Skip to content

Commit

Permalink
Merge commit 'aaf1e819014c501b2e786738be5b6f9ea8a214fb'
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Qrysto committed Apr 16, 2017
2 parents 05aa93b + aaf1e81 commit cf2c2ba
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion packages/create-react-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-react-app",
"version": "1.1.0",
"version": "1.2.0",
"keywords": [
"react"
],
Expand Down
2 changes: 2 additions & 0 deletions packages/react-scripts/config/paths.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,5 @@ module.exports = {

var reactScriptsPath = path.resolve('node_modules/react-scripts');
var reactScriptsLinked = fs.existsSync(reactScriptsPath) && fs.lstatSync(reactScriptsPath).isSymbolicLink();

// @remove-on-eject-end
2 changes: 1 addition & 1 deletion packages/react-scripts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sero.ai-react-scripts",
"version": "0.2.0",
"version": "0.3.0",
"description": "Configuration and scripts for Create React App. Customized for sero.ai team.",
"repository": "Qrysto/create-react-app",
"license": "BSD-3-Clause",
Expand Down

0 comments on commit cf2c2ba

Please sign in to comment.