fix: push exported variable when hoisting export declared names (#12110)

babel · Sep 28, 2020 · 62df8d2 · 62df8d2
1 parent a080c82
commit 62df8d2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/packages/babel-plugin-transform-modules-systemjs/src/index.js b/packages/babel-plugin-transform-modules-systemjs/src/index.js
@@ -506,9 +506,11 @@ export default declare((api, options) => {
             path,
             (id, name, hasInit) => {
               variableIds.push(id);
-              if (!hasInit) {
-                exportNames.push(name);
-                exportValues.push(scope.buildUndefinedNode());
+              if (!hasInit && name in exportMap) {
+                for (const exported of exportMap[name]) {
+                  exportNames.push(exported);
+                  exportValues.push(scope.buildUndefinedNode());
+                }
               }
             },
             null,

diff --git a/.../babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-3/output.mjs b/.../babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-3/output.mjs
@@ -3,7 +3,7 @@ System.register([], function (_export, _context) {
 
   var foo;
 
-  _export("foo", void 0);
+  _export("bar", void 0);
 
   return {
     setters: [],

diff --git a/.../babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-4/output.mjs b/.../babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-4/output.mjs
@@ -3,7 +3,7 @@ System.register([], function (_export, _context) {
 
   var foo;
 
-  _export("foo", void 0);
+  _export("default", void 0);
 
   return {
     setters: [],

diff --git a/.../babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-5/output.mjs b/.../babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-named-5/output.mjs
@@ -4,7 +4,7 @@ System.register([], function (_export, _context) {
   var foo, bar;
 
   _export({
-    foo: void 0,
+    default: void 0,
     bar: void 0
   });
 

diff --git a/...lugin-transform-modules-systemjs/test/fixtures/systemjs/hoist-function-exports/output.mjs b/...lugin-transform-modules-systemjs/test/fixtures/systemjs/hoist-function-exports/output.mjs
@@ -7,10 +7,7 @@ System.register(["./evens"], function (_export, _context) {
     return _export("p", p = isEven(n) ? n + 1 : n + 2);
   }
 
-  _export({
-    nextOdd: nextOdd,
-    a: void 0
-  });
+  _export("nextOdd", nextOdd);
 
   return {
     setters: [function (_evens) {