create-cloudflare 2.31.2 → 2.32.1

package/dist/cli.js

@@ -24815,8 +24815,8 @@ var require_index_688c5d50 = __commonJS({
     var pathReservations = () => {
       const queues = /* @__PURE__ */ new Map();
       const reservations = /* @__PURE__ */ new Map();
-      const { join: join7 } = path__default["default"];
-      const getDirs = (path7) => join7(path7).split(/[\\/]/).slice(0, -1).reduce((set, path8) => set.length ? set.concat(join7(set[set.length - 1], path8)) : [path8], []);
+      const { join: join8 } = path__default["default"];
+      const getDirs = (path7) => join8(path7).split(/[\\/]/).slice(0, -1).reduce((set, path8) => set.length ? set.concat(join8(set[set.length - 1], path8)) : [path8], []);
       const running = /* @__PURE__ */ new Set();
       const getQueues = (fn) => {
         const res = reservations.get(fn);
@@ -38609,7 +38609,7 @@ var require_util8 = __commonJS({
       return path6;
     }
     exports2.normalize = normalize2;
-    function join7(aRoot, aPath) {
+    function join8(aRoot, aPath) {
       if (aRoot === "") {
         aRoot = ".";
       }
@@ -38641,7 +38641,7 @@ var require_util8 = __commonJS({
       }
       return joined;
     }
-    exports2.join = join7;
+    exports2.join = join8;
     exports2.isAbsolute = function(aPath) {
       return aPath.charAt(0) === "/" || urlRegexp.test(aPath);
     };
@@ -38814,7 +38814,7 @@ var require_util8 = __commonJS({
             parsed.path = parsed.path.substring(0, index + 1);
           }
         }
-        sourceURL = join7(urlGenerate(parsed), sourceURL);
+        sourceURL = join8(urlGenerate(parsed), sourceURL);
       }
       return normalize2(sourceURL);
     }
@@ -73719,7 +73719,7 @@ var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
 // package.json
-var version = "2.31.2";
+var version = "2.32.1";
 
 // src/metrics.ts
 var import_node_async_hooks = require("node:async_hooks");
@@ -74477,15 +74477,15 @@ var package_default = {
     "create-astro": "4.10.0",
     "create-analog": "1.8.1",
     "@angular/create": "18.2.11",
-    "create-docusaurus": "3.5.2",
+    "create-docusaurus": "3.6.1",
     "create-hono": "0.14.2",
     "create-next-app": "14.2.5",
     "create-qwik": "1.9.1",
     "create-vite": "5.5.5",
-    "create-remix": "2.13.1",
+    "create-remix": "2.14.0",
     "create-solid": "0.5.13",
-    "create-vue": "3.12.0",
-    gatsby: "5.13.7",
+    "create-vue": "3.12.1",
+    gatsby: "5.14.0",
     nuxi: "3.15.0",
     sv: "0.6.1"
   }
@@ -75227,7 +75227,7 @@ var generate9 = async (ctx) => {
   await runFrameworkGenerator(ctx, [
     ctx.project.name,
     "--template",
-    "https://github.com/remix-run/remix/tree/main/templates/cloudflare"
+    "https://github.com/remix-run/remix/tree/main/templates/cloudflare-workers"
   ]);
   logRaw("");
 };
@@ -75237,19 +75237,6 @@ var configure6 = async () => {
     startText: "Updating the Wrangler version",
     doneText: `${brandColor(`updated`)} ${dim("wrangler@latest")}`
   });
-  const typeDefsPath = "load-context.ts";
-  const s = spinner();
-  s.start(`Updating \`${typeDefsPath}\``);
-  transformFile(typeDefsPath, {
-    visitTSInterfaceDeclaration(n2) {
-      if (n2.node.id.type === "Identifier" && n2.node.id.name !== "Env") {
-        return this.traverse(n2);
-      }
-      n2.replace();
-      return false;
-    }
-  });
-  s.stop(`${brandColor("updated")} \`${dim(typeDefsPath)}\``);
 };
 var config10 = {
   configVersion: 1,
@@ -75265,7 +75252,6 @@ var config10 = {
   configure: configure6,
   transformPackageJson: async () => ({
     scripts: {
-      build: "remix vite:build && wrangler pages functions build --outdir build/worker",
       deploy: `${npm6} run build && wrangler deploy`,
       preview: `${npm6} run build && wrangler dev`,
       "cf-typegen": `wrangler types`
@@ -75466,7 +75452,7 @@ var config12 = {
   configVersion: 1,
   id: "svelte",
   frameworkCli: "sv",
-  displayName: "Svelte",
+  displayName: "SvelteKit",
   platform: "workers",
   copyFiles: {
     variants: {
@@ -76790,7 +76776,7 @@ var config24 = {
   configVersion: 1,
   id: "svelte",
   frameworkCli: "sv",
-  displayName: "Svelte",
+  displayName: "SvelteKit",
   platform: "pages",
   copyFiles: {
     variants: {
@@ -76845,7 +76831,7 @@ var config25 = {
 var c3_default35 = config25;
 
 // ../wrangler/package.json
-var version2 = "3.85.0";
+var version2 = "3.86.1";
 
 // src/git.ts
 var offerGit = async (ctx) => {
@@ -77934,6 +77920,9 @@ var processArgument = async (args, key, promptConfig) => {
 };
 
 // src/deploy.ts
+var import_promises4 = require("node:fs/promises");
+var import_node_os5 = require("node:os");
+var import_node_path5 = require("node:path");
 var import_toml2 = __toESM(require_toml());
 
 // src/helpers/poll.ts
@@ -79252,23 +79241,34 @@ var runDeploy = async (ctx) => {
       JSON.stringify(ctx.commitMessage)
     ] : []
   ];
-  const result = await runCommand(deployCmd, {
-    silent: true,
+  const outputFile = (0, import_node_path5.join)(
+    await (0, import_promises4.mkdtemp)((0, import_node_path5.join)((0, import_node_os5.tmpdir)(), "c3-wrangler-deploy-")),
+    "output.json"
+  );
+  await runCommand(deployCmd, {
     cwd: ctx.project.path,
     env: {
       CLOUDFLARE_ACCOUNT_ID: ctx.account.id,
-      NODE_ENV: "production"
+      NODE_ENV: "production",
+      WRANGLER_OUTPUT_FILE_PATH: outputFile
     },
     startText: "Deploying your application",
     doneText: `${brandColor("deployed")} ${dim(
       `via \`${quoteShellArgs(baseDeployCmd)}\``
     )}`
   });
-  const deployedUrlRegex = /https:\/\/.+\.(pages|workers)\.dev/;
-  const deployedUrlMatch = result.match(deployedUrlRegex);
-  if (deployedUrlMatch) {
-    ctx.deployment.url = deployedUrlMatch[0];
-  } else {
+  try {
+    const contents = readFile(outputFile);
+    const entries = contents.split("\n").filter(Boolean).map((entry) => JSON.parse(entry));
+    const url = entries.find((entry) => entry.type === "deploy")?.targets?.[0] ?? entries.find((entry) => entry.type === "pages-deploy")?.url;
+    const deployedUrlRegex = /https:\/\/.+\.(pages|workers)\.dev/;
+    const deployedUrlMatch = url?.match(deployedUrlRegex);
+    if (deployedUrlMatch) {
+      ctx.deployment.url = deployedUrlMatch[0];
+    } else {
+      throw new Error("Failed to find deployment url.");
+    }
+  } catch {
     throw new Error("Failed to find deployment url.");
   }
   if (ctx.deployment.url?.endsWith(".pages.dev")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "2.31.2",
+  "version": "2.32.1",
   "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.20241022.0",
+    "@cloudflare/workers-types": "^4.20241106.0",
     "@iarna/toml": "^3.0.0",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
@@ -66,10 +66,10 @@
     "wrap-ansi": "^9.0.0",
     "xdg-app-paths": "^8.3.0",
     "yargs": "^17.7.2",
-    "@cloudflare/eslint-config-worker": "1.1.0",
-    "@cloudflare/workers-tsconfig": "0.0.0",
     "@cloudflare/cli": "1.1.1",
-    "wrangler": "3.85.0"
+    "@cloudflare/workers-tsconfig": "0.0.0",
+    "@cloudflare/eslint-config-worker": "1.1.0",
+    "wrangler": "3.86.1"
   },
   "engines": {
     "node": ">=18.14.1"

package/templates/svelte/c3.ts

@@ -98,7 +98,7 @@ const config: TemplateConfig = {
 	configVersion: 1,
 	id: "svelte",
 	frameworkCli: "sv",
-	displayName: "Svelte",
+	displayName: "SvelteKit",
 	platform: "pages",
 	copyFiles: {
 		variants: {

package/templates-experimental/remix/c3.ts

@@ -1,8 +1,6 @@
 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 { detectPackageManager } from "helpers/packageManagers";
 import { installPackages } from "helpers/packages";
 import type { TemplateConfig } from "../../src/templates";
@@ -14,7 +12,7 @@ const generate = async (ctx: C3Context) => {
 	await runFrameworkGenerator(ctx, [
 		ctx.project.name,
 		"--template",
-		"https://github.com/remix-run/remix/tree/main/templates/cloudflare",
+		"https://github.com/remix-run/remix/tree/main/templates/cloudflare-workers",
 	]);
 
 	logRaw(""); // newline
@@ -26,27 +24,6 @@ const configure = async () => {
 		startText: "Updating the Wrangler version",
 		doneText: `${brandColor(`updated`)} ${dim("wrangler@latest")}`,
 	});
-
-	const typeDefsPath = "load-context.ts";
-
-	const s = spinner();
-	s.start(`Updating \`${typeDefsPath}\``);
-
-	// Remove the empty Env declaration from the template to allow the type from
-	// worker-configuration.d.ts to take over
-	transformFile(typeDefsPath, {
-		visitTSInterfaceDeclaration(n) {
-			if (n.node.id.type === "Identifier" && n.node.id.name !== "Env") {
-				return this.traverse(n);
-			}
-
-			// Removes the node
-			n.replace();
-			return false;
-		},
-	});
-
-	s.stop(`${brandColor("updated")} \`${dim(typeDefsPath)}\``);
 };
 
 const config: TemplateConfig = {
@@ -63,8 +40,6 @@ const config: TemplateConfig = {
 	configure,
 	transformPackageJson: async () => ({
 		scripts: {
-			build:
-				"remix vite:build && wrangler pages functions build --outdir build/worker",
 			deploy: `${npm} run build && wrangler deploy`,
 			preview: `${npm} run build && wrangler dev`,
 			"cf-typegen": `wrangler types`,

package/templates-experimental/remix/templates/public/.assetsignore

@@ -1,4 +0,0 @@
-_worker.js
-_routes.json
-_headers
-_redirects

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

@@ -1,7 +1,7 @@
 #:schema node_modules/wrangler/config-schema.json
 name = "<TBD>"
 compatibility_date = "<TBD>"
-main = "./build/worker/index.js"
+main = "./server.ts"
 assets = { directory = "./build/client" }
 
 # Workers Logs

package/templates-experimental/svelte/c3.ts

@@ -98,7 +98,7 @@ const config: TemplateConfig = {
 	configVersion: 1,
 	id: "svelte",
 	frameworkCli: "sv",
-	displayName: "Svelte",
+	displayName: "SvelteKit",
 	platform: "workers",
 	copyFiles: {
 		variants: {