create-cloudflare 2.71.1 → 2.72.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "2.71.1",
+  "version": "2.72.1",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -31,7 +31,7 @@
     "@babel/parser": "^7.21.3",
     "@babel/types": "^7.21.4",
     "@clack/prompts": "^1.2.0",
-    "@cloudflare/workers-types": "^5.20260811.1",
+    "@cloudflare/workers-types": "^5.20260815.1",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
     "@types/deepmerge": "^2.2.0",
@@ -71,13 +71,13 @@
     "which-pm-runs": "^1.1.0",
     "wrap-ansi": "^9.0.0",
     "yargs": "^17.7.2",
-    "@cloudflare/cli-shared-helpers": "0.1.23",
+    "@cloudflare/cli-shared-helpers": "0.1.24",
     "@cloudflare/codemod": "1.1.0",
     "@cloudflare/mock-npm-registry": "0.0.0",
-    "@cloudflare/vite-plugin": "1.52.0",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "@cloudflare/workers-utils": "0.33.0",
-    "wrangler": "4.122.0"
+    "@cloudflare/workers-utils": "0.33.1",
+    "wrangler": "4.124.0",
+    "@cloudflare/vite-plugin": "1.53.0"
   },
   "engines": {
     "node": ">=22.0.0"

package/templates/analog/c3.ts

@@ -25,7 +25,7 @@ const configure = async (ctx: C3Context) => {
 	usesTypescript(ctx);
 	const filePath = `vite.config.${usesTypescript(ctx) ? "ts" : "js"}`;
 
-	const compatDate = getWorkerdCompatibilityDate(ctx.project.path);
+	const compatDate = getWorkerdCompatibilityDate();
 
 	updateStatus(`Updating configuration in ${blue(filePath)}`);
 

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

@@ -9,8 +9,8 @@
 		"test": "vitest"
 	},
 	"devDependencies": {
-		"@cloudflare/vitest-pool-workers": "^0.12.4",
-		"vitest": "~3.2.0",
-		"wrangler": "^3.101.0"
+		"@cloudflare/vitest-pool-workers": "^0.21.0",
+		"vitest": "~4.1.0",
+		"wrangler": "^4"
 	}
 }

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

@@ -0,0 +1,10 @@
+import { cloudflareTest } from "@cloudflare/vitest-pool-workers";
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+	plugins: [
+		cloudflareTest({
+			wrangler: { configPath: "./wrangler.jsonc" },
+		}),
+	],
+});

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

@@ -10,9 +10,9 @@
 		"cf-typegen": "wrangler types"
 	},
 	"devDependencies": {
-		"@cloudflare/vitest-pool-workers": "^0.12.4",
+		"@cloudflare/vitest-pool-workers": "^0.21.0",
 		"typescript": "^5.5.2",
-		"vitest": "~3.2.0",
-		"wrangler": "^3.101.0"
+		"vitest": "~4.1.0",
+		"wrangler": "^4"
 	}
 }

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

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

package/templates/hello-world/ts/vitest.config.mts

@@ -1,11 +1,10 @@
-import { defineWorkersConfig } from "@cloudflare/vitest-pool-workers/config";
+import { cloudflareTest } from "@cloudflare/vitest-pool-workers";
+import { defineConfig } from "vitest/config";
 
-export default defineWorkersConfig({
-	test: {
-		poolOptions: {
-			workers: {
-				wrangler: { configPath: "./wrangler.jsonc" },
-			},
-		},
-	},
+export default defineConfig({
+	plugins: [
+		cloudflareTest({
+			wrangler: { configPath: "./wrangler.jsonc" },
+		}),
+	],
 });

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

@@ -9,8 +9,8 @@
 		"test": "vitest"
 	},
 	"devDependencies": {
-		"@cloudflare/vitest-pool-workers": "^0.12.4",
-		"wrangler": "^3.101.0",
-		"vitest": "~3.2.0"
+		"@cloudflare/vitest-pool-workers": "^0.21.0",
+		"wrangler": "^4",
+		"vitest": "~4.1.0"
 	}
 }

package/templates/hello-world-with-assets/js/vitest.config.mjs

@@ -0,0 +1,10 @@
+import { cloudflareTest } from "@cloudflare/vitest-pool-workers";
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+	plugins: [
+		cloudflareTest({
+			wrangler: { configPath: "./wrangler.jsonc" },
+		}),
+	],
+});

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

@@ -10,9 +10,9 @@
 		"cf-typegen": "wrangler types"
 	},
 	"devDependencies": {
-		"@cloudflare/vitest-pool-workers": "^0.12.4",
+		"@cloudflare/vitest-pool-workers": "^0.21.0",
 		"typescript": "^5.5.2",
-		"vitest": "~3.2.0",
-		"wrangler": "^3.101.0"
+		"vitest": "~4.1.0",
+		"wrangler": "^4"
 	}
 }

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

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

package/templates/hello-world-with-assets/ts/vitest.config.mts

@@ -1,11 +1,10 @@
-import { defineWorkersConfig } from '@cloudflare/vitest-pool-workers/config';
+import { cloudflareTest } from "@cloudflare/vitest-pool-workers";
+import { defineConfig } from "vitest/config";
 
-export default defineWorkersConfig({
-	test: {
-		poolOptions: {
-			workers: {
-				wrangler: { configPath: './wrangler.jsonc' },
-			},
-		},
-	},
+export default defineConfig({
+	plugins: [
+		cloudflareTest({
+			wrangler: { configPath: "./wrangler.jsonc" },
+		}),
+	],
 });

package/templates/next/c3.ts

@@ -1,8 +1,96 @@
+import assert from "node:assert";
+import { logRaw } from "@cloudflare/cli-shared-helpers";
+import { inputPrompt } from "@cloudflare/cli-shared-helpers/interactive";
+import { runFrameworkGenerator } from "frameworks/index";
+import { detectPackageManager } from "helpers/packageManagers";
 import { downloadRemoteTemplate, updatePackageName } from "../../src/templates";
 import type { TemplateConfig } from "../../src/templates";
 import type { C3Context } from "types";
 
-const generate = async (ctx: C3Context) => {
+const { npm } = detectPackageManager();
+
+type NextVariantValue = "vinext" | "opennext";
+
+const VINEXT_TYPES_PATH = "./worker-configuration.d.ts";
+const OPENNEXT_TYPES_PATH = "./cloudflare-env.d.ts";
+
+type NextVariant = {
+	value: NextVariantValue;
+	label: string;
+};
+
+const NEXT_VARIANTS: NextVariant[] = [
+	{
+		value: "vinext",
+		label: "vinext (recommended)",
+	},
+	{
+		value: "opennext",
+		label: "OpenNext adapter",
+	},
+];
+
+async function getNextVariant(ctx: C3Context): Promise<NextVariant> {
+	if (ctx.args.variant) {
+		const selected = NEXT_VARIANTS.find(
+			(variant) => variant.value === ctx.args.variant
+		);
+		if (!selected) {
+			throw new Error(
+				`Unknown Next.js variant "${
+					ctx.args.variant
+				}". Valid variants are: ${NEXT_VARIANTS.map((v) => v.value).join(", ")}`
+			);
+		}
+		return selected;
+	}
+
+	const value = await inputPrompt({
+		type: "select",
+		question: "Which Next.js adapter do you want to use?",
+		label: "variant",
+		options: NEXT_VARIANTS,
+		defaultValue: NEXT_VARIANTS[0].value,
+		// Honour -y / --accept-defaults by taking the recommended vinext path.
+		acceptDefault: Boolean(ctx.args.acceptDefaults),
+	});
+
+	const selected = NEXT_VARIANTS.find((variant) => variant.value === value);
+	assert(selected, "Expected a Next.js variant to be selected");
+	return selected;
+}
+
+async function generateVinext(ctx: C3Context) {
+	// Delegate to create-vinext-app, which scaffolds a Next.js App Router project
+	// already configured for vinext + Cloudflare Workers.
+	const pmFlag =
+		npm === "pnpm"
+			? "--use-pnpm"
+			: npm === "yarn"
+				? "--use-yarn"
+				: npm === "bun"
+					? "--use-bun"
+					: "--use-npm";
+
+	await runFrameworkGenerator(ctx, [
+		ctx.project.name,
+		"--platform",
+		"cloudflare",
+		// Avoid a placeholder KV namespace id that would block `wrangler deploy`
+		// until the user manually provisions one. Caching can be added later
+		// via vinext's Cloudflare cache adapters.
+		"--data-cache",
+		"none",
+		"--yes",
+		"--skip-install",
+		"--disable-git",
+		pmFlag,
+	]);
+
+	logRaw("");
+}
+
+async function generateOpenNext(ctx: C3Context) {
 	// Easy way to switch branch for local testing
 	const branch = "main";
 
@@ -13,20 +101,53 @@ const generate = async (ctx: C3Context) => {
 	});
 
 	await updatePackageName(ctx);
+}
+
+const generate = async (ctx: C3Context) => {
+	const variant = await getNextVariant(ctx);
+	// Stash on args so transformPackageJson can branch without re-prompting.
+	ctx.args.variant = variant.value;
+	ctx.template.typesPath =
+		variant.value === "opennext" ? OPENNEXT_TYPES_PATH : VINEXT_TYPES_PATH;
+
+	if (variant.value === "opennext") {
+		ctx.template.frameworkCliUsed = false;
+		await generateOpenNext(ctx);
+		return;
+	}
+
+	await generateVinext(ctx);
 };
 
 const envInterfaceName = "CloudflareEnv";
-const typesPath = "./cloudflare-env.d.ts";
+
 export default {
 	configVersion: 1,
 	id: "next",
-	frameworkCli: "create-next-app",
+	// Used by runFrameworkGenerator for the vinext path. OpenNext downloads a
+	// remote template and does not invoke this CLI.
+	frameworkCli: "create-vinext-app",
 	platform: "workers",
 	displayName: "Next.js",
 	generate,
+	transformPackageJson: async (_pkgJson, ctx) => {
+		// OpenNext's remote template already has deploy/preview/cf-typegen.
+		if (ctx.args.variant === "opennext") {
+			return {};
+		}
+
+		return {
+			scripts: {
+				// Align with OpenNext so the shared previewScript: "preview" works
+				// for both variants (vinext only ships dev/build/start/deploy).
+				preview: `${npm} run build && ${npm} run start${npm === "npm" ? " --" : ""}`,
+				"cf-typegen": `wrangler types --env-interface ${envInterfaceName} ${VINEXT_TYPES_PATH}`,
+			},
+		};
+	},
 	devScript: "dev",
 	previewScript: "preview",
 	deployScript: "deploy",
-	typesPath,
+	typesPath: VINEXT_TYPES_PATH,
 	envInterfaceName,
 } as TemplateConfig;

package/templates/next/experimental_c3.ts

@@ -3,14 +3,18 @@ import type { TemplateConfig } from "../../src/templates";
 import type { C3Context } from "types";
 
 const generate = async (ctx: C3Context) => {
-	await runFrameworkGenerator(ctx, [
-		ctx.project.name,
-		"--skip-install",
-	]);
+	if (ctx.args.variant) {
+		throw new Error(
+			"Next.js adapter variants are not supported with --experimental."
+		);
+	}
+
+	await runFrameworkGenerator(ctx, [ctx.project.name, "--skip-install"]);
 };
 
 const envInterfaceName = "CloudflareEnv";
 const typesPath = "./cloudflare-env.d.ts";
+
 export default {
 	configVersion: 1,
 	id: "next",

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

@@ -1,11 +0,0 @@
-import { defineWorkersConfig } from "@cloudflare/vitest-pool-workers/config";
-
-export default defineWorkersConfig({
-	test: {
-		poolOptions: {
-			workers: {
-				wrangler: { configPath: "./wrangler.jsonc" },
-			},
-		},
-	},
-});

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

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

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

@@ -1,11 +0,0 @@
-import { defineWorkersConfig } from '@cloudflare/vitest-pool-workers/config';
-
-export default defineWorkersConfig({
-	test: {
-		poolOptions: {
-			workers: {
-				wrangler: { configPath: './wrangler.jsonc' },
-			},
-		},
-	},
-});

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

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