Revert "chore: upgrade core-js to version 3" (#25474)

wardpeet · web-flow · commit a50cd3d18e73 · 2020-07-02T15:33:16.000+02:00
diff --git a/packages/babel-preset-gatsby-package/__tests__/__snapshots__/index.js.snap b/packages/babel-preset-gatsby-package/__tests__/__snapshots__/index.js.snap
@@ -67,7 +67,7 @@ Array [
   Array [
     "@babel/preset-env",
     Object {
-      "corejs": 3,
+      "corejs": 2,
       "debug": false,
       "loose": true,
       "modules": "commonjs",
@@ -90,7 +90,7 @@ Array [
   Array [
     "@babel/preset-env",
     Object {
-      "corejs": 3,
+      "corejs": 2,
       "debug": true,
       "loose": true,
       "modules": "commonjs",
diff --git a/packages/babel-preset-gatsby-package/index.js b/packages/babel-preset-gatsby-package/index.js
@@ -14,7 +14,7 @@ function preset(context, options = {}) {
   }
 
   const nodeConfig = {
-    corejs: 3,
+    corejs: 2,
     useBuiltIns: `entry`,
     targets: {
       node: nodeVersion,
diff --git a/packages/babel-preset-gatsby-package/package.json b/packages/babel-preset-gatsby-package/package.json
@@ -18,7 +18,7 @@
     "@babel/preset-flow": "^7.10.1",
     "@babel/preset-react": "^7.10.1",
     "babel-plugin-dynamic-import-node": "^2.3.3",
-    "core-js": "^3.6.5"
+    "core-js": "^2.6.11"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0"
diff --git a/packages/babel-preset-gatsby/package.json b/packages/babel-preset-gatsby/package.json
@@ -24,8 +24,7 @@
     "gatsby-core-utils": "^1.3.10"
   },
   "peerDependencies": {
-    "@babel/core": "^7.0.0",
-    "core-js": "^3.0.0"
+    "@babel/core": "^7.0.0"
   },
   "license": "MIT",
   "main": "index.js",
diff --git a/packages/babel-preset-gatsby/src/__tests__/__snapshots__/dependencies.ts.snap b/packages/babel-preset-gatsby/src/__tests__/__snapshots__/dependencies.ts.snap
@@ -19,7 +19,7 @@ Object {
     Array [
       "<PROJECT_ROOT>/node_modules/@babel/preset-env/lib/index.js",
       Object {
-        "corejs": 3,
+        "corejs": 2,
         "exclude": Array [
           "transform-typeof-symbol",
         ],
diff --git a/packages/babel-preset-gatsby/src/__tests__/__snapshots__/index.js.snap b/packages/babel-preset-gatsby/src/__tests__/__snapshots__/index.js.snap
@@ -45,7 +45,7 @@ Object {
     Array [
       "<PROJECT_ROOT>/node_modules/@babel/preset-env/lib/index.js",
       Object {
-        "corejs": 3,
+        "corejs": 2,
         "exclude": Array [
           "transform-typeof-symbol",
         ],
@@ -120,7 +120,7 @@ Object {
     Array [
       "<PROJECT_ROOT>/node_modules/@babel/preset-env/lib/index.js",
       Object {
-        "corejs": 3,
+        "corejs": 2,
         "exclude": Array [
           "transform-typeof-symbol",
         ],
@@ -187,7 +187,7 @@ Object {
     Array [
       "<PROJECT_ROOT>/node_modules/@babel/preset-env/lib/index.js",
       Object {
-        "corejs": 3,
+        "corejs": 2,
         "exclude": Array [
           "transform-typeof-symbol",
         ],
@@ -254,7 +254,7 @@ Object {
     Array [
       "<PROJECT_ROOT>/node_modules/@babel/preset-env/lib/index.js",
       Object {
-        "corejs": 3,
+        "corejs": 2,
         "exclude": Array [
           "transform-typeof-symbol",
         ],
diff --git a/packages/babel-preset-gatsby/src/__tests__/index.js b/packages/babel-preset-gatsby/src/__tests__/index.js
@@ -24,7 +24,7 @@ describe(`babel-preset-gatsby`, () => {
       expect.stringContaining(path.join(`@babel`, `preset-env`)),
       {
         exclude: [`transform-typeof-symbol`],
-        corejs: 3,
+        corejs: 2,
         loose: true,
         modules: false,
         useBuiltIns: `usage`,
diff --git a/packages/babel-preset-gatsby/src/dependencies.ts b/packages/babel-preset-gatsby/src/dependencies.ts
@@ -32,7 +32,7 @@ export default (_?: unknown, options: IPresetOptions = {}) => {
         {
           // Allow importing core-js in entrypoint and use browserlist to select polyfills
           useBuiltIns: `usage`,
-          corejs: 3,
+          corejs: 2,
           modules: false,
           // Exclude transforms that make all code slower (https://github.com/facebook/create-react-app/pull/5278)
           exclude: [`transform-typeof-symbol`],
diff --git a/packages/babel-preset-gatsby/src/index.js b/packages/babel-preset-gatsby/src/index.js
@@ -51,7 +51,7 @@ module.exports = function preset(_, options = {}) {
       [
         resolve(`@babel/preset-env`),
         {
-          corejs: 3,
+          corejs: 2,
           loose: true,
           modules: stage === `test` ? `commonjs` : false,
           useBuiltIns: `usage`,
diff --git a/packages/gatsby-cli/package.json b/packages/gatsby-cli/package.json
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.10.3",
+    "@babel/runtime": "^7.10.3",
     "@hapi/joi": "^15.1.1",
     "@types/common-tags": "^1.8.0",
     "better-opn": "^1.0.0",
diff --git a/packages/gatsby-cli/src/index.ts b/packages/gatsby-cli/src/index.ts
@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+import "@babel/polyfill"
 import os from "os"
 import semver from "semver"
 import util from "util"
@@ -45,7 +46,7 @@ if (semver.prerelease(version)) {
   report.warn(
     report.stripIndent(`
     You are currently using a prerelease version of Node (${version}), which is not supported.
-    You can use this for testing, but we do not recommend it in production.
+    You can use this for testing, but we do not recommend it in production. 
     Before reporting any bugs, please test with a supported version of Node (>=${MIN_NODE_VERSION}).`)
   )
 }
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
@@ -13,6 +13,8 @@
     "@babel/code-frame": "^7.10.3",
     "@babel/core": "^7.10.3",
     "@babel/parser": "^7.10.3",
+    "@babel/polyfill": "^7.8.7",
+    "@babel/runtime": "^7.10.3",
     "@babel/traverse": "^7.10.3",
     "@hapi/joi": "^15.1.1",
     "@mikaelkristiansson/domready": "^1.0.10",
@@ -44,7 +46,7 @@
     "compression": "^1.7.4",
     "convert-hrtime": "^3.0.0",
     "copyfiles": "^2.3.0",
-    "core-js": "^3.6.5",
+    "core-js": "^2.6.11",
     "cors": "^2.8.5",
     "css-loader": "^1.0.1",
     "date-fns": "^2.14.0",
@@ -165,7 +167,6 @@
     "babel-preset-gatsby-package": "^0.5.0",
     "cross-env": "^5.2.1",
     "documentation": "^12.3.0",
-    "enhanced-resolve": "^4.2.0",
     "eslint-plugin-jsx-a11y": "^6.3.1",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
diff --git a/packages/gatsby/src/utils/webpack.config.js b/packages/gatsby/src/utils/webpack.config.js
@@ -5,7 +5,6 @@ const fs = require(`fs-extra`)
 const path = require(`path`)
 const dotenv = require(`dotenv`)
 const PnpWebpackPlugin = require(`pnp-webpack-plugin`)
-const { CoreJSResolver } = require(`./webpack/corejs-resolver`)
 const { store } = require(`../redux`)
 const { actions } = require(`../redux/actions`)
 const { getPublicPath } = require(`./get-public-path`)
@@ -389,6 +388,7 @@ module.exports = async (
         "@babel/runtime": path.dirname(
           require.resolve(`@babel/runtime/package.json`)
         ),
+        "core-js": path.dirname(require.resolve(`core-js/package.json`)),
         // TODO: Remove entire block when we make fast-refresh the default
         ...(process.env.GATSBY_HOT_LOADER !== `fast-refresh`
           ? {
@@ -415,7 +415,6 @@ module.exports = async (
         PnpWebpackPlugin.bind(directoryPath(`public`), module),
         // Transparently resolve packages via PnP when needed; noop otherwise
         PnpWebpackPlugin,
-        new CoreJSResolver(),
       ],
     }
 
diff --git a/packages/gatsby/src/utils/webpack/__tests__/corejs-resolver.ts b/packages/gatsby/src/utils/webpack/__tests__/corejs-resolver.ts
diff --git a/packages/gatsby/src/utils/webpack/corejs-resolver.ts b/packages/gatsby/src/utils/webpack/corejs-resolver.ts
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ function preset(context, options = {}) {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`const nodeConfig = {`
`17`		`- corejs: 3,`
	`17`	`+ corejs: 2,`
`18`	`18`	useBuiltIns: `entry`,
`19`	`19`	`targets: {`
`20`	`20`	`node: nodeVersion,`
Original file line number	Diff line number	Diff line change
@@ -24,7 +24,7 @@ describe(`babel-preset-gatsby`, () => {
`24`	`24`	expect.stringContaining(path.join(`@babel`, `preset-env`)),
`25`	`25`	`{`
`26`	`26`	exclude: [`transform-typeof-symbol`],
`27`		`- corejs: 3,`
	`27`	`+ corejs: 2,`
`28`	`28`	`loose: true,`
`29`	`29`	`modules: false,`
`30`	`30`	useBuiltIns: `usage`,
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ export default (_?: unknown, options: IPresetOptions = {}) => {`
`32`	`32`	`{`
`33`	`33`	`// Allow importing core-js in entrypoint and use browserlist to select polyfills`
`34`	`34`	useBuiltIns: `usage`,
`35`		`- corejs: 3,`
	`35`	`+ corejs: 2,`
`36`	`36`	`modules: false,`
`37`	`37`	`// Exclude transforms that make all code slower (https://github.com/facebook/create-react-app/pull/5278)`
`38`	`38`	exclude: [`transform-typeof-symbol`],
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ module.exports = function preset(_, options = {}) {`
`51`	`51`	`[`
`52`	`52`	resolve(`@babel/preset-env`),
`53`	`53`	`{`
`54`		`- corejs: 3,`
	`54`	`+ corejs: 2,`
`55`	`55`	`loose: true,`
`56`	`56`	modules: stage === `test` ? `commonjs` : false,
`57`	`57`	useBuiltIns: `usage`,
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`#!/usr/bin/env node`
`2`	`2`
	`3`	`+import "@babel/polyfill"`
`3`	`4`	`import os from "os"`
`4`	`5`	`import semver from "semver"`
`5`	`6`	`import util from "util"`
`@@ -45,7 +46,7 @@ if (semver.prerelease(version)) {`
`45`	`46`	`report.warn(`
`46`	`47`	report.stripIndent(`
`47`	`48`	`You are currently using a prerelease version of Node (${version}), which is not supported.`
`48`		`- You can use this for testing, but we do not recommend it in production.`
	`49`	`+ You can use this for testing, but we do not recommend it in production.`
`49`	`50`	Before reporting any bugs, please test with a supported version of Node (>=${MIN_NODE_VERSION}).`)
`50`	`51`	`)`
`51`	`52`	`}`