create-cloudflare 2.21.4 → 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.4";
+    version = "2.21.6";
   }
 });
 
@@ -24720,11 +24720,11 @@ var init_package2 = __esm({
         "create-docusaurus": "3.3.2",
         "create-hono": "0.7.3",
         "create-next-app": "14.1.0",
-        "create-qwik": "1.5.4",
+        "create-qwik": "1.5.5",
         "create-react-app": "5.0.1",
         "create-remix": "2.9.2",
-        "create-solid": "0.5.5",
-        "create-svelte": "6.1.2",
+        "create-solid": "0.5.11",
+        "create-svelte": "6.3.0",
         "create-vue": "3.10.2",
         gatsby: "5.13.5",
         nuxi: "3.11.1"
@@ -24803,7 +24803,7 @@ var init_frameworks = __esm({
 var version2;
 var init_package3 = __esm({
   "../wrangler/package.json"() {
-    version2 = "3.58.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;
         }
       });
@@ -72139,18 +72168,18 @@ var init_c316 = __esm({
   }
 });
 
-// templates/hello-world-durable-object/c3.ts
+// templates/common/c3.ts
 var c3_exports17 = {};
 __export(c3_exports17, {
   default: () => c3_default17
 });
 var c3_default17;
 var init_c317 = __esm({
-  "templates/hello-world-durable-object/c3.ts"() {
+  "templates/common/c3.ts"() {
     c3_default17 = {
       configVersion: 1,
-      id: "hello-world-durable-object",
-      displayName: '"Hello World" Durable Object',
+      id: "common",
+      displayName: "Example router & proxy Worker",
       platform: "workers",
       copyFiles: {
         variants: {
@@ -72166,18 +72195,18 @@ var init_c317 = __esm({
   }
 });
 
-// templates/common/c3.ts
+// templates/scheduled/c3.ts
 var c3_exports18 = {};
 __export(c3_exports18, {
   default: () => c3_default18
 });
 var c3_default18;
 var init_c318 = __esm({
-  "templates/common/c3.ts"() {
+  "templates/scheduled/c3.ts"() {
     c3_default18 = {
       configVersion: 1,
-      id: "common",
-      displayName: "Example router & proxy Worker",
+      id: "scheduled",
+      displayName: "Scheduled Worker (Cron Trigger)",
       platform: "workers",
       copyFiles: {
         variants: {
@@ -72193,18 +72222,18 @@ var init_c318 = __esm({
   }
 });
 
-// templates/scheduled/c3.ts
+// templates/queues/c3.ts
 var c3_exports19 = {};
 __export(c3_exports19, {
   default: () => c3_default19
 });
 var c3_default19;
 var init_c319 = __esm({
-  "templates/scheduled/c3.ts"() {
+  "templates/queues/c3.ts"() {
     c3_default19 = {
       configVersion: 1,
-      id: "scheduled",
-      displayName: "Scheduled Worker (Cron Trigger)",
+      id: "queues",
+      displayName: "Queue consumer & producer Worker",
       platform: "workers",
       copyFiles: {
         variants: {
@@ -72215,23 +72244,33 @@ var init_c319 = __esm({
             path: "./ts"
           }
         }
+      },
+      bindings: {
+        queues: [
+          {
+            boundVariable: "MY_QUEUE",
+            defaultValue: "my-queue",
+            producer: true,
+            consumer: true
+          }
+        ]
       }
     };
   }
 });
 
-// templates/queues/c3.ts
+// templates/hello-world-durable-object/c3.ts
 var c3_exports20 = {};
 __export(c3_exports20, {
   default: () => c3_default20
 });
 var c3_default20;
 var init_c320 = __esm({
-  "templates/queues/c3.ts"() {
+  "templates/hello-world-durable-object/c3.ts"() {
     c3_default20 = {
       configVersion: 1,
-      id: "queues",
-      displayName: "Queue consumer & producer Worker",
+      id: "hello-world-durable-object",
+      displayName: "Co-ordination / multiplayer API (using Durable Objects)",
       platform: "workers",
       copyFiles: {
         variants: {
@@ -72242,16 +72281,6 @@ var init_c320 = __esm({
             path: "./ts"
           }
         }
-      },
-      bindings: {
-        queues: [
-          {
-            boundVariable: "MY_QUEUE",
-            defaultValue: "my-queue",
-            producer: true,
-            consumer: true
-          }
-        ]
       }
     };
   }
@@ -72424,12 +72453,12 @@ var init_templates = __esm({
       return {
         "hello-world": (await Promise.resolve().then(() => (init_c315(), c3_exports15))).default,
         "hello-world-python": (await Promise.resolve().then(() => (init_c316(), c3_exports16))).default,
-        "hello-world-durable-object": (await Promise.resolve().then(() => (init_c317(), c3_exports17))).default,
         // Dummy record -- actual template config resolved in `selectFramework`
         "web-framework": { displayName: "Website or web app" },
-        common: (await Promise.resolve().then(() => (init_c318(), c3_exports18))).default,
-        scheduled: (await Promise.resolve().then(() => (init_c319(), c3_exports19))).default,
-        queues: (await Promise.resolve().then(() => (init_c320(), c3_exports20))).default,
+        common: (await Promise.resolve().then(() => (init_c317(), c3_exports17))).default,
+        scheduled: (await Promise.resolve().then(() => (init_c318(), c3_exports18))).default,
+        queues: (await Promise.resolve().then(() => (init_c319(), c3_exports19))).default,
+        "hello-world-durable-object": (await Promise.resolve().then(() => (init_c320(), c3_exports20))).default,
         openapi: (await Promise.resolve().then(() => (init_c321(), c3_exports21))).default,
         // Dummy record -- actual template config resolved in `processRemoteTemplate`
         "remote-template": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "2.21.4",
+  "version": "2.21.6",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -29,7 +29,7 @@
     "@babel/parser": "^7.21.3",
     "@babel/types": "^7.21.4",
     "@clack/prompts": "^0.6.3",
-    "@cloudflare/workers-types": "^4.20240524.0",
+    "@cloudflare/workers-types": "^4.20240605.0",
     "@iarna/toml": "^3.0.0",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
@@ -67,7 +67,7 @@
     "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "wrangler": "3.58.0"
+    "wrangler": "3.60.1"
   },
   "engines": {
     "node": ">=18.14.1"
@@ -75,6 +75,9 @@
   "workers-sdk": {
     "prerelease": true
   },
+  "volta": {
+    "extends": "../../package.json"
+  },
   "scripts": {
     "build": "node -r esbuild-register scripts/build.ts",
     "dev:codemod": "node -r esbuild-register scripts/codemodDev.ts",

package/templates/hello-world/js/vitest.config.js

@@ -1,11 +1,11 @@
-import { defineWorkersConfig } from "@cloudflare/vitest-pool-workers/config";
+import { defineWorkersConfig } from '@cloudflare/vitest-pool-workers/config';
 
 export default defineWorkersConfig({
-  test: {
-    poolOptions: {
-      workers: {
-        wrangler: { configPath: "./wrangler.toml" },
-      },
-    },
-  },
+	test: {
+		poolOptions: {
+			workers: {
+				wrangler: { configPath: './wrangler.toml' },
+			},
+		},
+	},
 });

package/templates/hello-world/ts/test/tsconfig.json

@@ -1,11 +1,8 @@
 {
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "types": [
-      "@cloudflare/workers-types/experimental",
-      "@cloudflare/vitest-pool-workers"
-    ]
-  },
-  "include": ["./**/*.ts", "../src/env.d.ts"],
-  "exclude": []
+	"extends": "../tsconfig.json",
+	"compilerOptions": {
+		"types": ["@cloudflare/workers-types/experimental", "@cloudflare/vitest-pool-workers"]
+	},
+	"include": ["./**/*.ts", "../src/env.d.ts"],
+	"exclude": []
 }

package/templates/hello-world/ts/vitest.config.ts

@@ -1,11 +1,11 @@
-import { defineWorkersConfig } from "@cloudflare/vitest-pool-workers/config";
+import { defineWorkersConfig } from '@cloudflare/vitest-pool-workers/config';
 
 export default defineWorkersConfig({
-  test: {
-    poolOptions: {
-      workers: {
-        wrangler: { configPath: "./wrangler.toml" },
-      },
-    },
-  },
+	test: {
+		poolOptions: {
+			workers: {
+				wrangler: { configPath: './wrangler.toml' },
+			},
+		},
+	},
 });

package/templates/hello-world-durable-object/c3.ts

@@ -1,7 +1,7 @@
 export default {
 	configVersion: 1,
 	id: "hello-world-durable-object",
-	displayName: '"Hello World" Durable Object',
+	displayName: "Co-ordination / multiplayer API (using Durable Objects)",
 	platform: "workers",
 	copyFiles: {
 		variants: {

package/templates/hello-world-durable-object/ts/wrangler.toml

@@ -48,13 +48,13 @@ compatibility_date = "<TBD>"
 
 # Bind a Durable Object. Durable objects are a scale-to-zero compute primitive based on the actor model.
 # Durable Objects can live for as long as needed. Use these when you need a long-running "server", such as in realtime apps.
-# Docs: https://developers.cloudflare.com/workers/runtime-apis/durable-objects
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#durable-objects
 [[durable_objects.bindings]]
 name = "MY_DURABLE_OBJECT"
 class_name = "MyDurableObject"
 
 # Durable Object migrations.
-# Docs: https://developers.cloudflare.com/workers/learning/using-durable-objects#configure-durable-object-classes-with-migrations
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#migrations
 [[migrations]]
 tag = "v1"
 new_classes = ["MyDurableObject"]

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