From 6bc9e43ae3a597ffeab759e9b2ba2c0853c4fee8 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 29 Jun 2023 18:59:36 -0400
Subject: [PATCH] Bump router to 6.14.1-pre.0 (#6727)

---
 .changeset/stale-houses-grin.md     |  5 +++++
 packages/remix-react/package.json   |  2 +-
 packages/remix-testing/package.json |  2 +-
 scripts/bump-router-versions.sh     | 25 ++++++++++++++++---------
 yarn.lock                           | 18 +++++++++---------
 5 files changed, 32 insertions(+), 20 deletions(-)
 create mode 100644 .changeset/stale-houses-grin.md

diff --git a/.changeset/stale-houses-grin.md b/.changeset/stale-houses-grin.md
new file mode 100644
index 00000000000..3d178235a1f
--- /dev/null
+++ b/.changeset/stale-houses-grin.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+Bump router version
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
index 243e0cb8636..26302de3bee 100644
--- a/packages/remix-react/package.json
+++ b/packages/remix-react/package.json
@@ -17,7 +17,7 @@
   "module": "dist/esm/index.js",
   "dependencies": {
     "@remix-run/router": "1.7.0",
-    "react-router-dom": "6.14.0"
+    "react-router-dom": "6.14.1-pre.0"
   },
   "devDependencies": {
     "@remix-run/server-runtime": "1.18.1-pre.0",
diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
index d7929a1e610..a3cc3eb4fc0 100644
--- a/packages/remix-testing/package.json
+++ b/packages/remix-testing/package.json
@@ -19,7 +19,7 @@
     "@remix-run/node": "1.18.1-pre.0",
     "@remix-run/react": "1.18.1-pre.0",
     "@remix-run/router": "1.7.0",
-    "react-router-dom": "6.14.0"
+    "react-router-dom": "6.14.1-pre.0"
   },
   "devDependencies": {
     "@types/node": "^18.11.9",
diff --git a/scripts/bump-router-versions.sh b/scripts/bump-router-versions.sh
index fae157781fe..f4226ae6c47 100755
--- a/scripts/bump-router-versions.sh
+++ b/scripts/bump-router-versions.sh
@@ -1,13 +1,20 @@
 #!/bin/bash
 
-VERSION="${1}"
-
-if [ "${VERSION}" == "" ]; then
-  VERSION="latest"
+ROUTER_VERSION="${1}"
+RR_VERSION="${2}"
+
+if [ "${ROUTER_VERSION}" == "" ]; then
+  ROUTER_VERSION="latest"
+  RR_VERSION="latest"
+elif [ "${RR_VERSION}" == "" ]; then
+  RR_VERSION="${ROUTER_VERSION}"
 fi
 
-echo "Updating all router versions to ${VERSION}"
 
+echo "Updating the React Router dependencies to the following versions:"
+echo "  @remix-run/router -> ${ROUTER_VERSION}"
+echo "  react-router-dom -> ${RR_VERSION}"
+echo ""
 
 if [ ! -d "packages/remix-server-runtime" ]; then
   echo "Must be run from the remix repository"
@@ -17,19 +24,19 @@ fi
 set -x
 
 cd packages/remix-server-runtime
-yarn add -E @remix-run/router@${VERSION}
+yarn add -E @remix-run/router@${ROUTER_VERSION}
 cd ../..
 
 # cd packages/remix-express
-# yarn add -E @remix-run/router@${VERSION}
+# yarn add -E @remix-run/router@${ROUTER_VERSION}
 # cd ../..
 
 cd packages/remix-react
-yarn add -E @remix-run/router@${VERSION} react-router-dom@${VERSION}
+yarn add -E @remix-run/router@${ROUTER_VERSION} react-router-dom@${RR_VERSION}
 cd ../..
 
 cd packages/remix-testing
-yarn add -E @remix-run/router@${VERSION} react-router-dom@${VERSION}
+yarn add -E @remix-run/router@${ROUTER_VERSION} react-router-dom@${RR_VERSION}
 cd ../..
 
 set +x
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 728c688b74e..abcd75157fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11442,18 +11442,18 @@ react-refresh@^0.14.0:
   resolved "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz"
   integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==
 
-react-router-dom@6.14.0:
-  version "6.14.0"
-  resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.0.tgz#7ce6c3f73549e4d40216ba150253d3bf30812b33"
-  integrity sha512-YEwlApKwzMMMbGbhh+Q7MsloTldcwMgHxUY/1g0uA62+B1hZo2jsybCWIDCL8zvIDB1FA0pBKY9chHbZHt+2dQ==
+react-router-dom@6.14.1-pre.0:
+  version "6.14.1-pre.0"
+  resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.1-pre.0.tgz#db17b6665f0646a4238d651d2a5270836a422dfe"
+  integrity sha512-KOny98EwcKcE00sSQavChIBoNJddD9ICbAvNqus3FxOGHl9G20tTEg8JwohLH7m1Kx7EMr7PnOMNm+9SKSSumg==
   dependencies:
     "@remix-run/router" "1.7.0"
-    react-router "6.14.0"
+    react-router "6.14.1-pre.0"
 
-react-router@6.14.0:
-  version "6.14.0"
-  resolved "https://registry.npmjs.org/react-router/-/react-router-6.14.0.tgz#1c3e8e922d934d43a253fd862c72c82167c0a7f1"
-  integrity sha512-OD+vkrcGbvlwkspUFDgMzsu1RXwdjNh83YgG/28lBnDzgslhCgxIqoExLlxsfTpIygp7fc+Hd3esloNwzkm2xA==
+react-router@6.14.1-pre.0:
+  version "6.14.1-pre.0"
+  resolved "https://registry.npmjs.org/react-router/-/react-router-6.14.1-pre.0.tgz#d25fd534ce3bf091a11a890daa1de1cbb3f1410b"
+  integrity sha512-UbwepIQFZtJw91rm+bjaHW3VIflrho41kjwFVsc6kZq9g8FxaBppeGVKbzUdcmDVQAHChv0FPrlfL5o1mDyKAQ==
   dependencies:
     "@remix-run/router" "1.7.0"