chore(*): update to react 16.2 (#4984)

spinnaker · Mar 12, 2018 · 524210b · 524210b
1 parent 58d1527
commit 524210b
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,9 @@ dist: trusty
 before_install:
 - export CHROME_BIN=chromium-browser
 - export DISPLAY=:99.0
+- export PATH=$HOME/.yarn/bin:$PATH
+#- rm -rf node_modules
+- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.5.1
 - sh -e /etc/init.d/xvfb start
 install: gradle/installViaTravis.sh
 script: gradle/buildViaTravis.sh

diff --git a/karma-shim.js b/karma-shim.js
@@ -1,5 +1,5 @@
 import { configure } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-15';
+import Adapter from 'enzyme-adapter-react-16';
 
 configure({ adapter: new Adapter() });
 

diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
   "engines": {
     "node": ">=8.9.0",
     "npm": ">=5.5.1",
-    "yarn": ">=1.3.2"
+    "yarn": ">=1.5.0"
   },
   "scripts": {
     "clean": "rimraf .awcache .cache-loader build node_modules transpiled",
@@ -28,9 +28,9 @@
   "dependencies": {
     "@spinnaker/kayenta": "0.0.29",
     "@spinnaker/styleguide": "^1.0.0",
-    "@uirouter/react-hybrid": "0.0.16",
+    "@uirouter/react-hybrid": "0.1.0",
     "@uirouter/rx": "0.4.5",
-    "@uirouter/visualizer": "5.1.3",
+    "@uirouter/visualizer": "6.0.0",
     "Select2": "git://github.com/select2/select2.git#3.4.8",
     "angular": "~1.6.3",
     "angular-cache": "^4.6.0",
@@ -64,9 +64,9 @@
     "n3-charts": "^2.0.18",
     "ngimport": "^0.6.0",
     "prop-types": "15.6.1",
-    "react": "15.6.2",
+    "react": "16.2.0",
     "react-bootstrap": "^0.32.1",
-    "react-dom": "15.6.2",
+    "react-dom": "16.2.0",
     "react-ga": "^2.4.1",
     "react-redux": "^5.0.7",
     "react-select": "^1.2.1",
@@ -125,7 +125,7 @@
     "envify": "^1.2.1",
     "envify-loader": "^0.1.0",
     "enzyme": "^3.3.0",
-    "enzyme-adapter-react-15": "^1.0.5",
+    "enzyme-adapter-react-16": "1.1.1",
     "eslint": "^3.17.0",
     "eslint-loader": "^1.6.3",
     "exports-loader": "^0.6.3",
@@ -154,7 +154,7 @@
     "postcss-colorfix": "^0.0.3",
     "postcss-loader": "^2.0.6",
     "react-addons-test-utils": "15.6.2",
-    "react-test-renderer": "15.6.2",
+    "react-test-renderer": "16.2.0",
     "rimraf": "^2.5.4",
     "style-loader": "^0.17.0",
     "thread-loader": "^1.1.2",

diff --git a/yarn.lock b/yarn.lock
@@ -450,9 +450,9 @@
   version "5.0.5"
   resolved "https://registry.yarnpkg.com/@uirouter/core/-/core-5.0.5.tgz#4fafae8b89e1bee321b0ed32e69ab66547c055c6"
 
-"@uirouter/react-hybrid@0.0.16":
-  version "0.0.16"
-  resolved "https://registry.yarnpkg.com/@uirouter/react-hybrid/-/react-hybrid-0.0.16.tgz#6b81ac25be3de176b5ac680267d4b0bca4291b40"
+"@uirouter/react-hybrid@0.1.0":
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/@uirouter/react-hybrid/-/react-hybrid-0.1.0.tgz#08e4b7091dbc0f55e002765e450775b25e034447"
   dependencies:
     "@uirouter/angularjs" "1.0.15"
     "@uirouter/core" "5.0.17"
@@ -493,9 +493,9 @@
     rollup-plugin-uglify "^1.0.2"
     rollup-plugin-visualizer "^0.2.1"
 
-"@uirouter/visualizer@5.1.3":
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/@uirouter/visualizer/-/visualizer-5.1.3.tgz#c62d57ee7f11f3414cd05232d4b7a698a2416a9b"
+"@uirouter/visualizer@6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@uirouter/visualizer/-/visualizer-6.0.0.tgz#8812198ab5c89d7dd252665573bc027f2dd2ff98"
   dependencies:
     d3-hierarchy "^1.1.5"
     d3-interpolate "^1.1.5"
@@ -3119,17 +3119,19 @@ envify@^3.0.0:
     jstransform "^11.0.3"
     through "~2.3.4"
 
-enzyme-adapter-react-15@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-15/-/enzyme-adapter-react-15-1.0.5.tgz#99f9a03ff2c2303e517342935798a6bdfbb75fac"
+enzyme-adapter-react-16@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.1.1.tgz#a8f4278b47e082fbca14f5bfb1ee50ee650717b4"
   dependencies:
-    enzyme-adapter-utils "^1.1.0"
+    enzyme-adapter-utils "^1.3.0"
     lodash "^4.17.4"
     object.assign "^4.0.4"
     object.values "^1.0.4"
-    prop-types "^15.5.10"
+    prop-types "^15.6.0"
+    react-reconciler "^0.7.0"
+    react-test-renderer "^16.0.0-0"
 
-enzyme-adapter-utils@^1.1.0:
+enzyme-adapter-utils@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.3.0.tgz#d6c85756826c257a8544d362cc7a67e97ea698c7"
   dependencies:
@@ -7160,6 +7162,15 @@ react-dom@15.6.2:
     object-assign "^4.1.0"
     prop-types "^15.5.10"
 
+react-dom@16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.0"
+
 react-dom@^0.14.8:
   version "0.14.9"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-0.14.9.tgz#05064a3dcf0fb1880a3b2bfc9d58c55d8d9f6293"
@@ -7194,6 +7205,15 @@ react-prop-types@^0.4.0:
   dependencies:
     warning "^3.0.0"
 
+react-reconciler@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.7.0.tgz#9614894103e5f138deeeb5eabaf3ee80eb1d026d"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.0"
+
 react-redux@^5.0.7:
   version "5.0.7"
   resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.7.tgz#0dc1076d9afb4670f993ffaef44b8f8c1155a4c8"
@@ -7222,12 +7242,13 @@ react-sortable-hoc@^0.6.8:
     lodash "^4.12.0"
     prop-types "^15.5.7"
 
-react-test-renderer@15.6.2:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.6.2.tgz#d0333434fc2c438092696ca770da5ed48037efa8"
+react-test-renderer@16.2.0, react-test-renderer@^16.0.0-0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.2.0.tgz#bddf259a6b8fcd8555f012afc8eacc238872a211"
   dependencies:
-    fbjs "^0.8.9"
-    object-assign "^4.1.0"
+    fbjs "^0.8.16"
+    object-assign "^4.1.1"
+    prop-types "^15.6.0"
 
 react-transition-group@^2.0.0, react-transition-group@^2.2.0:
   version "2.2.1"
@@ -7286,14 +7307,7 @@ react@15.6.2:
     object-assign "^4.1.0"
     prop-types "^15.5.10"
 
-react@^0.14.8:
-  version "0.14.9"
-  resolved "https://registry.yarnpkg.com/react/-/react-0.14.9.tgz#9110a6497c49d44ba1c0edd317aec29c2e0d91d1"
-  dependencies:
-    envify "^3.0.0"
-    fbjs "^0.6.1"
-
-"react@^15.6.2 || ^16.0":
+react@16.2.0, "react@^15.6.2 || ^16.0":
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
   dependencies:
@@ -7302,6 +7316,13 @@ react@^0.14.8:
     object-assign "^4.1.1"
     prop-types "^15.6.0"
 
+react@^0.14.8:
+  version "0.14.9"
+  resolved "https://registry.yarnpkg.com/react/-/react-0.14.9.tgz#9110a6497c49d44ba1c0edd317aec29c2e0d91d1"
+  dependencies:
+    envify "^3.0.0"
+    fbjs "^0.6.1"
+
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"