Merge pull request #22 from facebook/next

Update Upstream

Author: tvalentius

Diff for: CHANGELOG.md

@@ -1,3 +1,53 @@
+## 1.1.4 (April 3, 2018)
+
+#### :bug: Bug Fix
+
+* `react-dev-utils`
+
+  * [#4250](https://github.com/facebook/create-react-app/pull/4250) Upgrade `detect-port-alt` to fix [#4189](https://github.com/facebook/create-react-app/issues/4189). ([@Timer](https://github.com/Timer))
+
+#### Committers: 1
+- Joe Haddad ([Timer](https://github.com/Timer))
+
+### Migrating from 1.1.3 to 1.1.4
+
+Inside any created project that has not been ejected, run:
+
+```
+npm install --save --save-exact [email protected]
+```
+
+or
+
+```
+yarn add --exact [email protected]
+```
+
+## 1.1.3 (April 3, 2018)
+
+#### :bug: Bug Fix
+
+* `react-scripts`
+
+  * [#4247](https://github.com/facebook/create-react-app/pull/4247) Fix `environment.dispose is not a function` error caused by a Jest bug. ([@gaearon](https://github.com/gaearon))
+
+#### Committers: 1
+- Dan Abramov ([gaearon](https://github.com/gaearon))
+
+### Migrating from 1.1.2 to 1.1.3
+
+Inside any created project that has not been ejected, run:
+
+```
+npm install --save --save-exact [email protected]
+```
+
+or
+
+```
+yarn add --exact [email protected]
+```
+
 ## 1.1.2 (April 3, 2018)
 
 #### :bug: Bug Fix

Diff for: packages/react-dev-utils/package.json

@@ -42,7 +42,7 @@
     "browserslist": "2.11.3",
     "chalk": "2.3.0",
     "cross-spawn": "5.1.0",
-    "detect-port-alt": "1.1.5",
+    "detect-port-alt": "1.1.6",
     "escape-string-regexp": "1.0.5",
     "filesize": "3.5.11",
     "find-pkg": "1.0.0",

Diff for: packages/react-scripts/package.json

@@ -56,6 +56,7 @@
     "promise": "8.0.1",
     "raf": "3.4.0",
     "react-dev-utils": "^5.0.0",
+    "resolve": "1.6.0",
     "style-loader": "0.19.1",
     "svgr": "1.8.1",
     "sw-precache-webpack-plugin": "0.11.4",

Diff for: packages/react-scripts/scripts/test.js

@@ -31,7 +31,7 @@ if (process.env.SKIP_PREFLIGHT_CHECK !== 'true') {
 // @remove-on-eject-end
 
 const jest = require('jest');
-const argv = process.argv.slice(2);
+let argv = process.argv.slice(2);
 
 // Watch unless on CI, in coverage mode, or explicitly running all tests
 if (
@@ -57,5 +57,59 @@ argv.push(
     )
   )
 );
+
+// This is a very dirty workaround for https://github.com/facebook/jest/issues/5913.
+// We're trying to resolve the environment ourselves because Jest does it incorrectly.
+// TODO: remove this (and the `resolve` dependency) as soon as it's fixed in Jest.
+const resolve = require('resolve');
+function resolveJestDefaultEnvironment(name) {
+  const jestDir = path.dirname(
+    resolve.sync('jest', {
+      basedir: __dirname,
+    })
+  );
+  const jestCLIDir = path.dirname(
+    resolve.sync('jest-cli', {
+      basedir: jestDir,
+    })
+  );
+  const jestConfigDir = path.dirname(
+    resolve.sync('jest-config', {
+      basedir: jestCLIDir,
+    })
+  );
+  return resolve.sync(name, {
+    basedir: jestConfigDir,
+  });
+}
+let cleanArgv = [];
+let env = 'node';
+let next;
+do {
+  next = argv.shift();
+  if (next === '--env') {
+    env = argv.shift();
+  } else if (next.indexOf('--env=') === 0) {
+    env = next.substring('--env='.length);
+  } else {
+    cleanArgv.push(next);
+  }
+} while (argv.length > 0);
+argv = cleanArgv;
+let resolvedEnv;
+try {
+  resolvedEnv = resolveJestDefaultEnvironment(`jest-environment-${env}`);
+} catch (e) {
+  // ignore
+}
+if (!resolvedEnv) {
+  try {
+    resolvedEnv = resolveJestDefaultEnvironment(env);
+  } catch (e) {
+    // ignore
+  }
+}
+const testEnvironment = resolvedEnv || env;
+argv.push('--env', testEnvironment);
 // @remove-on-eject-end
 jest.run(argv);

Diff for: packages/react-scripts/template/src/serviceWorker.js

@@ -33,7 +33,7 @@ export function register(config) {
       const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
 
       if (isLocalhost) {
-        // This is running on localhost. Lets check if a service worker still exists or not.
+        // This is running on localhost. Let's check if a service worker still exists or not.
         checkValidServiceWorker(swUrl, config);
 
         // Add some additional logging to localhost, pointing developers to the