Merge pull request #16 from facebook/next

Update Upstream

Author: tvalentius

packages/react-error-overlay/src/effects/proxyConsole.js

@@ -28,7 +28,7 @@ const registerReactStack = () => {
     // $FlowFixMe
     console.reactStack = frames => reactFrameStack.push(frames);
     // $FlowFixMe
-    console.reactStackEnd = frames => reactFrameStack.pop();
+    console.reactStackEnd = () => reactFrameStack.pop();
   }
 };
 

packages/react-error-overlay/src/utils/getStackFrames.js

@@ -13,7 +13,7 @@ import { unmap } from './unmapper';
 
 function getStackFrames(
   error: Error,
-  unhandledRejection: boolean = false,
+  unhandledRejection: boolean = false, // eslint-disable-line
   contextSize: number = 3
 ): Promise<StackFrame[] | null> {
   const parsedFrames = parse(error);

packages/react-scripts/template/README.md

@@ -1874,14 +1874,24 @@ monorepo/
     "private": true
   app1/
     package.json:
-      "dependencies": ["@myorg/comp1": ">=0.0.0", "react": "^16.2.0"],
-      "devDependencies": ["react-scripts": "2.0.0"]
+      "dependencies": {
+        "@myorg/comp1": ">=0.0.0",
+        "react": "^16.2.0"
+      },
+      "devDependencies": {
+        "react-scripts": "2.0.0"
+      }
     src/
       app.js: import comp1 from '@myorg/comp1';
   app2/
     package.json:
-      "dependencies": ["@myorg/comp1": ">=0.0.0", "react": "^16.2.0"],
-      "devDependencies": ["react-scripts": "2.0.0"]
+      "dependencies": {
+        "@myorg/comp1": ">=0.0.0",
+        "react": "^16.2.0"
+      },
+      "devDependencies": {
+        "react-scripts": "2.0.0"
+      }
     src/
       app.js: import comp1 from '@myorg/comp1';
   comp1/
@@ -1893,8 +1903,12 @@ monorepo/
     package.json:
       "name": "@myorg/comp2",
       "version": "0.1.0",
-      "dependencies": ["@myorg/comp1": ">=0.0.0"],
-      "devDependencies": ["react": "^16.2.0"]
+      "dependencies": {
+        "@myorg/comp1": ">=0.0.0"
+      },
+      "devDependencies": {
+        "react": "^16.2.0"
+      }
     index.js: import comp1 from '@myorg/comp1'
 ```
 * Monorepo tools work on a package level, the same level as an npm package.

tasks/e2e-installs.sh

@@ -75,7 +75,6 @@ root_path=$PWD
 if hash npm 2>/dev/null
 then
   npm i -g npm@latest
-  npm cache clean || npm cache verify
 fi
 
 # Bootstrap monorepo

tasks/e2e-kitchensink.sh

@@ -68,7 +68,6 @@ root_path=$PWD
 if hash npm 2>/dev/null
 then
   npm i -g npm@latest
-  npm cache clean || npm cache verify
 fi
 
 # Bootstrap monorepo

tasks/e2e-monorepos.sh

@@ -66,7 +66,6 @@ root_path=$PWD
 if hash npm 2>/dev/null
 then
   npm i -g npm@latest
-  npm cache clean || npm cache verify
 fi
 
 # Bootstrap create-react-app monorepo

tasks/e2e-simple.sh

@@ -79,7 +79,6 @@ fi
 if hash npm 2>/dev/null
 then
   npm i -g npm@latest
-  npm cache clean || npm cache verify
 fi
 
 # Bootstrap monorepo