create-cloudflare 0.0.0-a08c2924 → 0.0.0-a1f212e6

package/dist/cli.js

@@ -8473,7 +8473,7 @@ var require_util = __commonJS({
     exports.isAbsolute = function(aPath) {
       return aPath.charAt(0) === "/" || urlRegexp.test(aPath);
     };
-    function relative2(aRoot, aPath) {
+    function relative3(aRoot, aPath) {
       if (aRoot === "") {
         aRoot = ".";
       }
@@ -8492,7 +8492,7 @@ var require_util = __commonJS({
       }
       return Array(level + 1).join("../") + aPath.substr(aRoot.length + 1);
     }
-    exports.relative = relative2;
+    exports.relative = relative3;
     var supportsNullProto = function() {
       var obj = /* @__PURE__ */ Object.create(null);
       return !("__proto__" in obj);
@@ -58091,7 +58091,7 @@ var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
 // package.json
-var version = "0.0.0-a08c2924";
+var version = "0.0.0-a1f212e6";
 var devDependencies = {
   "@babel/parser": "^7.21.3",
   "@babel/types": "^7.21.4",
@@ -60149,29 +60149,39 @@ var spinner = (frames = spinnerFrames.clockwise, color = brandColor) => {
       helpText ||= ``;
       currentMsg = msg;
       startMsg = `${currentMsg} ${dim(helpText)}`;
-      let index = 0;
-      clearLoop();
-      loop = setInterval(() => {
-        index++;
-        const spinnerFrame = frames[index % frames.length];
-        const ellipsisFrame = ellipsisFrames[index % ellipsisFrames.length];
-        if (msg) {
-          log_update_default(`${color(spinnerFrame)} ${currentMsg} ${ellipsisFrame}`);
-        }
-      }, frameRate);
+      if (isInteractive()) {
+        let index = 0;
+        clearLoop();
+        loop = setInterval(() => {
+          index++;
+          const spinnerFrame = frames[index % frames.length];
+          const ellipsisFrame = ellipsisFrames[index % ellipsisFrames.length];
+          if (msg) {
+            log_update_default(`${color(spinnerFrame)} ${currentMsg} ${ellipsisFrame}`);
+          }
+        }, frameRate);
+      } else {
+        log_update_default(`${leftT} ${startMsg}`);
+      }
     },
     update(msg) {
       currentMsg = msg;
     },
     stop(msg) {
-      log_update_default.clear();
-      if (msg) {
-        log_update_default(`${leftT} ${startMsg}
+      if (isInteractive()) {
+        log_update_default.clear();
+        if (msg) {
+          log_update_default(`${leftT} ${startMsg}
+${grayBar} ${msg}`);
+          log_update_default.done();
+          newline();
+        }
+        clearLoop();
+      } else {
+        log_update_default(`
 ${grayBar} ${msg}`);
-        log_update_default.done();
         newline();
       }
-      clearLoop();
     }
   };
 };
@@ -60364,7 +60374,7 @@ var printAsyncStatus = async ({
   ...opts
 }) => {
   let s;
-  if (opts.useSpinner) {
+  if (opts.useSpinner && isInteractive()) {
     s = spinner();
   }
   s?.start(opts?.startText);
@@ -60382,7 +60392,10 @@ var printAsyncStatus = async ({
   }
   return promise;
 };
-var retry = async (times, fn) => {
+var retry = async ({
+  times,
+  exitCondition
+}, fn) => {
   let error = null;
   while (times > 0) {
     try {
@@ -60390,6 +60403,9 @@ var retry = async (times, fn) => {
     } catch (e) {
       error = e;
       times--;
+      if (exitCondition?.(e)) {
+        break;
+      }
     }
   }
   throw error;
@@ -60596,9 +60612,9 @@ var usesEslint = (ctx) => {
   }
   return { used: false };
 };
-var compatDateFlag = () => {
-  const date = /* @__PURE__ */ new Date();
-  return `--compatibility-date=${date.toISOString().slice(0, 10)}`;
+var compatDateFlag = async () => {
+  const workerdCompatDate = await getWorkerdCompatibilityDate();
+  return `--compatibility-date=${workerdCompatDate}`;
 };
 
 // src/frameworks/angular/index.ts
@@ -60612,9 +60628,8 @@ var generate = async (ctx) => {
   logRaw("");
 };
 var configure = async (ctx) => {
-  const cli = getFrameworkCli(ctx, false);
   process.chdir(ctx.project.path);
-  await runCommand(`${npx} ${cli}@next analytics disable`, {
+  await runCommand(`${npx} ng analytics disable`, {
     silent: true
   });
   await addSSRAdapter();
@@ -60626,15 +60641,15 @@ var config = {
   generate,
   configure,
   displayName: "Angular",
-  packageScripts: {
+  getPackageScripts: async () => ({
     process: "node ./tools/copy-worker-files.mjs && node ./tools/copy-client-files.mjs && node ./tools/bundle.mjs",
-    prestart: `${npm} run build:ssr && ${npm} run process`,
-    start: "wrangler pages dev dist/cloudflare --compatibility-date=2021-09-20 --experimental-local",
-    predeploy: `${npm} run build:ssr && ${npm} run process`,
-    deploy: "wrangler pages deploy dist/cloudflare"
-  },
+    "pages:build": `${npm} run build:ssr && ${npm} run process`,
+    start: `${npm} run pages:build && wrangler pages dev dist/cloudflare ${await compatDateFlag()} --experimental-local`,
+    deploy: `${npm} run pages:build && wrangler pages deploy dist/cloudflare`
+  }),
   deployCommand: "deploy",
-  devCommand: "start"
+  devCommand: "start",
+  testFlags: ["--routing", "--style", "sass"]
 };
 var angular_default = config;
 async function installCFWorker(ctx) {
@@ -60724,10 +60739,10 @@ var config2 = {
   generate: generate2,
   configure: configure2,
   displayName: "Astro",
-  packageScripts: {
-    "pages:dev": `wrangler pages dev ${compatDateFlag()} -- astro dev`,
+  getPackageScripts: async () => ({
+    "pages:dev": `wrangler pages dev ${await compatDateFlag()} -- astro dev`,
     "pages:deploy": `astro build && wrangler pages deploy ./dist`
-  },
+  }),
   testFlags: [
     "--skip-houston",
     "--no-install",
@@ -60749,10 +60764,10 @@ var generate3 = async (ctx) => {
 var config3 = {
   generate: generate3,
   displayName: "Docusaurus",
-  packageScripts: {
-    "pages:dev": `wrangler pages dev ${compatDateFlag()} --proxy 3000 -- ${npm2} run start`,
+  getPackageScripts: async () => ({
+    "pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 3000 -- ${npm2} run start`,
     "pages:deploy": `NODE_VERSION=16 ${npm2} run build && wrangler pages deploy ./build`
-  },
+  }),
   testFlags: [`--package-manager`, npm2]
 };
 var docusaurus_default = config3;
@@ -60785,10 +60800,10 @@ var generate4 = async (ctx) => {
 var config4 = {
   generate: generate4,
   displayName: "Gatsby",
-  packageScripts: {
-    "pages:dev": `wrangler pages dev ${compatDateFlag()} --proxy 8000 -- ${npm3} run develop`,
+  getPackageScripts: async () => ({
+    "pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 8000 -- ${npm3} run develop`,
     "pages:deploy": `${npm3} run build && wrangler pages deploy ./public`
-  }
+  })
 };
 var gatsby_default = config4;
 
@@ -60805,7 +60820,7 @@ var generate5 = async (ctx) => {
 var config5 = {
   generate: generate5,
   displayName: "Hono",
-  packageScripts: {},
+  getPackageScripts: async () => ({}),
   deployCommand: "deploy",
   devCommand: "dev",
   type: "workers"
@@ -60945,12 +60960,12 @@ var config6 = {
   generate: generate6,
   configure: configure3,
   displayName: "Next",
-  packageScripts: {
+  getPackageScripts: async () => ({
     "pages:build": `${dlx6} @cloudflare/next-on-pages@1`,
     "pages:deploy": `${npm4} 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`
-  },
+    "pages:dev": `${npx3} wrangler pages dev .vercel/output/static ${await compatDateFlag()} --compatibility-flag=nodejs_compat`
+  }),
   testFlags: [
     "--typescript",
     "--no-install",
@@ -60985,11 +61000,11 @@ var config7 = {
   generate: generate7,
   configure: configure4,
   displayName: "Nuxt",
-  packageScripts: {
+  getPackageScripts: async () => ({
     build: (cmd) => `NITRO_PRESET=cloudflare-pages ${cmd}`,
-    "pages:dev": `wrangler pages dev ${compatDateFlag()} --proxy 3000 -- ${npm5} run dev`,
+    "pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 3000 -- ${npm5} run dev`,
     "pages:deploy": `${npm5} run build && wrangler pages deploy ./dist`
-  }
+  })
 };
 var nuxt_default = config7;
 
@@ -61003,17 +61018,17 @@ var package_default = {
   ],
   dependencies: {
     "@angular/cli": "16.2.2",
-    "create-astro": "4.2.1",
+    "create-astro": "4.3.0",
     "create-docusaurus": "2.4.3",
-    "create-hono": "0.2.6",
+    "create-hono": "0.3.1",
     "create-next-app": "13.4.19",
     "create-qwik": "1.2.13",
     "create-react-app": "5.0.1",
-    "create-remix": "2.0.1",
-    "create-solid": "0.3.6",
-    "create-svelte": "5.1.0",
+    "create-remix": "2.1.0",
+    "create-solid": "0.3.7",
+    "create-svelte": "5.1.1",
     "create-vue": "3.7.5",
-    gatsby: "5.12.4",
+    gatsby: "5.12.7",
     nuxi: "3.9.0"
   },
   frameworkCliMap: {
@@ -61050,10 +61065,10 @@ var config8 = {
   generate: generate8,
   configure: configure5,
   displayName: "Qwik",
-  packageScripts: {
-    "pages:dev": `wrangler pages dev ${compatDateFlag()} -- ${npm6} run dev`,
+  getPackageScripts: async () => ({
+    "pages:dev": `wrangler pages dev ${await compatDateFlag()} -- ${npm6} run dev`,
     "pages:deploy": `${npm6} run build && wrangler pages deploy ./dist`
-  }
+  })
 };
 var qwik_default = config8;
 
@@ -61071,10 +61086,10 @@ var config9 = {
   generate: generate9,
   configure: configure6,
   displayName: "React",
-  packageScripts: {
-    "pages:dev": `wrangler pages dev ${compatDateFlag()} --port 3000 -- ${npm7} start`,
+  getPackageScripts: async () => ({
+    "pages:dev": `wrangler pages dev ${await compatDateFlag()} --port 3000 -- ${npm7} start`,
     "pages:deploy": `${npm7} run build && wrangler pages deploy ./build`
-  }
+  })
 };
 var react_default = config9;
 
@@ -61091,9 +61106,9 @@ var generate10 = async (ctx) => {
 var config10 = {
   generate: generate10,
   displayName: "Remix",
-  packageScripts: {
+  getPackageScripts: async () => ({
     "pages:deploy": `${npm8} run build && wrangler pages deploy ./public`
-  },
+  }),
   devCommand: "dev",
   testFlags: ["--typescript", "--no-install", "--no-git-init"]
 };
@@ -61135,10 +61150,10 @@ var config11 = {
   generate: generate11,
   configure: configure7,
   displayName: "Solid",
-  packageScripts: {
-    "pages:dev": `wrangler pages dev ${compatDateFlag()} --proxy 3000 -- ${npm9} run dev`,
+  getPackageScripts: async () => ({
+    "pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 3000 -- ${npm9} run dev`,
     "pages:deploy": `${npm9} run build && wrangler pages deploy ./dist/public`
-  }
+  })
 };
 var solid_default = config11;
 
@@ -61232,10 +61247,10 @@ var config12 = {
   generate: generate12,
   configure: configure8,
   displayName: "Svelte",
-  packageScripts: {
-    "pages:dev": `wrangler pages dev ${compatDateFlag()} --proxy 5173 -- ${npm10} run dev`,
+  getPackageScripts: async () => ({
+    "pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 5173 -- ${npm10} run dev`,
     "pages:deploy": `${npm10} run build && wrangler pages deploy .svelte-kit/cloudflare`
-  }
+  })
 };
 var svelte_default = config12;
 
@@ -61248,10 +61263,10 @@ var generate13 = async (ctx) => {
 var config13 = {
   generate: generate13,
   displayName: "Vue",
-  packageScripts: {
-    "pages:dev": `wrangler pages dev ${compatDateFlag()} --proxy 5173 -- ${npm11} run dev`,
+  getPackageScripts: async () => ({
+    "pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 5173 -- ${npm11} run dev`,
     "pages:deploy": `${npm11} run build && wrangler pages deploy ./dist`
-  },
+  }),
   testFlags: ["--ts"]
 };
 var vue_default = config13;
@@ -61389,33 +61404,35 @@ function secondsSince(start) {
 }
 
 // ../wrangler/package.json
-var version2 = "3.13.1";
+var version2 = "3.13.2";
 
 // src/common.ts
 var { name, npm: npm12 } = detectPackageManager();
-var validateProjectDirectory = (relativePath) => {
+var validateProjectDirectory = (relativePath, args) => {
   const path3 = (0, import_path7.resolve)(relativePath);
   const existsAlready = (0, import_fs8.existsSync)(path3);
   const isEmpty = existsAlready && (0, import_fs8.readdirSync)(path3).length === 0;
   if (existsAlready && !isEmpty) {
     return `Directory \`${relativePath}\` already exists and is not empty. Please choose a new name.`;
   }
-  const projectName = (0, import_path7.basename)(path3);
-  const invalidChars = /[^a-z0-9-]/;
-  const invalidStartEnd = /^-|-$/;
-  if (projectName.match(invalidStartEnd)) {
-    return `Project name cannot start or end with a dash.`;
-  }
-  if (projectName.match(invalidChars)) {
-    return `Project name must only contain lowercase characters, numbers, and dashes.`;
-  }
-  if (projectName.length > 58) {
-    return `Project names must be less than 58 characters.`;
+  if (!args.existingScript) {
+    const projectName = (0, import_path7.basename)(path3);
+    const invalidChars = /[^a-z0-9-]/;
+    const invalidStartEnd = /^-|-$/;
+    if (projectName.match(invalidStartEnd)) {
+      return `Project names cannot start or end with a dash.`;
+    }
+    if (projectName.match(invalidChars)) {
+      return `Project names must only contain lowercase characters, numbers, and dashes.`;
+    }
+    if (projectName.length > 58) {
+      return `Project names must be less than 58 characters.`;
+    }
   }
 };
 var setupProjectDirectory = (args) => {
   const path3 = (0, import_path7.resolve)(args.projectName);
-  const err = validateProjectDirectory(path3);
+  const err = validateProjectDirectory(path3, args);
   if (err) {
     crash(err);
   }
@@ -61521,7 +61538,10 @@ var chooseAccount = async (ctx) => {
 };
 var printSummary = async (ctx) => {
   const nextSteps = [
-    [`Navigate to the new directory`, `cd ${ctx.project.name}`],
+    [
+      `Navigate to the new directory`,
+      `cd ${quote([(0, import_path7.relative)(ctx.originalCWD, ctx.project.path)])}`
+    ],
     [
       `Run the development server`,
       `${npm12} run ${ctx.framework?.config.devCommand ?? "start"}`
@@ -61748,6 +61768,7 @@ var defaultFrameworkConfig = {
   devCommand: "pages:dev"
 };
 var runPagesGenerator = async (args) => {
+  const originalCWD = process.cwd();
   const { name: name2, path: path3 } = setupProjectDirectory(args);
   const framework = await getFrameworkSelection(args);
   const frameworkConfig = FrameworkMap[framework];
@@ -61765,7 +61786,8 @@ var runPagesGenerator = async (args) => {
       args: args.additionalArgs ?? []
     },
     args,
-    type: frameworkConfig.type
+    type: frameworkConfig.type,
+    originalCWD
   };
   const { generate: generate14, configure: configure9 } = FrameworkMap[framework];
   await generate14({ ...ctx });
@@ -61805,7 +61827,8 @@ var getFrameworkSelection = async (args) => {
 var updatePackageScripts = async (ctx) => {
   (0, import_process3.chdir)(ctx.project.path);
   await installWrangler();
-  const { packageScripts } = ctx.framework?.config ?? {};
+  const { getPackageScripts } = ctx.framework?.config ?? {};
+  const packageScripts = getPackageScripts ? await getPackageScripts() : {};
   if (packageScripts) {
     const s = spinner();
     const updatingScripts = Object.entries(packageScripts).filter(
@@ -61852,7 +61875,15 @@ var createProject = async (ctx) => {
     const productionBranch = await getProductionBranch(ctx.project.path);
     const cmd = `${npx5} wrangler pages project create ${ctx.project.name} --production-branch ${productionBranch} ${compatFlagsArg}`;
     await retry(
-      CREATE_PROJECT_RETRIES,
+      {
+        times: CREATE_PROJECT_RETRIES,
+        exitCondition: (e) => {
+          return e instanceof Error && // if the error is regarding name duplication we can exist as retrying is not going to help
+          e.message.includes(
+            "A project with this name already exists. Choose a different project name."
+          );
+        }
+      },
       async () => runCommand(cmd, {
         // Make this command more verbose in test mode to aid
         // troubleshooting API errors
@@ -61869,7 +61900,7 @@ var createProject = async (ctx) => {
   try {
     const verifyProject = `${npx5} wrangler pages deployment list --project-name ${ctx.project.name}`;
     await retry(
-      VERIFY_PROJECT_RETRIES,
+      { times: VERIFY_PROJECT_RETRIES },
       async () => runCommand(verifyProject, {
         silent: process.env.VITEST == void 0,
         cwd: ctx.project.path,
@@ -61893,10 +61924,12 @@ var import_path9 = require("path");
 var import_process4 = require("process");
 var { dlx: dlx14 } = detectPackageManager();
 var runWorkersGenerator = async (args) => {
+  const originalCWD = process.cwd();
   const { name: name2, path: path3 } = setupProjectDirectory(args);
   const ctx = {
     project: { name: name2, path: path3 },
-    args
+    args,
+    originalCWD
   };
   ctx.args.ts = await processArgument(ctx.args, "ts", {
     type: "confirm",
@@ -62092,7 +62125,10 @@ var processArgument = async (args, name2, promptConfig) => {
   let value = args[name2];
   const renderSubmitted = getRenderers(promptConfig).submit;
   if (value !== void 0) {
-    promptConfig.validate?.(value);
+    const error = promptConfig.validate?.(value);
+    if (error) {
+      crash(error);
+    }
     const lines = renderSubmitted({ value });
     logRaw(lines.join("\n"));
     return value;
@@ -62141,7 +62177,7 @@ var runCli = async (args) => {
     helpText: "also used as application name",
     defaultValue: C3_DEFAULTS.projectName,
     label: "dir",
-    validate: (value) => validateProjectDirectory(String(value) || C3_DEFAULTS.projectName),
+    validate: (value) => validateProjectDirectory(String(value) || C3_DEFAULTS.projectName, args),
     format: (val) => `./${val}`
   });
   if (!args.type) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "0.0.0-a08c2924",
+  "version": "0.0.0-a1f212e6",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -66,7 +66,7 @@
     "yargs": "^17.7.1",
     "yarn": "^1.22.19",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "wrangler": "3.13.1"
+    "wrangler": "3.13.2"
   },
   "engines": {
     "node": ">=18.14.1"