create-cloudflare 0.0.0-881ea7be → 0.0.0-941764d0

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

@@ -53150,7 +53150,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)
@@ -54350,6 +54350,7 @@ var leftT = gray(shapes.leftT);
 var textInput = async (opts) => {
   const { renderSubmitted, question, defaultValue, validate, acceptDefault } = opts;
   const helpText = opts.helpText || ``;
+  const format3 = opts.format || ((val) => val);
   const prompt = new oD({
     defaultValue,
     validate,
@@ -54359,19 +54360,21 @@ var textInput = async (opts) => {
         case "initial":
           body += `${blCorner} ${bold(question)} ${dim(helpText)}
 `;
-          body += `${space(2)}${gray(defaultValue)}
+          body += `${space(2)}${gray(format3(defaultValue))}
 `;
           break;
         case "active":
           body += `${blCorner} ${bold(question)} ${dim(helpText)}
 `;
-          body += `${space(2)}${this.value}
+          body += `${space(2)}${format3(this.value || dim(defaultValue))}
 `;
           break;
         case "submit":
           body += `${leftT} ${question}
 `;
-          body += `${grayBar} ${renderSubmitted(this.value)}
+          body += `${grayBar} ${renderSubmitted(
+            format3(this.value)
+          )}
 ${grayBar}`;
           break;
         case "error":
@@ -54381,7 +54384,7 @@ ${grayBar}`;
 `;
           body += `${blCorner} ${question} ${dim(helpText)}
 `;
-          body += `${space(2)}${this.value}
+          body += `${space(2)}${format3(this.value)}
 `;
           break;
         default:
@@ -59416,7 +59419,7 @@ var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
 // package.json
-var version = "0.0.0-881ea7be";
+var version = "0.0.0-941764d0";
 
 // src/common.ts
 var import_fs6 = require("fs");
@@ -59471,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) {
@@ -59503,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 }));
+            }
           }
         });
       });
@@ -59519,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");
     }
   });
 }
@@ -59538,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 {
@@ -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 });
@@ -60021,10 +60055,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 +60153,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 +60182,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;
@@ -60189,7 +60223,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 +60349,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 +60387,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 +60434,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 +60453,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 +60502,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 build && wrangler pages deploy ./dist/public`
   }
 };
 var solid_default = config11;
@@ -60568,7 +60602,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;
@@ -60604,7 +60638,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"]
 };
@@ -60845,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,
@@ -60859,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, {
@@ -60887,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
@@ -60896,14 +60932,15 @@ 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)}`;
     },
     defaultValue,
     acceptDefault,
-    validate: (value = defaultValue) => validateProjectDirectory(value)
+    validate: (value) => validateProjectDirectory(value || defaultValue),
+    format: (val) => `./${val}`
   });
 };
 var validateType = async (type, { acceptDefault = false } = {}) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-cloudflare",
-	"version": "0.0.0-881ea7be",
+	"version": "0.0.0-941764d0",
 	"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,7 +3,7 @@
 	"version": "0.0.0",
 	"private": true,
 	"scripts": {
-		"deploy": "wrangler publish",
+		"deploy": "wrangler deploy",
 		"start": "wrangler dev"
 	},
 	"devDependencies": {

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,7 +3,7 @@
 	"version": "0.0.0",
 	"private": true,
 	"scripts": {
-		"deploy": "wrangler publish",
+		"deploy": "wrangler deploy",
 		"start": "wrangler dev"
 	},
 	"devDependencies": {

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,7 +3,7 @@
 	"version": "0.0.0",
 	"private": true,
 	"scripts": {
-		"deploy": "wrangler publish",
+		"deploy": "wrangler deploy",
 		"start": "wrangler dev"
 	},
 	"devDependencies": {

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,7 +3,7 @@
 	"version": "0.0.0",
 	"private": true,
 	"scripts": {
-		"deploy": "wrangler publish",
+		"deploy": "wrangler deploy",
 		"start": "wrangler dev"
 	},
 	"devDependencies": {

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": {