Merge branch 'master' of https://github.com/facebookincubator/create-react-app

cr101 · cr101 · commit 9bad6a7f2883 · 2017-06-30T12:44:35.000+12:00
#	package.json
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -64,7 +64,7 @@
   Please scan these few sections for common problems.
   Additionally, you can search the User Guide itself for something you're having issues with:
   
-  https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.me
+  https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md
   
   If you didn't find the solution, please share which words you searched for.
   This helps us improve documentation for future readers who might encounter the same problem.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,86 @@
+## 1.0.10 (June 29, 2017)
+
+#### :bug: Bug Fix
+
+* `react-dev-utils`
+
+  * [#2692](https://github.com/facebookincubator/create-react-app/pull/2692) Fix IE11 crash in development. ([@pdhoopr](https://github.com/pdhoopr))
+
+* `create-react-app`
+  * [#2683](https://github.com/facebookincubator/create-react-app/pull/2683) Fix a typo. ([@BenBrostoff](https://github.com/BenBrostoff))
+
+#### :memo: Documentation
+
+* README
+
+  * [#2402](https://github.com/facebookincubator/create-react-app/pull/2402) Added `gluestick` to the alternatives section. ([@JoeCortopassi](https://github.com/JoeCortopassi))
+
+#### Committers: 5
+- Ben Brostoff ([BenBrostoff](https://github.com/BenBrostoff))
+- Forbes Lindesay ([ForbesLindesay](https://github.com/ForbesLindesay))
+- Joe Haddad ([Timer](https://github.com/Timer))
+- Patrick Hooper ([pdhoopr](https://github.com/pdhoopr))
+- [JoeCortopassi](https://github.com/JoeCortopassi)
+
+### Migrating from 1.0.9 to 1.0.10
+
+Inside any created project that has not been ejected, run:
+
+```
+npm install --save --save-exact react-scripts@1.0.10
+```
+
+or
+
+```
+yarn add --exact react-scripts@1.0.10
+```
+
+## 1.0.9 (June 29, 2017)
+
+#### :bug: Bug Fix
+
+* `react-scripts`
+
+  * [#2680](https://github.com/facebookincubator/create-react-app/pull/2680) Fix external CSS imports. ([@gaearon](https://github.com/gaearon))
+
+#### :memo: Documentation
+
+* `react-scripts`
+
+  * [#2679](https://github.com/facebookincubator/create-react-app/pull/2679) Fix minor typo. ([@dbanck](https://github.com/dbanck))
+  * [#2666](https://github.com/facebookincubator/create-react-app/pull/2666) Add more info about Apache client side routing. ([@viankakrisna](https://github.com/viankakrisna))
+  * [#2671](https://github.com/facebookincubator/create-react-app/pull/2671) Add JSON and CSS to Prettier instructions. ([@jbovenschen](https://github.com/jbovenschen))
+
+#### :house: Internal
+
+* Other
+
+  * [#2673](https://github.com/facebookincubator/create-react-app/pull/2673) Bootstrap with Yarn. ([@Timer](https://github.com/Timer))
+  * [#2659](https://github.com/facebookincubator/create-react-app/pull/2659) Test Node 8 on Travis. ([@gaearon](https://github.com/gaearon))
+
+#### Committers: 5
+
+- Ade Viankakrisna Fadlil ([viankakrisna](https://github.com/viankakrisna))
+- Dan Abramov ([gaearon](https://github.com/gaearon))
+- Daniel Banck ([dbanck](https://github.com/dbanck))
+- Jaco Bovenschen ([jbovenschen](https://github.com/jbovenschen))
+- Joe Haddad ([Timer](https://github.com/Timer))
+
+### Migrating from 1.0.8 to 1.0.9
+
+Inside any created project that has not been ejected, run:
+
+```
+npm install --save --save-exact react-scripts@1.0.9
+```
+
+or
+
+```
+yarn add --exact react-scripts@1.0.9
+```
+
 ## 1.0.8 (June 28, 2017)
 
 #### :bug: Bug Fix
diff --git a/README.md b/README.md
@@ -251,6 +251,7 @@ Notable alternatives also include:
 * [react-app](https://github.com/kriasoft/react-app)
 * [dev-toolkit](https://github.com/stoikerty/dev-toolkit)
 * [sku](https://github.com/seek-oss/sku)
+* [gluestick](https://github.com/TrueCar/gluestick)
 
 You can also use module bundlers like [webpack](http://webpack.js.org) and [Browserify](http://browserify.org/) directly.<br>
 React documentation includes [a walkthrough](https://facebook.github.io/react/docs/package-management.html) on this topic.
diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js
@@ -169,7 +169,7 @@ function createApp(name, verbose, version, template) {
   if (!semver.satisfies(process.version, '>=6.0.0')) {
     console.log(
       chalk.yellow(
-        `You are using Node ${process.version} so the project will be boostrapped with an old unsupported version of tools.\n\n` +
+        `You are using Node ${process.version} so the project will be bootstrapped with an old unsupported version of tools.\n\n` +
           `Please update to Node 6 or higher for a better, fully supported experience.\n`
       )
     );
diff --git a/packages/create-react-app/package.json b/packages/create-react-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-react-app",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "keywords": [
     "react"
   ],
diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dev-utils",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Webpack utilities used by Create React App",
   "repository": "facebookincubator/create-react-app",
   "license": "BSD-3-Clause",
@@ -49,7 +49,7 @@
     "recursive-readdir": "2.2.1",
     "shell-quote": "1.6.1",
     "sockjs-client": "1.1.4",
-    "strip-ansi": "4.0.0",
+    "strip-ansi": "3.0.1",
     "text-table": "0.2.0"
   }
 }
diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-error-overlay",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "An overlay for displaying stack frames.",
   "main": "lib/index.js",
   "scripts": {
@@ -34,7 +34,7 @@
     "anser": "1.2.5",
     "babel-code-frame": "6.22.0",
     "babel-runtime": "6.23.0",
-    "react-dev-utils": "^3.0.1",
+    "react-dev-utils": "^3.0.2",
     "settle-promise": "1.0.0",
     "source-map": "0.5.6"
   },
@@ -49,7 +49,7 @@
     "eslint-plugin-import": "2.2.0",
     "eslint-plugin-jsx-a11y": "5.0.3",
     "eslint-plugin-react": "7.0.1",
-    "flow-bin": "0.46.0",
+    "flow-bin": "0.49.1",
     "jest": "20.0.1",
     "jest-fetch-mock": "1.1.1"
   },
diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js
@@ -227,6 +227,9 @@ module.exports = {
           {
             loader: require.resolve('postcss-loader'),
             options: {
+              // Necessary for external CSS imports to work
+              // https://github.com/facebookincubator/create-react-app/issues/2677
+              ident: 'postcss',
               plugins: () => [
                 require('postcss-flexbugs-fixes'),
                 autoprefixer({
diff --git a/packages/react-scripts/config/webpack.config.prod.js b/packages/react-scripts/config/webpack.config.prod.js
@@ -236,6 +236,9 @@ module.exports = {
                 {
                   loader: require.resolve('postcss-loader'),
                   options: {
+                    // Necessary for external CSS imports to work
+                    // https://github.com/facebookincubator/create-react-app/issues/2677
+                    ident: 'postcss',
                     plugins: () => [
                       require('postcss-flexbugs-fixes'),
                       autoprefixer({
diff --git a/packages/react-scripts/fixtures/kitchensink/.template.dependencies.json b/packages/react-scripts/fixtures/kitchensink/.template.dependencies.json
@@ -6,6 +6,7 @@
     "chai": "3.5.0",
     "jsdom": "9.8.3",
     "mocha": "3.2.0",
+    "normalize.css": "7.0.0",
     "prop-types": "15.5.6",
     "test-integrity": "1.0.0"
   }
diff --git a/packages/react-scripts/fixtures/kitchensink/integration/webpack.test.js b/packages/react-scripts/fixtures/kitchensink/integration/webpack.test.js
@@ -17,6 +17,9 @@ describe('Integration', () => {
 
       expect(
         doc.getElementsByTagName('style')[0].textContent.replace(/\s/g, '')
+      ).to.match(/html\{/);
+      expect(
+        doc.getElementsByTagName('style')[1].textContent.replace(/\s/g, '')
       ).to.match(/#feature-css-inclusion\{background:.+;color:.+}/);
     });
 
diff --git a/packages/react-scripts/fixtures/kitchensink/src/features/webpack/assets/style.css b/packages/react-scripts/fixtures/kitchensink/src/features/webpack/assets/style.css
@@ -1,3 +1,9 @@
+/*
+ * Ensure CSS inclusion doesn't regress
+ * https://github.com/facebookincubator/create-react-app/issues/2677
+ */
+@import '~normalize.css/normalize.css';
+
 #feature-css-inclusion {
   background: palevioletred;
   color: papayawhip;
diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Configuration and scripts for Create React App.",
   "repository": "facebookincubator/create-react-app",
   "license": "BSD-3-Clause",
@@ -48,8 +48,8 @@
     "postcss-flexbugs-fixes": "3.0.0",
     "postcss-loader": "2.0.6",
     "promise": "7.1.1",
-    "react-dev-utils": "^3.0.1",
-    "react-error-overlay": "^1.0.8",
+    "react-dev-utils": "^3.0.2",
+    "react-error-overlay": "^1.0.9",
     "style-loader": "0.18.2",
     "sw-precache-webpack-plugin": "0.11.3",
     "url-loader": "0.5.9",
diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
@@ -1503,7 +1503,7 @@ Learn more about React Storybook:
 
 ### Getting Started with Styleguidist
 
-Styleguidist combines of a style guide, where all your components are presented on a single page with their props documentation and usage examples, with an environment for developing components in isolation, similar to Storybook. In Styleguidist you write examples in Markdown, where each code snippet is rendered as a live editable playground.
+Styleguidist combines a style guide, where all your components are presented on a single page with their props documentation and usage examples, with an environment for developing components in isolation, similar to Storybook. In Styleguidist you write examples in Markdown, where each code snippet is rendered as a live editable playground.
 
 First, install Styleguidist:
 

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ function createApp(name, verbose, version, template) {`
`169`	`169`	`if (!semver.satisfies(process.version, '>=6.0.0')) {`
`170`	`170`	`console.log(`
`171`	`171`	`chalk.yellow(`
`172`		- `You are using Node ${process.version} so the project will be boostrapped with an old unsupported version of tools.\n\n` +
	`172`	+ `You are using Node ${process.version} so the project will be bootstrapped with an old unsupported version of tools.\n\n` +
`173`	`173`	`Please update to Node 6 or higher for a better, fully supported experience.\n`
`174`	`174`	`)`
`175`	`175`	`);`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "create-react-app",`
`3`		`- "version": "1.3.2",`
	`3`	`+ "version": "1.3.3",`
`4`	`4`	`"keywords": [`
`5`	`5`	`"react"`
`6`	`6`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-dev-utils",`
`3`		`- "version": "3.0.1",`
	`3`	`+ "version": "3.0.2",`
`4`	`4`	`"description": "Webpack utilities used by Create React App",`
`5`	`5`	`"repository": "facebookincubator/create-react-app",`
`6`	`6`	`"license": "BSD-3-Clause",`
`@@ -49,7 +49,7 @@`
`49`	`49`	`"recursive-readdir": "2.2.1",`
`50`	`50`	`"shell-quote": "1.6.1",`
`51`	`51`	`"sockjs-client": "1.1.4",`
`52`		`- "strip-ansi": "4.0.0",`
	`52`	`+ "strip-ansi": "3.0.1",`
`53`	`53`	`"text-table": "0.2.0"`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`"chai": "3.5.0",`
`7`	`7`	`"jsdom": "9.8.3",`
`8`	`8`	`"mocha": "3.2.0",`
	`9`	`+ "normalize.css": "7.0.0",`
`9`	`10`	`"prop-types": "15.5.6",`
`10`	`11`	`"test-integrity": "1.0.0"`
`11`	`12`	`}`