Upgrade to react-redux-7, fix store instance missing issue #59 (#60)

* Upgrade react-redux dependency to 7 * react-redux in example and demo app both resolve to root level dependency * Moved dependency for react-redux in manifold package to peerDependency
uber · Oct 30, 2019 · 5e5ba36 · 5e5ba36
1 parent e8155bb
commit 5e5ba36
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 22 deletions.
diff --git a/bindings/jupyter-modules/jupyter-graph-builder/package.json b/bindings/jupyter-modules/jupyter-graph-builder/package.json
@@ -15,7 +15,7 @@
     "transpile": "NODE_ENV=production babel src -d dist -s --config-file ../../../babel.config.js && yarn copy"
   },
   "dependencies": {
-    "react": "^16.8.0",
+    "react": "^16.9.0",
     "@mlvis/graph-builder": "^1.0.0"
   }
 }
diff --git a/bindings/jupyter-modules/jupyter-manifold/package.json b/bindings/jupyter-modules/jupyter-manifold/package.json
@@ -19,7 +19,7 @@
     "global": "^4.4.0",
     "react": "^16.9.0",
     "react-dom": "^16.9.0",
-    "react-redux": "^5.0.7",
+    "react-redux": "^7.1.1",
     "reduce-reducers": "^1.0.4",
     "redux": "^4.0.1",
     "redux-actions": "^2.6.5",

diff --git a/bindings/jupyter-modules/jupyter-multi-way-plot/package.json b/bindings/jupyter-modules/jupyter-multi-way-plot/package.json
@@ -19,6 +19,6 @@
     "d3-scale": "^3.0.0",
     "d3-scale-chromatic": "^1.3.3",
     "global": "^4.4.0",
-    "react": "^16.8.0"
+    "react": "^16.9.0"
   }
 }
diff --git a/bindings/jupyter/js/package.json b/bindings/jupyter/js/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "global": "^4.4.0",
-    "react": "^16.8.0",
+    "react": "^16.9.0",
     "reselect": "^4.0.0"
   },
   "devDependencies": {

diff --git a/examples/manifold/package.json b/examples/manifold/package.json
@@ -10,10 +10,11 @@
   },
   "dependencies": {
     "antd": "^3.23.2",
+    "react-container-dimensions": "^1.4.1",
     "react-dom": "^16.8.6",
-    "react-router": "^5.0.1",
-    "react-router-dom": "^5.0.1",
-    "react-router-redux": "^4.0.8",
-    "react-container-dimensions": "^1.4.1"
+    "react-redux": "^7.1.1",
+    "react-router": "^5.1.2",
+    "react-router-dom": "^5.1.2",
+    "react-router-redux": "^4.0.8"
   }
 }
diff --git a/examples/manifold/src/main.js b/examples/manifold/src/main.js
@@ -1,4 +1,3 @@
-// @noflow
 // generator function from kepler layers need it
 // https://github.com/GitbookIO/expect-firestore/issues/1#issuecomment-370590583
 import '@babel/polyfill';

diff --git a/examples/manifold/webpack.config.js b/examples/manifold/webpack.config.js
@@ -24,6 +24,7 @@ module.exports = {
   resolve: {
     alias: {
       react: resolve(NODE_MODULES, 'react'),
+      'react-redux': resolve(NODE_MODULES, 'react-redux'),
       'styled-components': resolve(NODE_MODULES, 'styled-components'),
       ...packageAliases(),
     },

diff --git a/modules/feature-list-view/package.json b/modules/feature-list-view/package.json
@@ -31,6 +31,6 @@
     "reselect": "^3.0.1"
   },
   "peerDependencies": {
-    "react": "^16.7.0"
+    "react": "^16.9.0"
   }
 }
diff --git a/modules/graph-builder/package.json b/modules/graph-builder/package.json
@@ -19,6 +19,6 @@
   },
   "peerDependencies": {
     "prop-types": "^15.7.1",
-    "react": "^16.6.1"
+    "react": "^16.9.0"
   }
 }
diff --git a/modules/manifold/package.json b/modules/manifold/package.json
@@ -44,7 +44,6 @@
     "prop-types": "^15.7.2",
     "random": "^2.1.1",
     "react-d3-axis": "^0.1.1",
-    "react-redux": "^5.0.7",
     "reduce-reducers": "^1.0.4",
     "redux": "^4.0.1",
     "redux-actions": "^2.6.5",
@@ -54,7 +53,7 @@
     "styletron-react": "^5.2.1"
   },
   "peerDependencies": {
-    "react": "^16.7.0",
+    "react": "^16.9.0",
     "styled-components": "^4.2.0"
   }
 }
diff --git a/modules/multi-way-plot/package.json b/modules/multi-way-plot/package.json
@@ -32,7 +32,7 @@
     "reselect": "^4.0.0"
   },
   "peerDependencies": {
-    "react": "^16.7.0",
+    "react": "^16.9.0",
     "styled-components": "^4.2.0"
   }
 }
diff --git a/modules/stacked-calendar/package.json b/modules/stacked-calendar/package.json
@@ -17,7 +17,7 @@
   },
   "peerDependencies": {
     "prop-types": "^15.7.1",
-    "react": "^16.6.1",
+    "react": "^16.9.0",
     "reselect": "^3.0.1"
   },
   "publishConfig": {

diff --git a/package.json b/package.json
@@ -62,7 +62,8 @@
     "prettier": "^1.18.0",
     "prettier-eslint-cli": "^4.7.1",
     "puppeteer": "^1.9.0",
-    "react": "^16.7.0",
+    "react": "^16.9.0",
+    "react-redux": "^7.1.1",
     "react-test-renderer": "^16.5.2",
     "sass-loader": "^7.1.0",
     "source-map-loader": "^0.2.4",

diff --git a/website/package.json b/website/package.json
@@ -19,20 +19,20 @@
     "lint": "eslint src"
   },
   "dependencies": {
+    "antd": "^3.10.1",
     "global": "^4.3.2",
     "prop-types": "^15.6.2",
-    "react": "^16.7.0",
+    "react": "^16.9.0",
     "react-dom": "^16.5.2",
     "react-palm": "^3.1.2",
-    "react-redux": "^5.0.7",
-    "react-router": "^5.0.1",
-    "react-router-dom": "^5.0.1",
+    "react-redux": "^7.1.1",
+    "react-router": "^5.1.2",
+    "react-router-dom": "^5.1.2",
     "react-router-redux": "^4.0.8",
     "redux": "^4.0.0",
     "redux-actions": "^2.6.1",
     "redux-thunk": "^2.3.0",
-    "styled-components": "^4.0.0",
-    "antd": "^3.10.1"
+    "styled-components": "^4.0.0"
   },
   "devDependencies": {
     "webpack": "^4.27.1",

diff --git a/website/webpack.config.js b/website/webpack.config.js
@@ -22,6 +22,7 @@ const COMMON_CONFIG = {
   resolve: {
     alias: {
       react: resolve(NODE_MODULES, 'react'),
+      'react-redux': resolve(NODE_MODULES, 'react-redux'),
       'styled-components': resolve(NODE_MODULES, 'styled-components'),
       // Imports the manifold library from the src directory in this repo
       ...packageAliases(),