create-astro 4.10.0 → 4.11.0-beta.0

package/README.md

@@ -45,19 +45,19 @@ npm create astro@latest my-astro-project -- --template cassidoo/shopify-react-as
 
 May be provided in place of prompts
 
-| Name                         | Description                                            |
-| :--------------------------- | :----------------------------------------------------- |
-| `--help` (`-h`)              | Display available flags.                               |
-| `--template <name>`          | Specify your template.                                 |
-| `--install` / `--no-install` | Install dependencies (or not).                         |
-| `--git` / `--no-git`         | Initialize git repo (or not).                          |
-| `--yes` (`-y`)               | Skip all prompts by accepting defaults.                |
-| `--no` (`-n`)                | Skip all prompts by declining defaults.                |
-| `--dry-run`                  | Walk through steps without executing.                  |
-| `--skip-houston`             | Skip Houston animation.                                |
-| `--ref`                      | Specify an Astro branch (default: latest).             |
-| `--fancy`                    | Enable full Unicode support for Windows.               |
-| `--typescript <option>`      | TypeScript option: `strict` / `strictest` / `relaxed`. |
+| Name                         | Description                                |
+| :--------------------------- | :----------------------------------------- |
+| `--help` (`-h`)              | Display available flags.                   |
+| `--template <name>`          | Specify your template.                     |
+| `--install` / `--no-install` | Install dependencies (or not).             |
+| `--add <integrations>`       | Add integrations.                          |
+| `--git` / `--no-git`         | Initialize git repo (or not).              |
+| `--yes` (`-y`)               | Skip all prompts by accepting defaults.    |
+| `--no` (`-n`)                | Skip all prompts by declining defaults.    |
+| `--dry-run`                  | Walk through steps without executing.      |
+| `--skip-houston`             | Skip Houston animation.                    |
+| `--ref`                      | Specify an Astro branch (default: latest). |
+| `--fancy`                    | Enable full Unicode support for Windows.   |
 
 [examples]: https://github.com/withastro/astro/tree/main/examples
 [typescript]: https://github.com/withastro/astro/tree/main/packages/astro/tsconfigs

package/dist/actions/context.d.ts

@@ -8,6 +8,7 @@ export interface Context {
     version: Promise<string>;
     skipHouston: boolean;
     fancy?: boolean;
+    add?: string[];
     dryRun?: boolean;
     yes?: boolean;
     projectName?: string;

package/dist/actions/dependencies.d.ts

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

package/dist/index.d.ts

@@ -5,8 +5,7 @@ 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, };
+export { dependencies, getContext, git, intro, next, projectName, setStdout, template, verify };

package/dist/index.js

@@ -228,6 +228,7 @@ function getSeasonalHouston({ fancy }) {
           `Your creativity is the gift that keeps on giving!`
         ]
       };
+    case void 0:
     default:
       return {
         hats: fancy ? ["\u{1F3A9}", "\u{1F3A9}", "\u{1F3A9}", "\u{1F3A9}", "\u{1F393}", "\u{1F451}", "\u{1F9E2}", "\u{1F366}"] : void 0,
@@ -380,11 +381,6 @@ var error = async (prefix, text2) => {
     log(`${" ".repeat(5)} ${color.red("\u25B2")}  ${color.red(prefix)} ${color.dim(text2)}`);
   }
 };
-var typescriptByDefault = async () => {
-  await info(`No worries!`, "TypeScript is supported in Astro by default,");
-  log(`${" ".repeat(9)}${color.dim("but you are free to continue writing JavaScript instead.")}`);
-  await sleep(1e3);
-};
 var nextSteps = async ({ projectDir, devCmd }) => {
   const max = stdout.columns;
   const prefix = max < 80 ? " " : " ".repeat(9);
@@ -446,7 +442,7 @@ function printHelp({
   if (headline) {
     message.push(
       linebreak(),
-      `${title(commandName)} ${color.green(`v${"4.10.0"}`)} ${headline}`
+      `${title(commandName)} ${color.green(`v${"4.11.0-beta.0"}`)} ${headline}`
     );
   }
   if (usage) {
@@ -481,11 +477,11 @@ async function getContext(argv) {
       "--no-install": Boolean,
       "--git": Boolean,
       "--no-git": Boolean,
-      "--typescript": String,
       "--skip-houston": Boolean,
       "--dry-run": Boolean,
       "--help": Boolean,
       "--fancy": Boolean,
+      "--add": [String],
       "-y": "--yes",
       "-n": "--no",
       "-h": "--help"
@@ -503,29 +499,29 @@ async function getContext(argv) {
     "--no-install": noInstall,
     "--git": git2,
     "--no-git": noGit,
-    "--typescript": typescript2,
     "--fancy": fancy,
     "--skip-houston": skipHouston,
     "--dry-run": dryRun,
-    "--ref": ref
+    "--ref": ref,
+    "--add": add
   } = flags;
   let projectName2 = cwd;
   if (no) {
     yes = false;
     if (install2 == void 0) install2 = false;
     if (git2 == void 0) git2 = false;
-    if (typescript2 == void 0) typescript2 = "strict";
   }
-  skipHouston = (os.platform() === "win32" && !fancy || skipHouston) ?? [yes, no, install2, git2, typescript2].some((v) => v !== void 0);
+  skipHouston = (os.platform() === "win32" && !fancy || skipHouston) ?? [yes, no, install2, git2].some((v) => v !== void 0);
   const { messages, hats, ties } = getSeasonalHouston({ fancy });
   const context = {
     help: help2,
     prompt,
     packageManager,
     username: getName(),
-    version: getVersion(packageManager, "astro", "4.16.1"),
+    version: getVersion(packageManager, "astro", "5.0.0-beta.7"),
     skipHouston,
     fancy,
+    add,
     dryRun,
     projectName: projectName2,
     template: template2,
@@ -536,7 +532,6 @@ async function getContext(argv) {
     yes,
     install: install2 ?? (noInstall ? false : void 0),
     git: git2 ?? (noGit ? false : void 0),
-    typescript: typescript2,
     cwd,
     exit(code) {
       process.exit(code);
@@ -572,8 +567,12 @@ async function dependencies(ctx) {
     }));
     ctx.install = deps;
   }
+  ctx.add = ctx.add?.reduce((acc, item) => acc.concat(item.split(",")), []);
   if (ctx.dryRun) {
-    await info("--dry-run", `Skipping dependency installation`);
+    await info(
+      "--dry-run",
+      `Skipping dependency installation${ctx.add ? ` and adding ${ctx.add.join(", ")}` : ""}`
+    );
   } else if (deps) {
     ctx.tasks.push({
       pending: "Dependencies",
@@ -590,6 +589,24 @@ async function dependencies(ctx) {
       },
       while: () => install({ packageManager: ctx.packageManager, cwd: ctx.cwd })
     });
+    let add = ctx.add;
+    if (add) {
+      ctx.tasks.push({
+        pending: "Integrations",
+        start: `Adding integrations with astro add`,
+        end: "Integrations added",
+        onError: (e) => {
+          error("error", e);
+          error(
+            "error",
+            `Failed to add integrations, please run ${color2.bold(
+              `astro add ${add.join(" ")}`
+            )} to install them manually after setup.`
+          );
+        },
+        while: () => astroAdd({ integrations: add, packageManager: ctx.packageManager, cwd: ctx.cwd })
+      });
+    }
   } else {
     await info(
       ctx.yes === false ? "deps [skip]" : "No problem!",
@@ -597,6 +614,18 @@ async function dependencies(ctx) {
     );
   }
 }
+async function astroAdd({
+  integrations,
+  packageManager,
+  cwd
+}) {
+  if (packageManager === "yarn") await ensureYarnLock({ cwd });
+  return shell(
+    packageManager === "npm" ? "npx" : `${packageManager} dlx`,
+    ["astro add", integrations.join(" "), "-y"],
+    { cwd, timeout: 9e4, stdio: "ignore" }
+  );
+}
 async function install({ packageManager, cwd }) {
   if (packageManager === "yarn") await ensureYarnLock({ cwd });
   return shell(packageManager, ["install"], { cwd, timeout: 9e4, stdio: "ignore" });
@@ -675,14 +704,14 @@ function help() {
         ["--help (-h)", "See all available flags."],
         ["--template <name>", "Specify your template."],
         ["--install / --no-install", "Install dependencies (or not)."],
+        ["--add <integrations>", "Add integrations."],
         ["--git / --no-git", "Initialize git repo (or not)."],
         ["--yes (-y)", "Skip all prompts by accepting defaults."],
         ["--no (-n)", "Skip all prompts by declining defaults."],
         ["--dry-run", "Walk through steps without executing."],
         ["--skip-houston", "Skip Houston animation."],
         ["--ref", "Choose astro branch (default: latest)."],
-        ["--fancy", "Enable full Unicode support for Windows."],
-        ["--typescript <option>", "TypeScript option: strict | strictest | relaxed."]
+        ["--fancy", "Enable full Unicode support for Windows."]
       ]
     }
   });
@@ -854,9 +883,9 @@ async function template(ctx) {
       message: "How would you like to start your new project?",
       initial: "basics",
       choices: [
-        { value: "basics", label: "Include sample files", hint: "(recommended)" },
+        { value: "basics", label: "A basic, minimal starter", hint: "(recommended)" },
         { value: "blog", label: "Use blog template" },
-        { value: "minimal", label: "Empty" }
+        { value: "starlight", label: "Use docs (Starlight) template" }
       ]
     });
     ctx.template = tmpl;
@@ -959,231 +988,9 @@ async function copyTemplate(tmpl, ctx) {
   }
 }
 
-// src/actions/typescript.ts
-import { readFile, rm, writeFile } from "node:fs/promises";
-import path6 from "node:path";
-import { color as color7 } from "@astrojs/cli-kit";
-
-// ../../node_modules/.pnpm/strip-json-comments@5.0.1/node_modules/strip-json-comments/index.js
-var singleComment = Symbol("singleComment");
-var multiComment = Symbol("multiComment");
-var stripWithoutWhitespace = () => "";
-var stripWithWhitespace = (string, start, end) => string.slice(start, end).replace(/\S/g, " ");
-var isEscaped = (jsonString, quotePosition) => {
-  let index = quotePosition - 1;
-  let backslashCount = 0;
-  while (jsonString[index] === "\\") {
-    index -= 1;
-    backslashCount += 1;
-  }
-  return Boolean(backslashCount % 2);
-};
-function stripJsonComments(jsonString, { whitespace = true, trailingCommas = false } = {}) {
-  if (typeof jsonString !== "string") {
-    throw new TypeError(`Expected argument \`jsonString\` to be a \`string\`, got \`${typeof jsonString}\``);
-  }
-  const strip = whitespace ? stripWithWhitespace : stripWithoutWhitespace;
-  let isInsideString = false;
-  let isInsideComment = false;
-  let offset = 0;
-  let buffer = "";
-  let result = "";
-  let commaIndex = -1;
-  for (let index = 0; index < jsonString.length; index++) {
-    const currentCharacter = jsonString[index];
-    const nextCharacter = jsonString[index + 1];
-    if (!isInsideComment && currentCharacter === '"') {
-      const escaped = isEscaped(jsonString, index);
-      if (!escaped) {
-        isInsideString = !isInsideString;
-      }
-    }
-    if (isInsideString) {
-      continue;
-    }
-    if (!isInsideComment && currentCharacter + nextCharacter === "//") {
-      buffer += jsonString.slice(offset, index);
-      offset = index;
-      isInsideComment = singleComment;
-      index++;
-    } else if (isInsideComment === singleComment && currentCharacter + nextCharacter === "\r\n") {
-      index++;
-      isInsideComment = false;
-      buffer += strip(jsonString, offset, index);
-      offset = index;
-      continue;
-    } else if (isInsideComment === singleComment && currentCharacter === "\n") {
-      isInsideComment = false;
-      buffer += strip(jsonString, offset, index);
-      offset = index;
-    } else if (!isInsideComment && currentCharacter + nextCharacter === "/*") {
-      buffer += jsonString.slice(offset, index);
-      offset = index;
-      isInsideComment = multiComment;
-      index++;
-      continue;
-    } else if (isInsideComment === multiComment && currentCharacter + nextCharacter === "*/") {
-      index++;
-      isInsideComment = false;
-      buffer += strip(jsonString, offset, index + 1);
-      offset = index + 1;
-      continue;
-    } else if (trailingCommas && !isInsideComment) {
-      if (commaIndex !== -1) {
-        if (currentCharacter === "}" || currentCharacter === "]") {
-          buffer += jsonString.slice(offset, index);
-          result += strip(buffer, 0, 1) + buffer.slice(1);
-          buffer = "";
-          offset = index;
-          commaIndex = -1;
-        } else if (currentCharacter !== " " && currentCharacter !== "	" && currentCharacter !== "\r" && currentCharacter !== "\n") {
-          buffer += jsonString.slice(offset, index);
-          offset = index;
-          commaIndex = -1;
-        }
-      } else if (currentCharacter === ",") {
-        result += buffer + jsonString.slice(offset, index);
-        buffer = "";
-        offset = index;
-        commaIndex = index;
-      }
-    }
-  }
-  return result + buffer + (isInsideComment ? strip(jsonString.slice(offset)) : jsonString.slice(offset));
-}
-
-// src/actions/typescript.ts
-async function typescript(ctx) {
-  let ts = ctx.typescript ?? (typeof ctx.yes !== "undefined" ? "strict" : void 0);
-  if (ts === void 0) {
-    const { useTs } = await ctx.prompt({
-      name: "useTs",
-      type: "confirm",
-      label: title("ts"),
-      message: `Do you plan to write TypeScript?`,
-      initial: true
-    });
-    if (!useTs) {
-      await typescriptByDefault();
-      return;
-    }
-    ({ ts } = await ctx.prompt({
-      name: "ts",
-      type: "select",
-      label: title("use"),
-      message: `How strict should TypeScript be?`,
-      initial: "strict",
-      choices: [
-        { value: "strict", label: "Strict", hint: `(recommended)` },
-        { value: "strictest", label: "Strictest" },
-        { value: "base", label: "Relaxed" }
-      ]
-    }));
-  } else {
-    if (!["strict", "strictest", "relaxed", "default", "base"].includes(ts)) {
-      if (!ctx.dryRun) {
-        await rm(ctx.cwd, { recursive: true, force: true });
-      }
-      error(
-        "Error",
-        `Unknown TypeScript option ${color7.reset(ts)}${color7.dim(
-          "! Expected strict | strictest | relaxed"
-        )}`
-      );
-      ctx.exit(1);
-    }
-    await info("ts", `Using ${color7.reset(ts)}${color7.dim(" TypeScript configuration")}`);
-  }
-  if (ctx.dryRun) {
-    await info("--dry-run", `Skipping TypeScript setup`);
-  } else if (ts && ts !== "unsure") {
-    if (ts === "relaxed" || ts === "default") {
-      ts = "base";
-    }
-    ctx.tasks.push({
-      pending: "TypeScript",
-      start: "TypeScript customizing...",
-      end: "TypeScript customized",
-      while: () => setupTypeScript(ts, ctx).catch((e) => {
-        error("error", e);
-        process.exit(1);
-      })
-    });
-  } else {
-  }
-}
-var FILES_TO_UPDATE2 = {
-  "package.json": async (file, options) => {
-    try {
-      const data = await readFile(file, { encoding: "utf-8" });
-      const indent = /(^\s+)/m.exec(data)?.[1] ?? "	";
-      const parsedPackageJson = JSON.parse(data);
-      const buildScript = parsedPackageJson.scripts?.build;
-      if (typeof buildScript === "string" && !buildScript.includes("astro check")) {
-        parsedPackageJson.scripts.build = `astro check && ${buildScript}`;
-      }
-      const [astroCheckVersion, typescriptVersion] = await Promise.all([
-        getVersion(options.ctx.packageManager, "@astrojs/check", "0.9.4"),
-        getVersion(options.ctx.packageManager, "typescript", "5.6.2")
-      ]);
-      parsedPackageJson.dependencies ??= {};
-      parsedPackageJson.dependencies["@astrojs/check"] = `^${astroCheckVersion}`;
-      parsedPackageJson.dependencies.typescript = `^${typescriptVersion}`;
-      await writeFile(file, JSON.stringify(parsedPackageJson, null, indent) + "\n", "utf-8");
-    } catch (err) {
-      if (err && err.code === "ENOENT") return;
-      if (err instanceof Error) throw new Error(err.message);
-    }
-  },
-  "tsconfig.json": async (file, options) => {
-    try {
-      const data = await readFile(file, { encoding: "utf-8" });
-      const templateTSConfig = JSON.parse(stripJsonComments(data));
-      if (templateTSConfig && typeof templateTSConfig === "object") {
-        const result = Object.assign(templateTSConfig, {
-          extends: `astro/tsconfigs/${options.value}`
-        });
-        await writeFile(file, JSON.stringify(result, null, 2) + "\n");
-      } else {
-        throw new Error(
-          "There was an error applying the requested TypeScript settings. This could be because the template's tsconfig.json is malformed"
-        );
-      }
-    } catch (err) {
-      if (err && err.code === "ENOENT") {
-        await writeFile(
-          file,
-          JSON.stringify({ extends: `astro/tsconfigs/${options.value}` }, null, 2) + "\n"
-        );
-      }
-    }
-  },
-  "astro.config.mjs": async (file, options) => {
-    if (!(options.value === "strict" || options.value === "strictest")) {
-      return;
-    }
-    try {
-      let data = await readFile(file, { encoding: "utf-8" });
-      data = `// @ts-check
-${data}`;
-      await writeFile(file, data, { encoding: "utf-8" });
-    } catch (err) {
-      if (err && err.code === "ENOENT") return;
-      if (err instanceof Error) throw new Error(err.message);
-    }
-  }
-};
-async function setupTypeScript(value, ctx) {
-  await Promise.all(
-    Object.entries(FILES_TO_UPDATE2).map(
-      async ([file, update]) => update(path6.resolve(path6.join(ctx.cwd, file)), { value, ctx })
-    )
-  );
-}
-
 // src/actions/verify.ts
 import dns from "node:dns/promises";
-import { color as color8 } from "@astrojs/cli-kit";
+import { color as color7 } from "@astrojs/cli-kit";
 import { verifyTemplate } from "@bluwy/giget-core";
 async function verify(ctx) {
   if (!ctx.dryRun) {
@@ -1201,7 +1008,7 @@ async function verify(ctx) {
     if (!ok) {
       bannerAbort();
       log("");
-      error("error", `Template ${color8.reset(ctx.template)} ${color8.dim("could not be found!")}`);
+      error("error", `Template ${color7.reset(ctx.template)} ${color7.dim("could not be found!")}`);
       await info("check", "https://astro.build/examples");
       ctx.exit(1);
     }
@@ -1231,7 +1038,6 @@ async function main() {
     intro,
     projectName,
     template,
-    typescript,
     dependencies,
     // Steps which write to files need to go above git
     git
@@ -1257,8 +1063,6 @@ export {
   next,
   projectName,
   setStdout,
-  setupTypeScript,
   template,
-  typescript,
   verify
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "4.10.0",
+  "version": "4.11.0-beta.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -26,7 +26,7 @@
   "//b": "DEPENDENCIES IS FOR UNBUNDLED PACKAGES",
   "dependencies": {
     "@astrojs/cli-kit": "^0.4.1",
-    "@bluwy/giget-core": "^0.1.0"
+    "@bluwy/giget-core": "^0.1.1"
   },
   "devDependencies": {
     "arg": "^5.0.2",

package/dist/actions/typescript.d.ts

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