create-cloudflare 2.21.5 → 2.21.6

package/dist/cli.js

@@ -3902,7 +3902,7 @@ var init_args = __esm({
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "2.21.5";
+    version = "2.21.6";
   }
 });
 
@@ -24803,7 +24803,7 @@ var init_frameworks = __esm({
 var version2;
 var init_package3 = __esm({
   "../wrangler/package.json"() {
-    version2 = "3.60.0";
+    version2 = "3.60.1";
   }
 });
 
@@ -70808,7 +70808,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 +70860,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 +71631,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 +71919,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 +71940,8 @@ var init_c312 = __esm({
                   )
                 ])
               )
-            ])
-          ];
+            ]
+          );
           return false;
         }
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "2.21.5",
+  "version": "2.21.6",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -67,7 +67,7 @@
     "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "wrangler": "3.60.0"
+    "wrangler": "3.60.1"
   },
   "engines": {
     "node": ">=18.14.1"

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/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;
 		},