From bafa160e8f416d25198d846d57779535d5b2af28 Mon Sep 17 00:00:00 2001
From: Ward Peeters <ward@coding-tech.com>
Date: Thu, 9 Jan 2020 17:11:22 +0100
Subject: [PATCH] =?UTF-8?q?fix(babel-preset-gatsby-package):=20remove=20no?=
 =?UTF-8?q?de-env=20check=20as=20it's=20alway=E2=80=A6=20(#20509)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__tests__/__snapshots__/index.js.snap     | 71 +------------------
 .../__tests__/index.js                        | 18 -----
 packages/babel-preset-gatsby-package/index.js |  9 +--
 3 files changed, 5 insertions(+), 93 deletions(-)

diff --git a/packages/babel-preset-gatsby-package/__tests__/__snapshots__/index.js.snap b/packages/babel-preset-gatsby-package/__tests__/__snapshots__/index.js.snap
index 3878b9fe4430d..71c63ebb0ddd3 100644
--- a/packages/babel-preset-gatsby-package/__tests__/__snapshots__/index.js.snap
+++ b/packages/babel-preset-gatsby-package/__tests__/__snapshots__/index.js.snap
@@ -21,9 +21,6 @@ Array [
   ],
   Array [
     "@babel/preset-react",
-    Object {
-      "development": true,
-    },
   ],
   "@babel/preset-flow",
 ]
@@ -50,9 +47,6 @@ Array [
   ],
   Array [
     "@babel/preset-react",
-    Object {
-      "development": true,
-    },
   ],
   "@babel/preset-flow",
 ]
@@ -80,16 +74,13 @@ Array [
       "modules": "commonjs",
       "shippedProposals": true,
       "targets": Object {
-        "node": "current",
+        "node": "8.0",
       },
       "useBuiltIns": "entry",
     },
   ],
   Array [
     "@babel/preset-react",
-    Object {
-      "development": true,
-    },
   ],
   "@babel/preset-flow",
 ]
@@ -106,16 +97,13 @@ Array [
       "modules": "commonjs",
       "shippedProposals": true,
       "targets": Object {
-        "node": "current",
+        "node": "8.0",
       },
       "useBuiltIns": "entry",
     },
   ],
   Array [
     "@babel/preset-react",
-    Object {
-      "development": true,
-    },
   ],
   "@babel/preset-flow",
 ]
@@ -131,58 +119,3 @@ Array [
   "babel-plugin-dynamic-import-node",
 ]
 `;
-
-exports[`babel-preset-gatsby-package in production mode specifies proper presets for browser mode 1`] = `
-Array [
-  Array [
-    "@babel/preset-env",
-    Object {
-      "debug": false,
-      "loose": true,
-      "modules": "commonjs",
-      "shippedProposals": true,
-      "targets": Object {
-        "browsers": Array [
-          "last 4 versions",
-          "safari >= 7",
-          "ie >= 9",
-        ],
-      },
-      "useBuiltIns": false,
-    },
-  ],
-  Array [
-    "@babel/preset-react",
-    Object {
-      "development": false,
-    },
-  ],
-  "@babel/preset-flow",
-]
-`;
-
-exports[`babel-preset-gatsby-package in production mode specifies proper presets for node mode 1`] = `
-Array [
-  Array [
-    "@babel/preset-env",
-    Object {
-      "corejs": 2,
-      "debug": false,
-      "loose": true,
-      "modules": "commonjs",
-      "shippedProposals": true,
-      "targets": Object {
-        "node": "8.0",
-      },
-      "useBuiltIns": "entry",
-    },
-  ],
-  Array [
-    "@babel/preset-react",
-    Object {
-      "development": false,
-    },
-  ],
-  "@babel/preset-flow",
-]
-`;
diff --git a/packages/babel-preset-gatsby-package/__tests__/index.js b/packages/babel-preset-gatsby-package/__tests__/index.js
index e6e692b62cf17..ed3833b9d0d51 100644
--- a/packages/babel-preset-gatsby-package/__tests__/index.js
+++ b/packages/babel-preset-gatsby-package/__tests__/index.js
@@ -24,8 +24,6 @@ describe(`babel-preset-gatsby-package`, () => {
     })
 
     it(`can pass custom nodeVersion target`, () => {
-      process.env.BABEL_ENV = `production`
-
       const nodeVersion = `6.0`
       const { presets } = preset(null, {
         nodeVersion,
@@ -55,20 +53,4 @@ describe(`babel-preset-gatsby-package`, () => {
       expect(presets).toMatchSnapshot()
     })
   })
-
-  describe(`in production mode`, () => {
-    beforeEach(() => {
-      process.env.BABEL_ENV = `production`
-    })
-
-    it(`specifies proper presets for node mode`, () => {
-      const { presets } = preset(null)
-      expect(presets).toMatchSnapshot()
-    })
-
-    it(`specifies proper presets for browser mode`, () => {
-      const { presets } = preset(null, { browser: true })
-      expect(presets).toMatchSnapshot()
-    })
-  })
 })
diff --git a/packages/babel-preset-gatsby-package/index.js b/packages/babel-preset-gatsby-package/index.js
index 35212459fe78e..b822ba04705e6 100644
--- a/packages/babel-preset-gatsby-package/index.js
+++ b/packages/babel-preset-gatsby-package/index.js
@@ -4,15 +4,12 @@ function preset(context, options = {}) {
   const { browser = false, debug = false, nodeVersion = `8.0` } = options
   const { NODE_ENV, BABEL_ENV } = process.env
 
-  const IS_PRODUCTION = (BABEL_ENV || NODE_ENV) === `production`
   const IS_TEST  = (BABEL_ENV || NODE_ENV) === `test`
 
   const browserConfig = {
     useBuiltIns: false,
     targets: {
-      browsers: IS_PRODUCTION
-        ? [`last 4 versions`, `safari >= 7`, `ie >= 9`]
-        : [`last 2 versions`, `not ie <= 11`, `not android 4.4.3`],
+      browsers: [`last 2 versions`, `not ie <= 11`, `not android 4.4.3`],
     },
   }
 
@@ -20,7 +17,7 @@ function preset(context, options = {}) {
     corejs: 2,
     useBuiltIns: `entry`,
     targets: {
-      node: IS_PRODUCTION ? nodeVersion : `current`,
+      node: nodeVersion,
     },
   }
 
@@ -38,7 +35,7 @@ function preset(context, options = {}) {
           browser ? browserConfig : nodeConfig
         ),
       ],
-      [r(`@babel/preset-react`), { development: !IS_PRODUCTION }],
+      [r(`@babel/preset-react`)],
       r(`@babel/preset-flow`),
     ],
     plugins: [