create-astro 3.1.2 → 3.1.4

package/dist/index.js

@@ -368,7 +368,7 @@ function printHelp({
   if (headline) {
     message.push(
       linebreak(),
-      `${title(commandName)} ${color.green(`v${"3.1.2"}`)} ${headline}`
+      `${title(commandName)} ${color.green(`v${"3.1.4"}`)} ${headline}`
     );
   }
   if (usage) {
@@ -468,6 +468,7 @@ async function getContext(argv) {
 }
 
 // src/actions/dependencies.ts
+import { color as color2 } from "@astrojs/cli-kit";
 import { execa } from "execa";
 async function dependencies(ctx) {
   let deps = ctx.install ?? ctx.yes;
@@ -488,10 +489,26 @@ async function dependencies(ctx) {
     await spinner({
       start: `Dependencies installing with ${ctx.pkgManager}...`,
       end: "Dependencies installed",
-      while: () => install({ pkgManager: ctx.pkgManager, cwd: ctx.cwd }).catch((e) => {
-        error("error", e);
-        process.exit(1);
-      })
+      while: () => {
+        return Promise.reject("Unknown error").catch((e) => {
+          error("error", e);
+          error(
+            "error",
+            `Dependencies failed to install, please run ${color2.bold(
+              ctx.pkgManager + " install"
+            )} to install them manually after setup.`
+          );
+        });
+        return install({ pkgManager: ctx.pkgManager, cwd: ctx.cwd }).catch((e) => {
+          error("error", e);
+          error(
+            "error",
+            `Dependencies failed to install, please run ${color2.bold(
+              ctx.pkgManager + " install"
+            )}  to install them manually after setup.`
+          );
+        });
+      }
     });
   } else {
     await info(
@@ -512,7 +529,7 @@ async function install({ pkgManager, cwd }) {
 // src/actions/git.ts
 import fs from "node:fs";
 import path from "node:path";
-import { color as color2 } from "@astrojs/cli-kit";
+import { color as color3 } from "@astrojs/cli-kit";
 import { execa as execa2 } from "execa";
 async function git(ctx) {
   if (fs.existsSync(path.join(ctx.cwd, ".git"))) {
@@ -544,7 +561,7 @@ async function git(ctx) {
   } else {
     await info(
       ctx.yes === false ? "git [skip]" : "Sounds good!",
-      `You can always run ${color2.reset("git init")}${color2.dim(" manually.")}`
+      `You can always run ${color3.reset("git init")}${color3.dim(" manually.")}`
     );
   }
 }
@@ -591,7 +608,7 @@ function help() {
 }
 
 // src/actions/intro.ts
-import { color as color3, label as label2 } from "@astrojs/cli-kit";
+import { color as color4, label as label2 } from "@astrojs/cli-kit";
 import { random } from "@astrojs/cli-kit/utils";
 async function intro(ctx) {
   if (!ctx.skipHouston) {
@@ -599,8 +616,8 @@ async function intro(ctx) {
       [
         "Welcome",
         "to",
-        label2("astro", color3.bgGreen, color3.black),
-        color3.green(`v${ctx.version}`) + ",",
+        label2("astro", color4.bgGreen, color4.black),
+        color4.green(`v${ctx.version}`) + ",",
         `${ctx.username}!`
       ],
       random(welcome)
@@ -624,7 +641,7 @@ async function next(ctx) {
 }
 
 // src/actions/project-name.ts
-import { color as color4, generateProjectName } from "@astrojs/cli-kit";
+import { color as color5, generateProjectName } from "@astrojs/cli-kit";
 import path3 from "node:path";
 
 // src/actions/shared.ts
@@ -678,7 +695,7 @@ async function projectName(ctx) {
   await checkCwd(ctx.cwd);
   if (!ctx.cwd || !isEmpty(ctx.cwd)) {
     if (!isEmpty(ctx.cwd)) {
-      await info("Hmm...", `${color4.reset(`"${ctx.cwd}"`)}${color4.dim(` is not empty!`)}`);
+      await info("Hmm...", `${color5.reset(`"${ctx.cwd}"`)}${color5.dim(` is not empty!`)}`);
     }
     const { name } = await ctx.prompt({
       name: "name",
@@ -690,6 +707,8 @@ async function projectName(ctx) {
         if (!isEmpty(value)) {
           return `Directory is not empty!`;
         }
+        if (value.match(/[^\x20-\x7E]/g) !== null)
+          return `Invalid non-printable character present!`;
         return true;
       }
     });
@@ -714,13 +733,13 @@ async function checkCwd(cwd) {
   const empty = cwd && isEmpty(cwd);
   if (empty) {
     log("");
-    await info("dir", `Using ${color4.reset(cwd)}${color4.dim(" as project directory")}`);
+    await info("dir", `Using ${color5.reset(cwd)}${color5.dim(" as project directory")}`);
   }
   return empty;
 }
 
 // src/actions/template.ts
-import { color as color5 } from "@astrojs/cli-kit";
+import { color as color6 } from "@astrojs/cli-kit";
 import { downloadTemplate } from "giget";
 import fs3 from "node:fs";
 import path4 from "node:path";
@@ -740,7 +759,7 @@ async function template(ctx) {
     });
     ctx.template = tmpl;
   } else {
-    await info("tmpl", `Using ${color5.reset(ctx.template)}${color5.dim(" as project template")}`);
+    await info("tmpl", `Using ${color6.reset(ctx.template)}${color6.dim(" as project template")}`);
   }
   if (ctx.dryRun) {
     await info("--dry-run", `Skipping template copying`);
@@ -793,13 +812,13 @@ async function copyTemplate(tmpl, ctx) {
     } catch (err) {
       fs3.rmdirSync(ctx.cwd);
       if (err.message.includes("404")) {
-        throw new Error(`Template ${color5.reset(tmpl)} ${color5.dim("does not exist!")}`);
+        throw new Error(`Template ${color6.reset(tmpl)} ${color6.dim("does not exist!")}`);
       } else {
         throw new Error(err.message);
       }
     }
     if (fs3.readdirSync(ctx.cwd).length === 0) {
-      throw new Error(`Template ${color5.reset(tmpl)} ${color5.dim("is empty!")}`);
+      throw new Error(`Template ${color6.reset(tmpl)} ${color6.dim("is empty!")}`);
     }
     const removeFiles = FILES_TO_REMOVE.map(async (file) => {
       const fileLoc = path4.resolve(path4.join(ctx.cwd, file));
@@ -818,7 +837,7 @@ async function copyTemplate(tmpl, ctx) {
 }
 
 // src/actions/typescript.ts
-import { color as color6 } from "@astrojs/cli-kit";
+import { color as color7 } from "@astrojs/cli-kit";
 import fs4 from "node:fs";
 import { readFile } from "node:fs/promises";
 import path5 from "node:path";
@@ -945,13 +964,13 @@ async function typescript(ctx) {
       }
       error(
         "Error",
-        `Unknown TypeScript option ${color6.reset(ts)}${color6.dim(
+        `Unknown TypeScript option ${color7.reset(ts)}${color7.dim(
           "! Expected strict | strictest | relaxed"
         )}`
       );
       ctx.exit(1);
     }
-    await info("ts", `Using ${color6.reset(ts)}${color6.dim(" TypeScript configuration")}`);
+    await info("ts", `Using ${color7.reset(ts)}${color7.dim(" TypeScript configuration")}`);
   }
   if (ctx.dryRun) {
     await info("--dry-run", `Skipping TypeScript setup`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -34,10 +34,10 @@
   "devDependencies": {
     "@types/which-pm-runs": "^1.0.0",
     "arg": "^5.0.2",
-    "astro-scripts": "0.0.14",
     "strip-ansi": "^7.0.1",
     "strip-json-comments": "^5.0.0",
-    "which-pm-runs": "^1.1.0"
+    "which-pm-runs": "^1.1.0",
+    "astro-scripts": "0.0.14"
   },
   "engines": {
     "node": ">=16.12.0"