create-astro 4.0.0-beta.0 → 4.0.0-rc.2

package/dist/index.js

@@ -177,7 +177,6 @@ import detectPackageManager2 from "which-pm-runs";
 // src/messages.ts
 import { color, say as houston, label, spinner as load } from "@astrojs/cli-kit";
 import { align, sleep } from "@astrojs/cli-kit/utils";
-import { execa } from "execa";
 import fetch from "node-fetch-native";
 import { exec } from "node:child_process";
 
@@ -201,10 +200,43 @@ function stripAnsi(string) {
 
 // src/messages.ts
 import detectPackageManager from "which-pm-runs";
+
+// src/shell.ts
+import { spawn } from "node:child_process";
+import { text as textFromStream } from "node:stream/consumers";
+var text = (stream) => stream ? textFromStream(stream).then((t) => t.trimEnd()) : "";
+async function shell(command, flags, opts = {}) {
+  let child;
+  let stdout2 = "";
+  let stderr = "";
+  try {
+    child = spawn(command, flags, {
+      cwd: opts.cwd,
+      shell: true,
+      stdio: opts.stdio,
+      timeout: opts.timeout
+    });
+    const done = new Promise((resolve) => child.on("close", resolve));
+    [stdout2, stderr] = await Promise.all([text(child.stdout), text(child.stderr)]);
+    await done;
+  } catch (e) {
+    throw { stdout: stdout2, stderr, exitCode: 1 };
+  }
+  const { exitCode } = child;
+  if (exitCode === null) {
+    throw new Error("Timeout");
+  }
+  if (exitCode !== 0) {
+    throw new Error(stderr);
+  }
+  return { stdout: stdout2, stderr, exitCode };
+}
+
+// src/messages.ts
 async function getRegistry() {
   const packageManager = detectPackageManager()?.name || "npm";
   try {
-    const { stdout: stdout2 } = await execa(packageManager, ["config", "get", "registry"]);
+    const { stdout: stdout2 } = await shell(packageManager, ["config", "get", "registry"]);
     return stdout2?.trim()?.replace(/\/$/, "") || "https://registry.npmjs.org";
   } catch (e) {
     return "https://registry.npmjs.org";
@@ -220,7 +252,7 @@ async function say(messages, { clear = false, hat = "" } = {}) {
 async function spinner(args) {
   await load(args, { stdout });
 }
-var title = (text) => align(label(text), "end", 7) + " ";
+var title = (text2) => align(label(text2), "end", 7) + " ";
 var welcome = [
   `Let's claim your corner of the internet.`,
   `I'll be your assistant today.`,
@@ -260,7 +292,8 @@ var getVersion = () => new Promise(async (resolve) => {
     return resolve(v);
   let registry = await getRegistry();
   const { version } = await fetch(`${registry}/astro/latest`, { redirect: "follow" }).then(
-    (res) => res.json()
+    (res) => res.json(),
+    () => ({ version: "" })
   );
   v = version;
   resolve(version);
@@ -268,25 +301,25 @@ var getVersion = () => new Promise(async (resolve) => {
 var log = (message) => stdout.write(message + "\n");
 var banner = async (version) => log(
   `
-${label("astro", color.bgGreen, color.black)}  ${color.green(
-    color.bold(`v${version}`)
-  )} ${color.bold("Launch sequence initiated.")}`
+${label("astro", color.bgGreen, color.black)}${version ? "  " + color.green(color.bold(`v${version}`)) : ""} ${color.bold("Launch sequence initiated.")}`
 );
-var info = async (prefix, text) => {
+var bannerAbort = () => log(`
+${label("astro", color.bgRed)} ${color.bold("Launch sequence aborted.")}`);
+var info = async (prefix, text2) => {
   await sleep(100);
   if (stdout.columns < 80) {
     log(`${" ".repeat(5)} ${color.cyan("\u25FC")}  ${color.cyan(prefix)}`);
-    log(`${" ".repeat(9)}${color.dim(text)}`);
+    log(`${" ".repeat(9)}${color.dim(text2)}`);
   } else {
-    log(`${" ".repeat(5)} ${color.cyan("\u25FC")}  ${color.cyan(prefix)} ${color.dim(text)}`);
+    log(`${" ".repeat(5)} ${color.cyan("\u25FC")}  ${color.cyan(prefix)} ${color.dim(text2)}`);
   }
 };
-var error = async (prefix, text) => {
+var error = async (prefix, text2) => {
   if (stdout.columns < 80) {
     log(`${" ".repeat(5)} ${color.red("\u25B2")}  ${color.red(prefix)}`);
-    log(`${" ".repeat(9)}${color.dim(text)}`);
+    log(`${" ".repeat(9)}${color.dim(text2)}`);
   } else {
-    log(`${" ".repeat(5)} ${color.red("\u25B2")}  ${color.red(prefix)} ${color.dim(text)}`);
+    log(`${" ".repeat(5)} ${color.red("\u25B2")}  ${color.red(prefix)} ${color.dim(text2)}`);
   }
 };
 var typescriptByDefault = async () => {
@@ -355,7 +388,7 @@ function printHelp({
   if (headline) {
     message.push(
       linebreak(),
-      `${title(commandName)} ${color.green(`v${"4.0.0-beta.0"}`)} ${headline}`
+      `${title(commandName)} ${color.green(`v${"4.0.0-rc.2"}`)} ${headline}`
     );
   }
   if (usage) {
@@ -455,7 +488,8 @@ async function getContext(argv) {
 
 // src/actions/dependencies.ts
 import { color as color2 } from "@astrojs/cli-kit";
-import { execa as execa2 } from "execa";
+import fs from "node:fs";
+import path from "node:path";
 async function dependencies(ctx) {
   let deps = ctx.install ?? ctx.yes;
   if (deps === void 0) {
@@ -495,21 +529,23 @@ async function dependencies(ctx) {
   }
 }
 async function install({ pkgManager, cwd }) {
-  const installExec = execa2(pkgManager, ["install"], { cwd });
-  return new Promise((resolve, reject) => {
-    setTimeout(() => reject(`Request timed out after one minute`), 6e4);
-    installExec.on("error", (e) => reject(e));
-    installExec.on("close", () => resolve());
-  });
+  if (pkgManager === "yarn")
+    await ensureYarnLock({ cwd });
+  return shell(pkgManager, ["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" });
 }
 
 // src/actions/git.ts
-import fs from "node:fs";
-import path from "node:path";
+import fs2 from "node:fs";
+import path2 from "node:path";
 import { color as color3 } from "@astrojs/cli-kit";
-import { execa as execa3 } from "execa";
 async function git(ctx) {
-  if (fs.existsSync(path.join(ctx.cwd, ".git"))) {
+  if (fs2.existsSync(path2.join(ctx.cwd, ".git"))) {
     await info("Nice!", `Git has already been initialized`);
     return;
   }
@@ -544,9 +580,9 @@ async function git(ctx) {
 }
 async function init({ cwd }) {
   try {
-    await execa3("git", ["init"], { cwd, stdio: "ignore" });
-    await execa3("git", ["add", "-A"], { cwd, stdio: "ignore" });
-    await execa3(
+    await shell("git", ["init"], { cwd, stdio: "ignore" });
+    await shell("git", ["add", "-A"], { cwd, stdio: "ignore" });
+    await shell(
       "git",
       [
         "commit",
@@ -594,7 +630,7 @@ async function intro(ctx) {
         "Welcome",
         "to",
         label2("astro", color4.bgGreen, color4.black),
-        color4.green(`v${ctx.version}`) + ",",
+        (ctx.version ? color4.green(`v${ctx.version}`) : "") + ",",
         `${ctx.username}!`
       ],
       random(welcome)
@@ -606,10 +642,10 @@ async function intro(ctx) {
 }
 
 // src/actions/next-steps.ts
-import path2 from "node:path";
+import path3 from "node:path";
 async function next(ctx) {
-  let projectDir = path2.relative(process.cwd(), ctx.cwd);
-  const devCmd = ctx.pkgManager === "npm" ? "npm run dev" : `${ctx.pkgManager} dev`;
+  let projectDir = path3.relative(process.cwd(), ctx.cwd);
+  const devCmd = ctx.pkgManager === "npm" ? "npm run dev" : ctx.pkgManager === "bun" ? "bun run dev" : `${ctx.pkgManager} dev`;
   await nextSteps({ projectDir, devCmd });
   if (!ctx.skipHouston) {
     await say(["Good luck out there, astronaut! \u{1F680}"]);
@@ -619,10 +655,10 @@ async function next(ctx) {
 
 // src/actions/project-name.ts
 import { color as color5, generateProjectName } from "@astrojs/cli-kit";
-import path3 from "node:path";
+import path4 from "node:path";
 
 // src/actions/shared.ts
-import fs2 from "node:fs";
+import fs3 from "node:fs";
 var VALID_PROJECT_DIRECTORY_SAFE_LIST = [
   ".DS_Store",
   ".git",
@@ -648,10 +684,10 @@ var VALID_PROJECT_DIRECTORY_SAFE_LIST = [
   /^yarn-error\.log/
 ];
 function isEmpty(dirPath) {
-  if (!fs2.existsSync(dirPath)) {
+  if (!fs3.existsSync(dirPath)) {
     return true;
   }
-  const conflicts = fs2.readdirSync(dirPath).filter((content) => {
+  const conflicts = fs3.readdirSync(dirPath).filter((content) => {
     return !VALID_PROJECT_DIRECTORY_SAFE_LIST.some((safeContent) => {
       return typeof safeContent === "string" ? content === safeContent : safeContent.test(content);
     });
@@ -694,7 +730,7 @@ async function projectName(ctx) {
   } else {
     let name = ctx.cwd;
     if (name === "." || name === "./") {
-      const parts = process.cwd().split(path3.sep);
+      const parts = process.cwd().split(path4.sep);
       name = parts[parts.length - 1];
     } else if (name.startsWith("./") || name.startsWith("../")) {
       const parts = name.split("/");
@@ -718,8 +754,8 @@ async function checkCwd(cwd) {
 // src/actions/template.ts
 import { color as color6 } from "@astrojs/cli-kit";
 import { downloadTemplate } from "giget";
-import fs3 from "node:fs";
-import path4 from "node:path";
+import fs4 from "node:fs";
+import path5 from "node:path";
 async function template(ctx) {
   if (!ctx.template) {
     const { template: tmpl } = await ctx.prompt({
@@ -760,9 +796,9 @@ async function template(ctx) {
 }
 var FILES_TO_REMOVE = ["sandbox.config.json", "CHANGELOG.md"];
 var FILES_TO_UPDATE = {
-  "package.json": (file, overrides) => fs3.promises.readFile(file, "utf-8").then((value) => {
+  "package.json": (file, overrides) => fs4.promises.readFile(file, "utf-8").then((value) => {
     const indent = /(^\s+)/m.exec(value)?.[1] ?? "	";
-    fs3.promises.writeFile(
+    fs4.promises.writeFile(
       file,
       JSON.stringify(
         Object.assign(JSON.parse(value), Object.assign(overrides, { private: void 0 })),
@@ -774,11 +810,13 @@ var FILES_TO_UPDATE = {
   })
 };
 function getTemplateTarget(tmpl, ref = "latest") {
+  if (tmpl.startsWith("starlight")) {
+    const [, starter = "basics"] = tmpl.split("/");
+    return `withastro/starlight/examples/${starter}`;
+  }
   const isThirdParty = tmpl.includes("/");
   if (isThirdParty)
     return tmpl;
-  if (tmpl === "starlight")
-    return `withastro/starlight/examples/basics`;
   return `github:withastro/astro/examples/${tmpl}#${ref}`;
 }
 async function copyTemplate(tmpl, ctx) {
@@ -792,25 +830,25 @@ async function copyTemplate(tmpl, ctx) {
         dir: "."
       });
     } catch (err) {
-      fs3.rmdirSync(ctx.cwd);
+      fs4.rmdirSync(ctx.cwd);
       if (err.message.includes("404")) {
         throw new Error(`Template ${color6.reset(tmpl)} ${color6.dim("does not exist!")}`);
       } else {
         throw new Error(err.message);
       }
     }
-    if (fs3.readdirSync(ctx.cwd).length === 0) {
+    if (fs4.readdirSync(ctx.cwd).length === 0) {
       throw new Error(`Template ${color6.reset(tmpl)} ${color6.dim("is empty!")}`);
     }
     const removeFiles = FILES_TO_REMOVE.map(async (file) => {
-      const fileLoc = path4.resolve(path4.join(ctx.cwd, file));
-      if (fs3.existsSync(fileLoc)) {
-        return fs3.promises.rm(fileLoc, { recursive: true });
+      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 = path4.resolve(path4.join(ctx.cwd, file));
-      if (fs3.existsSync(fileLoc)) {
+      const fileLoc = path5.resolve(path5.join(ctx.cwd, file));
+      if (fs4.existsSync(fileLoc)) {
         return update(fileLoc, { name: ctx.projectName });
       }
     });
@@ -820,9 +858,9 @@ async function copyTemplate(tmpl, ctx) {
 
 // src/actions/typescript.ts
 import { color as color7 } from "@astrojs/cli-kit";
-import fs4 from "node:fs";
+import fs5 from "node:fs";
 import { readFile } from "node:fs/promises";
-import path5 from "node:path";
+import path6 from "node:path";
 
 // ../../node_modules/.pnpm/strip-json-comments@5.0.0/node_modules/strip-json-comments/index.js
 var singleComment = Symbol("singleComment");
@@ -942,7 +980,7 @@ async function typescript(ctx) {
   } else {
     if (!["strict", "strictest", "relaxed", "default", "base"].includes(ts)) {
       if (!ctx.dryRun) {
-        fs4.rmSync(ctx.cwd, { recursive: true, force: true });
+        fs5.rmSync(ctx.cwd, { recursive: true, force: true });
       }
       error(
         "Error",
@@ -972,7 +1010,7 @@ async function typescript(ctx) {
   }
 }
 async function setupTypeScript(value, { cwd }) {
-  const templateTSConfigPath = path5.join(cwd, "tsconfig.json");
+  const templateTSConfigPath = path6.join(cwd, "tsconfig.json");
   try {
     const data = await readFile(templateTSConfigPath, { encoding: "utf-8" });
     const templateTSConfig = JSON.parse(stripJsonComments(data));
@@ -980,7 +1018,7 @@ async function setupTypeScript(value, { cwd }) {
       const result = Object.assign(templateTSConfig, {
         extends: `astro/tsconfigs/${value}`
       });
-      fs4.writeFileSync(templateTSConfigPath, JSON.stringify(result, null, 2));
+      fs5.writeFileSync(templateTSConfigPath, JSON.stringify(result, null, 2));
     } else {
       throw new Error(
         "There was an error applying the requested TypeScript settings. This could be because the template's tsconfig.json is malformed"
@@ -988,7 +1026,7 @@ async function setupTypeScript(value, { cwd }) {
     }
   } catch (err) {
     if (err && err.code === "ENOENT") {
-      fs4.writeFileSync(
+      fs5.writeFileSync(
         templateTSConfigPath,
         JSON.stringify({ extends: `astro/tsconfigs/${value}` }, null, 2)
       );
@@ -996,6 +1034,64 @@ async function setupTypeScript(value, { cwd }) {
   }
 }
 
+// src/actions/verify.ts
+import { color as color8 } from "@astrojs/cli-kit";
+import fetch2 from "node-fetch-native";
+import dns from "node:dns/promises";
+async function verify(ctx) {
+  if (!ctx.dryRun) {
+    const online = await isOnline();
+    if (!online) {
+      bannerAbort();
+      log("");
+      error("error", `Unable to connect to the internet.`);
+      ctx.exit(1);
+    }
+  }
+  if (ctx.template) {
+    const ok = await verifyTemplate(ctx.template, ctx.ref);
+    if (!ok) {
+      bannerAbort();
+      log("");
+      error("error", `Template ${color8.reset(ctx.template)} ${color8.dim("could not be found!")}`);
+      await info("check", "https://astro.build/examples");
+      ctx.exit(1);
+    }
+  }
+}
+function isOnline() {
+  return dns.lookup("github.com").then(
+    () => true,
+    () => false
+  );
+}
+async function verifyTemplate(tmpl, ref) {
+  const target = getTemplateTarget(tmpl, ref);
+  const { repo, subdir, ref: branch } = parseGitURI(target.replace("github:", ""));
+  const url = new URL(`/repos/${repo}/contents${subdir}?ref=${branch}`, "https://api.github.com/");
+  let res = await fetch2(url.toString(), {
+    headers: {
+      Accept: "application/vnd.github+json",
+      "X-GitHub-Api-Version": "2022-11-28"
+    }
+  });
+  if (res.status === 403) {
+    res = await fetch2(`https://github.com/${repo}/tree/${branch}${subdir}`);
+  }
+  return res.status === 200;
+}
+var GIT_RE = /^(?<repo>[\w.-]+\/[\w.-]+)(?<subdir>[^#]+)?(?<ref>#[\w.-]+)?/;
+function parseGitURI(input) {
+  const m = input.match(GIT_RE)?.groups;
+  if (!m)
+    throw new Error(`Unable to parse "${input}"`);
+  return {
+    repo: m.repo,
+    subdir: m.subdir || "/",
+    ref: m.ref ? m.ref.slice(1) : "main"
+  };
+}
+
 // src/index.ts
 var exit = () => process.exit(0);
 process.on("SIGINT", exit);
@@ -1008,6 +1104,7 @@ async function main() {
     return;
   }
   const steps = [
+    verify,
     intro,
     projectName,
     template,
@@ -1033,5 +1130,6 @@ export {
   setStdout,
   setupTypeScript,
   template,
-  typescript
+  typescript,
+  verify
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "4.0.0-beta.0",
+  "version": "4.0.0-rc.2",
   "type": "module",
   "author": "withastro",
   "license": "MIT",