Merge branch 'dev' into markdalgleish/pnpm

remix-run · Mar 5, 2024 · f6b9f60 · f6b9f60
2 parents a6ae740 + 77b1e55
commit f6b9f60
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 32 deletions.
diff --git a/.changeset/tasty-stingrays-work.md b/.changeset/tasty-stingrays-work.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/react": patch
+---
+
+[REMOVE] Bump router
diff --git a/docs/future/spa-mode.md b/docs/future/spa-mode.md
@@ -58,15 +58,15 @@ export default defineConfig({
 In SPA Mode, you develop the same way you would for a traditional Remix SSR app, and you actually use a running Remix dev server in order to enable HMR/HDR:
 
 ```sh
-remix vite:dev
+npx remix vite:dev
 ```
 
 ### Production
 
 When you build your app in SPA Mode, Remix will call the server handler for the `/` route and save the rendered HTML in an `index.html` file alongside your client side assets (by default `build/client/index.html`).
 
 ```sh
-remix vite:build
+npx remix vite:build
 ```
 
 #### Preview

diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
@@ -32,7 +32,7 @@
     "@mdx-js/mdx": "^2.3.0",
     "@npmcli/package-json": "^4.0.1",
     "@remix-run/node": "workspace:*",
-    "@remix-run/router": "1.15.2",
+    "@remix-run/router": "1.15.3-pre.0",
     "@remix-run/server-runtime": "workspace:*",
     "@types/mdx": "^2.0.5",
     "@vanilla-extract/integration": "^6.2.0",

diff --git a/packages/remix-react/package.json b/packages/remix-react/package.json
@@ -19,10 +19,10 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@remix-run/router": "1.15.2",
+    "@remix-run/router": "1.15.3-pre.0",
     "@remix-run/server-runtime": "workspace:*",
-    "react-router": "6.22.2",
-    "react-router-dom": "6.22.2"
+    "react-router": "6.22.3-pre.0",
+    "react-router-dom": "6.22.3-pre.0"
   },
   "devDependencies": {
     "@remix-run/node": "workspace:*",

diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
@@ -19,7 +19,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@remix-run/router": "1.15.2",
+    "@remix-run/router": "1.15.3-pre.0",
     "@types/cookie": "^0.6.0",
     "@web3-storage/multipart-parser": "^1.0.0",
     "cookie": "^0.6.0",

diff --git a/packages/remix-testing/package.json b/packages/remix-testing/package.json
@@ -21,8 +21,8 @@
   "dependencies": {
     "@remix-run/node": "workspace:*",
     "@remix-run/react": "workspace:*",
-    "@remix-run/router": "1.15.2",
-    "react-router-dom": "6.22.2"
+    "@remix-run/router": "1.15.3-pre.0",
+    "react-router-dom": "6.22.3-pre.0"
   },
   "devDependencies": {
     "@remix-run/server-runtime": "workspace:*",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml