create-astro 3.1.12 → 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.12"}`)} ${headline}`
+      `${title(commandName)} ${color.green(`v${"3.2.0"}`)} ${headline}`
     );
   }
   if (usage) {
@@ -456,7 +486,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) {
@@ -496,21 +527,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;
   }
@@ -545,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",
@@ -607,9 +640,9 @@ 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);
+  let projectDir = path3.relative(process.cwd(), ctx.cwd);
   const devCmd = ctx.pkgManager === "npm" ? "npm run dev" : `${ctx.pkgManager} dev`;
   await nextSteps({ projectDir, devCmd });
   if (!ctx.skipHouston) {
@@ -620,10 +653,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",
@@ -649,10 +682,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);
     });
@@ -695,7 +728,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("/");
@@ -719,8 +752,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({
@@ -761,10 +794,10 @@ 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) => {
     var _a;
     const indent = ((_a = /(^\s+)/m.exec(value)) == null ? void 0 : _a[1]) ?? "	";
-    fs3.promises.writeFile(
+    fs4.promises.writeFile(
       file,
       JSON.stringify(
         Object.assign(JSON.parse(value), Object.assign(overrides, { private: void 0 })),
@@ -796,25 +829,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 });
       }
     });
@@ -824,9 +857,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");
@@ -946,7 +979,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",
@@ -976,7 +1009,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));
@@ -984,7 +1017,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"
@@ -992,7 +1025,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)
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "3.1.12",
+  "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",