create-astro 0.12.2 → 0.12.5

package/create-astro.mjs

@@ -3,7 +3,7 @@
 
 const currentVersion = process.versions.node;
 const requiredMajorVersion = parseInt(currentVersion.split('.')[0], 10);
-const minimumMajorVersion = 12;
+const minimumMajorVersion = 14;
 
 if (requiredMajorVersion < minimumMajorVersion) {
 	console.error(`Node.js v${currentVersion} is out of date and unsupported!`);

package/dist/index.js

@@ -1,14 +1,22 @@
+import degit from "degit";
+import { execa, execaCommand } from "execa";
 import fs from "fs";
+import { bgCyan, black, bold, cyan, dim, gray, green, red, reset, yellow } from "kleur/colors";
+import ora from "ora";
 import path from "path";
-import { bgCyan, black, bold, cyan, gray, green, red, yellow } from "kleur/colors";
 import prompts from "prompts";
-import degit from "degit";
+import detectPackageManager from "which-pm-runs";
 import yargs from "yargs-parser";
-import ora from "ora";
-import { TEMPLATES } from "./templates.js";
-import { logger, defaultLogLevel } from "./logger.js";
-import { execa, execaCommand } from "execa";
 import { loadWithRocketGradient, rocketAscii } from "./gradient.js";
+import { defaultLogLevel, logger } from "./logger.js";
+import { TEMPLATES } from "./templates.js";
+function wait(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function logAndWait(message, ms = 100) {
+  console.log(message);
+  return wait(ms);
+}
 const cleanArgv = process.argv.filter((arg) => arg !== "--");
 const args = yargs(cleanArgv);
 prompts.override(args);
@@ -27,10 +35,13 @@ function isEmpty(dirPath) {
 const { version } = JSON.parse(fs.readFileSync(new URL("../package.json", import.meta.url), "utf-8"));
 const FILES_TO_REMOVE = [".stackblitzrc", "sandbox.config.json", "CHANGELOG.md"];
 async function main() {
-  const pkgManager = pkgManagerFromUserAgent(process.env.npm_config_user_agent);
+  var _a;
+  const pkgManager = ((_a = detectPackageManager()) == null ? void 0 : _a.name) || "npm";
   logger.debug("Verbose logging turned on");
   console.log(`
 ${bold("Welcome to Astro!")} ${gray(`(create-astro v${version})`)}`);
+  console.log(`Lets walk through setting up your new Astro project.
+`);
   let cwd = args["_"][2];
   if (cwd && isEmpty(cwd)) {
     let acknowledgeProjectDir = ora({
@@ -48,7 +59,7 @@ ${bold("Welcome to Astro!")} ${gray(`(create-astro v${version})`)}`);
     const dirResponse = await prompts({
       type: "text",
       name: "directory",
-      message: "Where would you like to create your app?",
+      message: "Where would you like to create your new project?",
       initial: "./my-astro-site",
       validate(value) {
         if (!isEmpty(value)) {
@@ -66,7 +77,7 @@ ${bold("Welcome to Astro!")} ${gray(`(create-astro v${version})`)}`);
     {
       type: "select",
       name: "template",
-      message: "Which app template would you like to use?",
+      message: "Which template would you like to use?",
       choices: TEMPLATES
     }
   ]);
@@ -86,7 +97,7 @@ ${bold("Welcome to Astro!")} ${gray(`(create-astro v${version})`)}`);
     force: true,
     verbose: defaultLogLevel === "debug" ? true : false
   });
-  if (!args.dryrun) {
+  if (!args.dryRun) {
     try {
       emitter.on("info", (info) => {
         logger.debug(info.message);
@@ -118,19 +129,18 @@ ${bold("Welcome to Astro!")} ${gray(`(create-astro v${version})`)}`);
   const installResponse = await prompts({
     type: "confirm",
     name: "install",
-    message: `Would you like us to run "${pkgManager} install?"`,
+    message: `Would you like to install ${pkgManager} dependencies? ${reset(dim("(recommended)"))}`,
     initial: true
   });
-  if (!installResponse) {
-    process.exit(0);
-  }
-  if (installResponse.install && !args.dryrun) {
+  if (args.dryRun) {
+    ora().info(dim(`--dry-run enabled, skipping.`));
+  } else if (installResponse.install) {
     const installExec = execa(pkgManager, ["install"], { cwd });
     const installingPackagesMsg = `Installing packages${emojiWithFallback(" \u{1F4E6}", "...")}`;
     const installSpinner = await loadWithRocketGradient(installingPackagesMsg);
     await new Promise((resolve, reject) => {
-      var _a;
-      (_a = installExec.stdout) == null ? void 0 : _a.on("data", function(data) {
+      var _a2;
+      (_a2 = installExec.stdout) == null ? void 0 : _a2.on("data", function(data) {
         installSpinner.text = `${rocketAscii} ${installingPackagesMsg}
 ${bold(`[${pkgManager}]`)} ${data}`;
       });
@@ -139,66 +149,41 @@ ${bold(`[${pkgManager}]`)} ${data}`;
     });
     installSpinner.text = green("Packages installed!");
     installSpinner.succeed();
-  }
-  const astroAddCommand = installResponse.install ? "astro add --yes" : `${pkgManagerExecCommand(pkgManager)} astro@latest add --yes`;
-  const astroAddResponse = await prompts({
-    type: "confirm",
-    name: "astroAdd",
-    message: `Run "${astroAddCommand}?" This lets you optionally add component frameworks (ex. React), CSS frameworks (ex. Tailwind), and more.`,
-    initial: true
-  });
-  if (!astroAddResponse) {
-    process.exit(0);
-  }
-  if (!astroAddResponse.astroAdd) {
-    ora().info(`No problem. You can always run "${pkgManagerExecCommand(pkgManager)} astro add" later!`);
-  }
-  if (astroAddResponse.astroAdd && !args.dryrun) {
-    await execaCommand(astroAddCommand, astroAddCommand === "astro add --yes" ? { cwd, stdio: "inherit", localDir: cwd, preferLocal: true } : { cwd, stdio: "inherit" });
+  } else {
+    ora().info(dim(`No problem! Remember to install dependencies after setup.`));
   }
   const gitResponse = await prompts({
     type: "confirm",
     name: "git",
-    message: "Initialize a git repository?",
+    message: `Would you like to initialize a new git repository? ${reset(dim("(optional)"))}`,
     initial: true
   });
-  if (!gitResponse) {
-    process.exit(0);
-  }
-  if (gitResponse.git && !args.dryrun) {
+  if (args.dryRun) {
+    ora().info(dim(`--dry-run enabled, skipping.`));
+  } else if (gitResponse.git) {
     await execaCommand("git init", { cwd });
+  } else {
+    ora().info(dim(`Sounds good! You can come back and run ${cyan(`git init`)} later.`));
   }
-  ora({ text: green("Done. Ready for liftoff!") }).succeed();
+  ora().succeed("Setup complete.");
+  ora({ text: green("Ready for liftoff!") }).succeed();
+  await wait(300);
   console.log(`
 ${bgCyan(black(" Next steps "))}
 `);
-  const projectDir = path.relative(process.cwd(), cwd);
+  let projectDir = path.relative(process.cwd(), cwd);
   const devCmd = pkgManager === "npm" ? "npm run dev" : `${pkgManager} dev`;
-  console.log(`You can now ${bold(cyan("cd"))} into the ${bold(cyan(projectDir))} project directory.`);
-  console.log(`Run ${bold(cyan(devCmd))} to start the Astro dev server. ${bold(cyan("CTRL-C"))} to close.`);
-  if (!installResponse.install) {
-    console.log(yellow(`Remember to install dependencies first!`));
-  }
-  console.log(`
-Stuck? Come join us at ${bold(cyan("https://astro.build/chat"))}`);
+  await logAndWait(`You can now ${bold(cyan("cd"))} into the ${bold(cyan(projectDir))} project directory.`);
+  await logAndWait(`Run ${bold(cyan(devCmd))} to start the Astro dev server. ${bold(cyan("CTRL-C"))} to close.`);
+  await logAndWait(`Add frameworks like ${bold(cyan("react"))} and ${bold(cyan("tailwind"))} to your project using ${bold(cyan("astro add"))}`);
+  await logAndWait("");
+  await logAndWait(`Stuck? Come join us at ${bold(cyan("https://astro.build/chat"))}`, 1e3);
+  await logAndWait(dim("Good luck out there, astronaut."));
+  await logAndWait("", 300);
 }
 function emojiWithFallback(char, fallback) {
   return process.platform !== "win32" ? char : fallback;
 }
-function pkgManagerFromUserAgent(userAgent) {
-  if (!userAgent)
-    return "npm";
-  const pkgSpec = userAgent.split(" ")[0];
-  const pkgSpecArr = pkgSpec.split("/");
-  return pkgSpecArr[0];
-}
-function pkgManagerExecCommand(pkgManager) {
-  if (pkgManager === "pnpm") {
-    return "pnpx";
-  } else {
-    return "npx";
-  }
-}
 export {
   main,
   mkdirp

package/dist/logger.js

@@ -1,4 +1,4 @@
-import { bold, blue, dim, red, yellow } from "kleur/colors";
+import { blue, bold, dim, red, yellow } from "kleur/colors";
 import { Writable } from "stream";
 import { format as utilFormat } from "util";
 const dt = new Intl.DateTimeFormat([], {

package/dist/templates.js

@@ -1,22 +1,22 @@
 const TEMPLATES = [
   {
-    title: "Just the basics",
+    title: "Just the basics (recommended)",
     value: "basics"
   },
   {
     title: "Blog",
     value: "blog"
   },
-  {
-    title: "Documentation",
-    value: "docs"
-  },
   {
     title: "Portfolio",
     value: "portfolio"
   },
   {
-    title: "Completely empty",
+    title: "Documentation Site",
+    value: "docs"
+  },
+  {
+    title: "Empty project",
     value: "minimal"
   }
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "0.12.2",
+  "version": "0.12.5",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -22,21 +22,23 @@
     "create-astro.js"
   ],
   "dependencies": {
-    "@types/degit": "^2.8.3",
-    "@types/prompts": "^2.0.14",
     "chalk": "^5.0.1",
     "degit": "^2.8.4",
     "execa": "^6.1.0",
     "kleur": "^4.1.4",
     "ora": "^6.1.0",
     "prompts": "^2.4.2",
+    "which-pm-runs": "^1.1.0",
     "yargs-parser": "^21.0.1"
   },
   "devDependencies": {
     "@types/chai": "^4.3.1",
+    "@types/degit": "^2.8.3",
     "@types/mocha": "^9.1.1",
+    "@types/prompts": "^2.0.14",
+    "@types/which-pm-runs": "^1.0.0",
     "@types/yargs-parser": "^21.0.0",
-    "astro-scripts": "0.0.3",
+    "astro-scripts": "0.0.6",
     "chai": "^4.3.6",
     "mocha": "^9.2.2",
     "uvu": "^0.5.3"