Skip to content

Commit 65e9e80

Browse files
TrySoundTrySound
authored
refactor: split docker template (#4809)
We want to migrate more templates to react-router so here I split docker template into react-router and react-router-docker. Image processing, dockerfile and node environment are left as docker specifics.
1 parent 53ace3b commit 65e9e80

File tree

30 files changed

+142
-138
lines changed

30 files changed

+142
-138
lines changed

‎apps/builder/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"fast-deep-equal": "^3.1.3",
8989
"immer": "^10.1.1",
9090
"immerhin": "^0.10.0",
91-
"isbot": "^5.1.21",
91+
"isbot": "^5.1.22",
9292
"lexical": "^0.21.0",
9393
"match-sorter": "^8.0.0",
9494
"mdast-util-from-markdown": "^2.0.2",

‎fixtures/react-router-docker/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
"cli": "NODE_OPTIONS='--conditions=webstudio --import=tsx' webstudio",
88
"fixtures:link": "pnpm cli link --link https://p-d845c167-ea07-4875-b08d-83e97c09dcce-dot-${BUILDER_HOST:-main.development.webstudio.is}'?authToken=e9d1343f-9298-4fd3-a66e-f89a5af2dd93'",
99
"fixtures:sync": "pnpm cli sync --buildId f565d527-32e7-4731-bc71-aca9e9574587 && pnpm prettier --write ./.webstudio/",
10-
"fixtures:build": "pnpm cli build --template react-router-docker --template .template && pnpm prettier --write ./app/ ./package.json ./tsconfig.json"
10+
"fixtures:build": "pnpm cli build --template docker --template .template && pnpm prettier --write ./app/ ./package.json ./tsconfig.json"
1111
},
1212
"dependencies": {
13-
"@react-router/dev": "^7.1.3",
14-
"@react-router/fs-routes": "^7.1.3",
15-
"@react-router/node": "^7.1.3",
16-
"@react-router/serve": "^7.1.3",
13+
"@react-router/dev": "^7.1.4",
14+
"@react-router/fs-routes": "^7.1.4",
15+
"@react-router/node": "^7.1.4",
16+
"@react-router/serve": "^7.1.4",
1717
"@webstudio-is/image": "workspace:*",
1818
"@webstudio-is/react-sdk": "workspace:*",
1919
"@webstudio-is/sdk": "workspace:*",
@@ -23,10 +23,10 @@
2323
"@webstudio-is/sdk-components-react-router": "workspace:*",
2424
"h3": "^1.14.0",
2525
"ipx": "^3.0.1",
26-
"isbot": "^5.1.21",
26+
"isbot": "^5.1.22",
2727
"react": "18.3.0-canary-14898b6a9-20240318",
2828
"react-dom": "18.3.0-canary-14898b6a9-20240318",
29-
"react-router": "^7.1.3",
29+
"react-router": "^7.1.4",
3030
"vite": "^5.4.11",
3131
"webstudio": "workspace:*"
3232
},

‎fixtures/ssg-netlify-by-project-id/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@
4040
"@webstudio-is/sdk-components-react-remix": "workspace:*",
4141
"react": "18.3.0-canary-14898b6a9-20240318",
4242
"react-dom": "18.3.0-canary-14898b6a9-20240318",
43-
"vike": "^0.4.219"
43+
"vike": "^0.4.220"
4444
}
4545
}

‎fixtures/ssg/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@
4040
"@webstudio-is/sdk-components-react-remix": "workspace:*",
4141
"react": "18.3.0-canary-14898b6a9-20240318",
4242
"react-dom": "18.3.0-canary-14898b6a9-20240318",
43-
"vike": "^0.4.219"
43+
"vike": "^0.4.220"
4444
}
4545
}

‎fixtures/webstudio-cloudflare-template/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"@webstudio-is/sdk-components-react": "workspace:*",
4040
"@webstudio-is/sdk-components-react-radix": "workspace:*",
4141
"@webstudio-is/sdk-components-react-remix": "workspace:*",
42-
"isbot": "^5.1.21",
42+
"isbot": "^5.1.22",
4343
"react": "18.3.0-canary-14898b6a9-20240318",
4444
"react-dom": "18.3.0-canary-14898b6a9-20240318",
4545
"webstudio": "workspace:*",

‎fixtures/webstudio-custom-template/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@webstudio-is/sdk-components-react": "workspace:*",
2323
"@webstudio-is/sdk-components-react-radix": "workspace:*",
2424
"@webstudio-is/sdk-components-react-remix": "workspace:*",
25-
"isbot": "^5.1.21",
25+
"isbot": "^5.1.22",
2626
"react": "18.3.0-canary-14898b6a9-20240318",
2727
"react-dom": "18.3.0-canary-14898b6a9-20240318",
2828
"web-vitals": "^3.5.2"

‎fixtures/webstudio-remix-netlify-edge-functions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@webstudio-is/sdk-components-react": "workspace:*",
2424
"@webstudio-is/sdk-components-react-radix": "workspace:*",
2525
"@webstudio-is/sdk-components-react-remix": "workspace:*",
26-
"isbot": "^5.1.21",
26+
"isbot": "^5.1.22",
2727
"react": "18.3.0-canary-14898b6a9-20240318",
2828
"react-dom": "18.3.0-canary-14898b6a9-20240318"
2929
},

‎fixtures/webstudio-remix-netlify-functions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@webstudio-is/sdk-components-react": "workspace:*",
2323
"@webstudio-is/sdk-components-react-radix": "workspace:*",
2424
"@webstudio-is/sdk-components-react-remix": "workspace:*",
25-
"isbot": "^5.1.21",
25+
"isbot": "^5.1.22",
2626
"react": "18.3.0-canary-14898b6a9-20240318",
2727
"react-dom": "18.3.0-canary-14898b6a9-20240318"
2828
},

‎fixtures/webstudio-remix-vercel/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@webstudio-is/sdk-components-react": "workspace:*",
2323
"@webstudio-is/sdk-components-react-radix": "workspace:*",
2424
"@webstudio-is/sdk-components-react-remix": "workspace:*",
25-
"isbot": "^5.1.21",
25+
"isbot": "^5.1.22",
2626
"react": "18.3.0-canary-14898b6a9-20240318",
2727
"react-dom": "18.3.0-canary-14898b6a9-20240318"
2828
},

‎packages/cli/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
"devDependencies": {
5151
"@netlify/remix-adapter": "^2.5.1",
5252
"@netlify/remix-edge-adapter": "3.4.2",
53-
"@react-router/dev": "^7.1.3",
54-
"@react-router/fs-routes": "^7.1.3",
53+
"@react-router/dev": "^7.1.4",
54+
"@react-router/fs-routes": "^7.1.4",
5555
"@remix-run/cloudflare": "^2.15.2",
5656
"@remix-run/cloudflare-pages": "^2.15.2",
5757
"@remix-run/dev": "^2.15.2",
@@ -77,9 +77,9 @@
7777
"prettier": "3.4.2",
7878
"react": "18.3.0-canary-14898b6a9-20240318",
7979
"react-dom": "18.3.0-canary-14898b6a9-20240318",
80-
"react-router": "^7.1.3",
80+
"react-router": "^7.1.4",
8181
"ts-expect": "^1.3.0",
82-
"vike": "^0.4.219",
82+
"vike": "^0.4.220",
8383
"vite": "^5.4.11",
8484
"vitest": "^3.0.2",
8585
"wrangler": "^3.63.2"

‎packages/cli/src/config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export const PROJECT_TEMPLATES = [
6161
{
6262
value: "docker" as const,
6363
label: "Docker",
64-
expand: ["react-router-docker"],
64+
expand: ["react-router", "react-router-docker"],
6565
},
6666
{
6767
value: "vercel" as const,

‎packages/cli/src/prebuild.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ export const prebuild = async (options: {
267267
let framework;
268268
if (options.template.includes("ssg")) {
269269
framework = await createVikeSsgFramework();
270-
} else if (options.template.includes("react-router-docker")) {
270+
} else if (options.template.includes("react-router")) {
271271
framework = await createReactRouterFramework();
272272
} else {
273273
framework = await createRemixFramework();

‎packages/cli/templates/defaults/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@webstudio-is/sdk-components-animation": "0.0.0-webstudio-version",
1919
"@webstudio-is/sdk-components-react-radix": "0.0.0-webstudio-version",
2020
"@webstudio-is/sdk-components-react-remix": "0.0.0-webstudio-version",
21-
"isbot": "^5.1.21",
21+
"isbot": "^5.1.22",
2222
"react": "18.3.0-canary-14898b6a9-20240318",
2323
"react-dom": "18.3.0-canary-14898b6a9-20240318"
2424
},

‎packages/cli/templates/react-router-docker/package.json

+2-34
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,7 @@
11
{
2-
"type": "module",
3-
"private": true,
4-
"sideEffects": false,
5-
"scripts": {
6-
"build": "react-router build",
7-
"dev": "react-router dev",
8-
"start": "react-router-serve ./build/server/index.js",
9-
"typecheck": "tsc"
10-
},
112
"dependencies": {
12-
"@react-router/dev": "^7.1.3",
13-
"@react-router/fs-routes": "^7.1.3",
14-
"@react-router/node": "^7.1.3",
15-
"@react-router/serve": "^7.1.3",
16-
"@webstudio-is/image": "0.0.0-webstudio-version",
17-
"@webstudio-is/react-sdk": "0.0.0-webstudio-version",
18-
"@webstudio-is/sdk": "0.0.0-webstudio-version",
19-
"@webstudio-is/sdk-components-animation": "0.0.0-webstudio-version",
20-
"@webstudio-is/sdk-components-react-radix": "0.0.0-webstudio-version",
21-
"@webstudio-is/sdk-components-react-router": "0.0.0-webstudio-version",
22-
"@webstudio-is/sdk-components-react": "0.0.0-webstudio-version",
3+
"@react-router/node": "^7.1.4",
234
"h3": "^1.14.0",
24-
"ipx": "^3.0.1",
25-
"isbot": "^5.1.21",
26-
"react": "18.3.0-canary-14898b6a9-20240318",
27-
"react-dom": "18.3.0-canary-14898b6a9-20240318",
28-
"react-router": "^7.1.3",
29-
"vite": "^5.4.11"
30-
},
31-
"devDependencies": {
32-
"@types/react": "^18.2.70",
33-
"@types/react-dom": "^18.2.25",
34-
"typescript": "5.7.3"
35-
},
36-
"engines": {
37-
"node": ">=20.0.0"
5+
"ipx": "^3.0.1"
386
}
397
}

‎packages/cli/templates/react-router-docker/.gitignore ‎packages/cli/templates/react-router/.gitignore

File renamed without changes.

‎packages/cli/templates/react-router-docker/app/extension.ts ‎packages/cli/templates/react-router/app/extension.ts

File renamed without changes.

‎packages/cli/templates/react-router-docker/app/root.tsx ‎packages/cli/templates/react-router/app/root.tsx

File renamed without changes.

‎packages/cli/templates/react-router-docker/app/route-templates/default-sitemap.tsx ‎packages/cli/templates/react-router/app/route-templates/default-sitemap.tsx

File renamed without changes.

‎packages/cli/templates/react-router-docker/app/route-templates/html.tsx ‎packages/cli/templates/react-router/app/route-templates/html.tsx

File renamed without changes.

‎packages/cli/templates/react-router-docker/app/route-templates/redirect.tsx ‎packages/cli/templates/react-router/app/route-templates/redirect.tsx

File renamed without changes.

‎packages/cli/templates/react-router-docker/app/route-templates/xml.tsx ‎packages/cli/templates/react-router/app/route-templates/xml.tsx

File renamed without changes.

‎packages/cli/templates/react-router-docker/app/routes.ts ‎packages/cli/templates/react-router/app/routes.ts

File renamed without changes.

‎packages/cli/templates/react-router-docker/app/routes/[robots.txt].tsx ‎packages/cli/templates/react-router/app/routes/[robots.txt].tsx

File renamed without changes.

‎packages/cli/templates/react-router/package.json

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"type": "module",
3+
"private": true,
4+
"sideEffects": false,
5+
"scripts": {
6+
"build": "react-router build",
7+
"dev": "react-router dev",
8+
"start": "react-router-serve ./build/server/index.js",
9+
"typecheck": "tsc"
10+
},
11+
"dependencies": {
12+
"@react-router/dev": "^7.1.4",
13+
"@react-router/fs-routes": "^7.1.4",
14+
"@react-router/serve": "^7.1.4",
15+
"@webstudio-is/image": "0.0.0-webstudio-version",
16+
"@webstudio-is/react-sdk": "0.0.0-webstudio-version",
17+
"@webstudio-is/sdk": "0.0.0-webstudio-version",
18+
"@webstudio-is/sdk-components-animation": "0.0.0-webstudio-version",
19+
"@webstudio-is/sdk-components-react-radix": "0.0.0-webstudio-version",
20+
"@webstudio-is/sdk-components-react-router": "0.0.0-webstudio-version",
21+
"@webstudio-is/sdk-components-react": "0.0.0-webstudio-version",
22+
"isbot": "^5.1.22",
23+
"react": "18.3.0-canary-14898b6a9-20240318",
24+
"react-dom": "18.3.0-canary-14898b6a9-20240318",
25+
"react-router": "^7.1.4",
26+
"vite": "^5.4.11"
27+
},
28+
"devDependencies": {
29+
"@types/react": "^18.2.70",
30+
"@types/react-dom": "^18.2.25",
31+
"typescript": "5.7.3"
32+
},
33+
"engines": {
34+
"node": ">=20.0.0"
35+
}
36+
}

‎packages/cli/templates/react-router-docker/public/favicon.ico ‎packages/cli/templates/react-router/public/favicon.ico

File renamed without changes.

‎packages/cli/templates/react-router-docker/tsconfig.json ‎packages/cli/templates/react-router/tsconfig.json

File renamed without changes.

‎packages/cli/templates/react-router-docker/vite.config.ts ‎packages/cli/templates/react-router/vite.config.ts

File renamed without changes.

‎packages/cli/templates/ssg/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@webstudio-is/sdk-components-react-radix": "0.0.0-webstudio-version",
1717
"react": "18.3.0-canary-14898b6a9-20240318",
1818
"react-dom": "18.3.0-canary-14898b6a9-20240318",
19-
"vike": "^0.4.219"
19+
"vike": "^0.4.220"
2020
},
2121
"devDependencies": {
2222
"@types/react": "^18.2.70",

‎packages/sdk-components-react-router/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@webstudio-is/react-sdk": "workspace:*",
4343
"@webstudio-is/sdk": "workspace:*",
4444
"@webstudio-is/sdk-components-react": "workspace:*",
45-
"react-router": "^7.1.3"
45+
"react-router": "^7.1.4"
4646
},
4747
"devDependencies": {
4848
"@types/react": "^18.2.70",

0 commit comments

Comments
 (0)