Skip to content

Commit 1e83e85

Browse files
funnyleoleefunnyleolee
authored
Merge branch 'master' into master
2 parents 7f3738b + 31a4d14 commit 1e83e85

File tree

102 files changed

+5306
-2542
lines changed

Some content is hidden

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

102 files changed

+5306
-2542
lines changed

‎.eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
},
1212
"rules": {
1313
"no-console": "off",
14-
"strict": ["error", "global"]
14+
"strict": ["error", "global"],
15+
"curly": "warn"
1516
}
1617
}

‎ISSUE_TEMPLATE.md renamed to ‎.github/ISSUE_TEMPLATE.md

File renamed without changes.

‎PULL_REQUEST_TEMPLATE.md renamed to ‎.github/PULL_REQUEST_TEMPLATE.md

File renamed without changes.

‎.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,7 @@ matrix:
2424
include:
2525
- node_js: 0.10
2626
env: TEST_SUITE=simple
27-
- node_js: 6
28-
env: USE_YARN=yes TEST_SUITE=simple
27+
# There's a weird Yarn/Lerna bug related to prerelease versions.
28+
# TODO: reenable after we ship 1.0.
29+
# - node_js: 6
30+
# env: USE_YARN=yes TEST_SUITE=simple

‎CHANGELOG-0.x.md

Lines changed: 1374 additions & 0 deletions
Large diffs are not rendered by default.

‎CHANGELOG.md

Lines changed: 481 additions & 1125 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,15 @@ my-app/
6565
public/
6666
favicon.ico
6767
index.html
68+
manifest.json
6869
src/
6970
App.css
7071
App.js
7172
App.test.js
7273
index.css
7374
index.js
7475
logo.svg
76+
registerServiceWorker.js
7577
```
7678

7779
No configuration or complicated folder structures, just the files you need to build your app.<br>
@@ -100,7 +102,9 @@ Builds the app for production to the `build` folder.<br>
100102
It correctly bundles React in production mode and optimizes the build for the best performance.
101103

102104
The build is minified and the filenames include the hashes.<br>
103-
Your app is ready to be deployed!
105+
By default, it also [includes a service worker](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#making-a-progressive-web-app) so that your app loads from local cache on future visits.
106+
107+
Your app is ready to be deployed.
104108

105109
## User Guide
106110

@@ -116,6 +120,7 @@ The [User Guide](https://github.com/facebookincubator/create-react-app/blob/mast
116120
- [Changing the Page `<title>`](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#changing-the-page-title)
117121
- [Installing a Dependency](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#installing-a-dependency)
118122
- [Importing a Component](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#importing-a-component)
123+
- [Code Splitting](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#code-splitting)
119124
- [Adding a Stylesheet](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#adding-a-stylesheet)
120125
- [Post-Processing CSS](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#post-processing-css)
121126
- [Adding a CSS Preprocessor (Sass, Less etc.)](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#adding-a-css-preprocessor-sass-less-etc)
@@ -132,7 +137,6 @@ The [User Guide](https://github.com/facebookincubator/create-react-app/blob/mast
132137
- [Generating Dynamic `<meta>` Tags on the Server](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#generating-dynamic-meta-tags-on-the-server)
133138
- [Pre-Rendering into Static HTML Files](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#pre-rendering-into-static-html-files)
134139
- [Running Tests](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#running-tests)
135-
- [Developing Components in Isolation](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#developing-components-in-isolation)
136140
- [Making a Progressive Web App](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#making-a-progressive-web-app)
137141
- [Deployment](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#deployment)
138142
- [Advanced Configuration](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#advanced-configuration)
@@ -162,6 +166,7 @@ Please refer to the [User Guide](https://github.com/facebookincubator/create-rea
162166
* Import CSS and image files directly from JavaScript.
163167
* Autoprefixed CSS, so you don’t need `-webkit` or other prefixes.
164168
* A `build` script to bundle JS, CSS, and images for production, with sourcemaps.
169+
* An offline-first [service worker](https://developers.google.com/web/fundamentals/getting-started/primers/service-workers) and a [web app manifest](https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/), meeting all the [Progressive Web App](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#making-a-progressive-web-app) criteria.
165170

166171
**The feature set is intentionally limited**. It doesn’t support advanced features such as server rendering or CSS modules. The tool is also **non-configurable** because it is hard to provide a cohesive experience and easy updates across a set of tools when the user can tweak anything.
167172

@@ -194,7 +199,7 @@ Some of them might get added in the future if they are stable, are useful to maj
194199
The tools used by Create React App are subject to change.
195200
Currently it is a thin layer on top of many amazing community projects, such as:
196201

197-
* [webpack](https://webpack.github.io/) with [webpack-dev-server](https://github.com/webpack/webpack-dev-server), [html-webpack-plugin](https://github.com/ampedandwired/html-webpack-plugin) and [style-loader](https://github.com/webpack/style-loader)
202+
* [webpack](https://webpack.js.org/) with [webpack-dev-server](https://github.com/webpack/webpack-dev-server), [html-webpack-plugin](https://github.com/ampedandwired/html-webpack-plugin) and [style-loader](https://github.com/webpack/style-loader)
198203
* [Babel](http://babeljs.io/) with ES6 and extensions used by Facebook (JSX, [object spread](https://github.com/sebmarkbage/ecmascript-rest-spread/commits/master), [class properties](https://github.com/jeffmo/es-class-public-fields))
199204
* [Autoprefixer](https://github.com/postcss/autoprefixer)
200205
* [ESLint](http://eslint.org/)
@@ -241,8 +246,7 @@ Notable alternatives also include:
241246
* [aik](https://github.com/d4rkr00t/aik)
242247
* [react-app](https://github.com/kriasoft/react-app)
243248
* [dev-toolkit](https://github.com/stoikerty/dev-toolkit)
244-
* [tarec](https://github.com/geowarin/tarec)
245249
* [sku](https://github.com/seek-oss/sku)
246250

247-
You can also use module bundlers like [webpack](http://webpack.github.io) and [Browserify](http://browserify.org/) directly.<br>
251+
You can also use module bundlers like [webpack](http://webpack.js.org) and [Browserify](http://browserify.org/) directly.<br>
248252
React documentation includes [a walkthrough](https://facebook.github.io/react/docs/package-management.html) on this topic.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"precommit": "lint-staged"
1414
},
1515
"devDependencies": {
16-
"eslint": "3.16.1",
16+
"eslint": "3.19.0",
1717
"husky": "^0.13.2",
1818
"lerna": "2.0.0-beta.38",
1919
"lerna-changelog": "^0.2.3",

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
*/
99
'use strict';
1010

11-
var path = require('path');
12-
1311
const plugins = [
1412
// class { handleClick = () => { } }
1513
require.resolve('babel-plugin-transform-class-properties'),
@@ -36,8 +34,6 @@ const plugins = [
3634
helpers: false,
3735
polyfill: false,
3836
regenerator: true,
39-
// Resolve the Babel runtime relative to the config.
40-
moduleName: path.dirname(require.resolve('babel-runtime/package')),
4137
},
4238
],
4339
];

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "babel-preset-react-app",
3-
"version": "2.1.1",
3+
"version": "3.0.0",
44
"description": "Babel preset used by Create React App",
55
"repository": "facebookincubator/create-react-app",
66
"license": "BSD-3-Clause",
@@ -11,18 +11,20 @@
1111
"index.js"
1212
],
1313
"dependencies": {
14-
"babel-plugin-dynamic-import-node": "1.0.0",
14+
"babel-plugin-dynamic-import-node": "1.0.2",
1515
"babel-plugin-syntax-dynamic-import": "6.18.0",
16-
"babel-plugin-transform-class-properties": "6.23.0",
16+
"babel-plugin-transform-class-properties": "6.24.1",
1717
"babel-plugin-transform-object-rest-spread": "6.23.0",
1818
"babel-plugin-transform-react-constant-elements": "6.23.0",
19-
"babel-plugin-transform-react-jsx": "6.23.0",
19+
"babel-plugin-transform-react-jsx": "6.24.1",
2020
"babel-plugin-transform-react-jsx-self": "6.22.0",
2121
"babel-plugin-transform-react-jsx-source": "6.22.0",
22-
"babel-plugin-transform-regenerator": "6.22.0",
22+
"babel-plugin-transform-regenerator": "6.24.1",
2323
"babel-plugin-transform-runtime": "6.23.0",
24-
"babel-preset-env": "1.2.1",
25-
"babel-preset-react": "6.23.0",
26-
"babel-runtime": "6.23.0"
24+
"babel-preset-env": "1.4.0",
25+
"babel-preset-react": "6.24.1"
26+
},
27+
"peerDependencies": {
28+
"babel-runtime": "^6.23.0"
2729
}
2830
}

0 commit comments

Comments
 (0)