create-cloudflare 0.0.0-586c253f7 → 0.0.0-58ccf21d4

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);
     }
@@ -67118,7 +67118,7 @@ var logRaw = (msg) => {
 `);
 };
 var log = (msg) => {
-  const lines = msg.split("\n").map((ln) => `${gray(shapes.bar)} ${white(ln)}`);
+  const lines = msg.split("\n").map((ln) => `${gray(shapes.bar)}${ln.length > 0 ? " " + white(ln) : ""}`);
   logRaw(lines.join("\n"));
 };
 var newline = () => {
@@ -68447,7 +68447,12 @@ var inputPrompt = async (promptConfig) => {
   };
   let prompt;
   const dispatchRender = (props, p2) => {
-    const renderedLines = renderers[props.state](props, p2);
+    let state = props.state;
+    if (state === "initial" && promptConfig.initialErrorMessage) {
+      state = "error";
+      props.error = promptConfig.initialErrorMessage;
+    }
+    const renderedLines = renderers[state](props, p2);
     return renderedLines.join("\n");
   };
   if (promptConfig.type === "select") {
@@ -68813,7 +68818,10 @@ var spinner = (frames = spinnerFrames.clockwise, color = brandColor) => {
     start(msg, helpText) {
       helpText ||= ``;
       currentMsg = msg;
-      startMsg = `${currentMsg} ${dim(helpText)}`;
+      startMsg = currentMsg;
+      if (helpText !== void 0 && helpText.length > 0) {
+        startMsg += ` ${dim(helpText)}`;
+      }
       if (isInteractive()) {
         let index = 0;
         clearLoop();
@@ -68826,7 +68834,7 @@ var spinner = (frames = spinnerFrames.clockwise, color = brandColor) => {
           }
         }, frameRate);
       } else {
-        logUpdate2(`${leftT} ${startMsg}`);
+        logRaw(`${leftT} ${startMsg}`);
       }
     },
     update(msg) {
@@ -68844,17 +68852,20 @@ ${grayBar} ${msg}`);
         clearLoop();
       } else {
         if (msg !== void 0) {
-          logUpdate2(`
-${grayBar} ${msg}`);
+          logRaw(`${grayBar} ${msg}`);
         }
         newline();
       }
     }
   };
 };
-var isInteractive = () => {
-  return process.stdin.isTTY;
-};
+function isInteractive() {
+  try {
+    return Boolean(process.stdin.isTTY && process.stdout.isTTY);
+  } catch {
+    return false;
+  }
+}
 
 // ../../node_modules/.pnpm/yargs@17.7.2/node_modules/yargs/lib/platform-shims/esm.mjs
 var import_assert = require("assert");
@@ -73714,7 +73725,7 @@ var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
 // package.json
-var version = "0.0.0-586c253f7";
+var version = "0.0.0-58ccf21d4";
 
 // src/metrics.ts
 var import_node_async_hooks = require("node:async_hooks");
@@ -73994,7 +74005,7 @@ var detectPmMismatch = (ctx) => {
     case "pnpm":
       return !(0, import_fs5.existsSync)(import_path5.default.join(projectPath, "pnpm-lock.yaml"));
     case "bun":
-      return !(0, import_fs5.existsSync)(import_path5.default.join(projectPath, "bun.lockb"));
+      return !(0, import_fs5.existsSync)(import_path5.default.join(projectPath, "bun.lockb")) && !(0, import_fs5.existsSync)(import_path5.default.join(projectPath, "bun.lock"));
   }
 };
 
@@ -74461,189 +74472,6 @@ var usesEslint = (ctx) => {
 // templates-experimental/angular/c3.ts
 var import_node_path3 = require("node:path");
 
-// ../wrangler/package.json
-var version2 = "0.0.0-586c253f7";
-
-// src/git.ts
-var offerGit = async (ctx) => {
-  const gitInstalled = await isGitInstalled();
-  if (!gitInstalled) {
-    if (ctx.args.git) {
-      updateStatus(
-        "Couldn't find `git` installed on your machine. Continuing without git."
-      );
-    }
-    ctx.args.git = false;
-    return;
-  }
-  const insideGitRepo = await isInsideGitRepo(ctx.project.path);
-  if (insideGitRepo) {
-    ctx.args.git = true;
-    return;
-  }
-  ctx.args.git = await processArgument(ctx.args, "git", {
-    type: "confirm",
-    question: "Do you want to use git for version control?",
-    label: "git",
-    defaultValue: C3_DEFAULTS.git
-  });
-  if (!ctx.args.git) {
-    return;
-  }
-  const gitConfigured = await isGitConfigured();
-  if (!gitConfigured) {
-    updateStatus(
-      "Must configure `user.name` and user.email` to use git. Continuing without git."
-    );
-    ctx.args.git = false;
-    return;
-  }
-  await initializeGit(ctx.project.path);
-};
-var gitCommit = async (ctx) => {
-  const commitMessage = await createCommitMessage(ctx);
-  if (!ctx.args.git) {
-    return;
-  }
-  if (ctx.gitRepoAlreadyExisted) {
-    return;
-  }
-  const gitInstalled = await isGitInstalled();
-  const gitInitialized = await isInsideGitRepo(ctx.project.path);
-  if (!gitInstalled || !gitInitialized) {
-    return;
-  }
-  const s = spinner();
-  s.start("Committing new files");
-  await runCommand(["git", "add", "."], {
-    silent: true,
-    cwd: ctx.project.path
-  });
-  await runCommand(["git", "commit", "-m", commitMessage], {
-    silent: true,
-    cwd: ctx.project.path
-  });
-  s.stop(`${brandColor("git")} ${dim(`commit`)}`);
-};
-var createCommitMessage = async (ctx) => {
-  const framework = ctx.template.frameworkCli;
-  const header = framework ? "Initialize web application via create-cloudflare CLI" : "Initial commit (by create-cloudflare CLI)";
-  const packageManager = detectPackageManager();
-  const gitVersion = await getGitVersion();
-  const insideRepo = await isInsideGitRepo(ctx.project.path);
-  const details = [
-    { key: "C3", value: `create-cloudflare@${version}` },
-    { key: "project name", value: ctx.project.name },
-    ...framework ? [{ key: "framework", value: ctx.template.id }] : [],
-    ...framework ? [{ key: "framework cli", value: getFrameworkCli(ctx) }] : [],
-    {
-      key: "package manager",
-      value: `${packageManager.name}@${packageManager.version}`
-    },
-    {
-      key: "wrangler",
-      value: `wrangler@${version2}`
-    },
-    {
-      key: "git",
-      value: insideRepo ? gitVersion : "N/A"
-    }
-  ];
-  const body = `Details:
-${details.map(({ key, value }) => `  ${key} = ${value}`).join("\n")}
-`;
-  const commitMessage = `${header}
-
-${body}
-`;
-  ctx.commitMessage = commitMessage;
-  return commitMessage;
-};
-async function getGitVersion() {
-  try {
-    const rawGitVersion = await runCommand(["git", "--version"], {
-      useSpinner: false,
-      silent: true
-    });
-    const gitVersion = rawGitVersion.replace(/^git\s+version\s+/, "");
-    return gitVersion;
-  } catch {
-    return null;
-  }
-}
-async function isGitInstalled() {
-  return await getGitVersion() !== null;
-}
-async function isGitConfigured() {
-  try {
-    const userName = await runCommand(["git", "config", "user.name"], {
-      useSpinner: false,
-      silent: true
-    });
-    if (!userName) {
-      return false;
-    }
-    const email = await runCommand(["git", "config", "user.email"], {
-      useSpinner: false,
-      silent: true
-    });
-    if (!email) {
-      return false;
-    }
-    return true;
-  } catch {
-    return false;
-  }
-}
-async function isInsideGitRepo(cwd) {
-  try {
-    const output = await runCommand(["git", "status"], {
-      cwd,
-      useSpinner: false,
-      silent: true,
-      captureOutput: true
-    });
-    return output.includes("not a git repository") === false;
-  } catch (err) {
-    return false;
-  }
-}
-async function initializeGit(cwd) {
-  const s = spinner();
-  s.start("Initializing git repo");
-  try {
-    const defaultBranchName = await runCommand(
-      ["git", "config", "--get", "init.defaultBranch"],
-      { useSpinner: false, silent: true, cwd }
-    );
-    await runCommand(
-      ["git", "init", "--initial-branch", defaultBranchName.trim() ?? "main"],
-      // branch names can't contain spaces, so this is safe
-      { useSpinner: false, silent: true, cwd }
-    );
-  } catch {
-    await runCommand(["git", "init"], { useSpinner: false, silent: true, cwd });
-  } finally {
-    s.stop(`${brandColor("initialized")} ${dim(`git`)}`);
-  }
-}
-async function getProductionBranch(cwd) {
-  try {
-    const productionBranch = await runCommand(
-      ["git", "branch", "--show-current"],
-      {
-        silent: true,
-        cwd,
-        useSpinner: false,
-        captureOutput: true
-      }
-    );
-    return productionBranch.trim();
-  } catch (err) {
-  }
-  return "main";
-}
-
 // src/frameworks/package.json
 var package_default = {
   name: "frameworks_clis_info",
@@ -74652,20 +74480,20 @@ var package_default = {
     "so that we can use dependabot to update these dependencies automatically."
   ],
   dependencies: {
-    "create-astro": "4.8.0",
+    "create-astro": "4.10.0",
     "create-analog": "1.8.1",
-    "@angular/create": "18.2.8",
-    "create-docusaurus": "3.5.2",
-    "create-hono": "0.12.0",
+    "@angular/create": "19.0.0",
+    "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.3",
-    "create-remix": "2.12.0",
+    "create-qwik": "1.10.0",
+    "create-vite": "5.5.5",
+    "create-remix": "2.14.0",
     "create-solid": "0.5.13",
-    "create-svelte": "6.4.0",
-    "create-vue": "3.10.4",
-    gatsby: "5.13.7",
-    nuxi: "3.12.0"
+    "create-vue": "3.12.1",
+    gatsby: "5.14.0",
+    nuxi: "3.15.0",
+    sv: "0.6.1"
   }
 };
 
@@ -74693,18 +74521,6 @@ var runFrameworkGenerator = async (ctx, args) => {
   );
   logRaw("");
   await runCommand(cmd, { env: env3 });
-  if (process.env.SAVE_DIFFS) {
-    const cmdEnv = {
-      silent: true,
-      cwd: ctx.project.path
-    };
-    if (!isInsideGitRepo(ctx.project.path)) {
-      await runCommand(["git", "init"], cmdEnv);
-      await runCommand(["git", "add", "."], cmdEnv);
-      const commitMessage = `Initial commit by ${cli}`;
-      await runCommand(["git", "commit", "-m", commitMessage], cmdEnv);
-    }
-  }
 };
 
 // templates-experimental/angular/c3.ts
@@ -75417,7 +75233,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("");
 };
@@ -75427,19 +75243,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,
@@ -75455,7 +75258,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`
@@ -75500,7 +75302,7 @@ var configure7 = async (ctx) => {
               // preset: "cloudflare-pages"
               b2.objectProperty(
                 b2.identifier("preset"),
-                b2.stringLiteral("./cloudflare-pages")
+                b2.stringLiteral("cloudflare-pages")
               ),
               // output: {
               // 	dir: "{{ rootDir }}/dist",
@@ -75590,7 +75392,7 @@ var import_node_os3 = require("node:os");
 var recast6 = __toESM(require_main3());
 var { npm: npm8 } = detectPackageManager();
 var generate11 = async (ctx) => {
-  await runFrameworkGenerator(ctx, [ctx.project.name]);
+  await runFrameworkGenerator(ctx, ["create", ctx.project.name]);
   logRaw("");
 };
 var configure8 = async (ctx) => {
@@ -75655,8 +75457,8 @@ var updateTypeDefinitions = (ctx) => {
 var config12 = {
   configVersion: 1,
   id: "svelte",
-  frameworkCli: "create-svelte",
-  displayName: "Svelte",
+  frameworkCli: "sv",
+  displayName: "SvelteKit",
   platform: "workers",
   copyFiles: {
     variants: {
@@ -75794,7 +75596,11 @@ var c3_default15 = config13;
 var import_node_path4 = require("node:path");
 var { npm: npm10 } = detectPackageManager();
 var generate13 = async (ctx) => {
-  await runFrameworkGenerator(ctx, [ctx.project.name, "--ssr"]);
+  await runFrameworkGenerator(ctx, [
+    ctx.project.name,
+    "--ssr",
+    "--server-routing"
+  ]);
   logRaw("");
 };
 var configure10 = async (ctx) => {
@@ -75823,10 +75629,17 @@ async function updateAppCode2() {
   );
   writeFile2((0, import_node_path4.resolve)(appConfigPath), newAppConfig);
   s.stop(`${brandColor(`updated`)} ${dim(appConfigPath)}`);
+  const appServerRoutesPath = "src/app/app.routes.server.ts";
+  const appRoutes = readFile((0, import_node_path4.resolve)(appServerRoutesPath));
+  const newAppRoutes = appRoutes.replace(
+    "RenderMode.Prerender",
+    "RenderMode.Server"
+  );
+  writeFile2((0, import_node_path4.resolve)(appServerRoutesPath), newAppRoutes);
+  s.stop(`${brandColor(`updated`)} ${dim(appServerRoutesPath)}`);
   s.start(`Updating package.json`);
   const packageJsonPath = (0, import_node_path4.resolve)("package.json");
   const packageManifest = readJSON(packageJsonPath);
-  delete packageManifest["dependencies"]["@angular/ssr"];
   delete packageManifest["dependencies"]["express"];
   delete packageManifest["devDependencies"]["@types/express"];
   writeFile2(packageJsonPath, JSON.stringify(packageManifest, null, 2));
@@ -75838,6 +75651,8 @@ function updateAngularJson2(ctx) {
   const angularJson = readJSON((0, import_node_path4.resolve)("angular.json"));
   const architectSection = angularJson.projects[ctx.project.name].architect;
   architectSection.build.options.outputPath = "dist";
+  architectSection.build.options.outputMode = "server";
+  architectSection.build.options.ssr.experimentalPlatform = "neutral";
   architectSection.build.options.assets.push("src/_routes.json");
   writeFile2((0, import_node_path4.resolve)("angular.json"), JSON.stringify(angularJson, null, 2));
   s.stop(`${brandColor(`updated`)} ${dim(`\`angular.json\``)}`);
@@ -75859,7 +75674,7 @@ var config14 = {
     scripts: {
       start: `${npm10} run build && wrangler pages dev dist/cloudflare ${await compatDateFlag()} --experimental-local`,
       build: `ng build && ${npm10} run process`,
-      process: "node ./tools/copy-files.mjs && node ./tools/alter-polyfills.mjs",
+      process: "node ./tools/copy-files.mjs",
       deploy: `${npm10} run build && wrangler pages deploy dist/cloudflare`
     }
   })
@@ -76514,7 +76329,6 @@ var isLoggedIn = async () => {
 // templates/pre-existing/c3.ts
 async function copyExistingWorkerFiles(ctx) {
   const { dlx } = detectPackageManager();
-  await chooseAccount(ctx);
   if (ctx.args.existingScript === void 0) {
     ctx.args.existingScript = await processArgument(
       ctx.args,
@@ -76568,11 +76382,23 @@ var c3_default27 = {
   copyFiles: {
     path: "./js"
   },
-  configure: async (ctx) => {
-    await copyExistingWorkerFiles(ctx);
-    ctx.args.deploy = false;
-  }
+  configure: buildConfigure({
+    login: wranglerLogin,
+    chooseAccount,
+    copyFiles: copyExistingWorkerFiles
+  })
 };
+function buildConfigure(params) {
+  return async function configure20(ctx) {
+    const loginSuccess = await params.login(ctx);
+    if (!loginSuccess) {
+      throw new Error("Failed to login to Cloudflare");
+    }
+    await params.chooseAccount(ctx);
+    await params.copyFiles(ctx);
+    ctx.args.deploy = false;
+  };
+}
 
 // templates/queues/c3.ts
 var c3_default28 = {
@@ -76903,7 +76729,7 @@ var import_node_os4 = require("node:os");
 var recast12 = __toESM(require_main3());
 var { npm: npm19 } = detectPackageManager();
 var generate24 = async (ctx) => {
-  await runFrameworkGenerator(ctx, [ctx.project.name]);
+  await runFrameworkGenerator(ctx, ["create", ctx.project.name]);
   logRaw("");
 };
 var configure18 = async (ctx) => {
@@ -76968,8 +76794,8 @@ var updateTypeDefinitions2 = (ctx) => {
 var config24 = {
   configVersion: 1,
   id: "svelte",
-  frameworkCli: "create-svelte",
-  displayName: "Svelte",
+  frameworkCli: "sv",
+  displayName: "SvelteKit",
   platform: "pages",
   copyFiles: {
     variants: {
@@ -77023,6 +76849,189 @@ var config25 = {
 };
 var c3_default35 = config25;
 
+// ../wrangler/package.json
+var version2 = "0.0.0-58ccf21d4";
+
+// src/git.ts
+var offerGit = async (ctx) => {
+  const gitInstalled = await isGitInstalled();
+  if (!gitInstalled) {
+    if (ctx.args.git) {
+      updateStatus(
+        "Couldn't find `git` installed on your machine. Continuing without git."
+      );
+    }
+    ctx.args.git = false;
+    return;
+  }
+  const insideGitRepo = await isInsideGitRepo(ctx.project.path);
+  if (insideGitRepo) {
+    ctx.args.git = true;
+    return;
+  }
+  ctx.args.git = await processArgument(ctx.args, "git", {
+    type: "confirm",
+    question: "Do you want to use git for version control?",
+    label: "git",
+    defaultValue: C3_DEFAULTS.git
+  });
+  if (!ctx.args.git) {
+    return;
+  }
+  const gitConfigured = await isGitConfigured();
+  if (!gitConfigured) {
+    updateStatus(
+      "Must configure `user.name` and user.email` to use git. Continuing without git."
+    );
+    ctx.args.git = false;
+    return;
+  }
+  await initializeGit(ctx.project.path);
+};
+var gitCommit = async (ctx) => {
+  const commitMessage = await createCommitMessage(ctx);
+  if (!ctx.args.git) {
+    return;
+  }
+  if (ctx.gitRepoAlreadyExisted) {
+    return;
+  }
+  const gitInstalled = await isGitInstalled();
+  const gitInitialized = await isInsideGitRepo(ctx.project.path);
+  if (!gitInstalled || !gitInitialized) {
+    return;
+  }
+  const s = spinner();
+  s.start("Committing new files");
+  await runCommand(["git", "add", "."], {
+    silent: true,
+    cwd: ctx.project.path
+  });
+  await runCommand(["git", "commit", "-m", commitMessage], {
+    silent: true,
+    cwd: ctx.project.path
+  });
+  s.stop(`${brandColor("git")} ${dim(`commit`)}`);
+};
+var createCommitMessage = async (ctx) => {
+  const framework = ctx.template.frameworkCli;
+  const header = framework ? "Initialize web application via create-cloudflare CLI" : "Initial commit (by create-cloudflare CLI)";
+  const packageManager = detectPackageManager();
+  const gitVersion = await getGitVersion();
+  const insideRepo = await isInsideGitRepo(ctx.project.path);
+  const details = [
+    { key: "C3", value: `create-cloudflare@${version}` },
+    { key: "project name", value: ctx.project.name },
+    ...framework ? [{ key: "framework", value: ctx.template.id }] : [],
+    ...framework ? [{ key: "framework cli", value: getFrameworkCli(ctx) }] : [],
+    {
+      key: "package manager",
+      value: `${packageManager.name}@${packageManager.version}`
+    },
+    {
+      key: "wrangler",
+      value: `wrangler@${version2}`
+    },
+    {
+      key: "git",
+      value: insideRepo ? gitVersion : "N/A"
+    }
+  ];
+  const body = `Details:
+${details.map(({ key, value }) => `  ${key} = ${value}`).join("\n")}
+`;
+  const commitMessage = `${header}
+
+${body}
+`;
+  ctx.commitMessage = commitMessage;
+  return commitMessage;
+};
+async function getGitVersion() {
+  try {
+    const rawGitVersion = await runCommand(["git", "--version"], {
+      useSpinner: false,
+      silent: true
+    });
+    const gitVersion = rawGitVersion.replace(/^git\s+version\s+/, "");
+    return gitVersion;
+  } catch {
+    return null;
+  }
+}
+async function isGitInstalled() {
+  return await getGitVersion() !== null;
+}
+async function isGitConfigured() {
+  try {
+    const userName = await runCommand(["git", "config", "user.name"], {
+      useSpinner: false,
+      silent: true
+    });
+    if (!userName) {
+      return false;
+    }
+    const email = await runCommand(["git", "config", "user.email"], {
+      useSpinner: false,
+      silent: true
+    });
+    if (!email) {
+      return false;
+    }
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function isInsideGitRepo(cwd) {
+  try {
+    const output = await runCommand(["git", "status"], {
+      cwd,
+      useSpinner: false,
+      silent: true,
+      captureOutput: true
+    });
+    return output.includes("not a git repository") === false;
+  } catch (err) {
+    return false;
+  }
+}
+async function initializeGit(cwd) {
+  const s = spinner();
+  s.start("Initializing git repo");
+  try {
+    const defaultBranchName = await runCommand(
+      ["git", "config", "--get", "init.defaultBranch"],
+      { useSpinner: false, silent: true, cwd }
+    );
+    await runCommand(
+      ["git", "init", "--initial-branch", defaultBranchName.trim() ?? "main"],
+      // branch names can't contain spaces, so this is safe
+      { useSpinner: false, silent: true, cwd }
+    );
+  } catch {
+    await runCommand(["git", "init"], { useSpinner: false, silent: true, cwd });
+  } finally {
+    s.stop(`${brandColor("initialized")} ${dim(`git`)}`);
+  }
+}
+async function getProductionBranch(cwd) {
+  try {
+    const productionBranch = await runCommand(
+      ["git", "branch", "--show-current"],
+      {
+        silent: true,
+        cwd,
+        useSpinner: false,
+        captureOutput: true
+      }
+    );
+    return productionBranch.trim();
+  } catch (err) {
+  }
+  return "main";
+}
+
 // src/validators.ts
 var import_fs10 = require("fs");
 var import_path12 = require("path");
@@ -77217,6 +77226,10 @@ var createContext = async (args, prevArgs) => {
     const currentArgs = { ...args };
     let linesPrinted = 0;
     switch (from) {
+      case "category":
+        linesPrinted = 6;
+        args.projectName = void 0;
+        break;
       case "type":
         linesPrinted = 9;
         args.category = void 0;
@@ -77250,7 +77263,7 @@ var createContext = async (args, prevArgs) => {
     type: "text",
     question: `In which directory do you want to create your application?`,
     helpText: "also used as application name",
-    defaultValue: defaultName,
+    defaultValue: prevArgs?.projectName ?? defaultName,
     label: "dir",
     validate: (value) => validateProjectDirectory(String(value) || C3_DEFAULTS.projectName, args),
     format: (val) => `./${val}`
@@ -77277,7 +77290,8 @@ var createContext = async (args, prevArgs) => {
       description: "Start from an existing GitHub repo link"
     },
     // This is used only if the type is `pre-existing`
-    { label: "Others", value: "others", hidden: true }
+    { label: "Others", value: "others", hidden: true },
+    backOption
   ];
   const category = await processArgument(args, "category", {
     type: "select",
@@ -77286,6 +77300,9 @@ var createContext = async (args, prevArgs) => {
     options: categoryOptions,
     defaultValue: prevArgs?.category ?? C3_DEFAULTS.category
   });
+  if (category === BACK_VALUE) {
+    return goBack("category");
+  }
   let template;
   if (category === "web-framework") {
     const frameworkMap = getFrameworkMap({
@@ -77904,11 +77921,13 @@ var processArgument = async (args, key, promptConfig) => {
     disableTelemetry: args[key] !== void 0,
     async promise() {
       const value = args[key];
+      const error2 = promptConfig.validate?.(value) ?? null;
       const result = await inputPrompt({
         ...promptConfig,
         // Accept the default value if the arg is already set
-        acceptDefault: promptConfig.acceptDefault ?? value !== void 0,
+        acceptDefault: promptConfig.acceptDefault ?? (value !== void 0 && !error2),
         defaultValue: value ?? promptConfig.defaultValue,
+        initialErrorMessage: error2,
         throwOnError: true
       });
       args[key] = result;
@@ -77920,6 +77939,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
@@ -79238,23 +79260,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")) {
@@ -79339,6 +79372,7 @@ var printSummary = (ctx) => {
   ]);
   const documentationUrl = `https://developers.cloudflare.com/${ctx.template.platform}`;
   const discordUrl = `https://discord.cloudflare.com`;
+  const reportIssueUrl = "https://github.com/cloudflare/workers-sdk/issues/new/choose";
   const lines = [
     `\u{1F389} ${bgGreen(" SUCCESS ")} Application ${ctx.deployment.url ? "deployed" : "created"} successfully!`,
     ``
@@ -79360,6 +79394,9 @@ var printSummary = (ctx) => {
     `\u{1F4D6} Explore Documentation`,
     `${blue.underline(hyperlink(documentationUrl))}`,
     ``,
+    `\u{1F41B} Report an Issue`,
+    `${blue.underline(hyperlink(reportIssueUrl))}`,
+    ``,
     `\u{1F4AC} Join our Community`,
     `${blue.underline(hyperlink(discordUrl))}`
   );