babel
diff --git a/‎packages/babel-helper-module-transforms/src/rewrite-live-references.ts
Lines changed: 18 additions & 1 deletion b/‎packages/babel-helper-module-transforms/src/rewrite-live-references.ts
Lines changed: 18 additions & 1 deletion
diff --git a/‎packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/local-exports-decl/input.mjs renamed to ‎packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/local-exports-decl-top-level/input.mjs b/‎packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/local-exports-decl/input.mjs renamed to ‎packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/local-exports-decl-top-level/input.mjs
diff --git a/‎packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/local-exports-decl/options.json renamed to ‎packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/local-exports-decl-top-level/options.json b/‎packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/local-exports-decl/options.json renamed to ‎packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/local-exports-decl-top-level/options.json
diff --git a/‎packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/local-exports-decl/output.js renamed to ‎packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/local-exports-decl-top-level/output.js b/‎packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/local-exports-decl/output.js renamed to ‎packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/local-exports-decl-top-level/output.js
diff --git a/‎packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/local-exports-decl-with-esm-exports/input.mjs
Lines changed: 8 additions & 0 deletions b/‎packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/local-exports-decl-with-esm-exports/input.mjs
Lines changed: 8 additions & 0 deletions
diff --git a/‎packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/local-exports-decl-with-esm-exports/options.json
Lines changed: 3 additions & 0 deletions b/‎packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/local-exports-decl-with-esm-exports/options.json
Lines changed: 3 additions & 0 deletions
diff --git a/‎packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/local-exports-decl-with-esm-exports/output.js
Lines changed: 14 additions & 0 deletions b/‎packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/local-exports-decl-with-esm-exports/output.js
Lines changed: 14 additions & 0 deletions
@@ -183,6 +183,7 @@ const rewriteBindingInitVisitor: Visitor<RewriteBindingInitVisitorState> = {
           metadata,
           exportNames,
           identifier(localName),
+          path.scope,
         ),
       );
       // @ts-expect-error todo(flow->ts): avoid mutations
@@ -203,6 +204,7 @@ const rewriteBindingInitVisitor: Visitor<RewriteBindingInitVisitorState> = {
             metadata,
             exportNames,
             identifier(localName),
+            path.scope,
           ),
         );
         // @ts-expect-error todo(flow->ts): avoid mutations
@@ -218,7 +220,18 @@ const buildBindingExportAssignmentExpression = (
   metadata: ModuleMetadata,
   exportNames: string[],
   localExpr: t.Expression,
+  scope: Scope,
 ) => {
+  const exportsObjectName = metadata.exportName;
+  for (
+    let currentScope = scope;
+    currentScope != null;
+    currentScope = currentScope.parent
+  ) {
+    if (currentScope.hasOwnBinding(exportsObjectName)) {
+      currentScope.rename(exportsObjectName);
+    }
+  }
   return (exportNames || []).reduce((expr, exportName) => {
     // class Foo {} export { Foo, Foo as Bar };
     // as
@@ -228,7 +241,7 @@ const buildBindingExportAssignmentExpression = (
     return assignmentExpression(
       "=",
       memberExpression(
-        identifier(metadata.exportName),
+        identifier(exportsObjectName),
         computed ? stringLiteral(exportName) : identifier(exportName),
         /* computed */ computed,
       ),
@@ -352,6 +365,7 @@ const rewriteReferencesVisitor: Visitor<RewriteReferencesVisitorState> = {
               this.metadata,
               exportedNames,
               cloneNode(update),
+              path.scope,
             ),
           );
         } else {
@@ -366,6 +380,7 @@ const rewriteReferencesVisitor: Visitor<RewriteReferencesVisitorState> = {
                 this.metadata,
                 exportedNames,
                 identifier(localName),
+                path.scope,
               ),
               cloneNode(ref),
             ]),
@@ -428,6 +443,7 @@ const rewriteReferencesVisitor: Visitor<RewriteReferencesVisitorState> = {
               this.metadata,
               exportedNames,
               assignment,
+              path.scope,
             ),
           );
           requeueInParent(path);
@@ -458,6 +474,7 @@ const rewriteReferencesVisitor: Visitor<RewriteReferencesVisitorState> = {
                 this.metadata,
                 exportedNames,
                 identifier(localName),
+                path.scope,
               ),
             );
           }
 
@@ -0,0 +1,8 @@
+var exports = 1;
+
+export let x = 2;
+
+function fn() {
+    x = 3;
+    var exports = 4;
+}
@@ -0,0 +1,3 @@
+{
+  "plugins": ["transform-modules-commonjs"]
+}
@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.x = void 0;
+var _exports = 1;
+let x = 2;
+exports.x = x;
+
+function fn() {
+  exports.x = x = 3;
+  var _exports2 = 4;
+}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "plugins": ["transform-modules-commonjs"]`
	`3`	`+}`