create-astro 0.9.0 → 0.10.0

package/dist/index.js

@@ -26,6 +26,7 @@ import { FRAMEWORKS, COUNTER_COMPONENTS } from "./frameworks.js";
 import { TEMPLATES } from "./templates.js";
 import { createConfig } from "./config.js";
 import { logger, defaultLogLevel } from "./logger.js";
+import { execa } from "execa";
 const cleanArgv = process.argv.filter((arg) => arg !== "--");
 const args = yargs(cleanArgv);
 prompts.override(args);
@@ -42,8 +43,10 @@ function isEmpty(dirPath) {
   return !fs.existsSync(dirPath) || fs.readdirSync(dirPath).length === 0;
 }
 const { version } = JSON.parse(fs.readFileSync(new URL("../package.json", import.meta.url), "utf-8"));
+const FILES_TO_REMOVE = [".stackblitzrc", "sandbox.config.json"];
 const POSTPROCESS_FILES = ["package.json", "astro.config.mjs", "CHANGELOG.md"];
 async function main() {
+  const pkgManager = pkgManagerFromUserAgent(process.env.npm_config_user_agent);
   logger.debug("Verbose logging turned on");
   console.log(`
 ${bold("Welcome to Astro!")} ${gray(`(create-astro v${version})`)}`);
@@ -119,97 +122,144 @@ ${bold("Welcome to Astro!")} ${gray(`(create-astro v${version})`)}`);
     integrations = result.integrations;
   }
   spinner = ora({ color: "green", text: "Copying project files..." }).start();
-  try {
-    emitter.on("info", (info) => {
-      logger.debug(info.message);
-    });
-    await emitter.clone(cwd);
-  } catch (err) {
-    logger.debug(err);
-    console.error(red(err.message));
-    if (err.message === "zlib: unexpected end of file") {
-      console.log(yellow("This seems to be a cache related problem. Remove the folder '~/.degit/github/withastro' to fix this error."));
-      console.log(yellow("For more information check out this issue: https://github.com/withastro/astro/issues/655"));
-    }
-    if (err.code === "MISSING_REF") {
-      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();
-    process.exit(1);
-  }
-  await Promise.all(POSTPROCESS_FILES.map(async (file) => {
-    const fileLoc = path.resolve(path.join(cwd, file));
-    switch (file) {
-      case "CHANGELOG.md": {
-        if (fs.existsSync(fileLoc)) {
-          await fs.promises.unlink(fileLoc);
-        }
-        break;
+  if (!args.dryrun) {
+    try {
+      emitter.on("info", (info) => {
+        logger.debug(info.message);
+      });
+      await emitter.clone(cwd);
+    } catch (err) {
+      logger.debug(err);
+      console.error(red(err.message));
+      if (err.message === "zlib: unexpected end of file") {
+        console.log(yellow("This seems to be a cache related problem. Remove the folder '~/.degit/github/withastro' to fix this error."));
+        console.log(yellow("For more information check out this issue: https://github.com/withastro/astro/issues/655"));
       }
-      case "astro.config.mjs": {
-        if ((selectedTemplate == null ? void 0 : selectedTemplate.integrations) !== true) {
-          break;
-        }
-        await fs.promises.writeFile(fileLoc, createConfig({ integrations }));
-        break;
+      if (err.code === "MISSING_REF") {
+        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"));
       }
-      case "package.json": {
-        const packageJSON = JSON.parse(await fs.promises.readFile(fileLoc, "utf8"));
-        delete packageJSON.snowpack;
-        const integrationEntries = (await Promise.all(integrations.map((integration) => fetch(`https://registry.npmjs.org/${integration.packageName}/latest`).then((res) => res.json()).then((res) => {
-          let dependencies = [[res["name"], `^${res["version"]}`]];
-          if (res["peerDependencies"]) {
-            for (const peer in res["peerDependencies"]) {
-              dependencies.push([peer, res["peerDependencies"][peer]]);
+      spinner.fail();
+      process.exit(1);
+    }
+    await Promise.all([
+      ...FILES_TO_REMOVE.map(async (file) => {
+        const fileLoc = path.resolve(path.join(cwd, file));
+        return fs.promises.rm(fileLoc);
+      }),
+      ...POSTPROCESS_FILES.map(async (file) => {
+        const fileLoc = path.resolve(path.join(cwd, file));
+        switch (file) {
+          case "CHANGELOG.md": {
+            if (fs.existsSync(fileLoc)) {
+              await fs.promises.unlink(fileLoc);
             }
+            break;
           }
-          return dependencies;
-        })))).flat(1);
-        packageJSON.devDependencies = __spreadValues(__spreadValues({}, packageJSON.devDependencies ?? {}), Object.fromEntries(integrationEntries));
-        packageJSON.devDependencies = Object.fromEntries(Object.entries(packageJSON.devDependencies).sort((a, b) => a[0].localeCompare(b[0])));
-        await fs.promises.writeFile(fileLoc, JSON.stringify(packageJSON, void 0, 2));
-        break;
-      }
+          case "astro.config.mjs": {
+            if ((selectedTemplate == null ? void 0 : selectedTemplate.integrations) !== true) {
+              break;
+            }
+            await fs.promises.writeFile(fileLoc, createConfig({ integrations }));
+            break;
+          }
+          case "package.json": {
+            const packageJSON = JSON.parse(await fs.promises.readFile(fileLoc, "utf8"));
+            delete packageJSON.snowpack;
+            const integrationEntries = (await Promise.all(integrations.map((integration) => fetch(`https://registry.npmjs.org/${integration.packageName}/latest`).then((res) => res.json()).then((res) => {
+              let dependencies = [[res["name"], `^${res["version"]}`]];
+              if (res["peerDependencies"]) {
+                for (const peer in res["peerDependencies"]) {
+                  dependencies.push([peer, res["peerDependencies"][peer]]);
+                }
+              }
+              return dependencies;
+            })))).flat(1);
+            packageJSON.devDependencies = __spreadValues(__spreadValues({}, packageJSON.devDependencies ?? {}), Object.fromEntries(integrationEntries));
+            packageJSON.devDependencies = Object.fromEntries(Object.entries(packageJSON.devDependencies).sort((a, b) => a[0].localeCompare(b[0])));
+            await fs.promises.writeFile(fileLoc, JSON.stringify(packageJSON, void 0, 2));
+            break;
+          }
+        }
+      })
+    ]);
+    if ((selectedTemplate == null ? void 0 : selectedTemplate.value) === "starter") {
+      let importStatements = [];
+      let components = [];
+      await Promise.all(integrations.map(async (integration) => {
+        const component = COUNTER_COMPONENTS[integration.id];
+        const componentName = path.basename(component.filename, path.extname(component.filename));
+        const absFileLoc = path.resolve(cwd, component.filename);
+        importStatements.push(`import ${componentName} from '${component.filename.replace(/^src/, "..")}';`);
+        components.push(`<${componentName} client:visible />`);
+        await fs.promises.writeFile(absFileLoc, component.content);
+      }));
+      const pageFileLoc = path.resolve(path.join(cwd, "src", "pages", "index.astro"));
+      const content = (await fs.promises.readFile(pageFileLoc)).toString();
+      const newContent = content.replace(/^(\s*)\/\* ASTRO\:COMPONENT_IMPORTS \*\//gm, (_, indent) => {
+        return indent + importStatements.join("\n");
+      }).replace(/^(\s*)<!-- ASTRO:COMPONENT_MARKUP -->/gm, (_, indent) => {
+        return components.map((ln) => indent + ln).join("\n");
+      });
+      await fs.promises.writeFile(pageFileLoc, newContent);
     }
-  }));
-  if ((selectedTemplate == null ? void 0 : selectedTemplate.value) === "starter") {
-    let importStatements = [];
-    let components = [];
-    await Promise.all(integrations.map(async (integration) => {
-      const component = COUNTER_COMPONENTS[integration.id];
-      const componentName = path.basename(component.filename, path.extname(component.filename));
-      const absFileLoc = path.resolve(cwd, component.filename);
-      importStatements.push(`import ${componentName} from '${component.filename.replace(/^src/, "..")}';`);
-      components.push(`<${componentName} client:visible />`);
-      await fs.promises.writeFile(absFileLoc, component.content);
-    }));
-    const pageFileLoc = path.resolve(path.join(cwd, "src", "pages", "index.astro"));
-    const content = (await fs.promises.readFile(pageFileLoc)).toString();
-    const newContent = content.replace(/^(\s*)\/\* ASTRO\:COMPONENT_IMPORTS \*\//gm, (_, indent) => {
-      return indent + importStatements.join("\n");
-    }).replace(/^(\s*)<!-- ASTRO:COMPONENT_MARKUP -->/gm, (_, indent) => {
-      return components.map((ln) => indent + ln).join("\n");
-    });
-    await fs.promises.writeFile(pageFileLoc, newContent);
   }
   spinner.succeed();
   console.log(bold(green("\u2714") + " Done!"));
+  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) {
+    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}
+${bold(`[${pkgManager}]`)} ${data}`;
+        });
+        installExec.on("error", (error) => reject(error));
+        installExec.on("close", () => resolve());
+      });
+    }
+    spinner.succeed();
+  }
   console.log("\nNext steps:");
   let i = 1;
   const relative = path.relative(process.cwd(), cwd);
   if (relative !== "") {
     console.log(`  ${i++}: ${bold(cyan(`cd ${relative}`))}`);
   }
-  console.log(`  ${i++}: ${bold(cyan("npm install"))} (or pnpm install, yarn, etc)`);
+  if (!installResponse.install) {
+    console.log(`  ${i++}: ${bold(cyan(`${pkgManager} install`))}`);
+  }
   console.log(`  ${i++}: ${bold(cyan('git init && git add -A && git commit -m "Initial commit"'))} (optional step)`);
-  console.log(`  ${i++}: ${bold(cyan("npm run dev"))} (or pnpm, yarn, etc)`);
+  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"))}`);
   console.log(`
 Stuck? Visit us at ${cyan("https://astro.build/chat")}
 `);
 }
+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];
+}
 export {
   main,
   mkdirp

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -31,6 +31,7 @@
     "@types/degit": "^2.8.3",
     "@types/prompts": "^2.0.14",
     "degit": "^2.8.4",
+    "execa": "^6.1.0",
     "kleur": "^4.1.4",
     "node-fetch": "^3.2.3",
     "ora": "^6.1.0",
@@ -39,7 +40,7 @@
   },
   "devDependencies": {
     "@types/chai": "^4.3.1",
-    "@types/mocha": "^9.1.0",
+    "@types/mocha": "^9.1.1",
     "@types/yargs-parser": "^21.0.0",
     "astro-scripts": "workspace:*",
     "chai": "^4.3.6",