create-cloudflare 0.0.0-4e69fb6f0 → 0.0.0-4e7345e13

package/templates/hello-world-durable-object-with-assets/py/__dot__gitignore

@@ -0,0 +1,68 @@
+# Logs
+
+logs
+_.log
+npm-debug.log_
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+
+report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
+
+# Runtime data
+
+pids
+_.pid
+_.seed
+\*.pid.lock
+
+# Dependency directories
+
+node_modules/
+jspm_packages/
+
+# TypeScript cache
+
+\*.tsbuildinfo
+
+# Optional npm cache directory
+
+.npm
+
+# Optional eslint cache
+
+.eslintcache
+
+# Optional stylelint cache
+
+.stylelintcache
+
+# Optional REPL history
+
+.node_repl_history
+
+# Output of 'npm pack'
+
+\*.tgz
+
+# dotenv environment variable files
+
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# public
+
+# Stores VSCode versions used for testing VSCode extensions
+
+.vscode-test
+
+# wrangler project
+
+.dev.vars
+.wrangler/

package/templates/hello-world-durable-object-with-assets/py/package.json

@@ -0,0 +1,13 @@
+{
+	"name": "<TBD>",
+	"version": "0.0.0",
+	"private": true,
+	"scripts": {
+		"deploy": "wrangler deploy",
+		"dev": "wrangler dev",
+		"start": "wrangler dev"
+	},
+	"devDependencies": {
+		"wrangler": "^3.101.0"
+	}
+}

package/templates/hello-world-durable-object-with-assets/py/public/index.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<title>Hello, World!</title>
+	</head>
+	<body>
+		<h1 id="heading"></h1>
+		<p>This page comes from a static asset stored at `public/index.html` as configured in `wrangler.jsonc`.</p>
+		<script>
+			fetch('/message')
+				.then((resp) => resp.text())
+				.then((text) => {
+					const h1 = document.getElementById('heading');
+					h1.textContent = text;
+				});
+		</script>
+	</body>
+</html>

package/templates/hello-world-durable-object-with-assets/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-durable-object-with-assets/py/src/entry.py

@@ -0,0 +1,66 @@
+from workers import DurableObject, Response
+
+"""
+ * Welcome to Cloudflare Workers! This is your first Durable Objects application.
+ *
+ * - Run `npm run dev` in your terminal to start a development server
+ * - Open a browser tab at http://localhost:8787/ to see your Durable Object in action
+ * - Run `npm run deploy` to publish your application
+ *
+ * Learn more at https://developers.cloudflare.com/durable-objects
+"""
+
+"""
+ * Env provides a mechanism to reference bindings declared in wrangler.jsonc within Python
+ *
+ * @typedef {Object} Env
+ * @property {DurableObjectNamespace} MY_DURABLE_OBJECT - The Durable Object namespace binding
+"""
+
+# A Durable Object's behavior is defined in an exported Python class
+class MyDurableObject(DurableObject):
+    """
+     * The constructor is invoked once upon creation of the Durable Object, i.e. the first call to
+     * `DurableObjectStub::get` for a given identifier (no-op constructors can be omitted)
+     *
+     * @param {DurableObjectState} ctx - The interface for interacting with Durable Object state
+     * @param {Env} env - The interface to reference bindings declared in wrangler.jsonc
+    """
+    def __init__(self, ctx, env):
+        super().__init__(ctx, env)
+
+    """
+     * The Durable Object exposes an RPC method `say_hello` which will be invoked when when a Durable
+     *  Object instance receives a request from a Worker via the same method invocation on the stub
+     *
+     * @param {string} name - The name provided to a Durable Object instance from a Worker
+     * @returns {Promise<string>} The greeting to be sent back to the Worker
+    """
+    async def say_hello(self, name):
+        return f"Hello, {name}!"
+
+
+"""
+* This is the standard fetch handler for a Cloudflare Worker
+*
+* @param {Request} request - The request submitted to the Worker from the client
+* @param {Env} env - The interface to reference bindings declared in wrangler.jsonc
+* @param {ExecutionContext} ctx - The execution context of the Worker
+* @returns {Promise<Response>} The response to be sent back to the client
+"""
+async def on_fetch(request, env, ctx):
+    # 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.
+    id = env.MY_DURABLE_OBJECT.idFromName("foo")
+
+    # Create a stub to open a communication channel with the Durable
+    # Object instance.
+    stub = env.MY_DURABLE_OBJECT.get(id)
+
+    # Call the `say_hello()` RPC method on the stub to invoke the method on
+    # the remote Durable Object instance
+    greeting = await stub.say_hello("world")
+
+    return Response(greeting)
+

package/templates/hello-world-durable-object-with-assets/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-durable-object-with-assets/py/wrangler.jsonc

@@ -0,0 +1,31 @@
+{
+  "name": "<TBD>",
+  "main": "src/entry.py",
+  "compatibility_date": "<TBD>",
+  "compatibility_flags": [
+    "python_workers"
+  ],
+  "assets": {
+    // The path to the directory containing the `index.html` file to be served at `/`
+    "directory": "./public"
+  },
+  "migrations": [
+    {
+      "new_sqlite_classes": [
+        "MyDurableObject"
+      ],
+      "tag": "v1"
+    }
+  ],
+  "durable_objects": {
+    "bindings": [
+      {
+        "class_name": "MyDurableObject",
+        "name": "MY_DURABLE_OBJECT"
+      }
+    ]
+  },
+  "observability": {
+    "enabled": true
+  }
+}

package/templates/hello-world-durable-object-with-assets/ts/public/index.html

@@ -7,6 +7,7 @@
 	</head>
 	<body>
 		<h1 id="heading"></h1>
+		<p>This page comes from a static asset stored at `public/index.html` as configured in `wrangler.jsonc`.</p>
 		<script>
 			fetch('/message')
 				.then((resp) => resp.text())

package/templates/hello-world-durable-object-with-assets/ts/tsconfig.json

@@ -13,8 +13,6 @@
 		"module": "es2022",
     /* Specify how TypeScript looks up a file from a given module specifier. */
 		"moduleResolution": "node",
-    /* 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-durable-object-with-assets/ts/wrangler.jsonc

@@ -11,7 +11,7 @@
     }
   ],
   "assets": {
-    "binding": "ASSETS",
+    // The path to the directory containing the `index.html` file to be served at `/`
     "directory": "./public"
   },
   "durable_objects": {

package/templates/hello-world-with-assets/c3.ts

@@ -4,8 +4,9 @@ const config: TemplateConfig = {
 	configVersion: 1,
 	id: "hello-world-with-assets",
 	path: "templates/hello-world-with-assets",
-	displayName: "Worker + Assets",
-	description: "For static sites with an API or server-side rendering (SSR)",
+	displayName: "SSR / full-stack app",
+	description:
+		"For sites with a backend API, or server-side rendering (SSR). Uses Static Assets with a Worker.",
 	platform: "workers",
 	copyFiles: {
 		variants: {

package/templates/hello-world-with-assets/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-with-assets/js/public/index.html

@@ -7,6 +7,7 @@
 	</head>
 	<body>
 		<h1 id="heading"></h1>
+		<p>This page comes from a static asset stored at `public/index.html` as configured in `wrangler.jsonc`.</p>
 		<button id="button" type="button">Fetch a random UUID</button>
 		<output id="random" for="button"></output>
 		<script>

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

@@ -3,10 +3,11 @@
   "main": "src/index.js",
   "compatibility_date": "<TBD>",
   "compatibility_flags": [
-    "nodejs_compat"
+    "nodejs_compat",
+    "global_fetch_strictly_public"
   ],
   "assets": {
-    "binding": "ASSETS",
+    // The path to the directory containing the `index.html` file to be served at `/`
     "directory": "./public"
   },
   "observability": {

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

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

package/templates/hello-world-with-assets/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-with-assets/py/public/index.html

@@ -7,6 +7,7 @@
 	</head>
 	<body>
 		<h1 id="heading"></h1>
+		<p>This page comes from a static asset stored at `public/index.html` as configured in `wrangler.jsonc`.</p>
 		<button id="button" type="button">Fetch a random UUID</button>
 		<output id="random" for="button"></output>
 		<script>

package/templates/hello-world-with-assets/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-with-assets/py/src/entry.py

@@ -1,9 +1,11 @@
-from js import Response, URL, crypto
+from workers import Response
+from uuid import uuid4
+from urllib.parse import urlparse
 
 async def on_fetch(request, env):
-	url = URL.new(request.url)
-	if url.pathname == '/message':
-		return Response.new('Hello, World!')
-	if url.pathname == '/random':
-		return Response.new(crypto.randomUUID())
-	return Response.new('Not Found', {'status': 404})
+    url = urlparse(request.url)
+    if url.path == '/message':
+        return Response('Hello, World!')
+    if url.path == '/random':
+        return Response(uuid4())
+    return Response('Not Found', status=404)

package/templates/hello-world-with-assets/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-with-assets/py/wrangler.jsonc

@@ -6,7 +6,7 @@
     "python_workers"
   ],
   "assets": {
-    "binding": "ASSETS",
+    // The path to the directory containing the `index.html` file to be served at `/`
     "directory": "./public"
   },
   "observability": {

package/templates/hello-world-with-assets/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-with-assets/ts/public/index.html

@@ -7,6 +7,7 @@
 	</head>
 	<body>
 		<h1 id="heading"></h1>
+		<p>This page comes from a static asset stored at `public/index.html` as configured in `wrangler.jsonc`.</p>
 		<button id="button" type="button">Fetch a random UUID</button>
 		<output id="random" for="button"></output>
 		<script>

package/templates/hello-world-with-assets/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-with-assets/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-with-assets/ts/wrangler.jsonc

@@ -3,10 +3,10 @@
   "main": "src/index.ts",
   "compatibility_date": "<TBD>",
   "compatibility_flags": [
-    "nodejs_compat"
+    "global_fetch_strictly_public"
   ],
   "assets": {
-    "binding": "ASSETS",
+    // The path to the directory containing the `index.html` file to be served at `/`
     "directory": "./public"
   },
   "observability": {

package/templates/hono/pages/c3.ts

@@ -19,6 +19,8 @@ const generate = async (ctx: C3Context) => {
 	logRaw(""); // newline
 };
 
+const envInterfaceName = "CloudflareBindings";
+
 const config: TemplateConfig = {
 	configVersion: 1,
 	id: "hono",
@@ -33,12 +35,13 @@ const config: TemplateConfig = {
 	generate,
 	transformPackageJson: async () => ({
 		scripts: {
-			"cf-typegen": "wrangler types --env-interface CloudflareBindings",
+			"cf-typegen": `wrangler types --env-interface ${envInterfaceName}`,
 			preview: "vite build && wrangler pages dev",
 		},
 	}),
 	devScript: "dev",
 	deployScript: "deploy",
 	previewScript: "preview",
+	envInterfaceName,
 };
 export default config;

package/templates/hono/workers/c3.ts

@@ -19,6 +19,7 @@ const generate = async (ctx: C3Context) => {
 	logRaw(""); // newline
 };
 
+const envInterfaceName = "CloudflareBindings";
 const config: TemplateConfig = {
 	configVersion: 1,
 	id: "hono",
@@ -32,11 +33,12 @@ const config: TemplateConfig = {
 	generate,
 	transformPackageJson: async () => ({
 		scripts: {
-			"cf-typegen": "wrangler types --env-interface CloudflareBindings",
+			"cf-typegen": `wrangler types --env-interface ${envInterfaceName}`,
 		},
 	}),
 	devScript: "dev",
 	deployScript: "deploy",
 	previewScript: "dev",
+	envInterfaceName,
 };
 export default config;

package/templates/next/pages/c3.ts

@@ -75,14 +75,6 @@ const configure = async (ctx: C3Context) => {
 
 	const usesTs = usesTypescript(ctx);
 
-	if (usesTs) {
-		copyFile(
-			join(getTemplatePath(ctx), "env.d.ts"),
-			join(projectPath, "env.d.ts"),
-		);
-		updateStatus("Created an env.d.ts file");
-	}
-
 	const installEslintPlugin = await shouldInstallNextOnPagesEslintPlugin(ctx);
 
 	if (installEslintPlugin) {
@@ -145,7 +137,6 @@ export const writeEslintrc = async (ctx: C3Context): Promise<void> => {
 const addDevDependencies = async (installEslintPlugin: boolean) => {
 	const packages = [
 		"@cloudflare/next-on-pages@1",
-		"@cloudflare/workers-types",
 		"vercel",
 		...(installEslintPlugin ? ["eslint-plugin-next-on-pages"] : []),
 	];
@@ -156,6 +147,9 @@ const addDevDependencies = async (installEslintPlugin: boolean) => {
 	});
 };
 
+const envInterfaceName = "CloudflareEnv";
+const typesPath = "./env.d.ts";
+
 export default {
 	configVersion: 1,
 	id: "next",
@@ -213,7 +207,7 @@ export default {
 				preview: `${pagesBuildRunCommand} && wrangler pages dev`,
 				deploy: `${pagesBuildRunCommand} && wrangler pages deploy`,
 				...(usesTypescript(ctx) && {
-					"cf-typegen": `wrangler types --env-interface CloudflareEnv env.d.ts`,
+					"cf-typegen": `wrangler types --env-interface ${envInterfaceName} ${typesPath}`,
 				}),
 			},
 		};
@@ -222,4 +216,6 @@ export default {
 	previewScript: "preview",
 	deployScript: "deploy",
 	compatibilityFlags: ["nodejs_compat"],
+	typesPath,
+	envInterfaceName,
 } as TemplateConfig;

package/templates/next/workers/c3.ts

@@ -11,14 +11,9 @@ const generate = async (ctx: C3Context) => {
 };
 
 const configure = async (ctx: C3Context) => {
-	const packages = [
-		"@opennextjs/cloudflare@~1.0.0-beta.0 || ^1.0.0",
-		"@cloudflare/workers-types",
-	];
-	await installPackages(packages, {
-		dev: true,
+	await installPackages(["@opennextjs/cloudflare@^1.0.2"], {
 		startText: "Adding the Cloudflare adapter",
-		doneText: `${brandColor(`installed`)} ${dim(packages.join(", "))}`,
+		doneText: `${brandColor(`installed`)} @opennextjs/cloudflare)}`,
 	});
 
 	const usesTs = usesTypescript(ctx);
@@ -47,13 +42,14 @@ const updateNextConfig = (usesTs: boolean) => {
 	s.stop(`${brandColor(`updated`)} ${dim(`\`${configFile}\``)}`);
 };
 
+const envInterfaceName = "CloudflareEnv";
+const typesPath = "./cloudflare-env.d.ts";
 export default {
 	configVersion: 1,
 	id: "next",
 	frameworkCli: "create-next-app",
-	frameworkCliPinnedVersion: "~15.2.4",
 	platform: "workers",
-	displayName: "Next.js (using Node.js compat + Workers Assets)",
+	displayName: "Next.js",
 	path: "templates/next/workers",
 	copyFiles: {
 		path: "./templates",
@@ -64,11 +60,12 @@ export default {
 		scripts: {
 			deploy: `opennextjs-cloudflare build && opennextjs-cloudflare deploy`,
 			preview: `opennextjs-cloudflare build && opennextjs-cloudflare preview`,
-			"cf-typegen": `wrangler types --env-interface CloudflareEnv cloudflare-env.d.ts`,
+			"cf-typegen": `wrangler types --env-interface ${envInterfaceName} ${typesPath}`,
 		},
 	}),
 	devScript: "dev",
 	previewScript: "preview",
 	deployScript: "deploy",
-	compatibilityFlags: ["nodejs_compat"],
+	typesPath,
+	envInterfaceName,
 } as TemplateConfig;

package/templates/next/workers/templates/open-next.config.ts

@@ -1,6 +1,9 @@
 import { defineCloudflareConfig } from "@opennextjs/cloudflare";
-import r2IncrementalCache from "@opennextjs/cloudflare/overrides/incremental-cache/r2-incremental-cache";
 
 export default defineCloudflareConfig({
-  incrementalCache: r2IncrementalCache,
+  // Uncomment to enable R2 cache,
+  // It should be imported as:
+  // `import r2IncrementalCache from "@opennextjs/cloudflare/overrides/incremental-cache/r2-incremental-cache";`
+  // See https://opennext.js.org/cloudflare/caching for more details
+  // incrementalCache: r2IncrementalCache,
 });

package/templates/next/workers/templates/wrangler.jsonc

@@ -3,7 +3,8 @@
   "main": ".open-next/worker.js",
   "compatibility_date": "2025-03-01",
   "compatibility_flags": [
-    "nodejs_compat"
+    "nodejs_compat",
+    "global_fetch_strictly_public"
   ],
   "assets": {
     "binding": "ASSETS",