Skip to content

Commit 757416b

Browse files
wmonkwmonk
committed
Merge commit '67d04032a3e4d8d4d44c395e7fe291e0d9a381c8'
2 parents 2abab81 + 67d0403 commit 757416b

File tree

114 files changed

+2193
-450
lines changed

Some content is hidden

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

114 files changed

+2193
-450
lines changed

‎.eslintignore

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
node_modules/
2+
build
3+
my-app*
4+
packages/react-scripts/template
5+
packages/react-scripts/fixtures

‎.eslintrc

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
11
{
2-
"extends": "react-app"
2+
"extends": "eslint:recommended",
3+
"env": {
4+
"browser": true,
5+
"commonjs": true,
6+
"node": true,
7+
"es6": true
8+
},
9+
"parserOptions": {
10+
"ecmaVersion": 6
11+
},
12+
"rules": {
13+
"no-console": "off",
14+
"strict": ["error", "global"]
15+
}
316
}

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.idea/
2+
.vscode/
13
node_modules/
24
build
35
.DS_Store

‎.travis.yml

+4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ language: node_js
33
node_js:
44
- 4
55
- 6
6+
- 7
67
cache:
78
directories:
89
- node_modules
910
- packages/create-react-app/node_modules
1011
- packages/react-scripts/node_modules
12+
install: true
1113
script:
1214
- 'if [ $TEST_SUITE = "simple" ]; then tasks/e2e-simple.sh; fi'
1315
- 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi'
@@ -21,5 +23,7 @@ env:
2123
- TEST_SUITE=kitchensink
2224
matrix:
2325
include:
26+
- node_js: 0.10
27+
env: TEST_SUITE=simple
2428
- node_js: 6
2529
env: USE_YARN=yes TEST_SUITE=simple

‎CHANGELOG.md

+387-53
Large diffs are not rendered by default.

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Following these guidelines helps to communicate that you respect the time of the
1010

1111
As much as possible, we try to avoid adding configuration and flags. The purpose of this tool is to provide the best experience for people getting started with React, and this will always be our first priority. This means that sometimes we [sacrifice additional functionality](https://gettingreal.37signals.com/ch05_Half_Not_Half_Assed.php) (such as server rendering) because it is too hard to solve it in a way that wouldn’t require any configuration.
1212

13-
We prefer **convention, heuristics, or interactivity** over configuration.
13+
We prefer **convention, heuristics, or interactivity** over configuration.<br>
1414
Here’s a few examples of them in action.
1515

1616
### Convention

‎appveyor.cleanup-cache.txt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Edit this file to trigger a cache rebuild.
2+
http://help.appveyor.com/discussions/questions/1310-delete-cache
3+
4+
----
5+
Just testing if this works.

‎appveyor.yml

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
environment:
2+
matrix:
3+
- nodejs_version: 7
4+
test_suite: "simple"
5+
- nodejs_version: 7
6+
test_suite: "installs"
7+
- nodejs_version: 7
8+
test_suite: "kitchensink"
9+
- nodejs_version: 6
10+
test_suite: "simple"
11+
- nodejs_version: 6
12+
test_suite: "installs"
13+
- nodejs_version: 6
14+
test_suite: "kitchensink"
15+
- nodejs_version: 4
16+
test_suite: "simple"
17+
- nodejs_version: 4
18+
test_suite: "installs"
19+
- nodejs_version: 4
20+
test_suite: "kitchensink"
21+
22+
cache:
23+
- node_modules -> appveyor.cleanup-cache.txt
24+
- packages\react-scripts\node_modules -> appveyor.cleanup-cache.txt
25+
26+
clone_depth: 50
27+
28+
matrix:
29+
fast_finish: true
30+
31+
platform:
32+
- x64
33+
34+
install:
35+
- ps: Install-Product node $env:nodejs_version $env:platform
36+
37+
build: off
38+
39+
skip_commits:
40+
files:
41+
- '**/*.md'
42+
43+
test_script:
44+
- node --version
45+
- npm --version
46+
- sh tasks/e2e-%test_suite%.sh

‎lerna.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"lerna": "2.0.0-beta.37",
2+
"lerna": "2.0.0-beta.38",
33
"version": "independent",
44
"changelog": {
55
"repo": "facebookincubator/create-react-app",
@@ -12,5 +12,8 @@
1212
"tag: internal": ":house: Internal"
1313
},
1414
"cacheDir": ".changelog"
15-
}
15+
},
16+
"packages": [
17+
"packages/*"
18+
]
1619
}

‎package.json

+2-8
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,8 @@
1111
"test": "node packages/react-scripts/scripts/test.js --env=jsdom"
1212
},
1313
"devDependencies": {
14-
"babel-eslint": "6.1.2",
15-
"eslint": "3.5.0",
16-
"eslint-config-react-app": "0.2.1",
17-
"eslint-plugin-flowtype": "2.18.1",
18-
"eslint-plugin-import": "1.12.0",
19-
"eslint-plugin-jsx-a11y": "2.2.2",
20-
"eslint-plugin-react": "6.3.0",
21-
"lerna": "^2.0.0-beta.37",
14+
"eslint": "3.16.1",
15+
"lerna": "2.0.0-beta.38",
2216
"lerna-changelog": "^0.2.3"
2317
}
2418
}

‎packages/babel-preset-react-app/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# babel-preset-react-app
22

3-
This package includes the Babel preset used by [Create React App](https://github.com/facebookincubator/create-react-app).
3+
This package includes the Babel preset used by [Create React App](https://github.com/facebookincubator/create-react-app).<br>
44
Please refer to its documentation:
55

66
* [Getting Started](https://github.com/facebookincubator/create-react-app/blob/master/README.md#getting-started) – How to create a new app.

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

+11-8
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,6 @@ if (env === 'development' || env === 'test') {
6464
}
6565

6666
if (env === 'test') {
67-
plugins.push.apply(plugins, [
68-
// We always include this plugin regardless of environment
69-
// because of a Babel bug that breaks object rest/spread without it:
70-
// https://github.com/babel/babel/issues/4851
71-
require.resolve('babel-plugin-transform-es2015-parameters')
72-
]);
73-
7467
module.exports = {
7568
presets: [
7669
// ES features necessary for user's Node version
@@ -88,7 +81,17 @@ if (env === 'test') {
8881
module.exports = {
8982
presets: [
9083
// Latest stable ECMAScript features
91-
require.resolve('babel-preset-latest'),
84+
[require.resolve('babel-preset-env'), {
85+
targets: {
86+
// React parses on ie 9, so we should too
87+
ie: 9,
88+
// We currently minify with uglify
89+
// Remove after https://github.com/mishoo/UglifyJS2/issues/448
90+
uglify: true
91+
},
92+
// Disable polyfill transforms
93+
useBuiltIns: false
94+
}],
9295
// JSX, Flow
9396
require.resolve('babel-preset-react')
9497
],

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "babel-preset-react-app",
3-
"version": "2.0.1",
3+
"version": "2.1.1",
44
"description": "Babel preset used by Create React App",
55
"repository": "facebookincubator/create-react-app",
66
"license": "BSD-3-Clause",
@@ -12,16 +12,14 @@
1212
],
1313
"dependencies": {
1414
"babel-plugin-transform-class-properties": "6.22.0",
15-
"babel-plugin-transform-es2015-parameters": "6.22.0",
1615
"babel-plugin-transform-object-rest-spread": "6.22.0",
1716
"babel-plugin-transform-react-constant-elements": "6.22.0",
1817
"babel-plugin-transform-react-jsx": "6.22.0",
1918
"babel-plugin-transform-react-jsx-self": "6.22.0",
2019
"babel-plugin-transform-react-jsx-source": "6.22.0",
2120
"babel-plugin-transform-regenerator": "6.22.0",
2221
"babel-plugin-transform-runtime": "6.22.0",
23-
"babel-preset-env": "1.1.8",
24-
"babel-preset-latest": "6.22.0",
22+
"babel-preset-env": "1.2.1",
2523
"babel-preset-react": "6.22.0",
2624
"babel-runtime": "6.22.0"
2725
}

‎packages/create-react-app/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# create-react-app
22

3-
This package includes the global command for [Create React App](https://github.com/facebookincubator/create-react-app).
3+
This package includes the global command for [Create React App](https://github.com/facebookincubator/create-react-app).<br>
44
Please refer to its documentation:
55

66
* [Getting Started](https://github.com/facebookincubator/create-react-app/blob/master/README.md#getting-started) – How to create a new app.

0 commit comments

Comments
 (0)