Clean up, use file matching (similar to original) in webpack configs …

…instead of matching function.

packages/react-scripts/config/paths.js

@@ -92,7 +92,6 @@ module.exports = {
 if (
   fs.existsSync(path.join(appDirectory, 'packages', 'react-scripts', 'config'))
 ) {
-  const appPackageJson = require(resolveOwn('package.json'));
   module.exports = {
     dotenv: resolveOwn('template/.env'),
     appPath: resolveApp('.'),
@@ -114,25 +113,6 @@ if (
 }
 // @remove-on-eject-end
 
-const isInPath = (fpath, searchPaths) => {
-  for (let i = 0; i < searchPaths.length; i++) {
-    if (fpath.startsWith(searchPaths[i] + path.sep)) {
-      return true;
-    }
-  }
-  return false;
-};
-
-const hasNodeModules = /[/\\\\]node_modules[/\\\\]/;
-
-// treat as source if realpath is in a srcPath, but not in a node_modules dir
-const isSrcFile = srcFile => {
-  const realSrc = fs.realpathSync(srcFile);
-  return (
-    !realSrc.match(hasNodeModules) && isInPath(realSrc, module.exports.srcPaths)
-  );
-};
-
 module.exports.srcPaths = [module.exports.appSrc];
 
 // if app is in a monorepo (lerna or yarn workspace), allow any module inside
@@ -153,5 +133,29 @@ if (monoPkgPath) {
   }
 }
 
-module.exports.shouldLint = modPath => isSrcFile(modPath);
+//
+// BELOW IS TO SUPPORT JEST TRANSPILING SOURCE FOR MONOREPOS
+// * JEST DOESN'T MATCH ON REALPATHS, BUT DOES WITH JEST >= 22.0.?, SO
+//   THIS CAN BE REMOVED WITH JEST > 22.0.?
+//
+
+const isInPath = (fpath, searchPaths) => {
+  for (let i = 0; i < searchPaths.length; i++) {
+    if (fpath.startsWith(searchPaths[i] + path.sep)) {
+      return true;
+    }
+  }
+  return false;
+};
+
+const hasNodeModules = /[/\\\\]node_modules[/\\\\]/;
+
+// realpath is in a srcPaths, but not in a node_modules dir
+const isSrcFile = srcFile => {
+  const realSrc = fs.realpathSync(srcFile);
+  return (
+    !realSrc.match(hasNodeModules) && isInPath(realSrc, module.exports.srcPaths)
+  );
+};
+
 module.exports.shouldTranspile = modPath => isSrcFile(modPath);

packages/react-scripts/config/webpack.config.dev.js

@@ -156,7 +156,8 @@ module.exports = {
             loader: require.resolve('eslint-loader'),
           },
         ],
-        include: paths.shouldLint,
+        include: paths.srcPaths,
+        exclude: [/[/\\\\]node_modules[/\\\\]/],
       },
       {
         // "oneOf" will traverse all following loaders until one will
@@ -178,7 +179,8 @@ module.exports = {
           // The preset includes JSX, Flow, and some ESnext features.
           {
             test: /\.(js|jsx|mjs)$/,
-            include: paths.shouldTranspile,
+            include: paths.srcPaths,
+            exclude: [/[/\\\\]node_modules[/\\\\]/],
             use: [
               // This loader parallelizes code compilation, it is optional but
               // improves compile time on larger projects

packages/react-scripts/config/webpack.config.prod.js

@@ -165,7 +165,8 @@ module.exports = {
             loader: require.resolve('eslint-loader'),
           },
         ],
-        include: paths.shouldLint,
+        include: paths.srcPaths,
+        exclude: [/[/\\\\]node_modules[/\\\\]/],
       },
       {
         // "oneOf" will traverse all following loaders until one will
@@ -186,7 +187,8 @@ module.exports = {
           // The preset includes JSX, Flow, and some ESnext features.
           {
             test: /\.(js|jsx|mjs)$/,
-            include: paths.shouldTranspile,
+            include: paths.srcPaths,
+            exclude: [/[/\\\\]node_modules[/\\\\]/],
             use: [
               // This loader parallelizes code compilation, it is optional but
               // improves compile time on larger projects

packages/react-scripts/scripts/utils/createJestConfig.js

@@ -47,10 +47,9 @@ module.exports = (resolve, rootDir, srcRoots, isEjecting) => {
         'config/jest/fileTransform.js'
       ),
     },
-    // pattern matching doesn't work for workspaces (symlinks from node_modules)
-    // because jest doesn't match against realpaths
-    // ...so decision to tranpile is inside babelTransform which can use realpaths
-    // for matching
+    // jest doesn't match against realpaths, so pattern matching doesn't work
+    // for monorepos with symlinks from node_modules to module source
+    // moved pattern matching into babelTransform for now
     // jest 22.0.x does match patterns against realpath so this can probably
     // change with jest 22.0.x+
     transformIgnorePatterns: [