create-astro 0.11.0 → 0.12.2

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/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,6 +1,6 @@
 import fs from "fs";
 import path from "path";
-import { bold, cyan, gray, green, red, yellow } from "kleur/colors";
+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";
@@ -8,6 +8,7 @@ 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";
 const cleanArgv = process.argv.filter((arg) => arg !== "--");
 const args = yargs(cleanArgv);
 prompts.override(args);
@@ -30,8 +31,6 @@ 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();
   let cwd = args["_"][2];
   if (cwd && isEmpty(cwd)) {
     let acknowledgeProjectDir = ora({
@@ -74,6 +73,7 @@ ${bold("Welcome to Astro!")} ${gray(`(create-astro v${version})`)}`);
   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,7 +86,6 @@ ${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) {
     try {
       emitter.on("info", (info) => {
@@ -104,7 +103,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,8 +113,8 @@ ${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",
@@ -125,22 +124,21 @@ ${bold("Welcome to Astro!")} ${gray(`(create-astro v${version})`)}`);
   if (!installResponse) {
     process.exit(0);
   }
-  if (installResponse.install) {
+  if (installResponse.install && !args.dryrun) {
     const installExec = execa(pkgManager, ["install"], { cwd });
     const installingPackagesMsg = `Installing packages${emojiWithFallback(" \u{1F4E6}", "...")}`;
-    spinner = ora({ color: "green", text: installingPackagesMsg }).start();
-    if (!args.dryrun) {
-      await new Promise((resolve, reject) => {
-        var _a;
-        (_a = installExec.stdout) == null ? void 0 : _a.on("data", function(data) {
-          spinner.text = `${installingPackagesMsg}
+    const installSpinner = await loadWithRocketGradient(installingPackagesMsg);
+    await new Promise((resolve, reject) => {
+      var _a;
+      (_a = installExec.stdout) == null ? void 0 : _a.on("data", function(data) {
+        installSpinner.text = `${rocketAscii} ${installingPackagesMsg}
 ${bold(`[${pkgManager}]`)} ${data}`;
-        });
-        installExec.on("error", (error) => reject(error));
-        installExec.on("close", () => resolve());
       });
-    }
-    spinner.succeed();
+      installExec.on("error", (error) => reject(error));
+      installExec.on("close", () => resolve());
+    });
+    installSpinner.text = green("Packages installed!");
+    installSpinner.succeed();
   }
   const astroAddCommand = installResponse.install ? "astro add --yes" : `${pkgManagerExecCommand(pkgManager)} astro@latest add --yes`;
   const astroAddResponse = await prompts({
@@ -158,23 +156,31 @@ ${bold(`[${pkgManager}]`)} ${data}`;
   if (astroAddResponse.astroAdd && !args.dryrun) {
     await execaCommand(astroAddCommand, astroAddCommand === "astro add --yes" ? { cwd, stdio: "inherit", localDir: cwd, preferLocal: true } : { cwd, stdio: "inherit" });
   }
-  console.log("\nNext steps:");
-  let i = 1;
-  const relative = path.relative(process.cwd(), cwd);
-  if (relative !== "") {
-    console.log(`  ${i++}: ${bold(cyan(`cd ${relative}`))}`);
+  const gitResponse = await prompts({
+    type: "confirm",
+    name: "git",
+    message: "Initialize a git repository?",
+    initial: true
+  });
+  if (!gitResponse) {
+    process.exit(0);
   }
-  if (!installResponse.install) {
-    console.log(`  ${i++}: ${bold(cyan(`${pkgManager} install`))}`);
+  if (gitResponse.git && !args.dryrun) {
+    await execaCommand("git init", { cwd });
   }
-  console.log(`  ${i++}: ${bold(cyan('git init && git add -A && git commit -m "Initial commit"'))} (optional step)`);
-  const runCommand = pkgManager === "npm" ? "npm run dev" : `${pkgManager} dev`;
-  console.log(`  ${i++}: ${bold(cyan(runCommand))}`);
-  console.log(`
-To close the dev server, hit ${bold(cyan("Ctrl-C"))}`);
+  ora({ text: green("Done. Ready for liftoff!") }).succeed();
   console.log(`
-Stuck? Visit us at ${cyan("https://astro.build/chat")}
+${bgCyan(black(" Next steps "))}
 `);
+  const 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"))}`);
 }
 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 { 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.11.0",
+  "version": "0.12.2",
   "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.3",
     "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"
   }
-}
+}