create-cloudflare 2.64.8 → 2.65.0

package/templates/qwik/workers/c3.ts

@@ -4,7 +4,7 @@ import { spinner } from "@cloudflare/cli/interactive";
 import { runFrameworkGenerator } from "frameworks/index";
 import { loadTemplateSnippets, transformFile } from "helpers/codemod";
 import { quoteShellArgs, runCommand } from "helpers/command";
-import { removeFile, usesTypescript } from "helpers/files";
+import { usesTypescript } from "helpers/files";
 import { detectPackageManager } from "helpers/packageManagers";
 import * as recast from "recast";
 import type { TemplateConfig } from "../../../src/templates";
@@ -17,15 +17,18 @@ const generate = async (ctx: C3Context) => {
 };
 
 const configure = async (ctx: C3Context) => {
-	// Add the pages integration
+	// Add the workers integration
 	// For some reason `pnpx qwik add` fails for qwik so we use `pnpm qwik add` instead.
-	const cmd = [name === "pnpm" ? npm : npx, "qwik", "add", "cloudflare-pages"];
+	const cmd = [
+		name === "pnpm" ? npm : npx,
+		"qwik",
+		"add",
+		"cloudflare-workers",
+		"--skipConfirmation=true",
+	];
 	endSection(`Running ${quoteShellArgs(cmd)}`);
 	await runCommand(cmd);
 
-	// Remove the extraneous Pages files
-	removeFile("./public/_routes.json");
-
 	addBindingsProxy(ctx);
 };
 
@@ -46,7 +49,7 @@ const addBindingsProxy = (ctx: C3Context) => {
 		// Insert the env declaration after the last import (but before the rest of the body)
 		visitProgram: function (n) {
 			const lastImportIndex = n.node.body.findLastIndex(
-				(t) => t.type === "ImportDeclaration",
+				(t) => t.type === "ImportDeclaration"
 			);
 			const lastImport = n.get("body", lastImportIndex);
 			lastImport.insertAfter(...snippets.getPlatformProxyTs);

package/templates/react/pages/c3.ts

@@ -44,7 +44,7 @@ async function getVariant(ctx: C3Context) {
 		const selected = variantsOptions.find((v) => v.value === ctx.args.variant);
 		if (!selected) {
 			throw new Error(
-				`Unknown variant "${ctx.args.variant}". Valid variants are: ${variantsOptions.map((v) => v.value).join(", ")}`,
+				`Unknown variant "${ctx.args.variant}". Valid variants are: ${variantsOptions.map((v) => v.value).join(", ")}`
 			);
 		}
 		return selected.value;

package/templates/react/workers/c3.ts

@@ -54,12 +54,12 @@ function transformViteConfig(ctx: C3Context) {
 			// import {cloudflare} from "@cloudflare/vite-plugin";
 			// ```
 			const lastImportIndex = n.node.body.findLastIndex(
-				(statement) => statement.type === "ImportDeclaration",
+				(statement) => statement.type === "ImportDeclaration"
 			);
 			const lastImport = n.get("body", lastImportIndex);
 			const importAst = b.importDeclaration(
 				[b.importSpecifier(b.identifier("cloudflare"))],
-				b.stringLiteral("@cloudflare/vite-plugin"),
+				b.stringLiteral("@cloudflare/vite-plugin")
 			);
 			lastImport.insertAfter(importAst);
 
@@ -81,7 +81,7 @@ function transformViteConfig(ctx: C3Context) {
 			const pluginsProp = config.properties.find((prop) => isPluginsProp(prop));
 			assert(pluginsProp && t.ArrayExpression.check(pluginsProp.value));
 			pluginsProp.value.elements.push(
-				b.callExpression(b.identifier("cloudflare"), []),
+				b.callExpression(b.identifier("cloudflare"), [])
 			);
 
 			return false;
@@ -90,7 +90,7 @@ function transformViteConfig(ctx: C3Context) {
 }
 
 function isPluginsProp(
-	prop: unknown,
+	prop: unknown
 ): prop is types.namedTypes.ObjectProperty | types.namedTypes.Property {
 	return (
 		(t.Property.check(prop) || t.ObjectProperty.check(prop)) &&
@@ -142,11 +142,11 @@ async function getVariant(ctx: C3Context) {
 	// If variant is provided via CLI args, use it directly
 	if (ctx.args.variant) {
 		const selected = variantsOptions.find(
-			(variant) => variant.value === ctx.args.variant,
+			(variant) => variant.value === ctx.args.variant
 		);
 		if (!selected) {
 			throw new Error(
-				`Unknown variant "${ctx.args.variant}". Valid variants are: ${variantsOptions.map((v) => v.value).join(", ")}`,
+				`Unknown variant "${ctx.args.variant}". Valid variants are: ${variantsOptions.map((v) => v.value).join(", ")}`
 			);
 		}
 		return selected;

package/templates/solid/c3.ts

@@ -34,7 +34,7 @@ const configure = async (ctx: C3Context) => {
 			const b = recast.types.builders;
 			const presetProp = b.objectProperty(
 				b.identifier("preset"),
-				b.stringLiteral("cloudflare-module"),
+				b.stringLiteral("cloudflare-module")
 			);
 
 			if (n.node.arguments.length === 0) {
@@ -42,7 +42,7 @@ const configure = async (ctx: C3Context) => {
 			} else {
 				mergeObjectProperties(
 					n.node.arguments[0] as recast.types.namedTypes.ObjectExpression,
-					[presetProp],
+					[presetProp]
 				);
 			}
 

package/templates/svelte/pages/c3.ts

@@ -98,21 +98,21 @@ const updateTypeDefinitions = (ctx: C3Context) => {
 					b.tsInterfaceBody([
 						b.tsPropertySignature(
 							b.identifier("env"),
-							b.tsTypeAnnotation(b.tsTypeReference(b.identifier("Env"))),
+							b.tsTypeAnnotation(b.tsTypeReference(b.identifier("Env")))
 						),
 						b.tsPropertySignature(
 							b.identifier("cf"),
 							b.tsTypeAnnotation(
-								b.tsTypeReference(b.identifier("CfProperties")),
-							),
+								b.tsTypeReference(b.identifier("CfProperties"))
+							)
 						),
 						b.tsPropertySignature(
 							b.identifier("ctx"),
 							b.tsTypeAnnotation(
-								b.tsTypeReference(b.identifier("ExecutionContext")),
-							),
+								b.tsTypeReference(b.identifier("ExecutionContext"))
+							)
 						),
-					]),
+					])
 				);
 
 				moduleBlock.body.unshift(platformInterface);

package/templates/svelte/workers/c3.ts

@@ -68,21 +68,21 @@ const updateTypeDefinitions = (ctx: C3Context) => {
 					b.tsInterfaceBody([
 						b.tsPropertySignature(
 							b.identifier("env"),
-							b.tsTypeAnnotation(b.tsTypeReference(b.identifier("Env"))),
+							b.tsTypeAnnotation(b.tsTypeReference(b.identifier("Env")))
 						),
 						b.tsPropertySignature(
 							b.identifier("cf"),
 							b.tsTypeAnnotation(
-								b.tsTypeReference(b.identifier("CfProperties")),
-							),
+								b.tsTypeReference(b.identifier("CfProperties"))
+							)
 						),
 						b.tsPropertySignature(
 							b.identifier("ctx"),
 							b.tsTypeAnnotation(
-								b.tsTypeReference(b.identifier("ExecutionContext")),
-							),
+								b.tsTypeReference(b.identifier("ExecutionContext"))
+							)
 						),
-					]),
+					])
 				);
 
 				moduleBlock.body.unshift(platformInterface);