From 6d0757e32ab5d63a518a054c4ddbfebfb6955f74 Mon Sep 17 00:00:00 2001 From: Bogdan Chadkin Date: Fri, 24 Jan 2025 21:50:46 +0700 Subject: [PATCH] experimental: add missing pieces to docker template --- fixtures/react-router-docker/Dockerfile | 5 +- fixtures/react-router-docker/package.json | 12 +- .../ssg-netlify-by-project-id/package.json | 2 +- fixtures/ssg/package.json | 2 +- packages/cli/package.json | 10 +- .../templates/react-router-docker/Dockerfile | 5 +- .../react-router-docker/app/routes.ts | 4 + .../react-router-docker/package.json | 11 +- packages/cli/templates/ssg/package.json | 2 +- .../sdk-components-react-router/package.json | 2 +- pnpm-lock.yaml | 176 +++++++++--------- 11 files changed, 125 insertions(+), 106 deletions(-) create mode 100644 packages/cli/templates/react-router-docker/app/routes.ts diff --git a/fixtures/react-router-docker/Dockerfile b/fixtures/react-router-docker/Dockerfile index 073fa8d17f05..0261c3c4df33 100644 --- a/fixtures/react-router-docker/Dockerfile +++ b/fixtures/react-router-docker/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /app RUN npm install FROM node:22-alpine AS production-dependencies-env -COPY ./package.json package-lock.json /app/ +COPY .npmrc ./package.json /app/ WORKDIR /app RUN npm install --omit=dev @@ -15,9 +15,10 @@ WORKDIR /app RUN npm run build FROM node:22-alpine -COPY ./package.json package-lock.json /app/ +COPY .npmrc ./package.json /app/ COPY --from=production-dependencies-env /app/node_modules /app/node_modules COPY --from=build-env /app/build /app/build +COPY --from=build-env /app/public /app/public WORKDIR /app # there is a DOMAINS env with comma separated allowed domains for image processing CMD ["npm", "run", "start"] diff --git a/fixtures/react-router-docker/package.json b/fixtures/react-router-docker/package.json index 9644b513f2a5..d57a867d7731 100644 --- a/fixtures/react-router-docker/package.json +++ b/fixtures/react-router-docker/package.json @@ -10,10 +10,10 @@ "fixtures:build": "pnpm cli build --template react-router-docker --template .template && pnpm prettier --write ./app/ ./package.json ./tsconfig.json" }, "dependencies": { - "@react-router/dev": "^7.1.1", - "@react-router/fs-routes": "^7.1.1", - "@react-router/node": "^7.1.1", - "@react-router/serve": "^7.1.1", + "@react-router/dev": "^7.1.3", + "@react-router/fs-routes": "^7.1.3", + "@react-router/node": "^7.1.3", + "@react-router/serve": "^7.1.3", "@webstudio-is/image": "workspace:*", "@webstudio-is/react-sdk": "workspace:*", "@webstudio-is/sdk": "workspace:*", @@ -21,12 +21,12 @@ "@webstudio-is/sdk-components-react": "workspace:*", "@webstudio-is/sdk-components-react-radix": "workspace:*", "@webstudio-is/sdk-components-react-router": "workspace:*", - "h3": "^1.13.1", + "h3": "^1.14.0", "ipx": "^3.0.1", "isbot": "^5.1.19", "react": "18.3.0-canary-14898b6a9-20240318", "react-dom": "18.3.0-canary-14898b6a9-20240318", - "react-router": "^7.1.1", + "react-router": "^7.1.3", "vite": "^5.4.11", "webstudio": "workspace:*" }, diff --git a/fixtures/ssg-netlify-by-project-id/package.json b/fixtures/ssg-netlify-by-project-id/package.json index 97d2309c2f48..96b409b7bcc9 100644 --- a/fixtures/ssg-netlify-by-project-id/package.json +++ b/fixtures/ssg-netlify-by-project-id/package.json @@ -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.210" + "vike": "^0.4.218" } } diff --git a/fixtures/ssg/package.json b/fixtures/ssg/package.json index f60fff2a805e..4eedc3ed0fb7 100644 --- a/fixtures/ssg/package.json +++ b/fixtures/ssg/package.json @@ -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.210" + "vike": "^0.4.218" } } diff --git a/packages/cli/package.json b/packages/cli/package.json index bd40eaee0e94..9bc1cb424421 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -31,7 +31,7 @@ "node": ">=20.12" }, "dependencies": { - "@clack/prompts": "^0.9.0", + "@clack/prompts": "^0.9.1", "@emotion/hash": "^0.9.2", "acorn": "^8.14.0", "acorn-walk": "^8.3.4", @@ -52,7 +52,7 @@ "devDependencies": { "@netlify/remix-adapter": "^2.5.1", "@netlify/remix-edge-adapter": "3.4.2", - "@react-router/dev": "^7.1.1", + "@react-router/dev": "^7.1.3", "@remix-run/cloudflare": "^2.15.2", "@remix-run/cloudflare-pages": "^2.15.2", "@remix-run/dev": "^2.15.2", @@ -73,13 +73,13 @@ "@webstudio-is/sdk-components-react-remix": "workspace:*", "@webstudio-is/sdk-components-react-router": "workspace:*", "@webstudio-is/tsconfig": "workspace:*", - "h3": "^1.13.1", + "h3": "^1.14.0", "ipx": "^3.0.1", "prettier": "3.4.2", "react-dom": "18.3.0-canary-14898b6a9-20240318", - "react-router": "^7.1.1", + "react-router": "^7.1.3", "ts-expect": "^1.3.0", - "vike": "^0.4.210", + "vike": "^0.4.218", "vite": "^5.4.11", "vitest": "^3.0.2", "wrangler": "^3.63.2" diff --git a/packages/cli/templates/react-router-docker/Dockerfile b/packages/cli/templates/react-router-docker/Dockerfile index 073fa8d17f05..0261c3c4df33 100644 --- a/packages/cli/templates/react-router-docker/Dockerfile +++ b/packages/cli/templates/react-router-docker/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /app RUN npm install FROM node:22-alpine AS production-dependencies-env -COPY ./package.json package-lock.json /app/ +COPY .npmrc ./package.json /app/ WORKDIR /app RUN npm install --omit=dev @@ -15,9 +15,10 @@ WORKDIR /app RUN npm run build FROM node:22-alpine -COPY ./package.json package-lock.json /app/ +COPY .npmrc ./package.json /app/ COPY --from=production-dependencies-env /app/node_modules /app/node_modules COPY --from=build-env /app/build /app/build +COPY --from=build-env /app/public /app/public WORKDIR /app # there is a DOMAINS env with comma separated allowed domains for image processing CMD ["npm", "run", "start"] diff --git a/packages/cli/templates/react-router-docker/app/routes.ts b/packages/cli/templates/react-router-docker/app/routes.ts new file mode 100644 index 000000000000..4c05936cb638 --- /dev/null +++ b/packages/cli/templates/react-router-docker/app/routes.ts @@ -0,0 +1,4 @@ +import { type RouteConfig } from "@react-router/dev/routes"; +import { flatRoutes } from "@react-router/fs-routes"; + +export default flatRoutes() satisfies RouteConfig; diff --git a/packages/cli/templates/react-router-docker/package.json b/packages/cli/templates/react-router-docker/package.json index 3e235c6e5c1e..0c52f281dcec 100644 --- a/packages/cli/templates/react-router-docker/package.json +++ b/packages/cli/templates/react-router-docker/package.json @@ -5,12 +5,14 @@ "scripts": { "build": "react-router build", "dev": "react-router dev", + "start": "react-router-serve ./build/server/index.js", "typecheck": "tsc" }, "dependencies": { - "@react-router/dev": "^7.1.1", - "@react-router/fs-routes": "^7.1.1", - "@react-router/node": "^7.1.1", + "@react-router/dev": "^7.1.3", + "@react-router/fs-routes": "^7.1.3", + "@react-router/node": "^7.1.3", + "@react-router/serve": "^7.1.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", @@ -18,11 +20,12 @@ "@webstudio-is/sdk-components-react-radix": "0.0.0-webstudio-version", "@webstudio-is/sdk-components-react-router": "0.0.0-webstudio-version", "@webstudio-is/sdk-components-react": "0.0.0-webstudio-version", - "h3": "^1.13.1", + "h3": "^1.14.0", "ipx": "^3.0.1", "isbot": "^5.1.19", "react": "18.3.0-canary-14898b6a9-20240318", "react-dom": "18.3.0-canary-14898b6a9-20240318", + "react-router": "^7.1.3", "vite": "^5.4.11" }, "devDependencies": { diff --git a/packages/cli/templates/ssg/package.json b/packages/cli/templates/ssg/package.json index 6a5c2b2daddc..ba84764486d5 100644 --- a/packages/cli/templates/ssg/package.json +++ b/packages/cli/templates/ssg/package.json @@ -16,7 +16,7 @@ "@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.210" + "vike": "^0.4.218" }, "devDependencies": { "@types/react": "^18.2.70", diff --git a/packages/sdk-components-react-router/package.json b/packages/sdk-components-react-router/package.json index 91ba1d3f31ef..665be31953cd 100644 --- 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.1.1" + "react-router": "^7.1.3" }, "devDependencies": { "@types/react": "^18.2.70", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bf4ac289103d..6a9b21459eff 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -474,17 +474,17 @@ importers: fixtures/react-router-docker: dependencies: '@react-router/dev': - specifier: ^7.1.1 - version: 7.1.1(@react-router/serve@7.1.1(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3))(@types/node@22.10.7)(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3)(vite@5.4.11(@types/node@22.10.7))(wrangler@3.63.2(@cloudflare/workers-types@4.20240701.0)) + specifier: ^7.1.3 + version: 7.1.3(@react-router/serve@7.1.3(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3))(@types/node@22.10.7)(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3)(vite@5.4.11(@types/node@22.10.7))(wrangler@3.63.2(@cloudflare/workers-types@4.20240701.0)) '@react-router/fs-routes': - specifier: ^7.1.1 - version: 7.1.1(@react-router/dev@7.1.1(@react-router/serve@7.1.1(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3))(@types/node@22.10.7)(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3)(vite@5.4.11(@types/node@22.10.7))(wrangler@3.63.2(@cloudflare/workers-types@4.20240701.0)))(typescript@5.7.3) + specifier: ^7.1.3 + version: 7.1.3(@react-router/dev@7.1.3(@react-router/serve@7.1.3(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3))(@types/node@22.10.7)(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3)(vite@5.4.11(@types/node@22.10.7))(wrangler@3.63.2(@cloudflare/workers-types@4.20240701.0)))(typescript@5.7.3) '@react-router/node': - specifier: ^7.1.1 - version: 7.1.1(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3) + specifier: ^7.1.3 + version: 7.1.3(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3) '@react-router/serve': - specifier: ^7.1.1 - version: 7.1.1(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3) + specifier: ^7.1.3 + version: 7.1.3(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3) '@webstudio-is/image': specifier: workspace:* version: link:../../packages/image @@ -507,8 +507,8 @@ importers: specifier: workspace:* version: link:../../packages/sdk-components-react-router h3: - specifier: ^1.13.1 - version: 1.13.1 + specifier: ^1.14.0 + version: 1.14.0 ipx: specifier: ^3.0.1 version: 3.0.1 @@ -522,8 +522,8 @@ importers: specifier: 18.3.0-canary-14898b6a9-20240318 version: 18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318) react-router: - specifier: ^7.1.1 - version: 7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318) + specifier: ^7.1.3 + version: 7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318) vite: specifier: ^5.4.11 version: 5.4.11(@types/node@22.10.7) @@ -571,8 +571,8 @@ importers: specifier: 18.3.0-canary-14898b6a9-20240318 version: 18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318) vike: - specifier: ^0.4.210 - version: 0.4.210(react-streaming@0.3.42(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(vite@5.4.11(@types/node@22.10.7)) + specifier: ^0.4.218 + version: 0.4.218(react-streaming@0.3.42(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(vite@5.4.11(@types/node@22.10.7)) devDependencies: '@types/react': specifier: ^18.2.70 @@ -626,8 +626,8 @@ importers: specifier: 18.3.0-canary-14898b6a9-20240318 version: 18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318) vike: - specifier: ^0.4.210 - version: 0.4.210(react-streaming@0.3.42(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(vite@5.4.11(@types/node@22.10.7)) + specifier: ^0.4.218 + version: 0.4.218(react-streaming@0.3.42(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(vite@5.4.11(@types/node@22.10.7)) devDependencies: '@types/react': specifier: ^18.2.70 @@ -1103,8 +1103,8 @@ importers: packages/cli: dependencies: '@clack/prompts': - specifier: ^0.9.0 - version: 0.9.0 + specifier: ^0.9.1 + version: 0.9.1 '@emotion/hash': specifier: ^0.9.2 version: 0.9.2 @@ -1161,8 +1161,8 @@ importers: specifier: 3.4.2 version: 3.4.2(@remix-run/react@2.15.2(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318)(typescript@5.7.3))(@remix-run/serve@2.15.2(typescript@5.7.3))(@remix-run/server-runtime@2.15.2(typescript@5.7.3))(@types/node@22.10.7)(typescript@5.7.3)(vite@5.4.11(@types/node@22.10.7))(wrangler@3.63.2(@cloudflare/workers-types@4.20240701.0)) '@react-router/dev': - specifier: ^7.1.1 - version: 7.1.1(@react-router/serve@7.1.1(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3))(@types/node@22.10.7)(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3)(vite@5.4.11(@types/node@22.10.7))(wrangler@3.63.2(@cloudflare/workers-types@4.20240701.0)) + specifier: ^7.1.3 + version: 7.1.3(@react-router/serve@7.1.3(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3))(@types/node@22.10.7)(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3)(vite@5.4.11(@types/node@22.10.7))(wrangler@3.63.2(@cloudflare/workers-types@4.20240701.0)) '@remix-run/cloudflare': specifier: ^2.15.2 version: 2.15.2(@cloudflare/workers-types@4.20240701.0)(typescript@5.7.3) @@ -1224,8 +1224,8 @@ importers: specifier: workspace:* version: link:../tsconfig h3: - specifier: ^1.13.1 - version: 1.13.1 + specifier: ^1.14.0 + version: 1.14.0 ipx: specifier: ^3.0.1 version: 3.0.1 @@ -1236,14 +1236,14 @@ importers: specifier: 18.3.0-canary-14898b6a9-20240318 version: 18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318) react-router: - specifier: ^7.1.1 - version: 7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318) + specifier: ^7.1.3 + version: 7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318) ts-expect: specifier: ^1.3.0 version: 1.3.0 vike: - specifier: ^0.4.210 - version: 0.4.210(react-streaming@0.3.42(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(vite@5.4.11(@types/node@22.10.7)) + specifier: ^0.4.218 + version: 0.4.218(react-streaming@0.3.42(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(vite@5.4.11(@types/node@22.10.7)) vite: specifier: ^5.4.11 version: 5.4.11(@types/node@22.10.7) @@ -2144,8 +2144,8 @@ importers: specifier: workspace:* version: link:../sdk-components-react react-router: - specifier: ^7.1.1 - version: 7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318) + specifier: ^7.1.3 + version: 7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318) devDependencies: '@types/react': specifier: ^18.2.70 @@ -2455,11 +2455,11 @@ packages: '@brillout/vite-plugin-server-entry@0.5.6': resolution: {integrity: sha512-lxgvTQhQBucZehhkvq9x2C7IUfrkAhp+YkW8S0MVR5EYkf6EWBg+bYZWB0//mDfbmUcc8aAEe3uRto7pOg35Ig==} - '@clack/core@0.4.0': - resolution: {integrity: sha512-YJCYBsyJfNDaTbvDUVSJ3SgSuPrcujarRgkJ5NLjexDZKvaOiVVJvAQYx8lIgG0qRT8ff0fPgqyBCVivanIZ+A==} + '@clack/core@0.4.1': + resolution: {integrity: sha512-Pxhij4UXg8KSr7rPek6Zowm+5M22rbd2g1nfojHJkxp5YkFqiZ2+YLEM/XGVIzvGOcM0nqjIFxrpDwWRZYWYjA==} - '@clack/prompts@0.9.0': - resolution: {integrity: sha512-nGsytiExgUr4FL0pR/LeqxA28nz3E0cW7eLTSh3Iod9TGrbBt8Y7BHbV3mmkNC4G0evdYyQ3ZsbiBkk7ektArA==} + '@clack/prompts@0.9.1': + resolution: {integrity: sha512-JIpyaboYZeWYlyP0H+OoPPxd6nqueG/CmN6ixBiNFsIDHREevjIf0n0Ohh5gr5C8pEDknzgvz+pIJ8dMhzWIeg==} '@cloudflare/kv-asset-handler@0.1.3': resolution: {integrity: sha512-FNcunDuTmEfQTLRLtA6zz+buIXUHj1soPvSWzzQFBC+n2lsy+CGf/NIrR3SEPCmsVNQj70/Jx2lViCpq+09YpQ==} @@ -4619,13 +4619,13 @@ packages: peerDependencies: react: 18.3.0-canary-14898b6a9-20240318 - '@react-router/dev@7.1.1': - resolution: {integrity: sha512-+UCrQZBAmdRcC7Bx1ho89T/DeP+FzEErkzrTvdBCpstr8AzOQ6mKlaglXGty15o3fgihBSFF4/J67jGveYIR8Q==} + '@react-router/dev@7.1.3': + resolution: {integrity: sha512-BPdIk4m8shjfynnkFeR30eH6aawpFHZiWqccWXNFgmFjKBcTQe/j7QTKi6gchceXDau0j2fSLciQ07rYrIGdhw==} engines: {node: '>=20.0.0'} hasBin: true peerDependencies: - '@react-router/serve': ^7.1.1 - react-router: ^7.1.1 + '@react-router/serve': ^7.1.3 + react-router: ^7.1.3 typescript: ^5.1.0 vite: ^5.1.0 || ^6.0.0 wrangler: ^3.28.2 @@ -4637,43 +4637,43 @@ packages: wrangler: optional: true - '@react-router/express@7.1.1': - resolution: {integrity: sha512-oiL2ADor3byuh7piajLTPr6007GmVPZ1Gh4HiN0uuZlz3vQ1rd0xZMSD9LnSrXhsrKEbPFaeCk8E2O67ZoABsg==} + '@react-router/express@7.1.3': + resolution: {integrity: sha512-uaES20anbbqnkObwx8PtU2/gLqCI+CCbAAMxM8P3yMIHFtsxLmd2cwjJ9Spab8TSFRGZNPhpBpLJeqygKtUvUQ==} engines: {node: '>=20.0.0'} peerDependencies: express: ^4.17.1 - react-router: 7.1.1 + react-router: 7.1.3 typescript: ^5.1.0 peerDependenciesMeta: typescript: optional: true - '@react-router/fs-routes@7.1.1': - resolution: {integrity: sha512-FXe4d5sKRwa3Yj1xz4rtnxpmwG1IENr+Jd8fQd4IxbC6u/HJrIURacq1l83cTr62Uerf5N4h3v3pGgDEmmGwcg==} + '@react-router/fs-routes@7.1.3': + resolution: {integrity: sha512-pn6rwAFhRQ8QDNPH0kqooLGZrE7pLAhvqTZSjU1C9Mi4GlVOKo9ohnoPs1Cts2H+2tNvLGaQmT63N/jfKNZFTQ==} engines: {node: '>=20.0.0'} peerDependencies: - '@react-router/dev': ^7.1.1 + '@react-router/dev': ^7.1.3 typescript: ^5.1.0 peerDependenciesMeta: typescript: optional: true - '@react-router/node@7.1.1': - resolution: {integrity: sha512-5X79SfJ1IEEsttt0oo9rhO9kgxXyBTKdVBsz3h0WHTkRzbRk0VEpVpBW3PQ1RpkgEaAHwJ8obVl4k4brdDSExA==} + '@react-router/node@7.1.3': + resolution: {integrity: sha512-xNyPafKkjd5Tyn0/6ZR14Q6ky5+ucEfAWYI+0phu2/DUFjovLLguTQ3G9QDbpL6zzb6wtpX0uYJCtLnbsXJ+xg==} engines: {node: '>=20.0.0'} peerDependencies: - react-router: 7.1.1 + react-router: 7.1.3 typescript: ^5.1.0 peerDependenciesMeta: typescript: optional: true - '@react-router/serve@7.1.1': - resolution: {integrity: sha512-rhV1yp72ZZQn4giQUzUiLVo/7/7dhxD98Z5pdDm6mKOTJPGoQ8TBPccQaKxzJIFNRHcn0sEdehfLOxl5ydnUKw==} + '@react-router/serve@7.1.3': + resolution: {integrity: sha512-Wxtrv5bUgE+AznN0JM12dg5lTMZDr4lhS7wRiHe8OgATes/EuLc8URnU7kGfoE/1OEbeadX49Qpw8qVSqMHeEQ==} engines: {node: '>=20.0.0'} hasBin: true peerDependencies: - react-router: 7.1.1 + react-router: 7.1.3 '@react-stately/utils@3.10.5': resolution: {integrity: sha512-iMQSGcpaecghDIh3mZEpZfoFH3ExBwTtuBEcvZ2XnGzCgQjeYXcMdIUwAfVQLXFTdHUHGF6Gu6/dFrYsCzySBQ==} @@ -5862,6 +5862,9 @@ packages: crossws@0.3.1: resolution: {integrity: sha512-HsZgeVYaG+b5zA+9PbIPGq4+J/CJynJuearykPsXx4V/eMhyQ5EDVg3Ak2FBZtVXCiOLu/U7IiwDHTr9MA+IKw==} + crossws@0.3.2: + resolution: {integrity: sha512-S2PpQHRcgYABOS2465b34wqTOn5dbLL+iSvyweJYGGFLDsKq88xrjDXUiEhfYkhWZq1HuS6of3okRHILbkrqxw==} + crypt@0.0.2: resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==} @@ -6576,8 +6579,8 @@ packages: resolution: {integrity: sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==} hasBin: true - h3@1.13.1: - resolution: {integrity: sha512-u/z6Z4YY+ANZ05cRRfsFJadTBrNA6e3jxdU+AN5UCbZSZEUwgHiwjvUEe0k1NoQmAvQmETwr+xB5jd7mhCJuIQ==} + h3@1.14.0: + resolution: {integrity: sha512-ao22eiONdgelqcnknw0iD645qW0s9NnrJHr5OBz4WOMdBdycfSas1EQf1wXRsm+PcB2Yoj43pjBPwqIpJQTeWg==} has-bigints@1.0.2: resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==} @@ -8140,8 +8143,8 @@ packages: peerDependencies: react: 18.3.0-canary-14898b6a9-20240318 - react-router@7.1.1: - resolution: {integrity: sha512-39sXJkftkKWRZ2oJtHhCxmoCrBCULr/HAH4IT5DHlgu/Q0FCPV0S4Lx+abjDTx/74xoZzNYDYbOZWlJjruyuDQ==} + react-router@7.1.3: + resolution: {integrity: sha512-EezYymLY6Guk/zLQ2vRA8WvdUhWFEj5fcE3RfWihhxXBW7+cd1LsIiA3lmx+KCmneAGQuyBv820o44L2+TtkSA==} engines: {node: '>=20.0.0'} peerDependencies: react: 18.3.0-canary-14898b6a9-20240318 @@ -9154,8 +9157,8 @@ packages: vfile@5.3.6: resolution: {integrity: sha512-ADBsmerdGBs2WYckrLBEmuETSPyTD4TuLxTrw0DvjirxW1ra4ZwkbzG8ndsv3Q57smvHxo677MHaQrY9yxH8cA==} - vike@0.4.210: - resolution: {integrity: sha512-+X2Gl1OJz0L6GIDSk+1wlkFSDY/BCqLihbTsO76HukxOq6JIHLC0wYb9UgNek3ruU4jSUtwSe4nOdchyiy8+kw==} + vike@0.4.218: + resolution: {integrity: sha512-6VffMYCXWZD/cKD/2ta5Tn5k7A6ezs0Q/T7o+UpJtDtcYPgWcelZyHyR03BoVaz+DPPIpeDL6JHgRS4A8vQa7g==} engines: {node: '>=18.0.0'} hasBin: true peerDependencies: @@ -9164,6 +9167,8 @@ packages: peerDependenciesMeta: react-streaming: optional: true + vite: + optional: true vite-node@1.6.0: resolution: {integrity: sha512-de6HJgzC+TFzOu0NTC4RAIsyf/DY/ibWDYQUcuEA84EMHhcefTUGkjFHKKEJhQN4A+6I0u++kr3l36ZF2d7XRw==} @@ -9741,14 +9746,14 @@ snapshots: '@brillout/import': 0.2.3 '@brillout/picocolors': 1.0.15 - '@clack/core@0.4.0': + '@clack/core@0.4.1': dependencies: picocolors: 1.1.1 sisteransi: 1.0.5 - '@clack/prompts@0.9.0': + '@clack/prompts@0.9.1': dependencies: - '@clack/core': 0.4.0 + '@clack/core': 0.4.1 picocolors: 1.1.1 sisteransi: 1.0.5 @@ -11654,7 +11659,7 @@ snapshots: clsx: 2.1.1 react: 18.3.0-canary-14898b6a9-20240318 - '@react-router/dev@7.1.1(@react-router/serve@7.1.1(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3))(@types/node@22.10.7)(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3)(vite@5.4.11(@types/node@22.10.7))(wrangler@3.63.2(@cloudflare/workers-types@4.20240701.0))': + '@react-router/dev@7.1.3(@react-router/serve@7.1.3(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3))(@types/node@22.10.7)(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3)(vite@5.4.11(@types/node@22.10.7))(wrangler@3.63.2(@cloudflare/workers-types@4.20240701.0))': dependencies: '@babel/core': 7.26.0 '@babel/generator': 7.26.2 @@ -11665,12 +11670,12 @@ snapshots: '@babel/traverse': 7.25.9 '@babel/types': 7.26.0 '@npmcli/package-json': 4.0.1 - '@react-router/node': 7.1.1(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3) + '@react-router/node': 7.1.3(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3) arg: 5.0.2 babel-dead-code-elimination: 1.0.8 chokidar: 4.0.3 dedent: 1.5.3 - es-module-lexer: 1.5.4 + es-module-lexer: 1.6.0 exit-hook: 2.2.1 fs-extra: 10.1.0 gunzip-maybe: 1.4.2 @@ -11681,14 +11686,14 @@ snapshots: picomatch: 2.3.1 prettier: 2.8.7 react-refresh: 0.14.2 - react-router: 7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318) + react-router: 7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318) semver: 7.6.3 set-cookie-parser: 2.6.0 valibot: 0.41.0(typescript@5.7.3) vite: 5.4.11(@types/node@22.10.7) vite-node: 3.0.0-beta.2(@types/node@22.10.7) optionalDependencies: - '@react-router/serve': 7.1.1(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3) + '@react-router/serve': 7.1.3(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3) typescript: 5.7.3 wrangler: 3.63.2(@cloudflare/workers-types@4.20240701.0) transitivePeerDependencies: @@ -11704,40 +11709,40 @@ snapshots: - supports-color - terser - '@react-router/express@7.1.1(express@4.21.1)(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3)': + '@react-router/express@7.1.3(express@4.21.1)(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3)': dependencies: - '@react-router/node': 7.1.1(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3) + '@react-router/node': 7.1.3(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3) express: 4.21.1 - react-router: 7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318) + react-router: 7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318) optionalDependencies: typescript: 5.7.3 - '@react-router/fs-routes@7.1.1(@react-router/dev@7.1.1(@react-router/serve@7.1.1(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3))(@types/node@22.10.7)(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3)(vite@5.4.11(@types/node@22.10.7))(wrangler@3.63.2(@cloudflare/workers-types@4.20240701.0)))(typescript@5.7.3)': + '@react-router/fs-routes@7.1.3(@react-router/dev@7.1.3(@react-router/serve@7.1.3(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3))(@types/node@22.10.7)(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3)(vite@5.4.11(@types/node@22.10.7))(wrangler@3.63.2(@cloudflare/workers-types@4.20240701.0)))(typescript@5.7.3)': dependencies: - '@react-router/dev': 7.1.1(@react-router/serve@7.1.1(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3))(@types/node@22.10.7)(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3)(vite@5.4.11(@types/node@22.10.7))(wrangler@3.63.2(@cloudflare/workers-types@4.20240701.0)) + '@react-router/dev': 7.1.3(@react-router/serve@7.1.3(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3))(@types/node@22.10.7)(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3)(vite@5.4.11(@types/node@22.10.7))(wrangler@3.63.2(@cloudflare/workers-types@4.20240701.0)) minimatch: 9.0.4 optionalDependencies: typescript: 5.7.3 - '@react-router/node@7.1.1(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3)': + '@react-router/node@7.1.3(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3)': dependencies: '@mjackson/node-fetch-server': 0.2.0 - react-router: 7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318) + react-router: 7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318) source-map-support: 0.5.21 stream-slice: 0.1.2 undici: 6.21.0 optionalDependencies: typescript: 5.7.3 - '@react-router/serve@7.1.1(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3)': + '@react-router/serve@7.1.3(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3)': dependencies: - '@react-router/express': 7.1.1(express@4.21.1)(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3) - '@react-router/node': 7.1.1(react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3) + '@react-router/express': 7.1.3(express@4.21.1)(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3) + '@react-router/node': 7.1.3(react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(typescript@5.7.3) compression: 1.7.4 express: 4.21.1 get-port: 5.1.1 morgan: 1.10.0 - react-router: 7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318) + react-router: 7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318) source-map-support: 0.5.21 transitivePeerDependencies: - supports-color @@ -13184,6 +13189,10 @@ snapshots: dependencies: uncrypto: 0.1.3 + crossws@0.3.2: + dependencies: + uncrypto: 0.1.3 + crypt@0.0.2: {} css-select@5.1.0: @@ -14102,10 +14111,10 @@ snapshots: pumpify: 1.5.1 through2: 2.0.5 - h3@1.13.1: + h3@1.14.0: dependencies: cookie-es: 1.2.2 - crossws: 0.3.1 + crossws: 0.3.2 defu: 6.1.4 destr: 2.0.3 iron-webcrypto: 1.2.1 @@ -14287,7 +14296,7 @@ snapshots: defu: 6.1.4 destr: 2.0.3 etag: 1.8.1 - h3: 1.13.1 + h3: 1.14.0 image-meta: 0.2.1 listhen: 1.9.0 ofetch: 1.4.1 @@ -14604,7 +14613,7 @@ snapshots: crossws: 0.3.1 defu: 6.1.4 get-port-please: 3.1.2 - h3: 1.13.1 + h3: 1.14.0 http-shutdown: 1.2.2 jiti: 2.4.2 mlly: 1.7.4 @@ -16043,7 +16052,7 @@ snapshots: '@remix-run/router': 1.21.0 react: 18.3.0-canary-14898b6a9-20240318 - react-router@7.1.1(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318): + react-router@7.1.3(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318): dependencies: '@types/cookie': 0.6.0 cookie: 1.0.1 @@ -16970,7 +16979,7 @@ snapshots: anymatch: 3.1.3 chokidar: 3.6.0 destr: 2.0.3 - h3: 1.13.1 + h3: 1.14.0 lru-cache: 10.4.3 node-fetch-native: 1.6.4 ofetch: 1.4.1 @@ -17089,7 +17098,7 @@ snapshots: unist-util-stringify-position: 3.0.3 vfile-message: 3.1.3 - vike@0.4.210(react-streaming@0.3.42(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(vite@5.4.11(@types/node@22.10.7)): + vike@0.4.218(react-streaming@0.3.42(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318))(vite@5.4.11(@types/node@22.10.7)): dependencies: '@brillout/import': 0.2.3 '@brillout/json-serializer': 0.5.15 @@ -17098,14 +17107,15 @@ snapshots: '@brillout/vite-plugin-server-entry': 0.5.6 acorn: 8.14.0 cac: 6.7.14 - es-module-lexer: 1.5.4 + es-module-lexer: 1.6.0 esbuild: 0.24.2 fast-glob: 3.3.2 + json5: 2.2.3 semver: 7.6.3 source-map-support: 0.5.21 - vite: 5.4.11(@types/node@22.10.7) optionalDependencies: react-streaming: 0.3.42(react-dom@18.3.0-canary-14898b6a9-20240318(react@18.3.0-canary-14898b6a9-20240318))(react@18.3.0-canary-14898b6a9-20240318) + vite: 5.4.11(@types/node@22.10.7) vite-node@1.6.0(@types/node@22.10.7): dependencies: @@ -17129,7 +17139,7 @@ snapshots: dependencies: cac: 6.7.14 debug: 4.4.0 - es-module-lexer: 1.5.4 + es-module-lexer: 1.6.0 pathe: 1.1.2 vite: 5.4.11(@types/node@22.10.7) transitivePeerDependencies: