create-cloudflare 0.0.0-c5f3bf45 → 0.0.0-cc9ced83

package/dist/cli.js

@@ -59419,7 +59419,7 @@ var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
 // package.json
-var version = "0.0.0-c5f3bf45";
+var version = "0.0.0-cc9ced83";
 
 // src/common.ts
 var import_fs6 = require("fs");
@@ -59474,26 +59474,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) {
@@ -59506,10 +59506,19 @@ 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 }));
+            }
           }
         });
       });
@@ -59522,9 +59531,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");
     }
   });
 }
@@ -59541,8 +59552,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 {
@@ -59655,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");
@@ -60849,10 +60879,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,
@@ -60863,8 +60895,8 @@ async function updateFiles(ctx) {
 
 // src/cli.ts
 var main = async (argv) => {
-  printBanner();
   const args = await parseArgs(argv);
+  printBanner();
   const validatedArgs = {
     ...args,
     projectName: await validateName(args.projectName, {
@@ -60891,7 +60923,7 @@ var parseArgs = async (argv) => {
   }).option("existing-script", {
     type: "string",
     hidden: templateMap["pre-existing"].hidden
-  }).option("wrangler-defaults", { type: "boolean", hidden: true }).help().argv;
+  }).option("wrangler-defaults", { type: "boolean", hidden: true }).version(version).help().argv;
   return {
     projectName: args._[0],
     ...args
@@ -60900,7 +60932,7 @@ var parseArgs = async (argv) => {
 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?`,
+    question: `In which directory do you want to create your application?`,
     helpText: "also used as application name",
     renderSubmitted: (value) => {
       return `${brandColor("dir")} ${dim(value)}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-cloudflare",
-	"version": "0.0.0-c5f3bf45",
+	"version": "0.0.0-cc9ced83",
 	"description": "A CLI for creating and deploying new applications to Cloudflare.",
 	"keywords": [
 		"cloudflare",

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/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/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/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/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/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/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/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/