create-astro 0.12.0 → 0.12.3

package/LICENSE

@@ -0,0 +1,61 @@
+MIT License
+
+Copyright (c) 2021 Fred K. Schott
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+"""
+This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/sveltejs/kit repository:
+
+Copyright (c) 2020 [these people](https://github.com/sveltejs/kit/graphs/contributors)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+"""
+
+
+"""
+This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/vitejs/vite repository:
+
+MIT License
+
+Copyright (c) 2019-present, Yuxi (Evan) You and Vite contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""

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/gradient.js

@@ -0,0 +1,65 @@
+import chalk from "chalk";
+import ora from "ora";
+const gradientColors = [
+  `#ff5e00`,
+  `#ff4c29`,
+  `#ff383f`,
+  `#ff2453`,
+  `#ff0565`,
+  `#ff007b`,
+  `#f5008b`,
+  `#e6149c`,
+  `#d629ae`,
+  `#c238bd`
+];
+const rocketAscii = "\u25A0\u25A0\u25B6";
+const referenceGradient = [
+  ...gradientColors,
+  ...[...gradientColors].reverse(),
+  ...gradientColors
+];
+const sleep = (time) => new Promise((resolve) => {
+  setTimeout(resolve, time);
+});
+function getGradientAnimFrames() {
+  const frames = [];
+  for (let start = 0; start < gradientColors.length * 2; start++) {
+    const end = start + gradientColors.length - 1;
+    frames.push(referenceGradient.slice(start, end).map((g) => chalk.bgHex(g)(" ")).join(""));
+  }
+  return frames;
+}
+function getIntroAnimFrames() {
+  const frames = [];
+  for (let end = 1; end <= gradientColors.length; end++) {
+    const leadingSpacesArr = Array.from(new Array(Math.abs(gradientColors.length - end - 1)), () => " ");
+    const gradientArr = gradientColors.slice(0, end).map((g) => chalk.bgHex(g)(" "));
+    frames.push([...leadingSpacesArr, ...gradientArr].join(""));
+  }
+  return frames;
+}
+async function loadWithRocketGradient(text) {
+  const frames = getIntroAnimFrames();
+  const intro = ora({
+    spinner: {
+      interval: 30,
+      frames
+    },
+    text: `${rocketAscii} ${text}`
+  });
+  intro.start();
+  await sleep((frames.length - 1) * intro.interval);
+  intro.stop();
+  const spinner = ora({
+    spinner: {
+      interval: 80,
+      frames: getGradientAnimFrames()
+    },
+    text: `${rocketAscii} ${text}`
+  }).start();
+  return spinner;
+}
+export {
+  loadWithRocketGradient,
+  rocketAscii
+};

package/dist/index.js

@@ -1,13 +1,21 @@
+import degit from "degit";
+import { execa, execaCommand } from "execa";
 import fs from "fs";
+import { bgCyan, black, bold, cyan, dim, gray, green, red, 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 yargs from "yargs-parser";
-import ora from "ora";
+import { loadWithRocketGradient, rocketAscii } from "./gradient.js";
+import { defaultLogLevel, logger } from "./logger.js";
 import { TEMPLATES } from "./templates.js";
-import { logger, defaultLogLevel } from "./logger.js";
-import { execa, execaCommand } from "execa";
+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);
@@ -30,8 +38,8 @@ async function main() {
   logger.debug("Verbose logging turned on");
   console.log(`
 ${bold("Welcome to Astro!")} ${gray(`(create-astro v${version})`)}`);
-  let spinner = ora({ color: "green", text: "Prepare for liftoff." });
-  spinner.succeed();
+  console.log(`Lets walk through setting up your new Astro project.
+`);
   let cwd = args["_"][2];
   if (cwd && isEmpty(cwd)) {
     let acknowledgeProjectDir = ora({
@@ -49,7 +57,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)) {
@@ -67,13 +75,14 @@ ${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
     }
   ]);
   if (!options.template) {
     process.exit(1);
   }
+  const templateSpinner = await loadWithRocketGradient("Copying project files...");
   const hash = args.commit ? `#${args.commit}` : "";
   const templateTarget = `withastro/astro/examples/${options.template}#latest`;
   const emitter = degit(`${templateTarget}${hash}`, {
@@ -86,8 +95,7 @@ ${bold("Welcome to Astro!")} ${gray(`(create-astro v${version})`)}`);
     force: true,
     verbose: defaultLogLevel === "debug" ? true : false
   });
-  spinner = ora({ color: "green", text: "Copying project files..." }).start();
-  if (!args.dryrun) {
+  if (!args.dryRun) {
     try {
       emitter.on("info", (info) => {
         logger.debug(info.message);
@@ -104,7 +112,7 @@ ${bold("Welcome to Astro!")} ${gray(`(create-astro v${version})`)}`);
         console.log(yellow("This seems to be an issue with degit. Please check if you have 'git' installed on your system, and install it if you don't have (https://git-scm.com)."));
         console.log(yellow("If you do have 'git' installed, please run this command with the --verbose flag and file a new issue with the command output here: https://github.com/withastro/astro/issues"));
       }
-      spinner.fail();
+      templateSpinner.fail();
       process.exit(1);
     }
     await Promise.all(FILES_TO_REMOVE.map(async (file) => {
@@ -114,77 +122,62 @@ ${bold("Welcome to Astro!")} ${gray(`(create-astro v${version})`)}`);
       }
     }));
   }
-  spinner.succeed();
-  console.log(bold(green("\u2714") + " Done!"));
+  templateSpinner.text = green("Template copied!");
+  templateSpinner.succeed();
   const installResponse = await prompts({
     type: "confirm",
     name: "install",
     message: `Would you like us to run "${pkgManager} install?"`,
     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}", "...")}`;
-    spinner = ora({ color: "green", text: installingPackagesMsg }).start();
+    const installSpinner = await loadWithRocketGradient(installingPackagesMsg);
     await new Promise((resolve, reject) => {
       var _a;
       (_a = installExec.stdout) == null ? void 0 : _a.on("data", function(data) {
-        spinner.text = `${installingPackagesMsg}
+        installSpinner.text = `${rocketAscii} ${installingPackagesMsg}
 ${bold(`[${pkgManager}]`)} ${data}`;
       });
       installExec.on("error", (error) => reject(error));
       installExec.on("close", () => resolve());
     });
-    spinner.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" });
+    installSpinner.text = green("Packages installed!");
+    installSpinner.succeed();
+  } else {
+    ora().info(dim(`No problem! You can install dependencies yourself after setup.`));
   }
   const gitResponse = await prompts({
     type: "confirm",
     name: "git",
-    message: "Initialize a git repository?",
+    message: `Initialize a new git repository? ${dim("This can be useful to track changes.")}`,
     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().succeed("Setup complete.");
+  ora({ text: green("Ready for liftoff!") }).succeed();
+  await wait(300);
   console.log(`
 ${bgCyan(black(" Next steps "))}
 `);
-  const relative = path.relative(process.cwd(), cwd);
-  const startCommand = [];
-  if (relative !== "") {
-    startCommand.push(bold(cyan(`cd ${relative}`)));
-  }
-  if (!installResponse.install) {
-    startCommand.push(bold(cyan(`${pkgManager} install`)));
-  }
-  startCommand.push(bold(cyan(pkgManager === "npm" ? "npm run dev" : `${pkgManager} dev`)));
-  console.log(startCommand.join(" && "));
-  console.log(`
-To close the dev server, hit ${bold(cyan("Ctrl-C"))}`);
-  console.log(`Stuck? Visit us at ${cyan("https://astro.build/chat")}
-`);
+  let projectDir = path.relative(process.cwd(), cwd);
+  const devCmd = pkgManager === "npm" ? "npm run dev" : `${pkgManager} dev`;
+  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;

package/dist/logger.js

@@ -1,20 +1,10 @@
-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";
-function getLoggerLocale() {
-  const defaultLocale = "en-US";
-  if (process.env.LANG) {
-    const extractedLocale = process.env.LANG.split(".")[0].replace(/_/g, "-");
-    if (extractedLocale.length < 2)
-      return defaultLocale;
-    else
-      return extractedLocale;
-  } else
-    return defaultLocale;
-}
-const dt = new Intl.DateTimeFormat(getLoggerLocale(), {
+const dt = new Intl.DateTimeFormat([], {
   hour: "2-digit",
-  minute: "2-digit"
+  minute: "2-digit",
+  second: "2-digit"
 });
 const defaultLogDestination = new Writable({
   objectMode: true,

package/dist/types/gradient.d.ts

@@ -0,0 +1,8 @@
+import type { Ora } from 'ora';
+export declare const rocketAscii = "\u25A0\u25A0\u25B6";
+/**
+ * Generate loading spinner with rocket flames!
+ * @param text display text next to rocket
+ * @returns Ora spinner for running .stop()
+ */
+export declare function loadWithRocketGradient(text: string): Promise<Ora>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "0.12.0",
+  "version": "0.12.3",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -17,12 +17,6 @@
   "bin": {
     "create-astro": "./create-astro.mjs"
   },
-  "scripts": {
-    "build": "astro-scripts build \"src/**/*.ts\" && tsc",
-    "build:ci": "astro-scripts build \"src/**/*.ts\"",
-    "dev": "astro-scripts dev \"src/**/*.ts\"",
-    "test": "mocha --exit --timeout 20000"
-  },
   "files": [
     "dist",
     "create-astro.js"
@@ -30,6 +24,7 @@
   "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",
@@ -41,12 +36,18 @@
     "@types/chai": "^4.3.1",
     "@types/mocha": "^9.1.1",
     "@types/yargs-parser": "^21.0.0",
-    "astro-scripts": "workspace:*",
+    "astro-scripts": "0.0.5",
     "chai": "^4.3.6",
     "mocha": "^9.2.2",
     "uvu": "^0.5.3"
   },
   "engines": {
     "node": "^14.15.0 || >=16.0.0"
+  },
+  "scripts": {
+    "build": "astro-scripts build \"src/**/*.ts\" && tsc",
+    "build:ci": "astro-scripts build \"src/**/*.ts\"",
+    "dev": "astro-scripts dev \"src/**/*.ts\"",
+    "test": "mocha --exit --timeout 20000"
   }
-}
+}