Merge pull request #5149 from withspectrum/update-reactt-router

Update react router
withspectrum · Jun 4, 2019 · 8a0f907 · 8a0f907
2 parents 68f2ca6 + c030702
commit 8a0f907
Show file tree

Hide file tree

Showing 5 changed files with 2,416 additions and 2,411 deletions.
diff --git a/api/package.json b/api/package.json
@@ -95,16 +95,16 @@
     "raven": "^2.6.4",
     "react": "^15.4.1",
     "react-app-rewire-styled-components": "^3.0.2",
-    "react-app-rewired": "^1.6.2",
+    "react-app-rewired": "1.6.2",
     "react-dom": "^15.4.1",
     "react-helmet": "5.x",
     "react-infinite-scroller-with-scroll-element": "^1.0.4",
     "react-loadable": "5.2.2",
     "react-modal": "^3.8.1",
     "react-redux": "^5.1.1",
     "react-remarkable": "^1.1.1",
-    "react-router": "^4.0.0-beta.7",
-    "react-router-dom": "^4.0.0-beta.7",
+    "react-router": "4.x",
+    "react-router-dom": "4.x",
     "react-textarea-autosize": "^4.0.5",
     "react-transition-group": "^2.9.0",
     "react-trend": "^1.2.5",
@@ -139,4 +139,4 @@
   "scripts": {
     "start": "NODE_ENV=production node main.js"
   }
-}
+}