create-astro 5.0.2 → 5.0.4

package/dist/actions/dependencies.d.ts

@@ -1,2 +1,2 @@
 import type { Context } from './context.js';
-export declare function dependencies(ctx: Pick<Context, 'install' | 'yes' | 'prompt' | 'packageManager' | 'cwd' | 'dryRun' | 'tasks' | 'add'>): Promise<void>;
+export declare function dependencies(ctx: Pick<Context, 'install' | 'yes' | 'prompt' | 'packageManager' | 'cwd' | 'dryRun' | 'tasks' | 'add' | 'template'>): Promise<void>;

package/dist/actions/template.d.ts

@@ -15,3 +15,4 @@ export declare function removeTemplateMarkerSections(content: string): string;
 export declare function processTemplateReadme(content: string, packageManager: string): string;
 export declare function template(ctx: Pick<Context, 'template' | 'prompt' | 'yes' | 'dryRun' | 'exit' | 'tasks'>): Promise<void>;
 export declare function getTemplateTarget(tmpl: string, ref?: string): string;
+export declare function isThirdPartyTemplate(tmpl: string): boolean;

package/dist/index.js

@@ -291,17 +291,22 @@ import { spawn } from "node:child_process";
 import { text as textFromStream } from "node:stream/consumers";
 var WINDOWS_CMD_SHIMS = /* @__PURE__ */ new Set(["npm", "npx", "pnpm", "pnpx", "yarn", "yarnpkg", "bun", "bunx"]);
 var text = (stream) => stream ? textFromStream(stream).then((t) => t.trimEnd()) : "";
-function resolveCommand(command) {
-  if (process.platform !== "win32") return command;
-  if (command.includes("/") || command.includes("\\") || command.includes(".")) return command;
-  return WINDOWS_CMD_SHIMS.has(command.toLowerCase()) ? `${command}.cmd` : command;
+function resolveCommand(command, flags) {
+  if (process.platform !== "win32") return [command, flags];
+  if (command.includes("/") || command.includes("\\") || command.includes("."))
+    return [command, flags];
+  if (WINDOWS_CMD_SHIMS.has(command.toLowerCase())) {
+    return ["cmd.exe", ["/d", "/s", "/c", `${command}.cmd`, ...flags]];
+  }
+  return [command, flags];
 }
 async function shell(command, flags, opts = {}) {
   let child;
   let stdout2 = "";
   let stderr = "";
   try {
-    child = spawn(resolveCommand(command), flags, {
+    const [resolvedCommand, resolvedFlags] = resolveCommand(command, flags);
+    child = spawn(resolvedCommand, resolvedFlags, {
       cwd: opts.cwd,
       stdio: opts.stdio,
       timeout: opts.timeout
@@ -311,15 +316,16 @@ async function shell(command, flags, opts = {}) {
       child.once("close", () => resolve());
     });
     [stdout2, stderr] = await Promise.all([text(child.stdout), text(child.stderr), done]);
-  } catch {
-    throw { stdout: stdout2, stderr, exitCode: 1 };
+  } catch (e) {
+    const message = e instanceof Error ? e.message : stderr || "Unknown error";
+    throw new Error(message);
   }
   const { exitCode } = child;
   if (exitCode === null) {
     throw new Error("Timeout");
   }
   if (exitCode !== 0) {
-    throw new Error(stderr);
+    throw new Error(stderr || `Process exited with code ${exitCode}`);
   }
   return { stdout: stdout2, stderr, exitCode };
 }
@@ -459,7 +465,7 @@ function printHelp({
   if (headline) {
     message.push(
       linebreak(),
-      `${title(commandName)} ${color.green(`v${"5.0.2"}`)} ${headline}`
+      `${title(commandName)} ${color.green(`v${"5.0.4"}`)} ${headline}`
     );
   }
   if (usage) {
@@ -558,7 +564,7 @@ async function getContext(argv) {
       packageManager,
       "astro",
       getPackageTag(packageSpecifier),
-      "6.0.6"
+      "6.1.1"
     ),
     skipHouston,
     fancy,
@@ -589,8 +595,8 @@ function detectPackageManager() {
 }
 
 // src/actions/dependencies.ts
-import fs from "node:fs";
-import path from "node:path";
+import fs2 from "node:fs";
+import path2 from "node:path";
 
 // ../internal-helpers/dist/cli.js
 var NPM_PACKAGE_NAME_REGEX = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
@@ -606,7 +612,154 @@ function assertValidPackageName(packageName) {
 }
 
 // src/actions/dependencies.ts
+import { color as color3 } from "@astrojs/cli-kit";
+
+// src/actions/template.ts
+import fs from "node:fs";
+import path from "node:path";
 import { color as color2 } from "@astrojs/cli-kit";
+import { downloadTemplate } from "@bluwy/giget-core";
+function removeTemplateMarkerSections(content) {
+  const pattern = /<!--\s*ASTRO:REMOVE:START\s*-->[\s\S]*?<!--\s*ASTRO:REMOVE:END\s*-->/gi;
+  let result = content.replace(pattern, "");
+  result = result.replace(/\n{3,}/g, "\n\n");
+  return result;
+}
+function processTemplateReadme(content, packageManager) {
+  let processed = removeTemplateMarkerSections(content);
+  if (packageManager !== "npm") {
+    processed = processed.replace(/\bnpm run\b/g, packageManager).replace(/\bnpm\b/g, packageManager);
+  }
+  return processed;
+}
+async function template(ctx) {
+  if (!ctx.template && ctx.yes) ctx.template = "basics";
+  if (ctx.template) {
+    await info("tmpl", `Using ${color2.reset(ctx.template)}${color2.dim(" as project template")}`);
+  } else {
+    const { template: tmpl } = await ctx.prompt({
+      name: "template",
+      type: "select",
+      label: title("tmpl"),
+      message: "How would you like to start your new project?",
+      initial: "basics",
+      choices: [
+        { value: "basics", label: "A basic, helpful starter project", hint: "(recommended)" },
+        { value: "blog", label: "Use blog template" },
+        { value: "starlight", label: "Use docs (Starlight) template" },
+        { value: "minimal", label: "Use minimal (empty) template" }
+      ]
+    });
+    ctx.template = tmpl;
+  }
+  if (ctx.dryRun) {
+    await info("--dry-run", `Skipping template copying`);
+  } else if (ctx.template) {
+    ctx.tasks.push({
+      pending: "Template",
+      start: "Template copying...",
+      end: "Template copied",
+      while: () => copyTemplate(ctx.template, ctx).catch((e) => {
+        if (e instanceof Error) {
+          error("error", e.message);
+          process.exit(1);
+        } else {
+          error("error", "Unable to clone template.");
+          process.exit(1);
+        }
+      })
+    });
+  } else {
+    ctx.exit(1);
+  }
+}
+var FILES_TO_REMOVE = ["CHANGELOG.md", ".codesandbox"];
+var FILES_TO_UPDATE = {
+  "package.json": (file, overrides) => fs.promises.readFile(file, "utf-8").then((value) => {
+    const indent = /(^\s+)/m.exec(value)?.[1] ?? "	";
+    return fs.promises.writeFile(
+      file,
+      JSON.stringify(
+        Object.assign(JSON.parse(value), Object.assign(overrides, { private: void 0 })),
+        null,
+        indent
+      ),
+      "utf-8"
+    );
+  })
+};
+function getTemplateTarget(tmpl, ref = "latest") {
+  if (tmpl === "starlight" || tmpl.startsWith("starlight/")) {
+    const [, starter = "basics"] = tmpl.split("/");
+    return `github:withastro/starlight/examples/${starter}`;
+  }
+  if (isThirdPartyTemplate(tmpl)) return tmpl;
+  if (ref === "latest") {
+    return `github:withastro/astro#examples/${tmpl}`;
+  } else {
+    return `github:withastro/astro/examples/${tmpl}#${ref}`;
+  }
+}
+function isThirdPartyTemplate(tmpl) {
+  if (tmpl === "starlight" || tmpl.startsWith("starlight/")) return false;
+  return tmpl.includes("/");
+}
+async function copyTemplate(tmpl, ctx) {
+  const templateTarget = getTemplateTarget(tmpl, ctx.ref);
+  if (!ctx.dryRun) {
+    try {
+      await downloadTemplate(templateTarget, {
+        force: true,
+        cwd: ctx.cwd,
+        dir: "."
+      });
+      const readmePath = path.resolve(ctx.cwd, "README.md");
+      if (fs.existsSync(readmePath)) {
+        const readme = fs.readFileSync(readmePath, "utf8");
+        const processedReadme = processTemplateReadme(readme, ctx.packageManager);
+        fs.writeFileSync(readmePath, processedReadme);
+      }
+    } catch (err) {
+      if (ctx.cwd !== "." && ctx.cwd !== "./" && !ctx.cwd.startsWith("../")) {
+        try {
+          fs.rmdirSync(ctx.cwd);
+        } catch (_) {
+        }
+      }
+      if (err.message?.includes("404")) {
+        throw new Error(`Template ${color2.reset(tmpl)} ${color2.dim("does not exist!")}`);
+      }
+      if (err.message) {
+        error("error", err.message);
+      }
+      try {
+        if ("cause" in err) {
+          error("error", err.cause);
+          if ("cause" in err.cause) {
+            error("error", err.cause?.cause);
+          }
+        }
+      } catch {
+      }
+      throw new Error(`Unable to download template ${color2.reset(tmpl)}`);
+    }
+    const removeFiles = FILES_TO_REMOVE.map(async (file) => {
+      const fileLoc = path.resolve(path.join(ctx.cwd, file));
+      if (fs.existsSync(fileLoc)) {
+        return fs.promises.rm(fileLoc, { recursive: true });
+      }
+    });
+    const updateFiles = Object.entries(FILES_TO_UPDATE).map(async ([file, update]) => {
+      const fileLoc = path.resolve(path.join(ctx.cwd, file));
+      if (fs.existsSync(fileLoc)) {
+        return update(fileLoc, { name: ctx.projectName });
+      }
+    });
+    await Promise.all([...removeFiles, ...updateFiles]);
+  }
+}
+
+// src/actions/dependencies.ts
 async function dependencies(ctx) {
   let deps = ctx.install ?? ctx.yes;
   if (deps === void 0) {
@@ -626,6 +779,12 @@ async function dependencies(ctx) {
       assertValidPackageName(addValue);
     }
   }
+  if (deps && ctx.template && isThirdPartyTemplate(ctx.template)) {
+    await info(
+      "warn",
+      `Third-party template detected. Installing dependencies may run lifecycle scripts. Continue only if you trust this template. Use ${color3.bold("--no-install")} to skip automatic install.`
+    );
+  }
   if (ctx.dryRun) {
     await info(
       "--dry-run",
@@ -640,7 +799,7 @@ async function dependencies(ctx) {
         error("error", e);
         error(
           "error",
-          `Dependencies failed to install, please run ${color2.bold(
+          `Dependencies failed to install, please run ${color3.bold(
             ctx.packageManager + " install"
           )} to install them manually after setup.`
         );
@@ -657,7 +816,7 @@ async function dependencies(ctx) {
           error("error", e);
           error(
             "error",
-            `Failed to add integrations, please run ${color2.bold(
+            `Failed to add integrations, please run ${color3.bold(
               `astro add ${add.join(" ")}`
             )} to install them manually after setup.`
           );
@@ -687,17 +846,17 @@ async function install({ packageManager, cwd }) {
   return shell(packageManager, ["install"], { cwd, timeout: 9e4, stdio: "ignore" });
 }
 async function ensureYarnLock({ cwd }) {
-  const yarnLock = path.join(cwd, "yarn.lock");
-  if (fs.existsSync(yarnLock)) return;
-  return fs.promises.writeFile(yarnLock, "", { encoding: "utf-8" });
+  const yarnLock = path2.join(cwd, "yarn.lock");
+  if (fs2.existsSync(yarnLock)) return;
+  return fs2.promises.writeFile(yarnLock, "", { encoding: "utf-8" });
 }
 
 // src/actions/git.ts
-import fs2 from "node:fs";
-import path2 from "node:path";
-import { color as color3 } from "@astrojs/cli-kit";
+import fs3 from "node:fs";
+import path3 from "node:path";
+import { color as color4 } from "@astrojs/cli-kit";
 async function git(ctx) {
-  if (fs2.existsSync(path2.join(ctx.cwd, ".git"))) {
+  if (fs3.existsSync(path3.join(ctx.cwd, ".git"))) {
     await info("Nice!", `Git has already been initialized`);
     return;
   }
@@ -727,7 +886,7 @@ async function git(ctx) {
   } else {
     await info(
       ctx.yes === false ? "git [skip]" : "Sounds good!",
-      `You can always run ${color3.reset("git init")}${color3.dim(" manually.")}`
+      `You can always run ${color4.reset("git init")}${color4.dim(" manually.")}`
     );
   }
 }
@@ -774,7 +933,7 @@ function help() {
 }
 
 // src/actions/intro.ts
-import { color as color4, label as label2 } from "@astrojs/cli-kit";
+import { color as color5, label as label2 } from "@astrojs/cli-kit";
 async function intro(ctx) {
   banner();
   if (!ctx.skipHouston) {
@@ -784,9 +943,9 @@ async function intro(ctx) {
         [
           "Welcome",
           "to",
-          label2("astro", color4.bgGreen, color4.black),
+          label2("astro", color5.bgGreen, color5.black),
           Promise.resolve(ctx.version).then(
-            (version) => (version ? color4.green(`v${version}`) : "") + ","
+            (version) => (version ? color5.green(`v${version}`) : "") + ","
           ),
           Promise.resolve(ctx.username).then((username) => `${username}!`)
         ],
@@ -798,9 +957,9 @@ async function intro(ctx) {
 }
 
 // src/actions/next-steps.ts
-import path3 from "node:path";
+import path4 from "node:path";
 async function next(ctx) {
-  let projectDir = path3.relative(process.cwd(), ctx.cwd);
+  let projectDir = path4.relative(process.cwd(), ctx.cwd);
   const commandMap = {
     npm: "npm run dev",
     bun: "bun run dev",
@@ -816,11 +975,11 @@ async function next(ctx) {
 }
 
 // src/actions/project-name.ts
-import path4 from "node:path";
-import { color as color5, generateProjectName } from "@astrojs/cli-kit";
+import path5 from "node:path";
+import { color as color6, generateProjectName } from "@astrojs/cli-kit";
 
 // src/actions/shared.ts
-import fs3 from "node:fs";
+import fs4 from "node:fs";
 var VALID_PROJECT_DIRECTORY_SAFE_LIST = [
   ".DS_Store",
   ".git",
@@ -846,10 +1005,10 @@ var VALID_PROJECT_DIRECTORY_SAFE_LIST = [
   /^yarn-error\.log/
 ];
 function isEmpty(dirPath) {
-  if (!fs3.existsSync(dirPath)) {
+  if (!fs4.existsSync(dirPath)) {
     return true;
   }
-  const conflicts = fs3.readdirSync(dirPath).filter((content) => {
+  const conflicts = fs4.readdirSync(dirPath).filter((content) => {
     return !VALID_PROJECT_DIRECTORY_SAFE_LIST.some((safeContent) => {
       return typeof safeContent === "string" ? content === safeContent : safeContent.test(content);
     });
@@ -869,7 +1028,7 @@ async function projectName(ctx) {
   await checkCwd(ctx.cwd);
   if (!ctx.cwd || !isEmpty(ctx.cwd)) {
     if (ctx.cwd && !isEmpty(ctx.cwd)) {
-      await info("Hmm...", `${color5.reset(`"${ctx.cwd}"`)}${color5.dim(` is not empty!`)}`);
+      await info("Hmm...", `${color6.reset(`"${ctx.cwd}"`)}${color6.dim(` is not empty!`)}`);
     }
     if (ctx.yes) {
       ctx.projectName = generateProjectName();
@@ -901,7 +1060,7 @@ async function projectName(ctx) {
   } else {
     let name = ctx.cwd;
     if (name === "." || name === "./") {
-      const parts = process.cwd().split(path4.sep);
+      const parts = process.cwd().split(path5.sep);
       name = parts[parts.length - 1];
     } else if (name.startsWith("./") || name.startsWith("../")) {
       const parts = name.split("/");
@@ -917,153 +1076,11 @@ async function checkCwd(cwd) {
   const empty = cwd && isEmpty(cwd);
   if (empty) {
     log("");
-    await info("dir", `Using ${color5.reset(cwd)}${color5.dim(" as project directory")}`);
+    await info("dir", `Using ${color6.reset(cwd)}${color6.dim(" as project directory")}`);
   }
   return empty;
 }
 
-// src/actions/template.ts
-import fs4 from "node:fs";
-import path5 from "node:path";
-import { color as color6 } from "@astrojs/cli-kit";
-import { downloadTemplate } from "@bluwy/giget-core";
-function removeTemplateMarkerSections(content) {
-  const pattern = /<!--\s*ASTRO:REMOVE:START\s*-->[\s\S]*?<!--\s*ASTRO:REMOVE:END\s*-->/gi;
-  let result = content.replace(pattern, "");
-  result = result.replace(/\n{3,}/g, "\n\n");
-  return result;
-}
-function processTemplateReadme(content, packageManager) {
-  let processed = removeTemplateMarkerSections(content);
-  if (packageManager !== "npm") {
-    processed = processed.replace(/\bnpm run\b/g, packageManager).replace(/\bnpm\b/g, packageManager);
-  }
-  return processed;
-}
-async function template(ctx) {
-  if (!ctx.template && ctx.yes) ctx.template = "basics";
-  if (ctx.template) {
-    await info("tmpl", `Using ${color6.reset(ctx.template)}${color6.dim(" as project template")}`);
-  } else {
-    const { template: tmpl } = await ctx.prompt({
-      name: "template",
-      type: "select",
-      label: title("tmpl"),
-      message: "How would you like to start your new project?",
-      initial: "basics",
-      choices: [
-        { value: "basics", label: "A basic, helpful starter project", hint: "(recommended)" },
-        { value: "blog", label: "Use blog template" },
-        { value: "starlight", label: "Use docs (Starlight) template" },
-        { value: "minimal", label: "Use minimal (empty) template" }
-      ]
-    });
-    ctx.template = tmpl;
-  }
-  if (ctx.dryRun) {
-    await info("--dry-run", `Skipping template copying`);
-  } else if (ctx.template) {
-    ctx.tasks.push({
-      pending: "Template",
-      start: "Template copying...",
-      end: "Template copied",
-      while: () => copyTemplate(ctx.template, ctx).catch((e) => {
-        if (e instanceof Error) {
-          error("error", e.message);
-          process.exit(1);
-        } else {
-          error("error", "Unable to clone template.");
-          process.exit(1);
-        }
-      })
-    });
-  } else {
-    ctx.exit(1);
-  }
-}
-var FILES_TO_REMOVE = ["CHANGELOG.md", ".codesandbox"];
-var FILES_TO_UPDATE = {
-  "package.json": (file, overrides) => fs4.promises.readFile(file, "utf-8").then((value) => {
-    const indent = /(^\s+)/m.exec(value)?.[1] ?? "	";
-    return fs4.promises.writeFile(
-      file,
-      JSON.stringify(
-        Object.assign(JSON.parse(value), Object.assign(overrides, { private: void 0 })),
-        null,
-        indent
-      ),
-      "utf-8"
-    );
-  })
-};
-function getTemplateTarget(tmpl, ref = "latest") {
-  if (tmpl.startsWith("starlight")) {
-    const [, starter = "basics"] = tmpl.split("/");
-    return `github:withastro/starlight/examples/${starter}`;
-  }
-  const isThirdParty = tmpl.includes("/");
-  if (isThirdParty) return tmpl;
-  if (ref === "latest") {
-    return `github:withastro/astro#examples/${tmpl}`;
-  } else {
-    return `github:withastro/astro/examples/${tmpl}#${ref}`;
-  }
-}
-async function copyTemplate(tmpl, ctx) {
-  const templateTarget = getTemplateTarget(tmpl, ctx.ref);
-  if (!ctx.dryRun) {
-    try {
-      await downloadTemplate(templateTarget, {
-        force: true,
-        cwd: ctx.cwd,
-        dir: "."
-      });
-      const readmePath = path5.resolve(ctx.cwd, "README.md");
-      if (fs4.existsSync(readmePath)) {
-        const readme = fs4.readFileSync(readmePath, "utf8");
-        const processedReadme = processTemplateReadme(readme, ctx.packageManager);
-        fs4.writeFileSync(readmePath, processedReadme);
-      }
-    } catch (err) {
-      if (ctx.cwd !== "." && ctx.cwd !== "./" && !ctx.cwd.startsWith("../")) {
-        try {
-          fs4.rmdirSync(ctx.cwd);
-        } catch (_) {
-        }
-      }
-      if (err.message?.includes("404")) {
-        throw new Error(`Template ${color6.reset(tmpl)} ${color6.dim("does not exist!")}`);
-      }
-      if (err.message) {
-        error("error", err.message);
-      }
-      try {
-        if ("cause" in err) {
-          error("error", err.cause);
-          if ("cause" in err.cause) {
-            error("error", err.cause?.cause);
-          }
-        }
-      } catch {
-      }
-      throw new Error(`Unable to download template ${color6.reset(tmpl)}`);
-    }
-    const removeFiles = FILES_TO_REMOVE.map(async (file) => {
-      const fileLoc = path5.resolve(path5.join(ctx.cwd, file));
-      if (fs4.existsSync(fileLoc)) {
-        return fs4.promises.rm(fileLoc, { recursive: true });
-      }
-    });
-    const updateFiles = Object.entries(FILES_TO_UPDATE).map(async ([file, update]) => {
-      const fileLoc = path5.resolve(path5.join(ctx.cwd, file));
-      if (fs4.existsSync(fileLoc)) {
-        return update(fileLoc, { name: ctx.projectName });
-      }
-    });
-    await Promise.all([...removeFiles, ...updateFiles]);
-  }
-}
-
 // src/actions/verify.ts
 import dns from "node:dns/promises";
 import { color as color7 } from "@astrojs/cli-kit";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "5.0.2",
+  "version": "5.0.4",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -30,8 +30,8 @@
   },
   "devDependencies": {
     "arg": "^5.0.2",
-    "@astrojs/internal-helpers": "0.8.0",
-    "astro-scripts": "0.0.14"
+    "astro-scripts": "0.0.14",
+    "@astrojs/internal-helpers": "0.8.0"
   },
   "engines": {
     "node": ">=22.12.0"