Create @babel/plugin-proposal-dynamic-import (#9552)

* Create @babel/plugin-proposal-dynamic-import

* 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.

* Update error message

* Add error callback to amd interop

* Update babel-plugin-dynamic-import-node

packages/babel-plugin-proposal-dynamic-import/.npmignore

@@ -0,0 +1,3 @@
+src
+test
+*.log

packages/babel-plugin-proposal-dynamic-import/README.md

@@ -0,0 +1,19 @@
+# @babel/plugin-proposal-dynamic-import
+
+> Transform import() expressions
+
+See our website [@babel/plugin-proposal-dynamic-import](https://babeljs.io/docs/en/next/babel-plugin-proposal-dynamic-import.html) for more information.
+
+## Install
+
+Using npm:
+
+```sh
+npm install --save-dev @babel/plugin-proposal-dynamic-import
+```
+
+or using yarn:
+
+```sh
+yarn add @babel/plugin-proposal-dynamic-import --dev
+```

packages/babel-plugin-proposal-dynamic-import/package.json

@@ -0,0 +1,25 @@
+{
+  "name": "@babel/plugin-proposal-dynamic-import",
+  "version": "7.4.0",
+  "description": "Transform import() expressions",
+  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-proposal-dynamic-import",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "main": "lib/index.js",
+  "keywords": [
+    "babel-plugin"
+  ],
+  "dependencies": {
+    "@babel/helper-plugin-utils": "^7.0.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0"
+  },
+  "peerDependencies": {
+    "@babel/core": "^7.0.0-0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.2.0",
+    "@babel/helper-plugin-test-runner": "^7.0.0"
+  }
+}

packages/babel-plugin-proposal-dynamic-import/src/index.js

@@ -0,0 +1,41 @@
+import { declare } from "@babel/helper-plugin-utils";
+import syntaxDynamicImport from "@babel/plugin-syntax-dynamic-import";
+import { version } from "../package.json";
+
+const SUPPORTED_MODULES = ["commonjs", "amd", "systemjs"];
+
+const MODULES_NOT_FOUND = `\
+@babel/plugin-proposal-dynamic-import depends on a modules
+transform plugin. Supported plugins are:
+ - @babel/plugin-transform-modules-commonjs ^7.4.0
+ - @babel/plugin-transform-modules-amd ^7.4.0
+ - @babel/plugin-transform-modules-systemjs ^7.4.0
+
+If you are using Webpack or Rollup and thus don't want
+Babel to transpile your imports and exports, you can use
+the @babel/plugin-syntax-dynamic-import plugin and let your
+bundler handle dynamic imports.
+`;
+
+export default declare(api => {
+  api.assertVersion(7);
+
+  return {
+    name: "proposal-dynamic-import",
+    inherits: syntaxDynamicImport,
+
+    pre() {
+      this.file.set("@babel/plugin-proposal-dynamic-import", version);
+    },
+
+    visitor: {
+      Program() {
+        const modules = this.file.get("@babel/plugin-transform-modules-*");
+
+        if (!SUPPORTED_MODULES.includes(modules)) {
+          throw new Error(MODULES_NOT_FOUND);
+        }
+      },
+    },
+  };
+});

packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/missing-plugin/input.mjs

@@ -0,0 +1,3 @@
+import "a";
+
+import("b");

packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/missing-plugin/options.json

@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "syntax-dynamic-import",
+    "transform-modules-amd",
+    "external-helpers"
+  ]
+}

packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/missing-plugin/output.js

@@ -0,0 +1,5 @@
+define(["a"], function (_a) {
+  "use strict";
+
+  import("b");
+});

packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/module/input.mjs

@@ -0,0 +1 @@
+var modP = import("mod");

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

@@ -0,0 +1,5 @@
+define(["require"], function (_require) {
+  "use strict";
+
+  var modP = new Promise((_resolve, _reject) => _require(["mod"], imported => _resolve(babelHelpers.interopRequireWildcard(imported)), _reject));
+});

packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/no-interop/input.js

@@ -0,0 +1 @@
+var modP = import("mod");

packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/no-interop/options.json

@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "proposal-dynamic-import",
+    ["transform-modules-amd", { "noInterop": true }],
+    "external-helpers"
+  ]
+}

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

@@ -0,0 +1,3 @@
+define(["require"], function (_require) {
+  var modP = new Promise((_resolve, _reject) => _require(["mod"], imported => _resolve(imported), _reject));
+});

packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/options.json

@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "proposal-dynamic-import",
+    "transform-modules-amd",
+    "external-helpers"
+  ]
+}

packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/script/input.js

@@ -0,0 +1 @@
+var modP = import("mod");

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

@@ -0,0 +1,3 @@
+define(["require"], function (_require) {
+  var modP = new Promise((_resolve, _reject) => _require(["mod"], imported => _resolve(babelHelpers.interopRequireWildcard(imported)), _reject));
+});

packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/with-other-import-export/input.mjs

@@ -0,0 +1,8 @@
+var mod;
+
+import foo from "foo";
+
+import("mod").then(m => mod = m);
+
+export { mod };
+

packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/with-other-import-export/output.js

@@ -0,0 +1,12 @@
+define(["require", "exports", "foo"], function (_require, _exports, _foo) {
+  "use strict";
+
+  Object.defineProperty(_exports, "__esModule", {
+    value: true
+  });
+  _exports.mod = void 0;
+  _foo = babelHelpers.interopRequireDefault(_foo);
+  var mod;
+  _exports.mod = mod;
+  new Promise((_resolve, _reject) => _require(["mod"], imported => _resolve(babelHelpers.interopRequireWildcard(imported)), _reject)).then(m => _exports.mod = mod = m);
+});

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

@@ -0,0 +1,4 @@
+return import("./mod.js").then(({ default: def, named }) => {
+  expect(def()).toBe("foo");
+  expect(named()).toBe("bar");
+});

packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-interop/mod.js

@@ -0,0 +1,2 @@
+module.exports = () => "foo";
+module.exports.named = () => "bar";

packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-interop/options.json

@@ -0,0 +1,5 @@
+{
+  "parserOpts": {
+    "allowReturnOutsideFunction": true
+  }
+}

packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-transpiled-dep/exec.js

@@ -0,0 +1,4 @@
+return import("./mod.js").then(({ default: def, named }) => {
+  expect(def()).toBe("foo");
+  expect(named()).toBe("bar");
+});

packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-transpiled-dep/mod.js

@@ -0,0 +1,5 @@
+module.exports = {
+  __esModule: true,
+  default: () => "foo",
+  named: () => "bar",
+};

packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/exec-transpiled-dep/options.json

@@ -0,0 +1,5 @@
+{
+  "parserOpts": {
+    "allowReturnOutsideFunction": true
+  }
+}

packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/missing-plugin/input.mjs

@@ -0,0 +1,3 @@
+import "a";
+
+import("b");

packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/missing-plugin/options.json

@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "syntax-dynamic-import",
+    "transform-modules-commonjs",
+    "external-helpers"
+  ]
+}

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

@@ -0,0 +1,5 @@
+"use strict";
+
+require("a");
+
+import("b");

packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/module/input.mjs

@@ -0,0 +1 @@
+var modP = import("mod");

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

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

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

@@ -0,0 +1 @@
+var modP = import("mod");

packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/options.json

@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "proposal-dynamic-import",
+    ["transform-modules-commonjs", { "noInterop": true }],
+    "external-helpers"
+  ]
+}

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

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

packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/options.json

@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "proposal-dynamic-import",
+    "transform-modules-commonjs",
+    "external-helpers"
+  ]
+}

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

@@ -0,0 +1 @@
+var modP = import("mod");

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

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

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

@@ -0,0 +1,6 @@
+var require = "foo";
+
+(async function () {
+  var require = "bar";
+  await import("./mod");
+})();

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

@@ -0,0 +1,6 @@
+var _require2 = "foo";
+
+(async function () {
+  var _require = "bar";
+  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-proposal-dynamic-import/test/fixtures/missing-module-transform/missing-module-transform/options.json

@@ -0,0 +1,4 @@
+{
+  "plugins": ["proposal-dynamic-import"],
+  "throws": "@babel/plugin-proposal-dynamic-import depends on a modules\ntransform plugin. Supported plugins are:"
+}

packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin/input.mjs

@@ -0,0 +1,5 @@
+// TODO: This should throw in Babel 8
+
+import "a";
+
+import("b");

packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin/options.json

@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "syntax-dynamic-import",
+    "transform-modules-systemjs",
+    "external-helpers"
+  ]
+}

packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin/output.mjs

@@ -0,0 +1,11 @@
+System.register(["a"], function (_export, _context) {
+  "use strict";
+
+  return {
+    setters: [function (_a) {}],
+    execute: function () {
+      // TODO: This should throw in Babel 8
+      _context.import("b");
+    }
+  };
+});

packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/module/input.mjs

@@ -0,0 +1 @@
+var modP = import("mod");

packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/module/output.mjs

@@ -0,0 +1,11 @@
+System.register([], function (_export, _context) {
+  "use strict";
+
+  var modP;
+  return {
+    setters: [],
+    execute: function () {
+      modP = _context.import("mod");
+    }
+  };
+});

packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/options.json

@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "proposal-dynamic-import",
+    "transform-modules-systemjs",
+    "external-helpers"
+  ]
+}

packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/script/input.js

@@ -0,0 +1 @@
+var modP = import("mod");

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

@@ -0,0 +1,11 @@
+System.register([], function (_export, _context) {
+  "use strict";
+
+  var modP;
+  return {
+    setters: [],
+    execute: function () {
+      modP = _context.import("mod");
+    }
+  };
+});

packages/babel-plugin-proposal-dynamic-import/test/index.js

@@ -0,0 +1,3 @@
+import runner from "@babel/helper-plugin-test-runner";
+
+runner(__dirname);

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

@@ -10,7 +10,8 @@
   "main": "lib/index.js",
   "dependencies": {
     "@babel/helper-module-transforms": "^7.1.0",
-    "@babel/helper-plugin-utils": "^7.0.0"
+    "@babel/helper-plugin-utils": "^7.0.0",
+    "babel-plugin-dynamic-import-node": "^2.3.0"
   },
   "keywords": [
     "babel-plugin"