create-astro 4.0.1 → 4.1.0

package/README.md

@@ -14,17 +14,23 @@ npm create astro@latest
 yarn create astro
 ```
 
-`create-astro` automatically runs in _interactive_ mode, but you can also specify your project name and template with command line arguments.
+**With PNPM:**
 
 ```bash
-# npm 6.x
-npm create astro@latest my-astro-project --template minimal
+pnpm create astro
+```
+
+`create-astro` automatically runs in _interactive_ mode, but you can also specify your project name and template with command line arguments.
 
-# npm 7+, extra double-dash is needed:
+```bash
+# npm
 npm create astro@latest my-astro-project -- --template minimal
 
 # yarn
 yarn create astro my-astro-project --template minimal
+
+# pnpm
+pnpm create astro my-astro-project --template minimal
 ```
 
 [Check out the full list][examples] of example templates, available on GitHub.

package/create-astro.mjs

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

package/dist/actions/context.d.ts

@@ -0,0 +1,24 @@
+import { prompt } from '@astrojs/cli-kit';
+export interface Context {
+    help: boolean;
+    prompt: typeof prompt;
+    cwd: string;
+    packageManager: string;
+    username: Promise<string>;
+    version: Promise<string>;
+    skipHouston: boolean;
+    fancy?: boolean;
+    dryRun?: boolean;
+    yes?: boolean;
+    projectName?: string;
+    template?: string;
+    ref: string;
+    install?: boolean;
+    git?: boolean;
+    typescript?: string;
+    stdin?: typeof process.stdin;
+    stdout?: typeof process.stdout;
+    exit(code: number): never;
+    hat?: string;
+}
+export declare function getContext(argv: string[]): Promise<Context>;

package/dist/actions/dependencies.d.ts

@@ -0,0 +1,2 @@
+import type { Context } from './context.js';
+export declare function dependencies(ctx: Pick<Context, 'install' | 'yes' | 'prompt' | 'packageManager' | 'cwd' | 'dryRun'>): Promise<void>;

package/dist/actions/git.d.ts

@@ -0,0 +1,2 @@
+import type { Context } from './context.js';
+export declare function git(ctx: Pick<Context, 'cwd' | 'git' | 'yes' | 'prompt' | 'dryRun'>): Promise<void>;

package/dist/actions/help.d.ts

@@ -0,0 +1 @@
+export declare function help(): void;

package/dist/actions/intro.d.ts

@@ -0,0 +1,2 @@
+import type { Context } from './context.js';
+export declare function intro(ctx: Pick<Context, 'hat' | 'skipHouston' | 'version' | 'username' | 'fancy'>): Promise<void>;

package/dist/actions/next-steps.d.ts

@@ -0,0 +1,2 @@
+import type { Context } from './context.js';
+export declare function next(ctx: Pick<Context, 'hat' | 'cwd' | 'packageManager' | 'skipHouston'>): Promise<void>;

package/dist/actions/project-name.d.ts

@@ -0,0 +1,2 @@
+import type { Context } from './context.js';
+export declare function projectName(ctx: Pick<Context, 'cwd' | 'prompt' | 'projectName' | 'exit'>): Promise<void>;

package/dist/actions/shared.d.ts

@@ -0,0 +1,3 @@
+export declare function isEmpty(dirPath: string): boolean;
+export declare function isValidName(projectName: string): boolean;
+export declare function toValidName(projectName: string): string;

package/dist/actions/template.d.ts

@@ -0,0 +1,4 @@
+import type { Context } from './context.js';
+export declare function template(ctx: Pick<Context, 'template' | 'prompt' | 'dryRun' | 'exit'>): Promise<void>;
+export declare function getTemplateTarget(tmpl: string, ref?: string): string;
+export default function copyTemplate(tmpl: string, ctx: Context): Promise<void>;

package/dist/actions/typescript.d.ts

@@ -0,0 +1,5 @@
+import type { Context } from './context.js';
+export declare function typescript(ctx: Pick<Context, 'typescript' | 'yes' | 'prompt' | 'dryRun' | 'cwd' | 'exit'>): Promise<void>;
+export declare function setupTypeScript(value: string, { cwd }: {
+    cwd: string;
+}): Promise<void>;

package/dist/actions/verify.d.ts

@@ -0,0 +1,2 @@
+import type { Context } from './context.js';
+export declare function verify(ctx: Pick<Context, 'version' | 'dryRun' | 'template' | 'ref' | 'exit'>): Promise<void>;

package/dist/index.d.ts

@@ -0,0 +1,12 @@
+import { getContext } from './actions/context.js';
+import { dependencies } from './actions/dependencies.js';
+import { git } from './actions/git.js';
+import { intro } from './actions/intro.js';
+import { next } from './actions/next-steps.js';
+import { projectName } from './actions/project-name.js';
+import { template } from './actions/template.js';
+import { setupTypeScript, typescript } from './actions/typescript.js';
+import { verify } from './actions/verify.js';
+import { setStdout } from './messages.js';
+export declare function main(): Promise<void>;
+export { dependencies, getContext, git, intro, next, projectName, setStdout, setupTypeScript, template, typescript, verify, };

package/dist/index.js

@@ -171,13 +171,12 @@ var require_arg = __commonJS({
 // src/actions/context.ts
 var import_arg = __toESM(require_arg(), 1);
 import { prompt } from "@astrojs/cli-kit";
+import { random } from "@astrojs/cli-kit/utils";
 import os from "node:os";
-import detectPackageManager2 from "which-pm-runs";
 
 // src/messages.ts
 import { color, say as houston, label, spinner as load } from "@astrojs/cli-kit";
 import { align, sleep } from "@astrojs/cli-kit/utils";
-import fetch from "node-fetch-native";
 import { exec } from "node:child_process";
 
 // ../../node_modules/.pnpm/ansi-regex@6.0.1/node_modules/ansi-regex/index.js
@@ -198,9 +197,6 @@ function stripAnsi(string) {
   return string.replace(regex, "");
 }
 
-// src/messages.ts
-import detectPackageManager from "which-pm-runs";
-
 // src/shell.ts
 import { spawn } from "node:child_process";
 import { text as textFromStream } from "node:stream/consumers";
@@ -233,8 +229,7 @@ async function shell(command, flags, opts = {}) {
 }
 
 // src/messages.ts
-async function getRegistry() {
-  const packageManager = detectPackageManager()?.name || "npm";
+async function getRegistry(packageManager) {
   try {
     const { stdout: stdout2 } = await shell(packageManager, ["config", "get", "registry"]);
     return stdout2?.trim()?.replace(/\/$/, "") || "https://registry.npmjs.org";
@@ -287,10 +282,10 @@ var getName = () => new Promise((resolve) => {
   });
 });
 var v;
-var getVersion = () => new Promise(async (resolve) => {
+var getVersion = (packageManager) => new Promise(async (resolve) => {
   if (v)
     return resolve(v);
-  let registry = await getRegistry();
+  let registry = await getRegistry(packageManager);
   const { version } = await fetch(`${registry}/astro/latest`, { redirect: "follow" }).then(
     (res) => res.json(),
     () => ({ version: "" })
@@ -299,10 +294,11 @@ var getVersion = () => new Promise(async (resolve) => {
   resolve(version);
 });
 var log = (message) => stdout.write(message + "\n");
-var banner = async (version) => log(
-  `
-${label("astro", color.bgGreen, color.black)}${version ? "  " + color.green(color.bold(`v${version}`)) : ""} ${color.bold("Launch sequence initiated.")}`
-);
+var banner = () => {
+  const prefix = `astro`;
+  const suffix = `Launch sequence initiated.`;
+  log(`${label(prefix, color.bgGreen, color.black)}  ${suffix}`);
+};
 var bannerAbort = () => log(`
 ${label("astro", color.bgRed)} ${color.bold("Launch sequence aborted.")}`);
 var info = async (prefix, text2) => {
@@ -388,7 +384,7 @@ function printHelp({
   if (headline) {
     message.push(
       linebreak(),
-      `${title(commandName)} ${color.green(`v${"4.0.1"}`)} ${headline}`
+      `${title(commandName)} ${color.green(`v${"4.1.0"}`)} ${headline}`
     );
   }
   if (usage) {
@@ -434,8 +430,7 @@ async function getContext(argv) {
     },
     { argv, permissive: true }
   );
-  const pkgManager = detectPackageManager2()?.name ?? "npm";
-  const [username, version] = await Promise.all([getName(), getVersion()]);
+  const packageManager = detectPackageManager() ?? "npm";
   let cwd = flags["_"][0];
   let {
     "--help": help2 = false,
@@ -466,15 +461,16 @@ async function getContext(argv) {
   const context = {
     help: help2,
     prompt,
-    pkgManager,
-    username,
-    version,
+    packageManager,
+    username: getName(),
+    version: getVersion(packageManager),
     skipHouston,
     fancy,
     dryRun,
     projectName: projectName2,
     template: template2,
     ref: ref ?? "latest",
+    hat: fancy ? random(["\u{1F3A9}", "\u{1F3A9}", "\u{1F3A9}", "\u{1F3A9}", "\u{1F393}", "\u{1F451}", "\u{1F9E2}", "\u{1F366}"]) : void 0,
     yes,
     install: install2 ?? (noInstall ? false : void 0),
     git: git2 ?? (noGit ? false : void 0),
@@ -486,6 +482,13 @@ async function getContext(argv) {
   };
   return context;
 }
+function detectPackageManager() {
+  if (!process.env.npm_config_user_agent)
+    return;
+  const specifier = process.env.npm_config_user_agent.split(" ")[0];
+  const name = specifier.substring(0, specifier.lastIndexOf("/"));
+  return name === "npminstall" ? "cnpm" : name;
+}
 
 // src/actions/dependencies.ts
 import { color as color2 } from "@astrojs/cli-kit";
@@ -508,15 +511,15 @@ async function dependencies(ctx) {
     await info("--dry-run", `Skipping dependency installation`);
   } else if (deps) {
     await spinner({
-      start: `Installing dependencies with ${ctx.pkgManager}...`,
+      start: `Installing dependencies with ${ctx.packageManager}...`,
       end: "Dependencies installed",
       while: () => {
-        return install({ pkgManager: ctx.pkgManager, cwd: ctx.cwd }).catch((e) => {
+        return install({ packageManager: ctx.packageManager, cwd: ctx.cwd }).catch((e) => {
           error("error", e);
           error(
             "error",
             `Dependencies failed to install, please run ${color2.bold(
-              ctx.pkgManager + " install"
+              ctx.packageManager + " install"
             )}  to install them manually after setup.`
           );
         });
@@ -529,10 +532,10 @@ async function dependencies(ctx) {
     );
   }
 }
-async function install({ pkgManager, cwd }) {
-  if (pkgManager === "yarn")
+async function install({ packageManager, cwd }) {
+  if (packageManager === "yarn")
     await ensureYarnLock({ cwd });
-  return shell(pkgManager, ["install"], { cwd, timeout: 9e4, stdio: "ignore" });
+  return shell(packageManager, ["install"], { cwd, timeout: 9e4, stdio: "ignore" });
 }
 async function ensureYarnLock({ cwd }) {
   const yarnLock = path.join(cwd, "yarn.lock");
@@ -623,26 +626,25 @@ function help() {
 
 // src/actions/intro.ts
 import { color as color4, label as label2 } from "@astrojs/cli-kit";
-import { random } from "@astrojs/cli-kit/utils";
+import { random as random2 } from "@astrojs/cli-kit/utils";
 async function intro(ctx) {
+  banner();
   if (!ctx.skipHouston) {
-    const hat = ctx.fancy ? random(["\u{1F3A9}", "\u{1F3A9}", "\u{1F451}", "\u{1F9E2}", "\u{1F366}"]) : void 0;
     await say(
       [
         [
           "Welcome",
           "to",
           label2("astro", color4.bgGreen, color4.black),
-          (ctx.version ? color4.green(`v${ctx.version}`) : "") + ",",
-          `${ctx.username}!`
+          Promise.resolve(ctx.version).then(
+            (version) => (version ? color4.green(`v${version}`) : "") + ","
+          ),
+          Promise.resolve(ctx.username).then((username) => `${username}!`)
         ],
-        random(welcome)
+        random2(welcome)
       ],
-      { hat }
+      { clear: true, hat: ctx.hat }
     );
-    await banner(ctx.version);
-  } else {
-    await banner(ctx.version);
   }
 }
 
@@ -650,10 +652,16 @@ async function intro(ctx) {
 import path3 from "node:path";
 async function next(ctx) {
   let projectDir = path3.relative(process.cwd(), ctx.cwd);
-  const devCmd = ctx.pkgManager === "npm" ? "npm run dev" : ctx.pkgManager === "bun" ? "bun run dev" : `${ctx.pkgManager} dev`;
+  const commandMap = {
+    npm: "npm run dev",
+    bun: "bun run dev",
+    yarn: "yarn dev",
+    pnpm: "pnpm dev"
+  };
+  const devCmd = commandMap[ctx.packageManager] || "npm run dev";
   await nextSteps({ projectDir, devCmd });
   if (!ctx.skipHouston) {
-    await say(["Good luck out there, astronaut! \u{1F680}"]);
+    await say(["Good luck out there, astronaut! \u{1F680}"], { hat: ctx.hat });
   }
   return;
 }
@@ -730,7 +738,7 @@ async function projectName(ctx) {
         return true;
       }
     });
-    ctx.cwd = name;
+    ctx.cwd = name.trim();
     ctx.projectName = toValidName(name);
   } else {
     let name = ctx.cwd;
@@ -1041,7 +1049,6 @@ async function setupTypeScript(value, { cwd }) {
 
 // src/actions/verify.ts
 import { color as color8 } from "@astrojs/cli-kit";
-import fetch2 from "node-fetch-native";
 import dns from "node:dns/promises";
 async function verify(ctx) {
   if (!ctx.dryRun) {
@@ -1074,14 +1081,14 @@ async function verifyTemplate(tmpl, ref) {
   const target = getTemplateTarget(tmpl, ref);
   const { repo, subdir, ref: branch } = parseGitURI(target.replace("github:", ""));
   const url = new URL(`/repos/${repo}/contents${subdir}?ref=${branch}`, "https://api.github.com/");
-  let res = await fetch2(url.toString(), {
+  let res = await fetch(url.toString(), {
     headers: {
       Accept: "application/vnd.github+json",
       "X-GitHub-Api-Version": "2022-11-28"
     }
   });
   if (res.status === 403) {
-    res = await fetch2(`https://github.com/${repo}/tree/${branch}${subdir}`);
+    res = await fetch(`https://github.com/${repo}/tree/${branch}${subdir}`);
   }
   return res.status === 200;
 }
@@ -1102,6 +1109,7 @@ var exit = () => process.exit(0);
 process.on("SIGINT", exit);
 process.on("SIGTERM", exit);
 async function main() {
+  console.clear();
   const cleanArgv = process.argv.slice(2).filter((arg2) => arg2 !== "--");
   const ctx = await getContext(cleanArgv);
   if (ctx.help) {

package/dist/messages.d.ts

@@ -0,0 +1,32 @@
+/** @internal Used to mock `process.stdout.write` for testing purposes */
+export declare function setStdout(writable: typeof process.stdout): void;
+export declare function say(messages: string | string[], { clear, hat }?: {
+    clear?: boolean | undefined;
+    hat?: string | undefined;
+}): Promise<void>;
+export declare function spinner(args: {
+    start: string;
+    end: string;
+    while: (...args: any) => Promise<any>;
+}): Promise<void>;
+export declare const title: (text: string) => string;
+export declare const welcome: string[];
+export declare const getName: () => Promise<string>;
+export declare const getVersion: (packageManager: string) => Promise<string>;
+export declare const log: (message: string) => boolean;
+export declare const banner: () => void;
+export declare const bannerAbort: () => boolean;
+export declare const info: (prefix: string, text: string) => Promise<void>;
+export declare const error: (prefix: string, text: string) => Promise<void>;
+export declare const typescriptByDefault: () => Promise<void>;
+export declare const nextSteps: ({ projectDir, devCmd }: {
+    projectDir: string;
+    devCmd: string;
+}) => Promise<void>;
+export declare function printHelp({ commandName, headline, usage, tables, description, }: {
+    commandName: string;
+    headline?: string;
+    usage?: string;
+    tables?: Record<string, [command: string, help: string][]>;
+    description?: string;
+}): void;

package/dist/shell.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="node" resolution-mode="require"/>
+import type { StdioOptions } from 'node:child_process';
+export interface ExecaOptions {
+    cwd?: string | URL;
+    stdio?: StdioOptions;
+    timeout?: number;
+}
+export interface Output {
+    stdout: string;
+    stderr: string;
+    exitCode: number;
+}
+export declare function shell(command: string, flags: string[], opts?: ExecaOptions): Promise<Output>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -25,14 +25,10 @@
   "//a": "MOST PACKAGES SHOULD GO IN DEV_DEPENDENCIES! THEY WILL BE BUNDLED.",
   "//b": "DEPENDENCIES IS FOR UNBUNDLED PACKAGES",
   "dependencies": {
-    "@astrojs/cli-kit": "^0.2.3",
-    "execa": "^8.0.1",
-    "giget": "1.1.2",
-    "node-fetch-native": "^1.4.0",
-    "which-pm-runs": "^1.1.0"
+    "@astrojs/cli-kit": "^0.3.0",
+    "giget": "1.1.2"
   },
   "devDependencies": {
-    "@types/which-pm-runs": "^1.0.0",
     "arg": "^5.0.2",
     "chai": "^4.3.7",
     "mocha": "^10.2.0",