Bump react-router (elastic#69608)

# Conflicts: # x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/overview.test.tsx.snap
patrykkopycinski · Jun 29, 2020 · 1b05a24 · 1b05a24
1 parent 9131273
commit 1b05a24
Show file tree

Hide file tree

Showing 29 changed files with 1,910 additions and 827 deletions.
diff --git a/package.json b/package.json
@@ -79,7 +79,6 @@
   "resolutions": {
     "**/@types/node": ">=10.17.17 <10.20.0",
     "**/@types/react": "^16.9.36",
-    "**/@types/react-router": "^5.1.3",
     "**/@types/hapi": "^17.0.18",
     "**/@types/angular": "^1.6.56",
     "**/@types/hoist-non-react-statics": "^3.3.1",
@@ -242,8 +241,8 @@
     "react-monaco-editor": "~0.27.0",
     "react-redux": "^7.2.0",
     "react-resize-detector": "^4.2.0",
-    "react-router": "^5.1.2",
-    "react-router-dom": "^5.1.2",
+    "react-router": "^5.2.0",
+    "react-router-dom": "^5.2.0",
     "react-sizeme": "^2.3.6",
     "react-use": "^13.27.0",
     "reactcss": "1.2.3",
@@ -372,8 +371,8 @@
     "@types/react-grid-layout": "^0.16.7",
     "@types/react-redux": "^7.1.9",
     "@types/react-resize-detector": "^4.0.1",
-    "@types/react-router": "^5.1.3",
-    "@types/react-router-dom": "^5.1.3",
+    "@types/react-router": "^5.1.7",
+    "@types/react-router-dom": "^5.1.5",
     "@types/react-virtualized": "^9.18.7",
     "@types/recompose": "^0.30.6",
     "@types/redux-actions": "^2.6.1",

diff --git a/packages/kbn-ui-shared-deps/package.json b/packages/kbn-ui-shared-deps/package.json
@@ -26,8 +26,8 @@
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "react-intl": "^2.8.0",
-    "react-router": "^5.1.2",
-    "react-router-dom": "^5.1.2",
+    "react-router": "^5.2.0",
+    "react-router-dom": "^5.2.0",
     "regenerator-runtime": "^0.13.3",
     "rxjs": "^6.5.5",
     "symbol-observable": "^1.2.0",

diff --git a/x-pack/package.json b/x-pack/package.json
@@ -100,7 +100,7 @@
     "@types/react-beautiful-dnd": "^12.1.1",
     "@types/react-dom": "^16.9.8",
     "@types/react-redux": "^7.1.9",
-    "@types/react-router-dom": "^5.1.3",
+    "@types/react-router-dom": "^5.1.5",
     "@types/react-sticky": "^6.0.3",
     "@types/react-test-renderer": "^16.9.1",
     "@types/recompose": "^0.30.6",
@@ -329,8 +329,8 @@
     "react-portal": "^3.2.0",
     "react-redux": "^7.2.0",
     "react-reverse-portal": "^1.0.4",
-    "react-router": "^5.1.2",
-    "react-router-dom": "^5.1.2",
+    "react-router": "^5.2.0",
+    "react-router-dom": "^5.2.0",
     "react-shortcuts": "^2.0.0",
     "react-sticky": "^6.0.3",
     "react-syntax-highlighter": "^5.7.0",

diff --git a/...uptime/public/components/certificates/__tests__/__snapshots__/cert_monitors.test.tsx.snap b/...uptime/public/components/certificates/__tests__/__snapshots__/cert_monitors.test.tsx.snap
diff --git a/...s/uptime/public/components/certificates/__tests__/__snapshots__/cert_search.test.tsx.snap b/...s/uptime/public/components/certificates/__tests__/__snapshots__/cert_search.test.tsx.snap
diff --git a/...s/uptime/public/components/certificates/__tests__/__snapshots__/cert_status.test.tsx.snap b/...s/uptime/public/components/certificates/__tests__/__snapshots__/cert_status.test.tsx.snap
diff --git a/...me/public/components/certificates/__tests__/__snapshots__/certificates_list.test.tsx.snap b/...me/public/components/certificates/__tests__/__snapshots__/certificates_list.test.tsx.snap