Skip to content

Commit d17c915

Browse files
committed
Merge branch 'master' into feat/css-loacal-ident
2 parents 60e922c + fddce8a commit d17c915

File tree

106 files changed

+10470
-8560
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+10470
-8560
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto eol=lf

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
packages/ @ianschmitz @iansu @mrmckeb @petetnt
2-
docusaurus/ @amyrlam @iansu
2+
docusaurus/ @ianschmitz @iansu @mrmckeb

.github/FUNDING.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
open_collective: create-react-app

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ labels: 'issue: bug report, needs triage'
3232
* yarn.lock
3333
3434
Then you need to decide which package manager you prefer to use.
35-
We support both npm (https://npmjs.com) and yarn (http://yarnpkg.com/).
35+
We support both npm (https://npmjs.com) and yarn (https://yarnpkg.com/).
3636
However, **they can't be used together in one project** so you need to pick one.
3737
3838
If you decided to use npm, run this in your project directory:

.github/stale.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ daysUntilClose: 5
99

1010
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
1111
exemptLabels:
12-
- "contributions: claimed"
13-
- "contributions: up for grabs!"
14-
- "good first issue"
15-
- "issue: announcement"
16-
- "issue: bug"
17-
- "issue: needs investigation"
18-
- "issue: proposal"
19-
- "tag: breaking change"
20-
- "tag: bug fix"
21-
- "tag: documentation"
22-
- "tag: enhancement"
23-
- "tag: internal"
24-
- "tag: new feature"
25-
- "tag: underlying tools"
12+
- 'contributions: claimed'
13+
- 'contributions: up for grabs!'
14+
- 'good first issue'
15+
- 'issue: announcement'
16+
- 'issue: bug'
17+
- 'issue: needs investigation'
18+
- 'issue: proposal'
19+
- 'tag: breaking change'
20+
- 'tag: bug fix'
21+
- 'tag: documentation'
22+
- 'tag: enhancement'
23+
- 'tag: internal'
24+
- 'tag: new feature'
25+
- 'tag: underlying tools'
2626

2727
# Set to true to ignore issues in a project (defaults to false)
2828
exemptProjects: true

.prettierrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"arrowParens": "avoid",
3-
"trailingComma": "es5",
43
"singleQuote": true,
54
"semi": true
65
}

CHANGELOG-0.x.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ npm install -g [email protected]
156156

157157
If you are using Yarn, and you have created at least one app previously, Create React App now works offline.
158158

159-
<img src="http://i.imgur.com/1FLa9Tg.gif" width="500" alt="Yarn offline installation demo">
159+
<img src="https://i.imgur.com/1FLa9Tg.gif" width="500" alt="Yarn offline installation demo">
160160

161161
#### :bug: Bug Fix
162162

@@ -515,7 +515,7 @@ Inside any created project that has not been ejected, run:
515515
npm install --save-dev --save-exact [email protected]
516516
```
517517

518-
Then, run your tests. If you are affected by breaking changes from Jest 18, consult [blog post](https://facebook.github.io/jest/blog/2016/12/15/2016-in-jest.html), [changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md#jest-1800), and [documentation](http://facebook.github.io/jest/docs/getting-started.html). You might need to update any snapshots since their format might have changed.
518+
Then, run your tests. If you are affected by breaking changes from Jest 18, consult [blog post](https://facebook.github.io/jest/blog/2016/12/15/2016-in-jest.html), [changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md#jest-1800), and [documentation](https://facebook.github.io/jest/docs/getting-started.html). You might need to update any snapshots since their format might have changed.
519519

520520
If you relied on the browser not starting in non-interactive terminals, you now need to explicitly specify `BROWSER=none` as an environment variable to disable it.
521521

@@ -993,7 +993,7 @@ Thanks to [@fson](https://github.com/fson) for cutting this release.
993993

994994
### Build Dependency (`react-scripts`)
995995

996-
- Updates Jest to [version 16.0](http://facebook.github.io/jest/blog/2016/10/03/jest-16.html), with an upgraded CLI, improved snapshot testing, new matchers and more. ([@chase](https://github.com/chase) in [#858](https://github.com/facebook/create-react-app/pull/858))
996+
- Updates Jest to [version 16.0](https://facebook.github.io/jest/blog/2016/10/03/jest-16.html), with an upgraded CLI, improved snapshot testing, new matchers and more. ([@chase](https://github.com/chase) in [#858](https://github.com/facebook/create-react-app/pull/858))
997997
- Test setup file `src/setupTests.js` is now called after test framework initialization to support loading custom matchers. ([@just-boris](https://github.com/just-boris) in [#846](https://github.com/facebook/create-react-app/pull/846))
998998
- Build command shows better instructions for deploying the app to GitHub Pages ([@Janpot](https://github.com/Janpot) in [#841](https://github.com/facebook/create-react-app/pull/841))
999999
- Build command now generates an asset manifest with mappings from each filename to its final output filename. ([@lukyth](https://github.com/lukyth) in [#891](https://github.com/facebook/create-react-app/pull/891))
@@ -1394,7 +1394,7 @@ Newly created projects will use `0.2.1` automatically. You **don’t** need to u
13941394

13951395
- You can now enable deployment to GitHub Pages by adding `homepage` field to `package.json` ([@dhruska](https://github.com/dhruska) in [#94](https://github.com/facebook/create-react-app/pull/94))
13961396
- Development server now runs on `0.0.0.0` and works with VirtualBox ([@JWo1F](https://github.com/JWo1F) in [#128](https://github.com/facebook/create-react-app/pull/128))
1397-
- Cloud9 and Nitrous online IDEs are now supported ([@gaearon](http://github.com/gaearon) in [2fe84e](https://github.com/facebook/create-react-app/commit/2fe84ecded55f1d5258d91f9c2c07698ae0d2fb4))
1397+
- Cloud9 and Nitrous online IDEs are now supported ([@gaearon](https://github.com/gaearon) in [2fe84e](https://github.com/facebook/create-react-app/commit/2fe84ecded55f1d5258d91f9c2c07698ae0d2fb4))
13981398
- When `3000` port is taken, we offer to use another port ([@chocnut](https://github.com/chocnut) in [#101](https://github.com/facebook/create-react-app/pull/101), [2edf21](https://github.com/facebook/create-react-app/commit/2edf2180f2aa6bf647807d0b1fcd95f4cfe4a558))
13991399
- You can now `import` CSS files from npm modules ([@glennreyes](https://github.com/glennreyes) in [#105](https://github.com/facebook/create-react-app/pull/105), [@breaddevil](https://github.com/breaddevil) in [#178](https://github.com/facebook/create-react-app/pull/178))
14001400
- `fetch` and `Promise` polyfills are now always included ([@gaearon](https://github.com/gaearon) in [#235](https://github.com/facebook/create-react-app/pull/235))

CHANGELOG-1.x.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1547,7 +1547,7 @@ You can automatically convert your project to fix them by running the [correspon
15471547

15481548
#### How do I make my tests work with Jest 20?
15491549

1550-
Please refer to the [Jest 19](https://facebook.github.io/jest/blog/2017/02/21/jest-19-immersive-watch-mode-test-platform-improvements.html#breaking-changes) and [Jest 20](http://facebook.github.io/jest/blog/2017/05/06/jest-20-delightful-testing-multi-project-runner.html#breaking-changes) breaking changes for migration instructions.
1550+
Please refer to the [Jest 19](https://facebook.github.io/jest/blog/2017/02/21/jest-19-immersive-watch-mode-test-platform-improvements.html#breaking-changes) and [Jest 20](https://facebook.github.io/jest/blog/2017/05/06/jest-20-delightful-testing-multi-project-runner.html#breaking-changes) breaking changes for migration instructions.
15511551

15521552
If you use snapshots, you will likely need to update them once because of the change in format.
15531553

0 commit comments

Comments
 (0)