Skip to content

Commit 3b48247

Browse files
joeycozzajoeycozza
authored
Merge pull request #26 from facebook/master
facebook v2.1.3
2 parents 3956ce8 + 714599d commit 3b48247

File tree

37 files changed

+475
-287
lines changed

37 files changed

+475
-287
lines changed

‎.github/stale.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,14 @@ daysUntilClose: 5
99

1010
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
1111
exemptLabels:
12-
- "issue: proposal"
12+
- "contributions: claimed"
13+
- "contributions: up for grabs!"
14+
- "good first issue"
1315
- "issue: announcement"
16+
- "issue: bug"
17+
- "issue: proposal"
18+
- "tag: bug fix"
19+
- "tag: needs investigation"
1420

1521
# Set to true to ignore issues in a project (defaults to false)
1622
exemptProjects: true

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cache:
1010
directories:
1111
- .npm
1212
before_install:
13-
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --nightly
13+
- curl -o- -L https://yarnpkg.com/install.sh | bash -s
1414
- export PATH="$HOME/.yarn/bin:$PATH"
1515
install: true
1616
script:

‎CHANGELOG.md

+50
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,53 @@
1+
## 2.1.3 (January 4, 2019)
2+
3+
v2.1.3 is a maintenance release to fix a [vulnerability in webpack-dev-server](https://www.npmjs.com/advisories/725).
4+
5+
#### :memo: Documentation
6+
7+
- Other
8+
- [#6067](https://github.com/facebook/create-react-app/pull/6067) Correct an error for documentation. ([@hardo](https://github.com/hardo))
9+
- [#6110](https://github.com/facebook/create-react-app/pull/6110) Replace deprecated VSCode launch.json variable. ([@raiskila](https://github.com/raiskila))
10+
- [#5631](https://github.com/facebook/create-react-app/pull/5631) Generalize the adding bootstrap documentation. ([@jquense](https://github.com/jquense))
11+
- [#6084](https://github.com/facebook/create-react-app/pull/6084) Remove outdated docs for setting up eslint in editor. ([@LukasWerfel](https://github.com/LukasWerfel))
12+
- [#6061](https://github.com/facebook/create-react-app/pull/6061) Fix control comment of CSS Grid prefixing. ([@denexapp](https://github.com/denexapp))
13+
- `react-scripts`
14+
- [#6036](https://github.com/facebook/create-react-app/pull/6036) Fix comment typo. ([@shawtung](https://github.com/shawtung))
15+
16+
#### :house: Internal
17+
18+
- `create-react-app`, `react-error-overlay`
19+
- [#6104](https://github.com/facebook/create-react-app/pull/6104) Typo fixes. ([@prashant-andani](https://github.com/prashant-andani))
20+
21+
#### :hammer: Underlying Tools
22+
23+
- `react-scripts`
24+
- [#6064](https://github.com/facebook/create-react-app/pull/6064) Update webpack-dev-server 3.1.9 -> 3.1.14. ([@Friss](https://github.com/Friss))
25+
26+
#### Committers: 8
27+
28+
- Denis Mukhametov ([denexapp](https://github.com/denexapp))
29+
- Hardo ([hardo](https://github.com/hardo))
30+
- Janne Raiskila ([raiskila](https://github.com/raiskila))
31+
- Jason Quense ([jquense](https://github.com/jquense))
32+
- Lukas Werfel ([LukasWerfel](https://github.com/LukasWerfel))
33+
- Prashant Andani ([prashant-andani](https://github.com/prashant-andani))
34+
- Zachary Friss ([Friss](https://github.com/Friss))
35+
- [shawtung](https://github.com/shawtung)
36+
37+
### Migrating from 2.1.2 to 2.1.3
38+
39+
Inside any created project that has not been ejected, run:
40+
41+
```bash
42+
npm install --save --save-exact [email protected]
43+
```
44+
45+
or
46+
47+
```
48+
yarn add --exact [email protected]
49+
```
50+
151
## 2.1.2 (December 23, 2018)
252

353
v2.1.2 is a maintenance release including various bug fixes.

‎appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ platform:
3737
install:
3838
- ps: Install-Product node $env:nodejs_version $env:platform
3939
- ps: |
40-
(New-Object Net.WebClient).DownloadFile("https://nightly.yarnpkg.com/latest.msi", "$env:temp\yarn.msi")
40+
(New-Object Net.WebClient).DownloadFile("https://yarnpkg.com/latest.msi", "$env:temp\yarn.msi")
4141
cmd /c start /wait msiexec.exe /i $env:temp\yarn.msi /quiet /qn /norestart
4242
4343
build: off

‎docusaurus/docs/adding-a-css-modules-stylesheet.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ No clashes from other `.error` class names
4949

5050
```html
5151
<!-- This button has red background but not red text -->
52-
<button class="Button_error_ax7yz"></div>
52+
<button class="Button_error_ax7yz">Error Button</button>
5353
```
5454

5555
**This is an optional feature.** Regular `<link>` stylesheets and CSS files are fully supported. CSS Modules are turned on for files ending with the `.module.css` extension.

‎docusaurus/docs/adding-typescript.md

+10-6
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,21 @@ title: Adding TypeScript
1010
To start a new Create React App project with [TypeScript](https://www.typescriptlang.org/), you can run:
1111

1212
```bash
13-
$ npx create-react-app my-app --typescript
14-
$ # or
15-
$ yarn create react-app my-app --typescript
13+
npx create-react-app my-app --typescript
14+
15+
# or
16+
17+
yarn create react-app my-app --typescript
1618
```
1719

1820
To add [TypeScript](https://www.typescriptlang.org/) to a Create React App project, first install it:
1921

2022
```bash
21-
$ npm install --save typescript @types/node @types/react @types/react-dom @types/jest
22-
$ # or
23-
$ yarn add typescript @types/node @types/react @types/react-dom @types/jest
23+
npm install --save typescript @types/node @types/react @types/react-dom @types/jest
24+
25+
# or
26+
27+
yarn add typescript @types/node @types/react @types/react-dom @types/jest
2428
```
2529

2630
Next, rename any file to be a TypeScript file (e.g. `src/index.js` to `src/index.tsx`) and **restart your development server**!

‎docusaurus/docs/advanced-configuration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ You can adjust various development and production settings by setting environmen
1717
| CHOKIDAR_USEPOLLING | ✅ Used | 🚫 Ignored | 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. |
1818
| GENERATE_SOURCEMAP | 🚫 Ignored | ✅ Used | When set to `false`, source maps are not generated for a production build. This solves OOM issues on some smaller machines. |
1919
| NODE_PATH | ✅ Used | ✅ Used | Same as [`NODE_PATH` in Node.js](https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders), but only relative folders are allowed. Can be handy for emulating a monorepo setup by setting `NODE_PATH=src`. |
20-
| INLINE_RUNTIME_CHUNK | 🚫 Ignored | ✅ Used | By default, Create React App will embed the runtime script into `index.html` during the production build. When set to `false`, the script will not be embedded and will be imported as usual. This is normally required when dealing with CSP. | |
20+
| INLINE_RUNTIME_CHUNK | 🚫 Ignored | ✅ Used | By default, Create React App will embed the runtime script into `index.html` during the production build. When set to `false`, the script will not be embedded and will be imported as usual. This is normally required when dealing with CSP. |

‎docusaurus/docs/deployment.md

+13-8
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ npm install -g serve
1515
serve -s build
1616
```
1717

18-
The last command shown above will serve your static site on the port **5000**. Like many of [serve](https://github.com/zeit/serve)’s internal settings, the port can be adjusted using the `-p` or `--port` flags.
18+
The last command shown above will serve your static site on the port **5000**. Like many of [serve](https://github.com/zeit/serve)’s internal settings, the port can be adjusted using the `-l` or `--listen` flags:
19+
20+
```sh
21+
serve -s build -l 4000
22+
```
1923

2024
Run this command to get a full list of the options available:
2125

@@ -106,7 +110,8 @@ To override this, specify the `homepage` in your `package.json`, for example:
106110
This will let Create React App correctly infer the root path to use in the generated HTML file.
107111

108112
**Note**: If you are using `react-router@^4`, you can root `<Link>`s using the `basename` prop on any `<Router>`.<br>
109-
More information [here](https://reacttraining.com/react-router/web/api/BrowserRouter/basename-string).<br>
113+
More information [here](https://reacttraining.com/react-router/web/api/BrowserRouter/basename-string).<br>
114+
110115
<br>
111116
For example:
112117

@@ -240,7 +245,8 @@ For more information see [Firebase Hosting](https://firebase.google.com/docs/hos
240245
241246
### Step 1: Add `homepage` to `package.json`
242247
243-
**The step below is important!**<br>
248+
**The step below is important!**<br>
249+
244250
**If you skip it, your app will not deploy correctly.**
245251
246252
Open your `package.json` and add a `homepage` field for your project:
@@ -291,11 +297,10 @@ Add the following scripts in your `package.json`:
291297
292298
The `predeploy` script will run automatically before `deploy` is run.
293299
294-
If you are deploying to a GitHub user page instead of a project page you'll need to make two
295-
additional modifications:
300+
If you are deploying to a GitHub user page instead of a project page you'll need to make one
301+
additional modification:
296302

297-
1. First, change your repository's source branch to be any branch other than **master**.
298-
1. Additionally, tweak your `package.json` scripts to push deployments to **master**:
303+
1. Tweak your `package.json` scripts to push deployments to **master**:
299304

300305
```diff
301306
"scripts": {
@@ -312,7 +317,7 @@ Then run:
312317
npm run deploy
313318
```
314319
315-
### Step 4: Ensure your project’s settings use `gh-pages`
320+
### Step 4: For a project page, ensure your project’s settings use `gh-pages`
316321
317322
Finally, make sure **GitHub Pages** option in your GitHub project settings is set to use the `gh-pages` branch:
318323

‎docusaurus/docs/getting-started.md

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ cd my-app
1414
npm start
1515
```
1616

17+
> If you've previously installed `create-react-app` globally via `npm install -g create-react-app`, we recommend you uninstall the package using `npm uninstall -g create-react-app` to ensure that `npx` always uses the latest version.
18+
1719
_([npx](https://medium.com/@maybekatz/introducing-npx-an-npm-package-runner-55f7d4bd282b) comes with npm 5.2+ and higher, see [instructions for older npm versions](https://gist.github.com/gaearon/4064d3c23a77c74a3614c498a8bb1c5f))_
1820

1921
Then open [http://localhost:3000/](http://localhost:3000/) to see your app.

‎docusaurus/docs/supported-browsers-features.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This project supports a superset of the latest JavaScript standard. In addition
1919
- [Class Fields and Static Properties](https://github.com/tc39/proposal-class-public-fields) (part of stage 3 proposal).
2020
- [JSX](https://facebook.github.io/react/docs/introducing-jsx.html), [Flow](./adding-flow) and [TypeScript](./adding-typescript).
2121

22-
Learn more about [different proposal stages](https://babeljs.io/docs/plugins/#presets-stage-x-experimental-presets-).
22+
Learn more about [different proposal stages](https://tc39.github.io/process-document/).
2323

2424
While we recommend using experimental proposals with some caution, Facebook heavily uses these features in the product code, so we intend to provide [codemods](https://medium.com/@cpojer/effective-javascript-codemods-5a6686bb46fb) if any of these proposals change in the future.
2525

‎docusaurus/docs/updating-to-new-releases.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ Create React App is divided into two packages:
88
- `create-react-app` is a global command-line utility that you use to create new projects.
99
- `react-scripts` is a development dependency in the generated projects (including this one).
1010

11-
You almost never need to update `create-react-app` itself: it delegates all the setup to `react-scripts`.
11+
When you run `npx create-react-app my-app` it automatically installs the latest version of Create React App.
12+
> If you've previously installed `create-react-app` globally via `npm install -g create-react-app`, please visit [Getting Started](getting-started.md) to learn about current installation steps.
1213
13-
When you run `create-react-app`, it always creates the project with the latest version of `react-scripts` so you’ll get all the new features and improvements in newly created apps automatically.
14+
Create React App creates the project with the latest version of `react-scripts` so you’ll get all the new features and improvements in newly created apps automatically.
1415

1516
To update an existing project to a new version of `react-scripts`, [open the changelog](https://github.com/facebook/create-react-app/blob/master/CHANGELOG.md), find the version you’re currently on (check `package.json` in this folder if you’re not sure), and apply the migration instructions for the newer versions.
1617

‎lerna.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"tag: bug fix": ":bug: Bug Fix",
1212
"tag: enhancement": ":nail_care: Enhancement",
1313
"tag: documentation": ":memo: Documentation",
14-
"tag: internal": ":house: Internal"
14+
"tag: internal": ":house: Internal",
15+
"tag: underlying tools": ":hammer: Underlying Tools"
1516
},
1617
"cacheDir": ".changelog"
1718
}

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"compile:lockfile": "node tasks/compile-lockfile.js"
2020
},
2121
"devDependencies": {
22-
"eslint": "5.6.0",
22+
"eslint": "5.12.0",
2323
"execa": "1.0.0",
2424
"fs-extra": "^7.0.0",
2525
"get-port": "^4.0.0",

‎packages/babel-plugin-named-asset-import/index.test.js

+6-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pluginTester({
66
pluginOptions: {
77
loaderMap: {
88
svg: {
9-
ReactComponent: '@svgr/webpack?-prettier,-svgo![path]',
9+
ReactComponent: '@svgr/webpack?-svgo![path]',
1010
},
1111
},
1212
},
@@ -36,15 +36,15 @@ pluginTester({
3636
svgReactComponentNamedImport: {
3737
code: 'import { ReactComponent as logo } from "logo.svg";',
3838
output:
39-
'import { ReactComponent as logo } from "@svgr/webpack?-prettier,-svgo!logo.svg";',
39+
'import { ReactComponent as logo } from "@svgr/webpack?-svgo!logo.svg";',
4040
},
4141
svgMultipleImport: {
4242
code:
4343
'import logo, { logoUrl , ReactComponent as Logo } from "logo.svg";',
4444
output:
4545
'import logo from "logo.svg";\n' +
4646
'import { logoUrl } from "logo.svg";\n' +
47-
'import { ReactComponent as Logo } from "@svgr/webpack?-prettier,-svgo!logo.svg";',
47+
'import { ReactComponent as Logo } from "@svgr/webpack?-svgo!logo.svg";',
4848
},
4949
defaultExport: {
5050
code: 'export default logo;',
@@ -81,18 +81,17 @@ pluginTester({
8181
svgReactComponentNamedExport: {
8282
code: 'export { ReactComponent as Logo } from "logo.svg";',
8383
output:
84-
'export { ReactComponent as Logo } from "@svgr/webpack?-prettier,-svgo!logo.svg";',
84+
'export { ReactComponent as Logo } from "@svgr/webpack?-svgo!logo.svg";',
8585
},
8686
svgReactComponentExport: {
8787
code: 'export { ReactComponent } from "logo.svg";',
88-
output:
89-
'export { ReactComponent } from "@svgr/webpack?-prettier,-svgo!logo.svg";',
88+
output: 'export { ReactComponent } from "@svgr/webpack?-svgo!logo.svg";',
9089
},
9190
svgMultipleExport: {
9291
code: 'export { logoUrl , ReactComponent as Logo } from "logo.svg";',
9392
output:
9493
'export { logoUrl } from "logo.svg";\n' +
95-
'export { ReactComponent as Logo } from "@svgr/webpack?-prettier,-svgo!logo.svg";',
94+
'export { ReactComponent as Logo } from "@svgr/webpack?-svgo!logo.svg";',
9695
},
9796
},
9897
});

‎packages/babel-preset-react-app/package.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@
1717
"test.js"
1818
],
1919
"dependencies": {
20-
"@babel/core": "7.1.6",
21-
"@babel/plugin-proposal-class-properties": "7.1.0",
22-
"@babel/plugin-proposal-decorators": "7.1.6",
23-
"@babel/plugin-proposal-object-rest-spread": "7.0.0",
24-
"@babel/plugin-syntax-dynamic-import": "7.0.0",
25-
"@babel/plugin-transform-classes": "7.1.0",
26-
"@babel/plugin-transform-destructuring": "7.1.3",
27-
"@babel/plugin-transform-flow-strip-types": "7.1.6",
28-
"@babel/plugin-transform-react-constant-elements": "7.0.0",
29-
"@babel/plugin-transform-react-display-name": "7.0.0",
30-
"@babel/plugin-transform-runtime": "7.1.0",
31-
"@babel/preset-env": "7.1.6",
20+
"@babel/core": "7.2.2",
21+
"@babel/plugin-proposal-class-properties": "7.2.3",
22+
"@babel/plugin-proposal-decorators": "7.2.3",
23+
"@babel/plugin-proposal-object-rest-spread": "7.2.0",
24+
"@babel/plugin-syntax-dynamic-import": "7.2.0",
25+
"@babel/plugin-transform-classes": "7.2.2",
26+
"@babel/plugin-transform-destructuring": "7.2.0",
27+
"@babel/plugin-transform-flow-strip-types": "7.2.3",
28+
"@babel/plugin-transform-react-constant-elements": "7.2.0",
29+
"@babel/plugin-transform-react-display-name": "7.2.0",
30+
"@babel/plugin-transform-runtime": "7.2.0",
31+
"@babel/preset-env": "7.2.3",
3232
"@babel/preset-react": "7.0.0",
3333
"@babel/preset-typescript": "7.1.0",
34-
"@babel/runtime": "7.1.5",
35-
"babel-loader": "8.0.4",
34+
"@babel/runtime": "7.2.0",
35+
"babel-loader": "8.0.5",
3636
"babel-plugin-dynamic-import-node": "2.2.0",
37-
"babel-plugin-macros": "2.4.2",
38-
"babel-plugin-transform-react-remove-prop-types": "0.4.20"
37+
"babel-plugin-macros": "2.4.4",
38+
"babel-plugin-transform-react-remove-prop-types": "0.4.21"
3939
}
4040
}

‎packages/create-react-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-react-app",
3-
"version": "2.1.2",
3+
"version": "2.1.3",
44
"keywords": [
55
"react"
66
],

0 commit comments

Comments
 (0)