experimental: add missing pieces to docker template (#4783)

TrySound · web-flow · commit bc618d42fec4 · 2025-01-25T17:56:20.000+07:00
- Got rid of peer dependencies warnings
- Added missing files in template
- reduced install time of dependencies
- added docker to init options
diff --git a/apps/builder/package.json b/apps/builder/package.json
@@ -88,7 +88,7 @@
     "fast-deep-equal": "^3.1.3",
     "immer": "^10.1.1",
     "immerhin": "^0.10.0",
-    "isbot": "^5.1.19",
+    "isbot": "^5.1.21",
     "lexical": "^0.21.0",
     "match-sorter": "^8.0.0",
     "mdast-util-from-markdown": "^2.0.2",
diff --git a/fixtures/react-router-docker/Dockerfile b/fixtures/react-router-docker/Dockerfile
@@ -1,23 +1,19 @@
-FROM node:22-alpine AS development-dependencies-env
-COPY . /app
-WORKDIR /app
-RUN npm install
-
-FROM node:22-alpine AS production-dependencies-env
-COPY ./package.json package-lock.json /app/
+FROM node:22-alpine AS dependencies-env
+COPY .npmrc package.json /app/
 WORKDIR /app
 RUN npm install --omit=dev
 
-FROM node:22-alpine AS build-env
+FROM dependencies-env AS build-env
 COPY . /app/
-COPY --from=development-dependencies-env /app/node_modules /app/node_modules
 WORKDIR /app
+RUN npm install
 RUN npm run build
 
 FROM node:22-alpine
-COPY ./package.json package-lock.json /app/
-COPY --from=production-dependencies-env /app/node_modules /app/node_modules
+COPY .npmrc package.json /app/
+COPY --from=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
@@ -10,23 +10,23 @@
     "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:*",
     "@webstudio-is/sdk-components-animation": "workspace:*",
     "@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",
+    "isbot": "^5.1.21",
     "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
@@ -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.219"
   }
 }
diff --git 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.219"
   }
 }
diff --git a/fixtures/webstudio-cloudflare-template/package.json b/fixtures/webstudio-cloudflare-template/package.json
@@ -39,7 +39,7 @@
     "@webstudio-is/sdk-components-react": "workspace:*",
     "@webstudio-is/sdk-components-react-radix": "workspace:*",
     "@webstudio-is/sdk-components-react-remix": "workspace:*",
-    "isbot": "^5.1.19",
+    "isbot": "^5.1.21",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
     "webstudio": "workspace:*",
diff --git a/fixtures/webstudio-custom-template/package.json b/fixtures/webstudio-custom-template/package.json
@@ -22,7 +22,7 @@
     "@webstudio-is/sdk-components-react": "workspace:*",
     "@webstudio-is/sdk-components-react-radix": "workspace:*",
     "@webstudio-is/sdk-components-react-remix": "workspace:*",
-    "isbot": "^5.1.19",
+    "isbot": "^5.1.21",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
     "web-vitals": "^3.5.2"
diff --git a/fixtures/webstudio-remix-netlify-edge-functions/package.json b/fixtures/webstudio-remix-netlify-edge-functions/package.json
@@ -23,7 +23,7 @@
     "@webstudio-is/sdk-components-react": "workspace:*",
     "@webstudio-is/sdk-components-react-radix": "workspace:*",
     "@webstudio-is/sdk-components-react-remix": "workspace:*",
-    "isbot": "^5.1.19",
+    "isbot": "^5.1.21",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318"
   },
diff --git a/fixtures/webstudio-remix-netlify-functions/package.json b/fixtures/webstudio-remix-netlify-functions/package.json
@@ -22,7 +22,7 @@
     "@webstudio-is/sdk-components-react": "workspace:*",
     "@webstudio-is/sdk-components-react-radix": "workspace:*",
     "@webstudio-is/sdk-components-react-remix": "workspace:*",
-    "isbot": "^5.1.19",
+    "isbot": "^5.1.21",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318"
   },
diff --git a/fixtures/webstudio-remix-vercel/package.json b/fixtures/webstudio-remix-vercel/package.json
@@ -22,7 +22,7 @@
     "@webstudio-is/sdk-components-react": "workspace:*",
     "@webstudio-is/sdk-components-react-radix": "workspace:*",
     "@webstudio-is/sdk-components-react-remix": "workspace:*",
-    "isbot": "^5.1.19",
+    "isbot": "^5.1.21",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318"
   },
diff --git 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,8 @@
   "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",
+    "@react-router/fs-routes": "^7.1.3",
     "@remix-run/cloudflare": "^2.15.2",
     "@remix-run/cloudflare-pages": "^2.15.2",
     "@remix-run/dev": "^2.15.2",
@@ -73,13 +74,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.219",
     "vite": "^5.4.11",
     "vitest": "^3.0.2",
     "wrangler": "^3.63.2"
diff --git a/packages/cli/src/config.ts b/packages/cli/src/config.ts
@@ -58,7 +58,16 @@ export const PROJECT_TEMPLATES = [
     label: "Vanilla",
     expand: ["defaults"],
   },
-  { value: "vercel" as const, label: "Vercel", expand: ["defaults", "vercel"] },
+  {
+    value: "docker" as const,
+    label: "Docker",
+    expand: ["react-router-docker"],
+  },
+  {
+    value: "vercel" as const,
+    label: "Vercel",
+    expand: ["defaults", "vercel"],
+  },
   {
     value: "netlify-functions" as const,
     label: "Netlify Functions",
@@ -69,7 +78,10 @@ export const PROJECT_TEMPLATES = [
     label: "Netlify Edge Functions",
     expand: ["defaults", "netlify-edge-functions"],
   },
-  { value: "ssg" as const, label: "Static Site Generation (SSG)" },
+  {
+    value: "ssg" as const,
+    label: "Static Site Generation (SSG)",
+  },
   {
     value: "ssg-netlify" as const,
     label: "Static Site Generation (SSG) Netlify",
@@ -89,9 +101,4 @@ export const INTERNAL_TEMPLATES = [
     label: "Cloudflare",
     expand: ["defaults", "cloudflare"],
   },
-  {
-    value: "react-router-docker",
-    label: "Dokcer",
-    expand: ["react-router-docker"],
-  },
 ];
diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.ts
@@ -211,6 +211,12 @@ const importFrom = (importee: string, importer: string) => {
   return relative(dirname(importer), importee).replaceAll("\\", "/");
 };
 
+const npmrc = `force=true
+loglevel=error
+audit=false
+fund=false
+`;
+
 export const prebuild = async (options: {
   /**
    * Do we need download assets
@@ -253,7 +259,7 @@ export const prebuild = async (options: {
   await rm(routesDir, { recursive: true, force: true });
 
   // force npm to install with not matching peer dependencies
-  await writeFile(join(cwd(), ".npmrc"), "force=true");
+  await writeFile(join(cwd(), ".npmrc"), npmrc);
 
   for (const template of options.template) {
     await copyTemplates(template);
diff --git a/packages/cli/templates/defaults/package.json b/packages/cli/templates/defaults/package.json
@@ -18,7 +18,7 @@
     "@webstudio-is/sdk-components-animation": "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",
-    "isbot": "^5.1.19",
+    "isbot": "^5.1.21",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318"
   },
diff --git a/packages/cli/templates/react-router-docker/Dockerfile b/packages/cli/templates/react-router-docker/Dockerfile
@@ -1,23 +1,19 @@
-FROM node:22-alpine AS development-dependencies-env
-COPY . /app
-WORKDIR /app
-RUN npm install
-
-FROM node:22-alpine AS production-dependencies-env
-COPY ./package.json package-lock.json /app/
+FROM node:22-alpine AS dependencies-env
+COPY .npmrc package.json /app/
 WORKDIR /app
 RUN npm install --omit=dev
 
-FROM node:22-alpine AS build-env
+FROM dependencies-env AS build-env
 COPY . /app/
-COPY --from=development-dependencies-env /app/node_modules /app/node_modules
 WORKDIR /app
+RUN npm install
 RUN npm run build
 
 FROM node:22-alpine
-COPY ./package.json package-lock.json /app/
-COPY --from=production-dependencies-env /app/node_modules /app/node_modules
+COPY .npmrc package.json /app/
+COPY --from=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
@@ -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
@@ -5,24 +5,27 @@
   "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",
     "@webstudio-is/sdk-components-animation": "0.0.0-webstudio-version",
     "@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",
+    "isbot": "^5.1.21",
     "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
@@ -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.219"
   },
   "devDependencies": {
     "@types/react": "^18.2.70",
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.1.1"
+    "react-router": "^7.1.3"
   },
   "devDependencies": {
     "@types/react": "^18.2.70",
diff --git a/packages/sdk/src/schema/deployment.ts b/packages/sdk/src/schema/deployment.ts
@@ -2,6 +2,7 @@ import { z } from "zod";
 
 export const Templates = z.enum([
   "vanilla",
+  "docker",
   "vercel",
   "netlify-functions",
   "netlify-edge-functions",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,6 @@`
`40`	`40`	`"@webstudio-is/sdk-components-react-remix": "workspace:*",`
`41`	`41`	`"react": "18.3.0-canary-14898b6a9-20240318",`
`42`	`42`	`"react-dom": "18.3.0-canary-14898b6a9-20240318",`
`43`		`- "vike": "^0.4.210"`
	`43`	`+ "vike": "^0.4.219"`
`44`	`44`	`}`
`45`	`45`	`}`