create-astro 3.1.6 → 3.1.8

package/dist/index.js

@@ -168,37 +168,16 @@ var require_arg = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/which-pm-runs@1.1.0/node_modules/which-pm-runs/index.js
-var require_which_pm_runs = __commonJS({
-  "../../node_modules/.pnpm/which-pm-runs@1.1.0/node_modules/which-pm-runs/index.js"(exports, module) {
-    "use strict";
-    module.exports = function() {
-      if (!process.env.npm_config_user_agent) {
-        return void 0;
-      }
-      return pmFromUserAgent(process.env.npm_config_user_agent);
-    };
-    function pmFromUserAgent(userAgent) {
-      const pmSpec = userAgent.split(" ")[0];
-      const separatorPos = pmSpec.lastIndexOf("/");
-      const name = pmSpec.substring(0, separatorPos);
-      return {
-        name: name === "npminstall" ? "cnpm" : name,
-        version: pmSpec.substring(separatorPos + 1)
-      };
-    }
-  }
-});
-
 // src/actions/context.ts
 var import_arg = __toESM(require_arg(), 1);
-var import_which_pm_runs = __toESM(require_which_pm_runs(), 1);
 import { prompt } from "@astrojs/cli-kit";
 import os from "node:os";
+import detectPackageManager2 from "which-pm-runs";
 
 // 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";
 
@@ -211,15 +190,23 @@ function ansiRegex({ onlyFirst = false } = {}) {
   return new RegExp(pattern, onlyFirst ? void 0 : "g");
 }
 
-// ../../node_modules/.pnpm/strip-ansi@7.0.1/node_modules/strip-ansi/index.js
+// ../../node_modules/.pnpm/strip-ansi@7.1.0/node_modules/strip-ansi/index.js
+var regex = ansiRegex();
 function stripAnsi(string) {
   if (typeof string !== "string") {
     throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
   }
-  return string.replace(ansiRegex(), "");
+  return string.replace(regex, "");
 }
 
 // src/messages.ts
+import detectPackageManager from "which-pm-runs";
+async function getRegistry() {
+  var _a;
+  const packageManager = ((_a = detectPackageManager()) == 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 +252,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 +356,7 @@ function printHelp({
   if (headline) {
     message.push(
       linebreak(),
-      `${title(commandName)} ${color.green(`v${"3.1.6"}`)} ${headline}`
+      `${title(commandName)} ${color.green(`v${"3.1.8"}`)} ${headline}`
     );
   }
   if (usage) {
@@ -415,7 +403,7 @@ async function getContext(argv) {
     },
     { argv, permissive: true }
   );
-  const pkgManager = ((_a = (0, import_which_pm_runs.default)()) == null ? void 0 : _a.name) ?? "npm";
+  const pkgManager = ((_a = detectPackageManager2()) == null ? void 0 : _a.name) ?? "npm";
   const [username, version] = await Promise.all([getName(), getVersion()]);
   let cwd = flags["_"][0];
   let {
@@ -469,7 +457,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 +497,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 +509,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 +546,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",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "3.1.6",
+  "version": "3.1.8",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -25,18 +25,18 @@
   "//a": "MOST PACKAGES SHOULD GO IN DEV_DEPENDENCIES! THEY WILL BE BUNDLED.",
   "//b": "DEPENDENCIES IS FOR UNBUNDLED PACKAGES",
   "dependencies": {
-    "@astrojs/cli-kit": "^0.2.2",
-    "chai": "^4.3.6",
+    "@astrojs/cli-kit": "^0.2.3",
+    "chai": "^4.3.7",
     "execa": "^6.1.0",
     "giget": "1.0.0",
-    "mocha": "^9.2.2"
+    "mocha": "^9.2.2",
+    "which-pm-runs": "^1.1.0"
   },
   "devDependencies": {
     "@types/which-pm-runs": "^1.0.0",
     "arg": "^5.0.2",
-    "strip-ansi": "^7.0.1",
+    "strip-ansi": "^7.1.0",
     "strip-json-comments": "^5.0.0",
-    "which-pm-runs": "^1.1.0",
     "astro-scripts": "0.0.14"
   },
   "engines": {