create-cloudflare 0.0.0-dfbf03f87 → 0.0.0-dfea523ea

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "0.0.0-dfbf03f87",
+  "version": "0.0.0-dfea523ea",
   "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.20250321.0",
+    "@cloudflare/workers-types": "^4.20250410.0",
     "@iarna/toml": "^3.0.0",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
@@ -52,7 +52,7 @@
     "degit": "^2.8.4",
     "dns2": "^2.1.0",
     "dotenv": "^16.0.0",
-    "esbuild": "0.24.2",
+    "esbuild": "0.25.2",
     "execa": "^7.1.1",
     "glob": "^10.3.3",
     "haikunator": "^2.1.2",
@@ -70,12 +70,12 @@
     "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-dfbf03f87",
-    "@cloudflare/workers-tsconfig": "0.0.0",
-    "wrangler": "0.0.0-dfbf03f87"
+    "@cloudflare/vite-plugin": "0.0.0-dfea523ea",
+    "wrangler": "0.0.0-dfea523ea",
+    "@cloudflare/cli": "1.1.1",
+    "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "engines": {
     "node": ">=18.14.1"

package/templates/angular/pages/c3.ts

@@ -95,6 +95,7 @@ const config: TemplateConfig = {
 	frameworkCli: "@angular/create",
 	displayName: "Angular",
 	platform: "pages",
+	hidden: true,
 	copyFiles: {
 		path: "./templates",
 	},

package/templates/astro/pages/c3.ts

@@ -63,6 +63,7 @@ const config: TemplateConfig = {
 	id: "astro",
 	frameworkCli: "create-astro",
 	platform: "pages",
+	hidden: true,
 	displayName: "Astro",
 	path: "templates/astro/pages",
 	copyFiles: {

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

@@ -11,5 +11,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/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,

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,

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/hello-world-assets-only/c3.ts

@@ -4,9 +4,9 @@ const config: TemplateConfig = {
 	configVersion: 1,
 	id: "hello-world-assets-only",
 	path: "templates/hello-world-assets-only",
-	displayName: "Assets only",
+	displayName: "Static site",
 	description:
-		"For static sites (including SPAs) or when using your own backend",
+		"For static sites or when using your own backend. Uses Workers Static Assets.",
 	platform: "workers",
 	copyFiles: {
 		path: "./templates",

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

@@ -1,4 +1,6 @@
-export default {
+import type { TemplateConfig } from "../../src/templates";
+
+const config: TemplateConfig = {
 	configVersion: 1,
 	id: "hello-world-durable-object",
 	displayName: "Worker + Durable Objects",
@@ -16,3 +18,4 @@ export default {
 		},
 	},
 };
+export default config;

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

@@ -1,9 +1,12 @@
-export default {
+import type { TemplateConfig } from "../../src/templates";
+
+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: {
@@ -19,3 +22,4 @@ export default {
 		},
 	},
 };
+export default config;

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

@@ -1,9 +1,3 @@
 declare module 'cloudflare:test' {
-	// extends Env in ../worker-configuration.d.ts
 	interface ProvidedEnv extends Env {}
-
-	// You can also
-	//  interface ProvidedEnv {
-	// 	KV_NAMESPACE: KVNamespace;
-	// }
 }

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

@@ -1,4 +1,7 @@
-// Generated by Wrangler
-// After adding bindings to `wrangler.jsonc`, regenerate this interface via `npm run cf-typegen`
-interface Env {
+// Generated by Wrangler by running `wrangler types --include-runtime=false` (hash: 187132f48ddf0f604882ba8213fe386f)
+declare namespace Cloudflare {
+	interface Env {
+		ASSETS: Fetcher;
+	}
 }
+interface Env extends Cloudflare.Env {}

package/templates/hono/pages/c3.ts

@@ -29,14 +29,16 @@ const config: TemplateConfig = {
 	},
 	path: "templates/hono/pages",
 	platform: "pages",
+	hidden: true,
 	generate,
 	transformPackageJson: async () => ({
 		scripts: {
 			"cf-typegen": "wrangler types --env-interface CloudflareBindings",
+			preview: "vite build && wrangler pages dev",
 		},
 	}),
 	devScript: "dev",
 	deployScript: "deploy",
-	previewScript: "dev",
+	previewScript: "preview",
 };
 export default config;

package/templates/hono/pages/templates/wrangler.jsonc

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

package/templates/next/c3.ts

@@ -1,223 +1,9 @@
-import { join } from "path";
-import { updateStatus, warn } from "@cloudflare/cli";
-import { brandColor, dim } from "@cloudflare/cli/colors";
-import { inputPrompt, spinner } from "@cloudflare/cli/interactive";
-import { runFrameworkGenerator } from "frameworks/index";
-import {
-	copyFile,
-	probePaths,
-	readFile,
-	readJSON,
-	usesEslint,
-	usesTypescript,
-	writeFile,
-	writeJSON,
-} from "helpers/files";
-import { detectPackageManager } from "helpers/packageManagers";
-import { installPackages } from "helpers/packages";
-import { getTemplatePath } from "../../src/templates";
-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, npx } = detectPackageManager();
-
-const generate = async (ctx: C3Context) => {
-	const projectName = ctx.project.name;
-
-	await runFrameworkGenerator(ctx, [projectName]);
-
-	const wranglerConfig = readFile(join(getTemplatePath(ctx), "wrangler.jsonc"));
-	writeFile(join(ctx.project.path, "wrangler.jsonc"), wranglerConfig);
-	updateStatus("Created wrangler.jsonc file");
-};
-
-const updateNextConfig = (usesTs: boolean) => {
-	const s = spinner();
-
-	const configFile = `next.config.${usesTs ? "ts" : "mjs"}`;
-	s.start(`Updating \`${configFile}\``);
-
-	const configContent = readFile(configFile);
-
-	const updatedConfigFile =
-		`import { setupDevPlatform } from '@cloudflare/next-on-pages/next-dev';
-
-		// Here we use the @cloudflare/next-on-pages next-dev module to allow us to
-		// use bindings during local development (when running the application with
-		// \`next dev\`). This function is only necessary during development and
-		// has no impact outside of that. For more information see:
-		// https://github.com/cloudflare/next-on-pages/blob/main/internal-packages/next-dev/README.md
-		setupDevPlatform().catch(console.error);
-
-		`.replace(/\n\t*/g, "\n") + configContent;
-
-	writeFile(configFile, updatedConfigFile);
-
-	s.stop(`${brandColor(`updated`)} ${dim(`\`${configFile}\``)}`);
-};
-
-const configure = async (ctx: C3Context) => {
-	const projectPath = ctx.project.path;
-
-	// Add a compatible function handler example
-	const path = probePaths([
-		`${projectPath}/pages/api`,
-		`${projectPath}/src/pages/api`,
-		`${projectPath}/src/app/api`,
-		`${projectPath}/app/api`,
-		`${projectPath}/src/app`,
-		`${projectPath}/app`,
-	]);
-
-	if (!path) {
-		throw new Error("Could not find the `/api` or `/app` directory");
-	}
-
-	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) {
-		await writeEslintrc(ctx);
-	}
-
-	updateNextConfig(usesTs);
-
-	copyFile(
-		join(getTemplatePath(ctx), "README.md"),
-		join(projectPath, "README.md"),
-	);
-	updateStatus("Updated the README file");
-
-	await addDevDependencies(installEslintPlugin);
-};
-
-export const shouldInstallNextOnPagesEslintPlugin = async (
-	ctx: C3Context,
-): Promise<boolean> => {
-	const eslintUsage = usesEslint(ctx);
-
-	if (!eslintUsage.used) {
-		return false;
-	}
-
-	if (eslintUsage.configType !== ".eslintrc.json") {
-		warn(
-			`Expected .eslintrc.json from Next.js scaffolding but found ${eslintUsage.configType} instead`,
-		);
-		return false;
-	}
-
-	return await inputPrompt({
-		type: "confirm",
-		question: "Do you want to use the next-on-pages eslint-plugin?",
-		label: "eslint-plugin",
-		defaultValue: true,
-	});
-};
-
-export const writeEslintrc = async (ctx: C3Context): Promise<void> => {
-	const eslintConfig = readJSON(`${ctx.project.path}/.eslintrc.json`) as {
-		plugins: string[];
-		extends: string | string[];
-	};
-
-	eslintConfig.plugins ??= [];
-	eslintConfig.plugins.push("eslint-plugin-next-on-pages");
-
-	if (typeof eslintConfig.extends === "string") {
-		eslintConfig.extends = [eslintConfig.extends];
-	}
-	eslintConfig.extends ??= [];
-	eslintConfig.extends.push("plugin:eslint-plugin-next-on-pages/recommended");
-
-	writeJSON(`${ctx.project.path}/.eslintrc.json`, eslintConfig);
-};
-
-const addDevDependencies = async (installEslintPlugin: boolean) => {
-	const packages = [
-		"@cloudflare/next-on-pages@1",
-		"@cloudflare/workers-types",
-		"vercel",
-		...(installEslintPlugin ? ["eslint-plugin-next-on-pages"] : []),
-	];
-	await installPackages(packages, {
-		dev: true,
-		startText: "Adding the Cloudflare Pages adapter",
-		doneText: `${brandColor(`installed`)} ${dim(packages.join(", "))}`,
-	});
-};
-
-export default {
-	configVersion: 1,
-	id: "next",
-	frameworkCli: "create-next-app",
-	platform: "pages",
+const config: MultiPlatformTemplateConfig = {
 	displayName: "Next.js",
-	generate,
-	configure,
-	copyFiles: {
-		async selectVariant(ctx) {
-			const isApp = probePaths([
-				`${ctx.project.path}/src/app`,
-				`${ctx.project.path}/app`,
-			]);
-
-			const isTypescript = usesTypescript(ctx);
-
-			const dir = isApp ? "app" : "pages";
-			return `${dir}/${isTypescript ? "ts" : "js"}`;
-		},
-		destinationDir(ctx) {
-			const srcPath = probePaths([`${ctx.project.path}/src`]);
-			return srcPath ? "./src" : "./";
-		},
-		variants: {
-			"app/ts": {
-				path: "./app/ts",
-			},
-			"app/js": {
-				path: "./app/js",
-			},
-			"pages/ts": {
-				path: "./pages/ts",
-			},
-			"pages/js": {
-				path: "./pages/js",
-			},
-		},
-	},
-	transformPackageJson: async (_, ctx) => {
-		const isNpm = npm === "npm";
-		const isBun = npm === "bun";
-		const isNpmOrBun = isNpm || isBun;
-		const nextOnPagesScope = isNpmOrBun ? "@cloudflare/" : "";
-		const nextOnPagesCommand = `${nextOnPagesScope}next-on-pages`;
-		const pmCommand = isNpmOrBun ? npx : npm;
-		const pagesBuildRunCommand = `${
-			isNpm ? "npm run" : isBun ? "bun" : pmCommand
-		} pages:build`;
-		return {
-			scripts: {
-				"pages:build": `${pmCommand} ${nextOnPagesCommand}`,
-				preview: `${pagesBuildRunCommand} && wrangler pages dev`,
-				deploy: `${pagesBuildRunCommand} && wrangler pages deploy`,
-				...(usesTypescript(ctx) && {
-					"cf-typegen": `wrangler types --env-interface CloudflareEnv env.d.ts`,
-				}),
-			},
-		};
-	},
-	devScript: "dev",
-	previewScript: "preview",
-	deployScript: "deploy",
-	compatibilityFlags: ["nodejs_compat"],
-} as TemplateConfig;
+	platformVariants: { pages, workers },
+};
+export default config;