create-cloudflare 0.0.0-fd9dff833 → 0.0.0-fdae3f766

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "0.0.0-fd9dff833",
+  "version": "0.0.0-fdae3f766",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -30,7 +30,7 @@
     "@babel/parser": "^7.21.3",
     "@babel/types": "^7.21.4",
     "@clack/prompts": "^0.6.3",
-    "@cloudflare/workers-types": "^4.20250317.0",
+    "@cloudflare/workers-types": "^4.20250523.0",
     "@iarna/toml": "^3.0.0",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
@@ -38,7 +38,7 @@
     "@types/degit": "^2.8.6",
     "@types/dns2": "^2.0.3",
     "@types/esprima": "^4.0.3",
-    "@types/node": "^18.19.75",
+    "@types/node": "^20.17.32",
     "@types/semver": "^7.5.1",
     "@types/which-pm-runs": "^1.0.0",
     "@types/yargs": "^17.0.22",
@@ -52,7 +52,7 @@
     "degit": "^2.8.4",
     "dns2": "^2.1.0",
     "dotenv": "^16.0.0",
-    "esbuild": "0.24.2",
+    "esbuild": "0.25.4",
     "execa": "^7.1.1",
     "glob": "^10.3.3",
     "haikunator": "^2.1.2",
@@ -65,17 +65,17 @@
     "undici": "^5.28.5",
     "vite": "^5.4.14",
     "vite-tsconfig-paths": "^4.0.8",
-    "vitest": "~3.0.5",
+    "vitest": "~3.1.1",
     "which-pm-runs": "^1.1.0",
     "wrap-ansi": "^9.0.0",
     "xdg-app-paths": "^8.3.0",
     "yargs": "^17.7.2",
     "@cloudflare/cli": "1.1.1",
-    "@cloudflare/eslint-config-worker": "1.1.0",
     "@cloudflare/mock-npm-registry": "0.0.0",
-    "@cloudflare/vite-plugin": "0.0.0-fd9dff833",
+    "@cloudflare/vite-plugin": "0.0.0-fdae3f766",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "wrangler": "0.0.0-fd9dff833"
+    "wrangler": "0.0.0-fdae3f766",
+    "@cloudflare/eslint-config-worker": "1.1.0"
   },
   "engines": {
     "node": ">=18.14.1"

package/templates/analog/c3.ts

@@ -3,8 +3,6 @@ import { brandColor, dim } from "@cloudflare/cli/colors";
 import { spinner } from "@cloudflare/cli/interactive";
 import { runFrameworkGenerator } from "frameworks/index";
 import { loadTemplateSnippets, transformFile } from "helpers/codemod";
-import { getLatestTypesEntrypoint } from "helpers/compatDate";
-import { readFile, writeFile } from "helpers/files";
 import { detectPackageManager } from "helpers/packageManagers";
 import { installPackages } from "helpers/packages";
 import * as recast from "recast";
@@ -40,28 +38,6 @@ const configure = async (ctx: C3Context) => {
 	}
 
 	updateViteConfig(ctx);
-	updateEnvTypes(ctx);
-};
-
-const updateEnvTypes = (ctx: C3Context) => {
-	const filepath = "env.d.ts";
-
-	const s = spinner();
-	s.start(`Updating ${filepath}`);
-
-	let file = readFile(filepath);
-
-	let typesEntrypoint = `@cloudflare/workers-types`;
-	const latestEntrypoint = getLatestTypesEntrypoint(ctx);
-	if (latestEntrypoint) {
-		typesEntrypoint += `/${latestEntrypoint}`;
-	}
-
-	// Replace placeholder with actual types entrypoint
-	file = file.replace("WORKERS_TYPES_ENTRYPOINT", typesEntrypoint);
-	writeFile("env.d.ts", file);
-
-	s.stop(`${brandColor(`updated`)} ${dim(`\`${filepath}\``)}`);
 };
 
 const updateViteConfig = (ctx: C3Context) => {

package/templates/analog/templates/env.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="WORKERS_TYPES_ENTRYPOINT" />
+/// <reference types="./worker-configuration.d.ts" />
 
 declare module "h3" {
   interface H3EventContext {

package/templates/angular/pages/c3.ts

@@ -3,7 +3,6 @@ import { logRaw } from "@cloudflare/cli";
 import { brandColor, dim } from "@cloudflare/cli/colors";
 import { spinner } from "@cloudflare/cli/interactive";
 import { runFrameworkGenerator } from "frameworks/index";
-import { compatDateFlag } from "helpers/compatDate";
 import { readFile, readJSON, writeFile } from "helpers/files";
 import { detectPackageManager } from "helpers/packageManagers";
 import { installPackages } from "helpers/packages";
@@ -95,6 +94,7 @@ const config: TemplateConfig = {
 	frameworkCli: "@angular/create",
 	displayName: "Angular",
 	platform: "pages",
+	hidden: true,
 	copyFiles: {
 		path: "./templates",
 	},
@@ -106,10 +106,11 @@ const config: TemplateConfig = {
 	configure,
 	transformPackageJson: async () => ({
 		scripts: {
-			start: `${npm} run build && wrangler pages dev dist/cloudflare ${await compatDateFlag()}`,
+			start: `${npm} run build && wrangler pages dev`,
 			build: `ng build && ${npm} run process`,
 			process: "node ./tools/copy-files.mjs",
-			deploy: `${npm} run build && wrangler pages deploy dist/cloudflare`,
+			deploy: `${npm} run build && wrangler pages deploy`,
+			"cf-typegen": `wrangler types`,
 		},
 	}),
 };

package/templates/angular/pages/templates/wrangler.jsonc

@@ -0,0 +1,5 @@
+{
+	"name": "<TBD>",
+	"compatibility_date": "<TBD>",
+	"pages_build_output_dir": "./dist/cloudflare"
+  }

package/templates/angular/workers/c3.ts

@@ -106,6 +106,7 @@ const config: TemplateConfig = {
 			start: `${npm} run build && wrangler dev`,
 			build: `ng build`,
 			deploy: `${npm} run build && wrangler deploy`,
+			"cf-typegen": `wrangler types`,
 		},
 	}),
 };

package/templates/astro/c3.ts

@@ -1,97 +1,9 @@
-import { logRaw, updateStatus } from "@cloudflare/cli";
-import { blue, brandColor, dim } from "@cloudflare/cli/colors";
-import { runFrameworkGenerator } from "frameworks/index";
-import { transformFile } from "helpers/codemod";
-import { runCommand } from "helpers/command";
-import { usesTypescript } from "helpers/files";
-import { detectPackageManager } from "helpers/packageManagers";
-import * as recast from "recast";
-import type { TemplateConfig } from "../../src/templates";
-import type { C3Context, PackageJson } from "types";
+import pages from "./pages/c3";
+import workers from "./workers/c3";
+import type { MultiPlatformTemplateConfig } from "../../src/templates";
 
-const { npx } = detectPackageManager();
-
-const generate = async (ctx: C3Context) => {
-	await runFrameworkGenerator(ctx, [ctx.project.name, "--no-install"]);
-
-	logRaw(""); // newline
-};
-
-const configure = async () => {
-	await runCommand([npx, "astro", "add", "cloudflare", "-y"], {
-		silent: true,
-		startText: "Installing adapter",
-		doneText: `${brandColor("installed")} ${dim(
-			`via \`${npx} astro add cloudflare\``,
-		)}`,
-	});
-
-	updateAstroConfig();
-};
-
-const updateAstroConfig = () => {
-	const filePath = "astro.config.mjs";
-
-	updateStatus(`Updating configuration in ${blue(filePath)}`);
-
-	transformFile(filePath, {
-		visitCallExpression: function (n) {
-			const callee = n.node.callee as recast.types.namedTypes.Identifier;
-			if (callee.name !== "cloudflare") {
-				return this.traverse(n);
-			}
-
-			const b = recast.types.builders;
-			n.node.arguments = [
-				b.objectExpression([
-					b.objectProperty(
-						b.identifier("platformProxy"),
-						b.objectExpression([
-							b.objectProperty(b.identifier("enabled"), b.booleanLiteral(true)),
-						]),
-					),
-				]),
-			];
-
-			return false;
-		},
-	});
-};
-
-const config: TemplateConfig = {
-	configVersion: 1,
-	id: "astro",
-	frameworkCli: "create-astro",
-	platform: "pages",
+const config: MultiPlatformTemplateConfig = {
 	displayName: "Astro",
-	copyFiles: {
-		async selectVariant(ctx) {
-			// Note: this `selectVariant` function should not be needed
-			//       this is just a quick workaround until
-			//       https://github.com/cloudflare/workers-sdk/issues/7495
-			//       is resolved
-			return usesTypescript(ctx) ? "ts" : "js";
-		},
-		variants: {
-			js: {
-				path: "./templates/js",
-			},
-			ts: {
-				path: "./templates/ts",
-			},
-		},
-	},
-	devScript: "dev",
-	deployScript: "deploy",
-	previewScript: "preview",
-	generate,
-	configure,
-	transformPackageJson: async (pkgJson: PackageJson, ctx: C3Context) => ({
-		scripts: {
-			deploy: `astro build && wrangler pages deploy`,
-			preview: `astro build && wrangler pages dev`,
-			...(usesTypescript(ctx) && { "cf-typegen": `wrangler types` }),
-		},
-	}),
+	platformVariants: { pages, workers },
 };
 export default config;

package/templates/astro/pages/c3.ts

@@ -0,0 +1,99 @@
+import { logRaw, updateStatus } from "@cloudflare/cli";
+import { blue, brandColor, dim } from "@cloudflare/cli/colors";
+import { runFrameworkGenerator } from "frameworks/index";
+import { transformFile } from "helpers/codemod";
+import { runCommand } from "helpers/command";
+import { usesTypescript } from "helpers/files";
+import { detectPackageManager } from "helpers/packageManagers";
+import * as recast from "recast";
+import type { TemplateConfig } from "../../../src/templates";
+import type { C3Context, PackageJson } from "types";
+
+const { npx } = detectPackageManager();
+
+const generate = async (ctx: C3Context) => {
+	await runFrameworkGenerator(ctx, [ctx.project.name, "--no-install"]);
+
+	logRaw(""); // newline
+};
+
+const configure = async () => {
+	await runCommand([npx, "astro", "add", "cloudflare", "-y"], {
+		silent: true,
+		startText: "Installing adapter",
+		doneText: `${brandColor("installed")} ${dim(
+			`via \`${npx} astro add cloudflare\``,
+		)}`,
+	});
+
+	updateAstroConfig();
+};
+
+const updateAstroConfig = () => {
+	const filePath = "astro.config.mjs";
+
+	updateStatus(`Updating configuration in ${blue(filePath)}`);
+
+	transformFile(filePath, {
+		visitCallExpression: function (n) {
+			const callee = n.node.callee as recast.types.namedTypes.Identifier;
+			if (callee.name !== "cloudflare") {
+				return this.traverse(n);
+			}
+
+			const b = recast.types.builders;
+			n.node.arguments = [
+				b.objectExpression([
+					b.objectProperty(
+						b.identifier("platformProxy"),
+						b.objectExpression([
+							b.objectProperty(b.identifier("enabled"), b.booleanLiteral(true)),
+						]),
+					),
+				]),
+			];
+
+			return false;
+		},
+	});
+};
+
+const config: TemplateConfig = {
+	configVersion: 1,
+	id: "astro",
+	frameworkCli: "create-astro",
+	platform: "pages",
+	hidden: true,
+	displayName: "Astro",
+	path: "templates/astro/pages",
+	copyFiles: {
+		async selectVariant(ctx) {
+			// Note: this `selectVariant` function should not be needed
+			//       this is just a quick workaround until
+			//       https://github.com/cloudflare/workers-sdk/issues/7495
+			//       is resolved
+			return usesTypescript(ctx) ? "ts" : "js";
+		},
+		variants: {
+			js: {
+				path: "./templates/js",
+			},
+			ts: {
+				path: "./templates/ts",
+			},
+		},
+	},
+	devScript: "dev",
+	deployScript: "deploy",
+	previewScript: "preview",
+	generate,
+	configure,
+	transformPackageJson: async (pkgJson: PackageJson, ctx: C3Context) => ({
+		scripts: {
+			deploy: `astro build && wrangler pages deploy`,
+			preview: `astro build && wrangler pages dev`,
+			...(usesTypescript(ctx) && { "cf-typegen": `wrangler types` }),
+		},
+	}),
+};
+export default config;

package/{templates-experimental/astro → templates/astro/workers}/c3.ts

@@ -6,7 +6,7 @@ import { runCommand } from "helpers/command";
 import { usesTypescript } from "helpers/files";
 import { detectPackageManager } from "helpers/packageManagers";
 import * as recast from "recast";
-import type { TemplateConfig } from "../../src/templates";
+import type { TemplateConfig } from "../../../src/templates";
 import type { C3Context, PackageJson } from "types";
 
 const { npx } = detectPackageManager();
@@ -84,7 +84,7 @@ const config: TemplateConfig = {
 	devScript: "dev",
 	deployScript: "deploy",
 	previewScript: "preview",
-	path: "templates-experimental/astro",
+	path: "templates/astro/workers",
 	generate,
 	configure,
 	transformPackageJson: async (pkgJson: PackageJson, ctx: C3Context) => ({

package/templates/astro/workers/templates/js/public/.assetsignore

@@ -0,0 +1,2 @@
+_worker.js
+_routes.json

package/{templates-experimental/astro/templates/ts → templates/astro/workers/templates/js}/wrangler.jsonc

@@ -3,7 +3,8 @@
   "main": "./dist/_worker.js/index.js",
   "compatibility_date": "<TBD>",
   "compatibility_flags": [
-    "nodejs_compat"
+    "nodejs_compat",
+    "global_fetch_strictly_public"
   ],
   "assets": {
     "binding": "ASSETS",

package/templates/astro/workers/templates/ts/public/.assetsignore

@@ -0,0 +1,2 @@
+_worker.js
+_routes.json

package/{templates-experimental/astro/templates/js → templates/astro/workers/templates/ts}/wrangler.jsonc

@@ -3,7 +3,8 @@
   "main": "./dist/_worker.js/index.js",
   "compatibility_date": "<TBD>",
   "compatibility_flags": [
-    "nodejs_compat"
+    "nodejs_compat",
+    "global_fetch_strictly_public"
   ],
   "assets": {
     "binding": "ASSETS",
@@ -11,5 +12,5 @@
   },
   "observability": {
     "enabled": true
-  }
+  },
 }

package/templates/common/c3.ts

@@ -1,4 +1,6 @@
-export default {
+import type { TemplateConfig } from "../../src/templates";
+
+const config: TemplateConfig = {
 	configVersion: 1,
 	id: "common",
 	displayName: "Example router & proxy Worker",
@@ -17,3 +19,5 @@ export default {
 		},
 	},
 };
+
+export default config;

package/templates/common/ts/tsconfig.json

@@ -16,9 +16,6 @@
 		/* Enable importing .json files */
 		"resolveJsonModule": true,
 
-		/* Specify type package names to be included without being referenced in a source file. */
-		"types": ["@cloudflare/workers-types"],
-
 		/* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */
 		"allowJs": true,
 		/* Enable error reporting in type-checked JavaScript files. */

package/templates/docusaurus/pages/c3.ts

@@ -14,6 +14,7 @@ const config: TemplateConfig = {
 	id: "docusaurus",
 	frameworkCli: "create-docusaurus",
 	platform: "pages",
+	hidden: true,
 	displayName: "Docusaurus",
 	path: "templates/docusaurus/pages",
 	generate,
@@ -26,5 +27,6 @@ const config: TemplateConfig = {
 	devScript: "preview",
 	deployScript: "deploy",
 	previewScript: "preview",
+	workersTypes: "none",
 };
 export default config;

package/templates/docusaurus/workers/c3.ts

@@ -29,5 +29,6 @@ const config: TemplateConfig = {
 	devScript: "start",
 	deployScript: "deploy",
 	previewScript: "preview",
+	workersTypes: "none",
 };
 export default config;

package/templates/gatsby/pages/c3.ts

@@ -34,6 +34,7 @@ const config: TemplateConfig = {
 	id: "gatsby",
 	frameworkCli: "gatsby",
 	platform: "pages",
+	hidden: true,
 	displayName: "Gatsby",
 	path: "templates/gatsby/pages",
 	generate,
@@ -46,5 +47,6 @@ const config: TemplateConfig = {
 	devScript: "develop",
 	deployScript: "deploy",
 	previewScript: "preview",
+	workersTypes: "none",
 };
 export default config;

package/templates/gatsby/workers/c3.ts

@@ -49,5 +49,6 @@ const config: TemplateConfig = {
 	devScript: "develop",
 	deployScript: "deploy",
 	previewScript: "preview",
+	workersTypes: "none",
 };
 export default config;

package/templates/hello-world/c3.ts

@@ -5,8 +5,9 @@ import type { TemplateConfig } from "../../src/templates";
 export default {
 	configVersion: 1,
 	id: "hello-world",
-	displayName: "Hello World Worker",
-	description: "Get started with a basic Worker in the language of your choice",
+	displayName: "Worker only",
+	description:
+		"For processing requests, transforming responses, or API endpoints",
 	platform: "workers",
 	async configure(ctx) {
 		if (ctx.args.lang === "python") {

package/templates/hello-world/js/package.json

@@ -9,7 +9,7 @@
 		"test": "vitest"
 	},
 	"devDependencies": {
-		"@cloudflare/vitest-pool-workers": "^0.7.5",
+		"@cloudflare/vitest-pool-workers": "^0.8.19",
 		"wrangler": "^3.101.0",
 		"vitest": "~3.0.7"
 	}

package/templates/hello-world/py/README.md

@@ -1,8 +1,8 @@
 ## Usage
 
-You can run the worker defined by your new project by executing `wrangler dev` in this
+You can run the Worker defined by your new project by executing `wrangler dev` in this
 directory. This will start up an HTTP server and will allow you to iterate on your
-worker without having to restart `wrangler`.
+Worker without having to restart `wrangler`.
 
 ### Types and autocomplete
 

package/templates/hello-world/py/pyproject.toml

@@ -6,4 +6,4 @@ readme = "README.md"
 requires-python = ">=3.12"
 dependencies = [
     "webtypy>=0.1.7",
-]
+]

package/templates/hello-world/py/src/entry.py

@@ -1,4 +1,5 @@
-from js import Response
+from workers import Response, handler
 
+@handler
 async def on_fetch(request, env):
-    return Response.new("Hello World!")
+    return Response("Hello World!")

package/templates/hello-world/ts/package.json

@@ -10,7 +10,7 @@
 		"cf-typegen": "wrangler types"
 	},
 	"devDependencies": {
-		"@cloudflare/vitest-pool-workers": "^0.7.5",
+		"@cloudflare/vitest-pool-workers": "^0.8.19",
 		"typescript": "^5.5.2",
 		"vitest": "~3.0.7",
 		"wrangler": "^3.101.0"

package/templates/hello-world/ts/test/env.d.ts

@@ -0,0 +1,3 @@
+declare module 'cloudflare:test' {
+	interface ProvidedEnv extends Env {}
+}

package/templates/hello-world/ts/test/index.spec.ts

@@ -1,4 +1,3 @@
-// test/index.spec.ts
 import { env, createExecutionContext, waitOnExecutionContext, SELF } from 'cloudflare:test';
 import { describe, it, expect } from 'vitest';
 import worker from '../src/index';

package/templates/hello-world/ts/test/tsconfig.json

@@ -1,7 +1,7 @@
 {
 	"extends": "../tsconfig.json",
 	"compilerOptions": {
-		"types": ["@cloudflare/workers-types/experimental", "@cloudflare/vitest-pool-workers"]
+		"types": ["@cloudflare/vitest-pool-workers"]
 	},
 	"include": ["./**/*.ts", "../worker-configuration.d.ts"],
 	"exclude": []

package/templates/hello-world/ts/tsconfig.json

@@ -13,8 +13,6 @@
 		"module": "es2022",
 		/* Specify how TypeScript looks up a file from a given module specifier. */
 		"moduleResolution": "Bundler",
-		/* Specify type package names to be included without being referenced in a source file. */
-		"types": ["@cloudflare/workers-types"],
 		/* Enable importing .json files */
 		"resolveJsonModule": true,
 

package/{templates-experimental → templates}/hello-world-assets-only/c3.ts

@@ -3,9 +3,10 @@ import type { TemplateConfig } from "../../src/templates";
 const config: TemplateConfig = {
 	configVersion: 1,
 	id: "hello-world-assets-only",
-	path: "templates-experimental/hello-world-assets-only",
-	displayName: "Hello World - Assets-only",
-	description: "Get started with a basic Worker that only serves static assets",
+	path: "templates/hello-world-assets-only",
+	displayName: "Static site",
+	description:
+		"For static sites or when using your own backend. Uses Workers Static Assets.",
 	platform: "workers",
 	copyFiles: {
 		path: "./templates",

package/{templates-experimental → templates}/hello-world-assets-only/templates/public/index.html

@@ -7,5 +7,6 @@
 	</head>
 	<body>
 		<h1 id="heading">Hello, World!</h1>
+		<p>This page comes from a static asset stored at `public/index.html` as configured in `wrangler.jsonc`.</p>
 	</body>
 </html>

package/{templates-experimental → templates}/hello-world-assets-only/templates/wrangler.jsonc

@@ -2,6 +2,7 @@
   "name": "<TBD>",
   "compatibility_date": "<TBD>",
   "assets": {
+    // The path to the directory containing the `index.html` file to be served at `/`
     "directory": "./public"
   },
   "observability": {

package/templates/hello-world-durable-object/c3.ts

@@ -1,9 +1,11 @@
-export default {
+import type { TemplateConfig } from "../../src/templates";
+
+const config: TemplateConfig = {
 	configVersion: 1,
 	id: "hello-world-durable-object",
-	displayName: "Hello World Worker Using Durable Objects",
+	displayName: "Worker + Durable Objects",
 	description:
-		"Get started with a basic stateful app to build projects like real-time chats, collaborative apps, and multiplayer games",
+		"For multiplayer apps using WebSockets, or when you need synchronization",
 	platform: "workers",
 	copyFiles: {
 		variants: {
@@ -13,6 +15,10 @@ export default {
 			ts: {
 				path: "./ts",
 			},
+			python: {
+				path: "./py",
+			},
 		},
 	},
 };
+export default config;