Skip to content

Commit

Permalink
refactor: upgrade to remix 5.9.1
Browse files Browse the repository at this point in the history 
Ref #3284

Bumped remix to 5.9.1 and fixed remix version in cli templates
to avoid accidental install of higher remix version and conflicting
with specified versions.
  • Loading branch information
@TrySound
TrySound committed May 2, 2024
1 parent 8864524 commit 368608d
Show file tree
Hide file tree
Showing 19 changed files with 322 additions and 349 deletions.
18 changes: 9 additions & 9 deletions apps/builder/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,17 @@
"@radix-ui/react-tooltip": "^1.0.7",
"@react-aria/interactions": "^3.19.0",
"@react-aria/utils": "^3.21.0",
"@remix-run/cloudflare": "^2.8.1",
"@remix-run/node": "^2.8.1",
"@remix-run/react": "^2.8.1",
"@remix-run/serve": "^2.8.1",
"@remix-run/server-runtime": "^2.8.1",
"@remix-run/cloudflare": "^2.9.1",
"@remix-run/node": "^2.9.1",
"@remix-run/react": "^2.9.1",
"@remix-run/serve": "^2.9.1",
"@remix-run/server-runtime": "^2.9.1",
"@trpc/client": "^10.38.1",
"@trpc/server": "^10.38.1",
"@upstash/ratelimit": "^0.4.4",
"@vercel/edge": "^1.1.0",
"@vercel/kv": "^0.2.3",
"@vercel/remix": "2.8.1-patch.2",
"@vercel/remix": "2.9.1",
"@webstudio-is/ai": "workspace:*",
"@webstudio-is/asset-uploader": "workspace:*",
"@webstudio-is/authorization-token": "workspace:*",
Expand Down Expand Up @@ -127,7 +127,7 @@
"devDependencies": {
"@hono/node-server": "^1.2.0",
"@jest/globals": "^29.7.0",
"@remix-run/dev": "^2.8.1",
"@remix-run/dev": "^2.9.1",
"@storybook/addon-actions": "^7.4.0",
"@storybook/addon-essentials": "^7.4.0",
"@storybook/addon-links": "^7.4.0",
Expand All @@ -144,11 +144,11 @@
"@webstudio-is/tsconfig": "workspace:*",
"dotenv": "^16.3.1",
"html-tags": "^3.3.1",
"react-router-dom": "^6.22.3",
"react-router-dom": "^6.23.0",
"react-test-renderer": "18.3.0-canary-14898b6a9-20240318",
"type-fest": "^4.3.1",
"typescript": "5.4.5",
"vite": "^5.2.8"
"vite": "^5.2.11"
},
"sideEffects": false,
"license": "AGPL-3.0-or-later"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/webstudio-cloudflare-template/app/__generated__/[sitemap.xml].ts
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 16 additions & 16 deletions fixtures/webstudio-cloudflare-template/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,33 +26,33 @@
"node": ">=20.0.0"
},
"dependencies": {
"@remix-run/react": "^2.8.1",
"@remix-run/server-runtime": "^2.8.1",
"@remix-run/node": "^2.8.1",
"@webstudio-is/react-sdk": "workspace:*",
"@webstudio-is/sdk-components-react-radix": "workspace:*",
"@webstudio-is/sdk-components-react-remix": "workspace:*",
"@webstudio-is/sdk-components-react": "workspace:*",
"@remix-run/cloudflare": "2.9.1",
"@remix-run/cloudflare-pages": "2.9.1",
"@remix-run/node": "2.9.1",
"@remix-run/react": "2.9.1",
"@remix-run/server-runtime": "2.9.1",
"@webstudio-is/form-handlers": "workspace:*",
"@webstudio-is/image": "workspace:*",
"@webstudio-is/react-sdk": "workspace:*",
"@webstudio-is/sdk": "workspace:*",
"@webstudio-is/sdk-components-react": "workspace:*",
"@webstudio-is/sdk-components-react-radix": "workspace:*",
"@webstudio-is/sdk-components-react-remix": "workspace:*",
"isbot": "^4.1.0",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
"webstudio": "workspace:*",
"worktop": "0.8.0-next.18",
"zod": "^3.22.4",
"@remix-run/cloudflare": "^2.8.1",
"@remix-run/cloudflare-pages": "^2.8.1",
"webstudio": "workspace:*"
"zod": "^3.22.4"
},
"devDependencies": {
"@remix-run/dev": "^2.8.1",
"@cloudflare/workers-types": "^4.20240405.0",
"@remix-run/dev": "2.9.1",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
"miniflare": "^3.20231030.4",
"typescript": "5.4.5",
"vite": "^5.2.8",
"@cloudflare/workers-types": "^4.20240405.0",
"wrangler": "^3.48.0",
"miniflare": "^3.20231030.4"
"vite": "^5.2.11",
"wrangler": "^3.48.0"
}
}
2 changes: 1 addition & 1 deletion fixtures/webstudio-custom-template/app/__generated__/[sitemap.xml].ts
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions fixtures/webstudio-custom-template/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"private": true,
"sideEffects": false,
"dependencies": {
"@remix-run/node": "^2.8.1",
"@remix-run/react": "^2.8.1",
"@remix-run/server-runtime": "^2.8.1",
"@remix-run/node": "2.9.1",
"@remix-run/react": "2.9.1",
"@remix-run/server-runtime": "2.9.1",
"@size-limit/file": "^9.0.0",
"@webstudio-is/form-handlers": "workspace:*",
"@webstudio-is/image": "workspace:*",
Expand All @@ -31,12 +31,12 @@
"web-vitals": "^3.5.2"
},
"devDependencies": {
"@remix-run/dev": "^2.8.1",
"@remix-run/dev": "2.9.1",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
"typescript": "5.4.5",
"webstudio": "workspace:*",
"vite": "^5.2.8"
"vite": "^5.2.11",
"webstudio": "workspace:*"
},
"engines": {
"node": ">=20.0.0"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/[sitemap.xml].ts
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions fixtures/webstudio-remix-netlify-edge-functions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"fixtures:build": "webstudio build --template internal --template netlify-edge-functions --preview && pnpm prettier --write ./app/ ./package.json"
},
"dependencies": {
"@netlify/edge-functions": "^2.3.1",
"@netlify/remix-edge-adapter": "3.2.0",
"@remix-run/node": "^2.8.1",
"@remix-run/react": "^2.8.1",
"@remix-run/server-runtime": "^2.8.1",
"@netlify/edge-functions": "^2.6.0",
"@netlify/remix-edge-adapter": "^3.2.2",
"@remix-run/node": "2.9.1",
"@remix-run/react": "2.9.1",
"@remix-run/server-runtime": "2.9.1",
"@webstudio-is/form-handlers": "workspace:*",
"@webstudio-is/image": "workspace:*",
"@webstudio-is/react-sdk": "workspace:*",
Expand All @@ -29,12 +29,12 @@
"private": true,
"sideEffects": false,
"devDependencies": {
"@remix-run/dev": "^2.8.1",
"@remix-run/dev": "2.9.1",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
"typescript": "5.4.5",
"webstudio": "workspace:*",
"vite": "^5.2.8"
"vite": "^5.2.11",
"webstudio": "workspace:*"
},
"engines": {
"node": ">=20.0.0"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/webstudio-remix-netlify-functions/app/__generated__/[sitemap.xml].ts
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions fixtures/webstudio-remix-netlify-functions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
},
"dependencies": {
"@netlify/functions": "^2.6.0",
"@netlify/remix-adapter": "^2.3.0",
"@remix-run/node": "^2.8.1",
"@remix-run/react": "^2.8.1",
"@remix-run/server-runtime": "^2.8.1",
"@netlify/remix-adapter": "^2.3.1",
"@remix-run/node": "2.9.1",
"@remix-run/react": "2.9.1",
"@remix-run/server-runtime": "2.9.1",
"@webstudio-is/form-handlers": "workspace:*",
"@webstudio-is/image": "workspace:*",
"@webstudio-is/react-sdk": "workspace:*",
Expand All @@ -28,12 +28,12 @@
"private": true,
"sideEffects": false,
"devDependencies": {
"@remix-run/dev": "^2.8.1",
"@remix-run/dev": "2.9.1",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
"typescript": "5.4.5",
"webstudio": "workspace:*",
"vite": "^5.2.8"
"vite": "^5.2.11",
"webstudio": "workspace:*"
},
"engines": {
"node": ">=20.0.0"
Expand Down
4 changes: 2 additions & 2 deletions fixtures/webstudio-remix-vercel/app/__generated__/[sitemap.xml].ts
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions fixtures/webstudio-remix-vercel/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"private": true,
"sideEffects": false,
"dependencies": {
"@remix-run/node": "^2.8.1",
"@remix-run/react": "^2.8.1",
"@remix-run/server-runtime": "^2.8.1",
"@remix-run/node": "2.9.1",
"@remix-run/react": "2.9.1",
"@remix-run/server-runtime": "2.9.1",
"@webstudio-is/form-handlers": "workspace:*",
"@webstudio-is/image": "workspace:*",
"@webstudio-is/react-sdk": "workspace:*",
Expand All @@ -26,11 +26,11 @@
"react-dom": "18.3.0-canary-14898b6a9-20240318"
},
"devDependencies": {
"@remix-run/dev": "^2.8.1",
"@remix-run/dev": "2.9.1",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
"typescript": "5.4.5",
"vite": "^5.2.8",
"vite": "^5.2.11",
"webstudio": "workspace:*"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"storybook": "^7.4.0",
"tsx": "^4.7.2",
"typescript": "5.4.5",
"vite": "^5.2.8"
"vite": "^5.2.11"
},
"engines": {
"node": "20",
Expand Down
19 changes: 11 additions & 8 deletions packages/cli/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,26 @@
"zod": "^3.22.4"
},
"devDependencies": {
"@netlify/remix-adapter": "^2.3.0",
"@netlify/remix-edge-adapter": "3.2.0",
"@remix-run/cloudflare": "^2.8.1",
"@remix-run/cloudflare-pages": "^2.8.1",
"@remix-run/dev": "^2.8.1",
"@remix-run/node": "^2.8.1",
"@remix-run/react": "^2.8.1",
"@remix-run/server-runtime": "^2.8.1",
"@netlify/remix-adapter": "^2.3.1",
"@netlify/remix-edge-adapter": "3.2.2",
"@remix-run/cloudflare": "^2.9.1",
"@remix-run/cloudflare-pages": "^2.9.1",
"@remix-run/dev": "^2.9.1",
"@remix-run/node": "^2.9.1",
"@remix-run/react": "^2.9.1",
"@remix-run/server-runtime": "^2.9.1",
"@types/node": "^20.12.7",
"@types/prompts": "^2.4.5",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
"@types/yargs": "^17.0.32",
"@webstudio-is/form-handlers": "workspace:*",
"@webstudio-is/tsconfig": "workspace:*",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
"tsx": "^4.7.2",
"typescript": "5.4.5",
"vite": "^5.2.11",
"wrangler": "^3.48.0"
}
}
4 changes: 2 additions & 2 deletions packages/cli/templates/cloudflare/package.json
View file
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.8.1",
"@remix-run/cloudflare-pages": "^2.8.1",
"@remix-run/cloudflare": "2.9.1",
"@remix-run/cloudflare-pages": "2.9.1",
"isbot": "^4.1.0"
},
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions packages/cli/templates/defaults/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"typecheck": "tsc"
},
"dependencies": {
"@remix-run/react": "^2.8.1",
"@remix-run/server-runtime": "^2.8.1",
"@remix-run/node": "^2.8.1",
"@remix-run/node": "2.9.1",
"@remix-run/react": "2.9.1",
"@remix-run/server-runtime": "2.9.1",
"@webstudio-is/react-sdk": "0.145.0",
"@webstudio-is/sdk-components-react-radix": "0.145.0",
"@webstudio-is/sdk-components-react-remix": "0.145.0",
Expand All @@ -23,11 +23,11 @@
"react-dom": "18.3.0-canary-14898b6a9-20240318"
},
"devDependencies": {
"@remix-run/dev": "^2.8.1",
"@remix-run/dev": "2.9.1",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
"typescript": "5.4.5",
"vite": "^5.2.8"
"vite": "^5.2.11"
},
"engines": {
"node": ">=20.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/templates/netlify-edge-functions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"start": "netlify serve"
},
"dependencies": {
"@netlify/edge-functions": "^2.3.1",
"@netlify/remix-edge-adapter": "3.2.0"
"@netlify/edge-functions": "^2.6.0",
"@netlify/remix-edge-adapter": "^3.2.2"
}
}
2 changes: 1 addition & 1 deletion packages/cli/templates/netlify-functions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
},
"dependencies": {
"@netlify/functions": "^2.6.0",
"@netlify/remix-adapter": "^2.3.0"
"@netlify/remix-adapter": "^2.3.1"
}
}
4 changes: 2 additions & 2 deletions packages/sdk-components-react-remix/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"checks": "pnpm typecheck"
},
"peerDependencies": {
"@remix-run/react": "^2.8.1",
"@remix-run/react": "^2.9.1",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318"
},
Expand All @@ -52,7 +52,7 @@
"@webstudio-is/sdk-components-react": "workspace:*"
},
"devDependencies": {
"@remix-run/react": "^2.8.1",
"@remix-run/react": "^2.9.1",
"@types/node": "^20.12.7",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
Expand Down
Loading

0 comments on commit 368608d

Please sign in to comment.