create-cloudflare 0.0.0-e8df68ee → 0.0.0-f7ae0ead

package/dist/angular/templates/tools/bundle.mjs

@@ -37,7 +37,8 @@ async function bundleMain() {
 		],
 	});
 
-	let main = result.outputFiles[0].text;
+	// Store the original promise (before Angular/Zone.js replaces it) on the global scope.
+	let main = "globalThis.OGPromise = Promise;\n" + result.outputFiles[0].text;
 
 	// Patch any dynamic imports (converting `require()` calls to `import()` calls).
 	main = main.replace(
@@ -45,7 +46,9 @@ async function bundleMain() {
 		'promises.push(import("./" + __webpack_require__.u(chunkId)).then((mod) => installChunk(mod.default))'
 	);
 	// Export the fetch handler (grabbing it from the global).
-	main += "\nexport default { fetch : globalThis.__workerFetchHandler };";
+	// Also Cloudflare expects `fetch()` to return an original Promise (not a ZoneAwarePromise).
+	main +=
+		"\nexport default { fetch: (request, env) => globalThis.OGPromise.resolve(globalThis.__workerFetchHandler(request, env)) };";
 
 	await fs.writeFile(path.resolve(workerPath, "index.js"), main);
 }

package/dist/cli.js

@@ -52612,7 +52612,9 @@ var require_typescript2 = __commonJS({
 // src/cli.ts
 var cli_exports = {};
 __export(cli_exports, {
-  main: () => main
+  C3_DEFAULTS: () => C3_DEFAULTS,
+  main: () => main,
+  parseArgs: () => parseArgs
 });
 module.exports = __toCommonJS(cli_exports);
 var import_haikunator = __toESM(require_dist_node());
@@ -53150,7 +53152,7 @@ var status = {
   success: bgRed(` SUCCESS `)
 };
 var space = (n = 1) => {
-  return [...Array(n)].map(() => hidden("-")).join("");
+  return hidden("\u200A".repeat(n));
 };
 var logRaw = (msg) => {
   if (process.env.VITEST)
@@ -54347,171 +54349,165 @@ var logUpdateStderr = createLogUpdate(import_node_process6.default.stderr);
 var grayBar = gray(shapes.bar);
 var blCorner = gray(shapes.corners.bl);
 var leftT = gray(shapes.leftT);
-var textInput = async (opts) => {
-  const { renderSubmitted, question, defaultValue, validate, acceptDefault } = opts;
-  const helpText = opts.helpText || ``;
-  const prompt = new oD({
-    defaultValue,
-    validate,
-    render() {
-      let body = "";
-      switch (this.state) {
-        case "initial":
-          body += `${blCorner} ${bold(question)} ${dim(helpText)}
-`;
-          body += `${space(2)}${gray(defaultValue)}
-`;
-          break;
-        case "active":
-          body += `${blCorner} ${bold(question)} ${dim(helpText)}
-`;
-          body += `${space(2)}${this.value}
-`;
-          break;
-        case "submit":
-          body += `${leftT} ${question}
-`;
-          body += `${grayBar} ${renderSubmitted(this.value)}
-${grayBar}`;
-          break;
-        case "error":
-          body += `${leftT} ${status.error} ${dim(this.error)}
-`;
-          body += `${grayBar}
-`;
-          body += `${blCorner} ${question} ${dim(helpText)}
-`;
-          body += `${space(2)}${this.value}
-`;
-          break;
-        default:
-          break;
-      }
-      return body;
-    }
-  });
-  let value;
-  if (acceptDefault) {
-    logRaw(`${leftT} ${question}`);
-    logRaw(`${grayBar} ${renderSubmitted(defaultValue)}
-${grayBar}`);
-    value = defaultValue;
-    validate?.(value);
-  } else {
-    value = await prompt.prompt();
-    if (eD(value)) {
-      cancel("Operation cancelled.");
-      process.exit(0);
-    }
-  }
+var processArgument = async (args, name, promptConfig) => {
+  let value = args[name];
+  const renderSubmitted = getRenderers(promptConfig).submit;
+  if (value !== void 0) {
+    promptConfig.validate?.(value);
+    const lines = renderSubmitted({ value });
+    logRaw(lines.join("\n"));
+    return value;
+  }
+  value = await inputPrompt(promptConfig);
   return value;
 };
-var selectInput = async (opts) => {
-  const { question, options, renderSubmitted, defaultValue, acceptDefault } = opts;
-  const helpText = opts.helpText || ``;
-  const prompt = new ED({
-    options,
-    initialValue: defaultValue ?? options[0].value,
-    render() {
-      const renderOption = (opt, i) => {
-        const { label } = opt;
-        const active = i === this.cursor;
-        const text = active ? blue.underline(label) : dim(label);
-        const indicator = active ? blue(shapes.radioActive) : dim(shapes.radioInactive);
-        return `${space(2)}${indicator} ${text}`;
-      };
-      let body = ``;
-      switch (this.state) {
-        case "submit":
-          body += `${leftT} ${question}
-`;
-          body += `${grayBar} ${renderSubmitted(options[this.cursor])}`;
-          body += `
-${grayBar}`;
-          break;
-        default:
-          body += `${blCorner} ${bold(question)} ${dim(helpText)}
-`;
-          body += `${options.map(renderOption).join(`
-`)}
-`;
-          break;
+var inputPrompt = async (promptConfig) => {
+  const renderers = getRenderers(promptConfig);
+  let prompt;
+  const dispatchRender = (props) => {
+    const renderedLines = renderers[props.state](props);
+    return renderedLines.join("\n");
+  };
+  if (promptConfig.type === "select") {
+    prompt = new ED({
+      ...promptConfig,
+      options: promptConfig.options,
+      initialValue: String(promptConfig.defaultValue),
+      render() {
+        return dispatchRender(this);
       }
-      return body;
-    }
-  });
-  let value;
-  if (acceptDefault) {
-    logRaw(`${leftT} ${question}`);
-    logRaw(
-      `${grayBar} ${renderSubmitted({
-        label: defaultValue,
-        value: defaultValue
-      })}`
-    );
-    logRaw(`${grayBar}`);
-    value = defaultValue;
+    });
+  } else if (promptConfig.type === "confirm") {
+    prompt = new sD({
+      ...promptConfig,
+      initialValue: Boolean(promptConfig.defaultValue),
+      active: promptConfig.activeText || "",
+      inactive: promptConfig.inactiveText || "",
+      render() {
+        return dispatchRender(this);
+      }
+    });
   } else {
-    value = await prompt.prompt();
-    if (eD(value)) {
-      cancel("Operation cancelled.");
-      process.exit(0);
-    }
+    prompt = new oD({
+      ...promptConfig,
+      defaultValue: String(promptConfig.defaultValue),
+      render() {
+        return dispatchRender(this);
+      }
+    });
   }
-  return value;
+  const input = await prompt.prompt();
+  if (eD(input)) {
+    cancel("Operation cancelled.");
+    process.exit(0);
+  }
+  return input;
+};
+var renderSubmit = (config14, value) => {
+  const { question, label } = config14;
+  const content = config14.type === "confirm" ? `${grayBar} ${brandColor(value)} ${dim(label)}` : `${grayBar} ${brandColor(label)} ${dim(value)}`;
+  return [`${leftT} ${question}`, content, `${grayBar}`];
+};
+var handleCancel = () => {
+  cancel("Operation cancelled.");
+  process.exit(0);
 };
-var confirmInput = async (opts) => {
+var getRenderers = (config14) => {
+  switch (config14.type) {
+    case "select":
+      return getSelectRenderers(config14);
+    case "confirm":
+      return getConfirmRenderers(config14);
+    case "text":
+      return getTextRenderers(config14);
+  }
+};
+var getTextRenderers = (config14) => {
   const {
-    activeText,
-    inactiveText,
+    defaultValue,
     question,
-    renderSubmitted,
-    defaultValue = true,
-    acceptDefault
-  } = opts;
-  const helpText = opts.helpText || `(y/n)`;
+    helpText: _helpText,
+    format: _format
+  } = config14;
+  const helpText = _helpText ?? "";
+  const format3 = _format ?? ((val) => String(val));
+  return {
+    initial: () => [
+      `${blCorner} ${bold(question)} ${dim(helpText)}`,
+      `${space(2)}${gray(format3(defaultValue))}`,
+      ``
+      // extra line for readability
+    ],
+    active: ({ value }) => [
+      `${blCorner} ${bold(question)} ${dim(helpText)}`,
+      `${space(2)}${format3(value || dim(defaultValue))}`,
+      ``
+      // extra line for readability
+    ],
+    error: ({ value, error }) => [
+      `${leftT} ${status.error} ${dim(error)}`,
+      `${grayBar}`,
+      `${blCorner} ${question} ${dim(helpText)}`,
+      `${space(2)}${format3(value)}`,
+      ``
+      // extra line for readability
+    ],
+    submit: ({ value }) => renderSubmit(config14, format3(value)),
+    cancel: handleCancel
+  };
+};
+var getSelectRenderers = (config14) => {
+  const { options, question, helpText: _helpText } = config14;
+  const helpText = _helpText ?? "";
+  const defaultRenderer = ({ cursor }) => {
+    const renderOption = (opt, i) => {
+      const { label: optionLabel } = opt;
+      const active = i === cursor;
+      const text = active ? blue.underline(optionLabel) : dim(optionLabel);
+      const indicator = active ? blue(shapes.radioActive) : dim(shapes.radioInactive);
+      return `${space(2)}${indicator} ${text}`;
+    };
+    return [
+      `${blCorner} ${bold(question)} ${dim(helpText)}`,
+      `${options.map(renderOption).join(`
+`)}`,
+      ``
+      // extra line for readability
+    ];
+  };
+  return {
+    initial: defaultRenderer,
+    active: defaultRenderer,
+    confirm: defaultRenderer,
+    error: defaultRenderer,
+    submit: ({ value }) => renderSubmit(
+      config14,
+      options.find((o2) => o2.value === value)?.label
+    ),
+    cancel: handleCancel
+  };
+};
+var getConfirmRenderers = (config14) => {
+  const { activeText, inactiveText, question, helpText: _helpText } = config14;
+  const helpText = _helpText ?? "";
   const active = activeText || "Yes";
   const inactive = inactiveText || "No";
-  const prompt = new sD({
-    active,
-    inactive,
-    initialValue: defaultValue,
-    render() {
-      const yesColor = this.value ? blue : dim;
-      const noColor = this.value ? dim : blue;
-      let body = ``;
-      switch (this.state) {
-        case "submit":
-          body += `${leftT} ${question}
-`;
-          body += `${grayBar} ${renderSubmitted(this.value)}`;
-          body += `
-${grayBar}`;
-          break;
-        default:
-          body += `${blCorner} ${bold(question)} ${dim(helpText)}
-`;
-          body += `${space(2)}${yesColor(active)} / ${noColor(inactive)}
-`;
-          break;
-      }
-      return body;
-    }
-  });
-  let value;
-  if (acceptDefault) {
-    logRaw(`${leftT} ${question}`);
-    logRaw(`${grayBar} ${renderSubmitted(defaultValue)}`);
-    logRaw(`${grayBar}`);
-    value = defaultValue;
-  } else {
-    value = Boolean(await prompt.prompt());
-    if (eD(value)) {
-      cancel("Operation cancelled.");
-      process.exit(0);
-    }
-  }
-  return value;
+  const defaultRenderer = ({ value }) => {
+    const yesColor = value ? blue : dim;
+    const noColor = value ? dim : blue;
+    return [
+      `${blCorner} ${bold(question)} ${dim(helpText)}`,
+      `${space(2)}${yesColor(active)} / ${noColor(inactive)}`
+    ];
+  };
+  return {
+    initial: defaultRenderer,
+    active: defaultRenderer,
+    confirm: defaultRenderer,
+    error: defaultRenderer,
+    submit: ({ value }) => renderSubmit(config14, value ? "yes" : "no"),
+    cancel: handleCancel
+  };
 };
 var spinner = () => {
   const spinnerFrames = ["\u2524", "\u2518", "\u2534", "\u2514", "\u251C", "\u250C", "\u252C", "\u2510"];
@@ -59416,7 +59412,7 @@ var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
 // package.json
-var version = "0.0.0-e8df68ee";
+var version = "0.0.0-f7ae0ead";
 
 // src/common.ts
 var import_fs6 = require("fs");
@@ -59471,26 +59467,26 @@ var detectPackageManager = () => {
 };
 
 // src/helpers/command.ts
-var runCommand = async (command2, opts) => {
+var runCommand = async (command2, opts = {}) => {
   if (typeof command2 === "string") {
     command2 = command2.trim().replace(/\s+/g, ` `).split(" ");
   }
   return printAsyncStatus({
-    useSpinner: opts?.useSpinner ?? opts?.silent,
-    startText: opts?.startText || command2.join(" "),
-    doneText: opts?.doneText,
+    useSpinner: opts.useSpinner ?? opts.silent,
+    startText: opts.startText || command2.join(" "),
+    doneText: opts.doneText,
     promise() {
       const [executable, ...args] = command2;
-      const squelch = opts?.silent || process.env.VITEST;
+      const squelch = opts.silent || process.env.VITEST;
       const cmd = (0, import_cross_spawn.spawn)(executable, [...args], {
         // TODO: ideally inherit stderr, but npm install uses this for warnings
         // stdio: [ioMode, ioMode, "inherit"],
         stdio: squelch ? "pipe" : "inherit",
         env: {
           ...process.env,
-          ...opts?.env
+          ...opts.env
         },
-        cwd: opts?.cwd
+        cwd: opts.cwd
       });
       let output = ``;
       if (opts?.captureOutput ?? squelch) {
@@ -59503,12 +59499,24 @@ var runCommand = async (command2, opts) => {
       }
       return new Promise((resolve9, reject) => {
         cmd.on("close", (code) => {
-          if (code === 0) {
-            resolve9(stripAnsi(output));
-          } else {
-            reject(new Error(output, { cause: code }));
+          try {
+            if (code !== 0) {
+              throw new Error(output, { cause: code });
+            }
+            const transformOutput = opts.transformOutput ?? ((result) => result);
+            const processedOutput = transformOutput(stripAnsi(output));
+            resolve9(processedOutput);
+          } catch (e) {
+            if (opts.fallbackOutput) {
+              resolve9(opts.fallbackOutput(e));
+            } else {
+              reject(new Error(output, { cause: e }));
+            }
           }
         });
+        cmd.on("error", (code) => {
+          reject(code);
+        });
       });
     }
   });
@@ -59519,9 +59527,11 @@ async function runCommands({ commands, ...opts }) {
     startText: opts.startText,
     doneText: opts.doneText,
     async promise() {
+      const results = [];
       for (const command2 of commands) {
-        await runCommand(command2, { ...opts, useSpinner: false });
+        results.push(await runCommand(command2, { ...opts, useSpinner: false }));
       }
+      return results.join("\n");
     }
   });
 }
@@ -59538,8 +59548,9 @@ var printAsyncStatus = async ({
     promise = promise();
   }
   try {
-    await promise;
-    s?.stop(opts.doneText);
+    const output = await promise;
+    const doneText = typeof opts.doneText === "function" ? opts.doneText(output) : opts.doneText;
+    s?.stop(doneText);
   } catch (err) {
     s?.stop(err.message);
   } finally {
@@ -59616,10 +59627,14 @@ var installWrangler = async () => {
 };
 var isLoggedIn = async () => {
   const { npx: npx6 } = detectPackageManager();
-  const output = await runCommand(`${npx6} wrangler whoami`, {
-    silent: true
-  });
-  return !/not authenticated/.test(output);
+  try {
+    const output = await runCommand(`${npx6} wrangler whoami`, {
+      silent: true
+    });
+    return /You are logged in/.test(output);
+  } catch (error) {
+    return false;
+  }
 };
 var wranglerLogin = async () => {
   const { npx: npx6 } = detectPackageManager();
@@ -59652,6 +59667,24 @@ var listAccounts = async () => {
   });
   return accounts;
 };
+async function getWorkerdCompatibilityDate() {
+  const { npm: npm12 } = detectPackageManager();
+  return runCommand(`${npm12} info workerd dist-tags.latest`, {
+    silent: true,
+    captureOutput: true,
+    startText: "Retrieving current workerd compatibility date",
+    transformOutput: (result) => {
+      const match = result.match(/\d+\.(\d{4})(\d{2})(\d{2})\.\d+/);
+      if (!match) {
+        throw new Error("Could not find workerd date");
+      }
+      const [, year, month, date] = match;
+      return `${year}-${month}-${date}`;
+    },
+    fallbackOutput: () => "2023-05-18",
+    doneText: (output) => `${brandColor("compatibility date")} ${dim(output)}`
+  });
+}
 
 // src/helpers/poll.ts
 var import_promises = require("node:dns/promises");
@@ -59729,14 +59762,15 @@ var validateProjectDirectory = (relativePath) => {
   const existsAlready = (0, import_fs6.existsSync)(path3);
   const isEmpty = existsAlready && (0, import_fs6.readdirSync)(path3).length === 0;
   if (existsAlready && !isEmpty) {
-    crash(
-      `Directory \`${relativePath}\` already exists and is not empty. Please choose a new name.`
-    );
+    return `Directory \`${relativePath}\` already exists and is not empty. Please choose a new name.`;
   }
 };
 var setupProjectDirectory = (args) => {
   const path3 = (0, import_path6.resolve)(args.projectName);
-  validateProjectDirectory(path3);
+  const err = validateProjectDirectory(path3);
+  if (err) {
+    crash(err);
+  }
   const directory = (0, import_path6.dirname)(path3);
   const name = (0, import_path6.basename)(path3);
   (0, import_fs6.mkdirSync)(directory, { recursive: true });
@@ -59745,14 +59779,12 @@ var setupProjectDirectory = (args) => {
 };
 var offerToDeploy = async (ctx) => {
   startSection(`Deploy with Cloudflare`, `Step 3 of 3`);
-  ctx.args.deploy = await confirmInput({
+  const label = `deploy via \`${npm} run ${ctx.framework?.config.deployCommand ?? "deploy"}\``;
+  ctx.args.deploy = await processArgument(ctx.args, "deploy", {
+    type: "confirm",
     question: "Do you want to deploy your application?",
-    renderSubmitted: (value) => `${brandColor(value ? `yes` : `no`)} ${dim(
-      `deploying via \`${npm} run ${ctx.framework?.config.deployCommand ?? "deploy"}\``
-    )}`,
-    defaultValue: ctx.args.deploy ?? (ctx.args.wranglerDefaults ? false : true),
-    // if --wrangler-defaults, default to false, otherwise default to true
-    acceptDefault: ctx.args.wranglerDefaults
+    label,
+    defaultValue: C3_DEFAULTS.deploy
   });
   if (!ctx.args.deploy)
     return;
@@ -59806,14 +59838,12 @@ var chooseAccount = async (ctx) => {
       label: name,
       value: id
     }));
-    accountId = await selectInput({
+    accountId = await inputPrompt({
+      type: "select",
       question: "Which account do you want to use?",
       options: accountOptions,
-      renderSubmitted: (option) => {
-        return `${brandColor("account")} ${dim(option.label)}`;
-      },
-      defaultValue: accountOptions[0].value,
-      acceptDefault: ctx.args.wranglerDefaults
+      label: "account",
+      defaultValue: accountOptions[0].value
     });
   }
   const accountName = Object.keys(accounts).find(
@@ -59823,6 +59853,7 @@ var chooseAccount = async (ctx) => {
 };
 var printSummary = async (ctx) => {
   const nextSteps = [
+    [`Navigate to the new directory:`, `cd ${ctx.project.name}`],
     [
       `Run the development server`,
       `${npm} run ${ctx.framework?.config.devCommand ?? "start"}`
@@ -59885,11 +59916,11 @@ var offerGit = async (ctx) => {
   const insideGitRepo = await isInsideGitRepo(ctx.project.path);
   if (insideGitRepo)
     return;
-  ctx.args.git ??= await confirmInput({
+  ctx.args.git = await processArgument(ctx.args, "git", {
+    type: "confirm",
     question: "Do you want to use git for version control?",
-    renderSubmitted: (value) => `${brandColor("git")} ${dim(value ? `yes` : `no`)}`,
-    defaultValue: true,
-    acceptDefault: ctx.args.wranglerDefaults
+    label: "git",
+    defaultValue: C3_DEFAULTS.git
   });
   if (ctx.args.git) {
     await printAsyncStatus({
@@ -60021,10 +60052,10 @@ var config = {
   displayName: "Angular",
   packageScripts: {
     process: "node ./tools/copy-worker-files.mjs && node ./tools/copy-client-files.mjs && node ./tools/bundle.mjs",
-    prestart: `${npm2} run build:ssr && npm run process`,
+    prestart: `${npm2} run build:ssr && ${npm2} run process`,
     start: "wrangler pages dev dist/cloudflare --compatibility-date=2021-09-20 --experimental-local",
-    predeploy: `${npm2} run build:ssr && npm run process`,
-    deploy: "wrangler pages publish dist/cloudflare"
+    predeploy: `${npm2} run build:ssr && ${npm2} run process`,
+    deploy: "wrangler pages deploy dist/cloudflare"
   },
   deployCommand: "deploy",
   devCommand: "start"
@@ -60119,7 +60150,7 @@ var config2 = {
   displayName: "Astro",
   packageScripts: {
     "pages:dev": `wrangler pages dev ${compatDateFlag()} --proxy 3000 -- astro dev`,
-    "pages:deploy": `astro build && wrangler pages publish ./dist`
+    "pages:deploy": `astro build && wrangler pages deploy ./dist`
   },
   testFlags: [
     "--skip-houston",
@@ -60148,7 +60179,7 @@ var config3 = {
   displayName: "Docusaurus",
   packageScripts: {
     "pages:dev": `wrangler pages dev ${compatDateFlag()} --proxy 3000 -- ${npm3} run start`,
-    "pages:deploy": `NODE_VERSION=16 ${npm3} run build && wrangler pages publish ./build`
+    "pages:deploy": `NODE_VERSION=16 ${npm3} run build && wrangler pages deploy ./build`
   }
 };
 var docusaurus_default = config3;
@@ -60157,25 +60188,19 @@ var docusaurus_default = config3;
 var { npm: npm4, dlx: dlx4 } = detectPackageManager();
 var generate4 = async (ctx) => {
   const defaultTemplate = "https://github.com/gatsbyjs/gatsby-starter-blog";
-  const useTemplate = await confirmInput({
+  const useTemplate = await inputPrompt({
+    type: "confirm",
     question: "Would you like to use a template?",
-    renderSubmitted: (value) => {
-      const status2 = value ? "yes" : "no";
-      return `${brandColor(`template`)} ${status2}`;
-    },
-    defaultValue: true,
-    acceptDefault: false
+    label: "template",
+    defaultValue: true
   });
   let templateUrl = "";
   if (useTemplate) {
-    templateUrl = await textInput({
+    templateUrl = await inputPrompt({
+      type: "text",
       question: `Please specify the url of the template you'd like to use`,
-      renderSubmitted: (value) => {
-        const result = `Using template \`${value}\``;
-        return `${brandColor("template")} ${dim(result)}`;
-      },
-      defaultValue: defaultTemplate,
-      acceptDefault: false
+      label: "template",
+      defaultValue: defaultTemplate
     });
   }
   const version2 = getFrameworkVersion(ctx);
@@ -60189,7 +60214,7 @@ var config4 = {
   displayName: "Gatsby",
   packageScripts: {
     "pages:dev": `wrangler pages dev ${compatDateFlag()} --proxy 8000 -- ${npm4} run develop`,
-    "pages:deploy": `${npm4} run build && wrangler pages publish ./public`
+    "pages:deploy": `${npm4} run build && wrangler pages deploy ./public`
   }
 };
 var gatsby_default = config4;
@@ -60315,7 +60340,7 @@ var config6 = {
   displayName: "Next",
   packageScripts: {
     "pages:build": `${npx3} @cloudflare/next-on-pages@1`,
-    "pages:deploy": `${npm5} run pages:build && wrangler pages publish .vercel/output/static`,
+    "pages:deploy": `${npm5} run pages:build && wrangler pages deploy .vercel/output/static`,
     "pages:watch": `${npx3} @cloudflare/next-on-pages@1 --watch`,
     "pages:dev": `${npx3} wrangler pages dev .vercel/output/static --compatibility-flag=nodejs_compat`
   },
@@ -60353,7 +60378,7 @@ var config7 = {
   displayName: "Nuxt",
   packageScripts: {
     "pages:dev": `wrangler pages dev ${compatDateFlag()} --proxy 3000 -- npm run dev`,
-    "pages:deploy": `NODE_VERSION=17 npm run generate && wrangler pages publish ./dist`
+    "pages:deploy": `NODE_VERSION=17 npm run generate && wrangler pages deploy ./dist`
   }
 };
 var nuxt_default = config7;
@@ -60400,7 +60425,7 @@ var config9 = {
   displayName: "React",
   packageScripts: {
     "pages:dev": `wrangler pages dev ${compatDateFlag()} --port 3000 -- ${npm7} start`,
-    "pages:deploy": `${npm7} run build && wrangler pages publish ./build`
+    "pages:deploy": `${npm7} run build && wrangler pages deploy ./build`
   }
 };
 var react_default = config9;
@@ -60419,7 +60444,7 @@ var config10 = {
   generate: generate10,
   displayName: "Remix",
   packageScripts: {
-    "pages:deploy": `${npm8} run build && wrangler pages publish ./public`
+    "pages:deploy": `${npm8} run build && wrangler pages deploy ./public`
   },
   devCommand: "dev",
   testFlags: ["--typescript", "--no-install"]
@@ -60468,7 +60493,7 @@ var config11 = {
   displayName: "Solid",
   packageScripts: {
     "pages:dev": `wrangler pages dev ${compatDateFlag()} --proxy 3000 -- ${npm9} run dev`,
-    "pages:deploy": `${npm9} run build build && wrangler pages publish ./dist/public`
+    "pages:deploy": `${npm9} run build && wrangler pages deploy ./dist/public`
   }
 };
 var solid_default = config11;
@@ -60568,7 +60593,7 @@ var config12 = {
   displayName: "Svelte",
   packageScripts: {
     "pages:dev": `wrangler pages dev ${compatDateFlag()} --proxy 5173 -- ${npm10} run dev`,
-    "pages:deploy": `NODE_VERSION=16 ${npm10} run build && wrangler pages publish .svelte-kit/cloudflare`
+    "pages:deploy": `NODE_VERSION=16 ${npm10} run build && wrangler pages deploy .svelte-kit/cloudflare`
   }
 };
 var svelte_default = config12;
@@ -60579,7 +60604,7 @@ var versionMap_default = {
   astro: "3.1.5",
   docusaurus: "2.4.1",
   gatsby: "5.10.0",
-  hono: "0.2.0",
+  hono: "0.2.6",
   next: "13.4.2",
   nuxt: "3.4.2",
   qwik: "1.1.x",
@@ -60604,7 +60629,7 @@ var config13 = {
   displayName: "Vue",
   packageScripts: {
     "pages:dev": `wrangler pages dev ${compatDateFlag()} --proxy 5173 -- ${npm11} run dev`,
-    "pages:deploy": `${npm11} run build && wrangler pages publish ./dist`
+    "pages:deploy": `${npm11} run build && wrangler pages deploy ./dist`
   },
   testFlags: ["--ts"]
 };
@@ -60684,14 +60709,12 @@ var getFrameworkSelection = async (args) => {
       value: key
     })
   );
-  const framework = await selectInput({
+  const framework = await processArgument(args, "framework", {
+    type: "select",
+    label: "framework",
     question: "Which development framework do you want to use?",
     options: frameworkOptions,
-    renderSubmitted: (option) => {
-      return `${brandColor("framework")} ${dim(option.label)}`;
-    },
-    defaultValue: args.framework ?? "svelte",
-    acceptDefault: Boolean(args.framework)
+    defaultValue: C3_DEFAULTS.framework
   });
   framework || crash("A framework must be selected to continue.");
   if (!supportedFramework(framework)) {
@@ -60769,11 +60792,11 @@ var runWorkersGenerator = async (args) => {
 };
 async function getTemplate(ctx) {
   if (ctx.args.ts === void 0) {
-    ctx.args.ts = await confirmInput({
+    ctx.args.ts = await processArgument(ctx.args, "ts", {
+      type: "confirm",
       question: "Do you want to use TypeScript?",
-      renderSubmitted: (value) => `${brandColor("typescript")} ${dim(`${value ? "yes" : "no"}`)}`,
-      defaultValue: true,
-      acceptDefault: ctx.args.wranglerDefaults
+      label: "typescript",
+      defaultValue: C3_DEFAULTS.ts
     });
   }
   const preexisting = ctx.args.type === "pre-existing";
@@ -60799,12 +60822,16 @@ async function copyExistingWorkerFiles(ctx) {
   if (preexisting) {
     await chooseAccount(ctx);
     if (ctx.args.existingScript === void 0) {
-      ctx.args.existingScript = await textInput({
-        question: "Please specify the name of the existing worker in this account?",
-        renderSubmitted: (value) => `${brandColor("worker")} ${dim(`"${value}"`)}`,
-        defaultValue: ctx.project.name,
-        acceptDefault: ctx.args.wranglerDefaults
-      });
+      ctx.args.existingScript = await processArgument(
+        ctx.args,
+        "existingScript",
+        {
+          type: "text",
+          question: "Please specify the name of the existing worker in this account?",
+          label: "worker",
+          defaultValue: ctx.project.name
+        }
+      );
     }
     const tempdir = await (0, import_promises3.mkdtemp)(
       (0, import_path9.join)((0, import_os.tmpdir)(), "c3-wrangler-init--from-dash-")
@@ -60845,10 +60872,12 @@ async function updateFiles(ctx) {
     packagejson: JSON.parse(await (0, import_promises3.readFile)(paths.packagejson, "utf-8")),
     wranglertoml: await (0, import_promises3.readFile)(paths.wranglertoml, "utf-8")
   };
-  contents.packagejson.name = ctx.project.name;
-  contents.wranglertoml = contents.wranglertoml.replace(/^name = .+$/m, `name = "${ctx.project.name}"`).replace(
-    /^compatibility_date = .+$/m,
-    `compatibility_date = "${(/* @__PURE__ */ new Date()).toISOString().substring(0, 10)}"`
+  if (contents.packagejson.name === "<TBD>") {
+    contents.packagejson.name = ctx.project.name;
+  }
+  contents.wranglertoml = contents.wranglertoml.replace(/^name\s*=\s*"<TBD>"/m, `name = "${ctx.project.name}"`).replace(
+    /^compatibility_date\s*=\s*"<TBD>"/m,
+    `compatibility_date = "${await getWorkerdCompatibilityDate()}"`
   );
   await (0, import_promises3.writeFile)(
     paths.packagejson,
@@ -60858,19 +60887,55 @@ async function updateFiles(ctx) {
 }
 
 // src/cli.ts
+var C3_DEFAULTS = {
+  projectName: new import_haikunator.default().haikunate({ tokenHex: true }),
+  type: "hello-world",
+  framework: "angular",
+  deploy: true,
+  git: true,
+  open: true,
+  ts: true
+};
+var WRANGLER_DEFAULTS = {
+  ...C3_DEFAULTS,
+  deploy: false
+};
 var main = async (argv) => {
-  printBanner();
   const args = await parseArgs(argv);
+  printBanner();
+  const projectName = await processArgument(args, "projectName", {
+    type: "text",
+    question: `In which directory do you want to create your application?`,
+    helpText: "also used as application name",
+    defaultValue: C3_DEFAULTS.projectName,
+    label: "dir",
+    validate: (value) => validateProjectDirectory(String(value) || C3_DEFAULTS.projectName),
+    format: (val) => `./${val}`
+  });
+  if (!args.type) {
+    if (args.framework) {
+      args.type = "webFramework";
+    } else if (args.existingScript) {
+      args.type = "pre-existing";
+    }
+  }
+  const templateOptions = Object.entries(templateMap).filter(([_3, { hidden: hidden2 }]) => !hidden2).map(([value, { label }]) => ({ value, label }));
+  const type = await processArgument(args, "type", {
+    type: "select",
+    question: "What type of application do you want to create?",
+    label: "type",
+    options: templateOptions,
+    defaultValue: C3_DEFAULTS.type
+  });
+  if (!type || !Object.keys(templateMap).includes(type)) {
+    return crash("An application type must be specified to continue.");
+  }
   const validatedArgs = {
     ...args,
-    projectName: await validateName(args.projectName, {
-      acceptDefault: args.wranglerDefaults
-    }),
-    type: await validateType(args.type, {
-      acceptDefault: args.wranglerDefaults
-    })
+    type,
+    projectName
   };
-  const { handler } = templateMap[validatedArgs.type];
+  const { handler } = templateMap[type];
   await handler(validatedArgs);
 };
 var printBanner = () => {
@@ -60887,41 +60952,17 @@ var parseArgs = async (argv) => {
   }).option("existing-script", {
     type: "string",
     hidden: templateMap["pre-existing"].hidden
-  }).option("wrangler-defaults", { type: "boolean", hidden: true }).help().argv;
+  }).option("accept-defaults", {
+    alias: "y",
+    type: "boolean"
+  }).option("wrangler-defaults", { type: "boolean", hidden: true }).version(version).help().argv;
   return {
+    ...args.wranglerDefaults && WRANGLER_DEFAULTS,
+    ...args.acceptDefaults && C3_DEFAULTS,
     projectName: args._[0],
     ...args
   };
 };
-var validateName = async (name, { acceptDefault = false } = {}) => {
-  const defaultValue = name ?? new import_haikunator.default().haikunate({ tokenHex: true });
-  return textInput({
-    question: `Where do you want to create your application?`,
-    helpText: "also used as application name",
-    renderSubmitted: (value) => {
-      return `${brandColor("dir")} ${dim(value)}`;
-    },
-    defaultValue,
-    acceptDefault,
-    validate: (value = defaultValue) => validateProjectDirectory(value)
-  });
-};
-var validateType = async (type, { acceptDefault = false } = {}) => {
-  const templateOptions = Object.entries(templateMap).filter(([_3, { hidden: hidden2 }]) => !hidden2).map(([value, { label }]) => ({ value, label }));
-  type = await selectInput({
-    question: "What type of application do you want to create?",
-    options: templateOptions,
-    renderSubmitted: (option) => {
-      return `${brandColor("type")} ${dim(option.label)}`;
-    },
-    defaultValue: type ?? "hello-world",
-    acceptDefault
-  });
-  if (!type || !Object.keys(templateMap).includes(type)) {
-    crash("An application type must be specified to continue.");
-  }
-  return type;
-};
 var templateMap = {
   webFramework: {
     label: "Website or web app",
@@ -60959,7 +61000,9 @@ var templateMap = {
 main(process.argv).catch((e) => crash(e));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  main
+  C3_DEFAULTS,
+  main,
+  parseArgs
 });
 /*! Bundled license information:
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-cloudflare",
-	"version": "0.0.0-e8df68ee",
+	"version": "0.0.0-f7ae0ead",
 	"description": "A CLI for creating and deploying new applications to Cloudflare.",
 	"keywords": [
 		"cloudflare",
@@ -61,7 +61,7 @@
 		"recast": "^0.22.0",
 		"semver": "^7.5.1",
 		"typescript": "^5.0.2",
-		"undici": "^5.22.0",
+		"undici": "5.20.0",
 		"vite-tsconfig-paths": "^4.0.8",
 		"vitest": "^0.30.0",
 		"which-pm-runs": "^1.1.0",

package/templates/chatgptPlugin/ts/README.md

@@ -12,7 +12,7 @@ The sample plugin allows ChatGPT users to search for repositories using GitHub's
 1. Install [wrangler](https://developers.cloudflare.com/workers/cli-wrangler/install-update), the Cloudflare Workers CLI
 2. Clone this project and install dependencies with `npm install`
 3. Run `wrangler login` to login to your Cloudflare account in wrangler
-4. Run `wrangler publish` to publish the plugin to Cloudflare Workers
+4. Run `wrangler deploy` to publish the plugin to Cloudflare Workers
 
 ## Usage
 

package/templates/chatgptPlugin/ts/package.json

@@ -3,7 +3,7 @@
 	"version": "0.0.1",
 	"private": true,
 	"scripts": {
-		"deploy": "wrangler publish",
+		"deploy": "wrangler deploy",
 		"start": "wrangler dev"
 	},
 	"dependencies": {

package/templates/chatgptPlugin/ts/wrangler.toml

@@ -1,3 +1,3 @@
-name = "cloudflare-workers-chatgpt-plugin-example"
+name = "<TBD>"
 main = "src/index.ts"
-compatibility_date = "2023-04-07"
+compatibility_date = "<TBD>"

package/templates/common/js/package.json

@@ -3,11 +3,10 @@
 	"version": "0.0.0",
 	"private": true,
 	"scripts": {
-		"deploy": "wrangler publish",
+		"deploy": "wrangler deploy",
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230419.0",
 		"itty-router": "^3.0.12",
 		"wrangler": "^3.0.0"
 	}

package/templates/common/js/wrangler.toml

@@ -1,6 +1,6 @@
 name = "<TBD>"
 main = "src/worker.js"
-compatibility_date = "2023-04-21"
+compatibility_date = "<TBD>"
 
 # Variable bindings. These are arbitrary, plaintext strings (similar to environment variables)
 # Note: Use secrets to store sensitive data.

package/templates/common/ts/package.json

@@ -3,7 +3,7 @@
 	"version": "0.0.0",
 	"private": true,
 	"scripts": {
-		"deploy": "wrangler publish",
+		"deploy": "wrangler deploy",
 		"start": "wrangler dev"
 	},
 	"devDependencies": {

package/templates/common/ts/wrangler.toml

@@ -1,6 +1,6 @@
 name = "<TBD>"
 main = "src/worker.ts"
-compatibility_date = "2023-04-21"
+compatibility_date = "<TBD>"
 
 # Variable bindings. These are arbitrary, plaintext strings (similar to environment variables)
 # Note: Use secrets to store sensitive data.

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

@@ -3,12 +3,10 @@
 	"version": "0.0.0",
 	"private": true,
 	"scripts": {
-		"deploy": "wrangler publish",
+		"deploy": "wrangler deploy",
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230419.0",
-		"typescript": "^5.0.4",
 		"wrangler": "^3.0.0"
 	}
 }

package/templates/hello-world/js/wrangler.toml

@@ -1,6 +1,6 @@
 name = "<TBD>"
 main = "src/worker.js"
-compatibility_date = "2023-04-21"
+compatibility_date = "<TBD>"
 
 # Variable bindings. These are arbitrary, plaintext strings (similar to environment variables)
 # Note: Use secrets to store sensitive data.

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

@@ -3,7 +3,7 @@
 	"version": "0.0.0",
 	"private": true,
 	"scripts": {
-		"deploy": "wrangler publish",
+		"deploy": "wrangler deploy",
 		"start": "wrangler dev"
 	},
 	"devDependencies": {

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

@@ -1,6 +1,6 @@
 name = "<TBD>"
 main = "src/worker.ts"
-compatibility_date = "2023-04-21"
+compatibility_date = "<TBD>"
 
 # Variable bindings. These are arbitrary, plaintext strings (similar to environment variables)
 # Note: Use secrets to store sensitive data.

package/templates/queues/js/package.json

@@ -3,12 +3,10 @@
 	"version": "0.0.0",
 	"private": true,
 	"scripts": {
-		"deploy": "wrangler publish",
+		"deploy": "wrangler deploy",
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230419.0",
-		"typescript": "^5.0.4",
 		"wrangler": "^3.0.0"
 	}
 }

package/templates/queues/js/wrangler.toml

@@ -1,6 +1,6 @@
 name = "<TBD>"
 main = "src/worker.js"
-compatibility_date = "2023-05-15"
+compatibility_date = "<TBD>"
 
 # Bind a Queue producer. Use this binding to schedule an arbitrary task that may be processed later by a Queue consumer.
 # Docs: https://developers.cloudflare.com/queues/get-started

package/templates/queues/ts/package.json

@@ -3,7 +3,7 @@
 	"version": "0.0.0",
 	"private": true,
 	"scripts": {
-		"deploy": "wrangler publish",
+		"deploy": "wrangler deploy",
 		"start": "wrangler dev"
 	},
 	"devDependencies": {

package/templates/queues/ts/wrangler.toml

@@ -1,6 +1,6 @@
 name = "<TBD>"
 main = "src/worker.ts"
-compatibility_date = "2023-05-15"
+compatibility_date = "<TBD>"
 
 # Bind a Queue producer. Use this binding to schedule an arbitrary task that may be processed later by a Queue consumer.
 # Docs: https://developers.cloudflare.com/queues/get-started

package/templates/scheduled/js/package.json

@@ -3,12 +3,10 @@
 	"version": "0.0.0",
 	"private": true,
 	"scripts": {
-		"deploy": "wrangler publish",
+		"deploy": "wrangler deploy",
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230419.0",
-		"typescript": "^5.0.4",
 		"wrangler": "^3.0.0"
 	}
 }

package/templates/scheduled/js/wrangler.toml

@@ -1,6 +1,6 @@
 name = "<TBD>"
 main = "src/worker.ts"
-compatibility_date = "2023-05-15"
+compatibility_date = "<TBD>"
 
 # Cron Triggers
 # Docs: https://developers.cloudflare.com/workers/platform/triggers/cron-triggers/

package/templates/scheduled/ts/package.json

@@ -3,7 +3,7 @@
 	"version": "0.0.0",
 	"private": true,
 	"scripts": {
-		"deploy": "wrangler publish",
+		"deploy": "wrangler deploy",
 		"start": "wrangler dev"
 	},
 	"devDependencies": {