From 5b8477e969ac15c6ec2597c77927d9d567a4a119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= Date: Tue, 21 Apr 2020 12:12:54 +0200 Subject: [PATCH] Update dynamic import (#11453) * Update babel-plugin-proposal-dynamic-import fixture test outputs * Update package.json files Co-authored-by: Arun Kumar Mohan --- .../test/fixtures/commonjs/module/output.js | 2 +- .../test/fixtures/commonjs/no-interop/output.js | 2 +- .../test/fixtures/commonjs/script/output.js | 2 +- .../test/fixtures/commonjs/shadowed-require/output.js | 2 +- .../test/fixtures/commonjs/to-string/output.js | 2 +- packages/babel-plugin-transform-modules-amd/package.json | 2 +- packages/babel-plugin-transform-modules-commonjs/package.json | 2 +- packages/babel-plugin-transform-modules-systemjs/package.json | 2 +- .../auto-esm-unsupported-import-unsupported/output.js | 4 ++-- .../test/fixtures/dynamic-import/modules-cjs/output.js | 4 ++-- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/module/output.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/module/output.js index 2c4c89f6cf46..50b5317cf447 100644 --- a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/module/output.js +++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/module/output.js @@ -1,3 +1,3 @@ "use strict"; -var modP = Promise.resolve().then(() => babelHelpers.interopRequireWildcard(require("mod"))); +var modP = Promise.resolve("mod").then(s => babelHelpers.interopRequireWildcard(require(s))); diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/output.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/output.js index 0eee33867600..d664ed1214b6 100644 --- a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/output.js +++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/output.js @@ -1 +1 @@ -var modP = Promise.resolve().then(() => require("mod")); +var modP = Promise.resolve("mod").then(s => require(s)); diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/script/output.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/script/output.js index c1ee2ebe7ebf..45691a7f161a 100644 --- a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/script/output.js +++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/script/output.js @@ -1 +1 @@ -var modP = Promise.resolve().then(() => babelHelpers.interopRequireWildcard(require("mod"))); +var modP = Promise.resolve("mod").then(s => babelHelpers.interopRequireWildcard(require(s))); diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/shadowed-require/output.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/shadowed-require/output.js index 21529855028f..b672baeaff61 100644 --- a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/shadowed-require/output.js +++ b/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 Promise.resolve().then(() => babelHelpers.interopRequireWildcard(require("./mod"))); + await Promise.resolve("./mod").then(s => babelHelpers.interopRequireWildcard(require(s))); })(); diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/to-string/output.js b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/to-string/output.js index 1babb42d8cec..7ec1d85d66b6 100644 --- a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/to-string/output.js +++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/to-string/output.js @@ -1 +1 @@ -Promise.resolve().then(() => babelHelpers.interopRequireWildcard(require(`${2}`))); +Promise.resolve(`${2}`).then(s => babelHelpers.interopRequireWildcard(require(s))); diff --git a/packages/babel-plugin-transform-modules-amd/package.json b/packages/babel-plugin-transform-modules-amd/package.json index ff915d68058a..86aaa885f37d 100644 --- a/packages/babel-plugin-transform-modules-amd/package.json +++ b/packages/babel-plugin-transform-modules-amd/package.json @@ -11,7 +11,7 @@ "dependencies": { "@babel/helper-module-transforms": "^7.9.0", "@babel/helper-plugin-utils": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.0" + "babel-plugin-dynamic-import-node": "^2.3.2" }, "keywords": [ "babel-plugin" diff --git a/packages/babel-plugin-transform-modules-commonjs/package.json b/packages/babel-plugin-transform-modules-commonjs/package.json index 2722a97b283f..772f23149af9 100644 --- a/packages/babel-plugin-transform-modules-commonjs/package.json +++ b/packages/babel-plugin-transform-modules-commonjs/package.json @@ -12,7 +12,7 @@ "@babel/helper-module-transforms": "^7.9.0", "@babel/helper-plugin-utils": "^7.8.3", "@babel/helper-simple-access": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.0" + "babel-plugin-dynamic-import-node": "^2.3.2" }, "keywords": [ "babel-plugin" diff --git a/packages/babel-plugin-transform-modules-systemjs/package.json b/packages/babel-plugin-transform-modules-systemjs/package.json index 816f52f0db75..a04cd8f7309b 100644 --- a/packages/babel-plugin-transform-modules-systemjs/package.json +++ b/packages/babel-plugin-transform-modules-systemjs/package.json @@ -12,7 +12,7 @@ "@babel/helper-hoist-variables": "^7.8.3", "@babel/helper-module-transforms": "^7.9.0", "@babel/helper-plugin-utils": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.0" + "babel-plugin-dynamic-import-node": "^2.3.2" }, "keywords": [ "babel-plugin" diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-unsupported-import-unsupported/output.js b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-unsupported-import-unsupported/output.js index 1fbdb0891dc5..810190f67626 100644 --- a/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-unsupported-import-unsupported/output.js +++ b/packages/babel-preset-env/test/fixtures/dynamic-import/auto-esm-unsupported-import-unsupported/output.js @@ -6,6 +6,6 @@ function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; } -Promise.resolve().then(function () { - return _interopRequireWildcard(require("foo")); +Promise.resolve("foo").then(function (s) { + return _interopRequireWildcard(require(s)); }); diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/modules-cjs/output.js b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-cjs/output.js index 1fbdb0891dc5..810190f67626 100644 --- a/packages/babel-preset-env/test/fixtures/dynamic-import/modules-cjs/output.js +++ b/packages/babel-preset-env/test/fixtures/dynamic-import/modules-cjs/output.js @@ -6,6 +6,6 @@ function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; } -Promise.resolve().then(function () { - return _interopRequireWildcard(require("foo")); +Promise.resolve("foo").then(function (s) { + return _interopRequireWildcard(require(s)); });