refactor: upgrade remix and react-router

TrySound · TrySound · commit 2d37631bf5a2 · 2025-05-01T21:36:21.000+04:00
This should fix a few vulnerabilities in react-router and vite
diff --git a/apps/builder/package.json b/apps/builder/package.json
@@ -47,10 +47,10 @@
     "@radix-ui/react-tooltip": "^1.2.4",
     "@react-aria/interactions": "^3.23.0",
     "@react-aria/utils": "^3.27.0",
-    "@remix-run/node": "^2.16.4",
-    "@remix-run/react": "^2.16.4",
-    "@remix-run/serve": "^2.16.4",
-    "@remix-run/server-runtime": "^2.16.4",
+    "@remix-run/node": "^2.16.5",
+    "@remix-run/react": "^2.16.5",
+    "@remix-run/serve": "^2.16.5",
+    "@remix-run/server-runtime": "^2.16.5",
     "@trpc/client": "^10.45.2",
     "@trpc/server": "^10.45.2",
     "@tsndr/cloudflare-worker-jwt": "^2.5.3",
@@ -125,7 +125,7 @@
     "zod-validation-error": "^3.4.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "^2.16.4",
+    "@remix-run/dev": "^2.16.5",
     "@types/debug": "^4.1.12",
     "@types/dom-navigation": "^1.0.5",
     "@types/react": "^18.2.70",
@@ -137,7 +137,7 @@
     "react-test-renderer": "18.3.0-canary-14898b6a9-20240318",
     "type-fest": "^4.37.0",
     "typescript": "5.8.2",
-    "vite": "^6.3.3",
+    "vite": "^6.3.4",
     "vitest": "^3.1.2"
   },
   "sideEffects": false,
diff --git a/fixtures/react-router-docker/package.json b/fixtures/react-router-docker/package.json
@@ -10,10 +10,10 @@
     "fixtures:build": "pnpm cli build --template docker --template .template && pnpm prettier --write ./app/ ./package.json ./tsconfig.json"
   },
   "dependencies": {
-    "@react-router/dev": "^7.5.0",
-    "@react-router/fs-routes": "^7.5.0",
-    "@react-router/node": "^7.5.0",
-    "@react-router/serve": "^7.5.0",
+    "@react-router/dev": "^7.5.3",
+    "@react-router/fs-routes": "^7.5.3",
+    "@react-router/node": "^7.5.3",
+    "@react-router/serve": "^7.5.3",
     "@webstudio-is/image": "workspace:*",
     "@webstudio-is/react-sdk": "workspace:*",
     "@webstudio-is/sdk": "workspace:*",
@@ -26,8 +26,8 @@
     "isbot": "^5.1.25",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
-    "react-router": "^7.5.0",
-    "vite": "^6.3.3",
+    "react-router": "^7.5.3",
+    "vite": "^6.3.4",
     "webstudio": "workspace:*"
   },
   "private": true,
diff --git a/fixtures/react-router-netlify/package.json b/fixtures/react-router-netlify/package.json
@@ -13,9 +13,9 @@
   },
   "dependencies": {
     "@netlify/vite-plugin-react-router": "^1.0.1",
-    "@react-router/dev": "^7.5.0",
-    "@react-router/fs-routes": "^7.5.0",
-    "@react-router/node": "^7.5.0",
+    "@react-router/dev": "^7.5.3",
+    "@react-router/fs-routes": "^7.5.3",
+    "@react-router/node": "^7.5.3",
     "@webstudio-is/image": "workspace:*",
     "@webstudio-is/react-sdk": "workspace:*",
     "@webstudio-is/sdk": "workspace:*",
@@ -26,8 +26,8 @@
     "isbot": "^5.1.25",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
-    "react-router": "^7.5.0",
-    "vite": "^6.3.3",
+    "react-router": "^7.5.3",
+    "vite": "^6.3.4",
     "webstudio": "workspace:*"
   },
   "type": "module",
diff --git a/fixtures/react-router-vercel/package.json b/fixtures/react-router-vercel/package.json
@@ -11,9 +11,9 @@
     "deploy": "npx vercel deploy"
   },
   "dependencies": {
-    "@react-router/dev": "^7.5.0",
-    "@react-router/fs-routes": "^7.5.0",
-    "@react-router/node": "^7.5.0",
+    "@react-router/dev": "^7.5.3",
+    "@react-router/fs-routes": "^7.5.3",
+    "@react-router/node": "^7.5.3",
     "@vercel/react-router": "^1.1.0",
     "@webstudio-is/image": "workspace:*",
     "@webstudio-is/react-sdk": "workspace:*",
@@ -25,8 +25,8 @@
     "isbot": "^5.1.25",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
-    "react-router": "^7.5.0",
-    "vite": "^6.3.3",
+    "react-router": "^7.5.3",
+    "vite": "^6.3.4",
     "webstudio": "workspace:*"
   },
   "private": true,
diff --git a/fixtures/ssg-netlify-by-project-id/package.json b/fixtures/ssg-netlify-by-project-id/package.json
@@ -27,7 +27,7 @@
     "@vitejs/plugin-react": "^4.4.1",
     "prettier": "3.5.3",
     "typescript": "5.8.2",
-    "vite": "^6.3.3",
+    "vite": "^6.3.4",
     "webstudio": "workspace:*"
   },
   "dependencies": {
@@ -40,6 +40,6 @@
     "@webstudio-is/sdk-components-react-remix": "workspace:*",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
-    "vike": "^0.4.228"
+    "vike": "^0.4.229"
   }
 }
diff --git a/fixtures/ssg/package.json b/fixtures/ssg/package.json
@@ -27,7 +27,7 @@
     "@vitejs/plugin-react": "^4.4.1",
     "prettier": "3.5.3",
     "typescript": "5.8.2",
-    "vite": "^6.3.3",
+    "vite": "^6.3.4",
     "webstudio": "workspace:*"
   },
   "dependencies": {
@@ -40,6 +40,6 @@
     "@webstudio-is/sdk-components-react-remix": "workspace:*",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
-    "vike": "^0.4.228"
+    "vike": "^0.4.229"
   }
 }
diff --git a/fixtures/webstudio-cloudflare-template/package.json b/fixtures/webstudio-cloudflare-template/package.json
@@ -27,11 +27,11 @@
     "node": ">=20.0.0"
   },
   "dependencies": {
-    "@remix-run/cloudflare": "2.16.4",
-    "@remix-run/cloudflare-pages": "2.16.4",
-    "@remix-run/node": "2.16.4",
-    "@remix-run/react": "2.16.4",
-    "@remix-run/server-runtime": "2.16.4",
+    "@remix-run/cloudflare": "2.16.5",
+    "@remix-run/cloudflare-pages": "2.16.5",
+    "@remix-run/node": "2.16.5",
+    "@remix-run/react": "2.16.5",
+    "@remix-run/server-runtime": "2.16.5",
     "@webstudio-is/image": "workspace:*",
     "@webstudio-is/react-sdk": "workspace:*",
     "@webstudio-is/sdk": "workspace:*",
@@ -48,12 +48,12 @@
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20240620.0",
-    "@remix-run/dev": "2.16.4",
+    "@remix-run/dev": "2.16.5",
     "@types/react": "^18.2.70",
     "@types/react-dom": "^18.2.25",
     "fast-glob": "^3.3.2",
     "typescript": "5.8.2",
-    "vite": "^6.3.3",
+    "vite": "^6.3.4",
     "wrangler": "^3.63.2"
   }
 }
diff --git a/fixtures/webstudio-features/package.json b/fixtures/webstudio-features/package.json
@@ -13,9 +13,9 @@
   "sideEffects": false,
   "dependencies": {
     "@miniflare/html-rewriter": "^2.14.4",
-    "@react-router/dev": "^7.5.0",
-    "@react-router/fs-routes": "^7.5.0",
-    "@react-router/node": "^7.5.0",
+    "@react-router/dev": "^7.5.3",
+    "@react-router/fs-routes": "^7.5.3",
+    "@react-router/node": "^7.5.3",
     "@webstudio-is/image": "workspace:*",
     "@webstudio-is/react-sdk": "workspace:*",
     "@webstudio-is/sdk": "workspace:*",
@@ -26,8 +26,8 @@
     "isbot": "^5.1.25",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
-    "react-router": "^7.5.0",
-    "vite": "^6.3.3",
+    "react-router": "^7.5.3",
+    "vite": "^6.3.4",
     "webstudio": "workspace:*"
   },
   "devDependencies": {
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "tsx": "^4.19.3",
     "typescript": "5.8.2",
     "typescript-eslint": "^8.26.1",
-    "vite": "^6.3.3"
+    "vite": "^6.3.4"
   },
   "engines": {
     "node": "20",
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -49,14 +49,14 @@
   },
   "devDependencies": {
     "@netlify/vite-plugin-react-router": "^1.0.1",
-    "@react-router/dev": "^7.5.0",
-    "@react-router/fs-routes": "^7.5.0",
-    "@remix-run/cloudflare": "^2.16.4",
-    "@remix-run/cloudflare-pages": "^2.16.4",
-    "@remix-run/dev": "^2.16.4",
-    "@remix-run/node": "^2.16.4",
-    "@remix-run/react": "^2.16.4",
-    "@remix-run/server-runtime": "^2.16.4",
+    "@react-router/dev": "^7.5.3",
+    "@react-router/fs-routes": "^7.5.3",
+    "@remix-run/cloudflare": "^2.16.5",
+    "@remix-run/cloudflare-pages": "^2.16.5",
+    "@remix-run/dev": "^2.16.5",
+    "@remix-run/node": "^2.16.5",
+    "@remix-run/react": "^2.16.5",
+    "@remix-run/server-runtime": "^2.16.5",
     "@types/react": "^18.2.70",
     "@types/react-dom": "^18.2.25",
     "@types/yargs": "^17.0.33",
@@ -78,10 +78,10 @@
     "prettier": "3.5.3",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
-    "react-router": "^7.5.0",
+    "react-router": "^7.5.3",
     "ts-expect": "^1.3.0",
-    "vike": "^0.4.228",
-    "vite": "^6.3.3",
+    "vike": "^0.4.229",
+    "vite": "^6.3.4",
     "vitest": "^3.1.2",
     "wrangler": "^3.63.2"
   }
diff --git a/packages/cli/templates/cloudflare/package.json b/packages/cli/templates/cloudflare/package.json
@@ -12,8 +12,8 @@
     "build-cf-types": "wrangler types"
   },
   "dependencies": {
-    "@remix-run/cloudflare": "2.16.4",
-    "@remix-run/cloudflare-pages": "2.16.4"
+    "@remix-run/cloudflare": "2.16.5",
+    "@remix-run/cloudflare-pages": "2.16.5"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20240620.0",
diff --git a/packages/cli/templates/defaults/package.json b/packages/cli/templates/defaults/package.json
@@ -8,9 +8,9 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@remix-run/node": "2.16.4",
-    "@remix-run/react": "2.16.4",
-    "@remix-run/server-runtime": "2.16.4",
+    "@remix-run/node": "2.16.5",
+    "@remix-run/react": "2.16.5",
+    "@remix-run/server-runtime": "2.16.5",
     "@webstudio-is/image": "0.0.0-webstudio-version",
     "@webstudio-is/react-sdk": "0.0.0-webstudio-version",
     "@webstudio-is/sdk": "0.0.0-webstudio-version",
@@ -23,11 +23,11 @@
     "react-dom": "18.3.0-canary-14898b6a9-20240318"
   },
   "devDependencies": {
-    "@remix-run/dev": "2.16.4",
+    "@remix-run/dev": "2.16.5",
     "@types/react": "^18.2.70",
     "@types/react-dom": "^18.2.25",
     "typescript": "5.8.2",
-    "vite": "^6.3.3"
+    "vite": "^6.3.4"
   },
   "engines": {
     "node": ">=20.0.0"
diff --git a/packages/cli/templates/react-router-docker/package.json b/packages/cli/templates/react-router-docker/package.json
@@ -3,8 +3,8 @@
     "start": "react-router-serve ./build/server/index.js"
   },
   "dependencies": {
-    "@react-router/node": "^7.5.0",
-    "@react-router/serve": "^7.5.0",
+    "@react-router/node": "^7.5.3",
+    "@react-router/serve": "^7.5.3",
     "h3": "^1.15.1",
     "ipx": "^3.0.3"
   }
diff --git a/packages/cli/templates/react-router-netlify/package.json b/packages/cli/templates/react-router-netlify/package.json
@@ -5,6 +5,6 @@
   },
   "dependencies": {
     "@netlify/vite-plugin-react-router": "^1.0.1",
-    "@react-router/node": "^7.5.0"
+    "@react-router/node": "^7.5.3"
   }
 }
diff --git a/packages/cli/templates/react-router-vercel/package.json b/packages/cli/templates/react-router-vercel/package.json
@@ -3,7 +3,7 @@
     "deploy": "npx vercel deploy"
   },
   "dependencies": {
-    "@react-router/node": "^7.5.0",
+    "@react-router/node": "^7.5.3",
     "@vercel/react-router": "^1.1.0"
   }
 }
diff --git a/packages/cli/templates/react-router/package.json b/packages/cli/templates/react-router/package.json
@@ -8,8 +8,8 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@react-router/dev": "^7.5.0",
-    "@react-router/fs-routes": "^7.5.0",
+    "@react-router/dev": "^7.5.3",
+    "@react-router/fs-routes": "^7.5.3",
     "@webstudio-is/image": "0.0.0-webstudio-version",
     "@webstudio-is/react-sdk": "0.0.0-webstudio-version",
     "@webstudio-is/sdk": "0.0.0-webstudio-version",
@@ -20,8 +20,8 @@
     "isbot": "^5.1.25",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
-    "react-router": "^7.5.0",
-    "vite": "^6.3.3"
+    "react-router": "^7.5.3",
+    "vite": "^6.3.4"
   },
   "devDependencies": {
     "@types/react": "^18.2.70",
diff --git a/packages/cli/templates/ssg/package.json b/packages/cli/templates/ssg/package.json
@@ -16,14 +16,14 @@
     "@webstudio-is/sdk-components-react-radix": "0.0.0-webstudio-version",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
-    "vike": "^0.4.228"
+    "vike": "^0.4.229"
   },
   "devDependencies": {
     "@types/react": "^18.2.70",
     "@types/react-dom": "^18.2.25",
     "@vitejs/plugin-react": "^4.4.1",
     "typescript": "5.8.2",
-    "vite": "^6.3.3"
+    "vite": "^6.3.4"
   },
   "engines": {
     "node": ">=20.0.0"
diff --git a/packages/sdk-components-react-remix/package.json b/packages/sdk-components-react-remix/package.json
@@ -45,7 +45,7 @@
     "@webstudio-is/sdk-components-react": "workspace:*"
   },
   "devDependencies": {
-    "@remix-run/react": "^2.16.4",
+    "@remix-run/react": "^2.16.5",
     "@types/react": "^18.2.70",
     "@types/react-dom": "^18.2.25",
     "@webstudio-is/tsconfig": "workspace:*",
diff --git a/packages/sdk-components-react-router/package.json b/packages/sdk-components-react-router/package.json
@@ -42,7 +42,7 @@
     "@webstudio-is/react-sdk": "workspace:*",
     "@webstudio-is/sdk": "workspace:*",
     "@webstudio-is/sdk-components-react": "workspace:*",
-    "react-router": "^7.5.0"
+    "react-router": "^7.5.3"
   },
   "devDependencies": {
     "@types/react": "^18.2.70",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
