Require packages to be opted in via glob, react#4570

Author: bradfordlemley

packages/react-dev-utils/workspaceUtils.js

@@ -30,23 +30,29 @@ const findPkgs = (rootPath, globPatterns) => {
 };
 
 const findMonorepo = appDir => {
+  const appPkg = JSON.parse(
+    fs.readFileSync(path.resolve(appDir, 'package.json'))
+  );
   const monoPkgPath = findPkg.sync(path.resolve(appDir, '..'));
   const monoRootPath = monoPkgPath && path.dirname(monoPkgPath);
   const monoPkg = monoPkgPath && require(monoPkgPath);
   const patterns = monoPkg && monoPkg.workspaces;
   const isYarnWs = Boolean(patterns);
+  const srcPatterns = appPkg && appPkg.sourceWorkspaces;
   const allPkgs = patterns && findPkgs(monoRootPath, patterns);
+  const allSrcPkgs =
+    srcPatterns && findPkgs(path.dirname(monoPkgPath), srcPatterns);
   const isIncluded = dir => allPkgs && allPkgs.indexOf(dir) !== -1;
   const isAppIncluded = isIncluded(appDir);
-  const pkgs = allPkgs
-    ? allPkgs.filter(f => fs.realpathSync(f) !== appDir)
+  const srcPkgPaths = allSrcPkgs
+    ? allSrcPkgs.filter(f => fs.realpathSync(f) !== appDir)
     : [];
 
   return {
     isAppIncluded,
     isYarnWs,
-    pkgs,
     rootPath: monoRootPath,
+    srcPkgPaths,
   };
 };
 

packages/react-scripts/config/paths.js

@@ -128,7 +128,7 @@ if (checkForMonorepo) {
   // the monorepo as if they are app source
   const mono = findMonorepo(appDirectory);
   if (mono.isAppIncluded) {
-    Array.prototype.push.apply(module.exports.srcPaths, mono.pkgs);
+    Array.prototype.push.apply(module.exports.srcPaths, mono.srcPkgPaths);
     module.exports.isMonorepo = true;
     module.exports.monorepoRoot = mono.rootPath;
   }

…xtures/monorepos/packages/comp1/index.js …onorepos/yarn-ws/packages/comp1/index.jspackages/react-scripts/fixtures/monorepos/packages/comp1/index.js renamed to packages/react-scripts/fixtures/monorepos/yarn-ws/packages/comp1/index.js packages/react-scripts/fixtures/monorepos/packages/comp1/index.js renamed to packages/react-scripts/fixtures/monorepos/yarn-ws/packages/comp1/index.js

@@ -4,6 +4,7 @@
   "private": true,
   "dependencies": {
     "comp2": "^1.0.0",
+    "nwbcomp": ">0.0.0", 
     "react": "^16.2.0",
     "react-dom": "^16.2.0"
   },
@@ -28,5 +29,8 @@
       "Firefox ESR",
       "not ie < 11"
     ]
-  }
+  },
+  "sourceWorkspaces": [
+    "packages/comp*"
+  ]
 }