Switch back to babel-loader

facebook · Sep 27, 2018 · c92efca · c92efca
1 parent 27ac52a
commit c92efca
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 44 deletions.
diff --git a/packages/babel-preset-react-app/loader.js b/packages/babel-preset-react-app/loader.js
@@ -6,7 +6,28 @@
  */
 'use strict';
 
-const loader = require('babel-loader');
-const overrides = require('./overrides');
+const crypto = require('crypto');
 
-module.exports = loader.custom(() => overrides);
+module.exports = function() {
+  return {
+    // This function transforms the Babel configuration on a per-file basis
+    config(config, { source }) {
+      // Babel Macros are notoriously hard to cache, so they shouldn't be
+      // https://github.com/babel/babel/issues/8497
+      // We naively detect macros using their package suffix and insert a random
+      // caller name, a valid option accepted by Babel, to compose a one-time
+      // cacheIdentifier for the file. We cannot tune the loader options on a per
+      // file basis.
+      if (source.indexOf('.macro') !== -1 || source.indexOf('/macro') !== -1) {
+        return {
+          ...config.options,
+          caller: {
+            name: 'babel-preset-react-app',
+            craInvalidationToken: crypto.randomBytes(32).toString('hex'),
+          },
+        };
+      }
+      return config.options;
+    },
+  };
+};
diff --git a/packages/babel-preset-react-app/overrides.js b/packages/babel-preset-react-app/overrides.js
diff --git a/packages/babel-preset-react-app/package.json b/packages/babel-preset-react-app/package.json
@@ -13,7 +13,6 @@
     "dev.js",
     "index.js",
     "loader.js",
-    "overrides.js",
     "prod.js",
     "test.js"
   ],
@@ -31,7 +30,7 @@
     "@babel/preset-flow": "7.0.0",
     "@babel/preset-react": "7.0.0",
     "@babel/runtime": "7.0.0",
-    "babel-loader": "8.0.2",
+    "babel-loader": "8.0.4",
     "babel-plugin-macros": "2.4.2",
     "babel-plugin-transform-dynamic-import": "2.1.0",
     "babel-plugin-transform-react-remove-prop-types": "0.4.18"

diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json
@@ -36,7 +36,7 @@
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "9.0.0",
     "babel-jest": "23.6.0",
-    "babel-loader": "8.0.2",
+    "babel-loader": "8.0.4",
     "babel-preset-react-app": "^4.0.0",
     "chalk": "^2.3.2",
     "chokidar": "^2.0.2",

diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js
@@ -218,11 +218,9 @@ module.exports = {
                 },
               },
               {
-                // We need to use our own loader until `babel-loader` supports
-                // customization
-                // https://github.com/babel/babel-loader/pull/687
-                loader: require.resolve('babel-preset-react-app/loader'),
+                loader: require.resolve('babel-loader'),
                 options: {
+                  customize: require.resolve('babel-preset-react-app/loader'),
                   // @remove-on-eject-begin
                   babelrc: false,
                   configFile: false,

diff --git a/packages/react-scripts/config/webpack.config.prod.js b/packages/react-scripts/config/webpack.config.prod.js
@@ -272,8 +272,9 @@ module.exports = {
                 // We need to use our own loader until `babel-loader` supports
                 // customization
                 // https://github.com/babel/babel-loader/pull/687
-                loader: require.resolve('babel-preset-react-app/loader'),
+                loader: require.resolve('babel-loader'),
                 options: {
+                  customize: require.resolve('babel-preset-react-app/loader'),
                   // @remove-on-eject-begin
                   babelrc: false,
                   configFile: false,

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
@@ -26,7 +26,7 @@
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "9.0.0",
     "babel-jest": "23.6.0",
-    "babel-loader": "8.0.2",
+    "babel-loader": "8.0.4",
     "babel-plugin-named-asset-import": "^0.2.0",
     "babel-preset-react-app": "^4.0.0",
     "bfj": "6.1.1",