From 33af5f745a2c4c0592c038e1cfd80589247973bf Mon Sep 17 00:00:00 2001 From: Henry Zhu Date: Mon, 16 Oct 2017 22:28:40 -0400 Subject: [PATCH] Scoped: fix more tests in preset-env [skip ci] --- experimental/babel-preset-env/src/debug.js | 2 +- experimental/babel-preset-env/src/index.js | 4 ++-- .../babel-preset-env/src/use-built-ins-entry-plugin.js | 6 +++--- experimental/babel-preset-env/src/use-built-ins-plugin.js | 8 ++++---- experimental/babel-preset-env/test/debug-fixtures.js | 2 +- .../fixtures/plugin-options/regenerator-false/expected.js | 1 + .../remove-babel-polyfill-import/expected.js | 6 ++++++ .../fixtures/preset-options/exclude-built-ins/expected.js | 1 + .../test/fixtures/umd/override-import-name/actual.js | 2 +- .../test/fixtures/umd/override-import-name/expected.js | 6 +++--- .../test/fixtures/umd/override-import-name/options.json | 2 +- 11 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 experimental/babel-preset-env/test/fixtures/plugin-options/regenerator-false/expected.js create mode 100644 experimental/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/remove-babel-polyfill-import/expected.js create mode 100644 experimental/babel-preset-env/test/fixtures/preset-options/exclude-built-ins/expected.js diff --git a/experimental/babel-preset-env/src/debug.js b/experimental/babel-preset-env/src/debug.js index edd430a81e..a1f8062b7c 100644 --- a/experimental/babel-preset-env/src/debug.js +++ b/experimental/babel-preset-env/src/debug.js @@ -52,7 +52,7 @@ export const logEntryPolyfills = ( console.log( ` -[${filename}] Replaced \`babel-polyfill\` with the following polyfill${wordEnds( +[${filename}] Replaced \`@babel/polyfill\` with the following polyfill${wordEnds( polyfills.size, )}:`, ); diff --git a/experimental/babel-preset-env/src/index.js b/experimental/babel-preset-env/src/index.js index 1ca18587e8..05808da268 100644 --- a/experimental/babel-preset-env/src/index.js +++ b/experimental/babel-preset-env/src/index.js @@ -211,7 +211,7 @@ export default function buildPreset( const pluginUseBuiltIns = useBuiltIns !== false; // NOTE: not giving spec here yet to avoid compatibility issues when - // babel-plugin-transform-es2015-modules-commonjs gets its spec mode + // transform-es2015-modules-commonjs gets its spec mode if (modules !== false && moduleTransformations[modules]) { plugins.push([getPlugin(moduleTransformations[modules]), { loose }]); } @@ -227,7 +227,7 @@ export default function buildPreset( if (debug && !hasBeenLogged) { hasBeenLogged = true; - console.log("babel-preset-env: `DEBUG` option"); + console.log("@babel/preset-env: `DEBUG` option"); console.log("\nUsing targets:"); console.log(JSON.stringify(prettifyTargets(targets), null, 2)); console.log(`\nUsing modules transform: ${modules.toString()}`); diff --git a/experimental/babel-preset-env/src/use-built-ins-entry-plugin.js b/experimental/babel-preset-env/src/use-built-ins-entry-plugin.js index fa0026a365..4d6b03fd4b 100644 --- a/experimental/babel-preset-env/src/use-built-ins-entry-plugin.js +++ b/experimental/babel-preset-env/src/use-built-ins-entry-plugin.js @@ -11,7 +11,7 @@ type Plugin = { type RequireType = "require" | "import"; function isPolyfillSource(value: string): boolean { - return value === "babel-polyfill"; + return value === "@babel/polyfill"; } export default function({ types: t }: { types: Object }): Plugin { @@ -45,7 +45,7 @@ export default function({ types: t }: { types: Object }): Plugin { core: ?boolean, ): Object { if (core) { - polyfill = `babel-polyfill/lib/core-js/modules/${polyfill}`; + polyfill = `@babel/polyfill/lib/core-js/modules/${polyfill}`; } if (requireType === "import") { @@ -67,7 +67,7 @@ export default function({ types: t }: { types: Object }): Plugin { if (regenerator) { imports.push( createImport( - "babel-polyfill/lib/regenerator-runtime/runtime", + "@babel/polyfill/lib/regenerator-runtime/runtime", requireType, ), ); diff --git a/experimental/babel-preset-env/src/use-built-ins-plugin.js b/experimental/babel-preset-env/src/use-built-ins-plugin.js index f26b5b85b9..98fd7755c3 100644 --- a/experimental/babel-preset-env/src/use-built-ins-plugin.js +++ b/experimental/babel-preset-env/src/use-built-ins-plugin.js @@ -10,7 +10,7 @@ type Plugin = { }; function isPolyfillSource(value: string): boolean { - return value === "babel-polyfill"; + return value === "@babel/polyfill"; } // function warnOnInstanceMethod() { @@ -34,12 +34,12 @@ function has(obj: Object, key: string): boolean { // } const modulePathMap = { - "regenerator-runtime": "babel-polyfill/lib/regenerator-runtime/runtime", + "regenerator-runtime": "@babel/polyfill/lib/regenerator-runtime/runtime", }; const getModulePath = module => { return ( - modulePathMap[module] || `babel-polyfill/lib/core-js/modules/${module}` + modulePathMap[module] || `@babel/polyfill/lib/core-js/modules/${module}` ); }; @@ -188,7 +188,7 @@ export default function({ types: t }: { types: Object }): Plugin { // if (obj.name === "Array" && prop.name === "from") { // addImport( // path, - // "babel-polyfill/lib/core-js/modules/web.dom.iterable", + // "@babel/polyfill/lib/core-js/modules/web.dom.iterable", // this.builtIns, // ); // } diff --git a/experimental/babel-preset-env/test/debug-fixtures.js b/experimental/babel-preset-env/test/debug-fixtures.js index 20adc768e5..2e76b3114f 100644 --- a/experimental/babel-preset-env/test/debug-fixtures.js +++ b/experimental/babel-preset-env/test/debug-fixtures.js @@ -44,7 +44,7 @@ const assertTest = (stdout, stderr, opts) => { }; const buildTest = opts => { - const binLoc = require.resolve("babel-cli/bin/babel"); + const binLoc = require.resolve("@babel/cli/bin/babel"); return callback => { clear(); diff --git a/experimental/babel-preset-env/test/fixtures/plugin-options/regenerator-false/expected.js b/experimental/babel-preset-env/test/fixtures/plugin-options/regenerator-false/expected.js new file mode 100644 index 0000000000..b4ece7b964 --- /dev/null +++ b/experimental/babel-preset-env/test/fixtures/plugin-options/regenerator-false/expected.js @@ -0,0 +1 @@ +import "@babel/polyfill"; diff --git a/experimental/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/remove-babel-polyfill-import/expected.js b/experimental/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/remove-babel-polyfill-import/expected.js new file mode 100644 index 0000000000..2c3c5f695a --- /dev/null +++ b/experimental/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/remove-babel-polyfill-import/expected.js @@ -0,0 +1,6 @@ +import "@babel/polyfill"; +import "@babel/polyfill"; + +require("@babel/polyfill"); + +require("@babel/polyfill"); diff --git a/experimental/babel-preset-env/test/fixtures/preset-options/exclude-built-ins/expected.js b/experimental/babel-preset-env/test/fixtures/preset-options/exclude-built-ins/expected.js new file mode 100644 index 0000000000..b4ece7b964 --- /dev/null +++ b/experimental/babel-preset-env/test/fixtures/preset-options/exclude-built-ins/expected.js @@ -0,0 +1 @@ +import "@babel/polyfill"; diff --git a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/actual.js b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/actual.js index 27ecb3010f..232f138e46 100644 --- a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/actual.js +++ b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/actual.js @@ -1 +1 @@ -import "@babel/template"; +import "es6-promise"; diff --git a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/expected.js b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/expected.js index 4f9182f8c5..004a934307 100644 --- a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/expected.js @@ -1,13 +1,13 @@ (function (global, factory) { if (typeof define === "function" && define.amd) { - define(["@babel/template"], factory); + define(["es6-promise"], factory); } else if (typeof exports !== "undefined") { - factory(require("@babel/template")); + factory(require("es6-promise")); } else { var mod = { exports: {} }; - factory(global.baz); + factory(global.Promise); global.actual = mod.exports; } })(this, function (_babelTemplate) { diff --git a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/options.json b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/options.json index b8a91f8f8a..8a4079d0ef 100644 --- a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/options.json +++ b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/override-import-name/options.json @@ -3,7 +3,7 @@ "external-helpers", ["transform-es2015-modules-umd", { "globals": { - "@babel/template": "baz" + "es6-promise": "Promise" } }] ]