Skip to content

refactor: upgrade remix and react-router #5177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 1, 2025
Merged

refactor: upgrade remix and react-router #5177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d37631
refactor: upgrade remix and react-router
TrySound May 1, 2025
f88983c
Bump limits
TrySound May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ jobs:
}
const results = [
await assertSize('./fixtures/ssg/dist/client', 356),
await assertSize('./fixtures/react-router-netlify/build/client', 368),
await assertSize('./fixtures/webstudio-features/build/client', 1052),
await assertSize('./fixtures/react-router-netlify/build/client', 376),
await assertSize('./fixtures/webstudio-features/build/client', 1056),
]
for (const result of results) {
if (result.passed) {
Expand Down
12 changes: 6 additions & 6 deletions apps/builder/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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,
Expand Down
12 changes: 6 additions & 6 deletions fixtures/react-router-docker/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:*",
Expand All @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions fixtures/react-router-netlify/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:*",
Expand All @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions fixtures/react-router-vercel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:*",
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions fixtures/ssg-netlify-by-project-id/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
}
}
4 changes: 2 additions & 2 deletions fixtures/ssg/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
}
}
14 changes: 7 additions & 7 deletions fixtures/webstudio-cloudflare-template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:*",
Expand All @@ -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"
}
}
10 changes: 5 additions & 5 deletions fixtures/webstudio-features/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:*",
Expand All @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
22 changes: 11 additions & 11 deletions packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/templates/cloudflare/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions packages/cli/templates/defaults/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/templates/react-router-docker/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/templates/react-router-netlify/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/cli/templates/react-router-vercel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
8 changes: 4 additions & 4 deletions packages/cli/templates/react-router/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/templates/ssg/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk-components-react-remix/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk-components-react-router/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading