create-cloudflare 2.30.0 → 2.31.0

package/dist/cli.js

@@ -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") {
@@ -73714,7 +73719,7 @@ var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
 // package.json
-var version = "2.30.0";
+var version = "2.31.0";
 
 // src/metrics.ts
 var import_node_async_hooks = require("node:async_hooks");
@@ -74461,189 +74466,6 @@ var usesEslint = (ctx) => {
 // templates-experimental/angular/c3.ts
 var import_node_path3 = require("node:path");
 
-// ../wrangler/package.json
-var version2 = "3.81.0";
-
-// 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",
@@ -74656,16 +74478,16 @@ var package_default = {
     "create-analog": "1.8.1",
     "@angular/create": "18.2.8",
     "create-docusaurus": "3.5.2",
-    "create-hono": "0.14.1",
+    "create-hono": "0.14.2",
     "create-next-app": "14.2.5",
     "create-qwik": "1.9.1",
-    "create-vite": "5.5.3",
+    "create-vite": "5.5.4",
     "create-remix": "2.13.1",
     "create-solid": "0.5.13",
-    "create-svelte": "6.4.0",
-    "create-vue": "3.10.4",
+    "create-vue": "3.11.1",
     gatsby: "5.13.7",
-    nuxi: "3.12.0"
+    nuxi: "3.12.0",
+    sv: "0.5.11"
   }
 };
 
@@ -74693,18 +74515,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
@@ -75590,7 +75400,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,7 +75465,7 @@ var updateTypeDefinitions = (ctx) => {
 var config12 = {
   configVersion: 1,
   id: "svelte",
-  frameworkCli: "create-svelte",
+  frameworkCli: "sv",
   displayName: "Svelte",
   platform: "workers",
   copyFiles: {
@@ -76514,7 +76324,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 +76377,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 +76724,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,7 +76789,7 @@ var updateTypeDefinitions2 = (ctx) => {
 var config24 = {
   configVersion: 1,
   id: "svelte",
-  frameworkCli: "create-svelte",
+  frameworkCli: "sv",
   displayName: "Svelte",
   platform: "pages",
   copyFiles: {
@@ -77023,6 +76844,189 @@ var config25 = {
 };
 var c3_default35 = config25;
 
+// ../wrangler/package.json
+var version2 = "3.84.0";
+
+// 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");
@@ -77912,11 +77916,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;
@@ -79347,6 +79353,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!`,
     ``
@@ -79368,6 +79375,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))}`
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "2.30.0",
+  "version": "2.31.0",
   "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.20241011.0",
+    "@cloudflare/workers-types": "^4.20241022.0",
     "@iarna/toml": "^3.0.0",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
@@ -38,7 +38,7 @@
     "@types/degit": "^2.8.6",
     "@types/dns2": "^2.0.3",
     "@types/esprima": "^4.0.3",
-    "@types/node": "20.8.3",
+    "@types/node": "^18.19.59",
     "@types/semver": "^7.5.1",
     "@types/which-pm-runs": "^1.0.0",
     "@types/yargs": "^17.0.22",
@@ -68,8 +68,8 @@
     "yargs": "^17.7.2",
     "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
-    "wrangler": "3.81.0",
-    "@cloudflare/workers-tsconfig": "0.0.0"
+    "@cloudflare/workers-tsconfig": "0.0.0",
+    "wrangler": "3.84.0"
   },
   "engines": {
     "node": ">=18.14.1"

package/templates/pre-existing/c3.ts

@@ -5,14 +5,12 @@ import { brandColor, dim } from "@cloudflare/cli/colors";
 import { processArgument } from "helpers/args";
 import { runCommand } from "helpers/command";
 import { detectPackageManager } from "helpers/packageManagers";
-import { chooseAccount } from "../../src/wrangler/accounts";
+import { chooseAccount, wranglerLogin } from "../../src/wrangler/accounts";
 import type { C3Context } from "types";
 
 export async function copyExistingWorkerFiles(ctx: C3Context) {
 	const { dlx } = detectPackageManager();
 
-	await chooseAccount(ctx);
-
 	if (ctx.args.existingScript === undefined) {
 		ctx.args.existingScript = await processArgument(
 			ctx.args,
@@ -74,10 +72,31 @@ export default {
 	copyFiles: {
 		path: "./js",
 	},
-	configure: async (ctx: C3Context) => {
-		await copyExistingWorkerFiles(ctx);
+	configure: buildConfigure({
+		login: wranglerLogin,
+		chooseAccount,
+		copyFiles: copyExistingWorkerFiles,
+	}),
+};
+
+export interface ConfigureParams {
+	login: (ctx: C3Context) => Promise<boolean>;
+	chooseAccount: (ctx: C3Context) => Promise<void>;
+	copyFiles: (ctx: C3Context) => Promise<void>;
+}
+
+export function buildConfigure(params: ConfigureParams) {
+	return async function configure(ctx: C3Context) {
+		const loginSuccess = await params.login(ctx);
+
+		if (!loginSuccess) {
+			throw new Error("Failed to login to Cloudflare");
+		}
+
+		await params.chooseAccount(ctx);
+		await params.copyFiles(ctx);
 
 		// Force no-deploy since the worker is already deployed
 		ctx.args.deploy = false;
-	},
-};
+	};
+}

package/templates/svelte/c3.ts

@@ -13,7 +13,7 @@ import type { C3Context, PackageJson } from "types";
 const { npm } = detectPackageManager();
 
 const generate = async (ctx: C3Context) => {
-	await runFrameworkGenerator(ctx, [ctx.project.name]);
+	await runFrameworkGenerator(ctx, ["create", ctx.project.name]);
 
 	logRaw("");
 };
@@ -97,7 +97,7 @@ const updateTypeDefinitions = (ctx: C3Context) => {
 const config: TemplateConfig = {
 	configVersion: 1,
 	id: "svelte",
-	frameworkCli: "create-svelte",
+	frameworkCli: "sv",
 	displayName: "Svelte",
 	platform: "pages",
 	copyFiles: {

package/templates-experimental/svelte/c3.ts

@@ -13,7 +13,7 @@ import type { C3Context, PackageJson } from "types";
 const { npm } = detectPackageManager();
 
 const generate = async (ctx: C3Context) => {
-	await runFrameworkGenerator(ctx, [ctx.project.name]);
+	await runFrameworkGenerator(ctx, ["create", ctx.project.name]);
 
 	logRaw("");
 };
@@ -97,7 +97,7 @@ const updateTypeDefinitions = (ctx: C3Context) => {
 const config: TemplateConfig = {
 	configVersion: 1,
 	id: "svelte",
-	frameworkCli: "create-svelte",
+	frameworkCli: "sv",
 	displayName: "Svelte",
 	platform: "workers",
 	copyFiles: {