create-cloudflare 2.33.2 → 2.33.3

package/dist/cli.js

@@ -73725,7 +73725,7 @@ var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
 // package.json
-var version = "2.33.2";
+var version = "2.33.3";
 
 // src/metrics.ts
 var import_node_async_hooks = require("node:async_hooks");
@@ -73817,6 +73817,13 @@ var runCommand = async (command2, opts = {}) => {
     doneText: opts.doneText,
     promise() {
       const [executable, ...args] = command2;
+      if (args[0] === "wrangler") {
+        const metrics = readMetricsConfig();
+        if (metrics.c3permission?.enabled === false) {
+          opts.env ??= {};
+          opts.env["WRANGLER_SEND_METRICS"] = "false";
+        }
+      }
       const abortController = new AbortController();
       const cmd = (0, import_cross_spawn.spawn)(executable, [...args], {
         // TODO: ideally inherit stderr, but npm install uses this for warnings
@@ -75081,7 +75088,7 @@ var updateNuxtConfig = () => {
     b2.objectExpression([
       b2.objectProperty(
         b2.identifier("preset"),
-        b2.stringLiteral("./cloudflare-preset")
+        b2.stringLiteral("cloudflare_module")
       )
     ])
   );
@@ -75297,6 +75304,7 @@ var configure7 = async (ctx) => {
   });
   usesTypescript(ctx);
   const filePath = `app.config.${usesTypescript(ctx) ? "ts" : "js"}`;
+  const compatDate = await getWorkerdCompatibilityDate();
   updateStatus(`Updating configuration in ${blue(filePath)}`);
   transformFile(filePath, {
     visitCallExpression: function(n2) {
@@ -75311,60 +75319,14 @@ var configure7 = async (ctx) => {
           b2.objectProperty(
             b2.identifier("server"),
             b2.objectExpression([
-              // preset: "cloudflare-pages"
+              // preset: "cloudflare_module"
               b2.objectProperty(
                 b2.identifier("preset"),
-                b2.stringLiteral("cloudflare-pages")
-              ),
-              // output: {
-              // 	dir: "{{ rootDir }}/dist",
-              // 	publicDir: "{{ output.dir }}/public",
-              // 	serverDir: "{{ output.dir }}/worker",
-              // },
-              b2.objectProperty(
-                b2.identifier("output"),
-                b2.objectExpression([
-                  b2.objectProperty(
-                    b2.identifier("dir"),
-                    b2.stringLiteral("{{ rootDir }}/dist")
-                  ),
-                  b2.objectProperty(
-                    b2.identifier("publicDir"),
-                    b2.stringLiteral("{{ output.dir }}/public")
-                  ),
-                  b2.objectProperty(
-                    b2.identifier("serverDir"),
-                    b2.stringLiteral("{{ output.dir }}/worker")
-                  )
-                ])
+                b2.stringLiteral("cloudflare_module")
               ),
-              // rollupConfig: {
-              // 	external: ["node:async_hooks"],
-              // },
               b2.objectProperty(
-                b2.identifier("rollupConfig"),
-                b2.objectExpression([
-                  b2.objectProperty(
-                    b2.identifier("external"),
-                    b2.arrayExpression([b2.stringLiteral("node:async_hooks")])
-                  )
-                ])
-              ),
-              // hooks: {
-              // 	// Prevent the Pages preset from writing the _routes.json etc.
-              // 	compiled() {},
-              // },
-              b2.objectProperty(
-                b2.identifier("hooks"),
-                b2.objectExpression([
-                  b2.objectMethod(
-                    "method",
-                    b2.identifier("compiled"),
-                    [],
-                    b2.blockStatement([]),
-                    false
-                  )
-                ])
+                b2.identifier("compatibilityDate"),
+                b2.stringLiteral(compatDate)
               )
             ])
           )
@@ -76735,6 +76697,7 @@ var config23 = {
 var c3_default33 = config23;
 
 // templates/svelte/c3.ts
+var import_node_fs3 = require("node:fs");
 var import_node_os4 = require("node:os");
 var recast12 = __toESM(require_main3());
 var { npm: npm19 } = detectPackageManager();
@@ -76750,6 +76713,7 @@ var configure18 = async (ctx) => {
     doneText: `${brandColor(`installed`)} ${dim(pkg)}`
   });
   updateSvelteConfig2();
+  updatePlaywrightConfig(usesTypescript(ctx));
   updateTypeDefinitions2(ctx);
 };
 var updateSvelteConfig2 = () => {
@@ -76764,6 +76728,28 @@ var updateSvelteConfig2 = () => {
     }
   });
 };
+var updatePlaywrightConfig = (shouldUseTypescript) => {
+  const filePath = `playwright.config.${shouldUseTypescript ? "ts" : "js"}`;
+  if (!(0, import_node_fs3.existsSync)(filePath)) {
+    return;
+  }
+  updateStatus(`Changing webServer port in ${blue(filePath)}`);
+  transformFile(filePath, {
+    visitObjectExpression: function(n2) {
+      const portProp = n2.node.properties.find((prop) => {
+        if (!("key" in prop) || !("name" in prop.key)) {
+          return false;
+        }
+        return prop.key.name === "port";
+      });
+      if (!portProp || !("value" in portProp) || !("value" in portProp.value)) {
+        return this.traverse(n2);
+      }
+      portProp.value.value = 8788;
+      return false;
+    }
+  });
+};
 var updateTypeDefinitions2 = (ctx) => {
   if (!usesTypescript(ctx)) {
     return;
@@ -76860,7 +76846,7 @@ var config25 = {
 var c3_default35 = config25;
 
 // ../wrangler/package.json
-var version2 = "3.92.0";
+var version2 = "3.93.0";
 
 // src/git.ts
 var offerGit = async (ctx) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "2.33.2",
+  "version": "2.33.3",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -30,7 +30,7 @@
     "@babel/parser": "^7.21.3",
     "@babel/types": "^7.21.4",
     "@clack/prompts": "^0.6.3",
-    "@cloudflare/workers-types": "^4.20241106.0",
+    "@cloudflare/workers-types": "^4.20241205.0",
     "@iarna/toml": "^3.0.0",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
@@ -68,8 +68,8 @@
     "yargs": "^17.7.2",
     "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
-    "wrangler": "3.92.0",
-    "@cloudflare/workers-tsconfig": "0.0.0"
+    "@cloudflare/workers-tsconfig": "0.0.0",
+    "wrangler": "3.93.0"
   },
   "engines": {
     "node": ">=18.14.1"

package/templates/hello-world/js/package.json

@@ -11,6 +11,6 @@
 	"devDependencies": {
 		"@cloudflare/vitest-pool-workers": "^0.5.2",
 		"wrangler": "^3.60.3",
-		"vitest": "2.0.5"
+		"vitest": "2.1.8"
 	}
 }

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

@@ -12,7 +12,7 @@
 	"devDependencies": {
 		"@cloudflare/vitest-pool-workers": "^0.5.2",
 		"typescript": "^5.5.2",
-		"vitest": "2.0.5",
+		"vitest": "2.1.8",
 		"wrangler": "^3.60.3"
 	}
 }

package/templates/svelte/c3.ts

@@ -1,3 +1,4 @@
+import { existsSync } from "node:fs";
 import { platform } from "node:os";
 import { logRaw, updateStatus } from "@cloudflare/cli";
 import { blue, brandColor, dim } from "@cloudflare/cli/colors";
@@ -28,6 +29,7 @@ const configure = async (ctx: C3Context) => {
 	});
 
 	updateSvelteConfig();
+	updatePlaywrightConfig(usesTypescript(ctx));
 	updateTypeDefinitions(ctx);
 };
 
@@ -49,6 +51,34 @@ const updateSvelteConfig = () => {
 	});
 };
 
+const updatePlaywrightConfig = (shouldUseTypescript: boolean) => {
+	const filePath = `playwright.config.${shouldUseTypescript ? "ts" : "js"}`;
+	if (!existsSync(filePath)) {
+		return;
+	}
+
+	updateStatus(`Changing webServer port in ${blue(filePath)}`);
+
+	transformFile(filePath, {
+		visitObjectExpression: function (n) {
+			const portProp = n.node.properties.find((prop) => {
+				if (!("key" in prop) || !("name" in prop.key)) {
+					return false;
+				}
+
+				return prop.key.name === "port";
+			});
+
+			if (!portProp || !("value" in portProp) || !("value" in portProp.value)) {
+				return this.traverse(n);
+			}
+
+			portProp.value.value = 8788;
+			return false;
+		},
+	});
+};
+
 const updateTypeDefinitions = (ctx: C3Context) => {
 	if (!usesTypescript(ctx)) {
 		return;

package/templates-experimental/hello-world-with-assets/js/package.json

@@ -11,6 +11,6 @@
 	"devDependencies": {
 		"@cloudflare/vitest-pool-workers": "^0.5.2",
 		"wrangler": "^3.60.3",
-		"vitest": "2.0.5"
+		"vitest": "2.1.8"
 	}
 }

package/templates-experimental/hello-world-with-assets/ts/package.json

@@ -12,7 +12,7 @@
 	"devDependencies": {
 		"@cloudflare/vitest-pool-workers": "^0.5.2",
 		"typescript": "^5.5.2",
-		"vitest": "2.0.5",
+		"vitest": "2.1.8",
 		"wrangler": "^3.60.3"
 	}
 }

package/templates-experimental/nuxt/c3.ts

@@ -82,7 +82,7 @@ const updateNuxtConfig = () => {
 		b.objectExpression([
 			b.objectProperty(
 				b.identifier("preset"),
-				b.stringLiteral("./cloudflare-preset"),
+				b.stringLiteral("cloudflare_module"),
 			),
 		]),
 	);

package/templates-experimental/nuxt/templates/wrangler.toml

@@ -1,8 +1,8 @@
 #:schema node_modules/wrangler/config-schema.json
 name = "<TBD>"
 compatibility_date = "<TBD>"
-main = "./dist/worker/index.js"
-assets = { directory = "./dist/public", binding = "ASSETS" }
+main = "./.output/server/index.mjs"
+assets = { directory = "./.output/public/", binding = "ASSETS" }
 
 # Workers Logs
 # Docs: https://developers.cloudflare.com/workers/observability/logs/workers-logs/

package/templates-experimental/solid/c3.ts

@@ -2,6 +2,7 @@ import { logRaw, updateStatus } from "@cloudflare/cli";
 import { blue, brandColor, dim } from "@cloudflare/cli/colors";
 import { runFrameworkGenerator } from "frameworks/index";
 import { mergeObjectProperties, transformFile } from "helpers/codemod";
+import { getWorkerdCompatibilityDate } from "helpers/compatDate";
 import { usesTypescript } from "helpers/files";
 import { detectPackageManager } from "helpers/packageManagers";
 import { installPackages } from "helpers/packages";
@@ -30,6 +31,8 @@ const configure = async (ctx: C3Context) => {
 	usesTypescript(ctx);
 	const filePath = `app.config.${usesTypescript(ctx) ? "ts" : "js"}`;
 
+	const compatDate = await getWorkerdCompatibilityDate();
+
 	updateStatus(`Updating configuration in ${blue(filePath)}`);
 
 	transformFile(filePath, {
@@ -46,60 +49,14 @@ const configure = async (ctx: C3Context) => {
 					b.objectProperty(
 						b.identifier("server"),
 						b.objectExpression([
-							// preset: "cloudflare-pages"
+							// preset: "cloudflare_module"
 							b.objectProperty(
 								b.identifier("preset"),
-								b.stringLiteral("cloudflare-pages"),
-							),
-							// output: {
-							// 	dir: "{{ rootDir }}/dist",
-							// 	publicDir: "{{ output.dir }}/public",
-							// 	serverDir: "{{ output.dir }}/worker",
-							// },
-							b.objectProperty(
-								b.identifier("output"),
-								b.objectExpression([
-									b.objectProperty(
-										b.identifier("dir"),
-										b.stringLiteral("{{ rootDir }}/dist"),
-									),
-									b.objectProperty(
-										b.identifier("publicDir"),
-										b.stringLiteral("{{ output.dir }}/public"),
-									),
-									b.objectProperty(
-										b.identifier("serverDir"),
-										b.stringLiteral("{{ output.dir }}/worker"),
-									),
-								]),
-							),
-							// rollupConfig: {
-							// 	external: ["node:async_hooks"],
-							// },
-							b.objectProperty(
-								b.identifier("rollupConfig"),
-								b.objectExpression([
-									b.objectProperty(
-										b.identifier("external"),
-										b.arrayExpression([b.stringLiteral("node:async_hooks")]),
-									),
-								]),
+								b.stringLiteral("cloudflare_module"),
 							),
-							// hooks: {
-							// 	// Prevent the Pages preset from writing the _routes.json etc.
-							// 	compiled() {},
-							// },
 							b.objectProperty(
-								b.identifier("hooks"),
-								b.objectExpression([
-									b.objectMethod(
-										"method",
-										b.identifier("compiled"),
-										[],
-										b.blockStatement([]),
-										false,
-									),
-								]),
+								b.identifier("compatibilityDate"),
+								b.stringLiteral(compatDate),
 							),
 						]),
 					),

package/templates-experimental/solid/templates/wrangler.toml

@@ -2,8 +2,8 @@
 name = "<TBD>"
 compatibility_date = "<TBD>"
 compatibility_flags = ["nodejs_compat"]
-main = "./dist/worker/index.js"
-assets = { directory = "./dist/public", binding = "ASSETS" }
+main = "./.output/server/index.mjs"
+assets = { directory = "./.output/public", binding = "ASSETS" }
 
 # Workers Logs
 # Docs: https://developers.cloudflare.com/workers/observability/logs/workers-logs/

package/templates-experimental/nuxt/templates/cloudflare-preset/nitro.config.ts

@@ -1,27 +0,0 @@
-import { type NitroPreset } from "nitropack";
-
-export default <NitroPreset>{
-	extends: "cloudflare",
-	exportConditions: ["workerd"],
-	output: {
-		dir: "{{ rootDir }}/dist",
-		publicDir: "{{ output.dir }}/public",
-		serverDir: "{{ output.dir }}/worker",
-	},
-	commands: {
-		preview: "npx wrangler dev",
-		deploy: "npx wrangler deploy",
-	},
-	wasm: {
-		lazy: false,
-		esmImport: true,
-	},
-	rollupConfig: {
-		output: {
-			entryFileNames: "index.js",
-			format: "esm",
-			exports: "named",
-			inlineDynamicImports: false,
-		},
-	},
-};