Merge branch 'master' into v3.3.0-fix-package-name

Author: F1LT3R

packages/react-scripts/README.md

@@ -1,3 +1,13 @@
+# :warning: WARNING!
+
+This is a custom scripts-version of React-Scripts that provides Monorepo support.
+
+See [React Workspaces Playground](https://github.com/react-workspaces/react-workspaces-playground) for a working demo.
+
+[![React Workspaces Playground Screenshots](https://i.imgur.com/7snWXD0.png)](https://github.com/react-workspaces/react-workspaces-playground)
+
+For more information on why this ways created, please read this for more info: https://github.com/F1LT3R/cra-workspaces-support-1333
+
 # react-scripts
 
 This package includes scripts and configuration used by [Create React App](https://github.com/facebook/create-react-app).<br>

packages/react-scripts/config/paths.js

@@ -11,6 +11,7 @@
 const path = require('path');
 const fs = require('fs');
 const url = require('url');
+const findUp = require('find-up');
 
 // Make sure any symlinks in the project folder are resolved:
 // https://github.com/facebook/create-react-app/issues/637
@@ -122,7 +123,9 @@ module.exports = {
 };
 
 const ownPackageJson = require('../package.json');
-const reactScriptsPath = resolveApp(`node_modules/${ownPackageJson.name}`);
+const reactScriptsPath = findUp.sync(`node_modules/${ownPackageJson.name}`, {
+  cwd: resolveApp('.'),
+});
 const reactScriptsLinked =
   fs.existsSync(reactScriptsPath) &&
   fs.lstatSync(reactScriptsPath).isSymbolicLink();

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

@@ -93,6 +93,27 @@ module.exports = function(webpackEnv) {
   // passed into alias object. Uses a flag if passed into the build command
   const isEnvProductionProfile =
     isEnvProduction && process.argv.includes('--profile');
+  
+  const workspacesMainFields = [
+    workspacesConfig.packageEntry,
+    'browser',
+    'module',
+    'main',
+  ];
+  
+  const mainFields =
+    isEnvDevelopment && workspacesConfig.development
+      ? workspacesMainFields
+      : isEnvProduction && workspacesConfig.production
+        ? workspacesMainFields
+        : undefined;
+
+  const includePaths =
+    isEnvDevelopment && workspacesConfig.development
+      ? [paths.appSrc, ...workspacesConfig.paths]
+      : isEnvProduction && workspacesConfig.production
+      ? [paths.appSrc, ...workspacesConfig.paths]
+      : paths.appSrc;
 
   // Webpack uses `publicPath` to determine where the app is being served from.
   // It requires a trailing slash, or the file assets will get an incorrect path.
@@ -723,6 +744,10 @@ module.exports = function(webpackEnv) {
           typescript: resolve.sync('typescript', {
             basedir: paths.appNodeModules,
           }),
+          compilerOptions: {
+            skipLibCheck: true,
+            suppressOutputPathCheck: true,
+          },
           async: isEnvDevelopment,
           useTypescriptIncrementalApi: true,
           checkSyntacticErrors: true,

packages/react-scripts/config/yarn-workspaces.js

@@ -6,8 +6,12 @@ const findUp = require('find-up');
 const glob = require('glob');
 
 const loadPackageJson = packagePath => {
-	const packageObj = fse.readJsonSync(packagePath);
-	return packageObj;
+	try {
+		const packageObj = fse.readJsonSync(packagePath);
+		return packageObj;
+	} catch (err) {
+		throw err;
+	}
 };
 
 const getWorkspacesRootConfig = dir => {

packages/react-scripts/package.json

@@ -4,15 +4,15 @@
   "description": "Configuration and scripts for Create React App.",
   "repository": {
     "type": "git",
-    "url": "https://github.com/facebook/create-react-app.git",
+    "url": "https://github.com/react-workspaces/create-react-app.git",
     "directory": "packages/react-scripts"
   },
   "license": "MIT",
   "engines": {
     "node": ">=8.10"
   },
   "bugs": {
-    "url": "https://github.com/facebook/create-react-app/issues"
+    "url": "https://github.com/react-workspaces/create-react-app/issues"
   },
   "files": [
     "bin",

packages/react-scripts/scripts/start.js

@@ -154,6 +154,15 @@ checkBrowsers(paths.appPath, isInteractive)
         process.exit();
       });
     });
+    
+    // We need this to close the WebPack Server
+    // Thanks @1player! https://github.com/facebook/create-react-app/issues/1753#issuecomment-329972786
+    process.stdin.on("end", function() {
+      devServer.close();
+      process.exit();
+    });
+    
+    process.stdin.resume();
   })
   .catch(err => {
     if (err && err.message) {