create-cloudflare 2.21.5 → 2.21.7

package/dist/cli.js

@@ -1715,16 +1715,17 @@ var init_cli = __esm({
       // current default for backcompat -- TODO: change default to shapes.bar once all callees have been updated
       shape = shapes.corners.bl,
       // current default for backcompat -- TODO: change default to true once all callees have been updated
-      multiline = false
+      multiline = false,
+      newlineBefore = true
     } = {}) => {
       logRaw(
         format(msg, {
           firstLinePrefix: gray(shape) + space() + status.warning,
           linePrefix: gray(shapes.bar),
-          newlineBefore: true,
           formatLine: (line) => dim(line),
           // for backcompat but it's not ideal for this to be "dim"
-          multiline
+          multiline,
+          newlineBefore
         })
       );
     };
@@ -3902,7 +3903,7 @@ var init_args = __esm({
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "2.21.5";
+    version = "2.21.7";
   }
 });
 
@@ -24716,18 +24717,18 @@ var init_package2 = __esm({
       dependencies: {
         "create-astro": "4.8.0",
         "create-analog": "1.3.1",
-        "@angular/create": "17.3.7",
-        "create-docusaurus": "3.3.2",
-        "create-hono": "0.7.3",
+        "@angular/create": "18.0.3",
+        "create-docusaurus": "3.4.0",
+        "create-hono": "0.8.1",
         "create-next-app": "14.1.0",
-        "create-qwik": "1.5.5",
+        "create-qwik": "1.5.7",
         "create-react-app": "5.0.1",
         "create-remix": "2.9.2",
         "create-solid": "0.5.11",
         "create-svelte": "6.3.0",
-        "create-vue": "3.10.2",
-        gatsby: "5.13.5",
-        nuxi: "3.11.1"
+        "create-vue": "3.10.3",
+        gatsby: "5.13.6",
+        nuxi: "3.12.0"
       },
       frameworkCliMap: {
         analog: "create-analog",
@@ -24803,7 +24804,7 @@ var init_frameworks = __esm({
 var version2;
 var init_package3 = __esm({
   "../wrangler/package.json"() {
-    version2 = "3.60.0";
+    version2 = "3.60.3";
   }
 });
 
@@ -70808,7 +70809,7 @@ var require_typescript2 = __commonJS({
 });
 
 // src/helpers/codemod.ts
-var import_fs11, import_path12, recast, esprimaParser, typescriptParser, parseFile, transformFile, loadSnippets, loadTemplateSnippets;
+var import_fs11, import_path12, recast, esprimaParser, typescriptParser, parseFile, transformFile, loadSnippets, loadTemplateSnippets, mergeObjectProperties, getPropertyName;
 var init_codemod = __esm({
   "src/helpers/codemod.ts"() {
     import_fs11 = require("fs");
@@ -70860,6 +70861,33 @@ var init_codemod = __esm({
     loadTemplateSnippets = (ctx) => {
       return loadSnippets(getTemplatePath(ctx));
     };
+    mergeObjectProperties = (sourceObject, newProperties) => {
+      newProperties.forEach((newProp) => {
+        const newPropName = getPropertyName(newProp);
+        if (!newPropName) {
+          return false;
+        }
+        const indexOfExisting = sourceObject.properties.findIndex(
+          (p2) => p2.type === "ObjectProperty" && getPropertyName(p2) === newPropName
+        );
+        const existing = sourceObject.properties[indexOfExisting];
+        if (!existing) {
+          sourceObject.properties.push(newProp);
+          return;
+        }
+        if (existing.type === "ObjectProperty" && existing.value.type === "ObjectExpression" && newProp.value.type === "ObjectExpression") {
+          mergeObjectProperties(
+            existing.value,
+            newProp.value.properties
+          );
+          return;
+        }
+        sourceObject.properties[indexOfExisting] = newProp;
+      });
+    };
+    getPropertyName = (newProp) => {
+      return newProp.key.type === "Identifier" ? newProp.key.name : newProp.key.type === "StringLiteral" ? newProp.key.value : null;
+    };
   }
 });
 
@@ -71604,9 +71632,10 @@ var init_c38 = __esm({
         visitCallExpression: function(n2) {
           const callee = n2.node.callee;
           if (callee.name === "defineNuxtConfig") {
-            const obj = n2.node.arguments[0];
-            obj.properties.push(presetDef);
-            obj.properties.push(moduleDef);
+            mergeObjectProperties(
+              n2.node.arguments[0],
+              [presetDef, moduleDef]
+            );
           }
           return this.traverse(n2);
         }
@@ -71891,8 +71920,9 @@ var init_c312 = __esm({
             return this.traverse(n2);
           }
           const b2 = recast6.types.builders;
-          n2.node.arguments = [
-            b2.objectExpression([
+          mergeObjectProperties(
+            n2.node.arguments[0],
+            [
               b2.objectProperty(
                 b2.identifier("server"),
                 b2.objectExpression([
@@ -71911,8 +71941,8 @@ var init_c312 = __esm({
                   )
                 ])
               )
-            ])
-          ];
+            ]
+          );
           return false;
         }
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "2.21.5",
+  "version": "2.21.7",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -65,9 +65,9 @@
     "wrap-ansi": "^9.0.0",
     "yargs": "^17.7.1",
     "@cloudflare/cli": "1.1.1",
-    "@cloudflare/eslint-config-worker": "1.1.0",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "wrangler": "3.60.0"
+    "@cloudflare/eslint-config-worker": "1.1.0",
+    "wrangler": "3.60.3"
   },
   "engines": {
     "node": ">=18.14.1"

package/templates/common/ts/src/ab-test.ts

@@ -6,7 +6,7 @@ const EXPERIMENTS = [
 ];
 
 export default {
-	async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
+	async fetch(request, env, ctx): Promise<Response> {
 		const fingerprint = [request.headers.get('cf-connecting-ip'), request.cf?.postalCode]; // add any values you want considered as a fingerprint
 		const activeExperiments = await getActiveExperiments(fingerprint, EXPERIMENTS);
 
@@ -22,7 +22,7 @@ export default {
 
 		return rewriter.transform(res);
 	},
-};
+} satisfies ExportedHandler<Env>;
 
 // Get active experiments by hashing a fingerprint
 async function getActiveExperiments(fingerprint: unknown, experiments: Array<{ name: string; threshold: number }>) {

package/templates/common/ts/src/index.ts

@@ -19,7 +19,7 @@ import apiRouter from './router';
 export default {
 	// The fetch handler is invoked when this worker receives a HTTP(S) request
 	// and should return a Response (optionally wrapped in a Promise)
-	async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
+	async fetch(request, env, ctx): Promise<Response> {
 		// You'll find it helpful to parse the request.url string into a URL object. Learn more at https://developer.mozilla.org/en-US/docs/Web/API/URL
 		const url = new URL(request.url);
 
@@ -46,4 +46,4 @@ export default {
 			{ headers: { 'Content-Type': 'text/html' } }
 		);
 	},
-};
+} satisfies ExportedHandler<Env>;

package/templates/common/ts/src/proxy.ts

@@ -1,5 +1,5 @@
 export default {
-	async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
+	async fetch(request, env, ctx): Promise<Response> {
 		const url = new URL(request.url);
 
 		const proxyUrl = url.searchParams.get('proxyUrl'); // get a query param value (?proxyUrl=...)
@@ -20,4 +20,4 @@ export default {
 
 		return res;
 	},
-};
+} satisfies ExportedHandler<Env>;

package/templates/common/ts/src/redirect.ts

@@ -1,5 +1,5 @@
 export default {
-	async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
+	async fetch(request, env, ctx): Promise<Response> {
 		const url = new URL(request.url);
 		const redirectUrl = url.searchParams.get('redirectUrl'); // get a query param value (?redirectUrl=...)
 
@@ -10,4 +10,4 @@ export default {
 		// The Response class has static methods to create common Response objects as a convenience
 		return Response.redirect(redirectUrl);
 	},
-};
+} satisfies ExportedHandler<Env>;

package/templates/hello-world/ts/src/index.ts

@@ -12,7 +12,7 @@
  */
 
 export default {
-	async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
+	async fetch(request, env, ctx): Promise<Response> {
 		return new Response('Hello World!');
 	},
-};
+} satisfies ExportedHandler<Env>;

package/templates/hello-world-durable-object/ts/src/index.ts

@@ -68,7 +68,7 @@ export default {
 	 * @param ctx - The execution context of the Worker
 	 * @returns The response to be sent back to the client
 	 */
-	async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
+	async fetch(request, env, ctx): Promise<Response> {
 		// We will create a `DurableObjectId` using the pathname from the Worker request
 		// This id refers to a unique instance of our 'MyDurableObject' class above
 		let id: DurableObjectId = env.MY_DURABLE_OBJECT.idFromName(new URL(request.url).pathname);
@@ -83,4 +83,4 @@ export default {
 
 		return new Response(greeting);
 	},
-};
+} satisfies ExportedHandler<Env>;

package/templates/nuxt/c3.ts

@@ -2,7 +2,7 @@ import { logRaw } from "@cloudflare/cli";
 import { brandColor, dim } from "@cloudflare/cli/colors";
 import { spinner } from "@cloudflare/cli/interactive";
 import { runFrameworkGenerator } from "frameworks/index";
-import { transformFile } from "helpers/codemod";
+import { mergeObjectProperties, transformFile } from "helpers/codemod";
 import { getLatestTypesEntrypoint } from "helpers/compatDate";
 import { readFile, writeFile } from "helpers/files";
 import { detectPackageManager } from "helpers/packageManagers";
@@ -96,11 +96,10 @@ const updateNuxtConfig = () => {
 		visitCallExpression: function (n) {
 			const callee = n.node.callee as recast.types.namedTypes.Identifier;
 			if (callee.name === "defineNuxtConfig") {
-				const obj = n.node
-					.arguments[0] as recast.types.namedTypes.ObjectExpression;
-
-				obj.properties.push(presetDef);
-				obj.properties.push(moduleDef);
+				mergeObjectProperties(
+					n.node.arguments[0] as recast.types.namedTypes.ObjectExpression,
+					[presetDef, moduleDef],
+				);
 			}
 
 			return this.traverse(n);

package/templates/openapi/ts/src/index.ts

@@ -26,4 +26,4 @@ router.all("*", () =>
 
 export default {
 	fetch: router.handle,
-};
+} satisfies ExportedHandler;

package/templates/queues/ts/src/index.ts

@@ -18,7 +18,7 @@ export default {
 	// Our fetch handler is invoked on a HTTP request: we can send a message to a queue
 	// during (or after) a request.
 	// https://developers.cloudflare.com/queues/platform/javascript-apis/#producer
-	async fetch(req: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
+	async fetch(req, env, ctx): Promise<Response> {
 		// To send a message on a queue, we need to create the queue first
 		// https://developers.cloudflare.com/queues/get-started/#3-create-a-queue
 		await env.MY_QUEUE.send({
@@ -30,7 +30,7 @@ export default {
 	},
 	// The queue handler is invoked when a batch of messages is ready to be delivered
 	// https://developers.cloudflare.com/queues/platform/javascript-apis/#messagebatch
-	async queue(batch: MessageBatch<Error>, env: Env): Promise<void> {
+	async queue(batch, env): Promise<void> {
 		// A queue consumer can make requests to other endpoints on the Internet,
 		// write to R2 object storage, query a D1 Database, and much more.
 		for (let message of batch.messages) {
@@ -38,4 +38,4 @@ export default {
 			console.log(`message ${message.id} processed: ${JSON.stringify(message.body)}`);
 		}
 	},
-};
+} satisfies ExportedHandler<Env, Error>;

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

@@ -18,7 +18,7 @@
 export default {
 	// The scheduled handler is invoked at the interval set in our wrangler.toml's
 	// [[triggers]] configuration.
-	async scheduled(event: ScheduledEvent, env: Env, ctx: ExecutionContext): Promise<void> {
+	async scheduled(event, env, ctx): Promise<void> {
 		// A Cron Trigger can make requests to other endpoints on the Internet,
 		// publish to a Queue, query a D1 Database, and much more.
 		//
@@ -30,4 +30,4 @@ export default {
 		// In this template, we'll just log the result:
 		console.log(`trigger fired at ${event.cron}: ${wasSuccessful}`);
 	},
-};
+} satisfies ExportedHandler<Env>;

package/templates/solid/c3.ts

@@ -1,7 +1,7 @@
 import { logRaw, updateStatus } from "@cloudflare/cli";
 import { blue } from "@cloudflare/cli/colors";
 import { runFrameworkGenerator } from "frameworks/index";
-import { transformFile } from "helpers/codemod";
+import { mergeObjectProperties, transformFile } from "helpers/codemod";
 import { usesTypescript } from "helpers/files";
 import { detectPackageManager } from "helpers/packageManagers";
 import * as recast from "recast";
@@ -32,8 +32,10 @@ const configure = async (ctx: C3Context) => {
 			}
 
 			const b = recast.types.builders;
-			n.node.arguments = [
-				b.objectExpression([
+
+			mergeObjectProperties(
+				n.node.arguments[0] as recast.types.namedTypes.ObjectExpression,
+				[
 					b.objectProperty(
 						b.identifier("server"),
 						b.objectExpression([
@@ -52,8 +54,8 @@ const configure = async (ctx: C3Context) => {
 							),
 						]),
 					),
-				]),
-			];
+				],
+			);
 
 			return false;
 		},