create-astro 4.3.0 → 4.4.1

package/dist/actions/typescript.d.ts

@@ -1,5 +1,5 @@
 import type { Context } from './context.js';
-export declare function typescript(ctx: Pick<Context, 'typescript' | 'yes' | 'prompt' | 'dryRun' | 'cwd' | 'exit'>): Promise<void>;
-export declare function setupTypeScript(value: string, { cwd }: {
-    cwd: string;
-}): Promise<void>;
+type PickedTypeScriptContext = Pick<Context, 'typescript' | 'yes' | 'prompt' | 'dryRun' | 'cwd' | 'exit' | 'packageManager' | 'install'>;
+export declare function typescript(ctx: PickedTypeScriptContext): Promise<void>;
+export declare function setupTypeScript(value: string, ctx: PickedTypeScriptContext): Promise<void>;
+export {};

package/dist/index.js

@@ -391,7 +391,7 @@ function printHelp({
   if (headline) {
     message.push(
       linebreak(),
-      `${title(commandName)} ${color.green(`v${"4.3.0"}`)} ${headline}`
+      `${title(commandName)} ${color.green(`v${"4.4.1"}`)} ${headline}`
     );
   }
   if (usage) {
@@ -863,7 +863,12 @@ async function copyTemplate(tmpl, ctx) {
         dir: "."
       });
     } catch (err) {
-      fs4.rmdirSync(ctx.cwd);
+      if (ctx.cwd !== "." && ctx.cwd !== "./" && !ctx.cwd.startsWith("../")) {
+        try {
+          fs4.rmdirSync(ctx.cwd);
+        } catch (_) {
+        }
+      }
       if (err.message.includes("404")) {
         throw new Error(`Template ${color6.reset(tmpl)} ${color6.dim("does not exist!")}`);
       } else {
@@ -891,8 +896,7 @@ async function copyTemplate(tmpl, ctx) {
 
 // src/actions/typescript.ts
 import { color as color7 } from "@astrojs/cli-kit";
-import fs5 from "node:fs";
-import { readFile } from "node:fs/promises";
+import { readFile, rm, writeFile } from "node:fs/promises";
 import path6 from "node:path";
 
 // ../../node_modules/.pnpm/strip-json-comments@5.0.1/node_modules/strip-json-comments/index.js
@@ -1013,7 +1017,7 @@ async function typescript(ctx) {
   } else {
     if (!["strict", "strictest", "relaxed", "default", "base"].includes(ts)) {
       if (!ctx.dryRun) {
-        fs5.rmSync(ctx.cwd, { recursive: true, force: true });
+        await rm(ctx.cwd, { recursive: true, force: true });
       }
       error(
         "Error",
@@ -1034,7 +1038,7 @@ async function typescript(ctx) {
     await spinner({
       start: "TypeScript customizing...",
       end: "TypeScript customized",
-      while: () => setupTypeScript(ts, { cwd: ctx.cwd }).catch((e) => {
+      while: () => setupTypeScript(ts, ctx).catch((e) => {
         error("error", e);
         process.exit(1);
       })
@@ -1042,29 +1046,59 @@ async function typescript(ctx) {
   } else {
   }
 }
-async function setupTypeScript(value, { cwd }) {
-  const templateTSConfigPath = path6.join(cwd, "tsconfig.json");
-  try {
-    const data = await readFile(templateTSConfigPath, { encoding: "utf-8" });
-    const templateTSConfig = JSON.parse(stripJsonComments(data));
-    if (templateTSConfig && typeof templateTSConfig === "object") {
-      const result = Object.assign(templateTSConfig, {
-        extends: `astro/tsconfigs/${value}`
-      });
-      fs5.writeFileSync(templateTSConfigPath, JSON.stringify(result, null, 2));
-    } else {
-      throw new Error(
-        "There was an error applying the requested TypeScript settings. This could be because the template's tsconfig.json is malformed"
-      );
+var FILES_TO_UPDATE2 = {
+  "package.json": async (file, options) => {
+    try {
+      if (options.ctx.install)
+        await shell(options.ctx.packageManager, ["install", "@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");
+      }
+    } catch (err) {
+      if (err && err.code === "ENOENT")
+        return;
+      if (err instanceof Error)
+        throw new Error(err.message);
     }
-  } catch (err) {
-    if (err && err.code === "ENOENT") {
-      fs5.writeFileSync(
-        templateTSConfigPath,
-        JSON.stringify({ extends: `astro/tsconfigs/${value}` }, null, 2)
-      );
+  },
+  "tsconfig.json": async (file, options) => {
+    try {
+      const data = await readFile(file, { encoding: "utf-8" });
+      const templateTSConfig = JSON.parse(stripJsonComments(data));
+      if (templateTSConfig && typeof templateTSConfig === "object") {
+        const result = Object.assign(templateTSConfig, {
+          extends: `astro/tsconfigs/${options.value}`
+        });
+        await writeFile(file, JSON.stringify(result, null, 2));
+      } else {
+        throw new Error(
+          "There was an error applying the requested TypeScript settings. This could be because the template's tsconfig.json is malformed"
+        );
+      }
+    } catch (err) {
+      if (err && err.code === "ENOENT") {
+        await writeFile(
+          file,
+          JSON.stringify({ extends: `astro/tsconfigs/${options.value}` }, null, 2)
+        );
+      }
     }
   }
+};
+async function setupTypeScript(value, ctx) {
+  await Promise.all(
+    Object.entries(FILES_TO_UPDATE2).map(
+      async ([file, update]) => update(path6.resolve(path6.join(ctx.cwd, file)), { value, ctx })
+    )
+  );
 }
 
 // src/actions/verify.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "4.3.0",
+  "version": "4.4.1",
   "type": "module",
   "author": "withastro",
   "license": "MIT",