Merge pull request #9808 from babel/fix-noconflict-babel-polyfill

refactor: unify polyfill with noConflict mode
babel · Apr 2, 2019 · 53e0622 · 53e0622
2 parents 491b0a8 + 17e1050
commit 53e0622
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/packages/babel-polyfill/src/index.js b/packages/babel-polyfill/src/index.js
@@ -1,23 +1,4 @@
-// Cover all standardized ES6 APIs.
-import "core-js/es6";
-
-// Standard now
-import "core-js/fn/array/includes";
-import "core-js/fn/array/flat-map";
-import "core-js/fn/string/pad-start";
-import "core-js/fn/string/pad-end";
-import "core-js/fn/string/trim-start";
-import "core-js/fn/string/trim-end";
-import "core-js/fn/symbol/async-iterator";
-import "core-js/fn/object/get-own-property-descriptors";
-import "core-js/fn/object/values";
-import "core-js/fn/object/entries";
-import "core-js/fn/promise/finally";
-
-// Ensure that we polyfill ES6 compat for anything web-related, if it exists.
-import "core-js/web";
-
-import "regenerator-runtime/runtime";
+import "./noConflict";
 
 if (global._babelPolyfill && typeof console !== "undefined" && console.warn) {
   console.warn(

diff --git a/packages/babel-polyfill/src/noConflict.js b/packages/babel-polyfill/src/noConflict.js
@@ -3,8 +3,11 @@ import "core-js/es6";
 
 // Standard now
 import "core-js/fn/array/includes";
+import "core-js/fn/array/flat-map";
 import "core-js/fn/string/pad-start";
 import "core-js/fn/string/pad-end";
+import "core-js/fn/string/trim-start";
+import "core-js/fn/string/trim-end";
 import "core-js/fn/symbol/async-iterator";
 import "core-js/fn/object/get-own-property-descriptors";
 import "core-js/fn/object/values";