merged master

Author: kellyrmilligan

CHANGELOG.md

@@ -1,3 +1,38 @@
+## 1.0.17 (November 3, 2017)
+
+#### :nail_care: Enhancement
+
+* `react-scripts`
+
+  * [#3401](https://github.com/facebookincubator/create-react-app/pull/3401) Stop using a deprecated option. ([@gaearon](https://github.com/gaearon))
+
+#### :memo: Documentation
+
+* `react-scripts`
+
+  * [#3399](https://github.com/facebookincubator/create-react-app/pull/3399) Add link to VS Code troubleshooting guide. ([@auchenberg](https://github.com/auchenberg))
+  * [#3400](https://github.com/facebookincubator/create-react-app/pull/3400) Update VS Code debug configuration. ([@auchenberg](https://github.com/auchenberg))
+
+#### Committers: 3
+
+- Dan Abramov ([gaearon](https://github.com/gaearon))
+- Kenneth Auchenberg ([auchenberg](https://github.com/auchenberg))
+- Loren Sands-Ramshaw ([lorensr](https://github.com/lorensr))
+
+### Migrating from 1.0.16 to 1.0.17
+
+Inside any created project that has not been ejected, run:
+
+```
+npm install --save --save-exact [email protected]
+```
+
+or
+
+```
+yarn add --exact [email protected]
+```
+
 ## 1.0.16 (October 31, 2017) 🎃
 
 #### :bug: Bug Fix

README.md

@@ -40,7 +40,7 @@ Install it once globally:
 npm install -g create-react-app
 ```
 
-**You’ll need to have Node >= 6 on your machine**. You can use [nvm](https://github.com/creationix/nvm#installation) to easily switch Node versions between different projects.
+**You’ll need to have Node >= 6 on your machine**. You can use [nvm](https://github.com/creationix/nvm#installation) (macOS/Linux) or [nvm-windows](https://github.com/coreybutler/nvm-windows#node-version-manager-nvm-for-windows) to easily switch Node versions between different projects.
 
 **This tool doesn’t assume a Node backend**. The Node installation is only required for Create React App itself.
 

appveyor.yml

@@ -28,8 +28,6 @@ platform:
   - x64
 
 install:
-  # TODO: Remove after https://github.com/appveyor/ci/issues/1426 is fixed
-  - set PATH=C:\Program Files\Git\mingw64\bin;%PATH%
   - ps: Install-Product node $env:nodejs_version $env:platform
 
 build: off
@@ -41,4 +39,4 @@ skip_commits:
 test_script:
   - node --version
   - npm --version
-  - sh tasks/e2e-%test_suite%.sh
+  - bash tasks/e2e-%test_suite%.sh

packages/create-react-app/createReactApp.js

@@ -64,6 +64,7 @@ const program = new commander.Command(packageJson.name)
     '--scripts-version <alternative-package>',
     'use a non-standard version of react-scripts'
   )
+  .option('--use-npm')
   .allowUnknownOption()
   .on('--help', () => {
     console.log(`    Only ${chalk.green('<project-directory>')} is required.`);
@@ -133,10 +134,11 @@ createApp(
   projectName,
   program.verbose,
   program.scriptsVersion,
+  program.useNpm,
   hiddenProgram.internalTestingTemplate
 );
 
-function createApp(name, verbose, version, template) {
+function createApp(name, verbose, version, useNpm, template) {
   const root = path.resolve(name);
   const appName = path.basename(root);
 
@@ -159,7 +161,7 @@ function createApp(name, verbose, version, template) {
     JSON.stringify(packageJson, null, 2)
   );
 
-  const useYarn = shouldUseYarn();
+  const useYarn = useNpm ? false : shouldUseYarn();
   const originalDirectory = process.cwd();
   process.chdir(root);
   if (!useYarn && !checkThatNpmCanReadCwd()) {

packages/eslint-config-react-app/README.md

@@ -45,7 +45,7 @@ The following rules from the [eslint-plugin-jsx-a11y](https://github.com/evcohen
 - [aria-role](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/docs/rules/aria-role.md)
 - [aria-unsupported-elements](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/docs/rules/aria-unsupported-elements.md)
 - [heading-has-content](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/docs/rules/heading-has-content.md)
-- [href-no-hash](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/docs/rules/href-no-hash.md)
+- [href-no-hash](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/v5.1.1/docs/rules/href-no-hash.md)
 - [iframe-has-title](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/docs/rules/iframe-has-title.md)
 - [img-redundant-alt](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/docs/rules/img-redundant-alt.md)
 - [no-access-key](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/docs/rules/no-access-key.md)

packages/react-dev-utils/__tests__/.eslintrc

@@ -0,0 +1,5 @@
+{
+  "env": {
+    "jest": true
+  }
+}

packages/react-dev-utils/__tests__/ignoredFiles.test.js

@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+const ignoredFiles = require('../ignoredFiles');
+
+describe('ignore watch files regex', () => {
+  it('normal file', () => {
+    const appSrc = '/root/src/';
+    const isIgnored = ignoredFiles(appSrc).test('/foo');
+    const isIgnoredInSrc = ignoredFiles(appSrc).test('/root/src/foo');
+
+    expect(isIgnored).toBe(false);
+    expect(isIgnoredInSrc).toBe(false);
+  });
+
+  it('node modules', () => {
+    const appSrc = '/root/src/';
+    const isIgnored = ignoredFiles(appSrc).test('/root/node_modules/foo');
+
+    expect(isIgnored).toBe(true);
+  });
+
+  it('node modules inside source directory', () => {
+    const appSrc = '/root/src/';
+    const isIgnored = ignoredFiles(appSrc).test('/root/src/node_modules/foo');
+    const isIgnoredMoreThanOneLevel = ignoredFiles(appSrc).test(
+      '/root/src/bar/node_modules/foo'
+    );
+
+    expect(isIgnored).toBe(false);
+    expect(isIgnoredMoreThanOneLevel).toBe(false);
+  });
+
+  it('path contains source directory', () => {
+    const appSrc = '/root/src/';
+    const isIgnored = ignoredFiles(appSrc).test(
+      '/bar/root/src/node_modules/foo'
+    );
+
+    expect(isIgnored).toBe(true);
+  });
+
+  it('path starts with source directory', () => {
+    const appSrc = '/root/src/';
+    const isIgnored = ignoredFiles(appSrc).test('/root/src2/node_modules/foo');
+
+    expect(isIgnored).toBe(true);
+  });
+});

packages/react-dev-utils/ignoredFiles.js

@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+const path = require('path');
+
+module.exports = function ignoredFiles(appSrc) {
+  return new RegExp(
+    `^(?!${path
+      .normalize(appSrc + '/')
+      .replace(/[\\]+/g, '/')}).+/node_modules/`,
+    'g'
+  );
+};

packages/react-dev-utils/package.json

@@ -21,6 +21,7 @@
     "printBuildError.js",
     "formatWebpackMessages.js",
     "getProcessForPort.js",
+    "ignoredFiles.js",
     "inquirer.js",
     "InterpolateHtmlPlugin.js",
     "launchEditor.js",
@@ -53,5 +54,11 @@
     "sockjs-client": "1.1.4",
     "strip-ansi": "3.0.1",
     "text-table": "0.2.0"
+  },
+  "devDependencies": {
+    "jest": "20.0.4"
+  },
+  "scripts": {
+    "test": "jest"
   }
 }

packages/react-error-overlay/src/index.js

@@ -64,7 +64,7 @@ export function startReportingRuntimeErrors(options: RuntimeReportingOptions) {
     );
   }
   currentRuntimeErrorOptions = options;
-  listenToRuntimeErrors(errorRecord => {
+  stopListeningToRuntimeErrors = listenToRuntimeErrors(errorRecord => {
     try {
       if (typeof options.onError === 'function') {
         options.onError.call(null);
@@ -87,7 +87,7 @@ function handleRuntimeError(errorRecord) {
   update();
 }
 
-function dismissRuntimeErrors() {
+export function dismissRuntimeErrors() {
   currentRuntimeErrorRecords = [];
   update();
 }