create-cloudflare 2.21.1 → 2.21.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "2.21.1",
+  "version": "2.21.2",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -29,8 +29,7 @@
     "@babel/parser": "^7.21.3",
     "@babel/types": "^7.21.4",
     "@clack/prompts": "^0.6.3",
-    "@cloudflare/eslint-config-worker": "*",
-    "@cloudflare/workers-types": "^4.20240419.0",
+    "@cloudflare/workers-types": "^4.20240512.0",
     "@iarna/toml": "^3.0.0",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
@@ -58,19 +57,17 @@
     "indent-string": "^5.0.0",
     "magic-string": "^0.30.5",
     "open": "^8.4.0",
-    "pnpm": "^8.10.0",
     "recast": "^0.22.0",
     "semver": "^7.5.1",
-    "typescript": "^5.0.2",
-    "undici": "5.28.3",
+    "undici": "5.28.4",
     "vite-tsconfig-paths": "^4.0.8",
     "which-pm-runs": "^1.1.0",
     "wrap-ansi": "^9.0.0",
     "yargs": "^17.7.1",
-    "yarn": "^1.22.19",
     "@cloudflare/cli": "1.1.1",
+    "@cloudflare/eslint-config-worker": "1.1.0",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "wrangler": "3.52.0"
+    "wrangler": "3.57.0"
   },
   "engines": {
     "node": ">=18.14.1"
@@ -84,11 +81,7 @@
     "check:lint": "eslint .",
     "check:type": "tsc",
     "lint": "eslint",
-    "test:e2e:cleanup": "node -r esbuild-register scripts/e2eCleanup.ts",
-    "test:e2e:npm": "pnpm run build && cross-env TEST_PM=npm vitest run --config ./vitest-e2e.config.ts",
-    "test:e2e:pnpm": "pnpm run build && cross-env TEST_PM=pnpm vitest run --config ./vitest-e2e.config.ts",
-    "test:e2e:bun": "pnpm run build && cross-env TEST_PM=bun vitest run --config ./vitest-e2e.config.ts",
-    "test:e2e:yarn": "pnpm run build && cross-env TEST_PM=yarn vitest run --config ./vitest-e2e.config.ts",
+    "test:e2e": "vitest run --config ./vitest-e2e.config.ts",
     "test:unit": "vitest run --config ./vitest.config.ts",
     "test:unit:watch": "vitest --config ./vitest.config.ts",
     "watch": "node -r esbuild-register scripts/build.ts --watch",

package/templates/analog/c3.ts

@@ -76,7 +76,7 @@ const updateViteConfig = (ctx: C3Context) => {
 	transformFile(configFile, {
 		visitProgram(n) {
 			const lastImportIndex = n.node.body.findLastIndex(
-				(t) => t.type === "ImportDeclaration"
+				(t) => t.type === "ImportDeclaration",
 			);
 			const lastImport = n.get("body", lastImportIndex);
 			lastImport.insertAfter(...snippets.devBindingsModuleTs);
@@ -91,13 +91,13 @@ const updateViteConfig = (ctx: C3Context) => {
 					b.objectExpression([
 						b.objectProperty(
 							b.identifier("preset"),
-							b.stringLiteral("cloudflare-pages")
+							b.stringLiteral("cloudflare-pages"),
 						),
 						b.objectProperty(
 							b.identifier("modules"),
-							b.arrayExpression([b.identifier("devBindingsModule")])
+							b.arrayExpression([b.identifier("devBindingsModule")]),
 						),
-					])
+					]),
 				);
 
 				n.node.arguments = [b.objectExpression([pluginArguments])];

package/templates/angular/c3.ts

@@ -30,7 +30,7 @@ async function installCFWorker() {
 			dev: true,
 			startText: "Installing adapter dependencies",
 			doneText: `${brandColor("installed")} ${dim(`via \`${npm} install\``)}`,
-		}
+		},
 	);
 }
 async function updateAppCode() {
@@ -45,7 +45,7 @@ async function updateAppCode() {
 		"import { provideHttpClient, withFetch } from '@angular/common/http';\n" +
 		appConfig.replace(
 			"providers: [",
-			"providers: [provideHttpClient(withFetch()), "
+			"providers: [provideHttpClient(withFetch()), ",
 		);
 	writeFile(resolve(appConfigPath), newAppConfig);
 	s.stop(`${brandColor(`updated`)} ${dim(appConfigPath)}`);

package/templates/astro/c3.ts

@@ -22,7 +22,7 @@ const configure = async (ctx: C3Context) => {
 		silent: true,
 		startText: "Installing adapter",
 		doneText: `${brandColor("installed")} ${dim(
-			`via \`${npx} astro add cloudflare\``
+			`via \`${npx} astro add cloudflare\``,
 		)}`,
 	});
 
@@ -49,7 +49,7 @@ const updateAstroConfig = () => {
 						b.identifier("platformProxy"),
 						b.objectExpression([
 							b.objectProperty(b.identifier("enabled"), b.booleanLiteral(true)),
-						])
+						]),
 					),
 				]),
 			];
@@ -77,7 +77,7 @@ const updateEnvDeclaration = (ctx: C3Context) => {
 			// Preserve comments with the new body
 			const comments = n.get("comments").value;
 			n.node.comments = comments.map((c: recast.types.namedTypes.CommentLine) =>
-				b.commentLine(c.value)
+				b.commentLine(c.value),
 			);
 
 			// Add the patch

package/templates/hono/c3.ts

@@ -35,7 +35,7 @@ const configure = async (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.bindingsTypeTs);

package/templates/next/c3.ts

@@ -35,7 +35,7 @@ const generate = async (ctx: C3Context) => {
 	//       (instead of making it a special case which needs extra care)
 	const newTomlContent = wranglerToml.replace(
 		/#\s+\[\[kv_namespaces\]\]\n#\s+binding\s+=\s+"MY_KV_NAMESPACE"\n#\s+id\s+=\s+"[a-zA-Z0-9]+?"/,
-		($1) => `# KV Example:\n${$1}`
+		($1) => `# KV Example:\n${$1}`,
 	);
 
 	if (!/# KV Example/.test(newTomlContent)) {
@@ -97,7 +97,7 @@ const configure = async (ctx: C3Context) => {
 	if (usesTs) {
 		copyFile(
 			join(getTemplatePath(ctx), "env.d.ts"),
-			join(projectPath, "env.d.ts")
+			join(projectPath, "env.d.ts"),
 		);
 		updateStatus("Created an env.d.ts file");
 	}
@@ -112,7 +112,7 @@ const configure = async (ctx: C3Context) => {
 
 	copyFile(
 		join(getTemplatePath(ctx), "README.md"),
-		join(projectPath, "README.md")
+		join(projectPath, "README.md"),
 	);
 	updateStatus("Updated the README file");
 
@@ -120,15 +120,17 @@ const configure = async (ctx: C3Context) => {
 };
 
 export const shouldInstallNextOnPagesEslintPlugin = async (
-	ctx: C3Context
+	ctx: C3Context,
 ): Promise<boolean> => {
 	const eslintUsage = usesEslint(ctx);
 
-	if (!eslintUsage.used) return false;
+	if (!eslintUsage.used) {
+		return false;
+	}
 
 	if (eslintUsage.configType !== ".eslintrc.json") {
 		warn(
-			`Expected .eslintrc.json from Next.js scaffolding but found ${eslintUsage.configType} instead`
+			`Expected .eslintrc.json from Next.js scaffolding but found ${eslintUsage.configType} instead`,
 		);
 		return false;
 	}

package/templates/nuxt/c3.ts

@@ -82,14 +82,14 @@ const updateNuxtConfig = () => {
 		b.objectExpression([
 			b.objectProperty(
 				b.identifier("preset"),
-				b.stringLiteral("cloudflare-pages")
+				b.stringLiteral("cloudflare-pages"),
 			),
-		])
+		]),
 	);
 
 	const moduleDef = b.objectProperty(
 		b.identifier("modules"),
-		b.arrayExpression([b.stringLiteral("nitro-cloudflare-dev")])
+		b.arrayExpression([b.stringLiteral("nitro-cloudflare-dev")]),
 	);
 
 	transformFile(configFile, {

package/templates/pre-existing/c3.ts

@@ -23,7 +23,7 @@ export async function copyExistingWorkerFiles(ctx: C3Context) {
 					"Please specify the name of the existing worker in this account?",
 				label: "worker",
 				defaultValue: ctx.project.name,
-			}
+			},
 		);
 	}
 
@@ -46,22 +46,22 @@ export async function copyExistingWorkerFiles(ctx: C3Context) {
 			env: { CLOUDFLARE_ACCOUNT_ID: ctx.account?.id },
 			startText: "Downloading existing worker files",
 			doneText: `${brandColor("downloaded")} ${dim(
-				`existing "${ctx.args.existingScript}" worker files`
+				`existing "${ctx.args.existingScript}" worker files`,
 			)}`,
-		}
+		},
 	);
 
 	// copy src/* files from the downloaded worker
 	await cp(
 		join(tempdir, ctx.args.existingScript, "src"),
 		join(ctx.project.path, "src"),
-		{ recursive: true }
+		{ recursive: true },
 	);
 
 	// copy wrangler.toml from the downloaded worker
 	await cp(
 		join(tempdir, ctx.args.existingScript, "wrangler.toml"),
-		join(ctx.project.path, "wrangler.toml")
+		join(ctx.project.path, "wrangler.toml"),
 	);
 }
 

package/templates/qwik/c3.ts

@@ -43,7 +43,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);
@@ -109,8 +109,8 @@ const populateCloudflareEnv = () => {
 			].map(([varName, type]) =>
 				b.tsPropertySignature(
 					b.identifier(varName),
-					b.tsTypeAnnotation(b.tsTypeReference(b.identifier(type)))
-				)
+					b.tsTypeAnnotation(b.tsTypeReference(b.identifier(type))),
+				),
 			);
 
 			n.node.body.body = newBody;

package/templates/scheduled/js/package.json

@@ -4,8 +4,8 @@
 	"private": true,
 	"scripts": {
 		"deploy": "wrangler deploy",
-		"dev": "wrangler dev",
-		"start": "wrangler dev"
+		"dev": "wrangler dev --test-scheduled",
+		"start": "wrangler dev --test-scheduled"
 	},
 	"devDependencies": {
 		"wrangler": "^3.0.0"

package/templates/scheduled/js/src/index.js

@@ -6,13 +6,20 @@
  * https://developers.cloudflare.com/workers/platform/triggers/cron-triggers/
  *
  * - Run `npm run dev` in your terminal to start a development server
- * - Open a browser tab at http://localhost:8787/ to see your worker in action
+ * - Run `curl "http://localhost:8787/__scheduled?cron=*+*+*+*+*"` to see your worker in action
  * - Run `npm run deploy` to publish your worker
  *
  * Learn more at https://developers.cloudflare.com/workers/
  */
 
 export default {
+	async fetch(req) {
+		const url = new URL(req.url)
+		url.pathname = "/__scheduled";
+		url.searchParams.append("cron", "* * * * *");
+		return new Response(`To test the scheduled handler, ensure you have used the "--test-scheduled" then try running "curl ${url.href}".`);
+	},
+
 	// The scheduled handler is invoked at the interval set in our wrangler.toml's
 	// [[triggers]] configuration.
 	async scheduled(event, env, ctx) {

package/templates/scheduled/ts/package.json

@@ -4,8 +4,8 @@
 	"private": true,
 	"scripts": {
 		"deploy": "wrangler deploy",
-		"dev": "wrangler dev",
-		"start": "wrangler dev",
+		"dev": "wrangler dev --test-scheduled",
+		"start": "wrangler dev --test-scheduled",
 		"cf-typegen": "wrangler types"
 	},
 	"devDependencies": {

package/templates/scheduled/ts/src/index.ts

@@ -6,7 +6,7 @@
  * https://developers.cloudflare.com/workers/platform/triggers/cron-triggers/
  *
  * - Run `npm run dev` in your terminal to start a development server
- * - Open a browser tab at http://localhost:8787/ to see your worker in action
+ * - Run `curl "http://localhost:8787/__scheduled?cron=*+*+*+*+*"` to see your worker in action
  * - Run `npm run deploy` to publish your worker
  *
  * Bind resources to your worker in `wrangler.toml`. After adding bindings, a type definition for the

package/templates/solid/c3.ts

@@ -39,18 +39,18 @@ const configure = async (ctx: C3Context) => {
 						b.objectExpression([
 							b.objectProperty(
 								b.identifier("preset"),
-								b.stringLiteral("cloudflare-pages")
+								b.stringLiteral("cloudflare-pages"),
 							),
 							b.objectProperty(
 								b.identifier("rollupConfig"),
 								b.objectExpression([
 									b.objectProperty(
 										b.identifier("external"),
-										b.arrayExpression([b.stringLiteral("node:async_hooks")])
+										b.arrayExpression([b.stringLiteral("node:async_hooks")]),
 									),
-								])
+								]),
 							),
-						])
+						]),
 					),
 				]),
 			];

package/templates/svelte/c3.ts

@@ -69,21 +69,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);