create-cloudflare 0.0.0-4f910cfcf → 0.0.0-4fca01898

package/templates/gatsby/c3.ts

@@ -1,49 +1,9 @@
-import { inputPrompt } from "@cloudflare/cli/interactive";
-import { runFrameworkGenerator } from "frameworks/index";
-import { detectPackageManager } from "helpers/packageManagers";
-import type { TemplateConfig } from "../../src/templates";
-import type { C3Context } from "types";
+import pages from "./pages/c3";
+import workers from "./workers/c3";
+import type { MultiPlatformTemplateConfig } from "../../src/templates";
 
-const { npm } = detectPackageManager();
-
-const generate = async (ctx: C3Context) => {
-	const defaultTemplate = "https://github.com/gatsbyjs/gatsby-starter-blog";
-
-	const useTemplate = await inputPrompt({
-		type: "confirm",
-		question: "Would you like to use a template?",
-		label: "template",
-		defaultValue: true,
-	});
-
-	let templateUrl = "";
-	if (useTemplate) {
-		templateUrl = await inputPrompt({
-			type: "text",
-			question: `Please specify the url of the template you'd like to use`,
-			label: "template",
-			defaultValue: defaultTemplate,
-		});
-	}
-
-	await runFrameworkGenerator(ctx, ["new", ctx.project.name, templateUrl]);
-};
-
-const config: TemplateConfig = {
-	configVersion: 1,
-	id: "gatsby",
-	frameworkCli: "gatsby",
-	platform: "pages",
+const config: MultiPlatformTemplateConfig = {
 	displayName: "Gatsby",
-	generate,
-	transformPackageJson: async () => ({
-		scripts: {
-			deploy: `${npm} run build && wrangler pages deploy ./public`,
-			preview: `${npm} run build && wrangler pages dev ./public`,
-		},
-	}),
-	devScript: "develop",
-	deployScript: "deploy",
-	previewScript: "preview",
+	platformVariants: { pages, workers },
 };
 export default config;

package/templates/gatsby/pages/c3.ts

@@ -0,0 +1,50 @@
+import { inputPrompt } from "@cloudflare/cli/interactive";
+import { runFrameworkGenerator } from "frameworks/index";
+import { detectPackageManager } from "helpers/packageManagers";
+import type { TemplateConfig } from "../../../src/templates";
+import type { C3Context } from "types";
+
+const { npm } = detectPackageManager();
+
+const generate = async (ctx: C3Context) => {
+	const defaultTemplate = "https://github.com/gatsbyjs/gatsby-starter-blog";
+
+	const useTemplate = await inputPrompt({
+		type: "confirm",
+		question: "Would you like to use a template?",
+		label: "template",
+		defaultValue: true,
+	});
+
+	let templateUrl = "";
+	if (useTemplate) {
+		templateUrl = await inputPrompt({
+			type: "text",
+			question: `Please specify the url of the template you'd like to use`,
+			label: "template",
+			defaultValue: defaultTemplate,
+		});
+	}
+
+	await runFrameworkGenerator(ctx, ["new", ctx.project.name, templateUrl]);
+};
+
+const config: TemplateConfig = {
+	configVersion: 1,
+	id: "gatsby",
+	frameworkCli: "gatsby",
+	platform: "pages",
+	displayName: "Gatsby",
+	path: "templates/gatsby/pages",
+	generate,
+	transformPackageJson: async () => ({
+		scripts: {
+			deploy: `${npm} run build && wrangler pages deploy ./public`,
+			preview: `${npm} run build && wrangler pages dev ./public`,
+		},
+	}),
+	devScript: "develop",
+	deployScript: "deploy",
+	previewScript: "preview",
+};
+export default config;

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

@@ -1,7 +1,7 @@
 import { inputPrompt } from "@cloudflare/cli/interactive";
 import { runFrameworkGenerator } from "frameworks/index";
 import { detectPackageManager } from "helpers/packageManagers";
-import type { TemplateConfig } from "../../src/templates";
+import type { TemplateConfig } from "../../../src/templates";
 import type { C3Context } from "types";
 
 const { npm } = detectPackageManager();
@@ -38,7 +38,7 @@ const config: TemplateConfig = {
 	copyFiles: {
 		path: "./templates",
 	},
-	path: "templates-experimental/gatsby",
+	path: "templates/gatsby/workers",
 	generate,
 	transformPackageJson: async () => ({
 		scripts: {

package/templates/hello-world/c3.ts

@@ -1,9 +1,26 @@
+import { readFile, writeFile } from "node:fs/promises";
+import { resolve } from "node:path";
+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") {
+			for (const file of ["pyproject.toml", "uv.lock"]) {
+				const contents = await readFile(
+					resolve(ctx.project.path, file),
+					"utf8",
+				);
+				const updated = contents.replaceAll(/<TBD>/g, ctx.project.name);
+				await writeFile(resolve(ctx.project.path, file), updated);
+			}
+		}
+	},
 	copyFiles: {
 		variants: {
 			js: {
@@ -17,4 +34,4 @@ export default {
 			},
 		},
 	},
-};
+} satisfies TemplateConfig;

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

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

package/templates/hello-world/py/.python-version

@@ -0,0 +1 @@
+3.12

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

@@ -0,0 +1,23 @@
+## Usage
+
+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`.
+
+### Types and autocomplete
+
+This project also includes a pyproject.toml and uv.lock file with some requirements which
+set up autocomplete and type hints for this Python Workers project.
+
+To get these installed you'll need `uv`, which you can install by following
+https://docs.astral.sh/uv/getting-started/installation/.
+
+Once `uv` is installed, you can run the following:
+
+```
+uv venv
+uv sync
+```
+
+Then point your editor's Python plugin at the `.venv` directory. You should then have working
+autocomplete and type information in your editor.

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

@@ -0,0 +1,9 @@
+[project]
+name = "<TBD>"
+version = "0.1.0"
+description = "Add your description here"
+readme = "README.md"
+requires-python = ">=3.12"
+dependencies = [
+    "webtypy>=0.1.7",
+]

package/templates/hello-world/py/uv.lock

@@ -0,0 +1,22 @@
+version = 1
+requires-python = ">=3.12"
+
+[[package]]
+name = "<TBD>"
+version = "0.1.0"
+source = { virtual = "." }
+dependencies = [
+    { name = "webtypy" },
+]
+
+[package.metadata]
+requires-dist = [{ name = "webtypy", specifier = ">=0.1.7" }]
+
+[[package]]
+name = "webtypy"
+version = "0.1.7"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/5e/89/c7a0311fdc73809fc2415be97767f085ff3e00c86546430034dc8465fee7/webtypy-0.1.7.tar.gz", hash = "sha256:1b7212719a949c802f3d60fac5f0d952eb503a92121409cf1ad9847d7c76a336", size = 104505 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/61/91/c731bdaa605279e00b28bfd2bf0ae67f48061d16890fb1c026924bfbd242/webtypy-0.1.7-py3-none-any.whl", hash = "sha256:f35e6d73a4e08783e23adfac271a11cda3a2bd1105499db70e4819244efed0ae", size = 103519 },
+]

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

@@ -10,9 +10,9 @@
 		"cf-typegen": "wrangler types"
 	},
 	"devDependencies": {
-		"@cloudflare/vitest-pool-workers": "^0.6.4",
+		"@cloudflare/vitest-pool-workers": "^0.7.5",
 		"typescript": "^5.5.2",
-		"vitest": "~2.1.9",
+		"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/worker-configuration.d.ts

@@ -1,4 +1,8 @@
-// Generated by Wrangler
+// Generated by Wrangler by running `wrangler types --include-runtime=false` (hash: 2905fd8e181cd2f4083a615fa51f1913)
 // After adding bindings to `wrangler.jsonc`, regenerate this interface via `npm run cf-typegen`
-interface Env {
+declare namespace Cloudflare {
+	// eslint-disable-next-line @typescript-eslint/no-empty-interface,@typescript-eslint/no-empty-object-type
+	interface Env {
+	}
 }
+interface Env extends Cloudflare.Env {}

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: "Assets only",
+	description:
+		"For static sites (including SPAs) or when using your own backend",
 	platform: "workers",
 	copyFiles: {
 		path: "./templates",

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

@@ -1,9 +1,9 @@
 export default {
 	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: {

package/templates/hello-world-durable-object/js/src/index.js

@@ -52,17 +52,18 @@ export default {
 	 * @returns {Promise<Response>} The response to be sent back to the client
 	 */
 	async fetch(request, env, ctx) {
-		// We will create a `DurableObjectId` using the pathname from the Worker request
-		// This id refers to a unique instance of our 'MyDurableObject' class above
-		let id = env.MY_DURABLE_OBJECT.idFromName(new URL(request.url).pathname);
+		// Create a `DurableObjectId` for an instance of the `MyDurableObject`
+		// class named "foo". Requests from all Workers to the instance named
+		// "foo" will go to a single globally unique Durable Object instance.
+		const id = env.MY_DURABLE_OBJECT.idFromName("foo");
 
-		// This stub creates a communication channel with the Durable Object instance
-		// The Durable Object constructor will be invoked upon the first call for a given id
-		let stub = env.MY_DURABLE_OBJECT.get(id);
+		// Create a stub to open a communication channel with the Durable
+		// Object instance.
+		const stub = env.MY_DURABLE_OBJECT.get(id);
 
-		// We call the `sayHello()` RPC method on the stub to invoke the method on the remote
-		// Durable Object instance
-		let greeting = await stub.sayHello("world");
+		// Call the `sayHello()` RPC method on the stub to invoke the method on
+		// the remote Durable Object instance
+		const greeting = await stub.sayHello("world");
 
 		return new Response(greeting);
 	},

package/templates/hello-world-durable-object/js/wrangler.jsonc

@@ -4,7 +4,7 @@
   "compatibility_date": "<TBD>",
   "migrations": [
     {
-      "new_classes": [
+      "new_sqlite_classes": [
         "MyDurableObject"
       ],
       "tag": "v1"

package/templates/hello-world-durable-object/ts/src/index.ts

@@ -48,17 +48,18 @@ export default {
 	 * @returns The response to be sent back to the client
 	 */
 	async fetch(request, env, ctx): Promise<Response> {
-		// We will create a `DurableObjectId` using the pathname from the Worker request
-		// This id refers to a unique instance of our 'MyDurableObject' class above
-		let id: DurableObjectId = env.MY_DURABLE_OBJECT.idFromName(new URL(request.url).pathname);
+		// Create a `DurableObjectId` for an instance of the `MyDurableObject`
+		// class named "foo". Requests from all Workers to the instance named
+		// "foo" will go to a single globally unique Durable Object instance.
+		const id: DurableObjectId = env.MY_DURABLE_OBJECT.idFromName("foo");
 
-		// This stub creates a communication channel with the Durable Object instance
-		// The Durable Object constructor will be invoked upon the first call for a given id
-		let stub = env.MY_DURABLE_OBJECT.get(id);
+		// Create a stub to open a communication channel with the Durable
+		// Object instance.
+		const stub = env.MY_DURABLE_OBJECT.get(id);
 
-		// We call the `sayHello()` RPC method on the stub to invoke the method on the remote
-		// Durable Object instance
-		let greeting = await stub.sayHello("world");
+		// Call the `sayHello()` RPC method on the stub to invoke the method on
+		// the remote Durable Object instance
+		const greeting = await stub.sayHello("world");
 
 		return new Response(greeting);
 	},

package/templates/hello-world-durable-object/ts/worker-configuration.d.ts

@@ -1,5 +1,7 @@
-// Generated by Wrangler by running `wrangler types`
-
-interface Env {
-	MY_DURABLE_OBJECT: DurableObjectNamespace<import("./src/index").MyDurableObject>;
+// Generated by Wrangler by running `wrangler types --include-runtime=false` (hash: 4c81d17e8de07f650cddf73ce751ba8d)
+declare namespace Cloudflare {
+	interface Env {
+		MY_DURABLE_OBJECT: DurableObjectNamespace<import("./src/index").MyDurableObject>;
+	}
 }
+interface Env extends Cloudflare.Env {}

package/templates/hello-world-durable-object/ts/wrangler.jsonc

@@ -4,7 +4,7 @@
   "compatibility_date": "<TBD>",
   "migrations": [
     {
-      "new_classes": [
+      "new_sqlite_classes": [
         "MyDurableObject"
       ],
       "tag": "v1"

package/{templates-experimental → templates}/hello-world-durable-object-with-assets/c3.ts

@@ -3,10 +3,10 @@ import type { TemplateConfig } from "../../src/templates";
 const config: TemplateConfig = {
 	configVersion: 1,
 	id: "hello-world-durable-object-with-assets",
-	path: "templates-experimental/hello-world-durable-object-with-assets",
-	displayName: "Hello World - Worker Using Durable Objects with Assets",
+	path: "templates/hello-world-durable-object-with-assets",
+	displayName: "Worker + Durable Objects + Assets",
 	description:
-		"Get started with a basic stateful app to build projects like real-time chats, collaborative apps, and multiplayer games, which hosts assets",
+		"For full-stack applications requiring static assets, an API, and real-time coordination",
 	platform: "workers",
 	copyFiles: {
 		variants: {

package/{templates-experimental → templates}/hello-world-durable-object-with-assets/js/src/index.js

@@ -52,18 +52,19 @@ export default {
 	 * @returns {Promise<Response>} The response to be sent back to the client
 	 */
 	async fetch(request, env, ctx) {
-		// We will create a `DurableObjectId` using the pathname from the Worker request
-		// This id refers to a unique instance of our 'MyDurableObject' class above
-		let id = env.MY_DURABLE_OBJECT.idFromName(new URL(request.url).pathname);
+		// Create a `DurableObjectId` for an instance of the `MyDurableObject`
+		// class named "foo". Requests from all Workers to the instance named
+		// "foo" will go to a single globally unique Durable Object instance.
+		const id = env.MY_DURABLE_OBJECT.idFromName("foo");
 
-		// This stub creates a communication channel with the Durable Object instance
-		// The Durable Object constructor will be invoked upon the first call for a given id
-		let stub = env.MY_DURABLE_OBJECT.get(id);
+		// Create a stub to open a communication channel with the Durable
+		// Object instance.
+		const stub = env.MY_DURABLE_OBJECT.get(id);
 
-		// We call the `sayHello()` RPC method on the stub to invoke the method on the remote
-		// Durable Object instance
-		let greeting = await stub.sayHello("world");
+		// Call the `sayHello()` RPC method on the stub to invoke the method on
+		// the remote Durable Object instance
+		const greeting = await stub.sayHello("world");
 
 		return new Response(greeting);
-	},
+	}
 };

package/{templates-experimental → templates}/hello-world-durable-object-with-assets/js/wrangler.jsonc

@@ -14,9 +14,9 @@
       }
     ]
   },
-	"migrations": [
+  "migrations": [
     {
-      "new_classes": [
+      "new_sqlite_classes": [
         "MyDurableObject"
       ],
       "tag": "v1"

package/{templates-experimental → templates}/hello-world-durable-object-with-assets/ts/src/index.ts

@@ -49,17 +49,18 @@ export default {
 	 * @returns The response to be sent back to the client
 	 */
 	async fetch(request, env, ctx): Promise<Response> {
-		// We will create a `DurableObjectId` using the pathname from the Worker request
-		// This id refers to a unique instance of our 'MyDurableObject' class above
-		let id: DurableObjectId = env.MY_DURABLE_OBJECT.idFromName(new URL(request.url).pathname);
+		// Create a `DurableObjectId` for an instance of the `MyDurableObject`
+		// class named "foo". Requests from all Workers to the instance named
+		// "foo" will go to a single globally unique Durable Object instance.
+		const id: DurableObjectId = env.MY_DURABLE_OBJECT.idFromName("foo");
 
-		// This stub creates a communication channel with the Durable Object instance
-		// The Durable Object constructor will be invoked upon the first call for a given id
-		let stub = env.MY_DURABLE_OBJECT.get(id);
+		// Create a stub to open a communication channel with the Durable
+		// Object instance.
+		const stub = env.MY_DURABLE_OBJECT.get(id);
 
-		// We call the `sayHello()` RPC method on the stub to invoke the method on the remote
-		// Durable Object instance
-		let greeting = await stub.sayHello("world");
+		// Call the `sayHello()` RPC method on the stub to invoke the method on
+		// the remote Durable Object instance
+		const greeting = await stub.sayHello("world");
 
 		return new Response(greeting);
 	},

package/templates/hello-world-durable-object-with-assets/ts/worker-configuration.d.ts

@@ -0,0 +1,8 @@
+// Generated by Wrangler by running `wrangler types --include-runtime=false` (hash: 24be54e90498ce3774054fcb8bb2bc1a)
+declare namespace Cloudflare {
+	interface Env {
+		MY_DURABLE_OBJECT: DurableObjectNamespace<import("./src/index").MyDurableObject>;
+		ASSETS: Fetcher;
+	}
+}
+interface Env extends Cloudflare.Env {}

package/{templates-experimental → templates}/hello-world-durable-object-with-assets/ts/wrangler.jsonc

@@ -4,7 +4,7 @@
   "compatibility_date": "<TBD>",
   "migrations": [
     {
-      "new_classes": [
+      "new_sqlite_classes": [
         "MyDurableObject"
       ],
       "tag": "v1"

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

@@ -1,10 +1,9 @@
 export default {
 	configVersion: 1,
 	id: "hello-world-with-assets",
-	path: "templates-experimental/hello-world-with-assets",
-	displayName: "Hello World - Worker with Assets",
-	description:
-		"Get started with a basic Worker that also serves static assets, in the language of your choice",
+	path: "templates/hello-world-with-assets",
+	displayName: "Worker + Assets",
+	description: "For static sites with an API or server-side rendering (SSR)",
 	platform: "workers",
 	copyFiles: {
 		variants: {

package/{templates-experimental → templates}/hello-world-with-assets/js/package.json

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

package/{templates-experimental/hello-world-with-assets/ts → templates/hello-world-with-assets/js}/public/index.html

@@ -7,8 +7,8 @@
 	</head>
 	<body>
 		<h1 id="heading"></h1>
-		<button id="button">Fetch a random UUID</button>
-		<div id="random"></div>
+		<button id="button" type="button">Fetch a random UUID</button>
+		<output id="random" for="button"></output>
 		<script>
 			fetch('/message')
 				.then((resp) => resp.text())

package/{templates-experimental/hello-world-with-assets/js → templates/hello-world-with-assets/py}/public/index.html

@@ -7,8 +7,8 @@
 	</head>
 	<body>
 		<h1 id="heading"></h1>
-		<button id="button">Fetch a random UUID</button>
-		<div id="random"></div>
+		<button id="button" type="button">Fetch a random UUID</button>
+		<output id="random" for="button"></output>
 		<script>
 			fetch('/message')
 				.then((resp) => resp.text())

package/{templates-experimental → templates}/hello-world-with-assets/ts/package.json

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

package/{templates-experimental/hello-world-with-assets/py → templates/hello-world-with-assets/ts}/public/index.html

@@ -7,8 +7,8 @@
 	</head>
 	<body>
 		<h1 id="heading"></h1>
-		<button id="button">Fetch a random UUID</button>
-		<div id="random"></div>
+		<button id="button" type="button">Fetch a random UUID</button>
+		<output id="random" for="button"></output>
 		<script>
 			fetch('/message')
 				.then((resp) => resp.text())

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

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

package/{templates-experimental → templates}/hello-world-with-assets/ts/test/tsconfig.json

@@ -3,6 +3,6 @@
 	"compilerOptions": {
 		"types": ["@cloudflare/workers-types/experimental", "@cloudflare/vitest-pool-workers"]
 	},
-	"include": ["./**/*.ts", "../src/env.d.ts"],
+	"include": ["./**/*.ts", "../worker-configuration.d.ts"],
 	"exclude": []
 }

package/templates/hello-world-with-assets/ts/worker-configuration.d.ts

@@ -0,0 +1,7 @@
+// Generated by Wrangler by running `wrangler types --include-runtime=false` (hash: 187132f48ddf0f604882ba8213fe386f)
+declare namespace Cloudflare {
+	interface Env {
+		ASSETS: Fetcher;
+	}
+}
+interface Env extends Cloudflare.Env {}