create-cloudflare 0.0.0-dba3f2158 → 0.0.0-dbbeb23c7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "0.0.0-dba3f2158",
+  "version": "0.0.0-dbbeb23c7",
   "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.20250204.0",
+    "@cloudflare/workers-types": "^4.20250317.0",
     "@iarna/toml": "^3.0.0",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
@@ -38,7 +38,7 @@
     "@types/degit": "^2.8.6",
     "@types/dns2": "^2.0.3",
     "@types/esprima": "^4.0.3",
-    "@types/node": "^18.19.71",
+    "@types/node": "^18.19.75",
     "@types/semver": "^7.5.1",
     "@types/which-pm-runs": "^1.0.0",
     "@types/yargs": "^17.0.22",
@@ -46,12 +46,13 @@
     "@typescript-eslint/parser": "^6.9.0",
     "chalk": "^5.2.0",
     "command-exists": "^1.2.9",
+    "comment-json": "^4.2.5",
     "cross-spawn": "^7.0.3",
     "deepmerge": "^4.3.1",
     "degit": "^2.8.4",
     "dns2": "^2.1.0",
     "dotenv": "^16.0.0",
-    "esbuild": "0.17.19",
+    "esbuild": "0.24.2",
     "execa": "^7.1.1",
     "glob": "^10.3.3",
     "haikunator": "^2.1.2",
@@ -59,21 +60,22 @@
     "magic-string": "^0.30.5",
     "open": "^8.4.0",
     "recast": "^0.22.0",
-    "semver": "^7.5.1",
+    "semver": "^7.7.1",
     "typescript": "^5.7.2",
-    "undici": "^5.28.4",
+    "undici": "^5.28.5",
     "vite": "^5.4.14",
     "vite-tsconfig-paths": "^4.0.8",
-    "vitest": "~2.1.9",
+    "vitest": "~3.0.8",
     "which-pm-runs": "^1.1.0",
     "wrap-ansi": "^9.0.0",
     "xdg-app-paths": "^8.3.0",
     "yargs": "^17.7.2",
     "@cloudflare/cli": "1.1.1",
+    "@cloudflare/mock-npm-registry": "0.0.0",
     "@cloudflare/eslint-config-worker": "1.1.0",
+    "@cloudflare/vite-plugin": "0.0.0-dbbeb23c7",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "@cloudflare/mock-npm-registry": "0.0.0",
-    "wrangler": "0.0.0-dba3f2158"
+    "wrangler": "0.0.0-dbbeb23c7"
   },
   "engines": {
     "node": ">=18.14.1"

package/templates/angular/c3.ts

@@ -1,114 +1,9 @@
-import { resolve } from "node:path";
-import { logRaw } from "@cloudflare/cli";
-import { brandColor, dim } from "@cloudflare/cli/colors";
-import { spinner } from "@cloudflare/cli/interactive";
-import { runFrameworkGenerator } from "frameworks/index";
-import { compatDateFlag } from "helpers/compatDate";
-import { readFile, readJSON, writeFile } from "helpers/files";
-import { detectPackageManager } from "helpers/packageManagers";
-import { installPackages } from "helpers/packages";
-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,
-		"--ssr",
-		"--server-routing" /** Dev Preview API */,
-	]);
-	logRaw("");
-};
-
-const configure = async (ctx: C3Context) => {
-	updateAngularJson(ctx);
-	await updateAppCode();
-	await installCFWorker();
-};
-
-async function installCFWorker() {
-	await installPackages(["xhr2"], {
-		dev: true,
-		startText: "Installing additional dependencies",
-		doneText: `${brandColor("installed")} ${dim(`via \`${npm} install\``)}`,
-	});
-}
-async function updateAppCode() {
-	const s = spinner();
-	s.start(`Updating application code`);
-
-	// Update an app config file to:
-	// - add the `provideHttpClient(withFetch())` call to enable `fetch` usage in `HttpClient`
-	const appConfigPath = "src/app/app.config.ts";
-	const appConfig = readFile(resolve(appConfigPath));
-	const newAppConfig =
-		"import { provideHttpClient, withFetch } from '@angular/common/http';\n" +
-		appConfig.replace(
-			"providers: [",
-			"providers: [provideHttpClient(withFetch()), ",
-		);
-	writeFile(resolve(appConfigPath), newAppConfig);
-	s.stop(`${brandColor(`updated`)} ${dim(appConfigPath)}`);
-
-	// Update an app server routes file to:
-	const appServerRoutesPath = "src/app/app.routes.server.ts";
-	const appRoutes = readFile(resolve(appServerRoutesPath));
-	const newAppRoutes = appRoutes.replace(
-		"RenderMode.Prerender",
-		"RenderMode.Server",
-	);
-	writeFile(resolve(appServerRoutesPath), newAppRoutes);
-	s.stop(`${brandColor(`updated`)} ${dim(appServerRoutesPath)}`);
-
-	// Remove unwanted dependencies
-	s.start(`Updating package.json`);
-	const packageJsonPath = resolve("package.json");
-	const packageManifest = readJSON(packageJsonPath);
-
-	delete packageManifest["dependencies"]["express"];
-	delete packageManifest["devDependencies"]["@types/express"];
-
-	writeFile(packageJsonPath, JSON.stringify(packageManifest, null, 2));
-	s.stop(`${brandColor(`updated`)} ${dim(`\`package.json\``)}`);
-}
-
-function updateAngularJson(ctx: C3Context) {
-	const s = spinner();
-	s.start(`Updating angular.json config`);
-	const angularJson = readJSON(resolve("angular.json"));
-	// Update builder
-	const architectSection = angularJson.projects[ctx.project.name].architect;
-	architectSection.build.options.outputPath = "dist";
-	architectSection.build.options.outputMode = "server";
-	architectSection.build.options.ssr.experimentalPlatform = "neutral";
-	architectSection.build.options.assets.push("src/_routes.json");
-
-	writeFile(resolve("angular.json"), JSON.stringify(angularJson, null, 2));
-	s.stop(`${brandColor(`updated`)} ${dim(`\`angular.json\``)}`);
-}
-
-const config: TemplateConfig = {
-	configVersion: 1,
-	id: "angular",
-	frameworkCli: "@angular/create",
+const config: MultiPlatformTemplateConfig = {
 	displayName: "Angular",
-	platform: "pages",
-	copyFiles: {
-		path: "./templates",
-	},
-	devScript: "start",
-	deployScript: "deploy",
-	previewScript: "start",
-	generate,
-	configure,
-	transformPackageJson: async () => ({
-		scripts: {
-			start: `${npm} run build && wrangler pages dev dist/cloudflare ${await compatDateFlag()}`,
-			build: `ng build && ${npm} run process`,
-			process: "node ./tools/copy-files.mjs",
-			deploy: `${npm} run build && wrangler pages deploy dist/cloudflare`,
-		},
-	}),
+	platformVariants: { pages, workers },
 };
 export default config;

package/templates/angular/pages/c3.ts

@@ -0,0 +1,134 @@
+import { resolve } from "node:path";
+import { logRaw } from "@cloudflare/cli";
+import { brandColor, dim } from "@cloudflare/cli/colors";
+import { spinner } from "@cloudflare/cli/interactive";
+import { runFrameworkGenerator } from "frameworks/index";
+import { compatDateFlag } from "helpers/compatDate";
+import { readFile, readJSON, writeFile } from "helpers/files";
+import { detectPackageManager } from "helpers/packageManagers";
+import { installPackages } from "helpers/packages";
+import type { TemplateConfig } from "../../../src/templates";
+import type { C3Context, PackageJson } from "types";
+
+const { npm } = detectPackageManager();
+
+const generate = async (ctx: C3Context) => {
+	await runFrameworkGenerator(ctx, [
+		ctx.project.name,
+		"--ssr",
+		"--server-routing" /** Dev Preview API */,
+	]);
+	logRaw("");
+};
+
+const configure = async (ctx: C3Context) => {
+	updateAngularJson(ctx);
+	await updateAppCode();
+	await installCFWorker();
+};
+
+async function installCFWorker() {
+	await installPackages(["xhr2"], {
+		dev: true,
+		startText: "Installing additional dependencies",
+		doneText: `${brandColor("installed")} ${dim(`via \`${npm} install\``)}`,
+	});
+}
+async function updateAppCode() {
+	const s = spinner();
+	s.start(`Updating application code`);
+
+	// Update an app config file to:
+	// - add the `provideHttpClient(withFetch())` call to enable `fetch` usage in `HttpClient`
+	const appConfigPath = "src/app/app.config.ts";
+	const appConfig = readFile(resolve(appConfigPath));
+	const newAppConfig =
+		"import { provideHttpClient, withFetch } from '@angular/common/http';\n" +
+		appConfig.replace(
+			"providers: [",
+			"providers: [provideHttpClient(withFetch()), ",
+		);
+	writeFile(resolve(appConfigPath), newAppConfig);
+	s.stop(`${brandColor(`updated`)} ${dim(appConfigPath)}`);
+
+	// Update an app server routes file to:
+	const appServerRoutesPath = "src/app/app.routes.server.ts";
+	const appRoutes = readFile(resolve(appServerRoutesPath));
+	const newAppRoutes = appRoutes.replace(
+		"RenderMode.Prerender",
+		"RenderMode.Server",
+	);
+	writeFile(resolve(appServerRoutesPath), newAppRoutes);
+	s.stop(`${brandColor(`updated`)} ${dim(appServerRoutesPath)}`);
+
+	// Remove unwanted dependencies
+	s.start(`Updating package.json`);
+	const packageJsonPath = resolve("package.json");
+	const packageManifest = readJSON(packageJsonPath) as PackageJson;
+
+	delete packageManifest["dependencies"]?.["express"];
+	delete packageManifest["devDependencies"]?.["@types/express"];
+
+	writeFile(packageJsonPath, JSON.stringify(packageManifest, null, 2));
+	s.stop(`${brandColor(`updated`)} ${dim(`\`package.json\``)}`);
+}
+
+function updateAngularJson(ctx: C3Context) {
+	const s = spinner();
+	s.start(`Updating angular.json config`);
+	const angularJson = readJSON("angular.json") as AngularJson;
+
+	// Update builder
+	const architectSection = angularJson.projects[ctx.project.name].architect;
+	architectSection.build.options.outputPath = "dist";
+	architectSection.build.options.outputMode = "server";
+	architectSection.build.options.ssr.experimentalPlatform = "neutral";
+	architectSection.build.options.assets.push("src/_routes.json");
+
+	writeFile(resolve("angular.json"), JSON.stringify(angularJson, null, 2));
+	s.stop(`${brandColor(`updated`)} ${dim(`\`angular.json\``)}`);
+}
+
+const config: TemplateConfig = {
+	configVersion: 1,
+	id: "angular",
+	frameworkCli: "@angular/create",
+	displayName: "Angular",
+	platform: "pages",
+	copyFiles: {
+		path: "./templates",
+	},
+	path: "templates/angular/pages",
+	devScript: "start",
+	deployScript: "deploy",
+	previewScript: "start",
+	generate,
+	configure,
+	transformPackageJson: async () => ({
+		scripts: {
+			start: `${npm} run build && wrangler pages dev dist/cloudflare ${await compatDateFlag()}`,
+			build: `ng build && ${npm} run process`,
+			process: "node ./tools/copy-files.mjs",
+			deploy: `${npm} run build && wrangler pages deploy dist/cloudflare`,
+		},
+	}),
+};
+export default config;
+
+type AngularJson = {
+	projects: Record<
+		string,
+		{
+			architect: {
+				build: {
+					options: {
+						outputPath: string;
+						outputMode: string;
+						ssr: Record<string, unknown>;
+						assets: string[];
+					};
+				};
+			};
+		}
+	>;
+};

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

@@ -6,8 +6,8 @@ import { runFrameworkGenerator } from "frameworks/index";
 import { readFile, readJSON, writeFile } from "helpers/files";
 import { detectPackageManager } from "helpers/packageManagers";
 import { installPackages } from "helpers/packages";
-import type { TemplateConfig } from "../../src/templates";
-import type { C3Context } from "types";
+import type { TemplateConfig } from "../../../src/templates";
+import type { C3Context, PackageJson } from "types";
 
 const { npm } = detectPackageManager();
 
@@ -63,10 +63,10 @@ async function updateAppCode() {
 	// Remove unwanted dependencies
 	s.start(`Updating package.json`);
 	const packageJsonPath = resolve("package.json");
-	const packageManifest = readJSON(packageJsonPath);
+	const packageManifest = readJSON(packageJsonPath) as PackageJson;
 
-	delete packageManifest["dependencies"]["express"];
-	delete packageManifest["devDependencies"]["@types/express"];
+	delete packageManifest["dependencies"]?.["express"];
+	delete packageManifest["devDependencies"]?.["@types/express"];
 
 	writeFile(packageJsonPath, JSON.stringify(packageManifest, null, 2));
 	s.stop(`${brandColor(`updated`)} ${dim(`\`package.json\``)}`);
@@ -75,7 +75,7 @@ async function updateAppCode() {
 function updateAngularJson(ctx: C3Context) {
 	const s = spinner();
 	s.start(`Updating angular.json config`);
-	const angularJson = readJSON(resolve("angular.json"));
+	const angularJson = readJSON(resolve("angular.json")) as AngularJson;
 	// Update builder
 	const architectSection = angularJson.projects[ctx.project.name].architect;
 	architectSection.build.options.outputPath = "dist";
@@ -95,7 +95,7 @@ const config: TemplateConfig = {
 	copyFiles: {
 		path: "./templates",
 	},
-	path: "templates-experimental/angular",
+	path: "templates/angular/workers",
 	devScript: "start",
 	deployScript: "deploy",
 	previewScript: "start",
@@ -110,3 +110,21 @@ const config: TemplateConfig = {
 	}),
 };
 export default config;
+
+type AngularJson = {
+	projects: Record<
+		string,
+		{
+			architect: {
+				build: {
+					options: {
+						outputPath: string;
+						outputMode: string;
+						ssr: Record<string, unknown>;
+						assets: string[];
+					};
+				};
+			};
+		}
+	>;
+};

package/templates/astro/c3.ts

@@ -1,97 +1,9 @@
-import { logRaw, updateStatus } from "@cloudflare/cli";
-import { blue, brandColor, dim } from "@cloudflare/cli/colors";
-import { runFrameworkGenerator } from "frameworks/index";
-import { transformFile } from "helpers/codemod";
-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 { C3Context, PackageJson } from "types";
+import pages from "./pages/c3";
+import workers from "./workers/c3";
+import type { MultiPlatformTemplateConfig } from "../../src/templates";
 
-const { npx } = detectPackageManager();
-
-const generate = async (ctx: C3Context) => {
-	await runFrameworkGenerator(ctx, [ctx.project.name, "--no-install"]);
-
-	logRaw(""); // newline
-};
-
-const configure = async () => {
-	await runCommand([npx, "astro", "add", "cloudflare", "-y"], {
-		silent: true,
-		startText: "Installing adapter",
-		doneText: `${brandColor("installed")} ${dim(
-			`via \`${npx} astro add cloudflare\``,
-		)}`,
-	});
-
-	updateAstroConfig();
-};
-
-const updateAstroConfig = () => {
-	const filePath = "astro.config.mjs";
-
-	updateStatus(`Updating configuration in ${blue(filePath)}`);
-
-	transformFile(filePath, {
-		visitCallExpression: function (n) {
-			const callee = n.node.callee as recast.types.namedTypes.Identifier;
-			if (callee.name !== "cloudflare") {
-				return this.traverse(n);
-			}
-
-			const b = recast.types.builders;
-			n.node.arguments = [
-				b.objectExpression([
-					b.objectProperty(
-						b.identifier("platformProxy"),
-						b.objectExpression([
-							b.objectProperty(b.identifier("enabled"), b.booleanLiteral(true)),
-						]),
-					),
-				]),
-			];
-
-			return false;
-		},
-	});
-};
-
-const config: TemplateConfig = {
-	configVersion: 1,
-	id: "astro",
-	frameworkCli: "create-astro",
-	platform: "pages",
+const config: MultiPlatformTemplateConfig = {
 	displayName: "Astro",
-	copyFiles: {
-		async selectVariant(ctx) {
-			// Note: this `selectVariant` function should not be needed
-			//       this is just a quick workaround until
-			//       https://github.com/cloudflare/workers-sdk/issues/7495
-			//       is resolved
-			return usesTypescript(ctx) ? "ts" : "js";
-		},
-		variants: {
-			js: {
-				path: "./templates/js",
-			},
-			ts: {
-				path: "./templates/ts",
-			},
-		},
-	},
-	devScript: "dev",
-	deployScript: "deploy",
-	previewScript: "preview",
-	generate,
-	configure,
-	transformPackageJson: async (pkgJson: PackageJson, ctx: C3Context) => ({
-		scripts: {
-			deploy: `astro build && wrangler pages deploy`,
-			preview: `astro build && wrangler pages dev`,
-			...(usesTypescript(ctx) && { "cf-typegen": `wrangler types` }),
-		},
-	}),
+	platformVariants: { pages, workers },
 };
 export default config;

package/templates/astro/pages/c3.ts

@@ -0,0 +1,98 @@
+import { logRaw, updateStatus } from "@cloudflare/cli";
+import { blue, brandColor, dim } from "@cloudflare/cli/colors";
+import { runFrameworkGenerator } from "frameworks/index";
+import { transformFile } from "helpers/codemod";
+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 { C3Context, PackageJson } from "types";
+
+const { npx } = detectPackageManager();
+
+const generate = async (ctx: C3Context) => {
+	await runFrameworkGenerator(ctx, [ctx.project.name, "--no-install"]);
+
+	logRaw(""); // newline
+};
+
+const configure = async () => {
+	await runCommand([npx, "astro", "add", "cloudflare", "-y"], {
+		silent: true,
+		startText: "Installing adapter",
+		doneText: `${brandColor("installed")} ${dim(
+			`via \`${npx} astro add cloudflare\``,
+		)}`,
+	});
+
+	updateAstroConfig();
+};
+
+const updateAstroConfig = () => {
+	const filePath = "astro.config.mjs";
+
+	updateStatus(`Updating configuration in ${blue(filePath)}`);
+
+	transformFile(filePath, {
+		visitCallExpression: function (n) {
+			const callee = n.node.callee as recast.types.namedTypes.Identifier;
+			if (callee.name !== "cloudflare") {
+				return this.traverse(n);
+			}
+
+			const b = recast.types.builders;
+			n.node.arguments = [
+				b.objectExpression([
+					b.objectProperty(
+						b.identifier("platformProxy"),
+						b.objectExpression([
+							b.objectProperty(b.identifier("enabled"), b.booleanLiteral(true)),
+						]),
+					),
+				]),
+			];
+
+			return false;
+		},
+	});
+};
+
+const config: TemplateConfig = {
+	configVersion: 1,
+	id: "astro",
+	frameworkCli: "create-astro",
+	platform: "pages",
+	displayName: "Astro",
+	path: "templates/astro/pages",
+	copyFiles: {
+		async selectVariant(ctx) {
+			// Note: this `selectVariant` function should not be needed
+			//       this is just a quick workaround until
+			//       https://github.com/cloudflare/workers-sdk/issues/7495
+			//       is resolved
+			return usesTypescript(ctx) ? "ts" : "js";
+		},
+		variants: {
+			js: {
+				path: "./templates/js",
+			},
+			ts: {
+				path: "./templates/ts",
+			},
+		},
+	},
+	devScript: "dev",
+	deployScript: "deploy",
+	previewScript: "preview",
+	generate,
+	configure,
+	transformPackageJson: async (pkgJson: PackageJson, ctx: C3Context) => ({
+		scripts: {
+			deploy: `astro build && wrangler pages deploy`,
+			preview: `astro build && wrangler pages dev`,
+			...(usesTypescript(ctx) && { "cf-typegen": `wrangler types` }),
+		},
+	}),
+};
+export default config;

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/ts/public/.assetsignore

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

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,30 @@
+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",
+	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",
+};
+export default config;