From ae40264af67c2f7b577828e8226434cd55c8090e Mon Sep 17 00:00:00 2001
From: Dan Abramov <gaearon@fb.com>
Date: Thu, 29 Jun 2017 19:03:41 +0100
Subject: [PATCH 01/61] Publish

 - create-react-app@1.3.3
 - react-dev-utils@3.0.2
 - react-error-overlay@1.0.9
 - react-scripts@1.0.10
---
 packages/create-react-app/package.json    |  2 +-
 packages/react-dev-utils/package.json     |  2 +-
 packages/react-error-overlay/package.json |  4 ++--
 packages/react-scripts/package.json       | 17 +++++++----------
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/packages/create-react-app/package.json b/packages/create-react-app/package.json
index 613007b40b1..28502ca077a 100644
--- a/packages/create-react-app/package.json
+++ b/packages/create-react-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-react-app",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "keywords": [
     "react"
   ],
diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json
index 9fbbd76402c..b4539788d26 100644
--- a/packages/react-dev-utils/package.json
+++ b/packages/react-dev-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dev-utils",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Webpack utilities used by Create React App",
   "repository": "facebookincubator/create-react-app",
   "license": "BSD-3-Clause",
diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json
index dff62a58487..15bf9e484b4 100644
--- a/packages/react-error-overlay/package.json
+++ b/packages/react-error-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-error-overlay",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "An overlay for displaying stack frames.",
   "main": "lib/index.js",
   "scripts": {
@@ -34,7 +34,7 @@
     "anser": "1.2.5",
     "babel-code-frame": "6.22.0",
     "babel-runtime": "6.23.0",
-    "react-dev-utils": "^3.0.1",
+    "react-dev-utils": "^3.0.2",
     "settle-promise": "1.0.0",
     "source-map": "0.5.6"
   },
diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index 39b2f69fa55..a92c17fb5d2 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts-ts",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "description": "Configuration and scripts for Create React App.",
   "repository": "wmonk/create-react-app",
   "license": "BSD-3-Clause",
@@ -13,7 +13,6 @@
   "files": [
     "bin",
     "config",
-    "bin",
     "scripts",
     "template",
     "utils"
@@ -23,23 +22,21 @@
   },
   "dependencies": {
     "autoprefixer": "7.1.1",
-    "app-root-path": "^2.0.1",
     "case-sensitive-paths-webpack-plugin": "2.1.1",
     "chalk": "1.1.3",
-    "cli-highlight": "1.1.4",
     "css-loader": "0.28.4",
     "dotenv": "4.0.0",
     "extract-text-webpack-plugin": "2.1.2",
     "file-loader": "0.11.2",
     "fs-extra": "3.0.1",
-    "html-webpack-plugin": "2.28.0",
-    "jest": "20.0.3",
+    "html-webpack-plugin": "2.29.0",
+    "jest": "20.0.4",
     "object-assign": "4.1.1",
     "postcss-flexbugs-fixes": "3.0.0",
-    "postcss-loader": "2.0.5",
+    "postcss-loader": "2.0.6",
     "promise": "7.1.1",
-    "react-dev-utils": "^3.0.1",
-    "react-error-overlay": "^1.0.8",
+    "react-dev-utils": "^3.0.2",
+    "react-error-overlay": "^1.0.9",
     "style-loader": "0.18.2",
     "ts-jest": "^20.0.7",
     "ts-loader": "^2.2.1",
@@ -49,7 +46,7 @@
     "typescript": "~2.4.0",
     "source-map-loader": "^0.2.1",
     "sw-precache-webpack-plugin": "0.11.3",
-    "url-loader": "0.5.8",
+    "url-loader": "0.5.9",
     "webpack": "2.6.1",
     "webpack-dev-server": "2.5.0",
     "webpack-manifest-plugin": "1.1.0",

From c8cb0040ee3e94b59aae8fd5d792fbe9e8257ff2 Mon Sep 17 00:00:00 2001
From: Kristoffer <denkristoffer@users.noreply.github.com>
Date: Sat, 1 Jul 2017 16:49:49 +0200
Subject: [PATCH 02/61] allowTaggedTemplates to avoid warnings from SC's
 (#2701)

---
 packages/eslint-config-react-app/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/eslint-config-react-app/index.js b/packages/eslint-config-react-app/index.js
index 7298a8c3b3d..a8b900f940d 100644
--- a/packages/eslint-config-react-app/index.js
+++ b/packages/eslint-config-react-app/index.js
@@ -185,6 +185,7 @@ module.exports = {
       {
         allowShortCircuit: true,
         allowTernary: true,
+        allowTaggedTemplates: true,
       },
     ],
     'no-unused-labels': 'warn',

From 028b5c55de695c95c2592fa9cef32dcccff3d20c Mon Sep 17 00:00:00 2001
From: Danny Ho <danho123@gmail.com>
Date: Mon, 3 Jul 2017 13:03:00 -0700
Subject: [PATCH 03/61] Remove Windows note for source-map-explorer (#2719)

Glob support has been added in source-map-explorer@1.4+
---
 packages/react-scripts/template/README.md | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
index 5775028406e..6df4d43d7f6 100644
--- a/packages/react-scripts/template/README.md
+++ b/packages/react-scripts/template/README.md
@@ -1671,16 +1671,6 @@ Then in `package.json`, add the following line to `scripts`:
      "test": "react-scripts test --env=jsdom",
 ```
 
->**Note:**
->
->This doesn't quite work on Windows because it doesn't automatically expand `*` in the filepath. For now, the workaround is to look at the full hashed filename in `build/static/js` (e.g. `main.89b7e95a.js`) and copy it into `package.json` when you're running the analyzer. For example:
->
->```diff
->+    "analyze": "source-map-explorer build/static/js/main.89b7e95a.js",
->```
->
->Unfortunately it will be different after every build. You can express support for fixing this on Windows [in this issue](https://github.com/danvk/source-map-explorer/issues/52).
-
 Then to analyze the bundle run the production build then run the analyze
 script.
 

From fc2057c5f08f30382f6652d6614d6f0e13875277 Mon Sep 17 00:00:00 2001
From: Trygve Aaberge <trygveaa@gmail.com>
Date: Wed, 5 Jul 2017 00:44:55 +0200
Subject: [PATCH 04/61] Reorder vim arguments in launchEditor so --remote works
 (#2723)

This allows you to set REACT_EDITOR to 'vim --remote', so the file can
be opened in an already running vim process. When using vim without
remote, it works in the same way as before.

When launching vim without --remote, the order of the line and path
arguments doesn't matter. However, when using --remote the line argument
has to precede the path. This happens to be the same as joe and emacs
uses, so the vim cases were just moved there.

I haven't tested this with mvim, but the documentation says the same as
the vim documentation, so I assume it works the same.
---
 packages/react-dev-utils/launchEditor.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/react-dev-utils/launchEditor.js b/packages/react-dev-utils/launchEditor.js
index bcf0a506069..6f623dcf81b 100644
--- a/packages/react-dev-utils/launchEditor.js
+++ b/packages/react-dev-utils/launchEditor.js
@@ -58,9 +58,6 @@ function addWorkspaceToArgumentsIfExists(args, workspace) {
 function getArgumentsForLineNumber(editor, fileName, lineNumber, workspace) {
   const editorBasename = path.basename(editor).replace(/\.(exe|cmd|bat)$/i, '');
   switch (editorBasename) {
-    case 'vim':
-    case 'mvim':
-      return [fileName, '+' + lineNumber];
     case 'atom':
     case 'Atom':
     case 'Atom Beta':
@@ -74,6 +71,8 @@ function getArgumentsForLineNumber(editor, fileName, lineNumber, workspace) {
       return [fileName + ':' + lineNumber];
     case 'notepad++':
       return ['-n' + lineNumber, fileName];
+    case 'vim':
+    case 'mvim':
     case 'joe':
     case 'emacs':
     case 'emacsclient':

From fee4e579b42ea4ddd7d22e8acad12e8e2752feda Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Thu, 6 Jul 2017 16:47:41 +0100
Subject: [PATCH 05/61] Update link to issue blocking JSX hoisting (#2732)

---
 packages/babel-preset-react-app/index.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/babel-preset-react-app/index.js b/packages/babel-preset-react-app/index.js
index c8f20dde61d..f6102dc0529 100644
--- a/packages/babel-preset-react-app/index.js
+++ b/packages/babel-preset-react-app/index.js
@@ -129,10 +129,7 @@ if (env === 'test') {
 
   if (env === 'production') {
     // Optimization: hoist JSX that never changes out of render()
-    // Disabled because of issues:
-    // * https://github.com/facebookincubator/create-react-app/issues/525
-    // * https://phabricator.babeljs.io/search/query/pCNlnC2xzwzx/
-    // * https://github.com/babel/babel/issues/4516
+    // Disabled because of issues: https://github.com/facebookincubator/create-react-app/issues/553
     // TODO: Enable again when these issues are resolved.
     // plugins.push.apply(plugins, [
     //   require.resolve('babel-plugin-transform-react-constant-elements')

From 4b856a7c795ee056eda7b2244d83b347b0f971f9 Mon Sep 17 00:00:00 2001
From: Dan Ristea <danraduristea@gmail.com>
Date: Fri, 7 Jul 2017 11:34:56 +0100
Subject: [PATCH 06/61] Support PyCharm in launchEditor (#2740)

PyCharm has the same signature as WebStorm and PhpStorm `<editor> <projectPath> --line <number> <filePath>` so it can reuse the logic from those.

https://www.jetbrains.com/help/pycharm/opening-files-from-command-line.html

Tested with PyCharm Pro 2017.1.4 on MacOS 10.12
---
 packages/react-dev-utils/launchEditor.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/react-dev-utils/launchEditor.js b/packages/react-dev-utils/launchEditor.js
index 6f623dcf81b..bc1bd4d6e9d 100644
--- a/packages/react-dev-utils/launchEditor.js
+++ b/packages/react-dev-utils/launchEditor.js
@@ -91,6 +91,8 @@ function getArgumentsForLineNumber(editor, fileName, lineNumber, workspace) {
     case 'webstorm64':
     case 'phpstorm':
     case 'phpstorm64':
+    case 'pycharm':
+    case 'pycharm64':
       return addWorkspaceToArgumentsIfExists(
         ['--line', lineNumber, fileName],
         workspace

From 31e3ffea78fe7993a86281d0fae260917b27c942 Mon Sep 17 00:00:00 2001
From: Mostafa Hajizadeh <mostafa.h@gmail.com>
Date: Fri, 7 Jul 2017 15:07:32 +0430
Subject: [PATCH 07/61] Add "node" to Jest's moduleFileExtensions (#2738)

Jest's default value for this option is ["js", "json", "jsx", "node"].
CRA's current value is ["web.js", "js", "json", "web.jsx", "jsx"], which
is missing one of default ones: "node". This change fixes that.

This "node" extension is used in packages that use native code.
---
 .../scripts/utils/createJestConfig.js         | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/packages/react-scripts/scripts/utils/createJestConfig.js b/packages/react-scripts/scripts/utils/createJestConfig.js
index 559f96f4516..c5886ce0cce 100644
--- a/packages/react-scripts/scripts/utils/createJestConfig.js
+++ b/packages/react-scripts/scripts/utils/createJestConfig.js
@@ -27,17 +27,6 @@ module.exports = (resolve, rootDir) => {
     collectCoverageFrom: ['src/**/*.{js,jsx,ts,tsx}'],
     setupFiles: [resolve('config/polyfills.js')],
     setupTestFrameworkScriptFile: setupTestsFile,
-    moduleFileExtensions: [
-      'web.ts',
-      'ts',
-      'web.tsx',
-      'tsx',
-      'web.js',
-      'js',
-      'web.jsx',
-      'jsx',
-      'json',
-    ],
     testMatch: [
       '<rootDir>/src/**/__tests__/**/*.ts?(x)',
       '<rootDir>/src/**/?(*.)(spec|test).ts?(x)',
@@ -47,7 +36,7 @@ module.exports = (resolve, rootDir) => {
     transform: {
       '^.+\\.css$': resolve('config/jest/cssTransform.js'),
       '^.+\\.tsx?$': resolve('config/jest/typescriptTransform.js'),
-      '^(?!.*\\.(css|json)$)': resolve('config/jest/fileTransform.js'),
+      '^(?!.*\\.(js|jsx|css|json)$)': resolve('config/jest/fileTransform.js'),
     },
     transformIgnorePatterns: [
       '[/\\\\]node_modules[/\\\\].+\\.(js|jsx|ts|tsx)$',
@@ -55,6 +44,18 @@ module.exports = (resolve, rootDir) => {
     moduleNameMapper: {
       '^react-native$': 'react-native-web',
     },
+    moduleFileExtensions: [
+      'web.ts',
+      'ts',
+      'web.tsx',
+      'tsx',
+      'web.js',
+      'js',
+      'web.jsx',
+      'jsx',
+      'json',
+      'node'
+    ],
     globals: {
       'ts-jest': {
         tsConfigFile: paths.appTsTestConfig,

From 63e8924f993891c0e92c8b072830735f0f181135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=84=C2=90inh=20Quang=20Trung?= <trungdq88@gmail.com>
Date: Fri, 7 Jul 2017 17:40:29 +0700
Subject: [PATCH 08/61] ESLint 4 (#2735)

* Update eslint-loader 1.7.1 -> 1.9.0

* Add eslintPath option

* Update eslint 3.19.0 -> 4.1.1

* Update peer dependencies

* Move eslintPath config to outside @remove-on-eject
---
 packages/eslint-config-react-app/package.json        |  2 +-
 packages/react-scripts/config/webpack.config.dev.js  | 12 +++---------
 packages/react-scripts/config/webpack.config.prod.js |  2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/packages/eslint-config-react-app/package.json b/packages/eslint-config-react-app/package.json
index cd36a70e5cb..559e78b256b 100644
--- a/packages/eslint-config-react-app/package.json
+++ b/packages/eslint-config-react-app/package.json
@@ -12,7 +12,7 @@
   ],
   "peerDependencies": {
     "babel-eslint": "^7.2.3",
-    "eslint": "^3.19.0",
+    "eslint": "^4.1.1",
     "eslint-plugin-flowtype": "^2.33.0",
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-jsx-a11y": "^5.0.3",
diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js
index 2934aeae6ab..97d7012cce9 100644
--- a/packages/react-scripts/config/webpack.config.dev.js
+++ b/packages/react-scripts/config/webpack.config.dev.js
@@ -162,14 +162,8 @@ module.exports = {
       {
         exclude: [
           /\.html$/,
-          // We have to write /\.(js|jsx)(\?.*)?$/ rather than just /\.(js|jsx)$/
-          // because you might change the hot reloading server from the custom one
-          // to Webpack's built-in webpack-dev-server/client?/, which would not
-          // get properly excluded by /\.(js|jsx)$/ because of the query string.
-          // Webpack 2 fixes this, but for now we include this hack.
-          // https://github.com/facebookincubator/create-react-app/issues/1713
-          /\.(js|jsx)(\?.*)?$/,
-          /\.(ts|tsx)(\?.*)?$/,
+          /\.(js|jsx)$/,
+          /\.(ts|tsx)$/,
           /\.css$/,
           /\.json$/,
           /\.bmp$/,
@@ -237,7 +231,7 @@ module.exports = {
         ],
       },
       // ** STOP ** Are you adding a new loader?
-      // Remember to add the new extension(s) to the "url" loader exclusion list.
+      // Remember to add the new extension(s) to the "file" loader exclusion list.
     ],
   },
   plugins: [
diff --git a/packages/react-scripts/config/webpack.config.prod.js b/packages/react-scripts/config/webpack.config.prod.js
index 8519c6603a3..0141675de10 100644
--- a/packages/react-scripts/config/webpack.config.prod.js
+++ b/packages/react-scripts/config/webpack.config.prod.js
@@ -189,7 +189,7 @@ module.exports = {
       {
         test: /\.(ts|tsx)$/,
         include: paths.appSrc,
-        loader: require.resolve('ts-loader')
+        loader: require.resolve('ts-loader'),
       },
       // The notation here is somewhat confusing.
       // "postcss" loader applies autoprefixer to our CSS.

From e0c2729b0d461b977e6cb9c9c4a149763854f7d9 Mon Sep 17 00:00:00 2001
From: Andreas Hoffmann <furizaa@gmail.com>
Date: Sun, 9 Jul 2017 22:59:19 +0200
Subject: [PATCH 09/61] Use Rule.oneOf to resolve correct loader (#2747)

* Use oneOf to resolve correct loader

* Add html and json fallthrough again

* Use oneOf to resolve correct loader in dev

* Document file-loaders `js` exclusion

* Remove `jsx` from exclusion in prod config
---
 .../config/webpack.config.dev.js              | 137 +++++++-------
 .../config/webpack.config.prod.js             | 179 +++++++++---------
 2 files changed, 155 insertions(+), 161 deletions(-)

diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js
index 97d7012cce9..774201ac680 100644
--- a/packages/react-scripts/config/webpack.config.dev.js
+++ b/packages/react-scripts/config/webpack.config.dev.js
@@ -150,88 +150,85 @@ module.exports = {
         enforce: 'pre',
         include: paths.appSrc,
       },
-      // ** ADDING/UPDATING LOADERS **
-      // The "file" loader handles all assets unless explicitly excluded.
-      // The `exclude` list *must* be updated with every change to loader extensions.
-      // When adding a new loader, you must add its `test`
-      // as a new entry in the `exclude` list for "file" loader.
-
-      // "file" loader makes sure those assets get served by WebpackDevServer.
-      // When you `import` an asset, you get its (virtual) filename.
-      // In production, they would get copied to the `build` folder.
-      {
-        exclude: [
-          /\.html$/,
-          /\.(js|jsx)$/,
-          /\.(ts|tsx)$/,
-          /\.css$/,
-          /\.json$/,
-          /\.bmp$/,
-          /\.gif$/,
-          /\.jpe?g$/,
-          /\.png$/,
-        ],
-        loader: require.resolve('file-loader'),
-        options: {
-          name: 'static/media/[name].[hash:8].[ext]',
-        },
-      },
-      // "url" loader works like "file" loader except that it embeds assets
-      // smaller than specified limit in bytes as data URLs to avoid requests.
-      // A missing `test` is equivalent to a match.
-      {
-        test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
-        loader: require.resolve('url-loader'),
-        options: {
-          limit: 10000,
-          name: 'static/media/[name].[hash:8].[ext]',
-        },
-      },
-      // Compile .tsx?
-      {
-        test: /\.(ts|tsx)$/,
-        include: paths.appSrc,
-        loader: require.resolve('ts-loader'),
-      },
-      // "postcss" loader applies autoprefixer to our CSS.
-      // "css" loader resolves paths in CSS and adds assets as dependencies.
-      // "style" loader turns CSS into JS modules that inject <style> tags.
-      // In production, we use a plugin to extract that CSS to a file, but
-      // in development "style" loader enables hot editing of CSS.
       {
-        test: /\.css$/,
-        use: [
-          require.resolve('style-loader'),
+        // "oneOf" will traverse all following loaders until one will
+        // match the requirements. When no loader matches it will fall
+        // back to the "file" loader at the end of the loader list.
+        oneOf: [
+          // "url" loader works like "file" loader except that it embeds assets
+          // smaller than specified limit in bytes as data URLs to avoid requests.
+          // A missing `test` is equivalent to a match.
           {
-            loader: require.resolve('css-loader'),
+            test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
+            loader: require.resolve('url-loader'),
             options: {
-              importLoaders: 1,
+              limit: 10000,
+              name: 'static/media/[name].[hash:8].[ext]',
             },
           },
+          // Compile .tsx?
           {
-            loader: require.resolve('postcss-loader'),
-            options: {
-              // Necessary for external CSS imports to work
-              // https://github.com/facebookincubator/create-react-app/issues/2677
-              ident: 'postcss',
-              plugins: () => [
-                require('postcss-flexbugs-fixes'),
-                autoprefixer({
-                  browsers: [
-                    '>1%',
-                    'last 4 versions',
-                    'Firefox ESR',
-                    'not ie < 9', // React doesn't support IE8 anyway
+            test: /\.(ts|tsx)$/,
+            include: paths.appSrc,
+            loader: require.resolve('ts-loader'),
+          },
+          // "postcss" loader applies autoprefixer to our CSS.
+          // "css" loader resolves paths in CSS and adds assets as dependencies.
+          // "style" loader turns CSS into JS modules that inject <style> tags.
+          // In production, we use a plugin to extract that CSS to a file, but
+          // in development "style" loader enables hot editing of CSS.
+          {
+            test: /\.css$/,
+            use: [
+              require.resolve('style-loader'),
+              {
+                loader: require.resolve('css-loader'),
+                options: {
+                  importLoaders: 1,
+                },
+              },
+              {
+                loader: require.resolve('postcss-loader'),
+                options: {
+                  // Necessary for external CSS imports to work
+                  // https://github.com/facebookincubator/create-react-app/issues/2677
+                  ident: 'postcss',
+                  plugins: () => [
+                    require('postcss-flexbugs-fixes'),
+                    autoprefixer({
+                      browsers: [
+                        '>1%',
+                        'last 4 versions',
+                        'Firefox ESR',
+                        'not ie < 9', // React doesn't support IE8 anyway
+                      ],
+                      flexbox: 'no-2009',
+                    }),
                   ],
-                  flexbox: 'no-2009',
-                }),
-              ],
+                },
+              },
+            ],
+          },
+          // "file" loader makes sure those assets get served by WebpackDevServer.
+          // When you `import` an asset, you get its (virtual) filename.
+          // In production, they would get copied to the `build` folder.
+          // This loader don't uses a "test" so it will catch all modules
+          // that fall through the other loaders.
+          {
+            // Exclude `js` files to keep "css" loader working as it injects
+            // it's runtime that would otherwise processed through "file" loader.
+            // Also exclude `html` and `json` extensions so they get processed
+            // by webpacks internal loaders.
+            exclude: [/\.js$/, /\.html$/, /\.json$/],
+            loader: require.resolve('file-loader'),
+            options: {
+              name: 'static/media/[name].[hash:8].[ext]',
             },
           },
         ],
       },
       // ** STOP ** Are you adding a new loader?
-      // Remember to add the new extension(s) to the "file" loader exclusion list.
+      // Make sure to add the new loader(s) before the "file" loader.
     ],
   },
   plugins: [
diff --git a/packages/react-scripts/config/webpack.config.prod.js b/packages/react-scripts/config/webpack.config.prod.js
index 0141675de10..55319743e0a 100644
--- a/packages/react-scripts/config/webpack.config.prod.js
+++ b/packages/react-scripts/config/webpack.config.prod.js
@@ -150,103 +150,100 @@ module.exports = {
         enforce: 'pre',
         include: paths.appSrc,
       },
-      // ** ADDING/UPDATING LOADERS **
-      // The "file" loader handles all assets unless explicitly excluded.
-      // The `exclude` list *must* be updated with every change to loader extensions.
-      // When adding a new loader, you must add its `test`
-      // as a new entry in the `exclude` list in the "file" loader.
-
-      // "file" loader makes sure those assets end up in the `build` folder.
-      // When you `import` an asset, you get its filename.
-      {
-        exclude: [
-          /\.html$/,
-          /\.(js|jsx)$/,
-          /\.(ts|tsx)$/,
-          /\.css$/,
-          /\.json$/,
-          /\.bmp$/,
-          /\.gif$/,
-          /\.jpe?g$/,
-          /\.png$/,
-        ],
-        loader: require.resolve('file-loader'),
-        options: {
-          name: 'static/media/[name].[hash:8].[ext]',
-        },
-      },
-      // "url" loader works just like "file" loader but it also embeds
-      // assets smaller than specified size as data URLs to avoid requests.
-      {
-        test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
-        loader: require.resolve('url-loader'),
-        options: {
-          limit: 10000,
-          name: 'static/media/[name].[hash:8].[ext]',
-        },
-      },
-      // Compile .tsx?
-      {
-        test: /\.(ts|tsx)$/,
-        include: paths.appSrc,
-        loader: require.resolve('ts-loader'),
-      },
-      // The notation here is somewhat confusing.
-      // "postcss" loader applies autoprefixer to our CSS.
-      // "css" loader resolves paths in CSS and adds assets as dependencies.
-      // "style" loader normally turns CSS into JS modules injecting <style>,
-      // but unlike in development configuration, we do something different.
-      // `ExtractTextPlugin` first applies the "postcss" and "css" loaders
-      // (second argument), then grabs the result CSS and puts it into a
-      // separate file in our build process. This way we actually ship
-      // a single CSS file in production instead of JS code injecting <style>
-      // tags. If you use code splitting, however, any async bundles will still
-      // use the "style" loader inside the async code so CSS from them won't be
-      // in the main CSS file.
       {
-        test: /\.css$/,
-        loader: ExtractTextPlugin.extract(
-          Object.assign(
-            {
-              fallback: require.resolve('style-loader'),
-              use: [
-                {
-                  loader: require.resolve('css-loader'),
-                  options: {
-                    importLoaders: 1,
-                    minimize: true,
-                    sourceMap: true,
-                  },
-                },
+        // "oneOf" will traverse all following loaders until one will
+        // match the requirements. When no loader matches it will fall
+        // back to the "file" loader at the end of the loader list.
+        oneOf: [
+          // "url" loader works just like "file" loader but it also embeds
+          // assets smaller than specified size as data URLs to avoid requests.
+          {
+            test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
+            loader: require.resolve('url-loader'),
+            options: {
+              limit: 10000,
+              name: 'static/media/[name].[hash:8].[ext]',
+            },
+          },
+          //Compile .tsx?
+          {
+            test: /\.(ts|tsx)$/,
+            include: paths.appSrc,
+            loader: require.resolve('ts-loader')
+          },
+          // The notation here is somewhat confusing.
+          // "postcss" loader applies autoprefixer to our CSS.
+          // "css" loader resolves paths in CSS and adds assets as dependencies.
+          // "style" loader normally turns CSS into JS modules injecting <style>,
+          // but unlike in development configuration, we do something different.
+          // `ExtractTextPlugin` first applies the "postcss" and "css" loaders
+          // (second argument), then grabs the result CSS and puts it into a
+          // separate file in our build process. This way we actually ship
+          // a single CSS file in production instead of JS code injecting <style>
+          // tags. If you use code splitting, however, any async bundles will still
+          // use the "style" loader inside the async code so CSS from them won't be
+          // in the main CSS file.
+          {
+            test: /\.css$/,
+            loader: ExtractTextPlugin.extract(
+              Object.assign(
                 {
-                  loader: require.resolve('postcss-loader'),
-                  options: {
-                    // Necessary for external CSS imports to work
-                    // https://github.com/facebookincubator/create-react-app/issues/2677
-                    ident: 'postcss',
-                    plugins: () => [
-                      require('postcss-flexbugs-fixes'),
-                      autoprefixer({
-                        browsers: [
-                          '>1%',
-                          'last 4 versions',
-                          'Firefox ESR',
-                          'not ie < 9', // React doesn't support IE8 anyway
+                  fallback: require.resolve('style-loader'),
+                  use: [
+                    {
+                      loader: require.resolve('css-loader'),
+                      options: {
+                        importLoaders: 1,
+                        minimize: true,
+                        sourceMap: true,
+                      },
+                    },
+                    {
+                      loader: require.resolve('postcss-loader'),
+                      options: {
+                        // Necessary for external CSS imports to work
+                        // https://github.com/facebookincubator/create-react-app/issues/2677
+                        ident: 'postcss',
+                        plugins: () => [
+                          require('postcss-flexbugs-fixes'),
+                          autoprefixer({
+                            browsers: [
+                              '>1%',
+                              'last 4 versions',
+                              'Firefox ESR',
+                              'not ie < 9', // React doesn't support IE8 anyway
+                            ],
+                            flexbox: 'no-2009',
+                          }),
                         ],
-                        flexbox: 'no-2009',
-                      }),
-                    ],
-                  },
+                      },
+                    },
+                  ],
                 },
-              ],
+                extractTextPluginOptions
+              )
+            ),
+            // Note: this won't work without `new ExtractTextPlugin()` in `plugins`.
+          },
+          // "file" loader makes sure assets end up in the `build` folder.
+          // When you `import` an asset, you get its filename.
+          // This loader don't uses a "test" so it will catch all modules
+          // that fall through the other loaders.
+          {
+            loader: require.resolve('file-loader'),
+            // Exclude `js` files to keep "css" loader working as it injects
+            // it's runtime that would otherwise processed through "file" loader.
+            // Also exclude `html` and `json` extensions so they get processed
+            // by webpacks internal loaders.
+            exclude: [/\.js$/, /\.html$/, /\.json$/],
+            options: {
+              name: 'static/media/[name].[hash:8].[ext]',
             },
-            extractTextPluginOptions
-          )
-        ),
-        // Note: this won't work without `new ExtractTextPlugin()` in `plugins`.
+          },
+          // ** STOP ** Are you adding a new loader?
+          // Make sure to add the new loader(s) before the "file" loader.
+        ],
       },
-      // ** STOP ** Are you adding a new loader?
-      // Remember to add the new extension(s) to the "file" loader exclusion list.
     ],
   },
   plugins: [

From 772a447247a1329f2e56ada401bf7c84ab31302a Mon Sep 17 00:00:00 2001
From: Dan Ristea <danraduristea@gmail.com>
Date: Sun, 9 Jul 2017 22:15:43 +0100
Subject: [PATCH 10/61] Autodetect JetBrains IDEs (#2754)

Autodetect PyCharm (Pro and CE), WebStorm, PhpStorm, IntelliJ IDEA, RubyMine, CLion, and AppCode

Added IntelliJ IDEA, RubyMine, CLion, and AppCode to list of IDEs. It has the same signature as WebStorm and PhpStorm `<editor> <projectPath> --line <number> <filePath>` so it can reuse the logic from those.

Removed older integrations of AppCode, IntelliJ IDEA

https://www.jetbrains.com/help/idea/opening-files-from-command-line.html
https://www.jetbrains.com/help/pycharm/opening-files-from-command-line.html
https://www.jetbrains.com/help/phpstorm/opening-files-from-command-line.html
https://www.jetbrains.com/help/ruby/opening-files-from-command-line.html
https://www.jetbrains.com/help/webstorm/opening-files-from-command-line.html

Tested with Appcode 2017.1.3, CLion 2017.1.3, Intellij Idea 2017.1.5, PhpStorm 2017.1.4, PyCharm (Pro and CE) 2017.1.4, RubyMine 2017.1.5, and WebStorm 2017.1.4 on MacOS 10.12
Tested with 64-bit CLion 2017.1.3, Intellij Idea 2017.1.5, PhpStorm 2017.1.4, PyCharm (Pro and CE) 2017.1.4, RubyMine 2017.1.5, and WebStorm 2017.1.4 on a Windows 10 VM

Relates to #2636
---
 packages/react-dev-utils/launchEditor.js | 41 +++++++++++++++++++++---
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/packages/react-dev-utils/launchEditor.js b/packages/react-dev-utils/launchEditor.js
index bc1bd4d6e9d..e1ea29c8869 100644
--- a/packages/react-dev-utils/launchEditor.js
+++ b/packages/react-dev-utils/launchEditor.js
@@ -38,6 +38,22 @@ const COMMON_EDITORS_OSX = {
   '/Applications/Sublime Text 2.app/Contents/MacOS/Sublime Text 2':
     '/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl',
   '/Applications/Visual Studio Code.app/Contents/MacOS/Electron': 'code',
+  '/Applications/AppCode.app/Contents/MacOS/appcode':
+    '/Applications/AppCode.app/Contents/MacOS/appcode',
+  '/Applications/CLion.app/Contents/MacOS/clion':
+    '/Applications/CLion.app/Contents/MacOS/clion',
+  '/Applications/IntelliJ IDEA.app/Contents/MacOS/idea':
+      '/Applications/IntelliJ IDEA.app/Contents/MacOS/idea',
+  '/Applications/PhpStorm.app/Contents/MacOS/phpstorm':
+    '/Applications/PhpStorm.app/Contents/MacOS/phpstorm',
+  '/Applications/PyCharm.app/Contents/MacOS/pycharm':
+    '/Applications/PyCharm.app/Contents/MacOS/pycharm',
+  '/Applications/PyCharm CE.app/Contents/MacOS/pycharm':
+    '/Applications/PyCharm CE.app/Contents/MacOS/pycharm',
+  '/Applications/RubyMine.app/Contents/MacOS/rubymine':
+    '/Applications/RubyMine.app/Contents/MacOS/rubymine',
+  '/Applications/WebStorm.app/Contents/MacOS/webstorm':
+      '/Applications/WebStorm.app/Contents/MacOS/webstorm',
 };
 
 const COMMON_EDITORS_WIN = [
@@ -46,6 +62,18 @@ const COMMON_EDITORS_WIN = [
   'atom.exe',
   'sublime_text.exe',
   'notepad++.exe',
+  'clion.exe',
+  'clion64.exe',
+  'idea.exe',
+  'idea64.exe',
+  'phpstorm.exe',
+  'phpstorm64.exe',
+  'pycharm.exe',
+  'pycharm64.exe',
+  'rubymine.exe',
+  'rubymine64.exe',
+  'webstorm.exe',
+  'webstorm64.exe',
 ];
 
 function addWorkspaceToArgumentsIfExists(args, workspace) {
@@ -65,9 +93,7 @@ function getArgumentsForLineNumber(editor, fileName, lineNumber, workspace) {
     case 'sublime':
     case 'sublime_text':
     case 'wstorm':
-    case 'appcode':
     case 'charm':
-    case 'idea':
       return [fileName + ':' + lineNumber];
     case 'notepad++':
       return ['-n' + lineNumber, fileName];
@@ -87,12 +113,19 @@ function getArgumentsForLineNumber(editor, fileName, lineNumber, workspace) {
         ['-g', fileName + ':' + lineNumber],
         workspace
       );
-    case 'webstorm':
-    case 'webstorm64':
+    case 'appcode':
+    case 'clion':
+    case 'clion64':
+    case 'idea':
+    case 'idea64':
     case 'phpstorm':
     case 'phpstorm64':
     case 'pycharm':
     case 'pycharm64':
+    case 'rubymine':
+    case 'rubymine64':
+    case 'webstorm':
+    case 'webstorm64':
       return addWorkspaceToArgumentsIfExists(
         ['--line', lineNumber, fileName],
         workspace

From 5eb7c7359ad25e6dbf1d89c0a85b2a73712730ae Mon Sep 17 00:00:00 2001
From: Owen Flood <owenhflood@gmail.com>
Date: Mon, 10 Jul 2017 16:43:17 -0700
Subject: [PATCH 11/61] Don't prompt to install serve if already installed
 (#2761)

* dont prompt if serve is already installed

* change name for readability

* Pin the version
---
 packages/react-dev-utils/package.json                |  1 +
 packages/react-dev-utils/printHostingInstructions.js | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json
index b4539788d26..e09e990d0b7 100644
--- a/packages/react-dev-utils/package.json
+++ b/packages/react-dev-utils/package.json
@@ -41,6 +41,7 @@
     "detect-port-alt": "1.1.3",
     "escape-string-regexp": "1.0.5",
     "filesize": "3.3.0",
+    "global-modules": "1.0.0",
     "gzip-size": "3.0.0",
     "html-entities": "1.2.1",
     "inquirer": "3.1.1",
diff --git a/packages/react-dev-utils/printHostingInstructions.js b/packages/react-dev-utils/printHostingInstructions.js
index f9882d44a7c..2ef25767aa2 100644
--- a/packages/react-dev-utils/printHostingInstructions.js
+++ b/packages/react-dev-utils/printHostingInstructions.js
@@ -11,6 +11,8 @@
 
 const chalk = require('chalk');
 const url = require('url');
+const globalModules = require('global-modules');
+const fs = require('fs');
 
 function printHostingInstructions(
   appPackage,
@@ -121,10 +123,12 @@ function printHostingInstructions(
     );
     console.log('You may serve it with a static server:');
     console.log();
-    if (useYarn) {
-      console.log(`  ${chalk.cyan('yarn')} global add serve`);
-    } else {
-      console.log(`  ${chalk.cyan('npm')} install -g serve`);
+    if (!fs.existsSync(`${globalModules}/serve`)) {
+      if (useYarn) {
+        console.log(`  ${chalk.cyan('yarn')} global add serve`);
+      } else {
+        console.log(`  ${chalk.cyan('npm')} install -g serve`);
+      }
     }
     console.log(`  ${chalk.cyan('serve')} -s ${buildFolder}`);
     console.log();

From 494d96fdbe9f332f497c8a13ea1604a1676794c1 Mon Sep 17 00:00:00 2001
From: Ade Viankakrisna Fadlil <viankakrisna@gmail.com>
Date: Thu, 13 Jul 2017 02:49:43 +0700
Subject: [PATCH 12/61] Docs for react-router v4 basename feature (#2668)

* Docs for react-router v4 basename feature

Fix https://github.com/facebookincubator/create-react-app/issues/2593

* Update README.md

* Update README.md

* Update README.md

* Update README.md
---
 packages/react-scripts/template/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
index 6df4d43d7f6..0783e878eea 100644
--- a/packages/react-scripts/template/README.md
+++ b/packages/react-scripts/template/README.md
@@ -1776,6 +1776,15 @@ To override this, specify the `homepage` in your `package.json`, for example:
 
 This will let Create React App correctly infer the root path to use in the generated HTML file.
 
+**Note**: If you are using `react-router@^4`, you can root `<Link>`s using the `basename` prop on any `<Router>`.<br>
+More information [here](https://reacttraining.com/react-router/web/api/BrowserRouter/basename-string).<br>
+<br>
+For example:
+```js
+<BrowserRouter basename="/calendar"/>
+<Link to="/today"/> // renders <a href="/calendar/today">
+```
+
 #### Serving the Same Build from Different Paths
 
 >Note: this feature is available with `react-scripts@0.9.0` and higher.

From c3f4b7ca0682cc2b69adbfcc55a99b001f97079b Mon Sep 17 00:00:00 2001
From: zeel <kshah215@gmail.com>
Date: Thu, 13 Jul 2017 20:58:12 +0530
Subject: [PATCH 13/61] Moved npm run build before npm test (#2725)

Closes #2713
---
 packages/react-scripts/template/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
index 0783e878eea..82642ca3a8e 100644
--- a/packages/react-scripts/template/README.md
+++ b/packages/react-scripts/template/README.md
@@ -1379,8 +1379,8 @@ cache:
   directories:
     - node_modules
 script:
-  - npm test
   - npm run build
+  - npm test
 ```
 1. Trigger your first build with a git push.
 1. [Customize your Travis CI Build](https://docs.travis-ci.com/user/customizing-the-build/) if needed.

From 777e70ad7369e24526383a1f79b834807f7b6270 Mon Sep 17 00:00:00 2001
From: Owen Flood <owenhflood@gmail.com>
Date: Thu, 13 Jul 2017 20:19:44 -0700
Subject: [PATCH 14/61] List conflicting files when initializing app (#2785)

* change error wording and list conflicting files when initializing app

* update code

* Update createReactApp.js
---
 packages/create-react-app/createReactApp.js | 31 ++++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js
index 4509b49788d..07b083a5f62 100755
--- a/packages/create-react-app/createReactApp.js
+++ b/packages/create-react-app/createReactApp.js
@@ -143,11 +143,7 @@ function createApp(name, verbose, version, template) {
 
   checkAppName(appName);
   fs.ensureDirSync(name);
-  if (!isSafeToCreateProjectIn(root)) {
-    console.log(
-      `The directory ${chalk.green(name)} contains files that could conflict.`
-    );
-    console.log('Try using a new directory name.');
+  if (!isSafeToCreateProjectIn(root, name)) {
     process.exit(1);
   }
 
@@ -571,7 +567,7 @@ function setCaretRangeForRuntimeDeps(packageName) {
 // If project only contains files generated by GH, it’s safe.
 // We also special case IJ-based products .idea because it integrates with CRA:
 // https://github.com/facebookincubator/create-react-app/pull/368#issuecomment-243446094
-function isSafeToCreateProjectIn(root) {
+function isSafeToCreateProjectIn(root, name) {
   const validFiles = [
     '.DS_Store',
     'Thumbs.db',
@@ -585,7 +581,28 @@ function isSafeToCreateProjectIn(root) {
     '.hgignore',
     '.hgcheck',
   ];
-  return fs.readdirSync(root).every(file => validFiles.indexOf(file) >= 0);
+  console.log();
+
+  const conflicts = fs
+    .readdirSync(root)
+    .filter(file => !validFiles.includes(file));
+  if (conflicts.length < 1) {
+    return true;
+  }
+
+  console.log(
+    `The directory ${chalk.green(name)} contains files that could conflict:`
+  );
+  console.log();
+  for (const file of conflicts) {
+    console.log(`  ${file}`);
+  }
+  console.log();
+  console.log(
+    'Either try using a new directory name, or remove the files listed above.'
+  );
+
+  return false;
 }
 
 function checkIfOnline(useYarn) {

From 834515f1cb27de01f54f9cefa6ec722bae5d6fde Mon Sep 17 00:00:00 2001
From: Christian Bundy <christianbundy@fraction.io>
Date: Mon, 17 Jul 2017 23:16:38 -0700
Subject: [PATCH 15/61] Upgrade webpack-dev-server (#2806)

---
 packages/react-scripts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index a92c17fb5d2..0a6d41bce12 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -48,7 +48,7 @@
     "sw-precache-webpack-plugin": "0.11.3",
     "url-loader": "0.5.9",
     "webpack": "2.6.1",
-    "webpack-dev-server": "2.5.0",
+    "webpack-dev-server": "2.5.1",
     "webpack-manifest-plugin": "1.1.0",
     "whatwg-fetch": "2.0.3"
   },

From 64e586941288f5245db491cfbf1be8ba410eb650 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 19 Jul 2017 18:19:18 +0100
Subject: [PATCH 16/61] Add explicit "Opting Out of Caching" header (#2822)

---
 packages/react-scripts/template/README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
index 82642ca3a8e..55960e2b905 100644
--- a/packages/react-scripts/template/README.md
+++ b/packages/react-scripts/template/README.md
@@ -68,6 +68,7 @@ You can find the most recent version of this guide [here](https://github.com/fac
   - [Getting Started with Storybook](#getting-started-with-storybook)
   - [Getting Started with Styleguidist](#getting-started-with-styleguidist)
 - [Making a Progressive Web App](#making-a-progressive-web-app)
+  - [Opting Out of Caching](#opting-out-of-caching)
   - [Offline-First Considerations](#offline-first-considerations)
   - [Progressive Web App Metadata](#progressive-web-app-metadata)
 - [Analyzing the Bundle Size](#analyzing-the-bundle-size)
@@ -1562,6 +1563,8 @@ The service worker will use a [cache-first strategy](https://developers.google.c
 for handling all requests for local assets, including the initial HTML, ensuring
 that your web app is reliably fast, even on a slow or unreliable network.
 
+### Opting Out of Caching
+
 If you would prefer not to enable service workers prior to your initial
 production deployment, then remove the call to `serviceWorkerRegistration.register()`
 from [`src/index.js`](src/index.js).
@@ -1571,7 +1574,8 @@ have decided that you would like to disable them for all your existing users,
 you can swap out the call to `serviceWorkerRegistration.register()` in
 [`src/index.js`](src/index.js) with a call to `serviceWorkerRegistration.unregister()`.
 After the user visits a page that has `serviceWorkerRegistration.unregister()`,
-the service worker will be uninstalled.
+the service worker will be uninstalled. Note that depending on how `/service-worker.js` is served,
+it make take up to 24 hours for the cache to be invalidated.
 
 ### Offline-First Considerations
 

From c93e63090ae43819ae6d54f5b9519af348640a99 Mon Sep 17 00:00:00 2001
From: themre <mtrebizan@gmail.com>
Date: Tue, 25 Jul 2017 21:28:45 +0200
Subject: [PATCH 17/61] Feature/webpack3 (#2574)

* Add source-map-loader to support source maps of dependencies

* merge with latest develop

* add ModuleConcatenationPlugin

* revert source-map-loader

* bump to 3.1 and update dev-server

* rebase to master

* rebase again

* bump webpack

* remove ModuleConcatenationPlugin, downgraded react packages, bump etwp

* ETWP rc1 only for testing

* bump ETWP and webpack 3

* bump WP3

* revert to 3.2.0

* bump sw-precache-webpack-plugin

* bump back to 3.3.0

* bump dev-server and manifest
---
 packages/react-scripts/package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index 0a6d41bce12..b4b4d4839a4 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -26,7 +26,7 @@
     "chalk": "1.1.3",
     "css-loader": "0.28.4",
     "dotenv": "4.0.0",
-    "extract-text-webpack-plugin": "2.1.2",
+    "extract-text-webpack-plugin": "3.0.0",
     "file-loader": "0.11.2",
     "fs-extra": "3.0.1",
     "html-webpack-plugin": "2.29.0",
@@ -34,7 +34,7 @@
     "object-assign": "4.1.1",
     "postcss-flexbugs-fixes": "3.0.0",
     "postcss-loader": "2.0.6",
-    "promise": "7.1.1",
+    "promise": "8.0.1",
     "react-dev-utils": "^3.0.2",
     "react-error-overlay": "^1.0.9",
     "style-loader": "0.18.2",
@@ -45,11 +45,11 @@
     "tslint-react": "^3.0.0",
     "typescript": "~2.4.0",
     "source-map-loader": "^0.2.1",
-    "sw-precache-webpack-plugin": "0.11.3",
+    "sw-precache-webpack-plugin": "0.11.4",
     "url-loader": "0.5.9",
-    "webpack": "2.6.1",
-    "webpack-dev-server": "2.5.1",
-    "webpack-manifest-plugin": "1.1.0",
+    "webpack": "3.3.0",
+    "webpack-dev-server": "2.6.1",
+    "webpack-manifest-plugin": "1.2.1",
     "whatwg-fetch": "2.0.3"
   },
   "devDependencies": {

From 27f1256559ebe945965678bca508b5d4fa30e3da Mon Sep 17 00:00:00 2001
From: themre <mtrebizan@gmail.com>
Date: Wed, 26 Jul 2017 10:58:42 +0200
Subject: [PATCH 18/61] Bump Webpack 3.4 (#2850)

* bump wp3

* try bump babel-loader
---
 packages/react-scripts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index b4b4d4839a4..de7bd640db2 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -47,7 +47,7 @@
     "source-map-loader": "^0.2.1",
     "sw-precache-webpack-plugin": "0.11.4",
     "url-loader": "0.5.9",
-    "webpack": "3.3.0",
+    "webpack": "3.4.0",
     "webpack-dev-server": "2.6.1",
     "webpack-manifest-plugin": "1.2.1",
     "whatwg-fetch": "2.0.3"

From 8dad81d89cbe51549ef2eb3d6101b8e7520eec78 Mon Sep 17 00:00:00 2001
From: Wiley Bennett <wileybenet@users.noreply.github.com>
Date: Tue, 1 Aug 2017 17:10:55 -0700
Subject: [PATCH 19/61] Allow use of scoped packages with a pinned version
 (#2853)

Fixes #2883
---
 packages/create-react-app/createReactApp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js
index 07b083a5f62..6fd6c75aca3 100755
--- a/packages/create-react-app/createReactApp.js
+++ b/packages/create-react-app/createReactApp.js
@@ -441,7 +441,7 @@ function getPackageName(installPackage) {
     // git+https://github.com/mycompany/react-scripts.git
     // git+ssh://github.com/mycompany/react-scripts.git#v1.2.3
     return Promise.resolve(installPackage.match(/([^\/]+)\.git(#.*)?$/)[1]);
-  } else if (installPackage.indexOf('@') > 0) {
+  } else if (installPackage.match(/.+@/)) {
     // Do not match @scope/ when stripping off @version or @tag
     return Promise.resolve(
       installPackage.charAt(0) + installPackage.substr(1).split('@')[0]

From 3cd47472abab7f0c8b8009d4537b3339c6ea8e25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kiho=20=C2=B7=20Cham?= <monkindey@163.com>
Date: Wed, 2 Aug 2017 09:04:25 +0800
Subject: [PATCH 20/61] Use modern syntax feature (#2873)

The create-react-app need node >= 6, and node version 6 support a lot of ES6, and let's switch using '+' to concat string with template string.
---
 packages/react-scripts/bin/react-scripts-ts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/bin/react-scripts-ts.js b/packages/react-scripts/bin/react-scripts-ts.js
index 9738aef2832..16aa7bad339 100755
--- a/packages/react-scripts/bin/react-scripts-ts.js
+++ b/packages/react-scripts/bin/react-scripts-ts.js
@@ -21,7 +21,7 @@ switch (script) {
   case 'test': {
     const result = spawn.sync(
       'node',
-      [require.resolve('../scripts/' + script)].concat(args),
+      [require.resolve(`../scripts/${script}`)].concat(args),
       { stdio: 'inherit' }
     );
     if (result.signal) {

From a6cd6f30cbcd452bb17b16961ba2e91a3c1a553e Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Wed, 2 Aug 2017 02:19:40 +0100
Subject: [PATCH 21/61] Update webpack version note (#2798)

* Remove note about webpackHotDevClient being webpack 1.0 only

It must work in webpack 2 since create-react-app is still using it and is using webpack 2 now.

It would be great if you could add some kind of note about how it differs from the default webpack hot reloaders.

* Update README.md

* Update README.md
---
 packages/react-dev-utils/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-dev-utils/README.md b/packages/react-dev-utils/README.md
index 166e1bfaea3..54033874734 100644
--- a/packages/react-dev-utils/README.md
+++ b/packages/react-dev-utils/README.md
@@ -295,7 +295,7 @@ Returns an object with local and remote URLs for the development server. Pass th
 
 This is an alternative client for [WebpackDevServer](https://github.com/webpack/webpack-dev-server) that shows a syntax error overlay.
 
-It currently supports only Webpack 1.x.
+It currently supports only Webpack 3.x.
 
 ```js
 // Webpack development config

From 2c988b9282b8ebab98f5d91fcf7d56a9dd64ab5f Mon Sep 17 00:00:00 2001
From: 864907600cc <h@ccloli.com>
Date: Wed, 2 Aug 2017 09:21:07 +0800
Subject: [PATCH 22/61] Fix parsing HTML/JSX tags to real elements (#2796)

* Fix parsing HTML/JSX tags to real elements

* Use `html-entities` to escape instead of pure `replace()`

* Remove unnecessary HTML entity replacing
---
 packages/react-dev-utils/ansiHTML.js            | 4 +++-
 packages/react-dev-utils/webpackHotDevClient.js | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/react-dev-utils/ansiHTML.js b/packages/react-dev-utils/ansiHTML.js
index 9f53cea67a3..90bf70374ee 100644
--- a/packages/react-dev-utils/ansiHTML.js
+++ b/packages/react-dev-utils/ansiHTML.js
@@ -10,6 +10,8 @@
 'use strict';
 
 var Anser = require('anser');
+var Entities = require('html-entities').AllHtmlEntities;
+var entities = new Entities();
 
 // Color scheme inspired by https://chriskempson.github.io/base16/css/base16-github.css
 // var base00 = 'ffffff'; // Default Background
@@ -61,7 +63,7 @@ var anserMap = {
 };
 
 function ansiHTML(txt) {
-  var arr = new Anser().ansiToJson(txt, {
+  var arr = new Anser().ansiToJson(entities.encode(txt), {
     use_classes: true,
   });
 
diff --git a/packages/react-dev-utils/webpackHotDevClient.js b/packages/react-dev-utils/webpackHotDevClient.js
index 78002b28efb..f2f206a5cd2 100644
--- a/packages/react-dev-utils/webpackHotDevClient.js
+++ b/packages/react-dev-utils/webpackHotDevClient.js
@@ -22,9 +22,7 @@ var SockJS = require('sockjs-client');
 var stripAnsi = require('strip-ansi');
 var url = require('url');
 var formatWebpackMessages = require('./formatWebpackMessages');
-var Entities = require('html-entities').AllHtmlEntities;
 var ansiHTML = require('./ansiHTML');
-var entities = new Entities();
 
 function createOverlayIframe(onIframeLoad) {
   var iframe = document.createElement('iframe');
@@ -138,7 +136,7 @@ function showErrorOverlay(message) {
       'margin-bottom: 0.5em; overflow-x: auto; white-space: pre-wrap; ' +
       'border-radius: 0.25rem; background-color: rgba(206, 17, 38, 0.05)">' +
       '<code style="font-family: Consolas, Menlo, monospace;">' +
-      ansiHTML(entities.encode(message)) +
+      ansiHTML(message) +
       '</code></pre>' +
       '<div style="' +
       'font-family: sans-serif; color: rgb(135, 142, 145); margin-top: 0.5rem; ' +

From 791df185e9ae45e229be8e8154b1f5325aca878b Mon Sep 17 00:00:00 2001
From: Joe Haddad <timer150@gmail.com>
Date: Tue, 1 Aug 2017 21:47:01 -0400
Subject: [PATCH 23/61] Update README.md

---
 packages/react-scripts/template/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
index 55960e2b905..a4fcd82b61a 100644
--- a/packages/react-scripts/template/README.md
+++ b/packages/react-scripts/template/README.md
@@ -2056,6 +2056,7 @@ HTTPS | :white_check_mark: | :x: | When set to `true`, Create React App will run
 PUBLIC_URL | :x: | :white_check_mark: | Create React App assumes your application is hosted at the serving web server's root or a subpath as specified in [`package.json` (`homepage`)](#building-for-relative-paths). Normally, Create React App ignores the hostname. You may use this variable to force assets to be referenced verbatim to the url you provide (hostname included). This may be particularly useful when using a CDN to host your application.
 CI | :large_orange_diamond: | :white_check_mark: | When set to `true`, Create React App treats warnings as failures in the build. It also makes the test runner non-watching. Most CIs set this flag by default.
 REACT_EDITOR | :white_check_mark: | :x: | When an app crashes in development, you will see an error overlay with clickable stack trace. When you click on it, Create React App will try to determine the editor you are using based on currently running processes, and open the relevant source file. You can [send a pull request to detect your editor of choice](https://github.com/facebookincubator/create-react-app/issues/2636). Setting this environment variable overrides the automatic detection. If you do it, make sure your systems [PATH](https://en.wikipedia.org/wiki/PATH_(variable)) environment variable points to your editor’s bin folder.
+CHOKIDAR_USEPOLLING | :white_check_mark: | :x: | Switches the watcher into polling mode, as necessary inside a VM. Use this option if `npm start` isn't detecting changes.
 
 ## Troubleshooting
 

From de34cf6501ecfc50e888c7559dbee221f2807e3b Mon Sep 17 00:00:00 2001
From: Joe Haddad <timer150@gmail.com>
Date: Tue, 1 Aug 2017 21:49:01 -0400
Subject: [PATCH 24/61] Update README.md

---
 packages/react-scripts/template/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
index a4fcd82b61a..cba7691f589 100644
--- a/packages/react-scripts/template/README.md
+++ b/packages/react-scripts/template/README.md
@@ -2056,7 +2056,7 @@ HTTPS | :white_check_mark: | :x: | When set to `true`, Create React App will run
 PUBLIC_URL | :x: | :white_check_mark: | Create React App assumes your application is hosted at the serving web server's root or a subpath as specified in [`package.json` (`homepage`)](#building-for-relative-paths). Normally, Create React App ignores the hostname. You may use this variable to force assets to be referenced verbatim to the url you provide (hostname included). This may be particularly useful when using a CDN to host your application.
 CI | :large_orange_diamond: | :white_check_mark: | When set to `true`, Create React App treats warnings as failures in the build. It also makes the test runner non-watching. Most CIs set this flag by default.
 REACT_EDITOR | :white_check_mark: | :x: | When an app crashes in development, you will see an error overlay with clickable stack trace. When you click on it, Create React App will try to determine the editor you are using based on currently running processes, and open the relevant source file. You can [send a pull request to detect your editor of choice](https://github.com/facebookincubator/create-react-app/issues/2636). Setting this environment variable overrides the automatic detection. If you do it, make sure your systems [PATH](https://en.wikipedia.org/wiki/PATH_(variable)) environment variable points to your editor’s bin folder.
-CHOKIDAR_USEPOLLING | :white_check_mark: | :x: | Switches the watcher into polling mode, as necessary inside a VM. Use this option if `npm start` isn't detecting changes.
+CHOKIDAR_USEPOLLING | :white_check_mark: | :x: | When set to `true`, the watcher runs in polling mode, as necessary inside a VM. Use this option if `npm start` isn't detecting changes.
 
 ## Troubleshooting
 

From adb4c6d1cdf6e57b40b7e7d38c6b7a085b241360 Mon Sep 17 00:00:00 2001
From: Jon Crenshaw <jdcrensh@gmail.com>
Date: Tue, 1 Aug 2017 18:52:26 -0700
Subject: [PATCH 25/61] Unstage yarn.lock pre-commit (#2700)

Since yarn.lock shouldn't be added to the repo, nor excluded via
.gitignore, lets take advantage of lint-staged to remove any staged
yarn.lock files before they can even be committed.
---
 package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package.json b/package.json
index ab4de27c66d..730126aa6ce 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,9 @@
     "*.js": [
       "prettier --trailing-comma es5 --single-quote --write",
       "git add"
+    ],
+    "yarn.lock": [
+      "git rm --cached"
     ]
   }
 }

From e08b789c2e798ab53f572277ea12cf7a0ea7b861 Mon Sep 17 00:00:00 2001
From: Ade Viankakrisna Fadlil <viankakrisna@gmail.com>
Date: Wed, 2 Aug 2017 08:57:50 +0700
Subject: [PATCH 26/61] Format UglifyJs error (#2650)

* format UglifyJs error

* move formatBuildError to react-dev-utils

* fix readme

* use regex for plucking the path from stack

* make path human readable and fallback to show error if regex not matched

* rename to printBuildError and add link to the docs

* fix link indentation

* improve readibility + shorten link
---
 packages/react-dev-utils/README.md          | 14 ++++++
 packages/react-dev-utils/package.json       |  3 +-
 packages/react-dev-utils/printBuildError.js | 50 +++++++++++++++++++++
 packages/react-scripts/scripts/build.js     |  3 +-
 packages/react-scripts/template/README.md   | 11 +++++
 5 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 packages/react-dev-utils/printBuildError.js

diff --git a/packages/react-dev-utils/README.md b/packages/react-dev-utils/README.md
index 54033874734..9206f3e8c9f 100644
--- a/packages/react-dev-utils/README.md
+++ b/packages/react-dev-utils/README.md
@@ -220,6 +220,20 @@ compiler.plugin('done', function(stats) {
 });
 ```
 
+#### `printBuildError(error: Object): void`
+
+Prettify some known build errors.
+Pass an Error object to log a prettified error message in the console.
+
+```
+  const printBuildError = require('react-dev-utils/printBuildError')
+  try {
+    build()
+  } catch(e) {
+    printBuildError(e) // logs prettified message
+  }
+```
+
 #### `getProcessForPort(port: number): string`
 
 Finds the currently running process on `port`.
diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json
index e09e990d0b7..77d5156090c 100644
--- a/packages/react-dev-utils/package.json
+++ b/packages/react-dev-utils/package.json
@@ -18,13 +18,14 @@
     "crossSpawn.js",
     "eslintFormatter.js",
     "FileSizeReporter.js",
+    "printBuildError.js",
     "formatWebpackMessages.js",
     "getProcessForPort.js",
     "inquirer.js",
     "InterpolateHtmlPlugin.js",
     "launchEditor.js",
-    "noopServiceWorkerMiddleware.js",
     "ModuleScopePlugin.js",
+    "noopServiceWorkerMiddleware.js",
     "openBrowser.js",
     "openChrome.applescript",
     "printHostingInstructions.js",
diff --git a/packages/react-dev-utils/printBuildError.js b/packages/react-dev-utils/printBuildError.js
new file mode 100644
index 00000000000..5efbaa97d43
--- /dev/null
+++ b/packages/react-dev-utils/printBuildError.js
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+'use strict';
+
+const get = require('lodash/get');
+const chalk = require('chalk');
+
+module.exports = function printBuildError(err) {
+  const message = get(err, 'message');
+  const stack = get(err, 'stack');
+
+  // Add more helpful message for UglifyJs error
+  if (
+    stack &&
+    typeof message === 'string' &&
+    message.indexOf('from UglifyJs') !== -1
+  ) {
+    try {
+      const matched = /Unexpected token:(.+)\[(.+)\:(.+)\,(.+)\]\[.+\]/.exec(
+        stack
+      );
+      if (!matched) {
+        throw new Error(
+          "The regex pattern is not matched. Maybe UglifyJs changed it's message?"
+        );
+      }
+      const problemPath = matched[2];
+      const line = matched[3];
+      const column = matched[4];
+      console.log(
+        'Failed to minify the code from this file: \n\n',
+        chalk.yellow(`${problemPath} line ${line}:${column}`),
+        '\n'
+      );
+    } catch (ignored) {
+      console.log('Failed to minify the code.', err);
+    }
+    console.log('Read more here: http://bit.ly/2tRViJ9');
+  } else {
+    console.log((message || err) + '\n');
+  }
+  console.log();
+};
diff --git a/packages/react-scripts/scripts/build.js b/packages/react-scripts/scripts/build.js
index b9b65f5313d..5ad12ab12b6 100644
--- a/packages/react-scripts/scripts/build.js
+++ b/packages/react-scripts/scripts/build.js
@@ -34,6 +34,7 @@ const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
 const formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
 const printHostingInstructions = require('react-dev-utils/printHostingInstructions');
 const FileSizeReporter = require('react-dev-utils/FileSizeReporter');
+const printBuildError = require('react-dev-utils/printBuildError');
 
 const measureFileSizesBeforeBuild =
   FileSizeReporter.measureFileSizesBeforeBuild;
@@ -104,7 +105,7 @@ measureFileSizesBeforeBuild(paths.appBuild)
     },
     err => {
       console.log(chalk.red('Failed to compile.\n'));
-      console.log((err.message || err) + '\n');
+      printBuildError(err);
       process.exit(1);
     }
   );
diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
index cba7691f589..bdfb9189d2d 100644
--- a/packages/react-scripts/template/README.md
+++ b/packages/react-scripts/template/README.md
@@ -92,6 +92,7 @@ You can find the most recent version of this guide [here](https://github.com/fac
   - [`npm test` hangs on macOS Sierra](#npm-test-hangs-on-macos-sierra)
   - [`npm run build` exits too early](#npm-run-build-exits-too-early)
   - [`npm run build` fails on Heroku](#npm-run-build-fails-on-heroku)
+  - [`npm run build` fails to minify](#npm-run-build-fails-to-minify)
   - [Moment.js locales are missing](#momentjs-locales-are-missing)
 - [Something Missing?](#something-missing)
 
@@ -2137,6 +2138,16 @@ moment.locale('fr');
 
 This will only work for locales that have been explicitly imported before.
 
+### `npm run build` fails to minify
+
+You may occasionally find a package you depend on needs compiled or ships code for a non-browser environment.<br>
+This is considered poor practice in the ecosystem and does not have an escape hatch in Create React App.<br>
+<br>
+To resolve this:
+1. Open an issue on the dependency's issue tracker and ask that the package be published pre-compiled (retaining ES6 Modules).
+2. Fork the package and publish a corrected version yourself.
+3. If the dependency is small enough, copy it to your `src/` folder and treat it as application code.
+
 ## Something Missing?
 
 If you have ideas for more “How To” recipes that should be on this page, [let us know](https://github.com/facebookincubator/create-react-app/issues) or [contribute some!](https://github.com/facebookincubator/create-react-app/edit/master/packages/react-scripts/template/README.md)

From de4615231fdbe6d3c6e9e4e94da50b81d9bde9cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20K=C3=B6=C3=B6k?= <oskarkook@maatriks.ee>
Date: Wed, 2 Aug 2017 05:35:06 +0300
Subject: [PATCH 27/61] Re-enable flowtype warning (#2718)

* Re-enable flowtype warning

* Update eslint-plugin-flowtype dependency
---
 packages/eslint-config-react-app/index.js     | 3 +--
 packages/eslint-config-react-app/package.json | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/eslint-config-react-app/index.js b/packages/eslint-config-react-app/index.js
index a8b900f940d..4e94e650c38 100644
--- a/packages/eslint-config-react-app/index.js
+++ b/packages/eslint-config-react-app/index.js
@@ -291,8 +291,7 @@ module.exports = {
 
     // https://github.com/gajus/eslint-plugin-flowtype
     'flowtype/define-flow-type': 'warn',
-    // TODO: Reenable once https://github.com/gajus/eslint-plugin-flowtype/issues/165 is fixed
-    //'flowtype/require-valid-file-annotation': 'warn',
+    'flowtype/require-valid-file-annotation': 'warn',
     'flowtype/use-flow-type': 'warn',
   },
 };
diff --git a/packages/eslint-config-react-app/package.json b/packages/eslint-config-react-app/package.json
index 559e78b256b..33395bc8604 100644
--- a/packages/eslint-config-react-app/package.json
+++ b/packages/eslint-config-react-app/package.json
@@ -13,7 +13,7 @@
   "peerDependencies": {
     "babel-eslint": "^7.2.3",
     "eslint": "^4.1.1",
-    "eslint-plugin-flowtype": "^2.33.0",
+    "eslint-plugin-flowtype": "^2.34.1",
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-jsx-a11y": "^5.0.3",
     "eslint-plugin-react": "^7.0.1"

From 9b7901241f66df60ac53edadecd8cb9b082bce79 Mon Sep 17 00:00:00 2001
From: iamdoron <iamdoron@users.noreply.github.com>
Date: Wed, 2 Aug 2017 05:50:58 +0300
Subject: [PATCH 28/61] Allow importing package.json (#2468)

* Allow importing package.json

* Remove package.json import from App.js template

* fix importing package.json

* Rename variable to reflect path is relative to root

* Check for both package & package.json in ModuleScopePlugin

* Use regex to check relative path to package.json

* Strictly enforce package.json extension on scope plugin

* Add allowedPaths to ModuleScopePlugin ctor and use it to allow app package.json

* Remove package.json import from App.js template

* Add package.json to react-scripts/template, show package version and name in the template

* Remove import package.json from template

* Remove template/package.json and its references in code

* Update ModuleScopePlugin.js

* Update README.md
---
 packages/react-dev-utils/ModuleScopePlugin.js  | 18 ++++++++++--------
 packages/react-dev-utils/README.md             |  4 ++--
 .../react-scripts/config/webpack.config.dev.js |  2 +-
 .../config/webpack.config.prod.js              |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/packages/react-dev-utils/ModuleScopePlugin.js b/packages/react-dev-utils/ModuleScopePlugin.js
index f630a0279f5..3a10904d36b 100644
--- a/packages/react-dev-utils/ModuleScopePlugin.js
+++ b/packages/react-dev-utils/ModuleScopePlugin.js
@@ -13,8 +13,9 @@ const chalk = require('chalk');
 const path = require('path');
 
 class ModuleScopePlugin {
-  constructor(appSrc) {
+  constructor(appSrc, allowedFiles = []) {
     this.appSrc = appSrc;
+    this.allowedFiles = new Set(allowedFiles);
   }
 
   apply(resolver) {
@@ -40,15 +41,16 @@ class ModuleScopePlugin {
       if (relative.startsWith('../') || relative.startsWith('..\\')) {
         return callback();
       }
-      // Find path from src to the requested file
-      const requestRelative = path.relative(
-        appSrc,
-        path.resolve(
-          path.dirname(request.context.issuer),
-          request.__innerRequest_request
-        )
+      const requestFullPath = path.resolve(
+        path.dirname(request.context.issuer),
+        request.__innerRequest_request
       );
+      if (this.allowedFiles.has(requestFullPath)) {
+        return callback();
+      }
+      // Find path from src to the requested file
       // Error if in a parent directory of src/
+      const requestRelative = path.relative(appSrc, requestFullPath);
       if (
         requestRelative.startsWith('../') ||
         requestRelative.startsWith('..\\')
diff --git a/packages/react-dev-utils/README.md b/packages/react-dev-utils/README.md
index 9206f3e8c9f..e23f0a294aa 100644
--- a/packages/react-dev-utils/README.md
+++ b/packages/react-dev-utils/README.md
@@ -57,7 +57,7 @@ module.exports = {
 ```
 
 
-#### `new ModuleScopePlugin(appSrc: string)`
+#### `new ModuleScopePlugin(appSrc: string, allowedFiles?: string[])`
 
 This Webpack plugin ensures that relative imports from app's source directory don't reach outside of it.
 
@@ -71,7 +71,7 @@ module.exports = {
   resolve: {
     // ...
     plugins: [
-      new ModuleScopePlugin(paths.appSrc),
+      new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
       // ...
     ],
     // ...
diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js
index 774201ac680..a00468b9f80 100644
--- a/packages/react-scripts/config/webpack.config.dev.js
+++ b/packages/react-scripts/config/webpack.config.dev.js
@@ -126,7 +126,7 @@ module.exports = {
       // To fix this, we prevent you from importing files out of src/ -- if you'd like to,
       // please link the files into your node_modules/ and let module-resolution kick in.
       // Make sure your source files are compiled, as they will not be processed in any way.
-      new ModuleScopePlugin(paths.appSrc),
+      new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
     ],
   },
   module: {
diff --git a/packages/react-scripts/config/webpack.config.prod.js b/packages/react-scripts/config/webpack.config.prod.js
index 55319743e0a..f50e829c86f 100644
--- a/packages/react-scripts/config/webpack.config.prod.js
+++ b/packages/react-scripts/config/webpack.config.prod.js
@@ -126,7 +126,7 @@ module.exports = {
       // To fix this, we prevent you from importing files out of src/ -- if you'd like to,
       // please link the files into your node_modules/ and let module-resolution kick in.
       // Make sure your source files are compiled, as they will not be processed in any way.
-      new ModuleScopePlugin(paths.appSrc),
+      new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
     ],
   },
   module: {

From eb3f85d2ea36d709de19107952d090b927902a77 Mon Sep 17 00:00:00 2001
From: themre <mtrebizan@gmail.com>
Date: Wed, 2 Aug 2017 11:33:13 +0200
Subject: [PATCH 29/61] Feature/webpack 3 4 (#2875)

* bump wp3

* try bump babel-loader

* bump 3.4.1
---
 packages/react-scripts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index de7bd640db2..9b5a3ddbbd2 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -47,7 +47,7 @@
     "source-map-loader": "^0.2.1",
     "sw-precache-webpack-plugin": "0.11.4",
     "url-loader": "0.5.9",
-    "webpack": "3.4.0",
+    "webpack": "3.4.1",
     "webpack-dev-server": "2.6.1",
     "webpack-manifest-plugin": "1.2.1",
     "whatwg-fetch": "2.0.3"

From dba32bedb9d9c315321b5d2838e5d0044036b945 Mon Sep 17 00:00:00 2001
From: Konstantin Tarkus <koistya@gmail.com>
Date: Wed, 9 Aug 2017 04:35:26 +0300
Subject: [PATCH 30/61] Fix the order of arguments in spawned child proc
 (#2913)

* Fix the order of arguments in spawned child proc

* Update react-scripts.js

* Remove a comma

* Update react-scripts.js
---
 packages/react-scripts/bin/react-scripts-ts.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/react-scripts/bin/react-scripts-ts.js b/packages/react-scripts/bin/react-scripts-ts.js
index 16aa7bad339..bd2a98b8ee7 100755
--- a/packages/react-scripts/bin/react-scripts-ts.js
+++ b/packages/react-scripts/bin/react-scripts-ts.js
@@ -11,8 +11,12 @@
 'use strict';
 
 const spawn = require('react-dev-utils/crossSpawn');
-const script = process.argv[2];
-const args = process.argv.slice(3);
+const args = process.argv.slice(2);
+
+const scriptIndex = args.findIndex(x =>
+   x === 'build' || x === 'eject' || x === 'start' || x === 'test');
+const script = scriptIndex === -1 ? args[0] : args[scriptIndex];
+const nodeArgs = scriptIndex > 0 ? args.slice(0, scriptIndex) : [];
 
 switch (script) {
   case 'build':
@@ -21,7 +25,9 @@ switch (script) {
   case 'test': {
     const result = spawn.sync(
       'node',
-      [require.resolve(`../scripts/${script}`)].concat(args),
+      nodeArgs
+        .concat(require.resolve('../scripts/' + script))
+        .concat(args.slice(scriptIndex + 1)),
       { stdio: 'inherit' }
     );
     if (result.signal) {

From dcdab42d066f151f7ff713a56e0b0ae2b68ae6bb Mon Sep 17 00:00:00 2001
From: Ben Sykes <ben@bensykes.com>
Date: Tue, 8 Aug 2017 18:36:32 -0700
Subject: [PATCH 31/61] Adjust the `checkIfOnline` check if in a corporate
 proxy environment (#2884)

* Adjust the `checkIfOnline` check if in a corporate proxy environment
If the environment variable `https_proxy` is set, test that the proxy name is resolveable rather than 'registry.yarnpkg.com'.
This fixes #2832.

* Adjust to check yarnpkg.com first, then check the proxy address only if that failed
---
 packages/create-react-app/createReactApp.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js
index 6fd6c75aca3..9fa0f077146 100755
--- a/packages/create-react-app/createReactApp.js
+++ b/packages/create-react-app/createReactApp.js
@@ -47,6 +47,7 @@ const semver = require('semver');
 const dns = require('dns');
 const tmp = require('tmp');
 const unpack = require('tar-pack').unpack;
+const url = require('url');
 const hyperquest = require('hyperquest');
 
 const packageJson = require('./package.json');
@@ -614,7 +615,15 @@ function checkIfOnline(useYarn) {
 
   return new Promise(resolve => {
     dns.lookup('registry.yarnpkg.com', err => {
-      resolve(err === null);
+      if (err != null && process.env.https_proxy) {
+        // If a proxy is defined, we likely can't resolve external hostnames.
+        // Try to resolve the proxy name as an indication of a connection.
+        dns.lookup(url.parse(process.env.https_proxy).hostname, proxyErr => {
+          resolve(proxyErr == null);
+        });
+      } else {
+        resolve(err == null);
+      }
     });
   });
 }

From b2593b64aa9b8d1b008644ea758f97b0acec16e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Goetz?= <onigoetz@onigoetz.ch>
Date: Wed, 9 Aug 2017 03:37:04 +0200
Subject: [PATCH 32/61] Make formatWebpackMessages return all messages (#2834)

* Move the reduction of the messages to a single place in the place it is used.

* Fix variable name
---
 packages/react-dev-utils/WebpackDevServerUtils.js | 5 +++++
 packages/react-dev-utils/formatWebpackMessages.js | 5 -----
 packages/react-scripts/scripts/build.js           | 5 +++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/react-dev-utils/WebpackDevServerUtils.js b/packages/react-dev-utils/WebpackDevServerUtils.js
index f9957aaa3fc..bb4a8c790b4 100644
--- a/packages/react-dev-utils/WebpackDevServerUtils.js
+++ b/packages/react-dev-utils/WebpackDevServerUtils.js
@@ -164,6 +164,11 @@ function createCompiler(webpack, config, appName, urls, useYarn) {
 
     // If errors exist, only show errors.
     if (messages.errors.length) {
+      // Only keep the first error. Others are often indicative
+      // of the same problem, but confuse the reader with noise.
+      if (messages.errors.length > 1) {
+        messages.errors.length = 1;
+      }
       console.log(chalk.red('Failed to compile.\n'));
       console.log(messages.errors.join('\n\n'));
       return;
diff --git a/packages/react-dev-utils/formatWebpackMessages.js b/packages/react-dev-utils/formatWebpackMessages.js
index 5dfd099c65c..a5176b92049 100644
--- a/packages/react-dev-utils/formatWebpackMessages.js
+++ b/packages/react-dev-utils/formatWebpackMessages.js
@@ -121,11 +121,6 @@ function formatWebpackMessages(json) {
     // preceding a much more useful Babel syntax error.
     result.errors = result.errors.filter(isLikelyASyntaxError);
   }
-  // Only keep the first error. Others are often indicative
-  // of the same problem, but confuse the reader with noise.
-  if (result.errors.length > 1) {
-    result.errors.length = 1;
-  }
   return result;
 }
 
diff --git a/packages/react-scripts/scripts/build.js b/packages/react-scripts/scripts/build.js
index 5ad12ab12b6..7691bfd5282 100644
--- a/packages/react-scripts/scripts/build.js
+++ b/packages/react-scripts/scripts/build.js
@@ -122,6 +122,11 @@ function build(previousFileSizes) {
       }
       const messages = formatWebpackMessages(stats.toJson({}, true));
       if (messages.errors.length) {
+        // Only keep the first error. Others are often indicative
+        // of the same problem, but confuse the reader with noise.
+        if (messages.errors.length > 1) {
+          messages.errors.length = 1;
+        }
         return reject(new Error(messages.errors.join('\n\n')));
       }
       if (

From 2ff3a19364a201ac9a4c2030a1a74802e7bc647e Mon Sep 17 00:00:00 2001
From: Ade Viankakrisna Fadlil <viankakrisna@gmail.com>
Date: Wed, 9 Aug 2017 08:53:37 +0700
Subject: [PATCH 33/61] Use env variable to disable source maps (#2818)

* use env variable to disable source maps

* Rename to use SOURCE_MAP with explicit value

* Update webpack.config.prod.js
---
 packages/react-scripts/config/webpack.config.prod.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/react-scripts/config/webpack.config.prod.js b/packages/react-scripts/config/webpack.config.prod.js
index f50e829c86f..9aa1bd93b3e 100644
--- a/packages/react-scripts/config/webpack.config.prod.js
+++ b/packages/react-scripts/config/webpack.config.prod.js
@@ -28,6 +28,8 @@ const publicPath = paths.servedPath;
 // Some apps do not use client-side routing with pushState.
 // For these, "homepage" can be set to "." to enable relative asset paths.
 const shouldUseRelativeAssetPaths = publicPath === './';
+// Source maps are resource heavy and can cause out of memory issue for large source files.
+const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
 // `publicUrl` is just like `publicPath`, but we will provide it to our app
 // as %PUBLIC_URL% in `index.html` and `process.env.PUBLIC_URL` in JavaScript.
 // Omit trailing slash as %PUBLIC_URL%/xyz looks better than %PUBLIC_URL%xyz.
@@ -61,7 +63,7 @@ module.exports = {
   bail: true,
   // We generate sourcemaps in production. This is slow but gives good results.
   // You can exclude the *.map files from the build during deployment.
-  devtool: 'source-map',
+  devtool: shouldUseSourceMap ? 'source-map' : false,
   // In production, we only want to load the polyfills and the app code.
   entry: [require.resolve('./polyfills'), paths.appIndexJs],
   output: {
@@ -195,7 +197,7 @@ module.exports = {
                       options: {
                         importLoaders: 1,
                         minimize: true,
-                        sourceMap: true,
+                        sourceMap: shouldUseSourceMap,
                       },
                     },
                     {
@@ -291,7 +293,7 @@ module.exports = {
         // https://github.com/facebookincubator/create-react-app/issues/2488
         ascii_only: true,
       },
-      sourceMap: true,
+      sourceMap: shouldUseSourceMap,
     }),
     // Note: this won't work without ExtractTextPlugin.extract(..) in `loaders`.
     new ExtractTextPlugin({

From 2d765637cdcdcee6a8a02f95705acd267635d4e3 Mon Sep 17 00:00:00 2001
From: Joe Haddad <timer150@gmail.com>
Date: Tue, 8 Aug 2017 21:55:13 -0400
Subject: [PATCH 34/61] Update README.md

---
 packages/react-scripts/template/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
index bdfb9189d2d..36496641ff4 100644
--- a/packages/react-scripts/template/README.md
+++ b/packages/react-scripts/template/README.md
@@ -2058,6 +2058,7 @@ PUBLIC_URL | :x: | :white_check_mark: | Create React App assumes your applicatio
 CI | :large_orange_diamond: | :white_check_mark: | When set to `true`, Create React App treats warnings as failures in the build. It also makes the test runner non-watching. Most CIs set this flag by default.
 REACT_EDITOR | :white_check_mark: | :x: | When an app crashes in development, you will see an error overlay with clickable stack trace. When you click on it, Create React App will try to determine the editor you are using based on currently running processes, and open the relevant source file. You can [send a pull request to detect your editor of choice](https://github.com/facebookincubator/create-react-app/issues/2636). Setting this environment variable overrides the automatic detection. If you do it, make sure your systems [PATH](https://en.wikipedia.org/wiki/PATH_(variable)) environment variable points to your editor’s bin folder.
 CHOKIDAR_USEPOLLING | :white_check_mark: | :x: | When set to `true`, the watcher runs in polling mode, as necessary inside a VM. Use this option if `npm start` isn't detecting changes.
+GENERATE_SOURCEMAP | :x: | :white_check_mark: | When set to `false`, source maps are not generated for a production build. This solves OOM issues on some smaller machines.
 
 ## Troubleshooting
 

From 8ace6d5f2043fc34ac70971913b58cad0c832f61 Mon Sep 17 00:00:00 2001
From: Joe Haddad <timer150@gmail.com>
Date: Tue, 8 Aug 2017 23:15:34 -0400
Subject: [PATCH 35/61] Update dev deps (#2923)

* Bump deps

* Fix linter errors

* Whoops

* Try to bump webpack

* Update peer deps to min for eslint 4.x
---
 lerna.json                                    |  2 +-
 package.json                                  | 10 +++++-----
 packages/create-react-app/createReactApp.js   |  2 +-
 packages/eslint-config-react-app/package.json |  6 +++---
 .../react-dev-utils/formatWebpackMessages.js  |  2 +-
 packages/react-dev-utils/package.json         |  6 +++---
 packages/react-dev-utils/printBuildError.js   |  2 +-
 packages/react-error-overlay/package.json     | 20 +++++++++----------
 packages/react-scripts/package.json           |  8 ++++----
 9 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/lerna.json b/lerna.json
index 7ca916a8569..1673f8a3187 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "lerna": "2.0.0-rc.5",
+  "lerna": "2.0.0",
   "version": "independent",
   "changelog": {
     "repo": "facebookincubator/create-react-app",
diff --git a/package.json b/package.json
index 730126aa6ce..4beaa5f8c48 100644
--- a/package.json
+++ b/package.json
@@ -14,14 +14,14 @@
     "precommit": "lint-staged"
   },
   "devDependencies": {
-    "@types/jest": "^19.2.3",
+    "@types/jest": "^20.0.4",
     "@types/node": "^7.0.21",
-    "@types/react": "^15.0.34",
+    "@types/react": "^15.6.1",
     "@types/react-dom": "^15.5.0",
-    "eslint": "3.19.0",
+    "eslint": "^4.4.1",
     "husky": "^0.13.2",
-    "lerna": "2.0.0-rc.5",
-    "lerna-changelog": "^0.2.3",
+    "lerna": "^2.0.0",
+    "lerna-changelog": "^0.6.0",
     "lint-staged": "^3.3.1",
     "prettier": "^1.5.2"
   },
diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js
index 9fa0f077146..4a1b7901dc4 100755
--- a/packages/create-react-app/createReactApp.js
+++ b/packages/create-react-app/createReactApp.js
@@ -441,7 +441,7 @@ function getPackageName(installPackage) {
     // Pull package name out of git urls e.g:
     // git+https://github.com/mycompany/react-scripts.git
     // git+ssh://github.com/mycompany/react-scripts.git#v1.2.3
-    return Promise.resolve(installPackage.match(/([^\/]+)\.git(#.*)?$/)[1]);
+    return Promise.resolve(installPackage.match(/([^/]+)\.git(#.*)?$/)[1]);
   } else if (installPackage.match(/.+@/)) {
     // Do not match @scope/ when stripping off @version or @tag
     return Promise.resolve(
diff --git a/packages/eslint-config-react-app/package.json b/packages/eslint-config-react-app/package.json
index 33395bc8604..5f80b9d77d4 100644
--- a/packages/eslint-config-react-app/package.json
+++ b/packages/eslint-config-react-app/package.json
@@ -14,8 +14,8 @@
     "babel-eslint": "^7.2.3",
     "eslint": "^4.1.1",
     "eslint-plugin-flowtype": "^2.34.1",
-    "eslint-plugin-import": "^2.2.0",
-    "eslint-plugin-jsx-a11y": "^5.0.3",
-    "eslint-plugin-react": "^7.0.1"
+    "eslint-plugin-import": "^2.6.0",
+    "eslint-plugin-jsx-a11y": "^5.1.1",
+    "eslint-plugin-react": "^7.1.0"
   }
 }
diff --git a/packages/react-dev-utils/formatWebpackMessages.js b/packages/react-dev-utils/formatWebpackMessages.js
index a5176b92049..1f22a0059a5 100644
--- a/packages/react-dev-utils/formatWebpackMessages.js
+++ b/packages/react-dev-utils/formatWebpackMessages.js
@@ -97,7 +97,7 @@ function formatMessage(message, isError) {
   // from user code generated by WebPack. For more information see
   // https://github.com/facebookincubator/create-react-app/pull/1050
   message = message.replace(
-    /^\s*at\s((?!webpack:).)*:\d+:\d+[\s\)]*(\n|$)/gm,
+    /^\s*at\s((?!webpack:).)*:\d+:\d+[\s)]*(\n|$)/gm,
     ''
   ); // at ... ...:x:y
 
diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json
index 77d5156090c..bb3ebb50b8b 100644
--- a/packages/react-dev-utils/package.json
+++ b/packages/react-dev-utils/package.json
@@ -38,14 +38,14 @@
     "anser": "1.4.1",
     "babel-code-frame": "6.22.0",
     "chalk": "1.1.3",
-    "cross-spawn": "4.0.2",
+    "cross-spawn": "5.1.0",
     "detect-port-alt": "1.1.3",
     "escape-string-regexp": "1.0.5",
-    "filesize": "3.3.0",
+    "filesize": "3.5.10",
     "global-modules": "1.0.0",
     "gzip-size": "3.0.0",
     "html-entities": "1.2.1",
-    "inquirer": "3.1.1",
+    "inquirer": "3.2.1",
     "is-root": "1.0.0",
     "opn": "5.1.0",
     "recursive-readdir": "2.2.1",
diff --git a/packages/react-dev-utils/printBuildError.js b/packages/react-dev-utils/printBuildError.js
index 5efbaa97d43..208c708e11a 100644
--- a/packages/react-dev-utils/printBuildError.js
+++ b/packages/react-dev-utils/printBuildError.js
@@ -23,7 +23,7 @@ module.exports = function printBuildError(err) {
     message.indexOf('from UglifyJs') !== -1
   ) {
     try {
-      const matched = /Unexpected token:(.+)\[(.+)\:(.+)\,(.+)\]\[.+\]/.exec(
+      const matched = /Unexpected token:(.+)\[(.+):(.+),(.+)\]\[.+\]/.exec(
         stack
       );
       if (!matched) {
diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json
index 15bf9e484b4..db55d559df6 100644
--- a/packages/react-error-overlay/package.json
+++ b/packages/react-error-overlay/package.json
@@ -31,7 +31,7 @@
     "middleware.js"
   ],
   "dependencies": {
-    "anser": "1.2.5",
+    "anser": "1.4.1",
     "babel-code-frame": "6.22.0",
     "babel-runtime": "6.23.0",
     "react-dev-utils": "^3.0.2",
@@ -42,16 +42,16 @@
     "babel-cli": "6.24.1",
     "babel-eslint": "7.2.3",
     "babel-preset-react-app": "^3.0.1",
-    "cross-env": "5.0.0",
-    "eslint": "3.19.0",
+    "cross-env": "5.0.5",
+    "eslint": "4.4.1",
     "eslint-config-react-app": "^1.0.5",
-    "eslint-plugin-flowtype": "2.33.0",
-    "eslint-plugin-import": "2.2.0",
-    "eslint-plugin-jsx-a11y": "5.0.3",
-    "eslint-plugin-react": "7.0.1",
-    "flow-bin": "0.49.1",
-    "jest": "20.0.1",
-    "jest-fetch-mock": "1.1.1"
+    "eslint-plugin-flowtype": "2.35.0",
+    "eslint-plugin-import": "2.7.0",
+    "eslint-plugin-jsx-a11y": "5.1.1",
+    "eslint-plugin-react": "7.1.0",
+    "flow-bin": "0.52.0",
+    "jest": "20.0.4",
+    "jest-fetch-mock": "1.2.1"
   },
   "jest": {
     "setupFiles": [
diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index 9b5a3ddbbd2..3fee76ca6f9 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -21,7 +21,7 @@
     "react-scripts-ts": "./bin/react-scripts-ts.js"
   },
   "dependencies": {
-    "autoprefixer": "7.1.1",
+    "autoprefixer": "7.1.2",
     "case-sensitive-paths-webpack-plugin": "2.1.1",
     "chalk": "1.1.3",
     "css-loader": "0.28.4",
@@ -32,7 +32,7 @@
     "html-webpack-plugin": "2.29.0",
     "jest": "20.0.4",
     "object-assign": "4.1.1",
-    "postcss-flexbugs-fixes": "3.0.0",
+    "postcss-flexbugs-fixes": "3.2.0",
     "postcss-loader": "2.0.6",
     "promise": "8.0.1",
     "react-dev-utils": "^3.0.2",
@@ -47,8 +47,8 @@
     "source-map-loader": "^0.2.1",
     "sw-precache-webpack-plugin": "0.11.4",
     "url-loader": "0.5.9",
-    "webpack": "3.4.1",
-    "webpack-dev-server": "2.6.1",
+    "webpack": "3.5.1",
+    "webpack-dev-server": "2.7.1",
     "webpack-manifest-plugin": "1.2.1",
     "whatwg-fetch": "2.0.3"
   },

From 85612852e82490387a095b7cd0b842faa1183b03 Mon Sep 17 00:00:00 2001
From: Joe Haddad <timer150@gmail.com>
Date: Tue, 8 Aug 2017 23:37:21 -0400
Subject: [PATCH 36/61] Prepare for 1.0.11 release (#2924)

* Prepare for release

* Make sure there's a break
---
 CHANGELOG.md | 119 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 115 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e2c349eb22..b8230403216 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,114 @@
+## 1.0.11 (2017-08-09)
+
+#### :bug: Bug Fix
+* `create-react-app`
+  * [#2884](https://github.com/facebookincubator/create-react-app/pull/2884) Improve offline heuristic for proxied environments. ([@bsyk](https://github.com/bsyk))
+
+    When a Yarn proxy is set, we will check its connectivity if we cannot reach Yarn's registry. This is often the case when DNS lookups must be made through the proxy.
+
+  * [#2853](https://github.com/facebookincubator/create-react-app/pull/2853) Allow use of scoped packages with a pinned version. ([@wileybenet](https://github.com/wileybenet))
+* `react-dev-utils`
+  * [#2796](https://github.com/facebookincubator/create-react-app/pull/2796) Properly escape HTML tags in error overlay. ([@ccloli](https://github.com/ccloli))
+
+    Elements printed in their entirety would sometimes render as HTML. This should no longer happen and should properly render as text.
+
+* `react-dev-utils`, `react-scripts`
+  * [#2834](https://github.com/facebookincubator/create-react-app/pull/2834) Make `formatWebpackMessages` return all messages ([@onigoetz](https://github.com/onigoetz))
+* `react-scripts`
+  * [#2806](https://github.com/facebookincubator/create-react-app/pull/2806) Fix SockJS version compatibility. ([@christianbundy](https://github.com/christianbundy))
+  * [#2738](https://github.com/facebookincubator/create-react-app/pull/2738) Fix Jest `node` file resolution. ([@mostafah](https://github.com/mostafah))
+
+#### :nail_care: Enhancement
+* `react-scripts`
+  * [#2818](https://github.com/facebookincubator/create-react-app/pull/2818) Allow sourcemaps to be disabled. ([@viankakrisna](https://github.com/viankakrisna))
+
+    As applications grow more complex, it is possible webpack may run out of memory while generating source maps. They may now be disabled by setting `GENERATE_SOURCEMAP=false`.
+
+  * [#2913](https://github.com/facebookincubator/create-react-app/pull/2913) Allow flags to be passed to node when running `react-scripts`. ([@koistya](https://github.com/koistya))
+  * [#2574](https://github.com/facebookincubator/create-react-app/pull/2574) Upgrade to `webpack@3`. ([@themre](https://github.com/themre))
+  * [#2747](https://github.com/facebookincubator/create-react-app/pull/2747) Simplify webpack configuration using `Rule.oneOf`. ([@Furizaa](https://github.com/Furizaa))
+* `react-dev-utils`, `react-scripts`
+  * [#2468](https://github.com/facebookincubator/create-react-app/pull/2468) Allow importing `package.json`. ([@iamdoron](https://github.com/iamdoron))
+  * [#2650](https://github.com/facebookincubator/create-react-app/pull/2650) Make UglifyJS error friendlier. ([@viankakrisna](https://github.com/viankakrisna))
+* `create-react-app`
+  * [#2785](https://github.com/facebookincubator/create-react-app/pull/2785) Change error wording and list conflicting files when initializing app. ([@OwenFlood](https://github.com/OwenFlood))
+* `react-dev-utils`
+  * [#2761](https://github.com/facebookincubator/create-react-app/pull/2761) Don't prompt to install serve if already installed. ([@OwenFlood](https://github.com/OwenFlood))
+  * [#2754](https://github.com/facebookincubator/create-react-app/pull/2754) Auto-detect JetBrains IDEs. ([@danrr](https://github.com/danrr))
+  * [#2740](https://github.com/facebookincubator/create-react-app/pull/2740) Support PyCharm in `launchEditor`. ([@danrr](https://github.com/danrr))
+  * [#2723](https://github.com/facebookincubator/create-react-app/pull/2723) Reorder vim arguments in `launchEditor` so `--remote` works. ([@trygveaa](https://github.com/trygveaa))
+* `eslint-config-react-app`, `react-scripts`
+  * [#2735](https://github.com/facebookincubator/create-react-app/pull/2735) Upgrade to `eslint@4`. ([@trungdq88](https://github.com/trungdq88))
+* `eslint-config-react-app`
+  * [#2701](https://github.com/facebookincubator/create-react-app/pull/2701) Set `allowTaggedTemplates` to true (eslint). ([@denkristoffer](https://github.com/denkristoffer))
+
+#### :memo: Documentation
+* Other
+  * [#2728](https://github.com/facebookincubator/create-react-app/pull/2728) Add Electrode to alternatives. ([@animesh10](https://github.com/animesh10))
+  * [#2788](https://github.com/facebookincubator/create-react-app/pull/2788) Update link for motion. ([@viankakrisna](https://github.com/viankakrisna))
+  * [#2697](https://github.com/facebookincubator/create-react-app/pull/2697) Fix env list ordering. ([@alexeyraspopov](https://github.com/alexeyraspopov))
+* `react-dev-utils`
+  * [#2798](https://github.com/facebookincubator/create-react-app/pull/2798) Update note about `webpackHotDevClient` support. ([@ForbesLindesay](https://github.com/ForbesLindesay))
+* `react-scripts`
+  * [#2822](https://github.com/facebookincubator/create-react-app/pull/2822) Add explicit "Opting Out of Caching" header. ([@gaearon](https://github.com/gaearon))
+  * [#2725](https://github.com/facebookincubator/create-react-app/pull/2725) Fixed typo. ([@zeel](https://github.com/zeel))
+  * [#2668](https://github.com/facebookincubator/create-react-app/pull/2668) Document `basename` feature in `react-router`. ([@viankakrisna](https://github.com/viankakrisna))
+  * [#2719](https://github.com/facebookincubator/create-react-app/pull/2719) Remove Windows note for `source-map-explorer`. ([@hodanny](https://github.com/hodanny))
+* `babel-preset-react-app`
+  * [#2732](https://github.com/facebookincubator/create-react-app/pull/2732) Update link to issue blocking JSX hoisting. ([@ForbesLindesay](https://github.com/ForbesLindesay))
+
+#### :house: Internal
+* `create-react-app`, `eslint-config-react-app`, `react-dev-utils`, `react-error-overlay`, `react-scripts`
+  * [#2923](https://github.com/facebookincubator/create-react-app/pull/2923) Update deps. ([@Timer](https://github.com/Timer))
+* `eslint-config-react-app`
+  * [#2718](https://github.com/facebookincubator/create-react-app/pull/2718) Re-enable flowtype warning. ([@oskarkook](https://github.com/oskarkook))
+* Other
+  * [#2700](https://github.com/facebookincubator/create-react-app/pull/2700) Unstage `yarn.lock` pre-commit. ([@jdcrensh](https://github.com/jdcrensh))
+* `react-scripts`
+  * [#2873](https://github.com/facebookincubator/create-react-app/pull/2873) Use template strings. ([@monkindey](https://github.com/monkindey))
+
+#### Committers: 26
+- 864907600cc ([ccloli](https://github.com/ccloli))
+- Ade Viankakrisna Fadlil ([viankakrisna](https://github.com/viankakrisna))
+- Alexey Raspopov ([alexeyraspopov](https://github.com/alexeyraspopov))
+- Andreas Hoffmann ([Furizaa](https://github.com/Furizaa))
+- Animesh Dutta ([animesh10](https://github.com/animesh10))
+- Ben Sykes ([bsyk](https://github.com/bsyk))
+- Christian Bundy ([christianbundy](https://github.com/christianbundy))
+- Dan Abramov ([gaearon](https://github.com/gaearon))
+- Dan Ristea ([danrr](https://github.com/danrr))
+- Danny Ho ([hodanny](https://github.com/hodanny))
+- Forbes Lindesay ([ForbesLindesay](https://github.com/ForbesLindesay))
+- Joe Haddad ([Timer](https://github.com/Timer))
+- Jon Crenshaw ([jdcrensh](https://github.com/jdcrensh))
+- Kiho · Cham ([monkindey](https://github.com/monkindey))
+- Konstantin Tarkus ([koistya](https://github.com/koistya))
+- Kristoffer ([denkristoffer](https://github.com/denkristoffer))
+- Mostafa Hajizadeh ([mostafah](https://github.com/mostafah))
+- Oskar Köök ([oskarkook](https://github.com/oskarkook))
+- Owen Flood ([OwenFlood](https://github.com/OwenFlood))
+- Stéphane Goetz ([onigoetz](https://github.com/onigoetz))
+- Trygve Aaberge ([trygveaa](https://github.com/trygveaa))
+- Wiley Bennett ([wileybenet](https://github.com/wileybenet))
+- [iamdoron](https://github.com/iamdoron)
+- [themre](https://github.com/themre)
+- zeel ([zeel](https://github.com/zeel))
+- Đinh Quang Trung ([trungdq88](https://github.com/trungdq88))
+
+### Migrating from 1.0.10 to 1.0.11
+
+Inside any created project that has not been ejected, run:
+
+```
+npm install --save --save-exact react-scripts@1.0.11
+```
+
+or
+
+```
+yarn add --exact react-scripts@1.0.11
+```
+
 ## 1.0.10 (June 29, 2017)
 
 #### :bug: Bug Fix
@@ -110,7 +221,7 @@ yarn add --exact react-scripts@1.0.9
   * [#2600](https://github.com/facebookincubator/create-react-app/pull/2600) Add empty mock for `dgram` Node module. ([@micopiira](https://github.com/micopiira))
   * [#2458](https://github.com/facebookincubator/create-react-app/pull/2458) Add names to module factories in development. ([@Zaccc123](https://github.com/Zaccc123))
   * [#2551](https://github.com/facebookincubator/create-react-app/pull/2551) In new projects, unregister service worker and force reload if `service-worker.js` is not found. ([@ro-savage](https://github.com/ro-savage))
-  
+
 * `babel-preset-react-app`, `react-dev-utils`, `react-scripts`
 
   * [#2658](https://github.com/facebookincubator/create-react-app/pull/2658) Bump dependencies. ([@gaearon](https://github.com/gaearon))
@@ -119,7 +230,7 @@ yarn add --exact react-scripts@1.0.9
 
   * [#2657](https://github.com/facebookincubator/create-react-app/pull/2657) Put `react-scripts` in `dependencies`, not `devDependencies`. ([@gaearon](https://github.com/gaearon))
   * [#2635](https://github.com/facebookincubator/create-react-app/pull/2635) Silence unhelpful npm warnings. ([@gaearon](https://github.com/gaearon))
-  
+
 * `react-dev-utils`
 
   * [#2637](https://github.com/facebookincubator/create-react-app/pull/2637) Auto-detect Brackets editor from error overlay. ([@petetnt](https://github.com/petetnt))
@@ -176,7 +287,7 @@ yarn add --exact react-scripts@1.0.9
   * [#2397](https://github.com/facebookincubator/create-react-app/pull/2397) Fix command in e2e-kitchensink.sh cleanup. ([@ro-savage](https://github.com/ro-savage))
   * [#2388](https://github.com/facebookincubator/create-react-app/pull/2388) Fix wrong path expansion in end-to-end test. ([@gaearon](https://github.com/gaearon))
   * [#2387](https://github.com/facebookincubator/create-react-app/pull/2387) Catch "No tests found" during CI. ([@EnoahNetzach](https://github.com/EnoahNetzach))
-  
+
 * `react-scripts`
 
   * [#2408](https://github.com/facebookincubator/create-react-app/pull/2408) E2E testing enhancements. ([@EnoahNetzach](https://github.com/EnoahNetzach))
@@ -573,7 +684,7 @@ yarn add --dev --exact react-scripts@1.0.1
 
 We’ve been working on this release for the past few months, and there are many big impovements, from migrating to webpack 2 to a brand new runtime error overlay and built-in support for Progressive Web Apps.
 
-So instead of just enumerating them here, we decided to write a blog post about all the new features.  
+So instead of just enumerating them here, we decided to write a blog post about all the new features.<br>
 Check it out: **[What’s New in Create React App](https://facebook.github.io/react/blog/2017/05/18/whats-new-in-create-react-app.html)**.
 
 Have you read it? Now let's see how to update your app to the latest version.

From 0bb9537f0672b8ae55c39f201802592bef395a8d Mon Sep 17 00:00:00 2001
From: Joe Haddad <timer150@gmail.com>
Date: Tue, 8 Aug 2017 23:39:58 -0400
Subject: [PATCH 37/61] Publish

 - babel-preset-react-app@3.0.2
 - create-react-app@1.4.0
 - eslint-config-react-app@2.0.0
 - react-dev-utils@3.1.0
 - react-error-overlay@1.0.10
 - react-scripts@1.0.11
---
 packages/babel-preset-react-app/package.json  | 2 +-
 packages/create-react-app/package.json        | 2 +-
 packages/eslint-config-react-app/package.json | 2 +-
 packages/react-dev-utils/package.json         | 2 +-
 packages/react-error-overlay/package.json     | 8 ++++----
 packages/react-scripts/package.json           | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/babel-preset-react-app/package.json b/packages/babel-preset-react-app/package.json
index d10188fda02..dce6742985f 100644
--- a/packages/babel-preset-react-app/package.json
+++ b/packages/babel-preset-react-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-react-app",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Babel preset used by Create React App",
   "repository": "facebookincubator/create-react-app",
   "license": "BSD-3-Clause",
diff --git a/packages/create-react-app/package.json b/packages/create-react-app/package.json
index 28502ca077a..42ee3497ea5 100644
--- a/packages/create-react-app/package.json
+++ b/packages/create-react-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-react-app",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "keywords": [
     "react"
   ],
diff --git a/packages/eslint-config-react-app/package.json b/packages/eslint-config-react-app/package.json
index 5f80b9d77d4..375c9f54b87 100644
--- a/packages/eslint-config-react-app/package.json
+++ b/packages/eslint-config-react-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-react-app",
-  "version": "1.0.5",
+  "version": "2.0.0",
   "description": "ESLint configuration used by Create React App",
   "repository": "facebookincubator/create-react-app",
   "license": "BSD-3-Clause",
diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json
index bb3ebb50b8b..0e4e135f89f 100644
--- a/packages/react-dev-utils/package.json
+++ b/packages/react-dev-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dev-utils",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "description": "Webpack utilities used by Create React App",
   "repository": "facebookincubator/create-react-app",
   "license": "BSD-3-Clause",
diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json
index db55d559df6..5a9e864c50f 100644
--- a/packages/react-error-overlay/package.json
+++ b/packages/react-error-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-error-overlay",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "An overlay for displaying stack frames.",
   "main": "lib/index.js",
   "scripts": {
@@ -34,17 +34,17 @@
     "anser": "1.4.1",
     "babel-code-frame": "6.22.0",
     "babel-runtime": "6.23.0",
-    "react-dev-utils": "^3.0.2",
+    "react-dev-utils": "^3.1.0",
     "settle-promise": "1.0.0",
     "source-map": "0.5.6"
   },
   "devDependencies": {
     "babel-cli": "6.24.1",
     "babel-eslint": "7.2.3",
-    "babel-preset-react-app": "^3.0.1",
+    "babel-preset-react-app": "^3.0.2",
     "cross-env": "5.0.5",
     "eslint": "4.4.1",
-    "eslint-config-react-app": "^1.0.5",
+    "eslint-config-react-app": "^2.0.0",
     "eslint-plugin-flowtype": "2.35.0",
     "eslint-plugin-import": "2.7.0",
     "eslint-plugin-jsx-a11y": "5.1.1",
diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index 3fee76ca6f9..4c018c0c36b 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -35,8 +35,8 @@
     "postcss-flexbugs-fixes": "3.2.0",
     "postcss-loader": "2.0.6",
     "promise": "8.0.1",
-    "react-dev-utils": "^3.0.2",
-    "react-error-overlay": "^1.0.9",
+    "react-dev-utils": "^3.1.0",
+    "react-error-overlay": "^1.0.10",
     "style-loader": "0.18.2",
     "ts-jest": "^20.0.7",
     "ts-loader": "^2.2.1",

From 9a6e32d313f0f9a7bf5a9b35f306e7acbd6c374c Mon Sep 17 00:00:00 2001
From: John Nilsson <john.nilsson@medius.se>
Date: Wed, 9 Aug 2017 15:41:16 +0200
Subject: [PATCH 38/61] Delete leftover file (upstream 82687dd)

---
 packages/react-dev-utils/prompt.js | 44 ------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 packages/react-dev-utils/prompt.js

diff --git a/packages/react-dev-utils/prompt.js b/packages/react-dev-utils/prompt.js
deleted file mode 100644
index e6e19cf39eb..00000000000
--- a/packages/react-dev-utils/prompt.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-'use strict';
-
-var rl = require('readline');
-
-// Convention: "no" should be the conservative choice.
-// If you mistype the answer, we'll always take it as a "no".
-// You can control the behavior on <Enter> with `isYesDefault`.
-function prompt(question, isYesDefault) {
-  if (typeof isYesDefault !== 'boolean') {
-    throw new Error('Provide explicit boolean isYesDefault as second argument.');
-  }
-  return new Promise(resolve => {
-    var rlInterface = rl.createInterface({
-      input: process.stdin,
-      output: process.stdout,
-    });
-
-    var hint = isYesDefault === true ? '[Y/n]' : '[y/N]';
-    var message = question + ' ' + hint + '\n';
-
-    rlInterface.question(message, function(answer) {
-      rlInterface.close();
-
-      var useDefault = answer.trim().length === 0;
-      if (useDefault) {
-        return resolve(isYesDefault);
-      }
-
-      var isYes = answer.match(/^(yes|y)$/i);
-      return resolve(isYes);
-    });
-  });
-}
-
-module.exports = prompt;

From 72bcf3390eefde126f95d44b3db821068eaffdc4 Mon Sep 17 00:00:00 2001
From: Thomas Bassetto <tbassetto@users.noreply.github.com>
Date: Wed, 9 Aug 2017 14:57:37 +0200
Subject: [PATCH 39/61] Update README.md (#2927)

Fixing a small typo.
---
 packages/react-scripts/template/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
index 36496641ff4..3f0dff1171a 100644
--- a/packages/react-scripts/template/README.md
+++ b/packages/react-scripts/template/README.md
@@ -1576,7 +1576,7 @@ you can swap out the call to `serviceWorkerRegistration.register()` in
 [`src/index.js`](src/index.js) with a call to `serviceWorkerRegistration.unregister()`.
 After the user visits a page that has `serviceWorkerRegistration.unregister()`,
 the service worker will be uninstalled. Note that depending on how `/service-worker.js` is served,
-it make take up to 24 hours for the cache to be invalidated.
+it may take up to 24 hours for the cache to be invalidated.
 
 ### Offline-First Considerations
 

From f9c601bf8a7e999cdca612882a76c3f88ac693e5 Mon Sep 17 00:00:00 2001
From: Joe Haddad <timer150@gmail.com>
Date: Thu, 10 Aug 2017 16:18:13 -0700
Subject: [PATCH 40/61] Remove superfluous lodash usage (#2938)

---
 packages/react-dev-utils/printBuildError.js | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/react-dev-utils/printBuildError.js b/packages/react-dev-utils/printBuildError.js
index 208c708e11a..eadfff471b9 100644
--- a/packages/react-dev-utils/printBuildError.js
+++ b/packages/react-dev-utils/printBuildError.js
@@ -9,12 +9,11 @@
 
 'use strict';
 
-const get = require('lodash/get');
 const chalk = require('chalk');
 
 module.exports = function printBuildError(err) {
-  const message = get(err, 'message');
-  const stack = get(err, 'stack');
+  const message = err != null && err.message;
+  const stack = err != null && err.stack;
 
   // Add more helpful message for UglifyJs error
   if (
@@ -23,24 +22,22 @@ module.exports = function printBuildError(err) {
     message.indexOf('from UglifyJs') !== -1
   ) {
     try {
-      const matched = /Unexpected token:(.+)\[(.+):(.+),(.+)\]\[.+\]/.exec(
-        stack
-      );
+      const matched = /(.+)\[(.+):(.+),(.+)\]\[.+\]/.exec(stack);
       if (!matched) {
-        throw new Error(
-          "The regex pattern is not matched. Maybe UglifyJs changed it's message?"
-        );
+        throw new Error('Using errors for control flow is bad.');
       }
       const problemPath = matched[2];
       const line = matched[3];
       const column = matched[4];
       console.log(
         'Failed to minify the code from this file: \n\n',
-        chalk.yellow(`${problemPath} line ${line}:${column}`),
+        chalk.yellow(
+          `\t${problemPath}:${line}${column !== '0' ? ':' + column : ''}`
+        ),
         '\n'
       );
     } catch (ignored) {
-      console.log('Failed to minify the code.', err);
+      console.log('Failed to minify the bundle.', err);
     }
     console.log('Read more here: http://bit.ly/2tRViJ9');
   } else {

From da055d6fb43fa3db2cc59316eebd5a580d73e92c Mon Sep 17 00:00:00 2001
From: Pier-Luc Gendreau <Zertz@users.noreply.github.com>
Date: Mon, 14 Aug 2017 05:51:38 -0400
Subject: [PATCH 41/61] Remove Modulus from user guide (#2948)

The service was rebranded to xervo.io and was completely shut down in April 2017
---
 packages/react-scripts/template/README.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
index 3f0dff1171a..71d6b25d360 100644
--- a/packages/react-scripts/template/README.md
+++ b/packages/react-scripts/template/README.md
@@ -81,7 +81,6 @@ You can find the most recent version of this guide [here](https://github.com/fac
   - [Firebase](#firebase)
   - [GitHub Pages](#github-pages)
   - [Heroku](#heroku)
-  - [Modulus](#modulus)
   - [Netlify](#netlify)
   - [Now](#now)
   - [S3 and CloudFront](#s3-and-cloudfront)
@@ -1975,10 +1974,6 @@ remote: npm ERR! argv "/tmp/build_a2875fc163b209225122d68916f1d4df/.heroku/node/
 
 In this case, ensure that the file is there with the proper lettercase and that’s not ignored on your local `.gitignore` or `~/.gitignore_global`.
 
-### Modulus
-
-See the [Modulus blog post](http://blog.modulus.io/deploying-react-apps-on-modulus) on how to deploy your react app to Modulus.
-
 ### Netlify
 
 **To do a manual deploy to Netlify’s CDN:**

From 152ef9b5c7dd619ec61c8712388a7fff42c00ef5 Mon Sep 17 00:00:00 2001
From: Yann Pringault <yann.pringault@gmail.com>
Date: Wed, 16 Aug 2017 02:17:37 +0200
Subject: [PATCH 42/61] Fix docs for `printFileSizesAfterBuild` (#2942)

* Fix docs for `printFileSizesAfterBuild`

* Add optionals parameters for `printFileSizesAfterBuild`
---
 packages/react-dev-utils/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/react-dev-utils/README.md b/packages/react-dev-utils/README.md
index e23f0a294aa..034790c2288 100644
--- a/packages/react-dev-utils/README.md
+++ b/packages/react-dev-utils/README.md
@@ -170,9 +170,9 @@ module: {
 
 Captures JS and CSS asset sizes inside the passed `buildFolder`. Save the result value to compare it after the build.
 
-##### `printFileSizesAfterBuild(webpackStats: WebpackStats, previousFileSizes: OpaqueFileSizes)`
+##### `printFileSizesAfterBuild(webpackStats: WebpackStats, previousFileSizes: OpaqueFileSizes, buildFolder: string, maxBundleGzipSize?: number, maxChunkGzipSize?: number)`
 
-Prints the JS and CSS asset sizes after the build, and includes a size comparison with `previousFileSizes` that were captured earlier using `measureFileSizesBeforeBuild()`.
+Prints the JS and CSS asset sizes after the build, and includes a size comparison with `previousFileSizes` that were captured earlier using `measureFileSizesBeforeBuild()`. `maxBundleGzipSize` and `maxChunkGzipSizemay` may optionally be specified to display a warning when the main bundle or a chunk exceeds the specified size (in bytes).
 
 ```js
 var {
@@ -182,7 +182,7 @@ var {
 
 measureFileSizesBeforeBuild(buildFolder).then(previousFileSizes => {
   return cleanAndRebuild().then(webpackStats => {
-    printFileSizesAfterBuild(webpackStats, previousFileSizes);
+    printFileSizesAfterBuild(webpackStats, previousFileSizes, buildFolder);
   });
 });
 ```

From 7aa5c2c4dbdb9bdc9e1e6f85e1ab79000b97a2ab Mon Sep 17 00:00:00 2001
From: Ekaterina Prigara <ekaterina@prigara.com>
Date: Mon, 21 Aug 2017 17:40:52 +0200
Subject: [PATCH 43/61] Docs: debugging in WebStorm (#2986)

* Debugging in WebStorm

* Fixed formatting for shortcuts

* Added note about default URL
---
 packages/react-scripts/template/README.md | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
index 71d6b25d360..c55ccdf949f 100644
--- a/packages/react-scripts/template/README.md
+++ b/packages/react-scripts/template/README.md
@@ -243,9 +243,11 @@ If you want to enforce a coding style for your project, consider using [Prettier
 
 ## Debugging in the Editor
 
-**This feature is currently only supported by [Visual Studio Code](https://code.visualstudio.com) editor.**
+**This feature is currently only supported by [Visual Studio Code](https://code.visualstudio.com) and [WebStorm](https://www.jetbrains.com/webstorm/).**
 
-Visual Studio Code supports debugging out of the box with Create React App. This enables you as a developer to write and debug your React code without leaving the editor, and most importantly it enables you to have a continuous development workflow, where context switching is minimal, as you don’t have to switch between tools.
+Visual Studio Code and WebStorm support debugging out of the box with Create React App. This enables you as a developer to write and debug your React code without leaving the editor, and most importantly it enables you to have a continuous development workflow, where context switching is minimal, as you don’t have to switch between tools.
+
+### Visual Studio Code
 
 You would need to have the latest version of [VS Code](https://code.visualstudio.com) and VS Code [Chrome Debugger Extension](https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome) installed.
 
@@ -267,9 +269,22 @@ Then add the block below to your `launch.json` file and put it inside the `.vsco
   }]
 }
 ```
+>Note: the URL may be different if you've made adjustments via the [HOST or PORT environment variables](#advanced-configuration).
 
 Start your app by running `npm start`, and start debugging in VS Code by pressing `F5` or by clicking the green debug icon. You can now write code, set breakpoints, make changes to the code, and debug your newly modified code—all from your editor.
 
+### WebStorm
+
+You would need to have [WebStorm](https://www.jetbrains.com/webstorm/) and [JetBrains IDE Support](https://chrome.google.com/webstore/detail/jetbrains-ide-support/hmhgeddbohgjknpmjagkdomcpobmllji) Chrome extension installed.
+
+In the WebStorm menu `Run` select `Edit Configurations...`. Then click `+` and select `JavaScript Debug`. Paste `http://localhost:3000` into the URL field and save the configuration.
+
+>Note: the URL may be different if you've made adjustments via the [HOST or PORT environment variables](#advanced-configuration).
+
+Start your app by running `npm start`, then press `^D` on macOS or `F9` on Windows and Linux or click the green debug icon to start debugging in WebStorm.
+
+The same way you can debug your application in IntelliJ IDEA Ultimate, PhpStorm, PyCharm Pro, and RubyMine. 
+
 ## Formatting Code Automatically
 
 Prettier is an opinionated code formatter with support for JavaScript, CSS and JSON. With Prettier you can format the code you write automatically to ensure a code style within your project. See the [Prettier's GitHub page](https://github.com/prettier/prettier) for more information, and look at this [page to see it in action](https://prettier.github.io/prettier/).

From ae457ae213d2053821c3021472f55043dbc5b656 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Sat, 26 Aug 2017 17:35:25 -0600
Subject: [PATCH 44/61] Fix module function name in error overlay (#3012)

---
 packages/react-error-overlay/src/components/frame.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/react-error-overlay/src/components/frame.js b/packages/react-error-overlay/src/components/frame.js
index 43d0d4043a3..4087f4d9c9d 100644
--- a/packages/react-error-overlay/src/components/frame.js
+++ b/packages/react-error-overlay/src/components/frame.js
@@ -101,13 +101,13 @@ function frameDiv(
   const frame = document.createElement('div');
   const frameFunctionName = document.createElement('div');
 
-  let cleanedFunctionName;
-  if (!functionName || functionName === 'Object.<anonymous>') {
-    cleanedFunctionName = '(anonymous function)';
-  } else {
-    cleanedFunctionName = functionName;
+  if (functionName && functionName.indexOf('Object.') === 0) {
+    functionName = functionName.slice('Object.'.length);
   }
-
+  if (functionName === '<anonymous>') {
+    functionName = null;
+  }
+  const cleanedFunctionName = functionName || '(anonymous function)';
   const cleanedUrl = url.replace('webpack://', '.');
 
   if (internalUrl) {

From acd639d2acc80c59719820c33851ca7e4f758b3c Mon Sep 17 00:00:00 2001
From: Joe Haddad <timer150@gmail.com>
Date: Thu, 10 Aug 2017 16:20:03 -0700
Subject: [PATCH 45/61] Bump react-dev-utils

---
 packages/react-dev-utils/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json
index 0e4e135f89f..8816e4009a6 100644
--- a/packages/react-dev-utils/package.json
+++ b/packages/react-dev-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dev-utils",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Webpack utilities used by Create React App",
   "repository": "facebookincubator/create-react-app",
   "license": "BSD-3-Clause",

From caa9cef27a5bad290680f138a33b07785ea68b7c Mon Sep 17 00:00:00 2001
From: Tharaka Wijebandara <tharaka.nw@gmail.com>
Date: Mon, 28 Aug 2017 01:45:55 +0000
Subject: [PATCH 46/61] Convert react-error-overlay to React (#2515)

* Convert react-error-overlay to React

* Update compile-time error overlay to use react-error-overlay components

 * Refactor react-error-overlay components to container and presentational components.

 * Make the compile-time error overlay a part of react-error-overlay package.

 * Use react-error-overlay as dependency in react-dev-utils to show compile-time errors.

* Run Prettier

* Move the function name fix into StackFrame itself

* Fix clicking on source code snippet to open the code in editor

* Use exact objects + minor style tweak

* Don't linkify frames that don't exist on the disk

* Fix lint

* Consolidate iframe rendering logic

* Remove circular dependency between react-dev-utils and react-error-overlay

* Fix lint

* Fix decoupling of react-dev-utils and react-error-overlay by moving middleware

* Deduplicate identical errors
---
 .../errorOverlayMiddleware.js}                |   6 +-
 .../launchEditorEndpoint.js}                  |  12 +-
 packages/react-dev-utils/package.json         |   6 +-
 .../react-dev-utils/webpackHotDevClient.js    | 158 ++------
 packages/react-error-overlay/.flowconfig      |   1 +
 .../react-error-overlay/fixtures/bundle.json  |  28 +-
 packages/react-error-overlay/package.json     |   4 +-
 .../src/__tests__/stack-frame.js              |   4 +-
 .../src/components/CloseButton.js             |  38 ++
 .../src/components/CodeBlock.js               |  54 +++
 .../src/components/Collapsible.js             |  78 ++++
 .../src/components/Footer.js                  |  36 ++
 .../src/components/Header.js                  |  39 ++
 .../src/components/NavigationBar.js           |  70 ++++
 .../src/components/Overlay.js                 |  74 ++++
 .../src/components/additional.js              |  72 ----
 .../src/components/close.js                   |  35 --
 .../src/components/footer.js                  |  31 --
 .../src/components/frame.js                   | 355 ------------------
 .../src/components/frames.js                  | 132 -------
 .../src/components/overlay.js                 |  95 -----
 .../src/containers/CompileErrorContainer.js   |  31 ++
 .../src/containers/RuntimeError.js            |  68 ++++
 .../src/containers/RuntimeErrorContainer.js   |  77 ++++
 .../src/containers/StackFrame.js              | 188 ++++++++++
 .../StackFrameCodeBlock.js}                   |  50 +--
 .../src/containers/StackTrace.js              |  95 +++++
 .../src/effects/shortcuts.js                  |  53 ---
 packages/react-error-overlay/src/index.js     | 157 +++++++-
 .../src/listenToRuntimeErrors.js              |  83 ++++
 packages/react-error-overlay/src/overlay.js   | 235 ------------
 packages/react-error-overlay/src/styles.js    | 180 +--------
 .../src/utils/dom/enableTabClick.js           |  24 --
 .../src/utils/generateAnsiHTML.js}            |  11 +-
 .../src/utils/getLinesAround.js               |   2 +-
 .../src/utils/getPrettyURL.js                 |  49 +++
 .../src/utils/getSourceMap.js                 |   2 +-
 .../{errorRegister.js => getStackFrames.js}   |  40 +-
 .../src/utils/isBultinErrorName.js            |  27 ++
 .../react-error-overlay/src/utils/mapper.js   |   2 +-
 .../react-error-overlay/src/utils/parser.js   |   2 +-
 .../src/utils/stack-frame.js                  |  28 +-
 .../react-error-overlay/src/utils/unmapper.js |   2 +-
 .../react-error-overlay/src/utils/warnings.js |   2 +-
 .../react-scripts/bin/react-scripts-ts.js     |   5 +-
 .../config/webpack.config.dev.js              |   2 -
 .../config/webpackDevServer.config.js         |   2 +-
 packages/react-scripts/package.json           |   1 -
 48 files changed, 1273 insertions(+), 1473 deletions(-)
 rename packages/{react-error-overlay/middleware.js => react-dev-utils/errorOverlayMiddleware.js} (76%)
 rename packages/{react-error-overlay/src/utils/dom/consumeEvent.js => react-dev-utils/launchEditorEndpoint.js} (65%)
 create mode 100644 packages/react-error-overlay/src/components/CloseButton.js
 create mode 100644 packages/react-error-overlay/src/components/CodeBlock.js
 create mode 100644 packages/react-error-overlay/src/components/Collapsible.js
 create mode 100644 packages/react-error-overlay/src/components/Footer.js
 create mode 100644 packages/react-error-overlay/src/components/Header.js
 create mode 100644 packages/react-error-overlay/src/components/NavigationBar.js
 create mode 100644 packages/react-error-overlay/src/components/Overlay.js
 delete mode 100644 packages/react-error-overlay/src/components/additional.js
 delete mode 100644 packages/react-error-overlay/src/components/close.js
 delete mode 100644 packages/react-error-overlay/src/components/footer.js
 delete mode 100644 packages/react-error-overlay/src/components/frame.js
 delete mode 100644 packages/react-error-overlay/src/components/frames.js
 delete mode 100644 packages/react-error-overlay/src/components/overlay.js
 create mode 100644 packages/react-error-overlay/src/containers/CompileErrorContainer.js
 create mode 100644 packages/react-error-overlay/src/containers/RuntimeError.js
 create mode 100644 packages/react-error-overlay/src/containers/RuntimeErrorContainer.js
 create mode 100644 packages/react-error-overlay/src/containers/StackFrame.js
 rename packages/react-error-overlay/src/{components/code.js => containers/StackFrameCodeBlock.js} (71%)
 create mode 100644 packages/react-error-overlay/src/containers/StackTrace.js
 delete mode 100644 packages/react-error-overlay/src/effects/shortcuts.js
 create mode 100644 packages/react-error-overlay/src/listenToRuntimeErrors.js
 delete mode 100644 packages/react-error-overlay/src/overlay.js
 delete mode 100644 packages/react-error-overlay/src/utils/dom/enableTabClick.js
 rename packages/{react-dev-utils/ansiHTML.js => react-error-overlay/src/utils/generateAnsiHTML.js} (95%)
 create mode 100644 packages/react-error-overlay/src/utils/getPrettyURL.js
 rename packages/react-error-overlay/src/utils/{errorRegister.js => getStackFrames.js} (59%)
 create mode 100644 packages/react-error-overlay/src/utils/isBultinErrorName.js

diff --git a/packages/react-error-overlay/middleware.js b/packages/react-dev-utils/errorOverlayMiddleware.js
similarity index 76%
rename from packages/react-error-overlay/middleware.js
rename to packages/react-dev-utils/errorOverlayMiddleware.js
index d4fd0d399f1..b2a857d6e37 100644
--- a/packages/react-error-overlay/middleware.js
+++ b/packages/react-dev-utils/errorOverlayMiddleware.js
@@ -8,12 +8,12 @@
  */
 'use strict';
 
-const launchEditor = require('react-dev-utils/launchEditor');
+const launchEditor = require('./launchEditor');
+const launchEditorEndpoint = require('./launchEditorEndpoint');
 
 module.exports = function createLaunchEditorMiddleware() {
   return function launchEditorMiddleware(req, res, next) {
-    // Keep this in sync with react-error-overlay
-    if (req.url.startsWith('/__open-stack-frame-in-editor')) {
+    if (req.url.startsWith(launchEditorEndpoint)) {
       launchEditor(req.query.fileName, req.query.lineNumber);
       res.end();
     } else {
diff --git a/packages/react-error-overlay/src/utils/dom/consumeEvent.js b/packages/react-dev-utils/launchEditorEndpoint.js
similarity index 65%
rename from packages/react-error-overlay/src/utils/dom/consumeEvent.js
rename to packages/react-dev-utils/launchEditorEndpoint.js
index 90bb9d1e815..e21870be9c4 100644
--- a/packages/react-error-overlay/src/utils/dom/consumeEvent.js
+++ b/packages/react-dev-utils/launchEditorEndpoint.js
@@ -6,13 +6,7 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  */
+'use strict';
 
-/* @flow */
-function consumeEvent(e: Event) {
-  e.preventDefault();
-  if (typeof e.target.blur === 'function') {
-    e.target.blur();
-  }
-}
-
-export { consumeEvent };
+// TODO: we might want to make this injectable to support DEV-time non-root URLs.
+module.exports = '/__open-stack-frame-in-editor';
diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json
index 8816e4009a6..ccc22bf6332 100644
--- a/packages/react-dev-utils/package.json
+++ b/packages/react-dev-utils/package.json
@@ -11,12 +11,12 @@
     "node": ">=6"
   },
   "files": [
-    "ansiHTML.js",
     "checkRequiredFiles.js",
     "clearConsole.js",
     "crashOverlay.js",
     "crossSpawn.js",
     "eslintFormatter.js",
+    "errorOverlayMiddleware.js",
     "FileSizeReporter.js",
     "printBuildError.js",
     "formatWebpackMessages.js",
@@ -24,6 +24,7 @@
     "inquirer.js",
     "InterpolateHtmlPlugin.js",
     "launchEditor.js",
+    "launchEditorEndpoint.js",
     "ModuleScopePlugin.js",
     "noopServiceWorkerMiddleware.js",
     "openBrowser.js",
@@ -35,7 +36,6 @@
   ],
   "dependencies": {
     "address": "1.0.2",
-    "anser": "1.4.1",
     "babel-code-frame": "6.22.0",
     "chalk": "1.1.3",
     "cross-spawn": "5.1.0",
@@ -44,10 +44,10 @@
     "filesize": "3.5.10",
     "global-modules": "1.0.0",
     "gzip-size": "3.0.0",
-    "html-entities": "1.2.1",
     "inquirer": "3.2.1",
     "is-root": "1.0.0",
     "opn": "5.1.0",
+    "react-error-overlay": "^1.0.9",
     "recursive-readdir": "2.2.1",
     "shell-quote": "1.6.1",
     "sockjs-client": "1.1.4",
diff --git a/packages/react-dev-utils/webpackHotDevClient.js b/packages/react-dev-utils/webpackHotDevClient.js
index f2f206a5cd2..b6effe718e5 100644
--- a/packages/react-dev-utils/webpackHotDevClient.js
+++ b/packages/react-dev-utils/webpackHotDevClient.js
@@ -21,143 +21,27 @@
 var SockJS = require('sockjs-client');
 var stripAnsi = require('strip-ansi');
 var url = require('url');
+var launchEditorEndpoint = require('./launchEditorEndpoint');
 var formatWebpackMessages = require('./formatWebpackMessages');
-var ansiHTML = require('./ansiHTML');
-
-function createOverlayIframe(onIframeLoad) {
-  var iframe = document.createElement('iframe');
-  iframe.id = 'react-dev-utils-webpack-hot-dev-client-overlay';
-  iframe.src = 'about:blank';
-  iframe.style.position = 'fixed';
-  iframe.style.left = 0;
-  iframe.style.top = 0;
-  iframe.style.right = 0;
-  iframe.style.bottom = 0;
-  iframe.style.width = '100vw';
-  iframe.style.height = '100vh';
-  iframe.style.border = 'none';
-  iframe.style.zIndex = 2147483647;
-  iframe.onload = onIframeLoad;
-  return iframe;
-}
-
-function addOverlayDivTo(iframe) {
-  // TODO: unify these styles with react-error-overlay
-  iframe.contentDocument.body.style.margin = 0;
-  iframe.contentDocument.body.style.maxWidth = '100vw';
-
-  var outerDiv = iframe.contentDocument.createElement('div');
-  outerDiv.id = 'react-dev-utils-webpack-hot-dev-client-overlay-div';
-  outerDiv.style.width = '100%';
-  outerDiv.style.height = '100%';
-  outerDiv.style.boxSizing = 'border-box';
-  outerDiv.style.textAlign = 'center';
-  outerDiv.style.backgroundColor = 'rgb(255, 255, 255)';
-
-  var div = iframe.contentDocument.createElement('div');
-  div.style.position = 'relative';
-  div.style.display = 'inline-flex';
-  div.style.flexDirection = 'column';
-  div.style.height = '100%';
-  div.style.width = '1024px';
-  div.style.maxWidth = '100%';
-  div.style.overflowX = 'hidden';
-  div.style.overflowY = 'auto';
-  div.style.padding = '0.5rem';
-  div.style.boxSizing = 'border-box';
-  div.style.textAlign = 'left';
-  div.style.fontFamily = 'Consolas, Menlo, monospace';
-  div.style.fontSize = '11px';
-  div.style.whiteSpace = 'pre-wrap';
-  div.style.wordBreak = 'break-word';
-  div.style.lineHeight = '1.5';
-  div.style.color = 'rgb(41, 50, 56)';
-
-  outerDiv.appendChild(div);
-  iframe.contentDocument.body.appendChild(outerDiv);
-  return div;
-}
-
-function overlayHeaderStyle() {
-  return (
-    'font-size: 2em;' +
-    'font-family: sans-serif;' +
-    'color: rgb(206, 17, 38);' +
-    'white-space: pre-wrap;' +
-    'margin: 0 2rem 0.75rem 0px;' +
-    'flex: 0 0 auto;' +
-    'max-height: 35%;' +
-    'overflow: auto;'
-  );
-}
-
-var overlayIframe = null;
-var overlayDiv = null;
-var lastOnOverlayDivReady = null;
-
-function ensureOverlayDivExists(onOverlayDivReady) {
-  if (overlayDiv) {
-    // Everything is ready, call the callback right away.
-    onOverlayDivReady(overlayDiv);
-    return;
-  }
-
-  // Creating an iframe may be asynchronous so we'll schedule the callback.
-  // In case of multiple calls, last callback wins.
-  lastOnOverlayDivReady = onOverlayDivReady;
-
-  if (overlayIframe) {
-    // We're already creating it.
-    return;
-  }
-
-  // Create iframe and, when it is ready, a div inside it.
-  overlayIframe = createOverlayIframe(function onIframeLoad() {
-    overlayDiv = addOverlayDivTo(overlayIframe);
-    // Now we can talk!
-    lastOnOverlayDivReady(overlayDiv);
-  });
-
-  // Zalgo alert: onIframeLoad() will be called either synchronously
-  // or asynchronously depending on the browser.
-  // We delay adding it so `overlayIframe` is set when `onIframeLoad` fires.
-  document.body.appendChild(overlayIframe);
-}
+var ErrorOverlay = require('react-error-overlay');
+
+ErrorOverlay.startReportingRuntimeErrors({
+  launchEditorEndpoint: launchEditorEndpoint,
+  onError: function() {
+    // TODO: why do we need this?
+    if (module.hot && typeof module.hot.decline === 'function') {
+      module.hot.decline();
+    }
+  },
+});
 
-function showErrorOverlay(message) {
-  ensureOverlayDivExists(function onOverlayDivReady(overlayDiv) {
-    // TODO: unify this with our runtime overlay
-    overlayDiv.innerHTML =
-      '<div style="' +
-      overlayHeaderStyle() +
-      '">Failed to compile</div>' +
-      '<pre style="' +
-      'display: block; padding: 0.5em; margin-top: 0; ' +
-      'margin-bottom: 0.5em; overflow-x: auto; white-space: pre-wrap; ' +
-      'border-radius: 0.25rem; background-color: rgba(206, 17, 38, 0.05)">' +
-      '<code style="font-family: Consolas, Menlo, monospace;">' +
-      ansiHTML(message) +
-      '</code></pre>' +
-      '<div style="' +
-      'font-family: sans-serif; color: rgb(135, 142, 145); margin-top: 0.5rem; ' +
-      'flex: 0 0 auto">' +
-      'This error occurred during the build time and cannot be dismissed.</div>';
+if (module.hot && typeof module.hot.dispose === 'function') {
+  module.hot.dispose(function() {
+    // TODO: why do we need this?
+    ErrorOverlay.stopReportingRuntimeErrors();
   });
 }
 
-function destroyErrorOverlay() {
-  if (!overlayDiv) {
-    // It is not there in the first place.
-    return;
-  }
-
-  // Clean up and reset internal state.
-  document.body.removeChild(overlayIframe);
-  overlayDiv = null;
-  overlayIframe = null;
-  lastOnOverlayDivReady = null;
-}
-
 // Connect to WebpackDevServer via a socket.
 var connection = new SockJS(
   url.format({
@@ -205,9 +89,9 @@ function handleSuccess() {
   // Attempt to apply hot updates or reload.
   if (isHotUpdate) {
     tryApplyUpdates(function onHotUpdateSuccess() {
-      // Only destroy it when we're sure it's a hot update.
+      // Only dismiss it when we're sure it's a hot update.
       // Otherwise it would flicker right before the reload.
-      destroyErrorOverlay();
+      ErrorOverlay.dismissBuildError();
     });
   }
 }
@@ -247,9 +131,9 @@ function handleWarnings(warnings) {
       // Only print warnings if we aren't refreshing the page.
       // Otherwise they'll disappear right away anyway.
       printWarnings();
-      // Only destroy it when we're sure it's a hot update.
+      // Only dismiss it when we're sure it's a hot update.
       // Otherwise it would flicker right before the reload.
-      destroyErrorOverlay();
+      ErrorOverlay.dismissBuildError();
     });
   } else {
     // Print initial warnings immediately.
@@ -271,7 +155,7 @@ function handleErrors(errors) {
   });
 
   // Only show the first error.
-  showErrorOverlay(formatted.errors[0]);
+  ErrorOverlay.reportBuildError(formatted.errors[0]);
 
   // Also log them to the console.
   if (typeof console !== 'undefined' && typeof console.error === 'function') {
diff --git a/packages/react-error-overlay/.flowconfig b/packages/react-error-overlay/.flowconfig
index 261b8646fc3..8d7de784e29 100644
--- a/packages/react-error-overlay/.flowconfig
+++ b/packages/react-error-overlay/.flowconfig
@@ -1,4 +1,5 @@
 [ignore]
+.*/node_modules/eslint-plugin-jsx-a11y/.*
 
 [include]
 src/**/*.js
diff --git a/packages/react-error-overlay/fixtures/bundle.json b/packages/react-error-overlay/fixtures/bundle.json
index 7dfd31f5863..16670f6231f 100644
--- a/packages/react-error-overlay/fixtures/bundle.json
+++ b/packages/react-error-overlay/fixtures/bundle.json
@@ -240,11 +240,11 @@
     ]
   },
   {
-    "functionName": "Object.batchedUpdates",
+    "functionName": "batchedUpdates",
     "fileName": "http://localhost:3000/static/js/bundle.js",
     "lineNumber": 33900,
     "columnNumber": 26,
-    "_originalFunctionName": "Object.batchedUpdates",
+    "_originalFunctionName": "batchedUpdates",
     "_originalFileName": "webpack:///packages/react-scripts/~/react-dom/lib/ReactDefaultBatchingStrategy.js",
     "_originalLineNumber": 62,
     "_originalColumnNumber": 0,
@@ -264,11 +264,11 @@
     ]
   },
   {
-    "functionName": "Object.batchedUpdates",
+    "functionName": "batchedUpdates",
     "fileName": "http://localhost:3000/static/js/bundle.js",
     "lineNumber": 2181,
     "columnNumber": 27,
-    "_originalFunctionName": "Object.batchedUpdates",
+    "_originalFunctionName": "batchedUpdates",
     "_originalFileName": "webpack:///packages/react-scripts/~/react-dom/lib/ReactUpdates.js",
     "_originalLineNumber": 97,
     "_originalColumnNumber": 0,
@@ -288,11 +288,11 @@
     ]
   },
   {
-    "functionName": "Object._renderNewRootComponent",
+    "functionName": "_renderNewRootComponent",
     "fileName": "http://localhost:3000/static/js/bundle.js",
     "lineNumber": 14398,
     "columnNumber": 18,
-    "_originalFunctionName": "Object._renderNewRootComponent",
+    "_originalFunctionName": "_renderNewRootComponent",
     "_originalFileName": "webpack:///packages/react-scripts/~/react-dom/lib/ReactMount.js",
     "_originalLineNumber": 320,
     "_originalColumnNumber": 0,
@@ -312,11 +312,11 @@
     ]
   },
   {
-    "functionName": "Object._renderSubtreeIntoContainer",
+    "functionName": "_renderSubtreeIntoContainer",
     "fileName": "http://localhost:3000/static/js/bundle.js",
     "lineNumber": 14479,
     "columnNumber": 32,
-    "_originalFunctionName": "Object._renderSubtreeIntoContainer",
+    "_originalFunctionName": "_renderSubtreeIntoContainer",
     "_originalFileName": "webpack:///packages/react-scripts/~/react-dom/lib/ReactMount.js",
     "_originalLineNumber": 401,
     "_originalColumnNumber": 0,
@@ -336,11 +336,11 @@
     ]
   },
   {
-    "functionName": "Object.render",
+    "functionName": "render",
     "fileName": "http://localhost:3000/static/js/bundle.js",
     "lineNumber": 14500,
     "columnNumber": 23,
-    "_originalFunctionName": "Object.render",
+    "_originalFunctionName": "render",
     "_originalFileName": "webpack:///packages/react-scripts/~/react-dom/lib/ReactMount.js",
     "_originalLineNumber": 422,
     "_originalColumnNumber": 0,
@@ -360,11 +360,11 @@
     ]
   },
   {
-    "functionName": "Object.friendlySyntaxErrorLabel",
+    "functionName": null,
     "fileName": "http://localhost:3000/static/js/bundle.js",
     "lineNumber": 17287,
     "columnNumber": 20,
-    "_originalFunctionName": "Object.friendlySyntaxErrorLabel",
+    "_originalFunctionName": null,
     "_originalFileName": "webpack:///packages/react-scripts/template/src/index.js",
     "_originalLineNumber": 6,
     "_originalColumnNumber": 0,
@@ -432,11 +432,11 @@
     ]
   },
   {
-    "functionName": "Object.<anonymous>",
+    "functionName": null,
     "fileName": "http://localhost:3000/static/js/bundle.js",
     "lineNumber": 41219,
     "columnNumber": 18,
-    "_originalFunctionName": "Object.<anonymous>",
+    "_originalFunctionName": null,
     "_originalFileName": null,
     "_originalLineNumber": null,
     "_originalColumnNumber": null,
diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json
index 5a9e864c50f..65c9b5efa0a 100644
--- a/packages/react-error-overlay/package.json
+++ b/packages/react-error-overlay/package.json
@@ -34,7 +34,9 @@
     "anser": "1.4.1",
     "babel-code-frame": "6.22.0",
     "babel-runtime": "6.23.0",
-    "react-dev-utils": "^3.1.0",
+    "html-entities": "1.2.1",
+    "react": "^15.5.4",
+    "react-dom": "^15.5.4",
     "settle-promise": "1.0.0",
     "source-map": "0.5.6"
   },
diff --git a/packages/react-error-overlay/src/__tests__/stack-frame.js b/packages/react-error-overlay/src/__tests__/stack-frame.js
index dc6a01b4a06..5a015260ab2 100644
--- a/packages/react-error-overlay/src/__tests__/stack-frame.js
+++ b/packages/react-error-overlay/src/__tests__/stack-frame.js
@@ -13,9 +13,9 @@ test('proper empty shape', () => {
   const empty = new StackFrame();
   expect(empty).toMatchSnapshot();
 
-  expect(empty.getFunctionName()).toBe(null);
+  expect(empty.getFunctionName()).toBe('(anonymous function)');
   expect(empty.getSource()).toBe('');
-  expect(empty.toString()).toBe('');
+  expect(empty.toString()).toBe('(anonymous function)');
 });
 
 test('proper full shape', () => {
diff --git a/packages/react-error-overlay/src/components/CloseButton.js b/packages/react-error-overlay/src/components/CloseButton.js
new file mode 100644
index 00000000000..503b1198c3f
--- /dev/null
+++ b/packages/react-error-overlay/src/components/CloseButton.js
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+/* @flow */
+import React from 'react';
+import { black } from '../styles';
+
+const closeButtonStyle = {
+  color: black,
+  lineHeight: '1rem',
+  fontSize: '1.5rem',
+  padding: '1rem',
+  cursor: 'pointer',
+  position: 'absolute',
+  right: 0,
+  top: 0,
+};
+
+type CloseCallback = () => void;
+function CloseButton({ close }: {| close: CloseCallback |}) {
+  return (
+    <span
+      title="Click or press Escape to dismiss."
+      onClick={close}
+      style={closeButtonStyle}
+    >
+      ×
+    </span>
+  );
+}
+
+export default CloseButton;
diff --git a/packages/react-error-overlay/src/components/CodeBlock.js b/packages/react-error-overlay/src/components/CodeBlock.js
new file mode 100644
index 00000000000..478f0111b9b
--- /dev/null
+++ b/packages/react-error-overlay/src/components/CodeBlock.js
@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+/* @flow */
+import React from 'react';
+import { redTransparent, yellowTransparent } from '../styles';
+
+const _preStyle = {
+  display: 'block',
+  padding: '0.5em',
+  marginTop: '0.5em',
+  marginBottom: '0.5em',
+  overflowX: 'auto',
+  whiteSpace: 'pre-wrap',
+  borderRadius: '0.25rem',
+};
+
+const primaryPreStyle = {
+  ..._preStyle,
+  backgroundColor: redTransparent,
+};
+
+const secondaryPreStyle = {
+  ..._preStyle,
+  backgroundColor: yellowTransparent,
+};
+
+const codeStyle = {
+  fontFamily: 'Consolas, Menlo, monospace',
+};
+
+type CodeBlockPropsType = {|
+  main: boolean,
+  codeHTML: string,
+|};
+
+function CodeBlock(props: CodeBlockPropsType) {
+  const preStyle = props.main ? primaryPreStyle : secondaryPreStyle;
+  const codeBlock = { __html: props.codeHTML };
+
+  return (
+    <pre style={preStyle}>
+      <code style={codeStyle} dangerouslySetInnerHTML={codeBlock} />
+    </pre>
+  );
+}
+
+export default CodeBlock;
diff --git a/packages/react-error-overlay/src/components/Collapsible.js b/packages/react-error-overlay/src/components/Collapsible.js
new file mode 100644
index 00000000000..92f1de4295c
--- /dev/null
+++ b/packages/react-error-overlay/src/components/Collapsible.js
@@ -0,0 +1,78 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+/* @flow */
+import React, { Component } from 'react';
+import { black } from '../styles';
+
+const _collapsibleStyle = {
+  color: black,
+  cursor: 'pointer',
+  border: 'none',
+  display: 'block',
+  width: '100%',
+  textAlign: 'left',
+  background: '#fff',
+  fontFamily: 'Consolas, Menlo, monospace',
+  fontSize: '1em',
+  padding: '0px',
+  lineHeight: '1.5',
+};
+
+const collapsibleCollapsedStyle = {
+  ..._collapsibleStyle,
+  marginBottom: '1.5em',
+};
+
+const collapsibleExpandedStyle = {
+  ..._collapsibleStyle,
+  marginBottom: '0.6em',
+};
+
+class Collapsible extends Component {
+  state = {
+    collapsed: true,
+  };
+
+  toggleCollaped = () => {
+    this.setState(state => ({
+      collapsed: !state.collapsed,
+    }));
+  };
+
+  render() {
+    const count = this.props.children.length;
+    const collapsed = this.state.collapsed;
+    return (
+      <div>
+        <button
+          onClick={this.toggleCollaped}
+          style={
+            collapsed ? collapsibleCollapsedStyle : collapsibleExpandedStyle
+          }
+        >
+          {(collapsed ? '▶' : '▼') +
+            ` ${count} stack frames were ` +
+            (collapsed ? 'collapsed.' : 'expanded.')}
+        </button>
+        <div style={{ display: collapsed ? 'none' : 'block' }}>
+          {this.props.children}
+          <button
+            onClick={this.toggleCollaped}
+            style={collapsibleExpandedStyle}
+          >
+            {`▲ ${count} stack frames were expanded.`}
+          </button>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default Collapsible;
diff --git a/packages/react-error-overlay/src/components/Footer.js b/packages/react-error-overlay/src/components/Footer.js
new file mode 100644
index 00000000000..68eb8465674
--- /dev/null
+++ b/packages/react-error-overlay/src/components/Footer.js
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+/* @flow */
+import React from 'react';
+import { darkGray } from '../styles';
+
+const footerStyle = {
+  fontFamily: 'sans-serif',
+  color: darkGray,
+  marginTop: '0.5rem',
+  flex: '0 0 auto',
+};
+
+type FooterPropsType = {|
+  line1: string,
+  line2?: string,
+|};
+
+function Footer(props: FooterPropsType) {
+  return (
+    <div style={footerStyle}>
+      {props.line1}
+      <br />
+      {props.line2}
+    </div>
+  );
+}
+
+export default Footer;
diff --git a/packages/react-error-overlay/src/components/Header.js b/packages/react-error-overlay/src/components/Header.js
new file mode 100644
index 00000000000..a2f40973d00
--- /dev/null
+++ b/packages/react-error-overlay/src/components/Header.js
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+/* @flow */
+import React from 'react';
+import { red } from '../styles';
+
+const headerStyle = {
+  fontSize: '2em',
+  fontFamily: 'sans-serif',
+  color: red,
+  whiteSpace: 'pre-wrap',
+  // Top bottom margin spaces header
+  // Right margin revents overlap with close button
+  margin: '0 2rem 0.75rem 0',
+  flex: '0 0 auto',
+  maxHeight: '50%',
+  overflow: 'auto',
+};
+
+type HeaderPropType = {|
+  headerText: string,
+|};
+
+function Header(props: HeaderPropType) {
+  return (
+    <div style={headerStyle}>
+      {props.headerText}
+    </div>
+  );
+}
+
+export default Header;
diff --git a/packages/react-error-overlay/src/components/NavigationBar.js b/packages/react-error-overlay/src/components/NavigationBar.js
new file mode 100644
index 00000000000..4eba743cef7
--- /dev/null
+++ b/packages/react-error-overlay/src/components/NavigationBar.js
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+/* @flow */
+import React from 'react';
+import { red, redTransparent } from '../styles';
+
+const navigationBarStyle = {
+  marginBottom: '0.5rem',
+};
+
+const buttonContainerStyle = {
+  marginRight: '1em',
+};
+
+const _navButtonStyle = {
+  backgroundColor: redTransparent,
+  color: red,
+  border: 'none',
+  borderRadius: '4px',
+  padding: '3px 6px',
+  cursor: 'pointer',
+};
+
+const leftButtonStyle = {
+  ..._navButtonStyle,
+  borderTopRightRadius: '0px',
+  borderBottomRightRadius: '0px',
+  marginRight: '1px',
+};
+
+const rightButtonStyle = {
+  ..._navButtonStyle,
+  borderTopLeftRadius: '0px',
+  borderBottomLeftRadius: '0px',
+};
+
+type Callback = () => void;
+
+type NavigationBarPropsType = {|
+  currentError: number,
+  totalErrors: number,
+  previous: Callback,
+  next: Callback,
+|};
+
+function NavigationBar(props: NavigationBarPropsType) {
+  const { currentError, totalErrors, previous, next } = props;
+  return (
+    <div style={navigationBarStyle}>
+      <span style={buttonContainerStyle}>
+        <button onClick={previous} style={leftButtonStyle}>
+          ←
+        </button>
+        <button onClick={next} style={rightButtonStyle}>
+          →
+        </button>
+      </span>
+      {`${currentError} of ${totalErrors} errors on the page`}
+    </div>
+  );
+}
+
+export default NavigationBar;
diff --git a/packages/react-error-overlay/src/components/Overlay.js b/packages/react-error-overlay/src/components/Overlay.js
new file mode 100644
index 00000000000..4fe530b6fee
--- /dev/null
+++ b/packages/react-error-overlay/src/components/Overlay.js
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+/* @flow */
+import React, { Component } from 'react';
+import { black } from '../styles';
+
+const overlayStyle = {
+  position: 'relative',
+  display: 'inline-flex',
+  flexDirection: 'column',
+  height: '100%',
+  width: '1024px',
+  maxWidth: '100%',
+  overflowX: 'hidden',
+  overflowY: 'auto',
+  padding: '0.5rem',
+  boxSizing: 'border-box',
+  textAlign: 'left',
+  fontFamily: 'Consolas, Menlo, monospace',
+  fontSize: '11px',
+  whiteSpace: 'pre-wrap',
+  wordBreak: 'break-word',
+  lineHeight: 1.5,
+  color: black,
+};
+
+class Overlay extends Component {
+  iframeWindow: window = null;
+
+  getIframeWindow = (element: HTMLDivElement) => {
+    if (element) {
+      const document = element.ownerDocument;
+      this.iframeWindow = document.defaultView;
+    }
+  };
+
+  onKeyDown = (e: KeyboardEvent) => {
+    const { shortcutHandler } = this.props;
+    if (shortcutHandler) {
+      shortcutHandler(e.key);
+    }
+  };
+
+  componentDidMount() {
+    window.addEventListener('keydown', this.onKeyDown);
+    if (this.iframeWindow) {
+      this.iframeWindow.addEventListener('keydown', this.onKeyDown);
+    }
+  }
+
+  componentWillUnmount() {
+    window.removeEventListener('keydown', this.onKeyDown);
+    if (this.iframeWindow) {
+      this.iframeWindow.removeEventListener('keydown', this.onKeyDown);
+    }
+  }
+
+  render() {
+    return (
+      <div style={overlayStyle} ref={this.getIframeWindow}>
+        {this.props.children}
+      </div>
+    );
+  }
+}
+
+export default Overlay;
diff --git a/packages/react-error-overlay/src/components/additional.js b/packages/react-error-overlay/src/components/additional.js
deleted file mode 100644
index b573c740634..00000000000
--- a/packages/react-error-overlay/src/components/additional.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-/* @flow */
-import { applyStyles } from '../utils/dom/css';
-import {
-  additionalChildStyle,
-  groupStyle,
-  groupElemLeft,
-  groupElemRight,
-} from '../styles';
-import { consumeEvent } from '../utils/dom/consumeEvent';
-import { enableTabClick } from '../utils/dom/enableTabClick';
-
-type SwitchCallback = (offset: number) => void;
-function updateAdditional(
-  document: Document,
-  additionalReference: HTMLDivElement,
-  currentError: number,
-  totalErrors: number,
-  switchCallback: SwitchCallback
-) {
-  if (additionalReference.lastChild) {
-    additionalReference.removeChild(additionalReference.lastChild);
-  }
-
-  if (totalErrors <= 1) {
-    return;
-  }
-
-  const div = document.createElement('div');
-  applyStyles(div, additionalChildStyle);
-
-  const group = document.createElement('span');
-  applyStyles(group, groupStyle);
-
-  const left = document.createElement('button');
-  applyStyles(left, groupElemLeft);
-  left.addEventListener('click', function(e: MouseEvent) {
-    consumeEvent(e);
-    switchCallback(-1);
-  });
-  left.appendChild(document.createTextNode('←'));
-  enableTabClick(left);
-
-  const right = document.createElement('button');
-  applyStyles(right, groupElemRight);
-  right.addEventListener('click', function(e: MouseEvent) {
-    consumeEvent(e);
-    switchCallback(1);
-  });
-  right.appendChild(document.createTextNode('→'));
-  enableTabClick(right);
-
-  group.appendChild(left);
-  group.appendChild(right);
-  div.appendChild(group);
-
-  const text = `${currentError} of ${totalErrors} errors on the page`;
-  div.appendChild(document.createTextNode(text));
-
-  additionalReference.appendChild(div);
-}
-
-export type { SwitchCallback };
-export { updateAdditional };
diff --git a/packages/react-error-overlay/src/components/close.js b/packages/react-error-overlay/src/components/close.js
deleted file mode 100644
index 2ced8d0ce92..00000000000
--- a/packages/react-error-overlay/src/components/close.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-/* @flow */
-import { applyStyles } from '../utils/dom/css';
-import { hintsStyle, hintStyle, closeButtonStyle } from '../styles';
-
-function createHint(document: Document, hint: string, title: string) {
-  const span = document.createElement('span');
-  span.appendChild(document.createTextNode(hint));
-  span.setAttribute('title', title);
-  applyStyles(span, hintStyle);
-  return span;
-}
-
-type CloseCallback = () => void;
-function createClose(document: Document, callback: CloseCallback) {
-  const hints = document.createElement('div');
-  applyStyles(hints, hintsStyle);
-
-  const close = createHint(document, '×', 'Click or press Escape to dismiss.');
-  close.addEventListener('click', () => callback());
-  applyStyles(close, closeButtonStyle);
-  hints.appendChild(close);
-  return hints;
-}
-
-export type { CloseCallback };
-export { createClose };
diff --git a/packages/react-error-overlay/src/components/footer.js b/packages/react-error-overlay/src/components/footer.js
deleted file mode 100644
index 4586a04ff2b..00000000000
--- a/packages/react-error-overlay/src/components/footer.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-/* @flow */
-import { applyStyles } from '../utils/dom/css';
-import { footerStyle } from '../styles';
-
-function createFooter(document: Document) {
-  const div = document.createElement('div');
-  applyStyles(div, footerStyle);
-  div.appendChild(
-    document.createTextNode(
-      'This screen is visible only in development. It will not appear if the app crashes in production.'
-    )
-  );
-  div.appendChild(document.createElement('br'));
-  div.appendChild(
-    document.createTextNode(
-      'Open your browser’s developer console to further inspect this error.'
-    )
-  );
-  return div;
-}
-
-export { createFooter };
diff --git a/packages/react-error-overlay/src/components/frame.js b/packages/react-error-overlay/src/components/frame.js
deleted file mode 100644
index 4087f4d9c9d..00000000000
--- a/packages/react-error-overlay/src/components/frame.js
+++ /dev/null
@@ -1,355 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-/* @flow */
-import { enableTabClick } from '../utils/dom/enableTabClick';
-import { createCode } from './code';
-import { isInternalFile } from '../utils/isInternalFile';
-import type { StackFrame } from '../utils/stack-frame';
-import type { FrameSetting, OmitsObject } from './frames';
-import { applyStyles } from '../utils/dom/css';
-import {
-  omittedFramesExpandedStyle,
-  omittedFramesCollapsedStyle,
-  functionNameStyle,
-  depStyle,
-  linkStyle,
-  anchorStyle,
-  hiddenStyle,
-} from '../styles';
-
-function getGroupToggle(
-  document: Document,
-  omitsCount: number,
-  omitBundle: number
-) {
-  const omittedFrames = document.createElement('div');
-  enableTabClick(omittedFrames);
-  const text1 = document.createTextNode(
-    '\u25B6 ' + omitsCount + ' stack frames were collapsed.'
-  );
-  omittedFrames.appendChild(text1);
-  omittedFrames.addEventListener('click', function() {
-    const hide = text1.textContent.match(/▲/);
-    const list = document.getElementsByName('bundle-' + omitBundle);
-    for (let index = 0; index < list.length; ++index) {
-      const n = list[index];
-      if (hide) {
-        n.style.display = 'none';
-      } else {
-        n.style.display = '';
-      }
-    }
-    if (hide) {
-      text1.textContent = text1.textContent.replace(/▲/, '▶');
-      text1.textContent = text1.textContent.replace(/expanded/, 'collapsed');
-      applyStyles(omittedFrames, omittedFramesCollapsedStyle);
-    } else {
-      text1.textContent = text1.textContent.replace(/▶/, '▲');
-      text1.textContent = text1.textContent.replace(/collapsed/, 'expanded');
-      applyStyles(omittedFrames, omittedFramesExpandedStyle);
-    }
-  });
-  applyStyles(omittedFrames, omittedFramesCollapsedStyle);
-  return omittedFrames;
-}
-
-function insertBeforeBundle(
-  document: Document,
-  parent: Node,
-  omitsCount: number,
-  omitBundle: number,
-  actionElement
-) {
-  const children = document.getElementsByName('bundle-' + omitBundle);
-  if (children.length < 1) {
-    return;
-  }
-  let first: ?Node = children[0];
-  while (first != null && first.parentNode !== parent) {
-    first = first.parentNode;
-  }
-  const div = document.createElement('div');
-  enableTabClick(div);
-  div.setAttribute('name', 'bundle-' + omitBundle);
-  const text = document.createTextNode(
-    '\u25BC ' + omitsCount + ' stack frames were expanded.'
-  );
-  div.appendChild(text);
-  div.addEventListener('click', function() {
-    return actionElement.click();
-  });
-  applyStyles(div, omittedFramesExpandedStyle);
-  div.style.display = 'none';
-
-  parent.insertBefore(div, first);
-}
-
-function frameDiv(
-  document: Document,
-  functionName,
-  url,
-  internalUrl,
-  onSourceClick: ?Function
-) {
-  const frame = document.createElement('div');
-  const frameFunctionName = document.createElement('div');
-
-  if (functionName && functionName.indexOf('Object.') === 0) {
-    functionName = functionName.slice('Object.'.length);
-  }
-  if (functionName === '<anonymous>') {
-    functionName = null;
-  }
-  const cleanedFunctionName = functionName || '(anonymous function)';
-  const cleanedUrl = url.replace('webpack://', '.');
-
-  if (internalUrl) {
-    applyStyles(
-      frameFunctionName,
-      Object.assign({}, functionNameStyle, depStyle)
-    );
-  } else {
-    applyStyles(frameFunctionName, functionNameStyle);
-  }
-
-  frameFunctionName.appendChild(document.createTextNode(cleanedFunctionName));
-  frame.appendChild(frameFunctionName);
-
-  const frameLink = document.createElement('div');
-  applyStyles(frameLink, linkStyle);
-  const frameAnchor = document.createElement('a');
-  applyStyles(frameAnchor, anchorStyle);
-  frameAnchor.appendChild(document.createTextNode(cleanedUrl));
-  frameLink.appendChild(frameAnchor);
-  frame.appendChild(frameLink);
-
-  if (typeof onSourceClick === 'function') {
-    let handler = onSourceClick;
-    enableTabClick(frameAnchor);
-    frameAnchor.style.cursor = 'pointer';
-    frameAnchor.addEventListener('click', function() {
-      handler();
-    });
-  }
-
-  return frame;
-}
-
-function isBultinErrorName(errorName: ?string) {
-  switch (errorName) {
-    case 'EvalError':
-    case 'InternalError':
-    case 'RangeError':
-    case 'ReferenceError':
-    case 'SyntaxError':
-    case 'TypeError':
-    case 'URIError':
-      return true;
-    default:
-      return false;
-  }
-}
-
-function getPrettyURL(
-  sourceFileName: ?string,
-  sourceLineNumber: ?number,
-  sourceColumnNumber: ?number,
-  fileName: ?string,
-  lineNumber: ?number,
-  columnNumber: ?number,
-  compiled: boolean
-): string {
-  let prettyURL;
-  if (!compiled && sourceFileName && typeof sourceLineNumber === 'number') {
-    // Remove everything up to the first /src/ or /node_modules/
-    const trimMatch = /^[/|\\].*?[/|\\]((src|node_modules)[/|\\].*)/.exec(
-      sourceFileName
-    );
-    if (trimMatch && trimMatch[1]) {
-      prettyURL = trimMatch[1];
-    } else {
-      prettyURL = sourceFileName;
-    }
-    prettyURL += ':' + sourceLineNumber;
-    // Note: we intentionally skip 0's because they're produced by cheap Webpack maps
-    if (sourceColumnNumber) {
-      prettyURL += ':' + sourceColumnNumber;
-    }
-  } else if (fileName && typeof lineNumber === 'number') {
-    prettyURL = fileName + ':' + lineNumber;
-    // Note: we intentionally skip 0's because they're produced by cheap Webpack maps
-    if (columnNumber) {
-      prettyURL += ':' + columnNumber;
-    }
-  } else {
-    prettyURL = 'unknown';
-  }
-  return prettyURL;
-}
-
-function createFrame(
-  document: Document,
-  frameSetting: FrameSetting,
-  frame: StackFrame,
-  contextSize: number,
-  critical: boolean,
-  omits: OmitsObject,
-  omitBundle: number,
-  parentContainer: HTMLDivElement,
-  lastElement: boolean,
-  errorName: ?string
-) {
-  const { compiled } = frameSetting;
-  let { functionName, _originalFileName: sourceFileName } = frame;
-  const {
-    fileName,
-    lineNumber,
-    columnNumber,
-    _scriptCode: scriptLines,
-    _originalLineNumber: sourceLineNumber,
-    _originalColumnNumber: sourceColumnNumber,
-    _originalScriptCode: sourceLines,
-  } = frame;
-
-  // TODO: find a better place for this.
-  // Chrome has a bug with inferring function.name:
-  // https://github.com/facebookincubator/create-react-app/issues/2097
-  // Let's ignore a meaningless name we get for top-level modules.
-  if (
-    functionName === 'Object.friendlySyntaxErrorLabel' ||
-    functionName === 'Object.exports.__esModule'
-  ) {
-    functionName = '(anonymous function)';
-  }
-
-  const prettyURL = getPrettyURL(
-    sourceFileName,
-    sourceLineNumber,
-    sourceColumnNumber,
-    fileName,
-    lineNumber,
-    columnNumber,
-    compiled
-  );
-
-  let needsHidden = false;
-  const isInternalUrl = isInternalFile(sourceFileName, fileName);
-  const isThrownIntentionally = !isBultinErrorName(errorName);
-  const shouldCollapse =
-    isInternalUrl && (isThrownIntentionally || omits.hasReachedAppCode);
-
-  if (!isInternalUrl) {
-    omits.hasReachedAppCode = true;
-  }
-
-  if (shouldCollapse) {
-    ++omits.value;
-    needsHidden = true;
-  }
-
-  let collapseElement = null;
-  if (!shouldCollapse || lastElement) {
-    if (omits.value > 0) {
-      const capV = omits.value;
-      const omittedFrames = getGroupToggle(document, capV, omitBundle);
-      window.requestAnimationFrame(() => {
-        insertBeforeBundle(
-          document,
-          parentContainer,
-          capV,
-          omitBundle,
-          omittedFrames
-        );
-      });
-      if (lastElement && shouldCollapse) {
-        collapseElement = omittedFrames;
-      } else {
-        parentContainer.appendChild(omittedFrames);
-      }
-      ++omits.bundle;
-    }
-    omits.value = 0;
-  }
-
-  let onSourceClick = null;
-  if (sourceFileName) {
-    // e.g. "/path-to-my-app/webpack/bootstrap eaddeb46b67d75e4dfc1"
-    const isInternalWebpackBootstrapCode =
-      sourceFileName.trim().indexOf(' ') !== -1;
-    if (!isInternalWebpackBootstrapCode) {
-      onSourceClick = () => {
-        // Keep this in sync with react-error-overlay/middleware.js
-        fetch(
-          '/__open-stack-frame-in-editor?fileName=' +
-            window.encodeURIComponent(sourceFileName) +
-            '&lineNumber=' +
-            window.encodeURIComponent(sourceLineNumber || 1)
-        ).then(() => {}, () => {});
-      };
-    }
-  }
-
-  const elem = frameDiv(
-    document,
-    functionName,
-    prettyURL,
-    shouldCollapse,
-    onSourceClick
-  );
-  if (needsHidden) {
-    applyStyles(elem, hiddenStyle);
-    elem.setAttribute('name', 'bundle-' + omitBundle);
-  }
-
-  let hasSource = false;
-  if (!shouldCollapse) {
-    if (
-      compiled &&
-      scriptLines &&
-      scriptLines.length !== 0 &&
-      lineNumber != null
-    ) {
-      elem.appendChild(
-        createCode(
-          document,
-          scriptLines,
-          lineNumber,
-          columnNumber,
-          contextSize,
-          critical,
-          onSourceClick
-        )
-      );
-      hasSource = true;
-    } else if (
-      !compiled &&
-      sourceLines &&
-      sourceLines.length !== 0 &&
-      sourceLineNumber != null
-    ) {
-      elem.appendChild(
-        createCode(
-          document,
-          sourceLines,
-          sourceLineNumber,
-          sourceColumnNumber,
-          contextSize,
-          critical,
-          onSourceClick
-        )
-      );
-      hasSource = true;
-    }
-  }
-
-  return { elem: elem, hasSource: hasSource, collapseElement: collapseElement };
-}
-
-export { createFrame };
diff --git a/packages/react-error-overlay/src/components/frames.js b/packages/react-error-overlay/src/components/frames.js
deleted file mode 100644
index 8bd50509295..00000000000
--- a/packages/react-error-overlay/src/components/frames.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-/* @flow */
-import type { StackFrame } from '../utils/stack-frame';
-import { applyStyles } from '../utils/dom/css';
-import { traceStyle, toggleStyle } from '../styles';
-import { enableTabClick } from '../utils/dom/enableTabClick';
-import { createFrame } from './frame';
-
-type OmitsObject = {
-  value: number,
-  bundle: number,
-  hasReachedAppCode: boolean,
-};
-type FrameSetting = { compiled: boolean };
-export type { OmitsObject, FrameSetting };
-
-function createFrameWrapper(
-  document: Document,
-  parent: HTMLDivElement,
-  factory,
-  lIndex: number,
-  frameSettings: FrameSetting[],
-  contextSize: number
-) {
-  const fac = factory();
-  if (fac == null) {
-    return;
-  }
-  const { hasSource, elem, collapseElement } = fac;
-
-  const elemWrapper = document.createElement('div');
-  elemWrapper.appendChild(elem);
-
-  if (hasSource) {
-    const compiledDiv = document.createElement('div');
-    enableTabClick(compiledDiv);
-    applyStyles(compiledDiv, toggleStyle);
-
-    const o = frameSettings[lIndex];
-    const compiledText = document.createTextNode(
-      'View ' + (o && o.compiled ? 'source' : 'compiled')
-    );
-    compiledDiv.addEventListener('click', function() {
-      if (o) {
-        o.compiled = !o.compiled;
-      }
-
-      const next = createFrameWrapper(
-        document,
-        parent,
-        factory,
-        lIndex,
-        frameSettings,
-        contextSize
-      );
-      if (next != null) {
-        parent.insertBefore(next, elemWrapper);
-        parent.removeChild(elemWrapper);
-      }
-    });
-    compiledDiv.appendChild(compiledText);
-    elemWrapper.appendChild(compiledDiv);
-  }
-
-  if (collapseElement != null) {
-    elemWrapper.appendChild(collapseElement);
-  }
-
-  return elemWrapper;
-}
-
-function createFrames(
-  document: Document,
-  resolvedFrames: StackFrame[],
-  frameSettings: FrameSetting[],
-  contextSize: number,
-  errorName: ?string
-) {
-  if (resolvedFrames.length !== frameSettings.length) {
-    throw new Error(
-      'You must give a frame settings array of identical length to resolved frames.'
-    );
-  }
-  const trace = document.createElement('div');
-  applyStyles(trace, traceStyle);
-
-  let index = 0;
-  let critical = true;
-  const omits: OmitsObject = { value: 0, bundle: 1, hasReachedAppCode: false };
-  resolvedFrames.forEach(function(frame) {
-    const lIndex = index++;
-    const elem = createFrameWrapper(
-      document,
-      trace,
-      createFrame.bind(
-        undefined,
-        document,
-        frameSettings[lIndex],
-        frame,
-        contextSize,
-        critical,
-        omits,
-        omits.bundle,
-        trace,
-        index === resolvedFrames.length,
-        errorName
-      ),
-      lIndex,
-      frameSettings,
-      contextSize
-    );
-    if (elem == null) {
-      return;
-    }
-    critical = false;
-    trace.appendChild(elem);
-  });
-  //TODO: fix this
-  omits.value = 0;
-
-  return trace;
-}
-
-export { createFrames };
diff --git a/packages/react-error-overlay/src/components/overlay.js b/packages/react-error-overlay/src/components/overlay.js
deleted file mode 100644
index 69acf9ad43f..00000000000
--- a/packages/react-error-overlay/src/components/overlay.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-/* @flow */
-import { applyStyles } from '../utils/dom/css';
-import { containerStyle, overlayStyle, headerStyle } from '../styles';
-import { createClose } from './close';
-import { createFrames } from './frames';
-import { createFooter } from './footer';
-import type { CloseCallback } from './close';
-import type { StackFrame } from '../utils/stack-frame';
-import { updateAdditional } from './additional';
-import type { FrameSetting } from './frames';
-import type { SwitchCallback } from './additional';
-
-function createOverlay(
-  document: Document,
-  name: ?string,
-  message: string,
-  frames: StackFrame[],
-  contextSize: number,
-  currentError: number,
-  totalErrors: number,
-  switchCallback: SwitchCallback,
-  closeCallback: CloseCallback
-): {
-  overlay: HTMLDivElement,
-  additional: HTMLDivElement,
-} {
-  const frameSettings: FrameSetting[] = frames.map(() => ({ compiled: false }));
-  // Create overlay
-  const overlay = document.createElement('div');
-  applyStyles(overlay, overlayStyle);
-
-  // Create container
-  const container = document.createElement('div');
-  applyStyles(container, containerStyle);
-  overlay.appendChild(container);
-  container.appendChild(createClose(document, closeCallback));
-
-  // Create "Errors X of Y" in case of multiple errors
-  const additional = document.createElement('div');
-  updateAdditional(
-    document,
-    additional,
-    currentError,
-    totalErrors,
-    switchCallback
-  );
-  container.appendChild(additional);
-
-  // Create header
-  const header = document.createElement('div');
-  applyStyles(header, headerStyle);
-
-  // Make message prettier
-  let finalMessage =
-    message.match(/^\w*:/) || !name ? message : name + ': ' + message;
-
-  finalMessage = finalMessage
-    // TODO: maybe remove this prefix from fbjs?
-    // It's just scaring people
-    .replace(/^Invariant Violation:\s*/, '')
-    // This is not helpful either:
-    .replace(/^Warning:\s*/, '')
-    // Break the actionable part to the next line.
-    // AFAIK React 16+ should already do this.
-    .replace(' Check the render method', '\n\nCheck the render method')
-    .replace(' Check your code at', '\n\nCheck your code at');
-
-  // Put it in the DOM
-  header.appendChild(document.createTextNode(finalMessage));
-  container.appendChild(header);
-
-  // Create trace
-  container.appendChild(
-    createFrames(document, frames, frameSettings, contextSize, name)
-  );
-
-  // Show message
-  container.appendChild(createFooter(document));
-
-  return {
-    overlay,
-    additional,
-  };
-}
-
-export { createOverlay };
diff --git a/packages/react-error-overlay/src/containers/CompileErrorContainer.js b/packages/react-error-overlay/src/containers/CompileErrorContainer.js
new file mode 100644
index 00000000000..bd193eb50b4
--- /dev/null
+++ b/packages/react-error-overlay/src/containers/CompileErrorContainer.js
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+/* @flow */
+import React, { PureComponent } from 'react';
+import Overlay from '../components/Overlay';
+import Footer from '../components/Footer';
+import Header from '../components/Header';
+import CodeBlock from '../components/CodeBlock';
+import generateAnsiHTML from '../utils/generateAnsiHTML';
+
+class CompileErrorContainer extends PureComponent {
+  render() {
+    const { error } = this.props;
+    return (
+      <Overlay>
+        <Header headerText="Failed to compile" />
+        <CodeBlock main={true} codeHTML={generateAnsiHTML(error)} />
+        <Footer line1="This error occurred during the build time and cannot be dismissed." />
+      </Overlay>
+    );
+  }
+}
+
+export default CompileErrorContainer;
diff --git a/packages/react-error-overlay/src/containers/RuntimeError.js b/packages/react-error-overlay/src/containers/RuntimeError.js
new file mode 100644
index 00000000000..c64824137d2
--- /dev/null
+++ b/packages/react-error-overlay/src/containers/RuntimeError.js
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+/* @flow */
+import React from 'react';
+import Header from '../components/Header';
+import StackTrace from './StackTrace';
+import type { StackFrame } from '../utils/stack-frame';
+
+const wrapperStyle = {
+  display: 'flex',
+  flexDirection: 'column',
+};
+
+type ErrorRecord = {|
+  error: Error,
+  unhandledRejection: boolean,
+  contextSize: number,
+  stackFrames: StackFrame[],
+|};
+
+type Props = {|
+  errorRecord: ErrorRecord,
+  launchEditorEndpoint: ?string,
+|};
+
+function RuntimeError({ errorRecord, launchEditorEndpoint }: Props) {
+  const { error, unhandledRejection, contextSize, stackFrames } = errorRecord;
+  const errorName = unhandledRejection
+    ? 'Unhandled Rejection (' + error.name + ')'
+    : error.name;
+
+  // Make header prettier
+  const message = error.message;
+  let headerText =
+    message.match(/^\w*:/) || !errorName ? message : errorName + ': ' + message;
+
+  headerText = headerText
+    // TODO: maybe remove this prefix from fbjs?
+    // It's just scaring people
+    .replace(/^Invariant Violation:\s*/, '')
+    // This is not helpful either:
+    .replace(/^Warning:\s*/, '')
+    // Break the actionable part to the next line.
+    // AFAIK React 16+ should already do this.
+    .replace(' Check the render method', '\n\nCheck the render method')
+    .replace(' Check your code at', '\n\nCheck your code at');
+
+  return (
+    <div style={wrapperStyle}>
+      <Header headerText={headerText} />
+      <StackTrace
+        stackFrames={stackFrames}
+        errorName={errorName}
+        contextSize={contextSize}
+        launchEditorEndpoint={launchEditorEndpoint}
+      />
+    </div>
+  );
+}
+
+export default RuntimeError;
diff --git a/packages/react-error-overlay/src/containers/RuntimeErrorContainer.js b/packages/react-error-overlay/src/containers/RuntimeErrorContainer.js
new file mode 100644
index 00000000000..c84adb19492
--- /dev/null
+++ b/packages/react-error-overlay/src/containers/RuntimeErrorContainer.js
@@ -0,0 +1,77 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+/* @flow */
+import React, { PureComponent } from 'react';
+import Overlay from '../components/Overlay';
+import CloseButton from '../components/CloseButton';
+import NavigationBar from '../components/NavigationBar';
+import RuntimeError from './RuntimeError';
+import Footer from '../components/Footer';
+
+class RuntimeErrorContainer extends PureComponent {
+  state = {
+    currentIndex: 0,
+  };
+
+  previous = () => {
+    this.setState((state, props) => ({
+      currentIndex:
+        state.currentIndex > 0
+          ? state.currentIndex - 1
+          : props.errorRecords.length - 1,
+    }));
+  };
+
+  next = () => {
+    this.setState((state, props) => ({
+      currentIndex:
+        state.currentIndex < props.errorRecords.length - 1
+          ? state.currentIndex + 1
+          : 0,
+    }));
+  };
+
+  shortcutHandler = (key: string) => {
+    if (key === 'Escape') {
+      this.props.close();
+    } else if (key === 'ArrowLeft') {
+      this.previous();
+    } else if (key === 'ArrowRight') {
+      this.next();
+    }
+  };
+
+  render() {
+    const { errorRecords, close } = this.props;
+    const totalErrors = errorRecords.length;
+    return (
+      <Overlay shortcutHandler={this.shortcutHandler}>
+        <CloseButton close={close} />
+        {totalErrors > 1 &&
+          <NavigationBar
+            currentError={this.state.currentIndex + 1}
+            totalErrors={totalErrors}
+            previous={this.previous}
+            next={this.next}
+          />}
+        <RuntimeError
+          errorRecord={errorRecords[this.state.currentIndex]}
+          launchEditorEndpoint={this.props.launchEditorEndpoint}
+        />
+        <Footer
+          line1="This screen is visible only in development. It will not appear if the app crashes in production."
+          line2="Open your browser’s developer console to further inspect this error."
+        />
+      </Overlay>
+    );
+  }
+}
+
+export default RuntimeErrorContainer;
diff --git a/packages/react-error-overlay/src/containers/StackFrame.js b/packages/react-error-overlay/src/containers/StackFrame.js
new file mode 100644
index 00000000000..c95ce003f49
--- /dev/null
+++ b/packages/react-error-overlay/src/containers/StackFrame.js
@@ -0,0 +1,188 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+/* @flow */
+import React, { Component } from 'react';
+import CodeBlock from './StackFrameCodeBlock';
+import { getPrettyURL } from '../utils/getPrettyURL';
+import { darkGray } from '../styles';
+
+const linkStyle = {
+  fontSize: '0.9em',
+  marginBottom: '0.9em',
+};
+
+const anchorStyle = {
+  textDecoration: 'none',
+  color: darkGray,
+  cursor: 'pointer',
+};
+
+const codeAnchorStyle = {
+  cursor: 'pointer',
+};
+
+const toggleStyle = {
+  marginBottom: '1.5em',
+  color: darkGray,
+  cursor: 'pointer',
+  border: 'none',
+  display: 'block',
+  width: '100%',
+  textAlign: 'left',
+  background: '#fff',
+  fontFamily: 'Consolas, Menlo, monospace',
+  fontSize: '1em',
+  padding: '0px',
+  lineHeight: '1.5',
+};
+
+class StackFrame extends Component {
+  state = {
+    compiled: false,
+  };
+
+  toggleCompiled = () => {
+    this.setState(state => ({
+      compiled: !state.compiled,
+    }));
+  };
+
+  canOpenInEditor() {
+    if (!this.props.launchEditorEndpoint) {
+      return;
+    }
+    const { _originalFileName: sourceFileName } = this.props.frame;
+    // Unknown file
+    if (!sourceFileName) {
+      return false;
+    }
+    // e.g. "/path-to-my-app/webpack/bootstrap eaddeb46b67d75e4dfc1"
+    const isInternalWebpackBootstrapCode =
+      sourceFileName.trim().indexOf(' ') !== -1;
+    if (isInternalWebpackBootstrapCode) {
+      return false;
+    }
+    // Code is in a real file
+    return true;
+  }
+
+  openInEditor = () => {
+    if (!this.canOpenInEditor()) {
+      return;
+    }
+    const {
+      _originalFileName: sourceFileName,
+      _originalLineNumber: sourceLineNumber,
+    } = this.props.frame;
+    // Keep this in sync with react-error-overlay/middleware.js
+    fetch(
+      `${this.props.launchEditorEndpoint}?fileName=` +
+        window.encodeURIComponent(sourceFileName) +
+        '&lineNumber=' +
+        window.encodeURIComponent(sourceLineNumber || 1)
+    ).then(() => {}, () => {});
+  };
+
+  onKeyDown = (e: SyntheticKeyboardEvent) => {
+    if (e.key === 'Enter') {
+      this.openInEditor();
+    }
+  };
+
+  render() {
+    const { frame, contextSize, critical, showCode } = this.props;
+    const {
+      fileName,
+      lineNumber,
+      columnNumber,
+      _scriptCode: scriptLines,
+      _originalFileName: sourceFileName,
+      _originalLineNumber: sourceLineNumber,
+      _originalColumnNumber: sourceColumnNumber,
+      _originalScriptCode: sourceLines,
+    } = frame;
+    const functionName = frame.getFunctionName();
+
+    const compiled = this.state.compiled;
+    const url = getPrettyURL(
+      sourceFileName,
+      sourceLineNumber,
+      sourceColumnNumber,
+      fileName,
+      lineNumber,
+      columnNumber,
+      compiled
+    );
+
+    let codeBlockProps = null;
+    if (showCode) {
+      if (
+        compiled &&
+        scriptLines &&
+        scriptLines.length !== 0 &&
+        lineNumber != null
+      ) {
+        codeBlockProps = {
+          lines: scriptLines,
+          lineNum: lineNumber,
+          columnNum: columnNumber,
+          contextSize,
+          main: critical,
+        };
+      } else if (
+        !compiled &&
+        sourceLines &&
+        sourceLines.length !== 0 &&
+        sourceLineNumber != null
+      ) {
+        codeBlockProps = {
+          lines: sourceLines,
+          lineNum: sourceLineNumber,
+          columnNum: sourceColumnNumber,
+          contextSize,
+          main: critical,
+        };
+      }
+    }
+
+    const canOpenInEditor = this.canOpenInEditor();
+    return (
+      <div>
+        <div>
+          {functionName}
+        </div>
+        <div style={linkStyle}>
+          <a
+            style={canOpenInEditor ? anchorStyle : null}
+            onClick={canOpenInEditor ? this.openInEditor : null}
+            onKeyDown={canOpenInEditor ? this.onKeyDown : null}
+            tabIndex={canOpenInEditor ? '0' : null}
+          >
+            {url}
+          </a>
+        </div>
+        {codeBlockProps &&
+          <span>
+            <a
+              onClick={canOpenInEditor ? this.openInEditor : null}
+              style={canOpenInEditor ? codeAnchorStyle : null}
+            >
+              <CodeBlock {...codeBlockProps} />
+            </a>
+            <button style={toggleStyle} onClick={this.toggleCompiled}>
+              {'View ' + (compiled ? 'source' : 'compiled')}
+            </button>
+          </span>}
+      </div>
+    );
+  }
+}
+
+export default StackFrame;
diff --git a/packages/react-error-overlay/src/components/code.js b/packages/react-error-overlay/src/containers/StackFrameCodeBlock.js
similarity index 71%
rename from packages/react-error-overlay/src/components/code.js
rename to packages/react-error-overlay/src/containers/StackFrameCodeBlock.js
index 580fe3b1be5..2ed685cff49 100644
--- a/packages/react-error-overlay/src/components/code.js
+++ b/packages/react-error-overlay/src/containers/StackFrameCodeBlock.js
@@ -8,33 +8,29 @@
  */
 
 /* @flow */
-import type { ScriptLine } from '../utils/stack-frame';
+import React from 'react';
+import CodeBlock from '../components/CodeBlock';
 import { applyStyles } from '../utils/dom/css';
 import { absolutifyCaret } from '../utils/dom/absolutifyCaret';
-import {
-  codeStyle,
-  primaryErrorStyle,
-  primaryPreStyle,
-  secondaryErrorStyle,
-  secondaryPreStyle,
-} from '../styles';
-
-import generateAnsiHtml from 'react-dev-utils/ansiHTML';
+import type { ScriptLine } from '../utils/stack-frame';
+import { primaryErrorStyle, secondaryErrorStyle } from '../styles';
+import generateAnsiHTML from '../utils/generateAnsiHTML';
 
 import codeFrame from 'babel-code-frame';
 
-function createCode(
-  document: Document,
-  sourceLines: ScriptLine[],
+type StackFrameCodeBlockPropsType = {|
+  lines: ScriptLine[],
   lineNum: number,
-  columnNum: number | null,
+  columnNum: number,
   contextSize: number,
   main: boolean,
-  onSourceClick: ?Function
-) {
+|};
+
+function StackFrameCodeBlock(props: StackFrameCodeBlockPropsType) {
+  const { lines, lineNum, columnNum, contextSize, main } = props;
   const sourceCode = [];
   let whiteSpace = Infinity;
-  sourceLines.forEach(function(e) {
+  lines.forEach(function(e) {
     const { content: text } = e;
     const m = text.match(/^\s*/);
     if (text === '') {
@@ -46,7 +42,7 @@ function createCode(
       whiteSpace = 0;
     }
   });
-  sourceLines.forEach(function(e) {
+  lines.forEach(function(e) {
     let { content: text } = e;
     const { lineNumber: line } = e;
 
@@ -65,11 +61,10 @@ function createCode(
       linesBelow: contextSize,
     }
   );
-  const htmlHighlight = generateAnsiHtml(ansiHighlight);
+  const htmlHighlight = generateAnsiHTML(ansiHighlight);
   const code = document.createElement('code');
   code.innerHTML = htmlHighlight;
   absolutifyCaret(code);
-  applyStyles(code, codeStyle);
 
   const ccn = code.childNodes;
   // eslint-disable-next-line
@@ -91,19 +86,8 @@ function createCode(
       break oLoop;
     }
   }
-  const pre = document.createElement('pre');
-  applyStyles(pre, main ? primaryPreStyle : secondaryPreStyle);
-  pre.appendChild(code);
-
-  if (typeof onSourceClick === 'function') {
-    let handler = onSourceClick;
-    pre.style.cursor = 'pointer';
-    pre.addEventListener('click', function() {
-      handler();
-    });
-  }
 
-  return pre;
+  return <CodeBlock main={main} codeHTML={code.innerHTML} />;
 }
 
-export { createCode };
+export default StackFrameCodeBlock;
diff --git a/packages/react-error-overlay/src/containers/StackTrace.js b/packages/react-error-overlay/src/containers/StackTrace.js
new file mode 100644
index 00000000000..4cb20bce128
--- /dev/null
+++ b/packages/react-error-overlay/src/containers/StackTrace.js
@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+/* @flow */
+import React, { Component } from 'react';
+import StackFrame from './StackFrame';
+import Collapsible from '../components/Collapsible';
+import { isInternalFile } from '../utils/isInternalFile';
+import { isBultinErrorName } from '../utils/isBultinErrorName';
+
+const traceStyle = {
+  fontSize: '1em',
+  flex: '0 1 auto',
+  minHeight: '0px',
+  overflow: 'auto',
+};
+
+class StackTrace extends Component {
+  renderFrames() {
+    const {
+      stackFrames,
+      errorName,
+      contextSize,
+      launchEditorEndpoint,
+    } = this.props;
+    const renderedFrames = [];
+    let hasReachedAppCode = false,
+      currentBundle = [],
+      bundleCount = 0;
+
+    stackFrames.forEach((frame, index) => {
+      const { fileName, _originalFileName: sourceFileName } = frame;
+      const isInternalUrl = isInternalFile(sourceFileName, fileName);
+      const isThrownIntentionally = !isBultinErrorName(errorName);
+      const shouldCollapse =
+        isInternalUrl && (isThrownIntentionally || hasReachedAppCode);
+
+      if (!isInternalUrl) {
+        hasReachedAppCode = true;
+      }
+
+      const frameEle = (
+        <StackFrame
+          key={'frame-' + index}
+          frame={frame}
+          contextSize={contextSize}
+          critical={index === 0}
+          showCode={!shouldCollapse}
+          launchEditorEndpoint={launchEditorEndpoint}
+        />
+      );
+      const lastElement = index === stackFrames.length - 1;
+
+      if (shouldCollapse) {
+        currentBundle.push(frameEle);
+      }
+
+      if (!shouldCollapse || lastElement) {
+        if (currentBundle.length === 1) {
+          renderedFrames.push(currentBundle[0]);
+        } else if (currentBundle.length > 1) {
+          bundleCount++;
+          renderedFrames.push(
+            <Collapsible key={'bundle-' + bundleCount}>
+              {currentBundle}
+            </Collapsible>
+          );
+        }
+        currentBundle = [];
+      }
+
+      if (!shouldCollapse) {
+        renderedFrames.push(frameEle);
+      }
+    });
+
+    return renderedFrames;
+  }
+
+  render() {
+    return (
+      <div style={traceStyle}>
+        {this.renderFrames()}
+      </div>
+    );
+  }
+}
+
+export default StackTrace;
diff --git a/packages/react-error-overlay/src/effects/shortcuts.js b/packages/react-error-overlay/src/effects/shortcuts.js
deleted file mode 100644
index bf8fd6d5eb7..00000000000
--- a/packages/react-error-overlay/src/effects/shortcuts.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-/* @flow */
-const SHORTCUT_ESCAPE = 'SHORTCUT_ESCAPE',
-  SHORTCUT_LEFT = 'SHORTCUT_LEFT',
-  SHORTCUT_RIGHT = 'SHORTCUT_RIGHT';
-
-let boundKeyHandler = null;
-
-type ShortcutCallback = (type: string) => void;
-
-function keyHandler(callback: ShortcutCallback, e: KeyboardEvent) {
-  const { key, keyCode, which } = e;
-  if (key === 'Escape' || keyCode === 27 || which === 27) {
-    callback(SHORTCUT_ESCAPE);
-  } else if (key === 'ArrowLeft' || keyCode === 37 || which === 37) {
-    callback(SHORTCUT_LEFT);
-  } else if (key === 'ArrowRight' || keyCode === 39 || which === 39) {
-    callback(SHORTCUT_RIGHT);
-  }
-}
-
-function registerShortcuts(target: EventTarget, callback: ShortcutCallback) {
-  if (boundKeyHandler !== null) {
-    return;
-  }
-  boundKeyHandler = keyHandler.bind(undefined, callback);
-  target.addEventListener('keydown', boundKeyHandler);
-}
-
-function unregisterShortcuts(target: EventTarget) {
-  if (boundKeyHandler === null) {
-    return;
-  }
-  target.removeEventListener('keydown', boundKeyHandler);
-  boundKeyHandler = null;
-}
-
-export {
-  SHORTCUT_ESCAPE,
-  SHORTCUT_LEFT,
-  SHORTCUT_RIGHT,
-  registerShortcuts as register,
-  unregisterShortcuts as unregister,
-  keyHandler as handler,
-};
diff --git a/packages/react-error-overlay/src/index.js b/packages/react-error-overlay/src/index.js
index 4f3b2316727..ff4f1c71404 100644
--- a/packages/react-error-overlay/src/index.js
+++ b/packages/react-error-overlay/src/index.js
@@ -8,11 +8,158 @@
  */
 
 /* @flow */
-import { inject, uninject } from './overlay';
+import React from 'react';
+import ReactDOM from 'react-dom';
+import CompileErrorContainer from './containers/CompileErrorContainer';
+import RuntimeErrorContainer from './containers/RuntimeErrorContainer';
+import { listenToRuntimeErrors } from './listenToRuntimeErrors';
+import { iframeStyle, overlayStyle } from './styles';
+import { applyStyles } from './utils/dom/css';
 
-inject();
-if (module.hot && typeof module.hot.dispose === 'function') {
-  module.hot.dispose(function() {
-    uninject();
+import type { ErrorRecord } from './listenToRuntimeErrors';
+
+type RuntimeReportingOptions = {|
+  onError: () => void,
+  launchEditorEndpoint: string,
+|};
+
+let iframe: null | HTMLIFrameElement = null;
+let isLoadingIframe: boolean = false;
+
+let renderedElement: null | React.Element<any> = null;
+let currentBuildError: null | string = null;
+let currentRuntimeErrorRecords: Array<ErrorRecord> = [];
+let currentRuntimeErrorOptions: null | RuntimeReportingOptions = null;
+let stopListeningToRuntimeErrors: null | (() => void) = null;
+
+export function reportBuildError(error: string) {
+  currentBuildError = error;
+  update();
+}
+
+export function dismissBuildError() {
+  currentBuildError = null;
+  update();
+}
+
+export function startReportingRuntimeErrors(options: RuntimeReportingOptions) {
+  if (stopListeningToRuntimeErrors !== null) {
+    throw new Error('Already listening');
+  }
+  currentRuntimeErrorOptions = options;
+  listenToRuntimeErrors(errorRecord => {
+    try {
+      if (typeof options.onError === 'function') {
+        options.onError.call(null);
+      }
+    } finally {
+      handleRuntimeError(errorRecord);
+    }
   });
 }
+
+function handleRuntimeError(errorRecord) {
+  if (
+    currentRuntimeErrorRecords.some(({ error }) => error === errorRecord.error)
+  ) {
+    // Deduplicate identical errors.
+    // This fixes https://github.com/facebookincubator/create-react-app/issues/3011.
+    return;
+  }
+  currentRuntimeErrorRecords = currentRuntimeErrorRecords.concat([errorRecord]);
+  update();
+}
+
+function dismissRuntimeErrors() {
+  currentRuntimeErrorRecords = [];
+  update();
+}
+
+export function stopReportingRuntimeErrors() {
+  if (stopListeningToRuntimeErrors === null) {
+    throw new Error('Not currently listening');
+  }
+  currentRuntimeErrorOptions = null;
+  try {
+    stopListeningToRuntimeErrors();
+  } finally {
+    stopListeningToRuntimeErrors = null;
+  }
+}
+
+function update() {
+  renderedElement = render();
+  // Loading iframe can be either sync or async depending on the browser.
+  if (isLoadingIframe) {
+    // Iframe is loading.
+    // First render will happen soon--don't need to do anything.
+    return;
+  }
+  if (iframe) {
+    // Iframe has already loaded.
+    // Just update it.
+    updateIframeContent();
+    return;
+  }
+  // We need to schedule the first render.
+  isLoadingIframe = true;
+  const loadingIframe = window.document.createElement('iframe');
+  applyStyles(loadingIframe, iframeStyle);
+  loadingIframe.onload = function() {
+    const iframeDocument = loadingIframe.contentDocument;
+    if (iframeDocument != null && iframeDocument.body != null) {
+      iframeDocument.body.style.margin = '0';
+      // Keep popup within body boundaries for iOS Safari
+      iframeDocument.body.style['max-width'] = '100vw';
+      const iframeRoot = iframeDocument.createElement('div');
+      applyStyles(iframeRoot, overlayStyle);
+      iframeDocument.body.appendChild(iframeRoot);
+
+      // Ready! Now we can update the UI.
+      iframe = loadingIframe;
+      isLoadingIframe = false;
+      updateIframeContent();
+    }
+  };
+  const appDocument = window.document;
+  appDocument.body.appendChild(loadingIframe);
+}
+
+function render() {
+  if (currentBuildError) {
+    return <CompileErrorContainer error={currentBuildError} />;
+  }
+  if (currentRuntimeErrorRecords.length > 0) {
+    if (!currentRuntimeErrorOptions) {
+      throw new Error('Expected options to be injected.');
+    }
+    return (
+      <RuntimeErrorContainer
+        errorRecords={currentRuntimeErrorRecords}
+        close={dismissRuntimeErrors}
+        launchEditorEndpoint={currentRuntimeErrorOptions.launchEditorEndpoint}
+      />
+    );
+  }
+  return null;
+}
+
+function updateIframeContent() {
+  if (iframe === null) {
+    throw new Error('Iframe has not been created yet.');
+  }
+  const iframeBody = iframe.contentDocument.body;
+  if (!iframeBody) {
+    throw new Error('Expected iframe to have a body.');
+  }
+  const iframeRoot = iframeBody.firstChild;
+  if (renderedElement === null) {
+    // Destroy iframe and force it to be recreated on next error
+    window.document.body.removeChild(iframe);
+    ReactDOM.unmountComponentAtNode(iframeRoot);
+    iframe = null;
+    return;
+  }
+  // Update the overlay
+  ReactDOM.render(renderedElement, iframeRoot);
+}
diff --git a/packages/react-error-overlay/src/listenToRuntimeErrors.js b/packages/react-error-overlay/src/listenToRuntimeErrors.js
new file mode 100644
index 00000000000..45c43fa5d40
--- /dev/null
+++ b/packages/react-error-overlay/src/listenToRuntimeErrors.js
@@ -0,0 +1,83 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+/* @flow */
+import {
+  register as registerError,
+  unregister as unregisterError,
+} from './effects/unhandledError';
+import {
+  register as registerPromise,
+  unregister as unregisterPromise,
+} from './effects/unhandledRejection';
+import {
+  register as registerStackTraceLimit,
+  unregister as unregisterStackTraceLimit,
+} from './effects/stackTraceLimit';
+import {
+  permanentRegister as permanentRegisterConsole,
+  registerReactStack,
+  unregisterReactStack,
+} from './effects/proxyConsole';
+import { massage as massageWarning } from './utils/warnings';
+import getStackFrames from './utils/getStackFrames';
+
+import type { StackFrame } from './utils/stack-frame';
+
+const CONTEXT_SIZE: number = 3;
+
+export type ErrorRecord = {|
+  error: Error,
+  unhandledRejection: boolean,
+  contextSize: number,
+  stackFrames: StackFrame[],
+|};
+
+export function listenToRuntimeErrors(crash: ErrorRecord => void) {
+  function crashWithFrames(error: Error, unhandledRejection = false) {
+    getStackFrames(error, unhandledRejection, CONTEXT_SIZE)
+      .then(stackFrames => {
+        if (stackFrames == null) {
+          return;
+        }
+        crash({
+          error,
+          unhandledRejection,
+          contextSize: CONTEXT_SIZE,
+          stackFrames,
+        });
+      })
+      .catch(e => {
+        console.log('Could not get the stack frames of error:', e);
+      });
+  }
+  registerError(window, error => crashWithFrames(error, false));
+  registerPromise(window, error => crashWithFrames(error, true));
+  registerStackTraceLimit();
+  registerReactStack();
+  permanentRegisterConsole('error', (warning, stack) => {
+    const data = massageWarning(warning, stack);
+    crashWithFrames(
+      // $FlowFixMe
+      {
+        message: data.message,
+        stack: data.stack,
+        __unmap_source: '/static/js/bundle.js',
+      },
+      false
+    );
+  });
+
+  return function stopListening() {
+    unregisterStackTraceLimit();
+    unregisterPromise(window);
+    unregisterError(window);
+    unregisterReactStack();
+  };
+}
diff --git a/packages/react-error-overlay/src/overlay.js b/packages/react-error-overlay/src/overlay.js
deleted file mode 100644
index 181cb02716d..00000000000
--- a/packages/react-error-overlay/src/overlay.js
+++ /dev/null
@@ -1,235 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-/* @flow */
-import {
-  register as registerError,
-  unregister as unregisterError,
-} from './effects/unhandledError';
-import {
-  register as registerPromise,
-  unregister as unregisterPromise,
-} from './effects/unhandledRejection';
-import {
-  register as registerShortcuts,
-  unregister as unregisterShortcuts,
-  handler as keyEventHandler,
-  SHORTCUT_ESCAPE,
-  SHORTCUT_LEFT,
-  SHORTCUT_RIGHT,
-} from './effects/shortcuts';
-import {
-  register as registerStackTraceLimit,
-  unregister as unregisterStackTraceLimit,
-} from './effects/stackTraceLimit';
-import {
-  permanentRegister as permanentRegisterConsole,
-  registerReactStack,
-  unregisterReactStack,
-} from './effects/proxyConsole';
-import { massage as massageWarning } from './utils/warnings';
-
-import {
-  consume as consumeError,
-  getErrorRecord,
-  drain as drainErrors,
-} from './utils/errorRegister';
-import type { ErrorRecordReference } from './utils/errorRegister';
-
-import type { StackFrame } from './utils/stack-frame';
-import { iframeStyle } from './styles';
-import { applyStyles } from './utils/dom/css';
-import { createOverlay } from './components/overlay';
-import { updateAdditional } from './components/additional';
-
-const CONTEXT_SIZE: number = 3;
-let iframeReference: HTMLIFrameElement | null = null;
-let additionalReference = null;
-let errorReferences: ErrorRecordReference[] = [];
-let currReferenceIndex: number = -1;
-
-function render(name: ?string, message: string, resolvedFrames: StackFrame[]) {
-  disposeCurrentView();
-
-  const iframe = window.document.createElement('iframe');
-  applyStyles(iframe, iframeStyle);
-  iframeReference = iframe;
-  iframe.onload = () => {
-    if (iframeReference == null) {
-      return;
-    }
-    const w = iframeReference.contentWindow;
-    const document = iframeReference.contentDocument;
-
-    const { overlay, additional } = createOverlay(
-      document,
-      name,
-      message,
-      resolvedFrames,
-      CONTEXT_SIZE,
-      currReferenceIndex + 1,
-      errorReferences.length,
-      offset => {
-        switchError(offset);
-      },
-      () => {
-        unmount();
-      }
-    );
-    if (w != null) {
-      w.onkeydown = event => {
-        keyEventHandler(type => shortcutHandler(type), event);
-      };
-    }
-    if (document.body != null) {
-      document.body.style.margin = '0';
-      // Keep popup within body boundaries for iOS Safari
-      // $FlowFixMe
-      document.body.style['max-width'] = '100vw';
-
-      (document.body: any).appendChild(overlay);
-    }
-    additionalReference = additional;
-  };
-  window.document.body.appendChild(iframe);
-}
-
-function renderErrorByIndex(index: number) {
-  currReferenceIndex = index;
-
-  const { error, unhandledRejection, enhancedFrames } = getErrorRecord(
-    errorReferences[index]
-  );
-
-  if (unhandledRejection) {
-    render(
-      'Unhandled Rejection (' + error.name + ')',
-      error.message,
-      enhancedFrames
-    );
-  } else {
-    render(error.name, error.message, enhancedFrames);
-  }
-}
-
-function switchError(offset) {
-  if (errorReferences.length === 0) {
-    return;
-  }
-
-  let nextView = currReferenceIndex + offset;
-
-  if (nextView < 0) {
-    nextView = errorReferences.length - 1;
-  } else if (nextView >= errorReferences.length) {
-    nextView = 0;
-  }
-
-  renderErrorByIndex(nextView);
-}
-
-function disposeCurrentView() {
-  if (iframeReference === null) {
-    return;
-  }
-  window.document.body.removeChild(iframeReference);
-  iframeReference = null;
-  additionalReference = null;
-}
-
-function unmount() {
-  disposeCurrentView();
-  drainErrors();
-  errorReferences = [];
-  currReferenceIndex = -1;
-}
-
-function crash(error: Error, unhandledRejection = false) {
-  if (module.hot && typeof module.hot.decline === 'function') {
-    module.hot.decline();
-  }
-  consumeError(error, unhandledRejection, CONTEXT_SIZE)
-    .then(ref => {
-      if (ref == null) {
-        return;
-      }
-      errorReferences.push(ref);
-      if (iframeReference !== null && additionalReference !== null) {
-        updateAdditional(
-          iframeReference.contentDocument,
-          additionalReference,
-          currReferenceIndex + 1,
-          errorReferences.length,
-          offset => {
-            switchError(offset);
-          }
-        );
-      } else {
-        if (errorReferences.length !== 1) {
-          throw new Error('Something is *really* wrong.');
-        }
-        renderErrorByIndex((currReferenceIndex = 0));
-      }
-    })
-    .catch(e => {
-      console.log('Could not consume error:', e);
-    });
-}
-
-function shortcutHandler(type: string) {
-  switch (type) {
-    case SHORTCUT_ESCAPE: {
-      unmount();
-      break;
-    }
-    case SHORTCUT_LEFT: {
-      switchError(-1);
-      break;
-    }
-    case SHORTCUT_RIGHT: {
-      switchError(1);
-      break;
-    }
-    default: {
-      //TODO: this
-      break;
-    }
-  }
-}
-
-function inject() {
-  registerError(window, error => crash(error));
-  registerPromise(window, error => crash(error, true));
-  registerShortcuts(window, shortcutHandler);
-  registerStackTraceLimit();
-
-  registerReactStack();
-  permanentRegisterConsole('error', (warning, stack) => {
-    const data = massageWarning(warning, stack);
-    crash(
-      // $FlowFixMe
-      {
-        message: data.message,
-        stack: data.stack,
-        __unmap_source: '/static/js/bundle.js',
-      },
-      false
-    );
-  });
-}
-
-function uninject() {
-  unregisterStackTraceLimit();
-  unregisterShortcuts(window);
-  unregisterPromise(window);
-  unregisterError(window);
-  unregisterReactStack();
-}
-
-export { inject, uninject };
diff --git a/packages/react-error-overlay/src/styles.js b/packages/react-error-overlay/src/styles.js
index bf17561d721..d6557c5d95f 100644
--- a/packages/react-error-overlay/src/styles.js
+++ b/packages/react-error-overlay/src/styles.js
@@ -24,7 +24,7 @@ const iframeStyle = {
   width: '100%',
   height: '100%',
   border: 'none',
-  'z-index': 2147483647 - 1, // below the compile error overlay
+  'z-index': 2147483647,
 };
 
 const overlayStyle = {
@@ -35,84 +35,6 @@ const overlayStyle = {
   'background-color': white,
 };
 
-const containerStyle = {
-  position: 'relative',
-  display: 'inline-flex',
-  'flex-direction': 'column',
-  height: '100%',
-  width: '1024px',
-  'max-width': '100%',
-  'overflow-x': 'hidden',
-  'overflow-y': 'auto',
-  padding: '0.5rem',
-  'box-sizing': 'border-box',
-  'text-align': 'left',
-  'font-family': 'Consolas, Menlo, monospace',
-  'font-size': '11px',
-  'white-space': 'pre-wrap',
-  'word-break': 'break-word',
-  'line-height': 1.5,
-  color: black,
-};
-
-const hintsStyle = {
-  color: darkGray,
-};
-
-const hintStyle = {
-  padding: '0.5em 1em',
-  cursor: 'pointer',
-};
-
-const closeButtonStyle = {
-  color: black,
-  'line-height': '1rem',
-  'font-size': '1.5rem',
-  padding: '1rem',
-  cursor: 'pointer',
-  position: 'absolute',
-  right: 0,
-  top: 0,
-};
-
-const additionalChildStyle = {
-  'margin-bottom': '0.5rem',
-};
-
-const headerStyle = {
-  'font-size': '2em',
-  'font-family': 'sans-serif',
-  color: red,
-  'white-space': 'pre-wrap',
-  // Top bottom margin spaces header
-  // Right margin revents overlap with close button
-  margin: '0 2rem 0.75rem 0',
-  flex: '0 0 auto',
-  'max-height': '50%',
-  overflow: 'auto',
-};
-
-const functionNameStyle = {};
-
-const linkStyle = {
-  'font-size': '0.9em',
-  'margin-bottom': '0.9em',
-};
-
-const anchorStyle = {
-  'text-decoration': 'none',
-  color: darkGray,
-};
-
-const traceStyle = {
-  'font-size': '1em',
-  flex: '0 1 auto',
-  'min-height': '0px',
-  overflow: 'auto',
-};
-
-const depStyle = {};
-
 const primaryErrorStyle = {
   'background-color': lightRed,
 };
@@ -121,104 +43,14 @@ const secondaryErrorStyle = {
   'background-color': yellow,
 };
 
-const omittedFramesCollapsedStyle = {
-  color: black,
-  cursor: 'pointer',
-  'margin-bottom': '1.5em',
-};
-
-const omittedFramesExpandedStyle = {
-  color: black,
-  cursor: 'pointer',
-  'margin-bottom': '0.6em',
-};
-
-const _preStyle = {
-  display: 'block',
-  padding: '0.5em',
-  'margin-top': '0.5em',
-  'margin-bottom': '0.5em',
-  'overflow-x': 'auto',
-  'white-space': 'pre-wrap',
-  'border-radius': '0.25rem',
-};
-const primaryPreStyle = Object.assign({}, _preStyle, {
-  'background-color': redTransparent,
-});
-const secondaryPreStyle = Object.assign({}, _preStyle, {
-  'background-color': yellowTransparent,
-});
-
-const toggleStyle = {
-  'margin-bottom': '1.5em',
-  color: darkGray,
-  cursor: 'pointer',
-};
-
-const codeStyle = {
-  'font-family': 'Consolas, Menlo, monospace',
-};
-
-const hiddenStyle = {
-  display: 'none',
-};
-
-const groupStyle = {
-  'margin-right': '1em',
-};
-
-const _groupElemStyle = {
-  'background-color': redTransparent,
-  color: red,
-  border: 'none',
-  'border-radius': '4px',
-  padding: '3px 6px',
-  cursor: 'pointer',
-};
-
-const groupElemLeft = Object.assign({}, _groupElemStyle, {
-  'border-top-right-radius': '0px',
-  'border-bottom-right-radius': '0px',
-  'margin-right': '1px',
-});
-
-const groupElemRight = Object.assign({}, _groupElemStyle, {
-  'border-top-left-radius': '0px',
-  'border-bottom-left-radius': '0px',
-});
-
-const footerStyle = {
-  'font-family': 'sans-serif',
-  color: darkGray,
-  'margin-top': '0.5rem',
-  flex: '0 0 auto',
-};
-
 export {
-  containerStyle,
   iframeStyle,
   overlayStyle,
-  hintsStyle,
-  hintStyle,
-  closeButtonStyle,
-  additionalChildStyle,
-  headerStyle,
-  functionNameStyle,
-  linkStyle,
-  anchorStyle,
-  traceStyle,
-  depStyle,
   primaryErrorStyle,
-  primaryPreStyle,
   secondaryErrorStyle,
-  secondaryPreStyle,
-  omittedFramesCollapsedStyle,
-  omittedFramesExpandedStyle,
-  toggleStyle,
-  codeStyle,
-  hiddenStyle,
-  groupStyle,
-  groupElemLeft,
-  groupElemRight,
-  footerStyle,
+  black,
+  darkGray,
+  red,
+  redTransparent,
+  yellowTransparent,
 };
diff --git a/packages/react-error-overlay/src/utils/dom/enableTabClick.js b/packages/react-error-overlay/src/utils/dom/enableTabClick.js
deleted file mode 100644
index b663c055f8c..00000000000
--- a/packages/react-error-overlay/src/utils/dom/enableTabClick.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-/* @flow */
-function enableTabClick(node: Element) {
-  node.setAttribute('tabindex', '0');
-  node.addEventListener('keydown', function(e: KeyboardEvent) {
-    const { key, which, keyCode } = e;
-    if (key === 'Enter' || which === 13 || keyCode === 13) {
-      e.preventDefault();
-      if (typeof e.target.click === 'function') {
-        e.target.click();
-      }
-    }
-  });
-}
-
-export { enableTabClick };
diff --git a/packages/react-dev-utils/ansiHTML.js b/packages/react-error-overlay/src/utils/generateAnsiHTML.js
similarity index 95%
rename from packages/react-dev-utils/ansiHTML.js
rename to packages/react-error-overlay/src/utils/generateAnsiHTML.js
index 90bf70374ee..509daddc23c 100644
--- a/packages/react-dev-utils/ansiHTML.js
+++ b/packages/react-error-overlay/src/utils/generateAnsiHTML.js
@@ -7,10 +7,11 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-'use strict';
+/* @flow */
+
+import Anser from 'anser';
+import { AllHtmlEntities as Entities } from 'html-entities';
 
-var Anser = require('anser');
-var Entities = require('html-entities').AllHtmlEntities;
 var entities = new Entities();
 
 // Color scheme inspired by https://chriskempson.github.io/base16/css/base16-github.css
@@ -62,7 +63,7 @@ var anserMap = {
   'ansi-white': 'darkgrey',
 };
 
-function ansiHTML(txt) {
+function generateAnsiHTML(txt: string): string {
   var arr = new Anser().ansiToJson(entities.encode(txt), {
     use_classes: true,
   });
@@ -104,4 +105,4 @@ function ansiHTML(txt) {
   return result;
 }
 
-module.exports = ansiHTML;
+export default generateAnsiHTML;
diff --git a/packages/react-error-overlay/src/utils/getLinesAround.js b/packages/react-error-overlay/src/utils/getLinesAround.js
index a03e09a5817..7cb2ea5c54d 100644
--- a/packages/react-error-overlay/src/utils/getLinesAround.js
+++ b/packages/react-error-overlay/src/utils/getLinesAround.js
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-//@flow
+/* @flow */
 import { ScriptLine } from './stack-frame';
 
 /**
diff --git a/packages/react-error-overlay/src/utils/getPrettyURL.js b/packages/react-error-overlay/src/utils/getPrettyURL.js
new file mode 100644
index 00000000000..47b834d08d0
--- /dev/null
+++ b/packages/react-error-overlay/src/utils/getPrettyURL.js
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+/* @flow */
+function getPrettyURL(
+  sourceFileName: ?string,
+  sourceLineNumber: ?number,
+  sourceColumnNumber: ?number,
+  fileName: ?string,
+  lineNumber: ?number,
+  columnNumber: ?number,
+  compiled: boolean
+): string {
+  let prettyURL;
+  if (!compiled && sourceFileName && typeof sourceLineNumber === 'number') {
+    // Remove everything up to the first /src/ or /node_modules/
+    const trimMatch = /^[/|\\].*?[/|\\]((src|node_modules)[/|\\].*)/.exec(
+      sourceFileName
+    );
+    if (trimMatch && trimMatch[1]) {
+      prettyURL = trimMatch[1];
+    } else {
+      prettyURL = sourceFileName;
+    }
+    prettyURL += ':' + sourceLineNumber;
+    // Note: we intentionally skip 0's because they're produced by cheap Webpack maps
+    if (sourceColumnNumber) {
+      prettyURL += ':' + sourceColumnNumber;
+    }
+  } else if (fileName && typeof lineNumber === 'number') {
+    prettyURL = fileName + ':' + lineNumber;
+    // Note: we intentionally skip 0's because they're produced by cheap Webpack maps
+    if (columnNumber) {
+      prettyURL += ':' + columnNumber;
+    }
+  } else {
+    prettyURL = 'unknown';
+  }
+  return prettyURL.replace('webpack://', '.');
+}
+
+export { getPrettyURL };
+export default getPrettyURL;
diff --git a/packages/react-error-overlay/src/utils/getSourceMap.js b/packages/react-error-overlay/src/utils/getSourceMap.js
index 80dd6002e0e..1d8405519bd 100644
--- a/packages/react-error-overlay/src/utils/getSourceMap.js
+++ b/packages/react-error-overlay/src/utils/getSourceMap.js
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-//@flow
+/* @flow */
 import { SourceMapConsumer } from 'source-map';
 
 /**
diff --git a/packages/react-error-overlay/src/utils/errorRegister.js b/packages/react-error-overlay/src/utils/getStackFrames.js
similarity index 59%
rename from packages/react-error-overlay/src/utils/errorRegister.js
rename to packages/react-error-overlay/src/utils/getStackFrames.js
index 0bd3379cef1..e5a4073106b 100644
--- a/packages/react-error-overlay/src/utils/errorRegister.js
+++ b/packages/react-error-overlay/src/utils/getStackFrames.js
@@ -13,22 +13,11 @@ import { parse } from './parser';
 import { map } from './mapper';
 import { unmap } from './unmapper';
 
-type ErrorRecord = {
-  error: Error,
-  unhandledRejection: boolean,
-  contextSize: number,
-  enhancedFrames: StackFrame[],
-};
-type ErrorRecordReference = number;
-const recorded: ErrorRecord[] = [];
-
-let errorsConsumed: ErrorRecordReference = 0;
-
-function consume(
+function getStackFrames(
   error: Error,
   unhandledRejection: boolean = false,
   contextSize: number = 3
-): Promise<ErrorRecordReference | null> {
+): Promise<StackFrame[] | null> {
   const parsedFrames = parse(error);
   let enhancedFramesPromise;
   if (error.__unmap_source) {
@@ -49,32 +38,13 @@ function consume(
     ) {
       return null;
     }
-    enhancedFrames = enhancedFrames.filter(
+    return enhancedFrames.filter(
       ({ functionName }) =>
         functionName == null ||
         functionName.indexOf('__stack_frame_overlay_proxy_console__') === -1
     );
-    recorded[++errorsConsumed] = {
-      error,
-      unhandledRejection,
-      contextSize,
-      enhancedFrames,
-    };
-    return errorsConsumed;
   });
 }
 
-function getErrorRecord(ref: ErrorRecordReference): ErrorRecord {
-  return recorded[ref];
-}
-
-function drain() {
-  // $FlowFixMe
-  const keys = Object.keys(recorded);
-  for (let index = 0; index < keys.length; ++index) {
-    delete recorded[keys[index]];
-  }
-}
-
-export { consume, getErrorRecord, drain };
-export type { ErrorRecordReference };
+export default getStackFrames;
+export { getStackFrames };
diff --git a/packages/react-error-overlay/src/utils/isBultinErrorName.js b/packages/react-error-overlay/src/utils/isBultinErrorName.js
new file mode 100644
index 00000000000..cf732b838f4
--- /dev/null
+++ b/packages/react-error-overlay/src/utils/isBultinErrorName.js
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+/* @flow */
+function isBultinErrorName(errorName: ?string) {
+  switch (errorName) {
+    case 'EvalError':
+    case 'InternalError':
+    case 'RangeError':
+    case 'ReferenceError':
+    case 'SyntaxError':
+    case 'TypeError':
+    case 'URIError':
+      return true;
+    default:
+      return false;
+  }
+}
+
+export { isBultinErrorName };
+export default isBultinErrorName;
diff --git a/packages/react-error-overlay/src/utils/mapper.js b/packages/react-error-overlay/src/utils/mapper.js
index fc3eb2266e6..656c216c144 100644
--- a/packages/react-error-overlay/src/utils/mapper.js
+++ b/packages/react-error-overlay/src/utils/mapper.js
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-// @flow
+/* @flow */
 import StackFrame from './stack-frame';
 import { getSourceMap } from './getSourceMap';
 import { getLinesAround } from './getLinesAround';
diff --git a/packages/react-error-overlay/src/utils/parser.js b/packages/react-error-overlay/src/utils/parser.js
index bfbb85f7969..1cbee1d1ccc 100644
--- a/packages/react-error-overlay/src/utils/parser.js
+++ b/packages/react-error-overlay/src/utils/parser.js
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-// @flow
+/* @flow */
 import StackFrame from './stack-frame';
 
 const regexExtractLocation = /\(?(.+?)(?::(\d+))?(?::(\d+))?\)?$/;
diff --git a/packages/react-error-overlay/src/utils/stack-frame.js b/packages/react-error-overlay/src/utils/stack-frame.js
index ae28cb53585..49f9da7fa11 100644
--- a/packages/react-error-overlay/src/utils/stack-frame.js
+++ b/packages/react-error-overlay/src/utils/stack-frame.js
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-//@flow
+/* @flow */
 
 /** A container holding a script line. */
 class ScriptLine {
@@ -54,6 +54,20 @@ class StackFrame {
     sourceColumnNumber: number | null = null,
     sourceScriptCode: ScriptLine[] | null = null
   ) {
+    if (functionName && functionName.indexOf('Object.') === 0) {
+      functionName = functionName.slice('Object.'.length);
+    }
+    if (
+      // Chrome has a bug with inferring function.name:
+      // https://github.com/facebookincubator/create-react-app/issues/2097
+      // Let's ignore a meaningless name we get for top-level modules.
+      functionName === 'friendlySyntaxErrorLabel' ||
+      functionName === 'exports.__esModule' ||
+      functionName === '<anonymous>' ||
+      !functionName
+    ) {
+      functionName = null;
+    }
     this.functionName = functionName;
 
     this.fileName = fileName;
@@ -72,8 +86,8 @@ class StackFrame {
   /**
    * Returns the name of this function.
    */
-  getFunctionName(): string | null {
-    return this.functionName;
+  getFunctionName(): string {
+    return this.functionName || '(anonymous function)';
   }
 
   /**
@@ -98,11 +112,9 @@ class StackFrame {
    * Returns a pretty version of this stack frame.
    */
   toString(): string {
-    const f = this.getFunctionName();
-    if (f == null) {
-      return this.getSource();
-    }
-    return `${f} (${this.getSource()})`;
+    const functionName = this.getFunctionName();
+    const source = this.getSource();
+    return `${functionName}${source ? ` (${source})` : ``}`;
   }
 }
 
diff --git a/packages/react-error-overlay/src/utils/unmapper.js b/packages/react-error-overlay/src/utils/unmapper.js
index b01736d74aa..60b2bee432b 100644
--- a/packages/react-error-overlay/src/utils/unmapper.js
+++ b/packages/react-error-overlay/src/utils/unmapper.js
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-// @flow
+/* @flow */
 import StackFrame from './stack-frame';
 import { getSourceMap } from './getSourceMap';
 import { getLinesAround } from './getLinesAround';
diff --git a/packages/react-error-overlay/src/utils/warnings.js b/packages/react-error-overlay/src/utils/warnings.js
index 8dcd7e1ee30..bcc54ceb733 100644
--- a/packages/react-error-overlay/src/utils/warnings.js
+++ b/packages/react-error-overlay/src/utils/warnings.js
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-// @flow
+/* @flow */
 import type { ReactFrame } from '../effects/proxyConsole';
 
 function stripInlineStacktrace(message: string): string {
diff --git a/packages/react-scripts/bin/react-scripts-ts.js b/packages/react-scripts/bin/react-scripts-ts.js
index bd2a98b8ee7..bc7f8f7dc30 100755
--- a/packages/react-scripts/bin/react-scripts-ts.js
+++ b/packages/react-scripts/bin/react-scripts-ts.js
@@ -13,8 +13,9 @@
 const spawn = require('react-dev-utils/crossSpawn');
 const args = process.argv.slice(2);
 
-const scriptIndex = args.findIndex(x =>
-   x === 'build' || x === 'eject' || x === 'start' || x === 'test');
+const scriptIndex = args.findIndex(
+  x => x === 'build' || x === 'eject' || x === 'start' || x === 'test'
+);
 const script = scriptIndex === -1 ? args[0] : args[scriptIndex];
 const nodeArgs = scriptIndex > 0 ? args.slice(0, scriptIndex) : [];
 
diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js
index a00468b9f80..b9eec97c998 100644
--- a/packages/react-scripts/config/webpack.config.dev.js
+++ b/packages/react-scripts/config/webpack.config.dev.js
@@ -55,8 +55,6 @@ module.exports = {
     require.resolve('react-dev-utils/webpackHotDevClient'),
     // We ship a few polyfills by default:
     require.resolve('./polyfills'),
-    // Errors should be considered fatal in development
-    require.resolve('react-error-overlay'),
     // Finally, this is your app's code:
     paths.appIndexJs,
     // We include the app code last so that if there is a runtime error during
diff --git a/packages/react-scripts/config/webpackDevServer.config.js b/packages/react-scripts/config/webpackDevServer.config.js
index 2a351e668bb..9c3889abae8 100644
--- a/packages/react-scripts/config/webpackDevServer.config.js
+++ b/packages/react-scripts/config/webpackDevServer.config.js
@@ -10,7 +10,7 @@
 // @remove-on-eject-end
 'use strict';
 
-const errorOverlayMiddleware = require('react-error-overlay/middleware');
+const errorOverlayMiddleware = require('react-dev-utils/errorOverlayMiddleware');
 const noopServiceWorkerMiddleware = require('react-dev-utils/noopServiceWorkerMiddleware');
 const config = require('./webpack.config.dev');
 const paths = require('./paths');
diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index 4c018c0c36b..c2ed1fe8a49 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -36,7 +36,6 @@
     "postcss-loader": "2.0.6",
     "promise": "8.0.1",
     "react-dev-utils": "^3.1.0",
-    "react-error-overlay": "^1.0.10",
     "style-loader": "0.18.2",
     "ts-jest": "^20.0.7",
     "ts-loader": "^2.2.1",

From 6aba4270da422bbb1504e19459d5ee972db9c367 Mon Sep 17 00:00:00 2001
From: Christophe Hurpeau <christophe.hurpeau+github@gmail.com>
Date: Mon, 28 Aug 2017 02:12:11 +0000
Subject: [PATCH 47/61] update babel-runtime dependency in react-error-overlay
 and react-scripts (#2991)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* update babel-runtime dependency in react-error-overlay and react-scripts

`babel-runtime@6.23.0` have a dependency on `regenerator-runtime@0.10.5`
`babel-runtime@6.26.0` on `regenerator-runtime@0.11.0`

> npm ls regenerator-runtime

```
└─┬ react-scripts@1.0.11
  ├─┬ babel-core@6.25.0
  │ └─┬ babel-runtime@6.26.0
  │   └── regenerator-runtime@0.11.0
  ├─┬ babel-eslint@7.2.3
  │ └─┬ babel-traverse@6.26.0
  │   └─┬ babel-runtime@6.26.0
  │     └── regenerator-runtime@0.11.0
  ├─┬ babel-runtime@6.23.0
  │ └── regenerator-runtime@0.10.5
  └─┬ react-error-overlay@1.0.10
    └─┬ babel-runtime@6.23.0
      └── regenerator-runtime@0.10.5
```

* fix requested changes
---
 packages/react-error-overlay/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json
index 65c9b5efa0a..06c890a1025 100644
--- a/packages/react-error-overlay/package.json
+++ b/packages/react-error-overlay/package.json
@@ -33,7 +33,7 @@
   "dependencies": {
     "anser": "1.4.1",
     "babel-code-frame": "6.22.0",
-    "babel-runtime": "6.23.0",
+    "babel-runtime": "6.26.0",
     "html-entities": "1.2.1",
     "react": "^15.5.4",
     "react-dom": "^15.5.4",

From ee75676db098edeba3d1b12093831230a259c01d Mon Sep 17 00:00:00 2001
From: Sylvain Baronnet <sylvain@studio.gd>
Date: Mon, 28 Aug 2017 04:17:21 +0200
Subject: [PATCH 48/61] Default Favicon lossless optimisation (#2917)

---
 .../react-scripts/template/public/favicon.ico | Bin 24838 -> 3870 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/packages/react-scripts/template/public/favicon.ico b/packages/react-scripts/template/public/favicon.ico
index 5c125de5d897c1ff5692a656485b3216123dcd89..a11777cc471a4344702741ab1c8a588998b1311a 100644
GIT binary patch
literal 3870
zcma);c{J4h9>;%nil|2-o+rCuEF-(I%-F}ijC~o(k~HKAkr0)!FCj~d>`RtpD?8b;
zXOC1OD!V*IsqUwzbMF1)-gEDD=A573Z-&G7^LoAC9|WO7Xc0Cx1g^Zu0u_SjAPB<A
z`RksU20=ur5rmib*S!+l%h4eS4)^Q+0X>3vGa^W|sj)80f#V0@M_CAZTIO(t--xg=
z!sii`1giyH7EKL_+Wi0ab<)&E_0KD!3Rp2^HNB*K2@PHCs4PWSA32*-^7d{9nH2_E
zmC{C*N*)(vEF1_aMamw2A{ZH5aIDqiabnFdJ|y0%aS|64E$`s2ccV~3lR!u<){eS`
z#^Mx6o(iP1Ix%<jZ{9b!^*}EvPeMb_W#+3mPDk@<s^Oh#VM&a2^K;|820}`)peR}+
zJXt@j)V#7+Js?u;Lb#g$HH)e~Ro^hvl6KSLHq)Y3adj<OOD7?;gwee^gNzCxwD?IA
z8?*}E@b*IiVPUPv3?XqzLRv|{4)GKGzjS`)#ukL7W&K6BHn&1}P(skc69cJ?5^C+V
z@yyqLJg;V2Ul%gZ*?2WiB%bNfz1}F^UeTpW^N?dSY@NL3zDD+Tzk$Cg_=cj!M^ot0
zu%qYEoTU9K@kMP2H52_@<2On}lNX!oZ(oWk^?eSfXAa3M8S?8tzISV2V&9A+_-47Y
z>4dv`t@!&Za-K@mTm#vadc{0aWDV*_%EiGK7qMC_(`exc>-$Gb9~W!w_^{*pYRm~G
zBN{nA<l~YIv(*f3@JAyAZDXwp4d;meFk*lN;rx5VQze6aK!n?W9`Uc4pES2K&V3BC
zkTJK{PcIXdQ?hM;i7~K{wRSeU-w9_32aC}+7nN6r5o<=I@CyjQAS~;jsb7p#@eUT2
zkh1M~1>;cm^w$VWg1O^^<6vY`1XCD|s_zv*g*5&V#wv&s#h$xlUilPe4U@I&UXZbL
z0)%9Uj&@yd03n;!7do+bfixH^FeZ-Ema}s;DQX2gY+7g0s(9;`8GyvPY1*vxiF&|w
z>!vA~GA<~JUqH}d;DfBSi^IT*#lrzXl$fNpq0_T1tA+`A$1?(gLb?e#0>UELvljtQ
zK+*74m0jn&)5yk8mLBv;=@}c{t0ztT<<S2g5CX`xuBQVwYJOMIsv7paOX6ypYJL$a
zJ|Vy}#?V4i+kjXzBq)LcuJEA=z^Z2W4WQ1U@0}*!;_q<!3_ls8PhMM3ii*Ci+cF6=
zF!@E<x#%Yvb!P0>v;Avck$S6D`Z)^c0(jiwKhQsn|LDRY&w(Fmi91I7H6S;b0XM{e
zXp0~(T@k_r-!jkLwd1_Vre^v$G4|kh4}=Gi?$AaJ)3I+^m|Zyj#*?Kp@w(lQdJZf4
z#|IJW5z+S^e9@(6hW6N~{pj8|NO*>1)E=%?nNUAkmv~OY&ZV<PHdt%yO<W_%O|c-T
zC%nAvgv?#h>;m-%?pQ_11)hAr0oAwILrlsGawpxx4D43J&K=n+p3WLnlDsQ$b(9+4
z?mO^hmV^F8MV{4<aA#E-8o{y-by8hR1>Lx>(Q=aHhQ1){0d*(e&s%G=i5rq3;t{JC
zmgbn5Nkl)t@fPH$v;af26lyhH!k+#}_&aBK4baYPbZy$5aFx4}ka<ge$nBI}>&qxl
z$=Rh$W;U)>-=S-0=?7FH9dUAd2(q#4TCAHky!$^~;Dz^j|8_wuKc*YzfdA<NJp8x7
z`_}_7!m44CG`<6nLk0r3A}8e>ht@Q&ror?91Dm!N03=4=O!a)I*0q~p0g$Fm$pmr$
zb;wD;STDIi$@M%y1>p&_>%?UP($15gou_ue1u0!4(%81;qcIW8NyxFEvXpiJ|H4wz
z*mFT(qVx1FKufG11hByuX%lPk4t#WZ{>8ka2efjY`~;AL6vWyQKpJun2nRiZYDij$
zP>4jQXPaP$UC$yIVgGa)jDV;F0l^n(V=HMRB5)20V7&r$<L^Phf(W29K>jmk{UUIe
zVjKroK}JAbD>B`2cwNQ&GDLx8{pg`7hbA~grk|W6LgiZ`8y`{Iq0i>t!3p2}MS6S+
zO_ruKyAElt)rdS>CtF7j{&6rP-#c=7evGMt7B6`7HG|-(WL`bDUAjyn+k$mx$C<FS
ztTQ#rrhaxTX7@2TN#`pson<p6thk-4?N)^;_(Up!_V=f}<~kR)zD%o0iiqseIMZqh
zGU`kZGbN)qs{;AuZP?~%PajDo&b&7)!V!+|VO<ediN}{)OvR~sQ<ZYe%O|)8-DTKw
zTXmYP$VLa(Y>H;q2Dz4x;cPP$hW=`pFfLO)!jaCL@V2+F)So3}vg|%O*^T1j>C2lx
zsURO-zIJC$^$g2byVbRIo^w>UxK}74^TqUiRR#7s_X$e)$6iYG1(PcW7un-va-S&u
zHk9-6Zn&>T==A)lM^D~bk{&rFzCi35>UR!ZjQkdSiNX*-;l4z9j*7|q`TBl~Au`5&
z+c)*8?#-tgUR$Zd%Q3bs96w6k7q@#tUn`5rj+r@_sAVVLqco|6O{ILX&U-&-cbVa3
zY?ngHR@%l{;`ri%H*0EhBWrGjv!LE4db?HEWb5mu*t@{kv|XwK8?npOshmzf=vZA@
zVSN9sL~!sn?r(AK)Q7Jk2(|M67Uy3I{eRy<vjA)m;~)jV3DFGzL)eNbs@Sy80roD>
z_l&Y@A>;vjkWN5I2xvFFTLX0i+`{qz7C_@bo`ZUzDugfq4+>a3?1v%)O+YTd6@Ul7
zAfLfm=nhZ`)P~&v90$&UcF+yXm9sq!qCx3^9gzIcO|Y(js^Fj)Rvq>nQAHI92ap=P
z10A4@prk+<s7nQxb0&o?puD0BStB$NLIA{pVg<pW;2=HJ11ZpVkRkF89w0s#3ef?(
zka>AGWCb`2)dQYFuR$|H6iDE8p}9a?#nV2}LBCoCf(Xi2@szia7#gY>b|l!-U`c}@
zLdhvQjc!BdLJvYvzzzngnw51yRYCqh4}$oRCy-z|v3Hc*d|?^Wj=l~18*E~*cR_kU
z{XsxM1i{V*4GujHQ3DBpl2w4FgFR48Nma@HPgnyKoIEY-MqmMeY=I<%oG~l!f<+FN
z1ZY^;10j4M4<Vo=b&OyEfF!Y);yDCJas8bbVhK~blk}<IGME~h)6n~gdmqP>#HYXP
zw5eJpA_y(>uLQ~OucgxDLuf}fVs272FaMxhn4xnDGIyLXnw>Xsd^J8XhcWIwIoQ9}
z%FoSJTAGW(SRGwJwb=@pY7r$uQRK3Zd~XbxU)ts!4XsJrCycrWSI?e!IqwqIR8+Jh
zlRjZ`UO1I!BtJR_2~7AbkbSm%XQqxEPkz6BTGWx8e}nQ=w7bZ|eVP4?*Tb!$(R)iC
z9)&%bS*u(lXqzitAN)Oo=&Ytn>%Hzjc<5liuPi>zC_nw;Z0AE3Y$Jao_Q90R-gl~5
z_xAb2J%eArrC1CN4G$}-zVvCqF1;H;abAu6G*+PDHSYFx@Tdbfox*uEd3}BUyYY-l
zTfEsOqsi#f9^FoLO;ChK<554qkri&Av~SIM*{fEYRE?vH7pTAOmu2pz3X?Wn*!ROX
ztd54huAk&mFBemMooL33RV-*1f0Q3_(7hl$<#*|WF9P!;r;4_+X~k~uKEqdzZ$5Al
zV63X<s4EnR@itBNL^suG_KHV!zgrw6&Bq&`dNv>N<k2!6lBSoSAvQBw$a}{Sg*d5f
zJqeF6lxH}v-(s5jl(8V8Bv*((#aw(*iLTd8#?8FnMLG#}AorDTkK*%$ni#S{e-*jA
zjy$_xALPmR?$A)F?XdsKy|!Ue+lIR5=csS!ZPu7h{Nc+Sd%?*WHR`S5ByDdhQAsNO
zeyx0!D+fx-a_t<57fQ^<7*WTVDog0}WA0F2_h++_I?f`i|C>@)j$FN#cCD;ek1R#l
zv%pGrhB~KWgoCj%GT?%{@@o(AJGt*PG#l3i>lhmb_twKH^EYvacVY-6bsCl5*^~L0
zonm@lk2UvvTKr2RS%}T>^~EYqdL1q4nD%0n&Xqr^cK^`J5W;lRRB^R-O<zOhVxo?8
zb#fjP=~|*nH<rZsU&F20QcP*BR|)$r#sFFtYi6hV=2&f<YJ%JC0IAdIRdHjO(;S%3
zC;L{EqcHO368@u|<ql>8b&HENO||mo0xaD+S=I8RTlIfVgqN@SXDr2&-)we--K7w=
zJVU8?Z+7k9dy;s;^gDkQa`0nz6N{T?(A&Iz)2!DEecLyRa&FI!id#5Z7B*O2=PsR0
zEvc|8{NS^)!d)MDX(97Xw}m&kEO@5jqRaDZ!+%`wYOI<23q|&js`&o4xvjP7D_xv@
z5hEwpsp{HezI9!~6O{~)lLR@oF7?J7i>1|5a~UuoN=q&6N}EJPV_GD`&M*v8Y`^2j
zKII*d_@Fi$+i*YEW+Hbz<W=zs^XxM$!;??OHDS{MUEdOi9{rF;;#a0RO>n{iQk~yP
z>7N{S4)r*!NwQ`(qcN#8SRQsNK6>{)X12nbF`*7#ecO7I)Q$uZsV+xS4E7aUn+U(K
baj7?x%VD!5Cxk2YbYLNVeiXvvpMCWYo=by@

literal 24838
zcmeI4X^>UL6@VY56)S&I{`6Nu0RscWCdj@GJHx(%?6_-;yKy1n;EEf9f}pr1CW5HA
zYt$%U#C=}?jWH&%G@BaHBxsWAoUb3}&6%Ei@4Ii_JRa1`RQ23*yU)_wJ$?H0>6gj0
z${d_I^w5kvTW3x<IFlKb$z%>YEc?FvyP3>p$!py@`@T`|dVepIsjbbvR}af%KKy<r
zQ!O-7BpkB&^2i9=CVy?(v>7YuQ%SDC^zmNWPYR^7avI5P-@dKev}UZ^aDAOyci9Nn
zwR4qEz~tSvrp|#ACvWzo9`3B;`}^{t18dxaH;?xT7#hmJiKAaI;|O=$yxzXNOHGw~
z^!5pE^SW`av%t_$22LFPsM^l%=PSp!3r`>9w%s+^ZQYnnTQ*Ggd9-1~kj_o$YdW@b
ztCkJ(ZGYjusqV5L4{^)R9Gt@gzU1t|?xhE&c^q(|(R#oa*}Sj5c({A$mhrB8*Y@tc
zr)K#C{KOp-eHl35ZWJ1&zkmI>9DL%!KJE@_!<b=R+`r#n>=W?aH;i?ZDb0O1HPFy6
zcV0Kf)eZ0BHm<I7>z9vowF7EA{z*aue9M)iJP&Zd)qYlfJ-c^sS1qY^?>s)!!Ta@x
zr@Lz|80r)7<{QVk9Z$}5SDaVtz*Rc?oH5~Wcjoc^eA&EdJ^h@aZ-BvL{K2s_7Cvfr
zFL&(R?D&(9OxsS%z_BzI9^Ai^AOF$PUpGk~oO(=OpMc3@Zh&KH1a9>G%%0rC)t@oQ
z4d~M`hX+g^Wf8P>A&&qjq|tZe*44Laq7qVPK#QIc)s*Qj34P`NL`Q{xBI`SnR!RC?
zlGdTvC%oVZ@0BgcH>}qc!uzul@{i@sH}L0|=eZBJ9qF!HHaw?`s0(_DJj(v`(memI
z6jH}=BfGlS<lCz5(9Y}G6-$SDeZe<M+V!hhjy&`*IN(B)R>lRV4)ouv#h*65yRR>G
zo;I#~BVK&l&{+H=_~Nq$d%bFLh7GE5pS&>Fr{RMe>)MM19~z6F1oQo_y>vtlpEZF#
zIc82TpMc3z9;{Q)=zG5B#4+96yHCvYy8p4;C%6x`%y$2HccC9|#vGVD)**C0xX|R|
z%h)}ze!Tnrvvb@RZ!GX@2lMEq`=`08b`9$%FnN@*zJLo2wD5?MbE&LN)Z>Kty*;m=
zt{Cn0>Q3nk)`<?XKA&^a0H1)#qYT{(E;6A-&$G^18FQ!hbgw)(&2_47Slh<SeEagv
z1zwkfi$2$N30U*M0ay8T6dv$`r{-OD&Jed;=9s?oY}dAp`^ziy+~Qf;b^SNe-^w2t
z9LoMGIN(}Zc-b}#mAUu+)3b7GF}TbX=E<)&P4Tq!pYjI=hcfyIT;)Gf)@XRC?V|at
zU(AVHuNvjo6xRCr(|dYbL)R{7Nh*KKhDl<#^z?QC;{h#gi(3onyYo*T;9eA4gt}r!
zVK4mgxjCK>bR^{dVf!3ECg6Yz4YcskI>$XH*L8E)MsudhnkP0B>+M(XEcErHUBKi~
z1`fEP&WPhp{@Ew?cPlR(ma9iw8NbJWHqp=btCtM*FnP*@ZwwlJ&-Y|LEjgvJzUtPc
zz5CrWNBRV8d0-bpWAl<=zM1PU8lJ<auFSVLADiJ5u&qD1&?ND+W&L_}^tzZnT_kh-
z*}JFsu|}tn7*p~nn>seDxBK^QuuCj2fg{&2#*IG5ezf1B(o%lU+OZx7So4D?yi2*h
zFBkr5pG3AJs83uy!~C3mQZLp~ss7-N9oAY>t)!eC#s)CrPukK!(!G*)H?v(~JCoj#
zfvgTxMV{4?zL1neQ;ITVBAdFDf`1yG$o{g7^1sR_n{RZ7tnXio?tM%240}(z9xFY0
zlz{^-G*RET;-`7`>e0b{{`!2kM)t7Si9ZqD$~wh*hyGC>z~qs@0T&u*;h}hiKGEga
zHkJ;%7aNc^o_0(>Z{Gp06<d!oiwkYI9@z4HFzfO!R*h-IQ)!TmJxBu9eEVd72@jiB
z2+SIP`!%B@>9H;TwPTUnvvX0SJ+kGGZ0lFBWocl>kaa)AoiMta+x_-J-?#KHFnJ*!
zwD1V?)4s#|?O)DlMBhVv4IgZs?d>b<6%xK3<{o91H?-%8?PK!_fm#3d>{{gQ<X0b>
z?*8`b{G6?bZKdO{_9IVlz{R$PcGjeL|3*|@upby()_Lf^eQ&XQe)CjsbJ3Uolrgt<
zweld3GH|fZpn(=1@PencO_a_)v6tU?WV-w8wfXLbOGae<M=}TTxv_VkkFEV<X@MyN
z2V7{Fd+b}_1y6V*Bc$V<eH8m0Xsn%ve~-Ncd(n@dpOe#l=sI|Q`r=&2J`x`2Kya=+
zzt+=O-yl5kg&`x#=ZBrln1yv?kHLJSFLf?4rgqGMXHLwH^SM79;Blb|_b2e?d&Z|2
z%0Y)skMV`6zEc~Xy<sSyJa~eGoo@HZRu=U{mdyihsrJ)H^i^E@>0{<*C?Ead$6v+>
z|EQKThJTmwXK!c6AOD+<KQQ<@{@^la?D)eoY5bwjH~(4t^38v6nlt~kz2*G=wGR5k
zez5wFeYu@?QTh*@V)UQN=9#4b(fO+XpV^ev|A%*Lm^aWDtN+Wr{-FzRyE@u_*ca=6
z8v94>FgtDv7i<48{-OPce!KDVkzR+XKOcREPha(;$}iUb!*)f-Fb}Y4@r9z-_{OIg
z`xn^T#ZtEPv_T$M*Sr+=Z{q#~8$|7Y{0!*2u${D*Jj%dfOrS~FzpH*_|55J!7kl4w
z?LT!7T(!3!632pmZh?dh`n-z$_ts42pn6;c`}hx;TSYd0idsqal5&0uGV=UM{c9xQ
z1KK6&TS+a^H|6B<wY1?KNwleRT=S(2ztn0;|CLnE`j%2QZCfX)(aE8_)AlDNl~VTp
z#QQ1QtaCx&H5Jr$9fvivU)tSS(tj$j{j{03Ut57~*ExVr+*!fxXI=QFg4>_hPo1W3
zh+Dun!`UkP%H3}*@IE18q{7&MH2f3?T6o}Jf+xI@fh=SyUOArw`*w1_-PUlHZTHc@
z--yqIxPtI}IjPRzLIZ8cPv4P=>?A&=E~~0)>&J#V;TwAR*6}`01iu~U$@prtzW6YS
ze}E>gUX+0YuF}B+Uhw2x7a7Q+oOzMNFHTNN<)40Rzg#`pABKF18@l}5A>RL`?Ri;Z
zC8ExD$)im1@R{N7(wIog8$Yn(6%q$yd9(zKe};OnH%;<E6IVx!rq-Dls&Jo8o|c0<
zuy5@7x0i)X@To&fw53oU#K*E9rw;0;PU1oT;M+!rL4$AO=p(c7O~B+)22N66stja8
zLmiT0brrv*pZHXfPf{Ow8X2@%^#b3ye(U5>mWBs7)>ls~T3Wi6!Xqw6+dpJLVS1P|
z9qV%io-nE*rYcPxiS<?aaq&fI_%s)XSYMT&^sPqm$A6{c4iDfIKCMP$j7*hZC~Z`o
z3eB_QUx<xEycp-_)Sah=HMTrWU685mFUR=P4wY|pc~adutHaL<osPMk3zXS2!X#eA
zQmK56!Art#=`!NBRQ}0}8{+lj<e<}^zH?HJ#;)7I$_tz{`u|6Z8)$57Y@Ga3<m;M!
z?b2b5zRf6E_G}ZMeu#tbU;9AgHA5Wxj!f{WgU#QUu-Y`l-Nnh}4h83xs_!^=pf9is
zZ6c2{+5|2%arZBfg-mccFN>31>U_>mbPTXxkC*!?*zefr#2vF|qr8{|4|u^7-pD|f
z&OPc->UKu)=iHgIpysp<ozGa?r0YPT{HTLHSC6V|OXXo_ayN;&#~E={T{+X=e(w~2
zw~0Nh;&4Wvrk?&hU(QFB4j$Z-f+xH+-#)1eb)s&iu!V^~AfA{w1uGX=?Rm}#S-&+l
zgncRJ)Zh@ylBVrCPT)cVEj)CO3vXl~%gP4UL>;Lsbyj}GJWoBkufOA={CRTUjr%af
zc5pUH9{pg?M5%+)oN`q9yBb<oyS@>Bt@+3xHV)qGm8b)Cp-w7~CwEhtBUk0rbjrqM
zTb|tQ3-5-pw^cul`T+X&s?O;?V(FD<p-*U$j}C+<^vEC&nfC4)HUsx3hzYZGCbpcm
z6e64X$6Y|>!(Q9Qg@(LTCNz{0-vBM^SX5lti3|GpxFn4;Ax6pGc~t)R!Bo${lYH(*
z!F&5X*?S&}YoDCyzwv1H+XI(+rL`;RN9}iLxlfr-r&vGG8OQa@=>+a)+Ij)sd_{wu
z1Am(+3-RFr4&N8N6+hqo19S#;SA1-hG<GH5jM5~<MA>>07p3}&*j4CR+rqdV)^6n;
z_vFr!<qZ$Di!AT7`VHNnve0FgcNDC1nRsh^hbs!#=B-+mwMSJJ_g-u{F!6C(9`}rj
zp@WyjXIw+xaqqN&wm`3UqvCMM*H~D5k4bo8S)U`Sb2ctKqWtsfFSBh4VQ@m;@X~sr
z`v>(a%-=#=kb{pY<Q=}Noc+1|5qFyt+f_*W)u&sj^WW+}&Yr^g5%rG#;~pt<%<8C6
z|8W;TobTZ~I?~E0R{zlkm666CYO?;xU4uf_KXk0x#D%VZQTTTKvty&bKVbXH!qmAr
z>mNL@6|DWkw~%E2V2jYl*e1}c{e$fib?(O+hs}eoBLRo&9(<zgA7XHk#X4o%Yhmmk
z)%oBSV*e<g{mK4CZ|_U{SNnixv-dx;XDQ^nvoeA0T(|zPeYO9w^}*Jn4%|!DHtAEp
zb?%3Z9@-^mGnHchi!Fl;WFcQ=Yh8F!N9vl^KD6!32cuK+`9GMe&)qxK-!FUQwr2W2
z#8;wi!vDctHF&~X^X;?L{*S1BVUJj8{;#kftpAfc-q!z#-zILn?AYal;Q=q}|3p@~
z{h#zj8vi$U_xSw+>;J}YV}0Mi<mo;y>;LZA<ldj{|NX)Ltz*y<=O3Jj=v>e{U$(s=
zT<-IaV$Z+q-P!~3{HxN>Kbw30jXzM&I(S<6Ksx^}HvU2Vntb!<yFz0a_NVv<Vo^f<
zl=P0zzDfLx<R#IBWyIX5zAQ)l1A8--U&vi>etSsm0>)j}Me^+L5{2yz--)?W`Q?az
z!WLG4UNP}+#C+NKH+ZG-Q<ppbjq%{@oiSjqt>=E>IPp%LuKLx$$8NAOGr(#~P>!EA
zDYlpXDR=xM?Xv5(-qp74Cw3LzBeASHSBY`OezkbO<VD55M#Z-5FY&MJafv~uZ8rWH
z`;FiF)bE^fzVqhBKl3|r@GMdMb5Zvn(!{^B503JKg>yjP!G%WSymju_C$VBl--z<c
z^Q7%X-+y6_@;es({)3!PFz);&9_MF;#0G|Sg%%$0f+uGm$Us)qcM;O3c&F`^eE*5I
zbKkX6@4waTy#rW@_a9fA`=1qk|8?&isM!0@IuG{tLnqM(D<q*C_eg4Ds~li?v|)!N
z+SJLm6?jiJ;|CvQpNDMCKKbne{#w=h$G-m^gRI#9|8H&&)Mp8E<F_^Ye$YqR=OH@o
F{{x|jBbfjI


From 169ef76de3cae13919f827a8b19b48bb495e0f89 Mon Sep 17 00:00:00 2001
From: Dan Abramov <gaearon@fb.com>
Date: Sun, 27 Aug 2017 19:20:54 -0700
Subject: [PATCH 49/61] Relax React dep requirements

---
 packages/react-error-overlay/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json
index 06c890a1025..8034897d9dc 100644
--- a/packages/react-error-overlay/package.json
+++ b/packages/react-error-overlay/package.json
@@ -35,8 +35,8 @@
     "babel-code-frame": "6.22.0",
     "babel-runtime": "6.26.0",
     "html-entities": "1.2.1",
-    "react": "^15.5.4",
-    "react-dom": "^15.5.4",
+    "react": "^15 || ^16",
+    "react-dom": "^15 || ^16",
     "settle-promise": "1.0.0",
     "source-map": "0.5.6"
   },

From 5904d8826d3015c39d1c24986482251a86810b93 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Sun, 27 Aug 2017 20:25:03 -0600
Subject: [PATCH 50/61] Changelog for 1.0.12 (#3016)

---
 CHANGELOG.md | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8230403216..62f877da1d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,68 @@
-## 1.0.11 (2017-08-09)
+## 1.0.12 (August 28, 2017)
+
+#### :bug: Bug Fix
+
+* `react-error-overlay`
+  * [#3012](https://github.com/facebookincubator/create-react-app/pull/3012) Fix module function name in error overlay. ([@gaearon](https://github.com/gaearon))
+
+* `react-dev-utils`
+  * [#2938](https://github.com/facebookincubator/create-react-app/pull/2938) Remove superfluous lodash usage. ([@Timer](https://github.com/Timer))
+
+#### :nail_care: Enhancement
+
+* `react-scripts`
+
+  * [#2917](https://github.com/facebookincubator/create-react-app/pull/2917) Optimize the size of default favicon. ([@sylvainbaronnet](https://github.com/sylvainbaronnet))
+
+#### :memo: Documentation
+
+* `react-scripts`
+
+  * [#2986](https://github.com/facebookincubator/create-react-app/pull/2986) Docs: debugging in WebStorm. ([@prigara](https://github.com/prigara))
+  * [#2948](https://github.com/facebookincubator/create-react-app/pull/2948) Remove Modulus from user guide. ([@Zertz](https://github.com/Zertz))
+  * [#2927](https://github.com/facebookincubator/create-react-app/pull/2927) Update README.md. ([@tbassetto](https://github.com/tbassetto))
+
+* `react-dev-utils`
+
+  * [#2942](https://github.com/facebookincubator/create-react-app/pull/2942) Fix docs for `printFileSizesAfterBuild`. ([@Kerumen](https://github.com/Kerumen))
+
+#### :house: Internal
+
+* `react-error-overlay`, `react-scripts`
+
+  * [#2991](https://github.com/facebookincubator/create-react-app/pull/2991) Update `babel-runtime` dependency ([@christophehurpeau](https://github.com/christophehurpeau))
+
+* `react-dev-utils`, `react-error-overlay`, `react-scripts`
+
+  * [#2515](https://github.com/facebookincubator/create-react-app/pull/2515) Convert `react-error-overlay` to React ([@tharakawj](https://github.com/tharakawj))
+
+#### Committers: 9
+
+- Christophe Hurpeau ([christophehurpeau](https://github.com/christophehurpeau))
+- Dan Abramov ([gaearon](https://github.com/gaearon))
+- Ekaterina Prigara ([prigara](https://github.com/prigara))
+- Joe Haddad ([Timer](https://github.com/Timer))
+- Pier-Luc Gendreau ([Zertz](https://github.com/Zertz))
+- Sylvain Baronnet ([sylvainbaronnet](https://github.com/sylvainbaronnet))
+- Tharaka Wijebandara ([tharakawj](https://github.com/tharakawj))
+- Thomas Bassetto ([tbassetto](https://github.com/tbassetto))
+- Yann Pringault ([Kerumen](https://github.com/Kerumen))
+
+### Migrating from 1.0.11 to 1.0.12
+
+Inside any created project that has not been ejected, run:
+
+```
+npm install --save --save-exact react-scripts@1.0.12
+```
+
+or
+
+```
+yarn add --exact react-scripts@1.0.12
+```
+
+## 1.0.11 (August 9, 2017)
 
 #### :bug: Bug Fix
 * `create-react-app`

From ef01aab95ad0b2eb6297e37e35ee5d7e51be934e Mon Sep 17 00:00:00 2001
From: Dan Abramov <gaearon@fb.com>
Date: Sun, 27 Aug 2017 19:26:52 -0700
Subject: [PATCH 51/61] Publish

 - react-dev-utils@4.0.0
 - react-error-overlay@2.0.0
 - react-scripts@1.0.12
---
 packages/react-dev-utils/package.json     | 4 ++--
 packages/react-error-overlay/package.json | 2 +-
 packages/react-scripts/package.json       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json
index ccc22bf6332..d2f87f51cf3 100644
--- a/packages/react-dev-utils/package.json
+++ b/packages/react-dev-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dev-utils",
-  "version": "3.1.1",
+  "version": "4.0.0",
   "description": "Webpack utilities used by Create React App",
   "repository": "facebookincubator/create-react-app",
   "license": "BSD-3-Clause",
@@ -47,7 +47,7 @@
     "inquirer": "3.2.1",
     "is-root": "1.0.0",
     "opn": "5.1.0",
-    "react-error-overlay": "^1.0.9",
+    "react-error-overlay": "^2.0.0",
     "recursive-readdir": "2.2.1",
     "shell-quote": "1.6.1",
     "sockjs-client": "1.1.4",
diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json
index 8034897d9dc..ba4676c4a77 100644
--- a/packages/react-error-overlay/package.json
+++ b/packages/react-error-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-error-overlay",
-  "version": "1.0.10",
+  "version": "2.0.0",
   "description": "An overlay for displaying stack frames.",
   "main": "lib/index.js",
   "scripts": {
diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index c2ed1fe8a49..f7acdb6befd 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -35,7 +35,7 @@
     "postcss-flexbugs-fixes": "3.2.0",
     "postcss-loader": "2.0.6",
     "promise": "8.0.1",
-    "react-dev-utils": "^3.1.0",
+    "react-dev-utils": "^4.0.0",
     "style-loader": "0.18.2",
     "ts-jest": "^20.0.7",
     "ts-loader": "^2.2.1",

From 912a02ece05bb09dd820035c92744e94ff513b6e Mon Sep 17 00:00:00 2001
From: Tharaka Wijebandara <tharaka.nw@gmail.com>
Date: Sat, 2 Sep 2017 01:24:58 +0530
Subject: [PATCH 52/61] Fix error overlay 'Object.assign' issue in IE by
 including polyfills before webpack client (#3046)

---
 packages/react-scripts/config/webpack.config.dev.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js
index b9eec97c998..7009dc1054e 100644
--- a/packages/react-scripts/config/webpack.config.dev.js
+++ b/packages/react-scripts/config/webpack.config.dev.js
@@ -42,6 +42,8 @@ module.exports = {
   // This means they will be the "root" imports that are included in JS bundle.
   // The first two entry points enable "hot" CSS and auto-refreshes for JS.
   entry: [
+    // We ship a few polyfills by default:
+    require.resolve('./polyfills'),
     // Include an alternative client for WebpackDevServer. A client's job is to
     // connect to WebpackDevServer by a socket and get notified about changes.
     // When you save a file, the client will either apply hot updates (in case
@@ -53,8 +55,6 @@ module.exports = {
     // require.resolve('webpack-dev-server/client') + '?/',
     // require.resolve('webpack/hot/dev-server'),
     require.resolve('react-dev-utils/webpackHotDevClient'),
-    // We ship a few polyfills by default:
-    require.resolve('./polyfills'),
     // Finally, this is your app's code:
     paths.appIndexJs,
     // We include the app code last so that if there is a runtime error during

From 563ff66a92ea221883ffffbf0c6edc232f33e348 Mon Sep 17 00:00:00 2001
From: "Erik J. Sturcke" <esturcke@users.noreply.github.com>
Date: Fri, 1 Sep 2017 15:56:17 -0400
Subject: [PATCH 53/61] Strip hash from chunk file name (#3049)

---
 packages/react-dev-utils/FileSizeReporter.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/react-dev-utils/FileSizeReporter.js b/packages/react-dev-utils/FileSizeReporter.js
index ab9a2728752..f25e473787d 100644
--- a/packages/react-dev-utils/FileSizeReporter.js
+++ b/packages/react-dev-utils/FileSizeReporter.js
@@ -92,7 +92,10 @@ function printFileSizesAfterBuild(
 function removeFileNameHash(buildFolder, fileName) {
   return fileName
     .replace(buildFolder, '')
-    .replace(/\/?(.*)(\.\w+)(\.js|\.css)/, (match, p1, p2, p3) => p1 + p3);
+    .replace(
+      /\/?(.*)(\.[0-9a-f]+)(\.chunk)?(\.js|\.css)/,
+      (match, p1, p2, p3, p4) => p1 + p4
+    );
 }
 
 // Input: 1024, 2048

From 763c4c27d7370b1894b4eecf94d0d93529b254ad Mon Sep 17 00:00:00 2001
From: Tharaka Wijebandara <tharaka.nw@gmail.com>
Date: Sat, 2 Sep 2017 06:29:37 +0530
Subject: [PATCH 54/61] Rename Overlay to ErrorOvelay (#3051)

---
 .../src/components/{Overlay.js => ErrorOverlay.js}          | 4 ++--
 .../src/containers/CompileErrorContainer.js                 | 6 +++---
 .../src/containers/RuntimeErrorContainer.js                 | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename packages/react-error-overlay/src/components/{Overlay.js => ErrorOverlay.js} (96%)

diff --git a/packages/react-error-overlay/src/components/Overlay.js b/packages/react-error-overlay/src/components/ErrorOverlay.js
similarity index 96%
rename from packages/react-error-overlay/src/components/Overlay.js
rename to packages/react-error-overlay/src/components/ErrorOverlay.js
index 4fe530b6fee..446105dad2e 100644
--- a/packages/react-error-overlay/src/components/Overlay.js
+++ b/packages/react-error-overlay/src/components/ErrorOverlay.js
@@ -31,7 +31,7 @@ const overlayStyle = {
   color: black,
 };
 
-class Overlay extends Component {
+class ErrorOverlay extends Component {
   iframeWindow: window = null;
 
   getIframeWindow = (element: HTMLDivElement) => {
@@ -71,4 +71,4 @@ class Overlay extends Component {
   }
 }
 
-export default Overlay;
+export default ErrorOverlay;
diff --git a/packages/react-error-overlay/src/containers/CompileErrorContainer.js b/packages/react-error-overlay/src/containers/CompileErrorContainer.js
index bd193eb50b4..a3e89fe591d 100644
--- a/packages/react-error-overlay/src/containers/CompileErrorContainer.js
+++ b/packages/react-error-overlay/src/containers/CompileErrorContainer.js
@@ -9,7 +9,7 @@
 
 /* @flow */
 import React, { PureComponent } from 'react';
-import Overlay from '../components/Overlay';
+import ErrorOverlay from '../components/ErrorOverlay';
 import Footer from '../components/Footer';
 import Header from '../components/Header';
 import CodeBlock from '../components/CodeBlock';
@@ -19,11 +19,11 @@ class CompileErrorContainer extends PureComponent {
   render() {
     const { error } = this.props;
     return (
-      <Overlay>
+      <ErrorOverlay>
         <Header headerText="Failed to compile" />
         <CodeBlock main={true} codeHTML={generateAnsiHTML(error)} />
         <Footer line1="This error occurred during the build time and cannot be dismissed." />
-      </Overlay>
+      </ErrorOverlay>
     );
   }
 }
diff --git a/packages/react-error-overlay/src/containers/RuntimeErrorContainer.js b/packages/react-error-overlay/src/containers/RuntimeErrorContainer.js
index c84adb19492..9c41aa38109 100644
--- a/packages/react-error-overlay/src/containers/RuntimeErrorContainer.js
+++ b/packages/react-error-overlay/src/containers/RuntimeErrorContainer.js
@@ -9,7 +9,7 @@
 
 /* @flow */
 import React, { PureComponent } from 'react';
-import Overlay from '../components/Overlay';
+import ErrorOverlay from '../components/ErrorOverlay';
 import CloseButton from '../components/CloseButton';
 import NavigationBar from '../components/NavigationBar';
 import RuntimeError from './RuntimeError';
@@ -52,7 +52,7 @@ class RuntimeErrorContainer extends PureComponent {
     const { errorRecords, close } = this.props;
     const totalErrors = errorRecords.length;
     return (
-      <Overlay shortcutHandler={this.shortcutHandler}>
+      <ErrorOverlay shortcutHandler={this.shortcutHandler}>
         <CloseButton close={close} />
         {totalErrors > 1 &&
           <NavigationBar
@@ -69,7 +69,7 @@ class RuntimeErrorContainer extends PureComponent {
           line1="This screen is visible only in development. It will not appear if the app crashes in production."
           line2="Open your browser’s developer console to further inspect this error."
         />
-      </Overlay>
+      </ErrorOverlay>
     );
   }
 }

From c4651dcbe30a1000f1377f83e7af83f177ec52d1 Mon Sep 17 00:00:00 2001
From: Anthony <anthony.alayo@gmail.com>
Date: Sat, 2 Sep 2017 13:41:40 -0700
Subject: [PATCH 55/61] provide empty mock for child_process so importing
 libraries with it works (#3033)

---
 packages/react-scripts/config/webpack.config.dev.js  | 1 +
 packages/react-scripts/config/webpack.config.prod.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js
index 7009dc1054e..07c0a3adf49 100644
--- a/packages/react-scripts/config/webpack.config.dev.js
+++ b/packages/react-scripts/config/webpack.config.dev.js
@@ -270,6 +270,7 @@ module.exports = {
     fs: 'empty',
     net: 'empty',
     tls: 'empty',
+    child_process: 'empty',
   },
   // Turn off performance hints during development because we don't do any
   // splitting or minification in interest of speed. These warnings become
diff --git a/packages/react-scripts/config/webpack.config.prod.js b/packages/react-scripts/config/webpack.config.prod.js
index 9aa1bd93b3e..9582ee73133 100644
--- a/packages/react-scripts/config/webpack.config.prod.js
+++ b/packages/react-scripts/config/webpack.config.prod.js
@@ -349,5 +349,6 @@ module.exports = {
     fs: 'empty',
     net: 'empty',
     tls: 'empty',
+    child_process: 'empty',
   },
 };

From 638a81caf6b53c65eae2c7dd8d5ebe5bbdf206c7 Mon Sep 17 00:00:00 2001
From: Jared Palmer <jaredloganpalmer@gmail.com>
Date: Sat, 2 Sep 2017 16:42:04 -0400
Subject: [PATCH 56/61] Make error overlay filename configurable (#3028)

* Make error overlay file configurable

* Add fallback filename
---
 packages/react-dev-utils/webpackHotDevClient.js           | 1 +
 packages/react-error-overlay/src/index.js                 | 3 ++-
 packages/react-error-overlay/src/listenToRuntimeErrors.js | 7 +++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/react-dev-utils/webpackHotDevClient.js b/packages/react-dev-utils/webpackHotDevClient.js
index b6effe718e5..96a15063231 100644
--- a/packages/react-dev-utils/webpackHotDevClient.js
+++ b/packages/react-dev-utils/webpackHotDevClient.js
@@ -33,6 +33,7 @@ ErrorOverlay.startReportingRuntimeErrors({
       module.hot.decline();
     }
   },
+  filename: 'static/js/bundle.js',
 });
 
 if (module.hot && typeof module.hot.dispose === 'function') {
diff --git a/packages/react-error-overlay/src/index.js b/packages/react-error-overlay/src/index.js
index ff4f1c71404..168baa7ef64 100644
--- a/packages/react-error-overlay/src/index.js
+++ b/packages/react-error-overlay/src/index.js
@@ -21,6 +21,7 @@ import type { ErrorRecord } from './listenToRuntimeErrors';
 type RuntimeReportingOptions = {|
   onError: () => void,
   launchEditorEndpoint: string,
+  filename?: string,
 |};
 
 let iframe: null | HTMLIFrameElement = null;
@@ -55,7 +56,7 @@ export function startReportingRuntimeErrors(options: RuntimeReportingOptions) {
     } finally {
       handleRuntimeError(errorRecord);
     }
-  });
+  }, options.filename);
 }
 
 function handleRuntimeError(errorRecord) {
diff --git a/packages/react-error-overlay/src/listenToRuntimeErrors.js b/packages/react-error-overlay/src/listenToRuntimeErrors.js
index 45c43fa5d40..341200afa8b 100644
--- a/packages/react-error-overlay/src/listenToRuntimeErrors.js
+++ b/packages/react-error-overlay/src/listenToRuntimeErrors.js
@@ -39,7 +39,10 @@ export type ErrorRecord = {|
   stackFrames: StackFrame[],
 |};
 
-export function listenToRuntimeErrors(crash: ErrorRecord => void) {
+export function listenToRuntimeErrors(
+  crash: ErrorRecord => void,
+  filename: string = '/static/js/bundle.js'
+) {
   function crashWithFrames(error: Error, unhandledRejection = false) {
     getStackFrames(error, unhandledRejection, CONTEXT_SIZE)
       .then(stackFrames => {
@@ -68,7 +71,7 @@ export function listenToRuntimeErrors(crash: ErrorRecord => void) {
       {
         message: data.message,
         stack: data.stack,
-        __unmap_source: '/static/js/bundle.js',
+        __unmap_source: filename,
       },
       false
     );

From ec2f824fdd9d868a2a3dbb572f39b6e06055cb5d Mon Sep 17 00:00:00 2001
From: Dan Abramov <gaearon@fb.com>
Date: Sat, 2 Sep 2017 13:54:33 -0700
Subject: [PATCH 57/61] Add missing slash

---
 packages/react-dev-utils/webpackHotDevClient.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-dev-utils/webpackHotDevClient.js b/packages/react-dev-utils/webpackHotDevClient.js
index 96a15063231..18a6a4a0ae1 100644
--- a/packages/react-dev-utils/webpackHotDevClient.js
+++ b/packages/react-dev-utils/webpackHotDevClient.js
@@ -33,7 +33,7 @@ ErrorOverlay.startReportingRuntimeErrors({
       module.hot.decline();
     }
   },
-  filename: 'static/js/bundle.js',
+  filename: '/static/js/bundle.js',
 });
 
 if (module.hot && typeof module.hot.dispose === 'function') {

From e8c952d9ee4046df357b4ced810d688ddd37829d Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Sat, 2 Sep 2017 13:57:52 -0700
Subject: [PATCH 58/61] Changelog for 1.0.13

---
 CHANGELOG.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62f877da1d0..3a77c54b298 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,52 @@
+## 1.0.13 (September 2, 2017)
+
+#### :bug: Bug Fix
+
+* `react-error-overlay`
+
+  * [#3051](https://github.com/facebookincubator/create-react-app/pull/3051) Fix case-sensitivity issue with upgrading the package version. ([@tharakawj](https://github.com/tharakawj))
+
+* `react-dev-utils`
+
+  * [#3049](https://github.com/facebookincubator/create-react-app/pull/3049) Print filesize difference for chunks. ([@esturcke](https://github.com/esturcke))
+
+* `react-scripts`
+
+  * [#3046](https://github.com/facebookincubator/create-react-app/pull/3046) Fix crash in development mode on IE11. ([@tharakawj](https://github.com/tharakawj))
+
+#### :nail_care: Enhancement
+
+* `react-scripts`
+
+  * [#3033](https://github.com/facebookincubator/create-react-app/pull/3033) Add an empty mock for `child_process` to let some libraries compile. ([@McFlurriez](https://github.com/McFlurriez))
+
+#### :house: Internal
+
+* `react-dev-utils`, `react-error-overlay`
+
+  * [#3028](https://github.com/facebookincubator/create-react-app/pull/3028) Make error overlay filename configurable. ([@jaredpalmer](https://github.com/jaredpalmer))
+
+#### Committers: 4
+
+- Anthony ([McFlurriez](https://github.com/McFlurriez))
+- Erik J. Sturcke ([esturcke](https://github.com/esturcke))
+- Jared Palmer ([jaredpalmer](https://github.com/jaredpalmer))
+- Tharaka Wijebandara ([tharakawj](https://github.com/tharakawj))
+
+### Migrating from 1.0.12 to 1.0.13
+
+Inside any created project that has not been ejected, run:
+
+```
+npm install --save --save-exact react-scripts@1.0.13
+```
+
+or
+
+```
+yarn add --exact react-scripts@1.0.13
+```
+
 ## 1.0.12 (August 28, 2017)
 
 #### :bug: Bug Fix
@@ -62,6 +111,8 @@ or
 yarn add --exact react-scripts@1.0.12
 ```
 
+**Note:** there’s a [known issue](https://github.com/facebookincubator/create-react-app/issues/3041) that might cause the project to not compile after upgrading. In this case, migrate straight to `1.0.13` which doesn’t have this issue.
+
 ## 1.0.11 (August 9, 2017)
 
 #### :bug: Bug Fix

From 51ee648f2517d6e86ba8bcffdf9144ef8954b19e Mon Sep 17 00:00:00 2001
From: Dan Abramov <gaearon@fb.com>
Date: Sat, 2 Sep 2017 13:58:21 -0700
Subject: [PATCH 59/61] Publish

 - react-dev-utils@4.0.1
 - react-error-overlay@2.0.1
 - react-scripts@1.0.13
---
 packages/react-dev-utils/package.json     | 4 ++--
 packages/react-error-overlay/package.json | 2 +-
 packages/react-scripts/package.json       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json
index d2f87f51cf3..ec8b442928f 100644
--- a/packages/react-dev-utils/package.json
+++ b/packages/react-dev-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dev-utils",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Webpack utilities used by Create React App",
   "repository": "facebookincubator/create-react-app",
   "license": "BSD-3-Clause",
@@ -47,7 +47,7 @@
     "inquirer": "3.2.1",
     "is-root": "1.0.0",
     "opn": "5.1.0",
-    "react-error-overlay": "^2.0.0",
+    "react-error-overlay": "^2.0.1",
     "recursive-readdir": "2.2.1",
     "shell-quote": "1.6.1",
     "sockjs-client": "1.1.4",
diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json
index ba4676c4a77..b3b9365aeb3 100644
--- a/packages/react-error-overlay/package.json
+++ b/packages/react-error-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-error-overlay",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "An overlay for displaying stack frames.",
   "main": "lib/index.js",
   "scripts": {
diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index f7acdb6befd..e2042156744 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts-ts",
-  "version": "2.7.0",
+  "version": "1.0.12",
   "description": "Configuration and scripts for Create React App.",
   "repository": "wmonk/create-react-app",
   "license": "BSD-3-Clause",
@@ -35,7 +35,7 @@
     "postcss-flexbugs-fixes": "3.2.0",
     "postcss-loader": "2.0.6",
     "promise": "8.0.1",
-    "react-dev-utils": "^4.0.0",
+    "react-dev-utils": "^4.0.1",
     "style-loader": "0.18.2",
     "ts-jest": "^20.0.7",
     "ts-loader": "^2.2.1",

From 26979d31ca36361c98fccb8d00a7f5606610e03a Mon Sep 17 00:00:00 2001
From: Tharaka Wijebandara <tharaka.nw@gmail.com>
Date: Sun, 3 Sep 2017 09:16:58 +0530
Subject: [PATCH 60/61] Set travis config to use 'precise' ci environment

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0bee9a16bd9..167fc436b49 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,9 @@
 ---
+# Use Ubuntu Precise instead of new default Trusty which cause build fail
+# with pre installed yarn v0.17.8
+# https://github.com/facebookincubator/create-react-app/issues/3054
+# TODO: remove after Trusty environment is updated with a lastet version of yarn
+dist: precise
 language: node_js
 node_js:
   - 6

From fa89c0017c1275c143874dd1fb850820a4bbc33a Mon Sep 17 00:00:00 2001
From: John Nilsson <john.nilsson@medius.se>
Date: Fri, 15 Sep 2017 10:57:42 +0200
Subject: [PATCH 61/61] change version back to 2.6.0

---
 packages/react-scripts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index e2042156744..59de5160a27 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts-ts",
-  "version": "1.0.12",
+  "version": "2.6.0",
   "description": "Configuration and scripts for Create React App.",
   "repository": "wmonk/create-react-app",
   "license": "BSD-3-Clause",