Allow JavaScript modules to be processed

palant · Dec 2, 2023 · e557852 · e557852
1 parent 6d5693a
commit e557852
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/lib/bundles.js b/lib/bundles.js
@@ -387,7 +387,7 @@ export function* parseModules(ast)
         node.body.body.splice(node.body.body.length - 1, 1, ...parseScript(placeholders2.expression1.value).body);
     }
 
-    let scopeManager = escope.analyze(node, {ecmaVersion: 6});
+    let scopeManager = escope.analyze(node, {ecmaVersion: 2021, sourceType: "module"});
     let scope = scopeManager.acquire(node);
     let paramOrder = type == "browserify" ? ["require", "module", "exports"] : ["module", "exports", "require"];
     let params = placeholders.expression1;

diff --git a/lib/deduceVariableNames.js b/lib/deduceVariableNames.js
@@ -64,7 +64,7 @@ function varNameFromClassName({placeholder1: oldName, placeholder2: className})
 
 export default function deduceVariableNames(ast)
 {
-  let scopeManager = escope.analyze(ast, {ecmaVersion: 6});
+  let scopeManager = escope.analyze(ast, {ecmaVersion: 2021, sourceType: "module"});
   let scopes = [];
 
   estraverse.traverse(ast, {

diff --git a/lib/generateVariableNames.js b/lib/generateVariableNames.js
@@ -59,7 +59,7 @@ function generateNamesInScope(scope, state = {})
     generateNamesInScope(child, state);
 }
 
-export default function generateVariableNames(ast, scope = escope.analyze(ast, {ecmaVersion: 6}).acquire(ast))
+export default function generateVariableNames(ast, scope = escope.analyze(ast, {ecmaVersion: 2021, sourceType: "module"}).acquire(ast))
 {
   generateNamesInScope(scope);
 }
diff --git a/lib/io.js b/lib/io.js
@@ -38,6 +38,7 @@ export function parseScript(contents)
 {
   let ast = codeToAst(contents, {
     ecmaVersion: 2021,
+    sourceType: "module",
     allowReturnOutsideFunction: true
   });
   removeLocations(ast);

diff --git a/lib/rewriteCode.js b/lib/rewriteCode.js
@@ -88,7 +88,7 @@ function rewriteNode(node, parent, rewritePatterns, scopeManager)
 
 export default function rewriteCode(ast)
 {
-  let scopeManager = escope.analyze(ast, {ecmaVersion: 6});
+  let scopeManager = escope.analyze(ast, {ecmaVersion: 2021, sourceType: "module"});
 
   estraverse.replace(ast, {
     enter(node, parent)