Skip to content

Commit

Permalink
Merge pull request #4 from manuelbieh/ssr-improvements
Browse files Browse the repository at this point in the history
Upgrade react to 16.3, Improved dev script, added build script
  • Loading branch information
manuelbieh authored Apr 1, 2018
2 parents 1ae946b + 5fd7cd6 commit 490e6e9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ coverage
.env
stuff
build/*
yarn-error.log
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@
"postcss-nested": "^3.0.0",
"postcss-normalize": "^4.0.0",
"prettier": "^1.11.1",
"react": "^16.2.0",
"react": "^16.3.0",
"react-dev-utils": "^5.0.0",
"react-dom": "^16.2.0",
"react-dom": "^16.3.0",
"react-i18next": "^7.5.0",
"react-redux": "^5.0.7",
"react-router": "^4.2.0",
Expand Down
12 changes: 6 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7375,9 +7375,9 @@ react-dev-utils@^5.0.0:
strip-ansi "3.0.1"
text-table "0.2.0"

react-dom@^16.2.0:
version "16.2.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
react-dom@^16.3.0:
version "16.3.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.0.tgz#b318e52184188ecb5c3e81117420cca40618643e"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
Expand Down Expand Up @@ -7455,9 +7455,9 @@ react-test-renderer@^16.0.0-0:
object-assign "^4.1.1"
prop-types "^15.6.0"

react@^16.2.0:
version "16.2.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
react@^16.3.0:
version "16.3.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.3.0.tgz#fc5a01c68f91e9b38e92cf83f7b795ebdca8ddff"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
Expand Down

0 comments on commit 490e6e9

Please sign in to comment.