Skip to content
This repository was archived by the owner on Oct 19, 2022. It is now read-only.

Merge changes from upstream #23

Merged
merged 5 commits into from
Jan 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions packages/react-dev-utils/ignoredFiles.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
'use strict';

const path = require('path');
const escape = require('escape-string-regexp');

module.exports = function ignoredFiles(appSrc) {
return new RegExp(
`^(?!${path
.normalize(appSrc + '/')
.replace(/[\\]+/g, '/')}).+/node_modules/`,
`^(?!${escape(
path.normalize(appSrc + '/').replace(/[\\]+/g, '/')
)}).+/node_modules/`,
'g'
);
};
8 changes: 4 additions & 4 deletions packages/react-scripts/template/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -890,10 +890,10 @@ life of the shell session.
#### Windows (cmd.exe)

```cmd
set REACT_APP_SECRET_CODE=abcdef&&npm start
set "REACT_APP_SECRET_CODE=abcdef" && npm start
```

(Note: the lack of whitespace is intentional.)
(Note: Quotes around the variable assignment are required to avoid a trailing whitespace.)

#### Linux, macOS (Bash)

Expand Down Expand Up @@ -1258,7 +1258,7 @@ it('renders without crashing', () => {
});
```

This test mounts a component and makes sure that it didn’t throw during rendering. Tests like this provide a lot value with very little effort so they are great as a starting point, and this is the test you will find in `src/App.test.js`.
This test mounts a component and makes sure that it didn’t throw during rendering. Tests like this provide a lot of value with very little effort so they are great as a starting point, and this is the test you will find in `src/App.test.js`.

When you encounter bugs caused by changing components, you will gain a deeper insight into which parts of them are worth testing in your application. This might be a good time to introduce more specific tests asserting specific expected output or behavior.

Expand Down Expand Up @@ -2131,7 +2131,7 @@ In this case, ensure that the file is there with the proper lettercase and that
**To do a manual deploy to Netlify’s CDN:**

```sh
npm install netlify-cli
npm install netlify-cli -g
netlify deploy
```

Expand Down