Merge branch 'next' into feature/serve-app-under-homepage

* next: Fix typos in example monorepo documentation. (facebook#4164) Minor fixes to CI (facebook#4193) Change no-unused-vars 'args' from none to all to show warning on destructured objects Bump babel-related deps (facebook#4159) Remove ref to non free resource (facebook#4160)
kellyrmilligan · Mar 22, 2018 · 6fd988a · 6fd988a
2 parents 23ed094 + e8b0d89
commit 6fd988a
Show file tree

Hide file tree

Showing 15 changed files with 49 additions and 44 deletions.
diff --git a/packages/babel-plugin-named-asset-import/package.json b/packages/babel-plugin-named-asset-import/package.json
@@ -12,6 +12,6 @@
     "index.js"
   ],
   "peerDependencies": {
-    "@babel/core": "7.0.0-beta.41"
+    "@babel/core": "7.0.0-beta.42"
   }
 }
diff --git a/packages/babel-preset-react-app/index.js b/packages/babel-preset-react-app/index.js
@@ -76,6 +76,9 @@ module.exports = function(api, opts) {
           // Adds component stack to warning messages
           // Adds __self attribute to JSX which React will use for some warnings
           development: isEnvDevelopment || isEnvTest,
+          // Will use the native built-in instead of trying to polyfill
+          // behavior for any plugins that require one.
+          useBuiltIns: true,
         },
       ],
       isFlowEnabled && [require('@babel/preset-flow').default],
@@ -99,13 +102,6 @@ module.exports = function(api, opts) {
           useBuiltIns: true,
         },
       ],
-      // Transforms JSX
-      [
-        require('@babel/plugin-transform-react-jsx').default,
-        {
-          useBuiltIns: true,
-        },
-      ],
       // Polyfills the runtime needed for async/await and generators
       [
         require('@babel/plugin-transform-runtime').default,

diff --git a/packages/babel-preset-react-app/package.json b/packages/babel-preset-react-app/package.json
@@ -12,19 +12,19 @@
     "dependencies.js"
   ],
   "dependencies": {
-    "@babel/core": "7.0.0-beta.41",
-    "@babel/plugin-proposal-class-properties": "7.0.0-beta.41",
-    "@babel/plugin-syntax-dynamic-import": "7.0.0-beta.41",
-    "@babel/plugin-transform-classes": "7.0.0-beta.41",
-    "@babel/plugin-transform-destructuring": "7.0.0-beta.41",
-    "@babel/plugin-transform-react-constant-elements": "7.0.0-beta.41",
-    "@babel/plugin-transform-react-display-name": "7.0.0-beta.41",
-    "@babel/plugin-transform-react-jsx": "7.0.0-beta.41",
-    "@babel/plugin-transform-regenerator": "7.0.0-beta.41",
-    "@babel/plugin-transform-runtime": "7.0.0-beta.41",
-    "@babel/preset-env": "7.0.0-beta.41",
-    "@babel/preset-flow": "7.0.0-beta.41",
-    "@babel/preset-react": "7.0.0-beta.41",
+    "@babel/core": "7.0.0-beta.42",
+    "@babel/plugin-proposal-class-properties": "7.0.0-beta.42",
+    "@babel/plugin-proposal-object-rest-spread": "7.0.0-beta.42",
+    "@babel/plugin-syntax-dynamic-import": "7.0.0-beta.42",
+    "@babel/plugin-transform-classes": "7.0.0-beta.42",
+    "@babel/plugin-transform-destructuring": "7.0.0-beta.42",
+    "@babel/plugin-transform-react-constant-elements": "7.0.0-beta.42",
+    "@babel/plugin-transform-react-display-name": "7.0.0-beta.42",
+    "@babel/plugin-transform-regenerator": "7.0.0-beta.42",
+    "@babel/plugin-transform-runtime": "7.0.0-beta.42",
+    "@babel/preset-env": "7.0.0-beta.42",
+    "@babel/preset-flow": "7.0.0-beta.42",
+    "@babel/preset-react": "7.0.0-beta.42",
     "babel-plugin-macros": "2.0.0",
     "babel-plugin-transform-dynamic-import": "2.0.0",
     "babel-plugin-transform-react-remove-prop-types": "0.4.12"

diff --git a/packages/eslint-config-react-app/index.js b/packages/eslint-config-react-app/index.js
@@ -131,7 +131,7 @@ module.exports = {
     'no-unused-vars': [
       'warn',
       {
-        args: 'none',
+        args: 'all',
         ignoreRestSiblings: true,
       },
     ],

diff --git a/packages/eslint-config-react-app/package.json b/packages/eslint-config-react-app/package.json
@@ -11,7 +11,7 @@
     "index.js"
   ],
   "peerDependencies": {
-    "babel-eslint": "^8.0.2",
+    "babel-eslint": "^8.2.2",
     "eslint": "^4.1.1",
     "eslint-plugin-flowtype": "^2.34.1",
     "eslint-plugin-import": "^2.6.0",

diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json
@@ -38,7 +38,7 @@
     "workspaceUtils.js"
   ],
   "dependencies": {
-    "@babel/code-frame": "7.0.0-beta.41",
+    "@babel/code-frame": "7.0.0-beta.42",
     "address": "1.0.3",
     "browserslist": "2.11.3",
     "chalk": "2.3.0",

diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json
@@ -30,12 +30,12 @@
     "lib/index.js"
   ],
   "devDependencies": {
-    "@babel/code-frame": "7.0.0-beta.41",
-    "@babel/core": "7.0.0-beta.41",
-    "@babel/runtime": "7.0.0-beta.41",
+    "@babel/code-frame": "7.0.0-beta.42",
+    "@babel/core": "7.0.0-beta.42",
+    "@babel/runtime": "7.0.0-beta.42",
     "anser": "1.4.6",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-eslint": "^8.0.2",
+    "babel-eslint": "^8.2.2",
     "babel-jest": "^22.1.0",
     "babel-loader": "^8.0.0-beta.0",
     "babel-preset-react-app": "^3.1.1",

diff --git a/packages/react-error-overlay/src/effects/proxyConsole.js b/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();
   }
 };
 

diff --git a/packages/react-error-overlay/src/utils/getStackFrames.js b/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);

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
@@ -21,11 +21,11 @@
     "react-scripts": "./bin/react-scripts.js"
   },
   "dependencies": {
-    "@babel/core": "7.0.0-beta.41",
-    "@babel/runtime": "7.0.0-beta.41",
+    "@babel/core": "7.0.0-beta.42",
+    "@babel/runtime": "7.0.0-beta.42",
     "autoprefixer": "7.2.5",
     "babel-core": "7.0.0-bridge.0",
-    "babel-eslint": "8.2.1",
+    "babel-eslint": "8.2.2",
     "babel-jest": "22.1.0",
     "babel-loader": "8.0.0-beta.0",
     "babel-plugin-named-asset-import": "^0.1.0",

diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
@@ -1806,7 +1806,6 @@ After that, follow the instructions on the screen.
 
 Learn more about React Storybook:
 
-* Screencast: [Getting Started with React Storybook](https://egghead.io/lessons/react-getting-started-with-react-storybook)
 * [GitHub Repo](https://github.com/storybooks/storybook)
 * [Documentation](https://storybook.js.org/basics/introduction/)
 * [Snapshot Testing UI](https://github.com/storybooks/storybook/tree/master/addons/storyshots) with Storybook + addon/storyshot
@@ -1875,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/
@@ -1894,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.

diff --git a/tasks/e2e-installs.sh b/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

diff --git a/tasks/e2e-kitchensink.sh b/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

diff --git a/tasks/e2e-monorepos.sh b/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

diff --git a/tasks/e2e-simple.sh b/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