Skip to content

Commit 65e9e80

Browse files
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 7 additions & 7 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 4 additions & 4 deletions
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"

0 commit comments

Comments
 (0)