create-astro 4.9.1 → 4.10.0

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

@@ -446,7 +446,7 @@ function printHelp({
   if (headline) {
     message.push(
       linebreak(),
-      `${title(commandName)} ${color.green(`v${"4.9.1"}`)} ${headline}`
+      `${title(commandName)} ${color.green(`v${"4.10.0"}`)} ${headline}`
     );
   }
   if (usage) {
@@ -523,7 +523,7 @@ async function getContext(argv) {
     prompt,
     packageManager,
     username: getName(),
-    version: getVersion(packageManager, "astro", "4.15.12"),
+    version: getVersion(packageManager, "astro", "4.16.1"),
     skipHouston,
     fancy,
     dryRun,
@@ -841,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) {
@@ -900,11 +900,15 @@ var FILES_TO_UPDATE = {
 function getTemplateTarget(tmpl, ref = "latest") {
   if (tmpl.startsWith("starlight")) {
     const [, starter = "basics"] = tmpl.split("/");
-    return `withastro/starlight/examples/${starter}`;
+    return `github:withastro/starlight/examples/${starter}`;
   }
   const isThirdParty = tmpl.includes("/");
   if (isThirdParty) return tmpl;
-  return `github:withastro/astro/examples/${tmpl}#${ref}`;
+  if (ref === "latest") {
+    return `github:withastro/astro#examples/${tmpl}`;
+  } else {
+    return `github:withastro/astro/examples/${tmpl}#${ref}`;
+  }
 }
 async function copyTemplate(tmpl, ctx) {
   const templateTarget = getTemplateTarget(tmpl, ctx.ref);
@@ -912,7 +916,6 @@ async function copyTemplate(tmpl, ctx) {
     try {
       await downloadTemplate(templateTarget, {
         force: true,
-        provider: "github",
         cwd: ctx.cwd,
         dir: "."
       });
@@ -940,9 +943,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)) {
@@ -1129,7 +1129,7 @@ var FILES_TO_UPDATE2 = {
       parsedPackageJson.dependencies ??= {};
       parsedPackageJson.dependencies["@astrojs/check"] = `^${astroCheckVersion}`;
       parsedPackageJson.dependencies.typescript = `^${typescriptVersion}`;
-      await writeFile(file, JSON.stringify(parsedPackageJson, null, indent), "utf-8");
+      await writeFile(file, JSON.stringify(parsedPackageJson, null, indent) + "\n", "utf-8");
     } catch (err) {
       if (err && err.code === "ENOENT") return;
       if (err instanceof Error) throw new Error(err.message);
@@ -1143,7 +1143,7 @@ var FILES_TO_UPDATE2 = {
         const result = Object.assign(templateTSConfig, {
           extends: `astro/tsconfigs/${options.value}`
         });
-        await writeFile(file, JSON.stringify(result, null, 2));
+        await writeFile(file, JSON.stringify(result, null, 2) + "\n");
       } else {
         throw new Error(
           "There was an error applying the requested TypeScript settings. This could be because the template's tsconfig.json is malformed"
@@ -1153,7 +1153,7 @@ var FILES_TO_UPDATE2 = {
       if (err && err.code === "ENOENT") {
         await writeFile(
           file,
-          JSON.stringify({ extends: `astro/tsconfigs/${options.value}` }, null, 2)
+          JSON.stringify({ extends: `astro/tsconfigs/${options.value}` }, null, 2) + "\n"
         );
       }
     }
@@ -1184,6 +1184,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();
@@ -1195,7 +1196,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("");
@@ -1211,31 +1213,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.1",
+  "version": "4.10.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -26,7 +26,7 @@
   "//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",