create-cloudflare 0.0.0-e33bb44a → 0.0.0-e600f029

package/dist/cli.js

@@ -53155,8 +53155,6 @@ var space = (n = 1) => {
   return hidden("\u200A".repeat(n));
 };
 var logRaw = (msg) => {
-  if (process.env.VITEST)
-    return;
   process.stdout.write(`${msg}
 `);
 };
@@ -54509,9 +54507,9 @@ var getConfirmRenderers = (config14) => {
     cancel: handleCancel
   };
 };
+var spinnerFrames = ["\u2524", "\u2518", "\u2534", "\u2514", "\u251C", "\u250C", "\u252C", "\u2510"];
+var ellipsisFrames = ["", ".", "..", "...", " ..", "  .", ""];
 var spinner = () => {
-  const spinnerFrames = ["\u2524", "\u2518", "\u2534", "\u2514", "\u251C", "\u250C", "\u252C", "\u2510"];
-  const ellipsisFrames = ["", ".", "..", "...", " ..", "  .", ""];
   const color = brandColor;
   const frameRate = 120;
   let loop = null;
@@ -59412,7 +59410,7 @@ var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
 // package.json
-var version = "0.0.0-e33bb44a";
+var version = "0.0.0-e600f029";
 
 // src/common.ts
 var import_fs6 = require("fs");
@@ -59473,15 +59471,14 @@ var runCommand = async (command2, opts = {}) => {
   }
   return printAsyncStatus({
     useSpinner: opts.useSpinner ?? opts.silent,
-    startText: opts.startText || command2.join(" "),
+    startText: opts.startText || command2.join(" ").trim(),
     doneText: opts.doneText,
     promise() {
       const [executable, ...args] = command2;
-      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",
+        stdio: opts.silent ? "pipe" : "inherit",
         env: {
           ...process.env,
           ...opts.env
@@ -59489,7 +59486,7 @@ var runCommand = async (command2, opts = {}) => {
         cwd: opts.cwd
       });
       let output = ``;
-      if (opts?.captureOutput ?? squelch) {
+      if (opts.captureOutput ?? opts.silent) {
         cmd.stdout?.on("data", (data) => {
           output += data;
         });
@@ -59514,6 +59511,9 @@ var runCommand = async (command2, opts = {}) => {
             }
           }
         });
+        cmd.on("error", (code) => {
+          reject(code);
+        });
       });
     }
   });
@@ -59624,10 +59624,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();
@@ -59797,7 +59801,7 @@ var runDeploy = async (ctx) => {
   const result = await runCommand(deployCmd, {
     silent: true,
     cwd: ctx.project.path,
-    env: { CLOUDFLARE_ACCOUNT_ID: ctx.account.id },
+    env: { CLOUDFLARE_ACCOUNT_ID: ctx.account.id, NODE_ENV: "production" },
     startText: `Deploying your application`,
     doneText: `${brandColor("deployed")} ${dim(`via \`${deployCmd}\``)}`
   });
@@ -59846,7 +59850,7 @@ 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 ${ctx.project.name}`],
     [
       `Run the development server`,
       `${npm} run ${ctx.framework?.config.devCommand ?? "start"}`
@@ -59973,6 +59977,24 @@ async function initializeGit(cwd) {
     await runCommand(`git init`, { useSpinner: false, silent: true, cwd });
   }
 }
+async function getProductionBranch(cwd) {
+  try {
+    const productionBranch = await runCommand(
+      // "git branch --show-current", // git@^2.22
+      "git rev-parse --abbrev-ref HEAD",
+      // git@^1.6.3
+      {
+        silent: true,
+        cwd,
+        useSpinner: false,
+        captureOutput: true
+      }
+    );
+    return productionBranch.trim();
+  } catch (err) {
+  }
+  return "main";
+}
 
 // src/pages.ts
 var import_path8 = require("path");
@@ -60002,6 +60024,9 @@ var readJSON = (path3) => {
   const contents = readFile(path3);
   return contents ? JSON.parse(contents) : contents;
 };
+var writeJSON = (path3, object, stringifySpace) => {
+  writeFile2(path3, JSON.stringify(object, null, stringifySpace));
+};
 var probePaths = (paths, errorMsg = "Failed to find required file.") => {
   for (const path3 of paths) {
     if ((0, import_fs7.existsSync)(path3)) {
@@ -60014,6 +60039,35 @@ var probePaths = (paths, errorMsg = "Failed to find required file.") => {
 var usesTypescript = (projectRoot = ".") => {
   return (0, import_fs7.existsSync)(`${projectRoot}/tsconfig.json`);
 };
+var eslintRcExts = ["js", "cjs", "yaml", "yml", "json"];
+var usesEslint = (ctx) => {
+  for (const ext of eslintRcExts) {
+    const eslintRcFilename = `.eslintrc.${ext}`;
+    if ((0, import_fs7.existsSync)(`${ctx.project.path}/${eslintRcFilename}`)) {
+      return {
+        used: true,
+        configType: eslintRcFilename
+      };
+    }
+  }
+  if ((0, import_fs7.existsSync)(`${ctx.project.path}/eslint.config.js`)) {
+    return {
+      used: true,
+      configType: "eslint.config.js"
+    };
+  }
+  try {
+    const pkgJson = readJSON(`${ctx.project.path}/package.json`);
+    if (pkgJson.eslintConfig) {
+      return {
+        used: true,
+        configType: "package.json"
+      };
+    }
+  } catch {
+  }
+  return { used: false };
+};
 var compatDateFlag = () => {
   const date = /* @__PURE__ */ new Date();
   return `--compatibility-date=${date.toISOString().slice(0, 10)}`;
@@ -60319,14 +60373,50 @@ var configure3 = async (ctx) => {
   );
   writeFile2(handlerPath, handlerFile);
   updateStatus("Created an example API route handler");
+  const installEslintPlugin = await shouldInstallNextOnPagesEslintPlugin(ctx);
+  if (installEslintPlugin) {
+    await writeEslintrc(ctx);
+  }
   process.chdir(projectName);
-  const packages = ["@cloudflare/next-on-pages@1", "vercel"];
+  const packages = [
+    "@cloudflare/next-on-pages@1",
+    "vercel",
+    ...installEslintPlugin ? ["eslint-plugin-next-on-pages"] : []
+  ];
   await installPackages(packages, {
     dev: true,
     startText: "Adding the Cloudflare Pages adapter",
     doneText: `${brandColor(`installed`)} ${dim(packages.join(", "))}`
   });
 };
+var shouldInstallNextOnPagesEslintPlugin = async (ctx) => {
+  const eslintUsage = usesEslint(ctx);
+  if (!eslintUsage.used)
+    return false;
+  if (eslintUsage.configType !== ".eslintrc.json") {
+    warn(
+      `Expected .eslintrc.json from Next.js scaffolding but found ${eslintUsage.configType} instead`
+    );
+    return false;
+  }
+  return await processArgument(ctx.args, "eslint-plugin", {
+    type: "confirm",
+    question: "Do you want to use the next-on-pages eslint-plugin?",
+    label: "eslint-plugin",
+    defaultValue: true
+  });
+};
+var writeEslintrc = async (ctx) => {
+  const eslintConfig = readJSON(`${ctx.project.name}/.eslintrc.json`);
+  eslintConfig.plugins ??= [];
+  eslintConfig.plugins.push("eslint-plugin-next-on-pages");
+  if (typeof eslintConfig.extends === "string") {
+    eslintConfig.extends = [eslintConfig.extends];
+  }
+  eslintConfig.extends ??= [];
+  eslintConfig.extends.push("plugin:eslint-plugin-next-on-pages/recommended");
+  writeJSON(`${ctx.project.name}/.eslintrc.json`, eslintConfig, 2);
+};
 var config6 = {
   generate: generate6,
   configure: configure3,
@@ -60345,7 +60435,7 @@ var config6 = {
     "--src-dir",
     "--app",
     "--import-alias",
-    '"@/*"'
+    "@/*"
   ],
   compatibilityFlags: ["nodejs_compat"]
 };
@@ -60363,6 +60453,7 @@ var generate7 = async (ctx) => {
 };
 var configure4 = async (ctx) => {
   process.chdir(ctx.project.path);
+  writeFile2("./.node-version", "17");
   await npmInstall();
 };
 var config7 = {
@@ -60370,8 +60461,9 @@ var config7 = {
   configure: configure4,
   displayName: "Nuxt",
   packageScripts: {
+    build: (cmd) => `NITRO_PRESET=cloudflare-pages ${cmd}`,
     "pages:dev": `wrangler pages dev ${compatDateFlag()} --proxy 3000 -- npm run dev`,
-    "pages:deploy": `NODE_VERSION=17 npm run generate && wrangler pages deploy ./dist`
+    "pages:deploy": "npm run build && wrangler pages deploy ./dist"
   }
 };
 var nuxt_default = config7;
@@ -60486,7 +60578,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 deploy ./dist/public`
+    "pages:deploy": `${npm9} run build && wrangler pages deploy ./dist/public`
   }
 };
 var solid_default = config11;
@@ -60721,11 +60813,29 @@ var updatePackageScripts = async (ctx) => {
   const { packageScripts } = ctx.framework?.config ?? {};
   if (packageScripts) {
     const s = spinner();
-    s.start(`Adding command scripts`, `for development and deployment`);
+    const updatingScripts = Object.entries(packageScripts).filter(
+      ([_3, cmdOrUpdater]) => typeof cmdOrUpdater === "function"
+    ).length > 0;
+    s.start(
+      `${updatingScripts ? "Updating" : "Adding"} command scripts`,
+      "for development and deployment"
+    );
     const pkgJsonPath = (0, import_path8.resolve)("package.json");
     const pkgConfig = readJSON(pkgJsonPath);
-    Object.entries(packageScripts).forEach(([target, command2]) => {
-      pkgConfig.scripts[target] = command2;
+    Object.entries(packageScripts).forEach(([target, cmdOrUpdater]) => {
+      if (typeof cmdOrUpdater === "string") {
+        const command2 = cmdOrUpdater;
+        pkgConfig.scripts[target] = command2;
+      } else {
+        const existingCommand = pkgConfig.scripts[target];
+        if (!existingCommand) {
+          throw new Error(
+            `Could not find ${target} script to update during ${ctx.framework} setup`
+          );
+        }
+        const updater = cmdOrUpdater;
+        pkgConfig.scripts[target] = updater(existingCommand);
+      }
     });
     writeFile2(pkgJsonPath, JSON.stringify(pkgConfig, null, 2));
     s.stop(`${brandColor("added")} ${dim("commands to `package.json`")}`);
@@ -60741,7 +60851,8 @@ var createProject = async (ctx) => {
   const CLOUDFLARE_ACCOUNT_ID = ctx.account.id;
   const compatFlags = ctx.framework?.config.compatibilityFlags?.join(" ");
   const compatFlagsArg = compatFlags ? `--compatibility-flags ${compatFlags}` : "";
-  const cmd = `${npx5} wrangler pages project create ${ctx.project.name} --production-branch main ${compatFlagsArg}`;
+  const productionBranch = await getProductionBranch(ctx.project.path);
+  const cmd = `${npx5} wrangler pages project create ${ctx.project.name} --production-branch ${productionBranch} ${compatFlagsArg}`;
   try {
     await retry(
       CREATE_PROJECT_RETRIES,
@@ -60750,7 +60861,7 @@ var createProject = async (ctx) => {
         cwd: ctx.project.path,
         env: { CLOUDFLARE_ACCOUNT_ID },
         startText: "Creating Pages project",
-        doneText: `${brandColor("created")} ${dim(`via \`${cmd}\``)}`
+        doneText: `${brandColor("created")} ${dim(`via \`${cmd.trim()}\``)}`
       })
     );
   } catch (error) {
@@ -60784,14 +60895,12 @@ var runWorkersGenerator = async (args) => {
   await printSummary(ctx);
 };
 async function getTemplate(ctx) {
-  if (ctx.args.ts === void 0) {
-    ctx.args.ts = await processArgument(ctx.args, "ts", {
-      type: "confirm",
-      question: "Do you want to use TypeScript?",
-      label: "typescript",
-      defaultValue: C3_DEFAULTS.ts
-    });
-  }
+  ctx.args.ts = await processArgument(ctx.args, "ts", {
+    type: "confirm",
+    question: "Do you want to use TypeScript?",
+    label: "typescript",
+    defaultValue: C3_DEFAULTS.ts
+  });
   const preexisting = ctx.args.type === "pre-existing";
   const template = preexisting ? "hello-world" : ctx.args.type;
   const path3 = (0, import_path9.resolve)(

package/package.json

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

package/templates/common/js/package.json

@@ -7,7 +7,6 @@
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230419.0",
 		"itty-router": "^3.0.12",
 		"wrangler": "^3.0.0"
 	}

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

@@ -7,8 +7,6 @@
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230419.0",
-		"typescript": "^5.0.4",
 		"wrangler": "^3.0.0"
 	}
 }

package/templates/queues/js/package.json

@@ -7,8 +7,6 @@
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230419.0",
-		"typescript": "^5.0.4",
 		"wrangler": "^3.0.0"
 	}
 }

package/templates/scheduled/js/package.json

@@ -7,8 +7,6 @@
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230419.0",
-		"typescript": "^5.0.4",
 		"wrangler": "^3.0.0"
 	}
 }