Skip to content

Commit cf2c2ba

Browse files
committed
Merge commit 'aaf1e819014c501b2e786738be5b6f9ea8a214fb'
* commit 'aaf1e819014c501b2e786738be5b6f9ea8a214fb': (73 commits) Publish Add "migrating" section for 0.9.3 Add 0.9.3 changelog (facebook#1683) Use offline cached version with yarn when it's possible (facebook#1423) add X-FORWARDED headers for proxy requests (facebook#1677) Revert "Enable eslint caching in development" (facebook#1665) fix project cleanup on windows (facebook#1675) add project name validation (facebook#1662) Remove Windows 0.10 simple test fix react dependency versions during initial install (facebook#1669) Add appveyor.yml (facebook#1648) Fix e2e-simple (cont.) Fix e2e when used with cold cache (facebook#1667) Set Chrome userDataDir to be under .vscode folder (facebook#1657) Format differently Merge changelogs Add a note about known issue 0.9.2 Add 0.9.2 changelog Fix npm test on Windows (facebook#1647) ... Conflicts: packages/create-react-app/package.json packages/react-scripts/README.md packages/react-scripts/config/paths.js packages/react-scripts/config/webpack.config.dev.js packages/react-scripts/package.json
2 parents 05aa93b + aaf1e81 commit cf2c2ba

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

packages/create-react-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-react-app",
3-
"version": "1.1.0",
3+
"version": "1.2.0",
44
"keywords": [
55
"react"
66
],

packages/react-scripts/config/paths.js

+2
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,5 @@ module.exports = {
116116

117117
var reactScriptsPath = path.resolve('node_modules/react-scripts');
118118
var reactScriptsLinked = fs.existsSync(reactScriptsPath) && fs.lstatSync(reactScriptsPath).isSymbolicLink();
119+
120+
// @remove-on-eject-end

packages/react-scripts/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sero.ai-react-scripts",
3-
"version": "0.2.0",
3+
"version": "0.3.0",
44
"description": "Configuration and scripts for Create React App. Customized for sero.ai team.",
55
"repository": "Qrysto/create-react-app",
66
"license": "BSD-3-Clause",

0 commit comments

Comments
 (0)