create-cloudflare 0.0.0-ab7204a6e → 0.0.0-ab8dab1e7

package/templates/astro/pages/templates/ts/worker-configuration.d.ts

@@ -0,0 +1,4 @@
+// Generated by Wrangler
+// After adding bindings to `wrangler.jsonc`, regenerate this interface via `npm run cf-typegen`
+interface Env {
+}

package/templates/astro/pages/templates/ts/wrangler.jsonc

@@ -0,0 +1,8 @@
+{
+  "name": "<TBD>",
+  "compatibility_date": "<TBD>",
+  "compatibility_flags": [
+    "nodejs_compat"
+  ],
+  "pages_build_output_dir": "./dist"
+}

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/astro/workers/templates/js/wrangler.jsonc

@@ -0,0 +1,16 @@
+{
+  "name": "<TBD>",
+  "main": "./dist/_worker.js/index.js",
+  "compatibility_date": "<TBD>",
+  "compatibility_flags": [
+    "nodejs_compat",
+    "global_fetch_strictly_public"
+  ],
+  "assets": {
+    "binding": "ASSETS",
+    "directory": "./dist"
+  },
+  "observability": {
+    "enabled": true
+  }
+}

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

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

package/templates/astro/workers/templates/ts/wrangler.jsonc

@@ -0,0 +1,16 @@
+{
+  "name": "<TBD>",
+  "main": "./dist/_worker.js/index.js",
+  "compatibility_date": "<TBD>",
+  "compatibility_flags": [
+    "nodejs_compat",
+    "global_fetch_strictly_public"
+  ],
+  "assets": {
+    "binding": "ASSETS",
+    "directory": "./dist"
+  },
+  "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/js/package.json

@@ -9,6 +9,6 @@
 	},
 	"devDependencies": {
 		"itty-router": "^3.0.12",
-		"wrangler": "^3.60.3"
+		"wrangler": "^3.101.0"
 	}
 }

package/templates/common/js/wrangler.jsonc

@@ -0,0 +1,8 @@
+{
+  "name": "<TBD>",
+  "main": "src/index.js",
+  "compatibility_date": "<TBD>",
+  "observability": {
+    "enabled": true
+  }
+}

package/templates/common/ts/package.json

@@ -11,6 +11,6 @@
 	"devDependencies": {
 		"itty-router": "^3.0.12",
 		"typescript": "^5.5.2",
-		"wrangler": "^3.60.3"
+		"wrangler": "^3.101.0"
 	}
 }

package/templates/common/ts/src/index.ts

@@ -5,7 +5,7 @@
  * - Open a browser tab at http://localhost:8787/ to see your worker in action
  * - Run `npm run deploy` to publish your worker
  *
- * Bind resources to your worker in `wrangler.toml`. After adding bindings, a type definition for the
+ * Bind resources to your Worker in `wrangler.jsonc`. After adding bindings, a type definition for the
  * `Env` object can be regenerated with `npm run cf-typegen`.
  *
  * Learn more at https://developers.cloudflare.com/workers/

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/common/ts/wrangler.jsonc

@@ -0,0 +1,8 @@
+{
+  "name": "<TBD>",
+  "main": "src/index.ts",
+  "compatibility_date": "<TBD>",
+  "observability": {
+    "enabled": true
+  }
+}

package/templates/docusaurus/c3.ts

@@ -1,28 +1,9 @@
-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) => {
-	await runFrameworkGenerator(ctx, [ctx.project.name, "classic"]);
-};
-
-const config: TemplateConfig = {
-	configVersion: 1,
-	id: "docusaurus",
-	frameworkCli: "create-docusaurus",
-	platform: "pages",
+const config: MultiPlatformTemplateConfig = {
 	displayName: "Docusaurus",
-	generate,
-	transformPackageJson: async () => ({
-		scripts: {
-			preview: `${npm} run build && wrangler pages dev ./build`,
-			deploy: `${npm} run build && wrangler pages deploy ./build`,
-		},
-	}),
-	devScript: "preview",
-	deployScript: "deploy",
+	platformVariants: { pages, workers },
 };
 export default config;

package/templates/docusaurus/pages/c3.ts

@@ -0,0 +1,32 @@
+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) => {
+	await runFrameworkGenerator(ctx, [ctx.project.name, "classic"]);
+};
+
+const config: TemplateConfig = {
+	configVersion: 1,
+	id: "docusaurus",
+	frameworkCli: "create-docusaurus",
+	platform: "pages",
+	hidden: true,
+	displayName: "Docusaurus",
+	path: "templates/docusaurus/pages",
+	generate,
+	transformPackageJson: async () => ({
+		scripts: {
+			preview: `${npm} run build && wrangler pages dev ./build`,
+			deploy: `${npm} run build && wrangler pages deploy ./build`,
+		},
+	}),
+	devScript: "preview",
+	deployScript: "deploy",
+	previewScript: "preview",
+	workersTypes: "none",
+};
+export default config;

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

@@ -1,6 +1,6 @@
 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();
@@ -18,7 +18,7 @@ const config: TemplateConfig = {
 	copyFiles: {
 		path: "./templates",
 	},
-	path: "templates-experimental/docusaurus",
+	path: "templates/docusaurus/workers",
 	generate,
 	transformPackageJson: async () => ({
 		scripts: {
@@ -28,5 +28,7 @@ const config: TemplateConfig = {
 	}),
 	devScript: "start",
 	deployScript: "deploy",
+	previewScript: "preview",
+	workersTypes: "none",
 };
 export default config;

package/templates/docusaurus/workers/templates/wrangler.jsonc

@@ -0,0 +1,10 @@
+{
+  "name": "<TBD>",
+  "compatibility_date": "<TBD>",
+  "assets": {
+    "directory": "./build"
+  },
+  "observability": {
+    "enabled": true
+  }
+}

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,52 @@
+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",
+	hidden: true,
+	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",
+	workersTypes: "none",
+};
+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: {
@@ -49,5 +49,6 @@ const config: TemplateConfig = {
 	devScript: "develop",
 	deployScript: "deploy",
 	previewScript: "preview",
+	workersTypes: "none",
 };
 export default config;

package/templates/gatsby/workers/templates/wrangler.jsonc

@@ -0,0 +1,10 @@
+{
+  "name": "<TBD>",
+  "compatibility_date": "<TBD>",
+  "assets": {
+    "directory": "./public"
+  },
+  "observability": {
+    "enabled": true
+  }
+}

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.5.2",
-		"wrangler": "^3.60.3",
-		"vitest": "2.1.8"
+		"@cloudflare/vitest-pool-workers": "^0.8.19",
+		"wrangler": "^3.101.0",
+		"vitest": "~3.0.7"
 	}
 }

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

@@ -14,7 +14,7 @@ describe('Hello World worker', () => {
 	});
 
 	it('responds with Hello World! (integration style)', async () => {
-		const response = await SELF.fetch(request, env, ctx);
+		const response = await SELF.fetch('http://example.com');
 		expect(await response.text()).toMatchInlineSnapshot(`"Hello World!"`);
 	});
 });

package/templates/hello-world/js/vitest.config.js

@@ -4,7 +4,7 @@ export default defineWorkersConfig({
 	test: {
 		poolOptions: {
 			workers: {
-				wrangler: { configPath: './wrangler.toml' },
+				wrangler: { configPath: './wrangler.jsonc' },
 			},
 		},
 	},

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

@@ -0,0 +1,8 @@
+{
+	"name": "<TBD>",
+	"main": "src/index.js",
+	"compatibility_date": "<TBD>",
+	"observability": {
+		"enabled": true,
+	},
+}

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/package.json

@@ -8,6 +8,6 @@
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"wrangler": "^3.60.3"
+		"wrangler": "^3.101.0"
 	}
 }

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/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/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/py/wrangler.jsonc

@@ -0,0 +1,9 @@
+{
+	"name": "<TBD>",
+	"main": "src/entry.py",
+	"compatibility_date": "<TBD>",
+	"compatibility_flags": ["python_workers"],
+	"observability": {
+		"enabled": true,
+	},
+}

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

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

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

@@ -5,7 +5,7 @@
  * - Open a browser tab at http://localhost:8787/ to see your worker in action
  * - Run `npm run deploy` to publish your worker
  *
- * Bind resources to your worker in `wrangler.toml`. After adding bindings, a type definition for the
+ * Bind resources to your worker in `wrangler.jsonc`. After adding bindings, a type definition for the
  * `Env` object can be regenerated with `npm run cf-typegen`.
  *
  * Learn more at https://developers.cloudflare.com/workers/

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/hello-world/ts/vitest.config.mts

@@ -4,7 +4,7 @@ export default defineWorkersConfig({
 	test: {
 		poolOptions: {
 			workers: {
-				wrangler: { configPath: './wrangler.toml' },
+				wrangler: { configPath: './wrangler.jsonc' },
 			},
 		},
 	},

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

@@ -0,0 +1,8 @@
+{
+	"name": "<TBD>",
+	"main": "src/index.ts",
+	"compatibility_date": "<TBD>",
+	"observability": {
+		"enabled": true,
+	},
+}