Use airbnb/babel-plugin-dynamic-import-node

Do not duplicate code, which will unavoidably lead
to bugs being fixed in one plugin and not in the other.

packages/babel-helper-module-transforms/src/index.js

@@ -14,8 +14,6 @@ import normalizeAndLoadModuleMetadata, {
 
 export { hasExports, isSideEffectImport, isModule };
 
-export { rewriteDynamicImport } from "./dynamic-import";
-
 /**
  * Perform all of the generic ES6 module rewriting needed to handle initial
  * module processing. This function will rewrite the majority of the given

packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/module/output.js

@@ -1,3 +1,3 @@
 "use strict";
 
-var modP = new Promise(_resolve => _resolve(babelHelpers.interopRequireWildcard(require("mod"))));
+var modP = Promise.resolve().then(() => babelHelpers.interopRequireWildcard(require("mod")));

packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/output.js

@@ -1 +1 @@
-var modP = new Promise(_resolve => _resolve(require("mod")));
+var modP = Promise.resolve().then(() => require("mod"));

packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/script/output.js

@@ -1 +1 @@
-var modP = new Promise(_resolve => _resolve(babelHelpers.interopRequireWildcard(require("mod"))));
+var modP = Promise.resolve().then(() => babelHelpers.interopRequireWildcard(require("mod")));

packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/shadowed-require/output.js

@@ -2,5 +2,5 @@ var _require2 = "foo";
 
 (async function () {
   var _require = "bar";
-  await new Promise(_resolve => _resolve(babelHelpers.interopRequireWildcard(require("./mod"))));
+  await Promise.resolve().then(() => babelHelpers.interopRequireWildcard(require("./mod")));
 })();

packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/to-string/input.js

@@ -0,0 +1 @@
+import(2);

packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/to-string/output.js

@@ -0,0 +1 @@
+Promise.resolve().then(() => babelHelpers.interopRequireWildcard(require(`${2}`)));

packages/babel-plugin-transform-modules-amd/src/index.js

@@ -7,7 +7,6 @@ import {
   buildNamespaceInitStatements,
   ensureStatementsHoisted,
   wrapInterop,
-  rewriteDynamicImport,
 } from "@babel/helper-module-transforms";
 import { template, types as t } from "@babel/core";
 
@@ -50,18 +49,26 @@ export default declare((api, options) => {
         if (!this.file.has("@babel/plugin-proposal-dynamic-import")) return;
         if (!path.get("callee").isImport()) return;
 
-        if (!state.requireId) {
-          state.requireId = path.scope.generateUidIdentifier("require");
+        let { requireId, resolveId } = state;
+        if (!requireId) {
+          requireId = path.scope.generateUidIdentifier("require");
+          state.requireId = requireId;
         }
+        if (!resolveId) {
+          resolveId = path.scope.generateUidIdentifier("resolve");
+          state.resolveId = resolveId;
+        }
+
+        let result = t.identifier("imported");
+        if (!noInterop) result = wrapInterop(path, result, "namespace");
 
-        rewriteDynamicImport(
-          path,
-          (source, resolve) =>
-            template.expression.ast`${state.requireId}(
-              [${source}],
-              imported => ${resolve(t.identifier("imported"))}
+        path.replaceWith(
+          template.expression.ast`
+            new Promise((${resolveId}) =>
+              ${requireId}([${path.node.arguments[0]}], imported =>
+                ${resolveId}(${result})
+              )
             )`,
-          { noInterop },
         );
       },
 

packages/babel-plugin-transform-modules-commonjs/package.json

@@ -11,7 +11,8 @@
   "dependencies": {
     "@babel/helper-module-transforms": "^7.4.4",
     "@babel/helper-plugin-utils": "^7.0.0",
-    "@babel/helper-simple-access": "^7.1.0"
+    "@babel/helper-simple-access": "^7.1.0",
+    "babel-plugin-dynamic-import-node": "^2.2.0"
   },
   "keywords": [
     "babel-plugin"

packages/babel-plugin-transform-modules-commonjs/src/index.js

@@ -6,14 +6,20 @@ import {
   buildNamespaceInitStatements,
   ensureStatementsHoisted,
   wrapInterop,
-  rewriteDynamicImport,
 } from "@babel/helper-module-transforms";
 import simplifyAccess from "@babel/helper-simple-access";
 import { template, types as t } from "@babel/core";
 
+import babelPluginDynamicImportNode from "babel-plugin-dynamic-import-node";
+
 export default declare((api, options) => {
   api.assertVersion(7);
 
+  // TODO: expose a better interface
+  const transformImportCall = Function.call.bind(
+    babelPluginDynamicImportNode(api).visitor.Import,
+  );
+
   const {
     loose,
 
@@ -57,9 +63,6 @@ export default declare((api, options) => {
     })()
   `;
 
-  const getRequire = source =>
-    t.callExpression(t.identifier("require"), [source]);
-
   const moduleExportsVisitor = {
     ReferencedIdentifier(path) {
       const localName = path.node.name;
@@ -136,11 +139,7 @@ export default declare((api, options) => {
           scope.rename("require");
         } while ((scope = scope.parent));
 
-        rewriteDynamicImport(
-          path,
-          (source, resolve) => resolve(getRequire(source)),
-          { noInterop },
-        );
+        transformImportCall(this, path.get("callee"));
       },
 
       Program: {
@@ -187,7 +186,9 @@ export default declare((api, options) => {
           );
 
           for (const [source, metadata] of meta.source) {
-            const loadExpr = getRequire(t.stringLiteral(source));
+            const loadExpr = t.callExpression(t.identifier("require"), [
+              t.stringLiteral(source),
+            ]);
 
             let header;
             if (isSideEffectImport(metadata)) {