From 8a34b7cc77099c7f591d64726a8106c02104f8f8 Mon Sep 17 00:00:00 2001
From: Ian Sutherland <ian@iansutherland.ca>
Date: Sun, 25 Mar 2018 16:17:41 -0600
Subject: [PATCH 1/4] Add ESLint check for incorrect propTypes usage (#3840)
 (#4048)

---
 packages/eslint-config-react-app/index.js     | 1 +
 packages/eslint-config-react-app/package.json | 2 +-
 packages/react-error-overlay/package.json     | 2 +-
 packages/react-scripts/package.json           | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/eslint-config-react-app/index.js b/packages/eslint-config-react-app/index.js
index 54dfe334733..7d2e716956a 100644
--- a/packages/eslint-config-react-app/index.js
+++ b/packages/eslint-config-react-app/index.js
@@ -186,6 +186,7 @@ module.exports = {
     'import/no-webpack-loader-syntax': 'error',
 
     // https://github.com/yannickcr/eslint-plugin-react/tree/master/docs/rules
+    'react/forbid-foreign-prop-types': ['warn', { allowInPropTypes: true }],
     'react/jsx-no-comment-textnodes': 'warn',
     'react/jsx-no-duplicate-props': ['warn', { ignoreCase: true }],
     'react/jsx-no-target-blank': 'warn',
diff --git a/packages/eslint-config-react-app/package.json b/packages/eslint-config-react-app/package.json
index 45dfc42e76e..c4b51925e69 100644
--- a/packages/eslint-config-react-app/package.json
+++ b/packages/eslint-config-react-app/package.json
@@ -16,7 +16,7 @@
     "eslint-plugin-flowtype": "^2.34.1",
     "eslint-plugin-import": "^2.6.0",
     "eslint-plugin-jsx-a11y": "^6.0.2",
-    "eslint-plugin-react": "^7.1.0"
+    "eslint-plugin-react": "^7.7.0"
   },
   "dependencies": {
     "confusing-browser-globals": "^1.0.0"
diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json
index 282cca890d0..cdaffae49d3 100644
--- a/packages/react-error-overlay/package.json
+++ b/packages/react-error-overlay/package.json
@@ -47,7 +47,7 @@
     "eslint-plugin-flowtype": "2.41.0",
     "eslint-plugin-import": "2.8.0",
     "eslint-plugin-jsx-a11y": "6.0.3",
-    "eslint-plugin-react": "7.5.1",
+    "eslint-plugin-react": "7.7.0",
     "flow-bin": "^0.63.1",
     "html-entities": "1.2.1",
     "jest": "22.1.2",
diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index 69bc74f2862..31b417c8328 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -41,7 +41,7 @@
     "eslint-plugin-flowtype": "2.41.0",
     "eslint-plugin-import": "2.8.0",
     "eslint-plugin-jsx-a11y": "6.0.3",
-    "eslint-plugin-react": "7.5.1",
+    "eslint-plugin-react": "7.7.0",
     "extract-text-webpack-plugin": "3.0.2",
     "file-loader": "1.1.6",
     "fs-extra": "5.0.0",

From 8db5e336b14bf9c61bd34901ce52d2c0963ea439 Mon Sep 17 00:00:00 2001
From: Minh Nguyen <minhnguyenxx@gmail.com>
Date: Mon, 26 Mar 2018 01:03:23 +0100
Subject: [PATCH 2/4] Revert lint-related changes made in #4193 (#4211)

---
 packages/react-error-overlay/src/effects/proxyConsole.js | 2 +-
 packages/react-error-overlay/src/utils/getStackFrames.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-error-overlay/src/effects/proxyConsole.js b/packages/react-error-overlay/src/effects/proxyConsole.js
index a1e8373a1bb..db270e9ddef 100644
--- 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 = () => reactFrameStack.pop();
+    console.reactStackEnd = frames => reactFrameStack.pop();
   }
 };
 
diff --git a/packages/react-error-overlay/src/utils/getStackFrames.js b/packages/react-error-overlay/src/utils/getStackFrames.js
index b01c6ebaee5..9721e316c52 100644
--- 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, // eslint-disable-line
+  unhandledRejection: boolean = false,
   contextSize: number = 3
 ): Promise<StackFrame[] | null> {
   const parsedFrames = parse(error);

From 06dd17e21bcbe65578013b3b6bc990ba0ff3f6ec Mon Sep 17 00:00:00 2001
From: Albert Still <albertjamesstill@gmail.com>
Date: Mon, 26 Mar 2018 12:08:16 +1100
Subject: [PATCH 3/4] add `create-react-app --help` info for local file path
 `--scripts-version` support (#4015)

* add `create-react-app --help` info for local file path --scripts-version

* make example path `../my-react-scripts` for local file path --help info
---
 packages/create-react-app/createReactApp.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js
index 1bf3bb0649d..cbe9699e2c3 100755
--- a/packages/create-react-app/createReactApp.js
+++ b/packages/create-react-app/createReactApp.js
@@ -89,6 +89,11 @@ const program = new commander.Command(packageJson.name)
         'my-react-scripts'
       )}`
     );
+    console.log(
+      `      - a local path relative to the current working directory: ${chalk.green(
+        'file:../my-react-scripts'
+      )}`
+    );
     console.log(
       `      - a .tgz archive: ${chalk.green(
         'https://mysite.com/my-react-scripts-0.8.2.tgz'

From 9c167a42490d134832e6e1b721292ea99eaf8ca5 Mon Sep 17 00:00:00 2001
From: bradfordlemley <bradfordlemley@gmail.com>
Date: Sun, 25 Mar 2018 19:14:59 -0600
Subject: [PATCH 4/4] Add some stuff that requires transpilation. (#4174)

---
 .../fixtures/monorepos/packages/comp1/index.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/react-scripts/fixtures/monorepos/packages/comp1/index.js b/packages/react-scripts/fixtures/monorepos/packages/comp1/index.js
index f3cb7964952..104989fe35a 100644
--- a/packages/react-scripts/fixtures/monorepos/packages/comp1/index.js
+++ b/packages/react-scripts/fixtures/monorepos/packages/comp1/index.js
@@ -1,5 +1,21 @@
 import React from 'react';
 
-const Comp1 = () => <div>Comp1</div>;
+class Comp1 extends React.Component {
+  static parts = {
+    greeting: 'hello',
+    region: 'world',
+  };
+
+  render() {
+    const { greeting, region } = Comp1.parts;
+
+    return (
+      <div {...this.props}>
+        Comp1
+        {greeting} {region}
+      </div>
+    );
+  }
+}
 
 export default Comp1;