From 17e10509c0a0b19fe0119631e2a22c40ec87ede8 Mon Sep 17 00:00:00 2001 From: Sven Sauleau Date: Tue, 2 Apr 2019 14:00:58 +0200 Subject: [PATCH] refactor: unify polyfill with noConflict mode --- packages/babel-polyfill/src/index.js | 21 +-------------------- packages/babel-polyfill/src/noConflict.js | 3 +++ 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/packages/babel-polyfill/src/index.js b/packages/babel-polyfill/src/index.js index 18aceda25ea4..038d13778601 100644 --- 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 index ec7c002ffffe..9e2bcad5d8c1 100644 --- 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";