Merge branch 'dev'

Author: ryanflorence

.gitignore

@@ -14,4 +14,7 @@ node_modules/
 /packages/*/esm/
 /packages/*/umd/
 
+# compat module copies
+/packages/react-router-dom-v5-compat/react-router-dom
+
 .eslintcache

contributors.yml

@@ -40,6 +40,8 @@
 - paulsmithkc
 - petersendidit
 - RobHannay
+- ryanflorence
+- rtmann
 - sanketshah19
 - sergiodxa
 - shamsup

examples/auth/package.json

@@ -10,8 +10,8 @@
     "history": "^5.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-router-dom": "6.2.2",
-    "react-router": "6.2.2"
+    "react-router-dom": "6.3.0",
+    "react-router": "6.3.0"
   },
   "devDependencies": {
     "@rollup/plugin-replace": "^3.0.0",

examples/basic/package.json

@@ -10,8 +10,8 @@
     "history": "^5.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-router-dom": "6.2.2",
-    "react-router": "6.2.2"
+    "react-router-dom": "6.3.0",
+    "react-router": "6.3.0"
   },
   "devDependencies": {
     "@rollup/plugin-replace": "^2.2.1",

examples/custom-filter-link/package.json

@@ -11,8 +11,8 @@
     "history": "^5.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-router-dom": "6.2.2",
-    "react-router": "6.2.2"
+    "react-router-dom": "6.3.0",
+    "react-router": "6.3.0"
   },
   "devDependencies": {
     "@rollup/plugin-replace": "^3.0.0",

examples/custom-link/package.json

@@ -10,8 +10,8 @@
     "history": "^5.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-router-dom": "6.2.2",
-    "react-router": "6.2.2"
+    "react-router-dom": "6.3.0",
+    "react-router": "6.3.0"
   },
   "devDependencies": {
     "@rollup/plugin-replace": "^2.2.1",

examples/custom-query-parsing/package.json

@@ -11,8 +11,8 @@
     "jsurl": "0.1.5",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-router-dom": "6.2.2",
-    "react-router": "6.2.2"
+    "react-router-dom": "6.3.0",
+    "react-router": "6.3.0"
   },
   "devDependencies": {
     "@rollup/plugin-replace": "^2.2.1",

examples/lazy-loading/package.json

@@ -10,8 +10,8 @@
     "history": "^5.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-router-dom": "6.2.2",
-    "react-router": "6.2.2"
+    "react-router-dom": "6.3.0",
+    "react-router": "6.3.0"
   },
   "devDependencies": {
     "@rollup/plugin-replace": "^2.2.1",

examples/modal/package.json

@@ -11,8 +11,8 @@
     "history": "^5.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-router-dom": "6.2.2",
-    "react-router": "6.2.2"
+    "react-router-dom": "6.3.0",
+    "react-router": "6.3.0"
   },
   "devDependencies": {
     "@rollup/plugin-replace": "^2.2.1",

examples/multi-app/package.json

@@ -14,8 +14,8 @@
     "history": "^5.2.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-router-dom": "6.2.2",
-    "react-router": "6.2.2"
+    "react-router-dom": "6.3.0",
+    "react-router": "6.3.0"
   },
   "devDependencies": {
     "@rollup/plugin-replace": "^3.0.0",