create-cloudflare 0.0.0-edec41591 → 0.0.0-edf169d15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (220) hide show
  1. package/dist/cli.js +14824 -14589
  2. package/dist/tsconfig.tsbuildinfo +1 -1
  3. package/package.json +17 -10
  4. package/templates/analog/templates/worker-configuration.d.ts +1 -1
  5. package/templates/analog/templates/wrangler.jsonc +5 -0
  6. package/templates/angular/c3.ts +5 -98
  7. package/templates/angular/pages/c3.ts +134 -0
  8. package/templates/angular/pages/templates/src/server.ts +15 -0
  9. package/templates/angular/pages/templates/tools/copy-files.mjs +15 -0
  10. package/{templates-experimental/angular → templates/angular/workers}/c3.ts +46 -14
  11. package/templates/angular/workers/templates/src/server.ts +15 -0
  12. package/templates/angular/workers/templates/wrangler.jsonc +12 -0
  13. package/templates/astro/c3.ts +17 -33
  14. package/templates/astro/templates/js/wrangler.jsonc +8 -0
  15. package/templates/astro/templates/ts/worker-configuration.d.ts +4 -0
  16. package/templates/astro/templates/ts/wrangler.jsonc +8 -0
  17. package/templates/common/js/package.json +1 -1
  18. package/templates/common/js/wrangler.jsonc +8 -0
  19. package/templates/common/ts/package.json +1 -1
  20. package/templates/common/ts/src/index.ts +1 -1
  21. package/templates/common/ts/worker-configuration.d.ts +1 -1
  22. package/templates/common/ts/wrangler.jsonc +8 -0
  23. package/templates/docusaurus/c3.ts +5 -24
  24. package/templates/docusaurus/pages/c3.ts +30 -0
  25. package/{templates-experimental/docusaurus → templates/docusaurus/workers}/c3.ts +3 -2
  26. package/templates/docusaurus/workers/templates/wrangler.jsonc +10 -0
  27. package/templates/gatsby/c3.ts +5 -45
  28. package/templates/gatsby/pages/c3.ts +50 -0
  29. package/{templates-experimental/gatsby → templates/gatsby/workers}/c3.ts +2 -2
  30. package/templates/gatsby/workers/templates/wrangler.jsonc +10 -0
  31. package/templates/hello-world/c3.ts +17 -1
  32. package/templates/hello-world/js/package.json +3 -3
  33. package/templates/hello-world/js/test/index.spec.js +1 -1
  34. package/templates/hello-world/js/vitest.config.js +1 -1
  35. package/templates/hello-world/js/wrangler.jsonc +8 -0
  36. package/templates/hello-world/py/.python-version +1 -0
  37. package/templates/hello-world/py/README.md +23 -0
  38. package/templates/hello-world/py/package.json +1 -1
  39. package/templates/hello-world/py/pyproject.toml +9 -0
  40. package/templates/hello-world/py/uv.lock +22 -0
  41. package/templates/hello-world/py/wrangler.jsonc +9 -0
  42. package/templates/hello-world/ts/package.json +3 -3
  43. package/templates/hello-world/ts/src/index.ts +1 -1
  44. package/templates/hello-world/ts/test/tsconfig.json +1 -1
  45. package/templates/hello-world/ts/vitest.config.mts +1 -1
  46. package/templates/hello-world/ts/worker-configuration.d.ts +1 -1
  47. package/templates/hello-world/ts/wrangler.jsonc +8 -0
  48. package/templates/hello-world-durable-object/js/package.json +1 -1
  49. package/templates/hello-world-durable-object/js/src/index.js +3 -3
  50. package/templates/hello-world-durable-object/js/wrangler.jsonc +24 -0
  51. package/templates/hello-world-durable-object/ts/package.json +1 -1
  52. package/templates/hello-world-durable-object/ts/src/index.ts +4 -4
  53. package/templates/hello-world-durable-object/ts/wrangler.jsonc +24 -0
  54. package/templates/hono/c3.ts +1 -0
  55. package/templates/hono/templates/worker-configuration.d.ts +1 -1
  56. package/templates/hono/templates/wrangler.jsonc +8 -0
  57. package/templates/next/README.md +3 -4
  58. package/templates/next/app/js/app/api/hello/route.js +4 -4
  59. package/templates/next/app/ts/app/api/hello/route.ts +4 -5
  60. package/templates/next/c3.ts +16 -31
  61. package/templates/next/wrangler.jsonc +8 -0
  62. package/templates/nuxt/c3.ts +5 -130
  63. package/templates/nuxt/pages/c3.ts +145 -0
  64. package/templates/nuxt/pages/templates/worker-configuration.d.ts +4 -0
  65. package/templates/nuxt/pages/templates/wrangler.jsonc +5 -0
  66. package/{templates-experimental/nuxt → templates/nuxt/workers}/c3.ts +14 -4
  67. package/templates/nuxt/workers/templates/worker-configuration.d.ts +4 -0
  68. package/templates/nuxt/workers/templates/wrangler.jsonc +12 -0
  69. package/templates/openapi/ts/package.json +1 -1
  70. package/templates/openapi/ts/worker-configuration.d.ts +1 -1
  71. package/templates/openapi/ts/wrangler.jsonc +8 -0
  72. package/templates/pre-existing/c3.ts +3 -3
  73. package/templates/pre-existing/js/package.json +1 -1
  74. package/templates/queues/js/package.json +1 -1
  75. package/templates/queues/js/wrangler.jsonc +21 -0
  76. package/templates/queues/ts/package.json +1 -1
  77. package/templates/queues/ts/src/index.ts +1 -1
  78. package/templates/queues/ts/worker-configuration.d.ts +1 -1
  79. package/templates/queues/ts/wrangler.jsonc +21 -0
  80. package/templates/qwik/c3.ts +3 -2
  81. package/templates/qwik/templates/worker-configuration.d.ts +1 -1
  82. package/templates/qwik/templates/wrangler.jsonc +8 -0
  83. package/templates/react/c3.ts +5 -57
  84. package/templates/react/pages/c3.ts +62 -0
  85. package/templates/react/workers/c3.ts +183 -0
  86. package/templates/react/workers/js/api/index.js +13 -0
  87. package/templates/react/workers/js/src/App.css +45 -0
  88. package/templates/react/workers/js/src/App.jsx +58 -0
  89. package/templates/react/workers/js/src/assets/Cloudflare_Logo.svg +51 -0
  90. package/templates/react/workers/js/wrangler.jsonc +9 -0
  91. package/templates/react/workers/ts/api/index.ts +13 -0
  92. package/templates/react/workers/ts/src/App.css +45 -0
  93. package/templates/react/workers/ts/src/App.tsx +58 -0
  94. package/templates/react/workers/ts/src/assets/Cloudflare_Logo.svg +51 -0
  95. package/templates/react/workers/ts/tsconfig.worker.json +8 -0
  96. package/templates/react/workers/ts/worker-configuration.d.ts +5 -0
  97. package/templates/react/workers/ts/wrangler.jsonc +9 -0
  98. package/templates/remix/templates/worker-configuration.d.ts +1 -1
  99. package/templates/remix/templates/wrangler.jsonc +5 -0
  100. package/templates/scheduled/js/package.json +1 -1
  101. package/templates/scheduled/js/src/index.js +1 -1
  102. package/templates/scheduled/js/wrangler.jsonc +13 -0
  103. package/templates/scheduled/ts/package.json +1 -1
  104. package/templates/scheduled/ts/src/index.ts +4 -4
  105. package/templates/scheduled/ts/worker-configuration.d.ts +1 -1
  106. package/templates/scheduled/ts/wrangler.jsonc +13 -0
  107. package/templates/solid/c3.ts +1 -1
  108. package/templates/solid/templates/wrangler.jsonc +8 -0
  109. package/templates/svelte/c3.ts +31 -4
  110. package/templates/svelte/templates/wrangler.jsonc +5 -0
  111. package/templates/vue/c3.ts +5 -25
  112. package/templates/vue/pages/c3.ts +30 -0
  113. package/templates/vue/workers/c3.ts +98 -0
  114. package/templates/vue/workers/js/server/index.js +13 -0
  115. package/templates/vue/workers/js/src/App.vue +107 -0
  116. package/templates/vue/workers/js/src/components/HelloWorld.vue +47 -0
  117. package/templates/vue/workers/js/vite.config.js +21 -0
  118. package/templates/vue/workers/js/wrangler.jsonc +12 -0
  119. package/templates/vue/workers/ts/server/index.ts +13 -0
  120. package/templates/vue/workers/ts/src/App.vue +107 -0
  121. package/templates/vue/workers/ts/src/components/HelloWorld.vue +44 -0
  122. package/templates/vue/workers/ts/tsconfig.worker.json +8 -0
  123. package/templates/vue/workers/ts/vite.config.ts +21 -0
  124. package/templates/vue/workers/ts/worker-configuration.d.ts +6 -0
  125. package/templates/vue/workers/ts/wrangler.jsonc +12 -0
  126. package/templates-experimental/astro/c3.ts +17 -33
  127. package/templates-experimental/astro/templates/js/wrangler.jsonc +15 -0
  128. package/templates-experimental/astro/templates/ts/worker-configuration.d.ts +4 -0
  129. package/templates-experimental/astro/templates/ts/wrangler.jsonc +15 -0
  130. package/templates-experimental/hello-world-assets-only/templates/wrangler.jsonc +10 -0
  131. package/templates-experimental/hello-world-durable-object-with-assets/js/package.json +1 -1
  132. package/templates-experimental/hello-world-durable-object-with-assets/js/src/index.js +3 -3
  133. package/templates-experimental/hello-world-durable-object-with-assets/js/wrangler.jsonc +28 -0
  134. package/templates-experimental/hello-world-durable-object-with-assets/ts/package.json +1 -1
  135. package/templates-experimental/hello-world-durable-object-with-assets/ts/src/index.ts +3 -3
  136. package/templates-experimental/hello-world-durable-object-with-assets/ts/wrangler.jsonc +28 -0
  137. package/templates-experimental/hello-world-with-assets/js/package.json +3 -3
  138. package/templates-experimental/hello-world-with-assets/js/vitest.config.js +1 -1
  139. package/templates-experimental/hello-world-with-assets/js/wrangler.jsonc +15 -0
  140. package/templates-experimental/hello-world-with-assets/py/package.json +1 -1
  141. package/templates-experimental/hello-world-with-assets/py/wrangler.jsonc +15 -0
  142. package/templates-experimental/hello-world-with-assets/ts/package.json +3 -3
  143. package/templates-experimental/hello-world-with-assets/ts/src/index.ts +1 -1
  144. package/templates-experimental/hello-world-with-assets/ts/vitest.config.mts +1 -1
  145. package/templates-experimental/hello-world-with-assets/ts/worker-configuration.d.ts +1 -1
  146. package/templates-experimental/hello-world-with-assets/ts/wrangler.jsonc +15 -0
  147. package/templates-experimental/hono/c3.ts +1 -0
  148. package/templates-experimental/hono/templates/worker-configuration.d.ts +1 -1
  149. package/templates-experimental/hono/templates/wrangler.jsonc +9 -0
  150. package/templates-experimental/next/c3.ts +39 -16
  151. package/templates-experimental/next/templates/.dev.vars +2 -0
  152. package/templates-experimental/next/templates/__dot__gitignore +2 -5
  153. package/templates-experimental/next/templates/cloudflare-env.d.ts +5 -0
  154. package/templates-experimental/next/templates/open-next.config.ts +6 -0
  155. package/templates-experimental/next/templates/wrangler.jsonc +12 -0
  156. package/templates-experimental/qwik/c3.ts +3 -2
  157. package/templates-experimental/qwik/templates/worker-configuration.d.ts +1 -1
  158. package/templates-experimental/qwik/templates/wrangler.jsonc +15 -0
  159. package/templates-experimental/solid/c3.ts +8 -51
  160. package/templates-experimental/solid/templates/wrangler.jsonc +15 -0
  161. package/templates-experimental/svelte/c3.ts +1 -4
  162. package/templates-experimental/svelte/templates/wrangler.jsonc +12 -0
  163. package/templates/analog/templates/wrangler.toml +0 -85
  164. package/templates/angular/templates/server.ts +0 -34
  165. package/templates/angular/templates/tools/alter-polyfills.mjs +0 -27
  166. package/templates/angular/templates/tools/copy-files.mjs +0 -9
  167. package/templates/angular/templates/tools/paths.mjs +0 -9
  168. package/templates/astro/templates/wrangler.toml +0 -86
  169. package/templates/common/js/wrangler.toml +0 -113
  170. package/templates/common/ts/wrangler.toml +0 -113
  171. package/templates/hello-world/js/wrangler.toml +0 -114
  172. package/templates/hello-world/py/wrangler.toml +0 -114
  173. package/templates/hello-world/ts/wrangler.toml +0 -114
  174. package/templates/hello-world-durable-object/js/wrangler.toml +0 -113
  175. package/templates/hello-world-durable-object/ts/wrangler.toml +0 -113
  176. package/templates/hono/templates/wrangler.toml +0 -113
  177. package/templates/next/wrangler.toml +0 -86
  178. package/templates/nuxt/templates/worker-configuration.d.ts +0 -4
  179. package/templates/nuxt/templates/wrangler.toml +0 -86
  180. package/templates/openapi/ts/wrangler.toml +0 -113
  181. package/templates/pre-existing/js/wrangler.toml +0 -4
  182. package/templates/queues/js/wrangler.toml +0 -118
  183. package/templates/queues/ts/wrangler.toml +0 -118
  184. package/templates/qwik/templates/wrangler.toml +0 -86
  185. package/templates/remix/templates/wrangler.toml +0 -85
  186. package/templates/scheduled/js/wrangler.toml +0 -119
  187. package/templates/scheduled/ts/wrangler.toml +0 -119
  188. package/templates/solid/templates/wrangler.toml +0 -84
  189. package/templates/svelte/js/wrangler.toml +0 -85
  190. package/templates/svelte/ts/wrangler.toml +0 -85
  191. package/templates-experimental/angular/templates/server.ts +0 -34
  192. package/templates-experimental/angular/templates/tools/alter-polyfills.mjs +0 -32
  193. package/templates-experimental/angular/templates/wrangler.toml +0 -11
  194. package/templates-experimental/astro/templates/wrangler.toml +0 -12
  195. package/templates-experimental/docusaurus/templates/wrangler.toml +0 -10
  196. package/templates-experimental/gatsby/templates/wrangler.toml +0 -10
  197. package/templates-experimental/hello-world-assets-only/templates/wrangler.toml +0 -10
  198. package/templates-experimental/hello-world-durable-object-with-assets/js/wrangler.toml +0 -24
  199. package/templates-experimental/hello-world-durable-object-with-assets/ts/wrangler.toml +0 -24
  200. package/templates-experimental/hello-world-with-assets/js/wrangler.toml +0 -12
  201. package/templates-experimental/hello-world-with-assets/py/wrangler.toml +0 -12
  202. package/templates-experimental/hello-world-with-assets/ts/wrangler.toml +0 -12
  203. package/templates-experimental/hono/templates/wrangler.toml +0 -5
  204. package/templates-experimental/next/templates/env.d.ts +0 -5
  205. package/templates-experimental/next/templates/wrangler.toml +0 -12
  206. package/templates-experimental/nuxt/templates/cloudflare-preset/nitro.config.ts +0 -27
  207. package/templates-experimental/nuxt/templates/worker-configuration.d.ts +0 -4
  208. package/templates-experimental/nuxt/templates/wrangler.toml +0 -11
  209. package/templates-experimental/qwik/templates/wrangler.toml +0 -12
  210. package/templates-experimental/solid/templates/wrangler.toml +0 -12
  211. package/templates-experimental/svelte/js/wrangler.toml +0 -11
  212. package/templates-experimental/svelte/ts/wrangler.toml +0 -11
  213. /package/templates/angular/{templates → pages/templates}/src/_routes.json +0 -0
  214. /package/templates/astro/{snippets/runtimeDeclaration.ts → templates/ts/src/env.d.ts} +0 -0
  215. /package/{templates-experimental/nuxt → templates/nuxt/pages}/templates/env.d.ts +0 -0
  216. /package/templates/nuxt/{templates → workers/templates}/env.d.ts +0 -0
  217. /package/templates-experimental/astro/templates/{public → js/public}/.assetsignore +0 -0
  218. /package/templates-experimental/{svelte/js/static → astro/templates/ts/public}/.assetsignore +0 -0
  219. /package/templates-experimental/astro/{snippets/runtimeDeclaration.ts → templates/ts/src/env.d.ts} +0 -0
  220. /package/templates-experimental/svelte/{ts → templates}/static/.assetsignore +0 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "create-cloudflare",
3
- "version": "0.0.0-edec41591",
3
+ "version": "0.0.0-edf169d15",
4
4
  "description": "A CLI for creating and deploying new applications to Cloudflare.",
5
5
  "keywords": [
6
6
  "cloudflare",
@@ -30,7 +30,7 @@
30
30
  "@babel/parser": "^7.21.3",
31
31
  "@babel/types": "^7.21.4",
32
32
  "@clack/prompts": "^0.6.3",
33
- "@cloudflare/workers-types": "^4.20241106.0",
33
+ "@cloudflare/workers-types": "^4.20250310.0",
34
34
  "@iarna/toml": "^3.0.0",
35
35
  "@types/command-exists": "^1.2.0",
36
36
  "@types/cross-spawn": "^6.0.2",
@@ -38,7 +38,7 @@
38
38
  "@types/degit": "^2.8.6",
39
39
  "@types/dns2": "^2.0.3",
40
40
  "@types/esprima": "^4.0.3",
41
- "@types/node": "^18.19.59",
41
+ "@types/node": "^18.19.75",
42
42
  "@types/semver": "^7.5.1",
43
43
  "@types/which-pm-runs": "^1.0.0",
44
44
  "@types/yargs": "^17.0.22",
@@ -46,12 +46,13 @@
46
46
  "@typescript-eslint/parser": "^6.9.0",
47
47
  "chalk": "^5.2.0",
48
48
  "command-exists": "^1.2.9",
49
+ "comment-json": "^4.2.5",
49
50
  "cross-spawn": "^7.0.3",
50
51
  "deepmerge": "^4.3.1",
51
52
  "degit": "^2.8.4",
52
53
  "dns2": "^2.1.0",
53
54
  "dotenv": "^16.0.0",
54
- "esbuild": "0.17.19",
55
+ "esbuild": "0.24.2",
55
56
  "execa": "^7.1.1",
56
57
  "glob": "^10.3.3",
57
58
  "haikunator": "^2.1.2",
@@ -59,23 +60,29 @@
59
60
  "magic-string": "^0.30.5",
60
61
  "open": "^8.4.0",
61
62
  "recast": "^0.22.0",
62
- "semver": "^7.5.1",
63
- "undici": "^5.28.4",
63
+ "semver": "^7.7.1",
64
+ "typescript": "^5.7.2",
65
+ "undici": "^5.28.5",
66
+ "vite": "^5.4.14",
64
67
  "vite-tsconfig-paths": "^4.0.8",
68
+ "vitest": "~3.0.5",
65
69
  "which-pm-runs": "^1.1.0",
66
70
  "wrap-ansi": "^9.0.0",
67
71
  "xdg-app-paths": "^8.3.0",
68
72
  "yargs": "^17.7.2",
69
- "@cloudflare/eslint-config-worker": "1.1.0",
70
73
  "@cloudflare/cli": "1.1.1",
74
+ "@cloudflare/vite-plugin": "0.0.0-edf169d15",
71
75
  "@cloudflare/workers-tsconfig": "0.0.0",
72
- "wrangler": "0.0.0-edec41591"
76
+ "@cloudflare/mock-npm-registry": "0.0.0",
77
+ "@cloudflare/eslint-config-worker": "1.1.0",
78
+ "wrangler": "0.0.0-edf169d15"
73
79
  },
74
80
  "engines": {
75
81
  "node": ">=18.14.1"
76
82
  },
77
83
  "workers-sdk": {
78
- "prerelease": true
84
+ "prerelease": true,
85
+ "type": "cli"
79
86
  },
80
87
  "volta": {
81
88
  "extends": "../../package.json"
@@ -92,7 +99,7 @@
92
99
  "test:e2e:yarn": "pnpm run build && cross-env TEST_PM=yarn vitest run --config ./vitest-e2e.config.mts",
93
100
  "test:unit": "vitest run --config ./vitest.config.mts",
94
101
  "test:unit:watch": "vitest --config ./vitest.config.mts",
95
- "watch": "node -r esbuild-register scripts/build.ts --watch",
102
+ "dev": "node -r esbuild-register scripts/build.ts --watch",
96
103
  "test:ci": "vitest run --config ./vitest.config.mts"
97
104
  }
98
105
  }
@@ -1,4 +1,4 @@
1
1
  // Generated by Wrangler
2
- // After adding bindings to `wrangler.toml`, regenerate this interface via `npm run cf-typegen`
2
+ // After adding bindings to `wrangler.jsonc`, regenerate this interface via `npm run cf-typegen`
3
3
  interface Env {
4
4
  }
@@ -0,0 +1,5 @@
1
+ {
2
+ "name": "<TBD>",
3
+ "compatibility_date": "<TBD>",
4
+ "pages_build_output_dir": "./dist/analog/public"
5
+ }
@@ -1,102 +1,9 @@
1
- import { resolve } from "node:path";
2
- import { logRaw } from "@cloudflare/cli";
3
- import { brandColor, dim } from "@cloudflare/cli/colors";
4
- import { spinner } from "@cloudflare/cli/interactive";
5
- import { runFrameworkGenerator } from "frameworks/index";
6
- import { compatDateFlag } from "helpers/compatDate";
7
- import { readFile, readJSON, writeFile } from "helpers/files";
8
- import { detectPackageManager } from "helpers/packageManagers";
9
- import { installPackages } from "helpers/packages";
10
- import type { TemplateConfig } from "../../src/templates";
11
- import type { C3Context } from "types";
1
+ import pages from "./pages/c3";
2
+ import workers from "./workers/c3";
3
+ import type { MultiPlatformTemplateConfig } from "../../src/templates";
12
4
 
13
- const { npm } = detectPackageManager();
14
-
15
- const generate = async (ctx: C3Context) => {
16
- await runFrameworkGenerator(ctx, [ctx.project.name, "--ssr"]);
17
- logRaw("");
18
- };
19
-
20
- const configure = async (ctx: C3Context) => {
21
- updateAngularJson(ctx);
22
- await updateAppCode();
23
- await installCFWorker();
24
- };
25
-
26
- async function installCFWorker() {
27
- await installPackages(
28
- ["@cloudflare/workers-types", "@miniflare/tre@next", "wrangler@beta"],
29
- {
30
- dev: true,
31
- startText: "Installing adapter dependencies",
32
- doneText: `${brandColor("installed")} ${dim(`via \`${npm} install\``)}`,
33
- },
34
- );
35
- }
36
- async function updateAppCode() {
37
- const s = spinner();
38
- s.start(`Updating application code`);
39
-
40
- // Update an app config file to:
41
- // - add the `provideHttpClient(withFetch())` call to enable `fetch` usage in `HttpClient`
42
- const appConfigPath = "src/app/app.config.ts";
43
- const appConfig = readFile(resolve(appConfigPath));
44
- const newAppConfig =
45
- "import { provideHttpClient, withFetch } from '@angular/common/http';\n" +
46
- appConfig.replace(
47
- "providers: [",
48
- "providers: [provideHttpClient(withFetch()), ",
49
- );
50
- writeFile(resolve(appConfigPath), newAppConfig);
51
- s.stop(`${brandColor(`updated`)} ${dim(appConfigPath)}`);
52
-
53
- // Remove unwanted dependencies
54
- s.start(`Updating package.json`);
55
- const packageJsonPath = resolve("package.json");
56
- const packageManifest = readJSON(packageJsonPath);
57
-
58
- delete packageManifest["dependencies"]["@angular/ssr"];
59
- delete packageManifest["dependencies"]["express"];
60
- delete packageManifest["devDependencies"]["@types/express"];
61
-
62
- writeFile(packageJsonPath, JSON.stringify(packageManifest, null, 2));
63
- s.stop(`${brandColor(`updated`)} ${dim(`\`package.json\``)}`);
64
- }
65
-
66
- function updateAngularJson(ctx: C3Context) {
67
- const s = spinner();
68
- s.start(`Updating angular.json config`);
69
- const angularJson = readJSON(resolve("angular.json"));
70
- // Update builder
71
- const architectSection = angularJson.projects[ctx.project.name].architect;
72
- architectSection.build.options.outputPath = "dist";
73
- architectSection.build.options.assets.push("src/_routes.json");
74
-
75
- writeFile(resolve("angular.json"), JSON.stringify(angularJson, null, 2));
76
- s.stop(`${brandColor(`updated`)} ${dim(`\`angular.json\``)}`);
77
- }
78
-
79
- const config: TemplateConfig = {
80
- configVersion: 1,
81
- id: "angular",
82
- frameworkCli: "@angular/create",
5
+ const config: MultiPlatformTemplateConfig = {
83
6
  displayName: "Angular",
84
- platform: "pages",
85
- copyFiles: {
86
- path: "./templates",
87
- },
88
- devScript: "start",
89
- deployScript: "deploy",
90
- generate,
91
- configure,
92
- transformPackageJson: async () => ({
93
- scripts: {
94
- start: `${npm} run build && wrangler pages dev dist/cloudflare ${await compatDateFlag()} --experimental-local`,
95
- build: `ng build && ${npm} run process`,
96
- process:
97
- "node ./tools/copy-files.mjs && node ./tools/alter-polyfills.mjs",
98
- deploy: `${npm} run build && wrangler pages deploy dist/cloudflare`,
99
- },
100
- }),
7
+ platformVariants: { pages, workers },
101
8
  };
102
9
  export default config;
@@ -0,0 +1,134 @@
1
+ import { resolve } from "node:path";
2
+ import { logRaw } from "@cloudflare/cli";
3
+ import { brandColor, dim } from "@cloudflare/cli/colors";
4
+ import { spinner } from "@cloudflare/cli/interactive";
5
+ import { runFrameworkGenerator } from "frameworks/index";
6
+ import { compatDateFlag } from "helpers/compatDate";
7
+ import { readFile, readJSON, writeFile } from "helpers/files";
8
+ import { detectPackageManager } from "helpers/packageManagers";
9
+ import { installPackages } from "helpers/packages";
10
+ import type { TemplateConfig } from "../../../src/templates";
11
+ import type { C3Context, PackageJson } from "types";
12
+
13
+ const { npm } = detectPackageManager();
14
+
15
+ const generate = async (ctx: C3Context) => {
16
+ await runFrameworkGenerator(ctx, [
17
+ ctx.project.name,
18
+ "--ssr",
19
+ "--server-routing" /** Dev Preview API */,
20
+ ]);
21
+ logRaw("");
22
+ };
23
+
24
+ const configure = async (ctx: C3Context) => {
25
+ updateAngularJson(ctx);
26
+ await updateAppCode();
27
+ await installCFWorker();
28
+ };
29
+
30
+ async function installCFWorker() {
31
+ await installPackages(["xhr2"], {
32
+ dev: true,
33
+ startText: "Installing additional dependencies",
34
+ doneText: `${brandColor("installed")} ${dim(`via \`${npm} install\``)}`,
35
+ });
36
+ }
37
+ async function updateAppCode() {
38
+ const s = spinner();
39
+ s.start(`Updating application code`);
40
+
41
+ // Update an app config file to:
42
+ // - add the `provideHttpClient(withFetch())` call to enable `fetch` usage in `HttpClient`
43
+ const appConfigPath = "src/app/app.config.ts";
44
+ const appConfig = readFile(resolve(appConfigPath));
45
+ const newAppConfig =
46
+ "import { provideHttpClient, withFetch } from '@angular/common/http';\n" +
47
+ appConfig.replace(
48
+ "providers: [",
49
+ "providers: [provideHttpClient(withFetch()), ",
50
+ );
51
+ writeFile(resolve(appConfigPath), newAppConfig);
52
+ s.stop(`${brandColor(`updated`)} ${dim(appConfigPath)}`);
53
+
54
+ // Update an app server routes file to:
55
+ const appServerRoutesPath = "src/app/app.routes.server.ts";
56
+ const appRoutes = readFile(resolve(appServerRoutesPath));
57
+ const newAppRoutes = appRoutes.replace(
58
+ "RenderMode.Prerender",
59
+ "RenderMode.Server",
60
+ );
61
+ writeFile(resolve(appServerRoutesPath), newAppRoutes);
62
+ s.stop(`${brandColor(`updated`)} ${dim(appServerRoutesPath)}`);
63
+
64
+ // Remove unwanted dependencies
65
+ s.start(`Updating package.json`);
66
+ const packageJsonPath = resolve("package.json");
67
+ const packageManifest = readJSON(packageJsonPath) as PackageJson;
68
+
69
+ delete packageManifest["dependencies"]?.["express"];
70
+ delete packageManifest["devDependencies"]?.["@types/express"];
71
+
72
+ writeFile(packageJsonPath, JSON.stringify(packageManifest, null, 2));
73
+ s.stop(`${brandColor(`updated`)} ${dim(`\`package.json\``)}`);
74
+ }
75
+
76
+ function updateAngularJson(ctx: C3Context) {
77
+ const s = spinner();
78
+ s.start(`Updating angular.json config`);
79
+ const angularJson = readJSON("angular.json") as AngularJson;
80
+
81
+ // Update builder
82
+ const architectSection = angularJson.projects[ctx.project.name].architect;
83
+ architectSection.build.options.outputPath = "dist";
84
+ architectSection.build.options.outputMode = "server";
85
+ architectSection.build.options.ssr.experimentalPlatform = "neutral";
86
+ architectSection.build.options.assets.push("src/_routes.json");
87
+
88
+ writeFile(resolve("angular.json"), JSON.stringify(angularJson, null, 2));
89
+ s.stop(`${brandColor(`updated`)} ${dim(`\`angular.json\``)}`);
90
+ }
91
+
92
+ const config: TemplateConfig = {
93
+ configVersion: 1,
94
+ id: "angular",
95
+ frameworkCli: "@angular/create",
96
+ displayName: "Angular",
97
+ platform: "pages",
98
+ copyFiles: {
99
+ path: "./templates",
100
+ },
101
+ path: "templates/angular/pages",
102
+ devScript: "start",
103
+ deployScript: "deploy",
104
+ previewScript: "start",
105
+ generate,
106
+ configure,
107
+ transformPackageJson: async () => ({
108
+ scripts: {
109
+ start: `${npm} run build && wrangler pages dev dist/cloudflare ${await compatDateFlag()}`,
110
+ build: `ng build && ${npm} run process`,
111
+ process: "node ./tools/copy-files.mjs",
112
+ deploy: `${npm} run build && wrangler pages deploy dist/cloudflare`,
113
+ },
114
+ }),
115
+ };
116
+ export default config;
117
+
118
+ type AngularJson = {
119
+ projects: Record<
120
+ string,
121
+ {
122
+ architect: {
123
+ build: {
124
+ options: {
125
+ outputPath: string;
126
+ outputMode: string;
127
+ ssr: Record<string, unknown>;
128
+ assets: string[];
129
+ };
130
+ };
131
+ };
132
+ }
133
+ >;
134
+ };
@@ -0,0 +1,15 @@
1
+ import { AngularAppEngine, createRequestHandler } from '@angular/ssr';
2
+
3
+ const angularApp = new AngularAppEngine();
4
+
5
+ /**
6
+ * This is a request handler used by the Angular CLI (dev-server and during build).
7
+ */
8
+ export const reqHandler = createRequestHandler(async (req) => {
9
+ const res = await angularApp.handle(req);
10
+
11
+ return res ?? new Response('Page not found.', { status: 404 });
12
+ });
13
+
14
+
15
+ export default { fetch: reqHandler };
@@ -0,0 +1,15 @@
1
+ // Copy the files over so that they can be uploaded by the pages publish command.
2
+ import fs from "node:fs";
3
+ import { join, resolve } from "node:path";
4
+ import { fileURLToPath } from "node:url";
5
+
6
+ const root = resolve(fileURLToPath(import.meta.url), "../../");
7
+ const client = resolve(root, "dist/browser");
8
+ const ssr = resolve(root, "dist/server");
9
+ const cloudflare = resolve(root, "dist/cloudflare");
10
+ const worker = resolve(cloudflare, "_worker.js");
11
+
12
+ fs.cpSync(client, cloudflare, { recursive: true });
13
+ fs.cpSync(ssr, worker, { recursive: true });
14
+
15
+ fs.renameSync(join(worker, "server.mjs"), join(worker, "index.js"));
@@ -6,13 +6,17 @@ import { runFrameworkGenerator } from "frameworks/index";
6
6
  import { readFile, readJSON, writeFile } from "helpers/files";
7
7
  import { detectPackageManager } from "helpers/packageManagers";
8
8
  import { installPackages } from "helpers/packages";
9
- import type { TemplateConfig } from "../../src/templates";
10
- import type { C3Context } from "types";
9
+ import type { TemplateConfig } from "../../../src/templates";
10
+ import type { C3Context, PackageJson } from "types";
11
11
 
12
12
  const { npm } = detectPackageManager();
13
13
 
14
14
  const generate = async (ctx: C3Context) => {
15
- await runFrameworkGenerator(ctx, [ctx.project.name, "--ssr"]);
15
+ await runFrameworkGenerator(ctx, [
16
+ ctx.project.name,
17
+ "--ssr",
18
+ "--server-routing" /** Dev Preview API */,
19
+ ]);
16
20
  logRaw("");
17
21
  };
18
22
 
@@ -23,9 +27,9 @@ const configure = async (ctx: C3Context) => {
23
27
  };
24
28
 
25
29
  async function installCFWorker() {
26
- await installPackages(["@cloudflare/workers-types", "wrangler"], {
30
+ await installPackages(["xhr2"], {
27
31
  dev: true,
28
- startText: "Installing adapter dependencies",
32
+ startText: "Installing additional dependencies",
29
33
  doneText: `${brandColor("installed")} ${dim(`via \`${npm} install\``)}`,
30
34
  });
31
35
  }
@@ -46,14 +50,23 @@ async function updateAppCode() {
46
50
  writeFile(resolve(appConfigPath), newAppConfig);
47
51
  s.stop(`${brandColor(`updated`)} ${dim(appConfigPath)}`);
48
52
 
53
+ // Update an app server routes file to:
54
+ const appServerRoutesPath = "src/app/app.routes.server.ts";
55
+ const appRoutes = readFile(resolve(appServerRoutesPath));
56
+ const newAppRoutes = appRoutes.replace(
57
+ "RenderMode.Prerender",
58
+ "RenderMode.Server",
59
+ );
60
+ writeFile(resolve(appServerRoutesPath), newAppRoutes);
61
+ s.stop(`${brandColor(`updated`)} ${dim(appServerRoutesPath)}`);
62
+
49
63
  // Remove unwanted dependencies
50
64
  s.start(`Updating package.json`);
51
65
  const packageJsonPath = resolve("package.json");
52
- const packageManifest = readJSON(packageJsonPath);
66
+ const packageManifest = readJSON(packageJsonPath) as PackageJson;
53
67
 
54
- delete packageManifest["dependencies"]["@angular/ssr"];
55
- delete packageManifest["dependencies"]["express"];
56
- delete packageManifest["devDependencies"]["@types/express"];
68
+ delete packageManifest["dependencies"]?.["express"];
69
+ delete packageManifest["devDependencies"]?.["@types/express"];
57
70
 
58
71
  writeFile(packageJsonPath, JSON.stringify(packageManifest, null, 2));
59
72
  s.stop(`${brandColor(`updated`)} ${dim(`\`package.json\``)}`);
@@ -62,11 +75,12 @@ async function updateAppCode() {
62
75
  function updateAngularJson(ctx: C3Context) {
63
76
  const s = spinner();
64
77
  s.start(`Updating angular.json config`);
65
- const angularJson = readJSON(resolve("angular.json"));
78
+ const angularJson = readJSON(resolve("angular.json")) as AngularJson;
66
79
  // Update builder
67
80
  const architectSection = angularJson.projects[ctx.project.name].architect;
68
81
  architectSection.build.options.outputPath = "dist";
69
- architectSection.build.options.assets.push("src/_routes.json");
82
+ architectSection.build.options.outputMode = "server";
83
+ architectSection.build.options.ssr.experimentalPlatform = "neutral";
70
84
 
71
85
  writeFile(resolve("angular.json"), JSON.stringify(angularJson, null, 2));
72
86
  s.stop(`${brandColor(`updated`)} ${dim(`\`angular.json\``)}`);
@@ -81,18 +95,36 @@ const config: TemplateConfig = {
81
95
  copyFiles: {
82
96
  path: "./templates",
83
97
  },
84
- path: "templates-experimental/angular",
98
+ path: "templates/angular/workers",
85
99
  devScript: "start",
86
100
  deployScript: "deploy",
101
+ previewScript: "start",
87
102
  generate,
88
103
  configure,
89
104
  transformPackageJson: async () => ({
90
105
  scripts: {
91
106
  start: `${npm} run build && wrangler dev`,
92
- build: `ng build && ${npm} run process`,
93
- process: "node ./tools/alter-polyfills.mjs",
107
+ build: `ng build`,
94
108
  deploy: `${npm} run build && wrangler deploy`,
95
109
  },
96
110
  }),
97
111
  };
98
112
  export default config;
113
+
114
+ type AngularJson = {
115
+ projects: Record<
116
+ string,
117
+ {
118
+ architect: {
119
+ build: {
120
+ options: {
121
+ outputPath: string;
122
+ outputMode: string;
123
+ ssr: Record<string, unknown>;
124
+ assets: string[];
125
+ };
126
+ };
127
+ };
128
+ }
129
+ >;
130
+ };
@@ -0,0 +1,15 @@
1
+ import { AngularAppEngine, createRequestHandler } from '@angular/ssr';
2
+
3
+ const angularApp = new AngularAppEngine();
4
+
5
+ /**
6
+ * This is a request handler used by the Angular CLI (dev-server and during build).
7
+ */
8
+ export const reqHandler = createRequestHandler(async (req) => {
9
+ const res = await angularApp.handle(req);
10
+
11
+ return res ?? new Response('Page not found.', { status: 404 });
12
+ });
13
+
14
+
15
+ export default { fetch: reqHandler };
@@ -0,0 +1,12 @@
1
+ {
2
+ "name": "<TBD>",
3
+ "main": "./dist/server/server.mjs",
4
+ "compatibility_date": "<TBD>",
5
+ "assets": {
6
+ "binding": "ASSETS",
7
+ "directory": "./dist/browser"
8
+ },
9
+ "observability": {
10
+ "enabled": true
11
+ }
12
+ }
@@ -1,7 +1,7 @@
1
1
  import { logRaw, updateStatus } from "@cloudflare/cli";
2
2
  import { blue, brandColor, dim } from "@cloudflare/cli/colors";
3
3
  import { runFrameworkGenerator } from "frameworks/index";
4
- import { loadTemplateSnippets, transformFile } from "helpers/codemod";
4
+ import { transformFile } from "helpers/codemod";
5
5
  import { runCommand } from "helpers/command";
6
6
  import { usesTypescript } from "helpers/files";
7
7
  import { detectPackageManager } from "helpers/packageManagers";
@@ -17,7 +17,7 @@ const generate = async (ctx: C3Context) => {
17
17
  logRaw(""); // newline
18
18
  };
19
19
 
20
- const configure = async (ctx: C3Context) => {
20
+ const configure = async () => {
21
21
  await runCommand([npx, "astro", "add", "cloudflare", "-y"], {
22
22
  silent: true,
23
23
  startText: "Installing adapter",
@@ -27,7 +27,6 @@ const configure = async (ctx: C3Context) => {
27
27
  });
28
28
 
29
29
  updateAstroConfig();
30
- updateEnvDeclaration(ctx);
31
30
  };
32
31
 
33
32
  const updateAstroConfig = () => {
@@ -59,35 +58,6 @@ const updateAstroConfig = () => {
59
58
  });
60
59
  };
61
60
 
62
- const updateEnvDeclaration = (ctx: C3Context) => {
63
- if (!usesTypescript(ctx)) {
64
- return;
65
- }
66
-
67
- const filePath = "src/env.d.ts";
68
-
69
- updateStatus(`Adding type declarations in ${blue(filePath)}`);
70
-
71
- transformFile(filePath, {
72
- visitProgram: function (n) {
73
- const snippets = loadTemplateSnippets(ctx);
74
- const patch = snippets.runtimeDeclarationTs;
75
- const b = recast.types.builders;
76
-
77
- // Preserve comments with the new body
78
- const comments = n.get("comments").value;
79
- n.node.comments = comments.map((c: recast.types.namedTypes.CommentLine) =>
80
- b.commentLine(c.value),
81
- );
82
-
83
- // Add the patch
84
- n.get("body").push(...patch);
85
-
86
- return false;
87
- },
88
- });
89
- };
90
-
91
61
  const config: TemplateConfig = {
92
62
  configVersion: 1,
93
63
  id: "astro",
@@ -95,7 +65,21 @@ const config: TemplateConfig = {
95
65
  platform: "pages",
96
66
  displayName: "Astro",
97
67
  copyFiles: {
98
- path: "./templates",
68
+ async selectVariant(ctx) {
69
+ // Note: this `selectVariant` function should not be needed
70
+ // this is just a quick workaround until
71
+ // https://github.com/cloudflare/workers-sdk/issues/7495
72
+ // is resolved
73
+ return usesTypescript(ctx) ? "ts" : "js";
74
+ },
75
+ variants: {
76
+ js: {
77
+ path: "./templates/js",
78
+ },
79
+ ts: {
80
+ path: "./templates/ts",
81
+ },
82
+ },
99
83
  },
100
84
  devScript: "dev",
101
85
  deployScript: "deploy",
@@ -0,0 +1,8 @@
1
+ {
2
+ "name": "<TBD>",
3
+ "compatibility_date": "<TBD>",
4
+ "compatibility_flags": [
5
+ "nodejs_compat"
6
+ ],
7
+ "pages_build_output_dir": "./dist"
8
+ }
@@ -0,0 +1,4 @@
1
+ // Generated by Wrangler
2
+ // After adding bindings to `wrangler.jsonc`, regenerate this interface via `npm run cf-typegen`
3
+ interface Env {
4
+ }
@@ -0,0 +1,8 @@
1
+ {
2
+ "name": "<TBD>",
3
+ "compatibility_date": "<TBD>",
4
+ "compatibility_flags": [
5
+ "nodejs_compat"
6
+ ],
7
+ "pages_build_output_dir": "./dist"
8
+ }
@@ -9,6 +9,6 @@
9
9
  },
10
10
  "devDependencies": {
11
11
  "itty-router": "^3.0.12",
12
- "wrangler": "^3.60.3"
12
+ "wrangler": "^3.101.0"
13
13
  }
14
14
  }
@@ -0,0 +1,8 @@
1
+ {
2
+ "name": "<TBD>",
3
+ "main": "src/index.js",
4
+ "compatibility_date": "<TBD>",
5
+ "observability": {
6
+ "enabled": true
7
+ }
8
+ }
@@ -11,6 +11,6 @@
11
11
  "devDependencies": {
12
12
  "itty-router": "^3.0.12",
13
13
  "typescript": "^5.5.2",
14
- "wrangler": "^3.60.3"
14
+ "wrangler": "^3.101.0"
15
15
  }
16
16
  }
@@ -5,7 +5,7 @@
5
5
  * - Open a browser tab at http://localhost:8787/ to see your worker in action
6
6
  * - Run `npm run deploy` to publish your worker
7
7
  *
8
- * Bind resources to your worker in `wrangler.toml`. After adding bindings, a type definition for the
8
+ * Bind resources to your Worker in `wrangler.jsonc`. After adding bindings, a type definition for the
9
9
  * `Env` object can be regenerated with `npm run cf-typegen`.
10
10
  *
11
11
  * Learn more at https://developers.cloudflare.com/workers/
@@ -1,4 +1,4 @@
1
1
  // Generated by Wrangler
2
- // After adding bindings to `wrangler.toml`, regenerate this interface via `npm run cf-typegen`
2
+ // After adding bindings to `wrangler.jsonc`, regenerate this interface via `npm run cf-typegen`
3
3
  interface Env {
4
4
  }