create-astro 4.9.0 → 4.9.2

package/create-astro.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-/* eslint-disable no-console */
+
 'use strict';
 
 const currentVersion = process.versions.node;

package/dist/index.js

@@ -278,27 +278,10 @@ function rarity(frequency, emoji) {
 
 // src/messages.ts
 import { exec } from "node:child_process";
+import { stripVTControlCharacters } from "node:util";
 import { color, say as houston, label, spinner as load } from "@astrojs/cli-kit";
 import { align, sleep } from "@astrojs/cli-kit/utils";
 
-// ../../node_modules/.pnpm/ansi-regex@6.0.1/node_modules/ansi-regex/index.js
-function ansiRegex({ onlyFirst = false } = {}) {
-  const pattern = [
-    "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)",
-    "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"
-  ].join("|");
-  return new RegExp(pattern, onlyFirst ? void 0 : "g");
-}
-
-// ../../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(regex, "");
-}
-
 // src/shell.ts
 import { spawn } from "node:child_process";
 import { text as textFromStream } from "node:stream/consumers";
@@ -420,7 +403,7 @@ var nextSteps = async ({ projectDir, devCmd }) => {
 ${prefix}Enter your project directory using`,
       color.cyan(`cd ${projectDir}`, "")
     ];
-    const len = enter[0].length + stripAnsi(enter[1]).length;
+    const len = enter[0].length + stripVTControlCharacters(enter[1]).length;
     log(enter.join(len > max ? "\n" + prefix : " "));
   }
   log(
@@ -463,7 +446,7 @@ function printHelp({
   if (headline) {
     message.push(
       linebreak(),
-      `${title(commandName)} ${color.green(`v${"4.9.0"}`)} ${headline}`
+      `${title(commandName)} ${color.green(`v${"4.9.2"}`)} ${headline}`
     );
   }
   if (usage) {
@@ -540,7 +523,7 @@ async function getContext(argv) {
     prompt,
     packageManager,
     username: getName(),
-    version: getVersion(packageManager, "astro", "4.15.4"),
+    version: getVersion(packageManager, "astro", "4.16.0"),
     skipHouston,
     fancy,
     dryRun,
@@ -858,7 +841,7 @@ async function checkCwd(cwd) {
 import fs4 from "node:fs";
 import path5 from "node:path";
 import { color as color6 } from "@astrojs/cli-kit";
-import { downloadTemplate } from "giget";
+import { downloadTemplate } from "@bluwy/giget-core";
 async function template(ctx) {
   if (!ctx.template && ctx.yes) ctx.template = "basics";
   if (ctx.template) {
@@ -957,9 +940,6 @@ async function copyTemplate(tmpl, ctx) {
       }
       throw new Error(`Unable to download template ${color6.reset(tmpl)}`);
     }
-    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 = path5.resolve(path5.join(ctx.cwd, file));
       if (fs4.existsSync(fileLoc)) {
@@ -1140,8 +1120,8 @@ var FILES_TO_UPDATE2 = {
         parsedPackageJson.scripts.build = `astro check && ${buildScript}`;
       }
       const [astroCheckVersion, typescriptVersion] = await Promise.all([
-        getVersion(options.ctx.packageManager, "@astrojs/check", "0.9.3"),
-        getVersion(options.ctx.packageManager, "typescript", "5.5.4")
+        getVersion(options.ctx.packageManager, "@astrojs/check", "0.9.4"),
+        getVersion(options.ctx.packageManager, "typescript", "5.6.2")
       ]);
       parsedPackageJson.dependencies ??= {};
       parsedPackageJson.dependencies["@astrojs/check"] = `^${astroCheckVersion}`;
@@ -1201,6 +1181,7 @@ async function setupTypeScript(value, ctx) {
 // src/actions/verify.ts
 import dns from "node:dns/promises";
 import { color as color8 } from "@astrojs/cli-kit";
+import { verifyTemplate } from "@bluwy/giget-core";
 async function verify(ctx) {
   if (!ctx.dryRun) {
     const online = await isOnline();
@@ -1212,7 +1193,8 @@ async function verify(ctx) {
     }
   }
   if (ctx.template) {
-    const ok = await verifyTemplate(ctx.template, ctx.ref);
+    const target = getTemplateTarget(ctx.template, ctx.ref);
+    const ok = await verifyTemplate(target);
     if (!ok) {
       bannerAbort();
       log("");
@@ -1228,31 +1210,6 @@ function isOnline() {
     () => false
   );
 }
-async function verifyTemplate(tmpl, ref) {
-  const target = getTemplateTarget(tmpl, ref);
-  const { repo, subdir, ref: branch } = parseGitURI(target.replace("github:", ""));
-  const url = new URL(`/repos/${repo}/contents${subdir}?ref=${branch}`, "https://api.github.com/");
-  let res = await fetch(url.toString(), {
-    headers: {
-      Accept: "application/vnd.github+json",
-      "X-GitHub-Api-Version": "2022-11-28"
-    }
-  });
-  if (res.status === 403) {
-    res = await fetch(`https://github.com/${repo}/tree/${branch}${subdir}`);
-  }
-  return res.status === 200;
-}
-var GIT_RE = /^(?<repo>[\w.-]+\/[\w.-]+)(?<subdir>[^#]+)?(?<ref>#[\w.-]+)?/;
-function parseGitURI(input) {
-  const m = GIT_RE.exec(input)?.groups;
-  if (!m) throw new Error(`Unable to parse "${input}"`);
-  return {
-    repo: m.repo,
-    subdir: m.subdir || "/",
-    ref: m.ref ? m.ref.slice(1) : "main"
-  };
-}
 
 // src/index.ts
 var exit = () => process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "4.9.0",
+  "version": "4.9.2",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -26,11 +26,10 @@
   "//b": "DEPENDENCIES IS FOR UNBUNDLED PACKAGES",
   "dependencies": {
     "@astrojs/cli-kit": "^0.4.1",
-    "giget": "1.2.3"
+    "@bluwy/giget-core": "^0.1.0"
   },
   "devDependencies": {
     "arg": "^5.0.2",
-    "strip-ansi": "^7.1.0",
     "strip-json-comments": "^5.0.1",
     "astro-scripts": "0.0.14"
   },