create-astro 4.7.1 → 4.7.3

package/dist/index.js

@@ -162,7 +162,7 @@ var require_arg = __commonJS({
       fn[flagSymbol] = true;
       return fn;
     };
-    arg2.COUNT = arg2.flag((v2, name, existingCount) => (existingCount || 0) + 1);
+    arg2.COUNT = arg2.flag((v, name, existingCount) => (existingCount || 0) + 1);
     arg2.ArgError = ArgError;
     module.exports = arg2;
   }
@@ -229,13 +229,20 @@ async function shell(command, flags, opts = {}) {
 }
 
 // src/messages.ts
+var _registry;
 async function getRegistry(packageManager) {
+  if (_registry)
+    return _registry;
+  const fallback = "https://registry.npmjs.org";
   try {
     const { stdout: stdout2 } = await shell(packageManager, ["config", "get", "registry"]);
-    return stdout2?.trim()?.replace(/\/$/, "") || "https://registry.npmjs.org";
+    _registry = stdout2?.trim()?.replace(/\/$/, "") || fallback;
+    if (!new URL(_registry).host)
+      _registry = fallback;
   } catch (e) {
-    return "https://registry.npmjs.org";
+    _registry = fallback;
   }
+  return _registry;
 }
 var stdout = process.stdout;
 function setStdout(writable) {
@@ -258,17 +265,15 @@ var getName = () => new Promise((resolve) => {
     });
   });
 });
-var v;
-var getVersion = (packageManager) => new Promise(async (resolve) => {
-  if (v)
-    return resolve(v);
+var getVersion = (packageManager, packageName, fallback = "") => new Promise(async (resolve) => {
   let registry = await getRegistry(packageManager);
-  const { version } = await fetch(`${registry}/astro/latest`, { redirect: "follow" }).then(
+  const { version } = await fetch(`${registry}/${packageName}/latest`, {
+    redirect: "follow"
+  }).then(
     (res) => res.json(),
-    () => ({ version: "" })
+    () => ({ version: fallback })
   );
-  v = version;
-  resolve(version);
+  return resolve(version);
 });
 var log = (message) => stdout.write(message + "\n");
 var banner = () => {
@@ -361,7 +366,7 @@ function printHelp({
   if (headline) {
     message.push(
       linebreak(),
-      `${title(commandName)} ${color.green(`v${"4.7.1"}`)} ${headline}`
+      `${title(commandName)} ${color.green(`v${"4.7.3"}`)} ${headline}`
     );
   }
   if (usage) {
@@ -538,14 +543,14 @@ async function getContext(argv) {
     if (typescript2 == void 0)
       typescript2 = "strict";
   }
-  skipHouston = (os.platform() === "win32" && !fancy || skipHouston) ?? [yes, no, install2, git2, typescript2].some((v2) => v2 !== void 0);
+  skipHouston = (os.platform() === "win32" && !fancy || skipHouston) ?? [yes, no, install2, git2, typescript2].some((v) => v !== void 0);
   const { messages, hats, ties } = getSeasonalHouston({ fancy });
   const context = {
     help: help2,
     prompt,
     packageManager,
     username: getName(),
-    version: getVersion(packageManager),
+    version: getVersion(packageManager, "astro"),
     skipHouston,
     fancy,
     dryRun,
@@ -1129,19 +1134,21 @@ async function typescript(ctx) {
 var FILES_TO_UPDATE2 = {
   "package.json": async (file, options) => {
     try {
-      if (options.ctx.install)
-        await shell(options.ctx.packageManager, ["add", "@astrojs/check", "typescript"], {
-          cwd: path6.dirname(file),
-          stdio: "ignore"
-        });
       const data = await readFile(file, { encoding: "utf-8" });
       const indent = /(^\s+)/m.exec(data)?.[1] ?? "	";
       const parsedPackageJson = JSON.parse(data);
       const buildScript = parsedPackageJson.scripts?.build;
       if (typeof buildScript === "string" && !buildScript.includes("astro check")) {
         parsedPackageJson.scripts.build = `astro check && ${buildScript}`;
-        await writeFile(file, JSON.stringify(parsedPackageJson, null, indent), "utf-8");
       }
+      const [astroCheckVersion, typescriptVersion] = await Promise.all([
+        getVersion(options.ctx.packageManager, "@astrojs/check"),
+        getVersion(options.ctx.packageManager, "typescript")
+      ]);
+      parsedPackageJson.dependencies ??= {};
+      parsedPackageJson.dependencies["@astrojs/check"] = `^${astroCheckVersion}`;
+      parsedPackageJson.dependencies.typescript = `^${typescriptVersion}`;
+      await writeFile(file, JSON.stringify(parsedPackageJson, null, indent), "utf-8");
     } catch (err) {
       if (err && err.code === "ENOENT")
         return;
@@ -1256,8 +1263,8 @@ async function main() {
     intro,
     projectName,
     template,
-    dependencies,
     typescript,
+    dependencies,
     // Steps which write to files need to go above git
     git
   ];

package/dist/messages.d.ts

@@ -11,7 +11,7 @@ export declare function spinner(args: {
 }): Promise<void>;
 export declare const title: (text: string) => string;
 export declare const getName: () => Promise<string>;
-export declare const getVersion: (packageManager: string) => Promise<string>;
+export declare const getVersion: (packageManager: string, packageName: string, fallback?: string) => Promise<string>;
 export declare const log: (message: string) => boolean;
 export declare const banner: () => void;
 export declare const bannerAbort: () => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "4.7.1",
+  "version": "4.7.3",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -46,6 +46,6 @@
     "build": "astro-scripts build \"src/index.ts\" --bundle && tsc",
     "build:ci": "astro-scripts build \"src/index.ts\" --bundle",
     "dev": "astro-scripts dev \"src/**/*.ts\"",
-    "test": "mocha --exit --timeout 20000 --parallel"
+    "test": "astro-scripts test \"test/**/*.test.js\""
   }
 }