Skip to content

Commit

Permalink
Have Es6RewriteModules and Es6RewriteModulesToCommonJsModules mark th…
Browse files Browse the repository at this point in the history
…e files they change as transpiled.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=197976261
  • Loading branch information
johnplaisted authored and brad4d committed May 25, 2018
1 parent 7d00895 commit be9bbe4
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
13 changes: 12 additions & 1 deletion src/com/google/javascript/jscomp/Es6RewriteModules.java
Expand Up @@ -174,7 +174,13 @@ public void hotSwapScript(Node scriptNode, Node originalRoot) {
if (isEs6ModuleRoot(scriptNode)) {
processFile(scriptNode);
} else {
NodeTraversal.traverse(compiler, scriptNode, new RewriteRequiresForEs6Modules());
RewriteRequiresForEs6Modules rewriter = new RewriteRequiresForEs6Modules();

NodeTraversal.traverse(compiler, scriptNode, rewriter);

if (rewriter.transpiled) {
scriptNode.putBooleanProp(Node.TRANSPILED, true);
}
}
}

Expand All @@ -184,6 +190,7 @@ public void hotSwapScript(Node scriptNode, Node originalRoot) {
private void processFile(Node root) {
checkArgument(isEs6ModuleRoot(root), root);
clearState();
root.putBooleanProp(Node.TRANSPILED, true);
NodeTraversal.traverse(compiler, root, this);
}

Expand All @@ -201,6 +208,8 @@ public void clearState() {
* modules and rewrites them.
*/
private class RewriteRequiresForEs6Modules extends AbstractPostOrderCallback {
boolean transpiled = false;

@Override
public void visit(NodeTraversal t, Node n, Node parent) {
if (n.isCall()) {
Expand Down Expand Up @@ -251,6 +260,8 @@ public void visit(NodeTraversal t, Node n, Node parent) {
n.detach();
t.reportCodeChange();
}

transpiled = true;
}
}
}
Expand Down
Expand Up @@ -21,6 +21,7 @@
import com.google.common.annotations.VisibleForTesting;
import com.google.javascript.jscomp.NodeTraversal.AbstractPostOrderCallback;
import com.google.javascript.jscomp.deps.ModuleLoader.ModulePath;
import com.google.javascript.jscomp.parsing.parser.FeatureSet.Feature;
import com.google.javascript.rhino.IR;
import com.google.javascript.rhino.Node;
import com.google.javascript.rhino.Token;
Expand Down Expand Up @@ -60,8 +61,10 @@ public void process(Node externs, Node root) {
for (Node script : root.children()) {
if (Es6RewriteModules.isEs6ModuleRoot(script)) {
NodeTraversal.traverse(compiler, script, new Rewriter(compiler, script));
script.putBooleanProp(Node.TRANSPILED, true);
}
}
compiler.setFeatureSet(compiler.getFeatureSet().without(Feature.MODULES));
}

private static class LocalQName {
Expand Down

0 comments on commit be9bbe4

Please sign in to comment.