create-astro 3.1.13 → 3.2.0

package/dist/index.js

@@ -176,8 +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 } from "@astrojs/cli-kit/utils";
-import { execa } from "execa";
+import { align, sleep as sleep2 } from "@astrojs/cli-kit/utils";
 import fetch from "node-fetch-native";
 import { exec } from "node:child_process";
 
@@ -201,11 +200,42 @@ 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";
+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 };
+    });
+  }
+  await new Promise((resolve) => child.on("exit", resolve));
+  const { exitCode } = child;
+  if (exitCode !== 0) {
+    throw { stdout: stdout2, stderr, exitCode };
+  }
+  return { stdout: stdout2, stderr, exitCode };
+}
+
+// src/messages.ts
 async function getRegistry() {
   var _a, _b;
   const packageManager = ((_a = detectPackageManager()) == null ? void 0 : _a.name) || "npm";
   try {
-    const { stdout: stdout2 } = await execa(packageManager, ["config", "get", "registry"]);
+    const { stdout: stdout2 } = await shell(packageManager, ["config", "get", "registry"]);
     return ((_b = stdout2 == null ? void 0 : stdout2.trim()) == null ? void 0 : _b.replace(/\/$/, "")) || "https://registry.npmjs.org";
   } catch (e) {
     return "https://registry.npmjs.org";
@@ -221,7 +251,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.`,
@@ -272,39 +302,39 @@ var banner = async (version) => log(
   `
 ${label("astro", color.bgGreen, color.black)}  ${version ? color.green(color.bold(`v${version}`)) : ""} ${color.bold("Launch sequence initiated.")}`
 );
-var info = async (prefix, text) => {
-  await sleep(100);
+var info = async (prefix, text2) => {
+  await sleep2(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 () => {
   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 sleep(1e3);
+  await sleep2(1e3);
 };
 var nextSteps = async ({ projectDir, devCmd }) => {
   const max = stdout.columns;
   const prefix = max < 80 ? " " : " ".repeat(9);
-  await sleep(200);
+  await sleep2(200);
   log(
     `
  ${color.bgCyan(` ${color.black("next")} `)}  ${color.bold(
       "Liftoff confirmed. Explore your project!"
     )}`
   );
-  await sleep(100);
+  await sleep2(100);
   if (projectDir !== "") {
     projectDir = projectDir.includes(" ") ? `"./${projectDir}"` : `./${projectDir}`;
     const enter = [
@@ -318,16 +348,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 sleep(100);
+  await sleep2(100);
   log(
     `${prefix}Add frameworks like ${color.cyan(`react`)} or ${color.cyan(
       "tailwind"
     )} using ${color.cyan("astro add")}.`
   );
-  await sleep(100);
+  await sleep2(100);
   log(`
 ${prefix}Stuck? Join us at ${color.cyan(`https://astro.build/chat`)}`);
-  await sleep(200);
+  await sleep2(200);
 };
 function printHelp({
   commandName,
@@ -355,7 +385,7 @@ function printHelp({
   if (headline) {
     message.push(
       linebreak(),
-      `${title(commandName)} ${color.green(`v${"3.1.13"}`)} ${headline}`
+      `${title(commandName)} ${color.green(`v${"3.2.0"}`)} ${headline}`
     );
   }
   if (usage) {
@@ -456,7 +486,6 @@ 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) {
@@ -500,12 +529,7 @@ async function dependencies(ctx) {
 async function install({ pkgManager, cwd }) {
   if (pkgManager === "yarn")
     await ensureYarnLock({ cwd });
-  const installExec = execa2(pkgManager, ["install"], { cwd });
-  return new Promise((resolve, reject) => {
-    setTimeout(() => reject(`Request timed out after 1m 30s`), 9e4);
-    installExec.on("error", (e) => reject(e));
-    installExec.on("close", () => resolve());
-  });
+  return shell(pkgManager, ["install"], { cwd, timeout: 9e4, stdio: "ignore" });
 }
 async function ensureYarnLock({ cwd }) {
   const yarnLock = path.join(cwd, "yarn.lock");
@@ -518,7 +542,6 @@ async function ensureYarnLock({ cwd }) {
 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 (fs2.existsSync(path2.join(ctx.cwd, ".git"))) {
     await info("Nice!", `Git has already been initialized`);
@@ -555,9 +578,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",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "3.1.13",
+  "version": "3.2.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -26,15 +26,14 @@
   "//b": "DEPENDENCIES IS FOR UNBUNDLED PACKAGES",
   "dependencies": {
     "@astrojs/cli-kit": "^0.2.3",
-    "chai": "^4.3.7",
-    "execa": "^6.1.0",
-    "giget": "1.0.0",
-    "mocha": "^9.2.2",
+    "giget": "^1.1.2",
     "node-fetch-native": "^1.2.0",
     "which-pm-runs": "^1.1.0"
   },
   "devDependencies": {
     "@types/which-pm-runs": "^1.0.0",
+    "chai": "^4.3.7",
+    "mocha": "^9.2.2",
     "arg": "^5.0.2",
     "strip-ansi": "^7.1.0",
     "strip-json-comments": "^5.0.0",