create-cloudflare 0.0.0-e739b7fe → 0.0.0-e771fe990

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 (212) hide show
  1. package/README.md +1 -1
  2. package/dist/cli.js +58975 -57846
  3. package/dist/tsconfig.tsbuildinfo +1 -0
  4. package/package.json +29 -25
  5. package/templates/analog/c3.ts +135 -0
  6. package/templates/analog/snippets/devBindingsModule.ts +7 -0
  7. package/templates/analog/templates/env.d.ts +13 -0
  8. package/templates/analog/templates/src/dev-bindings.ts +18 -0
  9. package/templates/analog/templates/worker-configuration.d.ts +4 -0
  10. package/templates/{svelte/js → analog/templates}/wrangler.toml +35 -2
  11. package/templates/angular/c3.ts +28 -14
  12. package/templates/angular/templates/src/server.ts +15 -0
  13. package/templates/angular/templates/tools/copy-files.mjs +8 -2
  14. package/templates/astro/c3.ts +25 -40
  15. package/templates/astro/templates/js/wrangler.toml +86 -0
  16. package/templates/astro/templates/ts/src/env.d.ts +5 -0
  17. package/templates/astro/templates/ts/worker-configuration.d.ts +4 -0
  18. package/templates/astro/templates/ts/wrangler.toml +86 -0
  19. package/templates/common/c3.ts +3 -0
  20. package/templates/common/js/package.json +1 -1
  21. package/templates/common/js/wrangler.toml +17 -1
  22. package/templates/common/ts/package.json +4 -3
  23. package/templates/common/ts/src/ab-test.ts +2 -2
  24. package/templates/common/ts/src/index.ts +5 -2
  25. package/templates/common/ts/src/proxy.ts +2 -2
  26. package/templates/common/ts/src/redirect.ts +2 -2
  27. package/templates/common/ts/tsconfig.json +37 -95
  28. package/templates/common/ts/worker-configuration.d.ts +2 -14
  29. package/templates/common/ts/wrangler.toml +17 -1
  30. package/templates/docusaurus/c3.ts +3 -1
  31. package/templates/gatsby/c3.ts +1 -0
  32. package/templates/hello-world/c3.ts +5 -1
  33. package/templates/hello-world/js/package.json +5 -4
  34. package/templates/hello-world/js/test/index.spec.js +17 -17
  35. package/templates/hello-world/js/vitest.config.js +8 -8
  36. package/templates/hello-world/js/wrangler.toml +17 -2
  37. package/templates/hello-world/py/__dot__gitignore +68 -0
  38. package/templates/hello-world/py/package.json +13 -0
  39. package/templates/hello-world/py/src/entry.py +4 -0
  40. package/templates/hello-world/py/wrangler.toml +114 -0
  41. package/templates/hello-world/ts/package.json +6 -5
  42. package/templates/hello-world/ts/src/index.ts +5 -19
  43. package/templates/hello-world/ts/test/index.spec.ts +17 -17
  44. package/templates/hello-world/ts/test/tsconfig.json +6 -9
  45. package/templates/hello-world/ts/tsconfig.json +38 -96
  46. package/templates/hello-world/ts/vitest.config.mts +11 -0
  47. package/templates/hello-world/ts/worker-configuration.d.ts +4 -0
  48. package/templates/hello-world/ts/wrangler.toml +17 -2
  49. package/templates/hello-world-durable-object/c3.ts +3 -1
  50. package/templates/hello-world-durable-object/js/package.json +1 -1
  51. package/templates/hello-world-durable-object/js/src/index.js +18 -14
  52. package/templates/hello-world-durable-object/js/wrangler.toml +18 -2
  53. package/templates/hello-world-durable-object/ts/package.json +4 -4
  54. package/templates/hello-world-durable-object/ts/src/index.ts +24 -37
  55. package/templates/hello-world-durable-object/ts/tsconfig.json +36 -95
  56. package/templates/hello-world-durable-object/ts/worker-configuration.d.ts +5 -0
  57. package/templates/hello-world-durable-object/ts/wrangler.toml +19 -4
  58. package/templates/hono/c3.ts +44 -0
  59. package/templates/hono/snippets/appDeclaration.ts +1 -0
  60. package/templates/hono/templates/worker-configuration.d.ts +4 -0
  61. package/templates/hono/templates/wrangler.toml +113 -0
  62. package/templates/next/README.md +8 -8
  63. package/templates/next/app/js/app/api/hello/route.js +5 -5
  64. package/templates/next/app/ts/app/api/hello/route.ts +5 -6
  65. package/templates/next/c3.ts +40 -22
  66. package/templates/next/pages/js/pages/api/hello.js +1 -1
  67. package/templates/next/pages/ts/pages/api/hello.ts +1 -1
  68. package/templates/next/wrangler.toml +33 -5
  69. package/templates/nuxt/c3.ts +14 -14
  70. package/templates/nuxt/templates/worker-configuration.d.ts +1 -1
  71. package/templates/nuxt/templates/wrangler.toml +36 -2
  72. package/templates/openapi/c3.ts +1 -0
  73. package/templates/openapi/ts/README.md +3 -3
  74. package/templates/openapi/ts/package.json +7 -4
  75. package/templates/openapi/ts/src/endpoints/taskCreate.ts +26 -16
  76. package/templates/openapi/ts/src/endpoints/taskDelete.ts +20 -19
  77. package/templates/openapi/ts/src/endpoints/taskFetch.ts +30 -23
  78. package/templates/openapi/ts/src/endpoints/taskList.ts +27 -24
  79. package/templates/openapi/ts/src/index.ts +14 -20
  80. package/templates/openapi/ts/src/types.ts +9 -8
  81. package/templates/openapi/ts/worker-configuration.d.ts +4 -0
  82. package/templates/openapi/ts/wrangler.toml +110 -0
  83. package/templates/pre-existing/c3.ts +33 -14
  84. package/templates/pre-existing/js/package.json +1 -1
  85. package/templates/pre-existing/js/wrangler.toml +1 -0
  86. package/templates/queues/c3.ts +2 -0
  87. package/templates/queues/js/package.json +1 -1
  88. package/templates/queues/js/wrangler.toml +17 -1
  89. package/templates/queues/ts/package.json +4 -3
  90. package/templates/queues/ts/src/index.ts +6 -8
  91. package/templates/queues/ts/tsconfig.json +36 -95
  92. package/templates/queues/ts/worker-configuration.d.ts +5 -0
  93. package/templates/queues/ts/wrangler.toml +17 -1
  94. package/templates/qwik/c3.ts +10 -9
  95. package/templates/qwik/templates/worker-configuration.d.ts +1 -1
  96. package/templates/qwik/templates/wrangler.toml +36 -2
  97. package/templates/react/c3.ts +33 -3
  98. package/templates/remix/c3.ts +5 -4
  99. package/templates/remix/templates/worker-configuration.d.ts +1 -1
  100. package/templates/remix/templates/wrangler.toml +35 -2
  101. package/templates/scheduled/c3.ts +2 -0
  102. package/templates/scheduled/js/package.json +3 -3
  103. package/templates/scheduled/js/src/index.js +8 -1
  104. package/templates/scheduled/js/wrangler.toml +18 -2
  105. package/templates/scheduled/ts/package.json +5 -4
  106. package/templates/scheduled/ts/src/index.ts +6 -23
  107. package/templates/scheduled/ts/tsconfig.json +36 -95
  108. package/templates/scheduled/ts/worker-configuration.d.ts +4 -0
  109. package/templates/scheduled/ts/wrangler.toml +18 -2
  110. package/templates/solid/c3.ts +18 -13
  111. package/templates/{astro → solid}/templates/wrangler.toml +33 -1
  112. package/templates/svelte/c3.ts +43 -15
  113. package/templates/svelte/{ts → templates}/wrangler.toml +35 -2
  114. package/templates/vue/c3.ts +1 -0
  115. package/templates-experimental/angular/c3.ts +112 -0
  116. package/templates-experimental/angular/templates/src/server.ts +15 -0
  117. package/templates-experimental/angular/templates/wrangler.toml +11 -0
  118. package/templates-experimental/astro/c3.ts +98 -0
  119. package/templates-experimental/astro/templates/js/public/.assetsignore +4 -0
  120. package/templates-experimental/astro/templates/js/wrangler.toml +12 -0
  121. package/templates-experimental/astro/templates/ts/public/.assetsignore +4 -0
  122. package/templates-experimental/astro/templates/ts/src/env.d.ts +5 -0
  123. package/templates-experimental/astro/templates/ts/worker-configuration.d.ts +4 -0
  124. package/templates-experimental/astro/templates/ts/wrangler.toml +12 -0
  125. package/templates-experimental/docusaurus/c3.ts +32 -0
  126. package/templates-experimental/docusaurus/templates/wrangler.toml +10 -0
  127. package/templates-experimental/gatsby/c3.ts +53 -0
  128. package/templates-experimental/gatsby/templates/wrangler.toml +10 -0
  129. package/templates-experimental/hello-world-assets-only/c3.ts +15 -0
  130. package/templates-experimental/hello-world-assets-only/templates/package.json +13 -0
  131. package/templates-experimental/hello-world-assets-only/templates/public/index.html +11 -0
  132. package/templates-experimental/hello-world-assets-only/templates/wrangler.toml +10 -0
  133. package/templates-experimental/hello-world-durable-object-with-assets/c3.ts +23 -0
  134. package/templates-experimental/hello-world-durable-object-with-assets/js/.editorconfig +12 -0
  135. package/templates-experimental/hello-world-durable-object-with-assets/js/.prettierrc +6 -0
  136. package/templates-experimental/hello-world-durable-object-with-assets/js/__dot__gitignore +172 -0
  137. package/templates-experimental/hello-world-durable-object-with-assets/js/package.json +13 -0
  138. package/templates-experimental/hello-world-durable-object-with-assets/js/public/index.html +19 -0
  139. package/templates-experimental/hello-world-durable-object-with-assets/js/src/index.js +69 -0
  140. package/templates-experimental/hello-world-durable-object-with-assets/js/wrangler.toml +24 -0
  141. package/templates-experimental/hello-world-durable-object-with-assets/ts/.editorconfig +12 -0
  142. package/templates-experimental/hello-world-durable-object-with-assets/ts/.prettierrc +6 -0
  143. package/templates-experimental/hello-world-durable-object-with-assets/ts/__dot__gitignore +172 -0
  144. package/templates-experimental/hello-world-durable-object-with-assets/ts/package.json +15 -0
  145. package/templates-experimental/hello-world-durable-object-with-assets/ts/public/index.html +19 -0
  146. package/templates-experimental/hello-world-durable-object-with-assets/ts/src/index.ts +66 -0
  147. package/templates-experimental/hello-world-durable-object-with-assets/ts/tsconfig.json +42 -0
  148. package/templates-experimental/hello-world-durable-object-with-assets/ts/worker-configuration.d.ts +5 -0
  149. package/templates-experimental/hello-world-durable-object-with-assets/ts/wrangler.toml +24 -0
  150. package/templates-experimental/hello-world-with-assets/c3.ts +22 -0
  151. package/templates-experimental/hello-world-with-assets/js/.editorconfig +12 -0
  152. package/templates-experimental/hello-world-with-assets/js/.prettierrc +6 -0
  153. package/templates-experimental/hello-world-with-assets/js/__dot__gitignore +172 -0
  154. package/templates-experimental/hello-world-with-assets/js/package.json +16 -0
  155. package/templates-experimental/hello-world-with-assets/js/public/index.html +31 -0
  156. package/templates-experimental/hello-world-with-assets/js/src/index.js +23 -0
  157. package/templates-experimental/hello-world-with-assets/js/test/index.spec.js +41 -0
  158. package/templates-experimental/hello-world-with-assets/js/vitest.config.js +11 -0
  159. package/templates-experimental/hello-world-with-assets/js/wrangler.toml +12 -0
  160. package/templates-experimental/hello-world-with-assets/py/__dot__gitignore +68 -0
  161. package/templates-experimental/hello-world-with-assets/py/package.json +13 -0
  162. package/templates-experimental/hello-world-with-assets/py/public/index.html +31 -0
  163. package/templates-experimental/hello-world-with-assets/py/src/entry.py +9 -0
  164. package/templates-experimental/hello-world-with-assets/py/wrangler.toml +12 -0
  165. package/templates-experimental/hello-world-with-assets/ts/.editorconfig +12 -0
  166. package/templates-experimental/hello-world-with-assets/ts/.prettierrc +6 -0
  167. package/templates-experimental/hello-world-with-assets/ts/__dot__gitignore +172 -0
  168. package/templates-experimental/hello-world-with-assets/ts/package.json +18 -0
  169. package/templates-experimental/hello-world-with-assets/ts/public/index.html +31 -0
  170. package/templates-experimental/hello-world-with-assets/ts/src/index.ts +26 -0
  171. package/templates-experimental/hello-world-with-assets/ts/test/index.spec.ts +41 -0
  172. package/templates-experimental/hello-world-with-assets/ts/test/tsconfig.json +8 -0
  173. package/templates-experimental/hello-world-with-assets/ts/tsconfig.json +44 -0
  174. package/templates-experimental/hello-world-with-assets/ts/vitest.config.mts +11 -0
  175. package/templates-experimental/hello-world-with-assets/ts/worker-configuration.d.ts +4 -0
  176. package/templates-experimental/hello-world-with-assets/ts/wrangler.toml +12 -0
  177. package/templates-experimental/hono/c3.ts +43 -0
  178. package/templates-experimental/hono/templates/public/index.html +19 -0
  179. package/templates-experimental/hono/templates/src/index.ts +9 -0
  180. package/templates-experimental/hono/templates/worker-configuration.d.ts +4 -0
  181. package/templates-experimental/hono/templates/wrangler.toml +5 -0
  182. package/templates-experimental/next/c3.ts +59 -0
  183. package/templates-experimental/next/templates/.dev.vars +2 -0
  184. package/templates-experimental/next/templates/__dot__gitignore +39 -0
  185. package/templates-experimental/next/templates/env.d.ts +5 -0
  186. package/templates-experimental/next/templates/open-next.config.ts +28 -0
  187. package/templates-experimental/next/templates/wrangler.toml +12 -0
  188. package/templates-experimental/nuxt/c3.ts +135 -0
  189. package/templates-experimental/nuxt/templates/env.d.ts +14 -0
  190. package/templates-experimental/nuxt/templates/worker-configuration.d.ts +4 -0
  191. package/templates-experimental/nuxt/templates/wrangler.toml +11 -0
  192. package/templates-experimental/qwik/c3.ts +153 -0
  193. package/templates-experimental/qwik/snippets/getPlatformProxy.ts +6 -0
  194. package/templates-experimental/qwik/templates/public/.assetsignore +4 -0
  195. package/templates-experimental/qwik/templates/worker-configuration.d.ts +4 -0
  196. package/templates-experimental/qwik/templates/wrangler.toml +12 -0
  197. package/templates-experimental/remix/c3.ts +52 -0
  198. package/templates-experimental/remix/templates/public/.assetsignore +0 -0
  199. package/templates-experimental/remix/templates/worker-configuration.d.ts +4 -0
  200. package/templates-experimental/remix/templates/wrangler.toml +11 -0
  201. package/templates-experimental/solid/c3.ts +94 -0
  202. package/templates-experimental/solid/templates/wrangler.toml +12 -0
  203. package/templates-experimental/svelte/c3.ts +129 -0
  204. package/templates-experimental/svelte/templates/static/.assetsignore +4 -0
  205. package/templates-experimental/svelte/templates/wrangler.toml +11 -0
  206. package/templates-experimental/vue/c3.ts +33 -0
  207. package/templates-experimental/vue/templates/wrangler.toml +10 -0
  208. package/templates/angular/templates/server.ts +0 -34
  209. package/templates/angular/templates/tools/alter-polyfills.mjs +0 -27
  210. package/templates/angular/templates/tools/paths.mjs +0 -9
  211. package/templates/astro/snippets/runtimeDeclaration.ts +0 -4
  212. package/templates/hello-world/ts/vitest.config.ts +0 -11
@@ -1,9 +1,20 @@
1
+ #:schema node_modules/wrangler/config-schema.json
1
2
  name = "<TBD>"
2
3
  compatibility_date = "<TBD>"
4
+ pages_build_output_dir = "./dist/analog/public"
5
+
6
+ # Automatically place your workloads in an optimal location to minimize latency.
7
+ # If you are running back-end logic in a Pages Function, running it closer to your back-end infrastructure
8
+ # rather than the end user may result in better performance.
9
+ # Docs: https://developers.cloudflare.com/pages/functions/smart-placement/#smart-placement
10
+ # [placement]
11
+ # mode = "smart"
3
12
 
4
13
  # Variable bindings. These are arbitrary, plaintext strings (similar to environment variables)
5
14
  # Note: Use secrets to store sensitive data.
6
- # Docs: https://developers.cloudflare.com/pages/functions/bindings/#environment-variables
15
+ # Docs:
16
+ # - https://developers.cloudflare.com/pages/functions/bindings/#environment-variables
17
+ # - https://developers.cloudflare.com/pages/functions/bindings/#secrets
7
18
  # [vars]
8
19
  # MY_VARIABLE = "production_value"
9
20
 
@@ -49,4 +60,26 @@ compatibility_date = "<TBD>"
49
60
  # Docs: https://developers.cloudflare.com/pages/functions/bindings/#service-bindings
50
61
  # [[services]]
51
62
  # binding = "MY_SERVICE"
52
- # service = "my-service"
63
+ # service = "my-service"
64
+
65
+ # To use different bindings for preview and production environments, follow the examples below.
66
+ # When using environment-specific overrides for bindings, ALL bindings must be specified on a per-environment basis.
67
+ # Docs: https://developers.cloudflare.com/pages/functions/wrangler-configuration#environment-specific-overrides
68
+
69
+ ######## PREVIEW environment config ########
70
+
71
+ # [env.preview.vars]
72
+ # API_KEY = "xyz789"
73
+
74
+ # [[env.preview.kv_namespaces]]
75
+ # binding = "MY_KV_NAMESPACE"
76
+ # id = "<PREVIEW_NAMESPACE_ID>"
77
+
78
+ ######## PRODUCTION environment config ########
79
+
80
+ # [env.production.vars]
81
+ # API_KEY = "abc123"
82
+
83
+ # [[env.production.kv_namespaces]]
84
+ # binding = "MY_KV_NAMESPACE"
85
+ # id = "<PRODUCTION_NAMESPACE_ID>"
@@ -13,7 +13,11 @@ import type { C3Context } from "types";
13
13
  const { npm } = detectPackageManager();
14
14
 
15
15
  const generate = async (ctx: C3Context) => {
16
- await runFrameworkGenerator(ctx, [ctx.project.name, "--ssr"]);
16
+ await runFrameworkGenerator(ctx, [
17
+ ctx.project.name,
18
+ "--ssr",
19
+ "--server-routing" /** Dev Preview API */,
20
+ ]);
17
21
  logRaw("");
18
22
  };
19
23
 
@@ -24,14 +28,11 @@ const configure = async (ctx: C3Context) => {
24
28
  };
25
29
 
26
30
  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
- );
31
+ await installPackages(["xhr2"], {
32
+ dev: true,
33
+ startText: "Installing additional dependencies",
34
+ doneText: `${brandColor("installed")} ${dim(`via \`${npm} install\``)}`,
35
+ });
35
36
  }
36
37
  async function updateAppCode() {
37
38
  const s = spinner();
@@ -45,18 +46,28 @@ async function updateAppCode() {
45
46
  "import { provideHttpClient, withFetch } from '@angular/common/http';\n" +
46
47
  appConfig.replace(
47
48
  "providers: [",
48
- "providers: [provideHttpClient(withFetch()), "
49
+ "providers: [provideHttpClient(withFetch()), ",
49
50
  );
50
51
  writeFile(resolve(appConfigPath), newAppConfig);
51
52
  s.stop(`${brandColor(`updated`)} ${dim(appConfigPath)}`);
52
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
+
53
64
  // Remove unwanted dependencies
54
65
  s.start(`Updating package.json`);
55
66
  const packageJsonPath = resolve("package.json");
56
67
  const packageManifest = readJSON(packageJsonPath);
57
68
 
58
- delete packageManifest["dependencies"]["@angular/ssr"];
59
69
  delete packageManifest["dependencies"]["express"];
70
+ delete packageManifest["devDependencies"]["@types/express"];
60
71
 
61
72
  writeFile(packageJsonPath, JSON.stringify(packageManifest, null, 2));
62
73
  s.stop(`${brandColor(`updated`)} ${dim(`\`package.json\``)}`);
@@ -69,6 +80,8 @@ function updateAngularJson(ctx: C3Context) {
69
80
  // Update builder
70
81
  const architectSection = angularJson.projects[ctx.project.name].architect;
71
82
  architectSection.build.options.outputPath = "dist";
83
+ architectSection.build.options.outputMode = "server";
84
+ architectSection.build.options.ssr.experimentalPlatform = "neutral";
72
85
  architectSection.build.options.assets.push("src/_routes.json");
73
86
 
74
87
  writeFile(resolve("angular.json"), JSON.stringify(angularJson, null, 2));
@@ -78,6 +91,7 @@ function updateAngularJson(ctx: C3Context) {
78
91
  const config: TemplateConfig = {
79
92
  configVersion: 1,
80
93
  id: "angular",
94
+ frameworkCli: "@angular/create",
81
95
  displayName: "Angular",
82
96
  platform: "pages",
83
97
  copyFiles: {
@@ -85,14 +99,14 @@ const config: TemplateConfig = {
85
99
  },
86
100
  devScript: "start",
87
101
  deployScript: "deploy",
102
+ previewScript: "start",
88
103
  generate,
89
104
  configure,
90
105
  transformPackageJson: async () => ({
91
106
  scripts: {
92
- start: `${npm} run build && wrangler pages dev dist/cloudflare ${await compatDateFlag()} --experimental-local`,
107
+ start: `${npm} run build && wrangler pages dev dist/cloudflare ${await compatDateFlag()}`,
93
108
  build: `ng build && ${npm} run process`,
94
- process:
95
- "node ./tools/copy-files.mjs && node ./tools/alter-polyfills.mjs",
109
+ process: "node ./tools/copy-files.mjs",
96
110
  deploy: `${npm} run build && wrangler pages deploy dist/cloudflare`,
97
111
  },
98
112
  }),
@@ -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 };
@@ -1,7 +1,13 @@
1
1
  // Copy the files over so that they can be uploaded by the pages publish command.
2
2
  import fs from "node:fs";
3
- import { join } from "node:path";
4
- import { client, cloudflare, ssr, worker } from "./paths.mjs";
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");
5
11
 
6
12
  fs.cpSync(client, cloudflare, { recursive: true });
7
13
  fs.cpSync(ssr, worker, { recursive: true });
@@ -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,17 +17,16 @@ 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",
24
24
  doneText: `${brandColor("installed")} ${dim(
25
- `via \`${npx} astro add cloudflare\``
25
+ `via \`${npx} astro add cloudflare\``,
26
26
  )}`,
27
27
  });
28
28
 
29
29
  updateAstroConfig();
30
- updateEnvDeclaration(ctx);
31
30
  };
32
31
 
33
32
  const updateAstroConfig = () => {
@@ -46,10 +45,10 @@ const updateAstroConfig = () => {
46
45
  n.node.arguments = [
47
46
  b.objectExpression([
48
47
  b.objectProperty(
49
- b.identifier("runtime"),
48
+ b.identifier("platformProxy"),
50
49
  b.objectExpression([
51
- b.objectProperty(b.identifier("mode"), b.stringLiteral("local")),
52
- ])
50
+ b.objectProperty(b.identifier("enabled"), b.booleanLiteral(true)),
51
+ ]),
53
52
  ),
54
53
  ]),
55
54
  ];
@@ -59,42 +58,28 @@ 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",
64
+ frameworkCli: "create-astro",
94
65
  platform: "pages",
95
66
  displayName: "Astro",
96
67
  copyFiles: {
97
- 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
+ },
98
83
  },
99
84
  devScript: "dev",
100
85
  deployScript: "deploy",
@@ -103,9 +88,9 @@ const config: TemplateConfig = {
103
88
  configure,
104
89
  transformPackageJson: async (pkgJson: PackageJson, ctx: C3Context) => ({
105
90
  scripts: {
106
- deploy: `astro build && wrangler pages deploy ./dist`,
107
- preview: `astro build && wrangler pages dev ./dist`,
108
- ...(usesTypescript(ctx) && { "build-cf-types": `wrangler types` }),
91
+ deploy: `astro build && wrangler pages deploy`,
92
+ preview: `astro build && wrangler pages dev`,
93
+ ...(usesTypescript(ctx) && { "cf-typegen": `wrangler types` }),
109
94
  },
110
95
  }),
111
96
  };
@@ -0,0 +1,86 @@
1
+ #:schema node_modules/wrangler/config-schema.json
2
+ name = "<TBD>"
3
+ compatibility_date = "<TBD>"
4
+ compatibility_flags = ["nodejs_compat"]
5
+ pages_build_output_dir = "./dist"
6
+
7
+ # Automatically place your workloads in an optimal location to minimize latency.
8
+ # If you are running back-end logic in a Pages Function, running it closer to your back-end infrastructure
9
+ # rather than the end user may result in better performance.
10
+ # Docs: https://developers.cloudflare.com/pages/functions/smart-placement/#smart-placement
11
+ # [placement]
12
+ # mode = "smart"
13
+
14
+ # Variable bindings. These are arbitrary, plaintext strings (similar to environment variables)
15
+ # Docs:
16
+ # - https://developers.cloudflare.com/pages/functions/bindings/#environment-variables
17
+ # Note: Use secrets to store sensitive data.
18
+ # - https://developers.cloudflare.com/pages/functions/bindings/#secrets
19
+ # [vars]
20
+ # MY_VARIABLE = "production_value"
21
+
22
+ # Bind the Workers AI model catalog. Run machine learning models, powered by serverless GPUs, on Cloudflare’s global network
23
+ # Docs: https://developers.cloudflare.com/pages/functions/bindings/#workers-ai
24
+ # [ai]
25
+ # binding = "AI"
26
+
27
+ # Bind a D1 database. D1 is Cloudflare’s native serverless SQL database.
28
+ # Docs: https://developers.cloudflare.com/pages/functions/bindings/#d1-databases
29
+ # [[d1_databases]]
30
+ # binding = "MY_DB"
31
+ # database_name = "my-database"
32
+ # database_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
33
+
34
+ # Bind a Durable Object. Durable objects are a scale-to-zero compute primitive based on the actor model.
35
+ # Durable Objects can live for as long as needed. Use these when you need a long-running "server", such as in realtime apps.
36
+ # Docs: https://developers.cloudflare.com/workers/runtime-apis/durable-objects
37
+ # [[durable_objects.bindings]]
38
+ # name = "MY_DURABLE_OBJECT"
39
+ # class_name = "MyDurableObject"
40
+ # script_name = 'my-durable-object'
41
+
42
+ # Bind a KV Namespace. Use KV as persistent storage for small key-value pairs.
43
+ # Docs: https://developers.cloudflare.com/pages/functions/bindings/#kv-namespaces
44
+ # [[kv_namespaces]]
45
+ # binding = "MY_KV_NAMESPACE"
46
+ # id = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
47
+
48
+ # Bind a Queue producer. Use this binding to schedule an arbitrary task that may be processed later by a Queue consumer.
49
+ # Docs: https://developers.cloudflare.com/pages/functions/bindings/#queue-producers
50
+ # [[queues.producers]]
51
+ # binding = "MY_QUEUE"
52
+ # queue = "my-queue"
53
+
54
+ # Bind an R2 Bucket. Use R2 to store arbitrarily large blobs of data, such as files.
55
+ # Docs: https://developers.cloudflare.com/pages/functions/bindings/#r2-buckets
56
+ # [[r2_buckets]]
57
+ # binding = "MY_BUCKET"
58
+ # bucket_name = "my-bucket"
59
+
60
+ # Bind another Worker service. Use this binding to call another Worker without network overhead.
61
+ # Docs: https://developers.cloudflare.com/pages/functions/bindings/#service-bindings
62
+ # [[services]]
63
+ # binding = "MY_SERVICE"
64
+ # service = "my-service"
65
+
66
+ # To use different bindings for preview and production environments, follow the examples below.
67
+ # When using environment-specific overrides for bindings, ALL bindings must be specified on a per-environment basis.
68
+ # Docs: https://developers.cloudflare.com/pages/functions/wrangler-configuration#environment-specific-overrides
69
+
70
+ ######## PREVIEW environment config ########
71
+
72
+ # [env.preview.vars]
73
+ # API_KEY = "xyz789"
74
+
75
+ # [[env.preview.kv_namespaces]]
76
+ # binding = "MY_KV_NAMESPACE"
77
+ # id = "<PREVIEW_NAMESPACE_ID>"
78
+
79
+ ######## PRODUCTION environment config ########
80
+
81
+ # [env.production.vars]
82
+ # API_KEY = "abc123"
83
+
84
+ # [[env.production.kv_namespaces]]
85
+ # binding = "MY_KV_NAMESPACE"
86
+ # id = "<PRODUCTION_NAMESPACE_ID>"
@@ -0,0 +1,5 @@
1
+ type Runtime = import("@astrojs/cloudflare").Runtime<Env>;
2
+
3
+ declare namespace App {
4
+ interface Locals extends Runtime {}
5
+ }
@@ -0,0 +1,4 @@
1
+ // Generated by Wrangler
2
+ // After adding bindings to `wrangler.toml`, regenerate this interface via `npm run cf-typegen`
3
+ interface Env {
4
+ }
@@ -0,0 +1,86 @@
1
+ #:schema node_modules/wrangler/config-schema.json
2
+ name = "<TBD>"
3
+ compatibility_date = "<TBD>"
4
+ compatibility_flags = ["nodejs_compat"]
5
+ pages_build_output_dir = "./dist"
6
+
7
+ # Automatically place your workloads in an optimal location to minimize latency.
8
+ # If you are running back-end logic in a Pages Function, running it closer to your back-end infrastructure
9
+ # rather than the end user may result in better performance.
10
+ # Docs: https://developers.cloudflare.com/pages/functions/smart-placement/#smart-placement
11
+ # [placement]
12
+ # mode = "smart"
13
+
14
+ # Variable bindings. These are arbitrary, plaintext strings (similar to environment variables)
15
+ # Docs:
16
+ # - https://developers.cloudflare.com/pages/functions/bindings/#environment-variables
17
+ # Note: Use secrets to store sensitive data.
18
+ # - https://developers.cloudflare.com/pages/functions/bindings/#secrets
19
+ # [vars]
20
+ # MY_VARIABLE = "production_value"
21
+
22
+ # Bind the Workers AI model catalog. Run machine learning models, powered by serverless GPUs, on Cloudflare’s global network
23
+ # Docs: https://developers.cloudflare.com/pages/functions/bindings/#workers-ai
24
+ # [ai]
25
+ # binding = "AI"
26
+
27
+ # Bind a D1 database. D1 is Cloudflare’s native serverless SQL database.
28
+ # Docs: https://developers.cloudflare.com/pages/functions/bindings/#d1-databases
29
+ # [[d1_databases]]
30
+ # binding = "MY_DB"
31
+ # database_name = "my-database"
32
+ # database_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
33
+
34
+ # Bind a Durable Object. Durable objects are a scale-to-zero compute primitive based on the actor model.
35
+ # Durable Objects can live for as long as needed. Use these when you need a long-running "server", such as in realtime apps.
36
+ # Docs: https://developers.cloudflare.com/workers/runtime-apis/durable-objects
37
+ # [[durable_objects.bindings]]
38
+ # name = "MY_DURABLE_OBJECT"
39
+ # class_name = "MyDurableObject"
40
+ # script_name = 'my-durable-object'
41
+
42
+ # Bind a KV Namespace. Use KV as persistent storage for small key-value pairs.
43
+ # Docs: https://developers.cloudflare.com/pages/functions/bindings/#kv-namespaces
44
+ # [[kv_namespaces]]
45
+ # binding = "MY_KV_NAMESPACE"
46
+ # id = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
47
+
48
+ # Bind a Queue producer. Use this binding to schedule an arbitrary task that may be processed later by a Queue consumer.
49
+ # Docs: https://developers.cloudflare.com/pages/functions/bindings/#queue-producers
50
+ # [[queues.producers]]
51
+ # binding = "MY_QUEUE"
52
+ # queue = "my-queue"
53
+
54
+ # Bind an R2 Bucket. Use R2 to store arbitrarily large blobs of data, such as files.
55
+ # Docs: https://developers.cloudflare.com/pages/functions/bindings/#r2-buckets
56
+ # [[r2_buckets]]
57
+ # binding = "MY_BUCKET"
58
+ # bucket_name = "my-bucket"
59
+
60
+ # Bind another Worker service. Use this binding to call another Worker without network overhead.
61
+ # Docs: https://developers.cloudflare.com/pages/functions/bindings/#service-bindings
62
+ # [[services]]
63
+ # binding = "MY_SERVICE"
64
+ # service = "my-service"
65
+
66
+ # To use different bindings for preview and production environments, follow the examples below.
67
+ # When using environment-specific overrides for bindings, ALL bindings must be specified on a per-environment basis.
68
+ # Docs: https://developers.cloudflare.com/pages/functions/wrangler-configuration#environment-specific-overrides
69
+
70
+ ######## PREVIEW environment config ########
71
+
72
+ # [env.preview.vars]
73
+ # API_KEY = "xyz789"
74
+
75
+ # [[env.preview.kv_namespaces]]
76
+ # binding = "MY_KV_NAMESPACE"
77
+ # id = "<PREVIEW_NAMESPACE_ID>"
78
+
79
+ ######## PRODUCTION environment config ########
80
+
81
+ # [env.production.vars]
82
+ # API_KEY = "abc123"
83
+
84
+ # [[env.production.kv_namespaces]]
85
+ # binding = "MY_KV_NAMESPACE"
86
+ # id = "<PRODUCTION_NAMESPACE_ID>"
@@ -2,7 +2,10 @@ export default {
2
2
  configVersion: 1,
3
3
  id: "common",
4
4
  displayName: "Example router & proxy Worker",
5
+ description:
6
+ "Create a Worker to route and forward requests to other services",
5
7
  platform: "workers",
8
+ hidden: true,
6
9
  copyFiles: {
7
10
  variants: {
8
11
  js: {
@@ -9,6 +9,6 @@
9
9
  },
10
10
  "devDependencies": {
11
11
  "itty-router": "^3.0.12",
12
- "wrangler": "^3.0.0"
12
+ "wrangler": "^3.60.3"
13
13
  }
14
14
  }
@@ -1,10 +1,26 @@
1
+ #:schema node_modules/wrangler/config-schema.json
1
2
  name = "<TBD>"
2
3
  main = "src/index.js"
3
4
  compatibility_date = "<TBD>"
4
5
 
6
+ # Workers Logs
7
+ # Docs: https://developers.cloudflare.com/workers/observability/logs/workers-logs/
8
+ # Configuration: https://developers.cloudflare.com/workers/observability/logs/workers-logs/#enable-workers-logs
9
+ [observability]
10
+ enabled = true
11
+
12
+ # Automatically place your workloads in an optimal location to minimize latency.
13
+ # If you are running back-end logic in a Worker, running it closer to your back-end infrastructure
14
+ # rather than the end user may result in better performance.
15
+ # Docs: https://developers.cloudflare.com/workers/configuration/smart-placement/#smart-placement
16
+ # [placement]
17
+ # mode = "smart"
18
+
5
19
  # Variable bindings. These are arbitrary, plaintext strings (similar to environment variables)
20
+ # Docs:
21
+ # - https://developers.cloudflare.com/workers/wrangler/configuration/#environment-variables
6
22
  # Note: Use secrets to store sensitive data.
7
- # Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#environment-variables
23
+ # - https://developers.cloudflare.com/workers/configuration/secrets/
8
24
  # [vars]
9
25
  # MY_VARIABLE = "production_value"
10
26
 
@@ -5,11 +5,12 @@
5
5
  "scripts": {
6
6
  "deploy": "wrangler deploy",
7
7
  "dev": "wrangler dev",
8
- "start": "wrangler dev"
8
+ "start": "wrangler dev",
9
+ "cf-typegen": "wrangler types"
9
10
  },
10
11
  "devDependencies": {
11
12
  "itty-router": "^3.0.12",
12
- "typescript": "^5.0.4",
13
- "wrangler": "^3.0.0"
13
+ "typescript": "^5.5.2",
14
+ "wrangler": "^3.60.3"
14
15
  }
15
16
  }
@@ -6,7 +6,7 @@ const EXPERIMENTS = [
6
6
  ];
7
7
 
8
8
  export default {
9
- async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
9
+ async fetch(request, env, ctx): Promise<Response> {
10
10
  const fingerprint = [request.headers.get('cf-connecting-ip'), request.cf?.postalCode]; // add any values you want considered as a fingerprint
11
11
  const activeExperiments = await getActiveExperiments(fingerprint, EXPERIMENTS);
12
12
 
@@ -22,7 +22,7 @@ export default {
22
22
 
23
23
  return rewriter.transform(res);
24
24
  },
25
- };
25
+ } satisfies ExportedHandler<Env>;
26
26
 
27
27
  // Get active experiments by hashing a fingerprint
28
28
  async function getActiveExperiments(fingerprint: unknown, experiments: Array<{ name: string; threshold: number }>) {
@@ -5,6 +5,9 @@
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
9
+ * `Env` object can be regenerated with `npm run cf-typegen`.
10
+ *
8
11
  * Learn more at https://developers.cloudflare.com/workers/
9
12
  */
10
13
 
@@ -16,7 +19,7 @@ import apiRouter from './router';
16
19
  export default {
17
20
  // The fetch handler is invoked when this worker receives a HTTP(S) request
18
21
  // and should return a Response (optionally wrapped in a Promise)
19
- async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
22
+ async fetch(request, env, ctx): Promise<Response> {
20
23
  // You'll find it helpful to parse the request.url string into a URL object. Learn more at https://developer.mozilla.org/en-US/docs/Web/API/URL
21
24
  const url = new URL(request.url);
22
25
 
@@ -43,4 +46,4 @@ export default {
43
46
  { headers: { 'Content-Type': 'text/html' } }
44
47
  );
45
48
  },
46
- };
49
+ } satisfies ExportedHandler<Env>;
@@ -1,5 +1,5 @@
1
1
  export default {
2
- async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
2
+ async fetch(request, env, ctx): Promise<Response> {
3
3
  const url = new URL(request.url);
4
4
 
5
5
  const proxyUrl = url.searchParams.get('proxyUrl'); // get a query param value (?proxyUrl=...)
@@ -20,4 +20,4 @@ export default {
20
20
 
21
21
  return res;
22
22
  },
23
- };
23
+ } satisfies ExportedHandler<Env>;
@@ -1,5 +1,5 @@
1
1
  export default {
2
- async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
2
+ async fetch(request, env, ctx): Promise<Response> {
3
3
  const url = new URL(request.url);
4
4
  const redirectUrl = url.searchParams.get('redirectUrl'); // get a query param value (?redirectUrl=...)
5
5
 
@@ -10,4 +10,4 @@ export default {
10
10
  // The Response class has static methods to create common Response objects as a convenience
11
11
  return Response.redirect(redirectUrl);
12
12
  },
13
- };
13
+ } satisfies ExportedHandler<Env>;