create-astro 3.2.0 → 3.2.2

package/dist/index.js

@@ -176,7 +176,7 @@ 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 as sleep2 } from "@astrojs/cli-kit/utils";
+import { align, sleep } from "@astrojs/cli-kit/utils";
 import fetch from "node-fetch-native";
 import { exec } from "node:child_process";
 
@@ -204,28 +204,30 @@ import detectPackageManager from "which-pm-runs";
 // src/shell.ts
 import { spawn } from "node:child_process";
 import { text as textFromStream } from "node:stream/consumers";
-import { setTimeout as sleep } from "node:timers/promises";
 var text = (stream) => stream ? textFromStream(stream).then((t) => t.trimEnd()) : "";
 async function shell(command, flags, opts = {}) {
-  const controller = opts.timeout ? new AbortController() : void 0;
-  const child = spawn(command, flags, {
-    cwd: opts.cwd,
-    shell: true,
-    stdio: opts.stdio,
-    signal: controller == null ? void 0 : controller.signal
-  });
-  const stdout2 = await text(child.stdout);
-  const stderr = await text(child.stderr);
-  if (opts.timeout) {
-    sleep(opts.timeout).then(() => {
-      controller.abort();
-      throw { stdout: stdout2, stderr, exitCode: 1 };
+  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 };
   }
-  await new Promise((resolve) => child.on("exit", resolve));
   const { exitCode } = child;
+  if (exitCode === null) {
+    throw new Error("Timeout");
+  }
   if (exitCode !== 0) {
-    throw { stdout: stdout2, stderr, exitCode };
+    throw new Error(stderr);
   }
   return { stdout: stdout2, stderr, exitCode };
 }
@@ -300,10 +302,12 @@ var getVersion = () => new Promise(async (resolve) => {
 var log = (message) => stdout.write(message + "\n");
 var banner = async (version) => log(
   `
-${label("astro", color.bgGreen, color.black)}  ${version ? 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 bannerAbort = () => log(`
+${label("astro", color.bgRed)} ${color.bold("Launch sequence aborted.")}`);
 var info = async (prefix, text2) => {
-  await sleep2(100);
+  await sleep(100);
   if (stdout.columns < 80) {
     log(`${" ".repeat(5)} ${color.cyan("\u25FC")}  ${color.cyan(prefix)}`);
     log(`${" ".repeat(9)}${color.dim(text2)}`);
@@ -322,19 +326,19 @@ var error = async (prefix, text2) => {
 var typescriptByDefault = async () => {
   await info(`No worries!`, "TypeScript is supported in Astro by default,");
   log(`${" ".repeat(9)}${color.dim("but you are free to continue writing JavaScript instead.")}`);
-  await sleep2(1e3);
+  await sleep(1e3);
 };
 var nextSteps = async ({ projectDir, devCmd }) => {
   const max = stdout.columns;
   const prefix = max < 80 ? " " : " ".repeat(9);
-  await sleep2(200);
+  await sleep(200);
   log(
     `
  ${color.bgCyan(` ${color.black("next")} `)}  ${color.bold(
       "Liftoff confirmed. Explore your project!"
     )}`
   );
-  await sleep2(100);
+  await sleep(100);
   if (projectDir !== "") {
     projectDir = projectDir.includes(" ") ? `"./${projectDir}"` : `./${projectDir}`;
     const enter = [
@@ -348,16 +352,16 @@ ${prefix}Enter your project directory using`,
   log(
     `${prefix}Run ${color.cyan(devCmd)} to start the dev server. ${color.cyan("CTRL+C")} to stop.`
   );
-  await sleep2(100);
+  await sleep(100);
   log(
     `${prefix}Add frameworks like ${color.cyan(`react`)} or ${color.cyan(
       "tailwind"
     )} using ${color.cyan("astro add")}.`
   );
-  await sleep2(100);
+  await sleep(100);
   log(`
 ${prefix}Stuck? Join us at ${color.cyan(`https://astro.build/chat`)}`);
-  await sleep2(200);
+  await sleep(200);
 };
 function printHelp({
   commandName,
@@ -385,7 +389,7 @@ function printHelp({
   if (headline) {
     message.push(
       linebreak(),
-      `${title(commandName)} ${color.green(`v${"3.2.0"}`)} ${headline}`
+      `${title(commandName)} ${color.green(`v${"3.2.2"}`)} ${headline}`
     );
   }
   if (usage) {
@@ -643,7 +647,7 @@ async function intro(ctx) {
 import path3 from "node:path";
 async function next(ctx) {
   let projectDir = path3.relative(process.cwd(), ctx.cwd);
-  const devCmd = ctx.pkgManager === "npm" ? "npm run dev" : `${ctx.pkgManager} dev`;
+  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}"]);
@@ -1033,6 +1037,65 @@ 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) {
+  var _a;
+  const m = (_a = input.match(GIT_RE)) == null ? void 0 : _a.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);
@@ -1045,6 +1108,7 @@ async function main() {
     return;
   }
   const steps = [
+    verify,
     intro,
     projectName,
     template,
@@ -1070,5 +1134,6 @@ export {
   setStdout,
   setupTypeScript,
   template,
-  typescript
+  typescript,
+  verify
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "type": "module",
   "author": "withastro",
   "license": "MIT",