Skip to content
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

refactor: upgrade remix #4669

Merged
merged 1 commit into from
Dec 29, 2024
Merged

refactor: upgrade remix #4669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions apps/builder/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@
"@radix-ui/react-tooltip": "^1.1.6",
"@react-aria/interactions": "^3.22.4",
"@react-aria/utils": "^3.25.3",
"@remix-run/node": "^2.15.0",
"@remix-run/react": "^2.15.0",
"@remix-run/serve": "^2.15.0",
"@remix-run/server-runtime": "^2.15.0",
"@remix-run/node": "^2.15.2",
"@remix-run/react": "^2.15.2",
"@remix-run/serve": "^2.15.2",
"@remix-run/server-runtime": "^2.15.2",
"@trpc/client": "^10.45.2",
"@trpc/server": "^10.45.2",
"@tsndr/cloudflare-worker-jwt": "^2.5.3",
"@vercel/remix": "2.15.0",
"@vercel/remix": "2.15.2",
"@webstudio-is/ai": "workspace:*",
"@webstudio-is/asset-uploader": "workspace:*",
"@webstudio-is/authorization-token": "workspace:*",
Expand Down Expand Up @@ -87,7 +87,7 @@
"fast-deep-equal": "^3.1.3",
"immer": "^10.1.1",
"immerhin": "^0.10.0",
"isbot": "^5.1.17",
"isbot": "^5.1.19",
"lexical": "^0.21.0",
"match-sorter": "^8.0.0",
"mdast-util-from-markdown": "^2.0.1",
Expand Down Expand Up @@ -122,14 +122,14 @@
"zod-validation-error": "^3.3.1"
},
"devDependencies": {
"@remix-run/dev": "^2.15.0",
"@remix-run/dev": "^2.15.2",
"@types/debug": "^4.1.12",
"@types/dom-navigation": "^1.0.4",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
"@webstudio-is/tsconfig": "workspace:*",
"html-tags": "^4.0.0",
"react-router-dom": "^6.28.0",
"react-router-dom": "^6.28.1",
"react-test-renderer": "18.3.0-canary-14898b6a9-20240318",
"type-fest": "^4.31.0",
"typescript": "5.7.2",
Expand Down
7 changes: 7 additions & 0 deletions apps/builder/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ export default defineConfig(({ mode }) => {
plugins: [
remix({
presets: [vercelPreset()],
future: {
v3_lazyRouteDiscovery: false,
v3_relativeSplatPath: false,
v3_singleFetch: false,
v3_fetcherPersist: false,
v3_throwAbortReason: false,
},
}),
{
name: "request-timing-logger",
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -39,6 +39,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.206"
"vike": "^0.4.210"
}
}
2 changes: 1 addition & 1 deletion fixtures/ssg/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,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.206"
"vike": "^0.4.210"
}
}
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,18 +27,18 @@
"node": ">=20.0.0"
},
"dependencies": {
"@remix-run/cloudflare": "2.15.0",
"@remix-run/cloudflare-pages": "2.15.0",
"@remix-run/node": "2.15.0",
"@remix-run/react": "2.15.0",
"@remix-run/server-runtime": "2.15.0",
"@remix-run/cloudflare": "2.15.2",
"@remix-run/cloudflare-pages": "2.15.2",
"@remix-run/node": "2.15.2",
"@remix-run/react": "2.15.2",
"@remix-run/server-runtime": "2.15.2",
"@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": "^5.1.17",
"isbot": "^5.1.19",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
"webstudio": "workspace:*",
Expand All @@ -47,7 +47,7 @@
},
"devDependencies": {
"@cloudflare/workers-types": "^4.20240620.0",
"@remix-run/dev": "2.15.0",
"@remix-run/dev": "2.15.2",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
"typescript": "5.7.2",
Expand Down
10 changes: 9 additions & 1 deletion fixtures/webstudio-cloudflare-template/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ export default defineConfig(({ mode }) => ({
plugins: [
// without this, remixCloudflareDevProxy trying to load workerd even for production (it's not needed for production)
mode === "production" ? undefined : remixCloudflareDevProxy(),
remix(),
remix({
future: {
v3_lazyRouteDiscovery: false,
v3_relativeSplatPath: false,
v3_singleFetch: false,
v3_fetcherPersist: false,
v3_throwAbortReason: false,
},
}),
].filter(Boolean),
}));
10 changes: 5 additions & 5 deletions fixtures/webstudio-custom-template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@
"private": true,
"sideEffects": false,
"dependencies": {
"@remix-run/node": "2.15.0",
"@remix-run/react": "2.15.0",
"@remix-run/server-runtime": "2.15.0",
"@remix-run/node": "2.15.2",
"@remix-run/react": "2.15.2",
"@remix-run/server-runtime": "2.15.2",
"@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": "^5.1.17",
"isbot": "^5.1.19",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
"web-vitals": "^3.5.2"
},
"devDependencies": {
"@remix-run/dev": "2.15.0",
"@remix-run/dev": "2.15.2",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
"typescript": "5.7.2",
Expand Down
12 changes: 11 additions & 1 deletion fixtures/webstudio-custom-template/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,15 @@ import { defineConfig } from "vite";
import { vitePlugin as remix } from "@remix-run/dev";

export default defineConfig({
plugins: [remix()],
plugins: [
remix({
future: {
v3_lazyRouteDiscovery: false,
v3_relativeSplatPath: false,
v3_singleFetch: false,
v3_fetcherPersist: false,
v3_throwAbortReason: false,
},
}),
],
});
10 changes: 5 additions & 5 deletions fixtures/webstudio-remix-netlify-edge-functions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@
"dependencies": {
"@netlify/edge-functions": "^2.11.1",
"@netlify/remix-edge-adapter": "^3.4.2",
"@remix-run/node": "2.15.0",
"@remix-run/react": "2.15.0",
"@remix-run/server-runtime": "2.15.0",
"@remix-run/node": "2.15.2",
"@remix-run/react": "2.15.2",
"@remix-run/server-runtime": "2.15.2",
"@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": "^5.1.17",
"isbot": "^5.1.19",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318"
},
"private": true,
"sideEffects": false,
"devDependencies": {
"@remix-run/dev": "2.15.0",
"@remix-run/dev": "2.15.2",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
"typescript": "5.7.2",
Expand Down
13 changes: 12 additions & 1 deletion fixtures/webstudio-remix-netlify-edge-functions/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,16 @@ import { defineConfig } from "vite";
import { netlifyPlugin } from "@netlify/remix-edge-adapter/plugin";

export default defineConfig({
plugins: [remix(), netlifyPlugin()],
plugins: [
remix({
future: {
v3_lazyRouteDiscovery: false,
v3_relativeSplatPath: false,
v3_singleFetch: false,
v3_fetcherPersist: false,
v3_throwAbortReason: false,
},
}),
netlifyPlugin(),
],
});
10 changes: 5 additions & 5 deletions fixtures/webstudio-remix-netlify-functions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@
"dependencies": {
"@netlify/functions": "^2.8.2",
"@netlify/remix-adapter": "^2.5.1",
"@remix-run/node": "2.15.0",
"@remix-run/react": "2.15.0",
"@remix-run/server-runtime": "2.15.0",
"@remix-run/node": "2.15.2",
"@remix-run/react": "2.15.2",
"@remix-run/server-runtime": "2.15.2",
"@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": "^5.1.17",
"isbot": "^5.1.19",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318"
},
"private": true,
"sideEffects": false,
"devDependencies": {
"@remix-run/dev": "2.15.0",
"@remix-run/dev": "2.15.2",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
"typescript": "5.7.2",
Expand Down
13 changes: 12 additions & 1 deletion fixtures/webstudio-remix-netlify-functions/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,16 @@ import { defineConfig } from "vite";
import { netlifyPlugin } from "@netlify/remix-adapter/plugin";

export default defineConfig({
plugins: [remix(), netlifyPlugin()],
plugins: [
remix({
future: {
v3_lazyRouteDiscovery: false,
v3_relativeSplatPath: false,
v3_singleFetch: false,
v3_fetcherPersist: false,
v3_throwAbortReason: false,
},
}),
netlifyPlugin(),
],
});
10 changes: 5 additions & 5 deletions fixtures/webstudio-remix-vercel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
"private": true,
"sideEffects": false,
"dependencies": {
"@remix-run/node": "2.15.0",
"@remix-run/react": "2.15.0",
"@remix-run/server-runtime": "2.15.0",
"@remix-run/node": "2.15.2",
"@remix-run/react": "2.15.2",
"@remix-run/server-runtime": "2.15.2",
"@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": "^5.1.17",
"isbot": "^5.1.19",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318"
},
"devDependencies": {
"@remix-run/dev": "2.15.0",
"@remix-run/dev": "2.15.2",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
"typescript": "5.7.2",
Expand Down
12 changes: 11 additions & 1 deletion fixtures/webstudio-remix-vercel/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,15 @@ import { defineConfig } from "vite";
import { vitePlugin as remix } from "@remix-run/dev";

export default defineConfig({
plugins: [remix()],
plugins: [
remix({
future: {
v3_lazyRouteDiscovery: false,
v3_relativeSplatPath: false,
v3_singleFetch: false,
v3_fetcherPersist: false,
v3_throwAbortReason: false,
},
}),
],
});
14 changes: 7 additions & 7 deletions packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@
"devDependencies": {
"@netlify/remix-adapter": "^2.5.1",
"@netlify/remix-edge-adapter": "3.4.2",
"@remix-run/cloudflare": "^2.15.0",
"@remix-run/cloudflare-pages": "^2.15.0",
"@remix-run/dev": "^2.15.0",
"@remix-run/node": "^2.15.0",
"@remix-run/react": "^2.15.0",
"@remix-run/server-runtime": "^2.15.0",
"@remix-run/cloudflare": "^2.15.2",
"@remix-run/cloudflare-pages": "^2.15.2",
"@remix-run/dev": "^2.15.2",
"@remix-run/node": "^2.15.2",
"@remix-run/react": "^2.15.2",
"@remix-run/server-runtime": "^2.15.2",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
"@types/yargs": "^17.0.33",
Expand All @@ -68,7 +68,7 @@
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
"ts-expect": "^1.3.0",
"vike": "^0.4.206",
"vike": "^0.4.210",
"vite": "^5.4.11",
"vitest": "^2.1.8",
"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.15.0",
"@remix-run/cloudflare-pages": "2.15.0"
"@remix-run/cloudflare": "2.15.2",
"@remix-run/cloudflare-pages": "2.15.2"
},
"devDependencies": {
"@cloudflare/workers-types": "^4.20240620.0",
Expand Down
10 changes: 9 additions & 1 deletion packages/cli/templates/cloudflare/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ export default defineConfig(({ mode }) => ({
plugins: [
// without this, remixCloudflareDevProxy trying to load workerd even for production (it's not needed for production)
mode === "production" ? undefined : remixCloudflareDevProxy(),
remix(),
remix({
future: {
v3_lazyRouteDiscovery: false,
v3_relativeSplatPath: false,
v3_singleFetch: false,
v3_fetcherPersist: false,
v3_throwAbortReason: false,
},
}),
].filter(Boolean),
}));
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,21 +8,21 @@
"typecheck": "tsc"
},
"dependencies": {
"@remix-run/node": "2.15.0",
"@remix-run/react": "2.15.0",
"@remix-run/server-runtime": "2.15.0",
"@remix-run/node": "2.15.2",
"@remix-run/react": "2.15.2",
"@remix-run/server-runtime": "2.15.2",
"@webstudio-is/react-sdk": "0.0.0-webstudio-version",
"@webstudio-is/sdk-components-react-radix": "0.0.0-webstudio-version",
"@webstudio-is/sdk-components-react-remix": "0.0.0-webstudio-version",
"@webstudio-is/sdk-components-react": "0.0.0-webstudio-version",
"@webstudio-is/image": "0.0.0-webstudio-version",
"@webstudio-is/sdk": "0.0.0-webstudio-version",
"isbot": "^5.1.17",
"isbot": "^5.1.19",
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318"
},
"devDependencies": {
"@remix-run/dev": "2.15.0",
"@remix-run/dev": "2.15.2",
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
"typescript": "5.7.2",
Expand Down
Loading
Loading