create-astro 3.1.5 → 3.1.7

package/dist/index.js

@@ -199,8 +199,10 @@ import os from "node:os";
 // src/messages.ts
 import { color, label, say as houston, spinner as load } from "@astrojs/cli-kit";
 import { align, sleep } from "@astrojs/cli-kit/utils";
+import { execa } from "execa";
 import { exec } from "node:child_process";
 import { get } from "node:https";
+import preferredPM from "preferred-pm";
 
 // ../../node_modules/.pnpm/ansi-regex@6.0.1/node_modules/ansi-regex/index.js
 function ansiRegex({ onlyFirst = false } = {}) {
@@ -220,6 +222,12 @@ function stripAnsi(string) {
 }
 
 // src/messages.ts
+async function getRegistry() {
+  var _a;
+  const packageManager = ((_a = await preferredPM(process.cwd())) == null ? void 0 : _a.name) || "npm";
+  const { stdout: stdout2 } = await execa(packageManager, ["config", "get", "registry"]);
+  return stdout2 || "https://registry.npmjs.org";
+}
 var stdout = process.stdout;
 function setStdout(writable) {
   stdout = writable;
@@ -265,10 +273,11 @@ var getName = () => new Promise((resolve) => {
   });
 });
 var v;
-var getVersion = () => new Promise((resolve) => {
+var getVersion = () => new Promise(async (resolve) => {
   if (v)
     return resolve(v);
-  get("https://registry.npmjs.org/astro/latest", (res) => {
+  const registry = await getRegistry();
+  get(`${registry}/astro/latest`, (res) => {
     let body = "";
     res.on("data", (chunk) => body += chunk);
     res.on("end", () => {
@@ -368,7 +377,7 @@ function printHelp({
   if (headline) {
     message.push(
       linebreak(),
-      `${title(commandName)} ${color.green(`v${"3.1.5"}`)} ${headline}`
+      `${title(commandName)} ${color.green(`v${"3.1.7"}`)} ${headline}`
     );
   }
   if (usage) {
@@ -469,7 +478,7 @@ async function getContext(argv) {
 
 // src/actions/dependencies.ts
 import { color as color2 } from "@astrojs/cli-kit";
-import { execa } from "execa";
+import { execa as execa2 } from "execa";
 async function dependencies(ctx) {
   let deps = ctx.install ?? ctx.yes;
   if (deps === void 0) {
@@ -509,7 +518,7 @@ async function dependencies(ctx) {
   }
 }
 async function install({ pkgManager, cwd }) {
-  const installExec = execa(pkgManager, ["install"], { 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));
@@ -521,7 +530,7 @@ async function install({ pkgManager, cwd }) {
 import fs from "node:fs";
 import path from "node:path";
 import { color as color3 } from "@astrojs/cli-kit";
-import { execa as execa2 } from "execa";
+import { execa as execa3 } from "execa";
 async function git(ctx) {
   if (fs.existsSync(path.join(ctx.cwd, ".git"))) {
     await info("Nice!", `Git has already been initialized`);
@@ -558,9 +567,9 @@ async function git(ctx) {
 }
 async function init({ cwd }) {
   try {
-    await execa2("git", ["init"], { cwd, stdio: "ignore" });
-    await execa2("git", ["add", "-A"], { cwd, stdio: "ignore" });
-    await execa2(
+    await execa3("git", ["init"], { cwd, stdio: "ignore" });
+    await execa3("git", ["add", "-A"], { cwd, stdio: "ignore" });
+    await execa3(
       "git",
       [
         "commit",
@@ -788,10 +797,16 @@ var FILES_TO_UPDATE = {
     );
   })
 };
-async function copyTemplate(tmpl, ctx) {
-  const ref = ctx.ref || "latest";
+function getTemplateTarget(tmpl, ref = "latest") {
   const isThirdParty = tmpl.includes("/");
-  const templateTarget = isThirdParty ? tmpl : `github:withastro/astro/examples/${tmpl}#${ref}`;
+  if (isThirdParty)
+    return tmpl;
+  if (tmpl === "starlight")
+    return `withastro/starlight/examples/basics`;
+  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, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "3.1.5",
+  "version": "3.1.7",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -29,7 +29,8 @@
     "chai": "^4.3.6",
     "execa": "^6.1.0",
     "giget": "1.0.0",
-    "mocha": "^9.2.2"
+    "mocha": "^9.2.2",
+    "preferred-pm": "^3.0.3"
   },
   "devDependencies": {
     "@types/which-pm-runs": "^1.0.0",