Include changes from 7127330

babel · Mar 5, 2020 · 90a6848 · 90a6848
1 parent 1990c0d
commit 90a6848
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/packages/babel-preset-env/src/index.js b/packages/babel-preset-env/src/index.js
@@ -7,8 +7,10 @@ import { removeUnnecessaryItems } from "./filter-items";
 import moduleTransformations from "./module-transformations";
 import normalizeOptions from "./normalize-options";
 import { proposalPlugins, pluginSyntaxMap } from "../data/shipped-proposals";
-import pluginList from "./plugins-compat-data";
-import bugfixPluginList from "@babel/compat-data/plugin-bugfixes";
+import {
+  plugins as pluginsList,
+  pluginsBugfixes as pluginsBugfixesList,
+} from "./plugins-compat-data";
 import overlappingPlugins from "@babel/compat-data/overlapping-plugins";
 
 import addCoreJS2UsagePlugin from "./polyfills/corejs2/usage-plugin";
@@ -40,13 +42,13 @@ export function isPluginRequired(targets: Targets, support: Targets) {
 
 const pluginLists = {
   withProposals: {
-    withoutBugfixes: pluginList,
-    withBugfixes: Object.assign({}, pluginList, bugfixPluginList),
+    withoutBugfixes: pluginsList,
+    withBugfixes: Object.assign({}, pluginsList, pluginsBugfixesList),
   },
   withoutProposals: {
-    withoutBugfixes: filterStageFromList(pluginList, proposalPlugins),
+    withoutBugfixes: filterStageFromList(pluginsList, proposalPlugins),
     withBugfixes: filterStageFromList(
-      Object.assign({}, pluginList, bugfixPluginList),
+      Object.assign({}, pluginsList, pluginsBugfixesList),
       proposalPlugins,
     ),
   },
@@ -309,7 +311,7 @@ export default declare((api, opts) => {
     console.log(`\nUsing modules transform: ${modules.toString()}`);
     console.log("\nUsing plugins:");
     pluginNames.forEach(pluginName => {
-      logPluginOrPolyfill(pluginName, targets, pluginList);
+      logPluginOrPolyfill(pluginName, targets, pluginsList);
     });
 
     if (!useBuiltIns) {

diff --git a/packages/babel-preset-env/src/normalize-options.js b/packages/babel-preset-env/src/normalize-options.js
@@ -4,7 +4,7 @@ import findSuggestion from "levenary";
 import invariant from "invariant";
 import { coerce, SemVer } from "semver";
 import corejs2Polyfills from "@babel/compat-data/corejs2-built-ins";
-import pluginsList from "./plugins-compat-data";
+import { plugins as pluginsList } from "./plugins-compat-data";
 import moduleTransformations from "./module-transformations";
 import { TopLevelOptions, ModulesOption, UseBuiltInsOption } from "./options";
 import { defaultWebIncludes } from "./polyfills/corejs2/get-platform-specific-default";

diff --git a/packages/babel-preset-env/src/plugins-compat-data.js b/packages/babel-preset-env/src/plugins-compat-data.js
@@ -1,13 +1,22 @@
 // @flow
 
 import plugins from "@babel/compat-data/plugins";
+import bugfixPlugins from "@babel/compat-data/plugin-bugfixes";
 import availablePlugins from "./available-plugins";
 
-const filtered = {};
+const pluginsFiltered = {};
+const bugfixPluginsFiltered = {};
+
 for (const plugin of Object.keys(plugins)) {
   if (Object.hasOwnProperty.call(availablePlugins, plugin)) {
-    filtered[plugin] = plugins[plugin];
+    pluginsFiltered[plugin] = plugins[plugin];
+  }
+}
+
+for (const plugin of Object.keys(bugfixPlugins)) {
+  if (Object.hasOwnProperty.call(availablePlugins, plugin)) {
+    bugfixPluginsFiltered[plugin] = bugfixPlugins[plugin];
   }
 }
 
-export { filtered as default };
+export { pluginsFiltered as plugins, bugfixPluginsFiltered as pluginsBugfixes };