Switch back to babel-loader (facebook#5143)

* Switch back to babel-loader

* Preserve existing caller options. Use Object.assign instead of object spread.

* Updated filename in package.json

* Update comment about cache identifier

* Update macro check to use a regex

* Move macro check regex out of function

Author: iansu

config/webpack.config.dev.js

@@ -218,11 +218,11 @@ 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/webpack-overrides'
+                  ),
                   // @remove-on-eject-begin
                   babelrc: false,
                   configFile: false,

config/webpack.config.prod.js

@@ -272,8 +272,11 @@ 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/webpack-overrides'
+                  ),
                   // @remove-on-eject-begin
                   babelrc: false,
                   configFile: false,

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",