Skip to content
This repository was archived by the owner on Jan 26, 2019. It is now read-only.

Commit ba698d0

Browse files
committed
Merge remote-tracking branch 'origin/master' into babel-support
# Conflicts: # package.json # packages/react-dev-utils/webpackHotDevClient.js # packages/react-error-overlay/src/components/frame.js # packages/react-error-overlay/src/components/overlay.js # packages/react-scripts/config/webpack.config.dev.js # packages/react-scripts/config/webpack.config.prod.js # packages/react-scripts/package.json # packages/react-scripts/scripts/utils/createJestConfig.js
2 parents c1e7060 + 606b651 commit ba698d0

Some content is hidden

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

76 files changed

+2036
-1857
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,7 @@
8383
2. `node -v`:
8484
3. `npm -v`:
8585
4. `yarn --version` (if you use Yarn):
86-
<<<<<<< HEAD
87-
5. `npm ls react-scripts` (if you haven’t ejected):
88-
=======
89-
3. `npm ls react-scripts-ts` (if you haven’t ejected):
90-
>>>>>>> Fix Code Review
86+
5. `npm ls react-scripts-ts` (if you haven’t ejected):
9187

9288
Then, specify:
9389

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
---
2+
# Use Ubuntu Precise instead of new default Trusty which cause build fail
3+
# with pre installed yarn v0.17.8
4+
# https://github.com/facebookincubator/create-react-app/issues/3054
5+
# TODO: remove after Trusty environment is updated with a lastet version of yarn
6+
dist: precise
27
language: node_js
38
node_js:
49
- 6

CHANGELOG.md

Lines changed: 230 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,229 @@
1+
## 1.0.13 (September 2, 2017)
2+
3+
#### :bug: Bug Fix
4+
5+
* `react-error-overlay`
6+
7+
* [#3051](https://github.com/facebookincubator/create-react-app/pull/3051) Fix case-sensitivity issue with upgrading the package version. ([@tharakawj](https://github.com/tharakawj))
8+
9+
* `react-dev-utils`
10+
11+
* [#3049](https://github.com/facebookincubator/create-react-app/pull/3049) Print filesize difference for chunks. ([@esturcke](https://github.com/esturcke))
12+
13+
* `react-scripts`
14+
15+
* [#3046](https://github.com/facebookincubator/create-react-app/pull/3046) Fix crash in development mode on IE11. ([@tharakawj](https://github.com/tharakawj))
16+
17+
#### :nail_care: Enhancement
18+
19+
* `react-scripts`
20+
21+
* [#3033](https://github.com/facebookincubator/create-react-app/pull/3033) Add an empty mock for `child_process` to let some libraries compile. ([@McFlurriez](https://github.com/McFlurriez))
22+
23+
#### :house: Internal
24+
25+
* `react-dev-utils`, `react-error-overlay`
26+
27+
* [#3028](https://github.com/facebookincubator/create-react-app/pull/3028) Make error overlay filename configurable. ([@jaredpalmer](https://github.com/jaredpalmer))
28+
29+
#### Committers: 4
30+
31+
- Anthony ([McFlurriez](https://github.com/McFlurriez))
32+
- Erik J. Sturcke ([esturcke](https://github.com/esturcke))
33+
- Jared Palmer ([jaredpalmer](https://github.com/jaredpalmer))
34+
- Tharaka Wijebandara ([tharakawj](https://github.com/tharakawj))
35+
36+
### Migrating from 1.0.12 to 1.0.13
37+
38+
Inside any created project that has not been ejected, run:
39+
40+
```
41+
npm install --save --save-exact react-scripts@1.0.13
42+
```
43+
44+
or
45+
46+
```
47+
yarn add --exact react-scripts@1.0.13
48+
```
49+
50+
## 1.0.12 (August 28, 2017)
51+
52+
#### :bug: Bug Fix
53+
54+
* `react-error-overlay`
55+
* [#3012](https://github.com/facebookincubator/create-react-app/pull/3012) Fix module function name in error overlay. ([@gaearon](https://github.com/gaearon))
56+
57+
* `react-dev-utils`
58+
* [#2938](https://github.com/facebookincubator/create-react-app/pull/2938) Remove superfluous lodash usage. ([@Timer](https://github.com/Timer))
59+
60+
#### :nail_care: Enhancement
61+
62+
* `react-scripts`
63+
64+
* [#2917](https://github.com/facebookincubator/create-react-app/pull/2917) Optimize the size of default favicon. ([@sylvainbaronnet](https://github.com/sylvainbaronnet))
65+
66+
#### :memo: Documentation
67+
68+
* `react-scripts`
69+
70+
* [#2986](https://github.com/facebookincubator/create-react-app/pull/2986) Docs: debugging in WebStorm. ([@prigara](https://github.com/prigara))
71+
* [#2948](https://github.com/facebookincubator/create-react-app/pull/2948) Remove Modulus from user guide. ([@Zertz](https://github.com/Zertz))
72+
* [#2927](https://github.com/facebookincubator/create-react-app/pull/2927) Update README.md. ([@tbassetto](https://github.com/tbassetto))
73+
74+
* `react-dev-utils`
75+
76+
* [#2942](https://github.com/facebookincubator/create-react-app/pull/2942) Fix docs for `printFileSizesAfterBuild`. ([@Kerumen](https://github.com/Kerumen))
77+
78+
#### :house: Internal
79+
80+
* `react-error-overlay`, `react-scripts`
81+
82+
* [#2991](https://github.com/facebookincubator/create-react-app/pull/2991) Update `babel-runtime` dependency ([@christophehurpeau](https://github.com/christophehurpeau))
83+
84+
* `react-dev-utils`, `react-error-overlay`, `react-scripts`
85+
86+
* [#2515](https://github.com/facebookincubator/create-react-app/pull/2515) Convert `react-error-overlay` to React ([@tharakawj](https://github.com/tharakawj))
87+
88+
#### Committers: 9
89+
90+
- Christophe Hurpeau ([christophehurpeau](https://github.com/christophehurpeau))
91+
- Dan Abramov ([gaearon](https://github.com/gaearon))
92+
- Ekaterina Prigara ([prigara](https://github.com/prigara))
93+
- Joe Haddad ([Timer](https://github.com/Timer))
94+
- Pier-Luc Gendreau ([Zertz](https://github.com/Zertz))
95+
- Sylvain Baronnet ([sylvainbaronnet](https://github.com/sylvainbaronnet))
96+
- Tharaka Wijebandara ([tharakawj](https://github.com/tharakawj))
97+
- Thomas Bassetto ([tbassetto](https://github.com/tbassetto))
98+
- Yann Pringault ([Kerumen](https://github.com/Kerumen))
99+
100+
### Migrating from 1.0.11 to 1.0.12
101+
102+
Inside any created project that has not been ejected, run:
103+
104+
```
105+
npm install --save --save-exact react-scripts@1.0.12
106+
```
107+
108+
or
109+
110+
```
111+
yarn add --exact react-scripts@1.0.12
112+
```
113+
114+
**Note:** there’s a [known issue](https://github.com/facebookincubator/create-react-app/issues/3041) that might cause the project to not compile after upgrading. In this case, migrate straight to `1.0.13` which doesn’t have this issue.
115+
116+
## 1.0.11 (August 9, 2017)
117+
118+
#### :bug: Bug Fix
119+
* `create-react-app`
120+
* [#2884](https://github.com/facebookincubator/create-react-app/pull/2884) Improve offline heuristic for proxied environments. ([@bsyk](https://github.com/bsyk))
121+
122+
When a Yarn proxy is set, we will check its connectivity if we cannot reach Yarn's registry. This is often the case when DNS lookups must be made through the proxy.
123+
124+
* [#2853](https://github.com/facebookincubator/create-react-app/pull/2853) Allow use of scoped packages with a pinned version. ([@wileybenet](https://github.com/wileybenet))
125+
* `react-dev-utils`
126+
* [#2796](https://github.com/facebookincubator/create-react-app/pull/2796) Properly escape HTML tags in error overlay. ([@ccloli](https://github.com/ccloli))
127+
128+
Elements printed in their entirety would sometimes render as HTML. This should no longer happen and should properly render as text.
129+
130+
* `react-dev-utils`, `react-scripts`
131+
* [#2834](https://github.com/facebookincubator/create-react-app/pull/2834) Make `formatWebpackMessages` return all messages ([@onigoetz](https://github.com/onigoetz))
132+
* `react-scripts`
133+
* [#2806](https://github.com/facebookincubator/create-react-app/pull/2806) Fix SockJS version compatibility. ([@christianbundy](https://github.com/christianbundy))
134+
* [#2738](https://github.com/facebookincubator/create-react-app/pull/2738) Fix Jest `node` file resolution. ([@mostafah](https://github.com/mostafah))
135+
136+
#### :nail_care: Enhancement
137+
* `react-scripts`
138+
* [#2818](https://github.com/facebookincubator/create-react-app/pull/2818) Allow sourcemaps to be disabled. ([@viankakrisna](https://github.com/viankakrisna))
139+
140+
As applications grow more complex, it is possible webpack may run out of memory while generating source maps. They may now be disabled by setting `GENERATE_SOURCEMAP=false`.
141+
142+
* [#2913](https://github.com/facebookincubator/create-react-app/pull/2913) Allow flags to be passed to node when running `react-scripts`. ([@koistya](https://github.com/koistya))
143+
* [#2574](https://github.com/facebookincubator/create-react-app/pull/2574) Upgrade to `webpack@3`. ([@themre](https://github.com/themre))
144+
* [#2747](https://github.com/facebookincubator/create-react-app/pull/2747) Simplify webpack configuration using `Rule.oneOf`. ([@Furizaa](https://github.com/Furizaa))
145+
* `react-dev-utils`, `react-scripts`
146+
* [#2468](https://github.com/facebookincubator/create-react-app/pull/2468) Allow importing `package.json`. ([@iamdoron](https://github.com/iamdoron))
147+
* [#2650](https://github.com/facebookincubator/create-react-app/pull/2650) Make UglifyJS error friendlier. ([@viankakrisna](https://github.com/viankakrisna))
148+
* `create-react-app`
149+
* [#2785](https://github.com/facebookincubator/create-react-app/pull/2785) Change error wording and list conflicting files when initializing app. ([@OwenFlood](https://github.com/OwenFlood))
150+
* `react-dev-utils`
151+
* [#2761](https://github.com/facebookincubator/create-react-app/pull/2761) Don't prompt to install serve if already installed. ([@OwenFlood](https://github.com/OwenFlood))
152+
* [#2754](https://github.com/facebookincubator/create-react-app/pull/2754) Auto-detect JetBrains IDEs. ([@danrr](https://github.com/danrr))
153+
* [#2740](https://github.com/facebookincubator/create-react-app/pull/2740) Support PyCharm in `launchEditor`. ([@danrr](https://github.com/danrr))
154+
* [#2723](https://github.com/facebookincubator/create-react-app/pull/2723) Reorder vim arguments in `launchEditor` so `--remote` works. ([@trygveaa](https://github.com/trygveaa))
155+
* `eslint-config-react-app`, `react-scripts`
156+
* [#2735](https://github.com/facebookincubator/create-react-app/pull/2735) Upgrade to `eslint@4`. ([@trungdq88](https://github.com/trungdq88))
157+
* `eslint-config-react-app`
158+
* [#2701](https://github.com/facebookincubator/create-react-app/pull/2701) Set `allowTaggedTemplates` to true (eslint). ([@denkristoffer](https://github.com/denkristoffer))
159+
160+
#### :memo: Documentation
161+
* Other
162+
* [#2728](https://github.com/facebookincubator/create-react-app/pull/2728) Add Electrode to alternatives. ([@animesh10](https://github.com/animesh10))
163+
* [#2788](https://github.com/facebookincubator/create-react-app/pull/2788) Update link for motion. ([@viankakrisna](https://github.com/viankakrisna))
164+
* [#2697](https://github.com/facebookincubator/create-react-app/pull/2697) Fix env list ordering. ([@alexeyraspopov](https://github.com/alexeyraspopov))
165+
* `react-dev-utils`
166+
* [#2798](https://github.com/facebookincubator/create-react-app/pull/2798) Update note about `webpackHotDevClient` support. ([@ForbesLindesay](https://github.com/ForbesLindesay))
167+
* `react-scripts`
168+
* [#2822](https://github.com/facebookincubator/create-react-app/pull/2822) Add explicit "Opting Out of Caching" header. ([@gaearon](https://github.com/gaearon))
169+
* [#2725](https://github.com/facebookincubator/create-react-app/pull/2725) Fixed typo. ([@zeel](https://github.com/zeel))
170+
* [#2668](https://github.com/facebookincubator/create-react-app/pull/2668) Document `basename` feature in `react-router`. ([@viankakrisna](https://github.com/viankakrisna))
171+
* [#2719](https://github.com/facebookincubator/create-react-app/pull/2719) Remove Windows note for `source-map-explorer`. ([@hodanny](https://github.com/hodanny))
172+
* `babel-preset-react-app`
173+
* [#2732](https://github.com/facebookincubator/create-react-app/pull/2732) Update link to issue blocking JSX hoisting. ([@ForbesLindesay](https://github.com/ForbesLindesay))
174+
175+
#### :house: Internal
176+
* `create-react-app`, `eslint-config-react-app`, `react-dev-utils`, `react-error-overlay`, `react-scripts`
177+
* [#2923](https://github.com/facebookincubator/create-react-app/pull/2923) Update deps. ([@Timer](https://github.com/Timer))
178+
* `eslint-config-react-app`
179+
* [#2718](https://github.com/facebookincubator/create-react-app/pull/2718) Re-enable flowtype warning. ([@oskarkook](https://github.com/oskarkook))
180+
* Other
181+
* [#2700](https://github.com/facebookincubator/create-react-app/pull/2700) Unstage `yarn.lock` pre-commit. ([@jdcrensh](https://github.com/jdcrensh))
182+
* `react-scripts`
183+
* [#2873](https://github.com/facebookincubator/create-react-app/pull/2873) Use template strings. ([@monkindey](https://github.com/monkindey))
184+
185+
#### Committers: 26
186+
- 864907600cc ([ccloli](https://github.com/ccloli))
187+
- Ade Viankakrisna Fadlil ([viankakrisna](https://github.com/viankakrisna))
188+
- Alexey Raspopov ([alexeyraspopov](https://github.com/alexeyraspopov))
189+
- Andreas Hoffmann ([Furizaa](https://github.com/Furizaa))
190+
- Animesh Dutta ([animesh10](https://github.com/animesh10))
191+
- Ben Sykes ([bsyk](https://github.com/bsyk))
192+
- Christian Bundy ([christianbundy](https://github.com/christianbundy))
193+
- Dan Abramov ([gaearon](https://github.com/gaearon))
194+
- Dan Ristea ([danrr](https://github.com/danrr))
195+
- Danny Ho ([hodanny](https://github.com/hodanny))
196+
- Forbes Lindesay ([ForbesLindesay](https://github.com/ForbesLindesay))
197+
- Joe Haddad ([Timer](https://github.com/Timer))
198+
- Jon Crenshaw ([jdcrensh](https://github.com/jdcrensh))
199+
- Kiho · Cham ([monkindey](https://github.com/monkindey))
200+
- Konstantin Tarkus ([koistya](https://github.com/koistya))
201+
- Kristoffer ([denkristoffer](https://github.com/denkristoffer))
202+
- Mostafa Hajizadeh ([mostafah](https://github.com/mostafah))
203+
- Oskar Köök ([oskarkook](https://github.com/oskarkook))
204+
- Owen Flood ([OwenFlood](https://github.com/OwenFlood))
205+
- Stéphane Goetz ([onigoetz](https://github.com/onigoetz))
206+
- Trygve Aaberge ([trygveaa](https://github.com/trygveaa))
207+
- Wiley Bennett ([wileybenet](https://github.com/wileybenet))
208+
- [iamdoron](https://github.com/iamdoron)
209+
- [themre](https://github.com/themre)
210+
- zeel ([zeel](https://github.com/zeel))
211+
- Đinh Quang Trung ([trungdq88](https://github.com/trungdq88))
212+
213+
### Migrating from 1.0.10 to 1.0.11
214+
215+
Inside any created project that has not been ejected, run:
216+
217+
```
218+
npm install --save --save-exact react-scripts@1.0.11
219+
```
220+
221+
or
222+
223+
```
224+
yarn add --exact react-scripts@1.0.11
225+
```
226+
1227
## 1.0.10 (June 29, 2017)
2228

3229
#### :bug: Bug Fix
@@ -110,7 +336,7 @@ yarn add --exact react-scripts@1.0.9
110336
* [#2600](https://github.com/facebookincubator/create-react-app/pull/2600) Add empty mock for `dgram` Node module. ([@micopiira](https://github.com/micopiira))
111337
* [#2458](https://github.com/facebookincubator/create-react-app/pull/2458) Add names to module factories in development. ([@Zaccc123](https://github.com/Zaccc123))
112338
* [#2551](https://github.com/facebookincubator/create-react-app/pull/2551) In new projects, unregister service worker and force reload if `service-worker.js` is not found. ([@ro-savage](https://github.com/ro-savage))
113-
339+
114340
* `babel-preset-react-app`, `react-dev-utils`, `react-scripts`
115341

116342
* [#2658](https://github.com/facebookincubator/create-react-app/pull/2658) Bump dependencies. ([@gaearon](https://github.com/gaearon))
@@ -119,7 +345,7 @@ yarn add --exact react-scripts@1.0.9
119345

120346
* [#2657](https://github.com/facebookincubator/create-react-app/pull/2657) Put `react-scripts` in `dependencies`, not `devDependencies`. ([@gaearon](https://github.com/gaearon))
121347
* [#2635](https://github.com/facebookincubator/create-react-app/pull/2635) Silence unhelpful npm warnings. ([@gaearon](https://github.com/gaearon))
122-
348+
123349
* `react-dev-utils`
124350

125351
* [#2637](https://github.com/facebookincubator/create-react-app/pull/2637) Auto-detect Brackets editor from error overlay. ([@petetnt](https://github.com/petetnt))
@@ -176,7 +402,7 @@ yarn add --exact react-scripts@1.0.9
176402
* [#2397](https://github.com/facebookincubator/create-react-app/pull/2397) Fix command in e2e-kitchensink.sh cleanup. ([@ro-savage](https://github.com/ro-savage))
177403
* [#2388](https://github.com/facebookincubator/create-react-app/pull/2388) Fix wrong path expansion in end-to-end test. ([@gaearon](https://github.com/gaearon))
178404
* [#2387](https://github.com/facebookincubator/create-react-app/pull/2387) Catch "No tests found" during CI. ([@EnoahNetzach](https://github.com/EnoahNetzach))
179-
405+
180406
* `react-scripts`
181407

182408
* [#2408](https://github.com/facebookincubator/create-react-app/pull/2408) E2E testing enhancements. ([@EnoahNetzach](https://github.com/EnoahNetzach))
@@ -573,7 +799,7 @@ yarn add --dev --exact react-scripts@1.0.1
573799

574800
We’ve been working on this release for the past few months, and there are many big impovements, from migrating to webpack 2 to a brand new runtime error overlay and built-in support for Progressive Web Apps.
575801

576-
So instead of just enumerating them here, we decided to write a blog post about all the new features.
802+
So instead of just enumerating them here, we decided to write a blog post about all the new features.<br>
577803
Check it out: **[What’s New in Create React App](https://facebook.github.io/react/blog/2017/05/18/whats-new-in-create-react-app.html)**.
578804

579805
Have you read it? Now let's see how to update your app to the latest version.

README.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,35 @@ When you run `npm run build` the terminal will output the error, including the h
2121

2222
![CodeHighlight](https://cloud.githubusercontent.com/assets/175278/22310149/1ee66ccc-e346-11e6-83ff-e3a053701fb4.gif)
2323

24+
## Migration
25+
26+
In general, most upgrades won't require any migration steps to work, but if you experience problems after an upgrade, please file an issue, and we'll add it to the list of migration steps below.
27+
28+
### From `<2.5.0` to `>=2.5.0`
29+
30+
Version `2.5.0` introduces a new config file for jest, that is necessary for the tests to run. If you were previously running a version older than `v2.5.0` and upgraded to `v2.5.0` or newer, you need to manually add the new file, or else you'll get an error similar to this when trying to run your tests:
31+
32+
```javascript
33+
Test suite failed to run
34+
35+
{
36+
"messageText": "Cannot read file 'C:\\[project]\\tsconfig.test.json': ENOENT: no such file or directory, open 'C:\\[project]\\tsconfig.test.json'.",
37+
"category": 1,
38+
"code": 5012
39+
}
40+
```
41+
42+
To fix this, create a new file *in the root of the project* called `tsconfig.test.json`, and paste [the content of this file into it](https://raw.githubusercontent.com/wmonk/create-react-app-typescript/master/packages/react-scripts/template/tsconfig.test.json). Everything should work now. For more info, please see [this issue](https://github.com/wmonk/create-react-app-typescript/issues/141).
43+
2444
## Changelog
2545

46+
### 2.7.0
47+
* Merge react-scripts@1.0.13 - @JohnNilsson
48+
* Fix git tempalte - @hktonylee
49+
* Provide migration docs - @JReinhold
50+
* Updated dependencies - @swengorschewski
51+
* Fix tslint config - @comerc
52+
2653
### 2.6.0
2754
* Merge react-scripts@1.0.10 - @wmonk
2855
* Update component template - @pelotom

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"lerna": "2.0.0-rc.5",
2+
"lerna": "2.0.0",
33
"version": "independent",
44
"changelog": {
55
"repo": "facebookincubator/create-react-app",

package.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
"precommit": "lint-staged"
1515
},
1616
"devDependencies": {
17-
"@types/jest": "^19.2.3",
17+
"@types/jest": "^20.0.4",
1818
"@types/node": "^7.0.21",
19-
"@types/react": "^15.0.34",
19+
"@types/react": "^15.6.1",
2020
"@types/react-dom": "^15.5.0",
2121
"babel-core": "^6.24.1",
22-
"eslint": "3.19.0",
22+
"eslint": "4.4.1",
2323
"husky": "^0.13.2",
24-
"lerna": "2.0.0-rc.5",
25-
"lerna-changelog": "^0.2.3",
24+
"lerna": "^2.0.0",
25+
"lerna-changelog": "^0.6.0",
2626
"lint-staged": "^3.3.1",
2727
"prettier": "^1.5.2",
2828
"typescript-babel-jest": "^1.0.4"
@@ -31,6 +31,9 @@
3131
"*.js": [
3232
"prettier --trailing-comma es5 --single-quote --write",
3333
"git add"
34+
],
35+
"yarn.lock": [
36+
"git rm --cached"
3437
]
3538
}
3639
}

packages/babel-preset-react-app/index.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,7 @@ if (env === 'test') {
129129

130130
if (env === 'production') {
131131
// Optimization: hoist JSX that never changes out of render()
132-
// Disabled because of issues:
133-
// * https://github.com/facebookincubator/create-react-app/issues/525
134-
// * https://phabricator.babeljs.io/search/query/pCNlnC2xzwzx/
135-
// * https://github.com/babel/babel/issues/4516
132+
// Disabled because of issues: https://github.com/facebookincubator/create-react-app/issues/553
136133
// TODO: Enable again when these issues are resolved.
137134
// plugins.push.apply(plugins, [
138135
// require.resolve('babel-plugin-transform-react-constant-elements')

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "babel-preset-react-app",
3-
"version": "3.0.1",
3+
"version": "3.0.2",
44
"description": "Babel preset used by Create React App",
55
"repository": "facebookincubator/create-react-app",
66
"license": "BSD-3-Clause",

0 commit comments

Comments
 (0)