Merge branch 'dev' into markdalgleish/vite-6-support

remix-run · Dec 19, 2024 · 4f83dcb · 4f83dcb
2 parents 3da8cfd + cbabd67
commit 4f83dcb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
@@ -21,8 +21,8 @@
   "dependencies": {
     "@remix-run/router": "1.21.0",
     "@remix-run/server-runtime": "workspace:*",
-    "react-router": "6.28.0",
-    "react-router-dom": "6.28.0",
+    "react-router": "6.28.1-pre.0",
+    "react-router-dom": "6.28.1-pre.0",
     "turbo-stream": "2.4.0"
   },
   "devDependencies": {

diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
@@ -22,7 +22,7 @@
     "@remix-run/node": "workspace:*",
     "@remix-run/react": "workspace:*",
     "@remix-run/router": "1.21.0",
-    "react-router-dom": "6.28.0"
+    "react-router-dom": "6.28.1-pre.0"
   },
   "devDependencies": {
     "@remix-run/server-runtime": "workspace:*",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/bump-router-versions.sh b/scripts/bump-router-versions.sh
@@ -24,26 +24,26 @@ fi
 set -x
 
 cd packages/remix-dev
-pnpm add -E @remix-run/router@${ROUTER_VERSION}
+npx pnpm@8 add -E @remix-run/router@${ROUTER_VERSION}
 cd ../..
 
 cd packages/remix-server-runtime
-pnpm add -E @remix-run/router@${ROUTER_VERSION}
+npx pnpm@8 add -E @remix-run/router@${ROUTER_VERSION}
 cd ../..
 
 cd packages/remix-react
-pnpm add -E @remix-run/router@${ROUTER_VERSION} react-router@${RR_VERSION} react-router-dom@${RR_VERSION}
+npx pnpm@8 add -E @remix-run/router@${ROUTER_VERSION} react-router@${RR_VERSION} react-router-dom@${RR_VERSION}
 cd ../..
 
 cd packages/remix-testing
-pnpm add -E @remix-run/router@${ROUTER_VERSION} react-router-dom@${RR_VERSION}
+npx pnpm@8 add -E @remix-run/router@${ROUTER_VERSION} react-router-dom@${RR_VERSION}
 cd ../..
 
 cd integration
-pnpm add -E @remix-run/router@${ROUTER_VERSION}
+npx pnpm@8 add -E @remix-run/router@${ROUTER_VERSION}
 cd ..
 
 # Because deplicates...
-pnpm dedupe && rm -rf ./node_modules && pnpm install
+npx pnpm@8 dedupe && rm -rf ./node_modules && npx pnpm@8 install
 
 set +x