From 567d981ee28188a78731b4c45aedaa60b22a03bd Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Thu, 29 Jun 2017 12:59:49 +0100 Subject: [PATCH 01/11] Fix external CSS imports (#2680) * Fix external CSS imports * Add external CSS import to integration test * Fix assertion --- packages/react-scripts/config/webpack.config.dev.js | 3 +++ packages/react-scripts/config/webpack.config.prod.js | 3 +++ .../fixtures/kitchensink/.template.dependencies.json | 1 + .../fixtures/kitchensink/integration/webpack.test.js | 3 +++ .../kitchensink/src/features/webpack/assets/style.css | 6 ++++++ 5 files changed, 16 insertions(+) diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js index 7536b13892c..987e7a3570c 100644 --- a/packages/react-scripts/config/webpack.config.dev.js +++ b/packages/react-scripts/config/webpack.config.dev.js @@ -219,6 +219,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 index f31fd3ebf9f..1ba1307bb3e 100644 --- a/packages/react-scripts/config/webpack.config.prod.js +++ b/packages/react-scripts/config/webpack.config.prod.js @@ -228,6 +228,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 index 63ecaf90db8..b8500f804b1 100644 --- 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 index bda69cc61af..e3845e79e42 100644 --- 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 index c399d1acada..9502cfaa121 100644 --- 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; From 29df7290b903252f5ecd9d4567001e0cab179257 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Thu, 29 Jun 2017 13:06:42 +0100 Subject: [PATCH 02/11] Changelog for 1.0.9 (#2682) --- CHANGELOG.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a5ef69066d..08b661de672 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,48 @@ +## 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-dev --save-exact react-scripts@1.0.9 +``` + +or + +``` +yarn add --dev --exact react-scripts@1.0.9 +``` + ## 1.0.8 (June 28, 2017) #### :bug: Bug Fix From adf334f88690596b5ffd3bb62e25cec7797e3b34 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Thu, 29 Jun 2017 13:11:46 +0100 Subject: [PATCH 03/11] Publish - react-scripts@1.0.9 --- packages/react-scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index f3750a16abc..ef3ba4881b7 100644 --- 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.9", "description": "Configuration and scripts for Create React App.", "repository": "facebookincubator/create-react-app", "license": "BSD-3-Clause", From 29888fcc7a5a6d658f41dc58fb2a7fa617b719e0 Mon Sep 17 00:00:00 2001 From: Forbes Lindesay Date: Thu, 29 Jun 2017 14:00:10 +0100 Subject: [PATCH 04/11] Fix typo in README link (#2684) --- .github/ISSUE_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index eec13d075eb..dc3c02df8ab 100644 --- 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. From f9f812571542cb10550abab428e084aa4114bfa1 Mon Sep 17 00:00:00 2001 From: Ben Brostoff Date: Thu, 29 Jun 2017 13:06:40 -0400 Subject: [PATCH 05/11] Fix typo (#2683) --- packages/create-react-app/createReactApp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js index 9dc7b4ff335..4509b49788d 100755 --- 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` ) ); From 5e11b48b38c78509200aabe3994130d80e80e901 Mon Sep 17 00:00:00 2001 From: Patrick Hooper Date: Thu, 29 Jun 2017 13:07:04 -0400 Subject: [PATCH 06/11] Downgrade `strip-ansi` package to 3.0.1 (#2692) --- packages/react-dev-utils/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json index 4b01b465db0..9fbbd76402c 100644 --- a/packages/react-dev-utils/package.json +++ b/packages/react-dev-utils/package.json @@ -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" } } From d3518d6254939751dc89f5b0faa9f537dbd1b6d4 Mon Sep 17 00:00:00 2001 From: JoeCortopassi Date: Thu, 29 Jun 2017 10:37:26 -0700 Subject: [PATCH 07/11] Added `gluestick` to the alternatives section (#2402) Added `gluestick` to the alternatives section --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0c428ef65cf..9f40a4d980e 100644 --- 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.
React documentation includes [a walkthrough](https://facebook.github.io/react/docs/package-management.html) on this topic. From 82ed81a03cae32e45b405478cfb7aa54585c5e48 Mon Sep 17 00:00:00 2001 From: Joe Haddad Date: Thu, 29 Jun 2017 13:39:24 -0400 Subject: [PATCH 08/11] Upgrade flow (#2693) Resolves #2670 --- packages/react-error-overlay/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json index f29aedd0f73..dff62a58487 100644 --- a/packages/react-error-overlay/package.json +++ b/packages/react-error-overlay/package.json @@ -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" }, From 19ba8874109b2323044f13bc639abfd870c134c3 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Thu, 29 Jun 2017 18:58:19 +0100 Subject: [PATCH 09/11] Update CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08b661de672..3bd98236299 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,13 +34,13 @@ Inside any created project that has not been ejected, run: ``` -npm install --save-dev --save-exact react-scripts@1.0.9 +npm install --save --save-exact react-scripts@1.0.9 ``` or ``` -yarn add --dev --exact react-scripts@1.0.9 +yarn add --exact react-scripts@1.0.9 ``` ## 1.0.8 (June 28, 2017) From c1221eb1109906965d4d87f91dd6593d9db5eb7f Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Thu, 29 Jun 2017 19:01:37 +0100 Subject: [PATCH 10/11] Changelog for 1.0.10 (#2694) * Add changelog for 1.0.10 * Update CHANGELOG.md * Update CHANGELOG.md --- CHANGELOG.md | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bd98236299..0e2c349eb22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,41 @@ +## 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 From ad35fd1d13f6497bd4b4244896e3c9e88ccef419 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Thu, 29 Jun 2017 19:03:41 +0100 Subject: [PATCH 11/11] Publish - create-react-app@1.3.3 - react-dev-utils@3.0.2 - react-error-overlay@1.0.9 - react-scripts@1.0.10 --- packages/create-react-app/package.json | 2 +- packages/react-dev-utils/package.json | 2 +- packages/react-error-overlay/package.json | 4 ++-- packages/react-scripts/package.json | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/create-react-app/package.json b/packages/create-react-app/package.json index 613007b40b1..28502ca077a 100644 --- 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 index 9fbbd76402c..b4539788d26 100644 --- 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", diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json index dff62a58487..15bf9e484b4 100644 --- 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" }, diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index ef3ba4881b7..5c1225e1d34 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -1,6 +1,6 @@ { "name": "react-scripts", - "version": "1.0.9", + "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",