diff options
author | Joffrey BION <joffrey.bion@gmail.com> | 2018-06-09 12:18:44 +0200 |
---|---|---|
committer | Joffrey BION <joffrey.bion@gmail.com> | 2018-06-09 12:49:52 +0200 |
commit | 9038d75925aa0bcc6cdf0bfb45b7f78415b3d465 (patch) | |
tree | 99e18ab2820b475c6f90c280683a41ab20bab24d | |
parent | Remove rebass dependency (diff) | |
download | seven-wonders-9038d75925aa0bcc6cdf0bfb45b7f78415b3d465.tar.gz seven-wonders-9038d75925aa0bcc6cdf0bfb45b7f78415b3d465.tar.bz2 seven-wonders-9038d75925aa0bcc6cdf0bfb45b7f78415b3d465.zip |
Migrate to react 16 and blueprint 2
-rw-r--r-- | frontend/package.json | 9 | ||||
-rw-r--r-- | frontend/src/index.js | 2 | ||||
-rw-r--r-- | frontend/src/scenes/SplashScreen/index.js | 2 | ||||
-rw-r--r-- | frontend/yarn.lock | 160 |
4 files changed, 70 insertions, 103 deletions
diff --git a/frontend/package.json b/frontend/package.json index 37bf4ce5..18738414 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -11,18 +11,17 @@ "react-scripts": "^1.1.4" }, "dependencies": { - "@blueprintjs/core": "^1.24.0", + "@blueprintjs/core": "^2.3.1", "history": "^4.6.3", "immutable": "^3.8.1", "normalizr": "^3.2.3", - "react": "^15.6.1", - "react-addons-css-transition-group": "^15.0.1", - "react-dom": "^15.6.1", + "react": "^16.4.0", + "react-dom": "^16.4.0", "react-redux": "^5.0.7", "react-redux-toastr": "^7.2.3", "react-router-dom": "^4.2.2", "react-router-redux": "^5.0.0-alpha.9", - "rebass": "^0.3.3", + "react-transition-group": "^2.3.1", "redux": "^4.0.0", "redux-immutable": "^4.0.0", "redux-saga": "^0.16.0", diff --git a/frontend/src/index.js b/frontend/src/index.js index 1a7a0859..8e82b96a 100644 --- a/frontend/src/index.js +++ b/frontend/src/index.js @@ -1,5 +1,5 @@ // @flow -import '@blueprintjs/core/dist/blueprint.css'; +import '@blueprintjs/core/lib/css/blueprint.css'; import 'babel-polyfill'; import React from 'react'; import ReactDOM from 'react-dom'; diff --git a/frontend/src/scenes/SplashScreen/index.js b/frontend/src/scenes/SplashScreen/index.js index 5d9af862..1eee4e1b 100644 --- a/frontend/src/scenes/SplashScreen/index.js +++ b/frontend/src/scenes/SplashScreen/index.js @@ -34,7 +34,7 @@ class SplashScreenPresenter extends Component<SplashScreenProps> { } renderSubmit = () => ( - <Button className={Classes.MINIMAL} onClick={this.play} intent={Intent.PRIMARY} rightIconName="arrow-right" /> + <Button className={Classes.MINIMAL} onClick={this.play} intent={Intent.PRIMARY} rightIcon="arrow-right" /> ); } diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 65bf20a6..9bf946f8 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -2,26 +2,29 @@ # yarn lockfile v1 -"@blueprintjs/core@^1.24.0": - version "1.28.0" - resolved "https://registry.yarnpkg.com/@blueprintjs/core/-/core-1.28.0.tgz#673b70fe091292b532f52805a6b9195922ab1b9e" +"@blueprintjs/core@^2.3.1": + version "2.3.1" + resolved "https://registry.yarnpkg.com/@blueprintjs/core/-/core-2.3.1.tgz#c998f8d22b02bfc9990b66b201f1ea095fb15450" dependencies: - "@types/dom4" "^1.5.20" - "@types/tether" "^1.1.27" + "@blueprintjs/icons" "^2.2.1" + "@types/dom4" "^2.0.0" classnames "^2.2" - dom4 "^1.8" - normalize.css "4.1.1" - pure-render-decorator "^1.1" - tether "^1.4" - tslib "^1.5.0" + dom4 "^2.0.1" + normalize.css "^8.0.0" + popper.js "^1.14.1" + react-popper "^0.8.2" + tslib "^1.9.0" -"@types/dom4@^1.5.20": - version "1.5.20" - resolved "https://registry.yarnpkg.com/@types/dom4/-/dom4-1.5.20.tgz#ccf636d3b794fe65a4191ebc7ff979a78efea6c2" +"@blueprintjs/icons@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@blueprintjs/icons/-/icons-2.2.1.tgz#1b4275fc67467218a8ffec6403c87c7af24532a5" + dependencies: + classnames "^2.2" + tslib "^1.9.0" -"@types/tether@^1.1.27": - version "1.4.3" - resolved "https://registry.yarnpkg.com/@types/tether/-/tether-1.4.3.tgz#bbcb46a35dfbeeaaf60d60afaba3d872b6e1ebf5" +"@types/dom4@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@types/dom4/-/dom4-2.0.0.tgz#00dc42fed6b36a7a6dabb8f7a9c9e678ee644e05" abab@^1.0.3: version "1.0.4" @@ -1370,10 +1373,6 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -chain-function@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.0.tgz#0d4ab37e7e18ead0bdc47b920764118ce58733dc" - chainsaw@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98" @@ -1719,14 +1718,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -create-react-class@^15.6.0: - version "15.6.3" - resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036" - dependencies: - fbjs "^0.8.9" - loose-envify "^1.3.1" - object-assign "^4.1.1" - cross-env@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.4.tgz#f61c14291f7cc653bb86457002ea80a04699d022" @@ -2090,7 +2081,7 @@ dom-converter@~0.1: dependencies: utila "~0.3" -dom-helpers@^3.2.0: +dom-helpers@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.3.1.tgz#fc1a4e15ffdf60ddde03a480a9c0fece821dd4a6" @@ -2107,9 +2098,9 @@ dom-urls@^1.1.0: dependencies: urijs "^1.16.1" -dom4@^1.8: - version "1.8.5" - resolved "https://registry.yarnpkg.com/dom4/-/dom4-1.8.5.tgz#4de3a2e59af45b2af8b30bc595713ecae5037037" +dom4@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/dom4/-/dom4-2.0.1.tgz#03000cbea1ec33b3dde8cfd7a0cf77587d27e9d5" domain-browser@^1.1.1: version "1.1.7" @@ -2776,9 +2767,9 @@ fb-watchman@^2.0.0: dependencies: bser "^2.0.0" -fbjs@^0.8.0, fbjs@^0.8.4, fbjs@^0.8.9: - version "0.8.15" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.15.tgz#4f0695fdfcc16c37c0b07facec8cb4c4091685b9" +fbjs@^0.8.16: + version "0.8.16" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db" dependencies: core-js "^1.0.0" isomorphic-fetch "^2.1.1" @@ -2788,9 +2779,9 @@ fbjs@^0.8.0, fbjs@^0.8.4, fbjs@^0.8.9: setimmediate "^1.0.5" ua-parser-js "^0.7.9" -fbjs@^0.8.16: - version "0.8.16" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db" +fbjs@^0.8.9: + version "0.8.15" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.15.tgz#4f0695fdfcc16c37c0b07facec8cb4c4091685b9" dependencies: core-js "^1.0.0" isomorphic-fetch "^2.1.1" @@ -4892,9 +4883,9 @@ normalize-url@^1.4.0: query-string "^4.1.0" sort-keys "^1.0.0" -normalize.css@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-4.1.1.tgz#4f0b1d5a235383252b04d8566b866cc5fcad9f0c" +normalize.css@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.0.tgz#14ac5e461612538a4ce9be90a7da23f86e718493" normalizr@^3.2.3: version "3.2.3" @@ -5252,6 +5243,10 @@ pluralize@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" +popper.js@^1.12.9, popper.js@^1.14.1: + version "1.14.3" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.3.tgz#1438f98d046acf7b4d78cd502bf418ac64d4f095" + portfinder@^1.0.9: version "1.0.13" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9" @@ -5668,7 +5663,7 @@ prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.7: fbjs "^0.8.9" loose-envify "^1.3.1" -prop-types@^15.5.6, prop-types@^15.6.0: +prop-types@^15.6.0, prop-types@^15.6.1: version "15.6.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca" dependencies: @@ -5713,12 +5708,6 @@ punycode@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d" -pure-render-decorator@^1.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/pure-render-decorator/-/pure-render-decorator-1.2.1.tgz#568870eeca17a1cee536b4fe94a3477fcd31eeb9" - dependencies: - fbjs "^0.8.0" - q@^1.1.2: version "1.5.0" resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1" @@ -5794,19 +5783,6 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.1.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-addons-css-transition-group@^15.0.1: - version "15.6.2" - resolved "https://registry.yarnpkg.com/react-addons-css-transition-group/-/react-addons-css-transition-group-15.6.2.tgz#9e4376bcf40b5217d14ec68553081cee4b08a6d6" - dependencies: - react-transition-group "^1.2.0" - -react-addons-pure-render-mixin@^15.4.2: - version "15.6.0" - resolved "https://registry.yarnpkg.com/react-addons-pure-render-mixin/-/react-addons-pure-render-mixin-15.6.0.tgz#84ba028630cdf89239d16f1bb4d98fe865651813" - dependencies: - fbjs "^0.8.4" - object-assign "^4.1.0" - react-dev-utils@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-5.0.1.tgz#1f396e161fe44b595db1b186a40067289bf06613" @@ -5830,19 +5806,26 @@ react-dev-utils@^5.0.1: strip-ansi "3.0.1" text-table "0.2.0" -react-dom@^15.6.1: - version "15.6.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730" +react-dom@^16.4.0: + version "16.4.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.0.tgz#099f067dd5827ce36a29eaf9a6cdc7cbf6216b1e" dependencies: - fbjs "^0.8.9" + fbjs "^0.8.16" loose-envify "^1.1.0" - object-assign "^4.1.0" - prop-types "^15.5.10" + object-assign "^4.1.1" + prop-types "^15.6.0" react-error-overlay@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-4.0.0.tgz#d198408a85b4070937a98667f500c832f86bd5d4" +react-popper@^0.8.2: + version "0.8.3" + resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.8.3.tgz#0f73333137c9fb0af6ec4074d2d0585a0a0461e1" + dependencies: + popper.js "^1.12.9" + prop-types "^15.6.0" + react-redux-toastr@^7.2.3: version "7.2.3" resolved "https://registry.yarnpkg.com/react-redux-toastr/-/react-redux-toastr-7.2.3.tgz#5bd1de3feba602283b83837c2b7a376a3be46496" @@ -5938,25 +5921,22 @@ react-scripts@^1.1.4: optionalDependencies: fsevents "^1.1.3" -react-transition-group@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.1.tgz#e11f72b257f921b213229a774df46612346c7ca6" +react-transition-group@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.3.1.tgz#31d611b33e143a5e0f2d94c348e026a0f3b474b6" dependencies: - chain-function "^1.0.0" - dom-helpers "^3.2.0" + dom-helpers "^3.3.1" loose-envify "^1.3.1" - prop-types "^15.5.6" - warning "^3.0.0" + prop-types "^15.6.1" -react@^15.6.1: - version "15.6.2" - resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72" +react@^16.4.0: + version "16.4.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.4.0.tgz#402c2db83335336fba1962c08b98c6272617d585" dependencies: - create-react-class "^15.6.0" - fbjs "^0.8.9" + fbjs "^0.8.16" loose-envify "^1.1.0" - object-assign "^4.1.0" - prop-types "^15.5.10" + object-assign "^4.1.1" + prop-types "^15.6.0" read-all-stream@^3.0.0: version "3.1.0" @@ -6037,14 +6017,6 @@ readdirp@^2.0.0: readable-stream "^2.0.2" set-immediate-shim "^1.0.1" -rebass@^0.3.3: - version "0.3.4" - resolved "https://registry.yarnpkg.com/rebass/-/rebass-0.3.4.tgz#88a16c6b6cf52e3b3e8d5a54fe42994bd04a4bf7" - dependencies: - classnames "^2.2.3" - object-assign "^4.1.1" - react-addons-pure-render-mixin "^15.4.2" - recursive-readdir@2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.1.tgz#90ef231d0778c5ce093c9a48d74e5c5422d13a99" @@ -6910,10 +6882,6 @@ test-exclude@^4.1.1: read-pkg-up "^1.0.1" require-main-filename "^1.0.1" -tether@^1.4: - version "1.4.0" - resolved "https://registry.yarnpkg.com/tether/-/tether-1.4.0.tgz#0f9fa171f75bf58485d8149e94799d7ae74d1c1a" - text-table@0.2.0, text-table@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -6996,9 +6964,9 @@ tryit@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb" -tslib@^1.5.0: - version "1.7.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec" +tslib@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" tty-browserify@0.0.0: version "0.0.0" |