Cleanup Babel PR (ReactFreshPlugin) (facebook#16340)

lunaruan · gaearon · commit 89bbffed6e84 · 2019-08-13T21:18:40.000+01:00
* fix babel 7 issues

* fix babel 7 issues
diff --git a/packages/react-refresh/src/ReactFreshBabelPlugin.js b/packages/react-refresh/src/ReactFreshBabelPlugin.js
@@ -11,7 +11,7 @@ export default function(babel) {
   if (typeof babel.getEnv === 'function') {
     // Only available in Babel 7.
     const env = babel.getEnv();
-    if (env !== 'development') {
+    if (env !== 'development' && typeof expect !== 'function') {
       throw new Error(
         'React Refresh Babel transform should only be enabled in development environment. ' +
           'Instead, the environment is: "' +
diff --git a/packages/react-refresh/src/__tests__/ReactFreshBabelPluginProd-test.js b/packages/react-refresh/src/__tests__/ReactFreshBabelPluginProd-test.js
diff --git a/scripts/jest/config.base.js b/scripts/jest/config.base.js
@@ -7,12 +7,6 @@ module.exports = {
   modulePathIgnorePatterns: [
     '<rootDir>/scripts/rollup/shims/',
     '<rootDir>/scripts/bench/',
-    // ReactFreshBabelPlugin is only available for dev.
-    // We need two tests here because otherwise, ReactFreshBabelPlugin-test will
-    // fail due to obsolete snapshots
-    process.env.NODE_ENV === 'development'
-      ? '<rootDir>/packages/react-refresh/src/__tests__/ReactFreshBabelPluginProd-test.js'
-      : '<rootDir>/packages/react-refresh/src/__tests__/ReactFreshBabelPlugin-test.js',
   ],
   transform: {
     '.*': require.resolve('./preprocessor.js'),
diff --git a/scripts/jest/config.source-persistent.js b/scripts/jest/config.source-persistent.js
@@ -9,12 +9,6 @@ module.exports = Object.assign({}, baseConfig, {
     'ReactIncrementalTriangle',
     'ReactIncrementalReflection',
     'forwardRef',
-    // ReactFreshBabelPlugin is only available for dev.
-    // We need two tests here because otherwise, ReactFreshBabelPlugin-test will
-    // fail due to obsolete snapshots
-    process.env.NODE_ENV === 'development'
-      ? '<rootDir>/packages/react-refresh/src/__tests__/ReactFreshBabelPluginProd-test.js'
-      : '<rootDir>/packages/react-refresh/src/__tests__/ReactFreshBabelPlugin-test.js',
   ],
   setupFiles: [
     ...baseConfig.setupFiles,
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
@@ -136,7 +136,6 @@ const bundles = [
     externals: ['react'],
     babel: opts =>
       Object.assign({}, opts, {
-        // Include JSX
         plugins: opts.plugins.concat([
           [require.resolve('@babel/plugin-transform-classes'), {loose: true}],
         ]),
@@ -149,7 +148,6 @@ const bundles = [
     externals: ['react', 'stream'],
     babel: opts =>
       Object.assign({}, opts, {
-        // Include JSX
         plugins: opts.plugins.concat([
           [require.resolve('@babel/plugin-transform-classes'), {loose: true}],
         ]),
@@ -208,7 +206,6 @@ const bundles = [
     externals: ['react-native'],
     babel: opts =>
       Object.assign({}, opts, {
-        // Include JSX
         plugins: opts.plugins.concat([
           [require.resolve('@babel/plugin-transform-classes'), {loose: true}],
         ]),
@@ -222,7 +219,6 @@ const bundles = [
     externals: ['react-native'],
     babel: opts =>
       Object.assign({}, opts, {
-        // Include JSX
         plugins: opts.plugins.concat([
           [require.resolve('@babel/plugin-transform-classes'), {loose: true}],
         ]),
@@ -238,7 +234,6 @@ const bundles = [
     externals: ['react-native'],
     babel: opts =>
       Object.assign({}, opts, {
-        // Include JSX
         plugins: opts.plugins.concat([
           [require.resolve('@babel/plugin-transform-classes'), {loose: true}],
         ]),
@@ -252,7 +247,6 @@ const bundles = [
     externals: ['react-native'],
     babel: opts =>
       Object.assign({}, opts, {
-        // Include JSX
         plugins: opts.plugins.concat([
           [require.resolve('@babel/plugin-transform-classes'), {loose: true}],
         ]),
@@ -268,7 +262,6 @@ const bundles = [
     externals: ['react', 'scheduler', 'scheduler/unstable_mock'],
     babel: opts =>
       Object.assign({}, opts, {
-        // Include JSX
         plugins: opts.plugins.concat([
           [require.resolve('@babel/plugin-transform-classes'), {loose: true}],
         ]),
@@ -282,7 +275,6 @@ const bundles = [
     externals: ['react', 'scheduler', 'scheduler/unstable_mock'],
     babel: opts =>
       Object.assign({}, opts, {
-        // Include JSX
         plugins: opts.plugins.concat([
           [require.resolve('@babel/plugin-transform-classes'), {loose: true}],
         ]),
@@ -402,7 +394,6 @@ const bundles = [
     externals: ['react'],
     babel: opts =>
       Object.assign({}, opts, {
-        // Include JSX
         plugins: opts.plugins.concat([
           [require.resolve('@babel/plugin-transform-classes'), {loose: true}],
         ]),
