astro 4.14.1 → 4.14.2

package/dist/cli/check/index.js

@@ -7,7 +7,7 @@ async function check(flags) {
   const logger = createLoggerFromFlags(flags);
   const getPackageOpts = {
     skipAsk: !!flags.yes || !!flags.y,
-    cwd: typeof flags.root == "string" ? flags.root : void 0
+    cwd: flags.root
   };
   const checkPackage = await getPackage(
     "@astrojs/check",

package/dist/cli/db/index.d.ts

@@ -1,5 +1,4 @@
-import { type Flags } from '../flags.js';
-export declare function db({ positionals, flags }: {
-    positionals: string[];
-    flags: Flags;
+import type { Arguments } from 'yargs-parser';
+export declare function db({ flags }: {
+    flags: Arguments;
 }): Promise<void>;

package/dist/cli/db/index.js

@@ -2,12 +2,12 @@ import { resolveConfig } from "../../core/config/config.js";
 import { apply as applyPolyfill } from "../../core/polyfill.js";
 import { createLoggerFromFlags, flagsToAstroInlineConfig } from "../flags.js";
 import { getPackage } from "../install-package.js";
-async function db({ positionals, flags }) {
+async function db({ flags }) {
   applyPolyfill();
   const logger = createLoggerFromFlags(flags);
   const getPackageOpts = {
     skipAsk: !!flags.yes || !!flags.y,
-    cwd: typeof flags.root == "string" ? flags.root : void 0
+    cwd: flags.root
   };
   const dbPackage = await getPackage("@astrojs/db", logger, getPackageOpts, []);
   if (!dbPackage) {
@@ -20,11 +20,7 @@ async function db({ positionals, flags }) {
   const { cli } = dbPackage;
   const inlineConfig = flagsToAstroInlineConfig(flags);
   const { astroConfig } = await resolveConfig(inlineConfig, "build");
-  const yargsArgs = {
-    _: positionals,
-    ...flags
-  };
-  await cli({ flags: yargsArgs, config: astroConfig });
+  await cli({ flags, config: astroConfig });
 }
 export {
   db

package/dist/cli/flags.d.ts

@@ -1,8 +1,7 @@
-import type { parseArgs } from 'node:util';
+import type { Arguments } from 'yargs-parser';
 import type { AstroInlineConfig } from '../@types/astro.js';
 import { Logger } from '../core/logger/core.js';
-export type ParsedArgsResult = ReturnType<typeof parseArgs>;
-export type Flags = ParsedArgsResult['values'];
+export type Flags = Arguments;
 export declare function flagsToAstroInlineConfig(flags: Flags): AstroInlineConfig;
 /**
  * The `logging` is usually created from an `AstroInlineConfig`, but some flows like `add`

package/dist/cli/flags.js

@@ -13,7 +13,7 @@ function flagsToAstroInlineConfig(flags) {
     base: typeof flags.base === "string" ? flags.base : void 0,
     outDir: typeof flags.outDir === "string" ? flags.outDir : void 0,
     server: {
-      port: typeof flags.port === "string" ? Number(flags.port) : void 0,
+      port: typeof flags.port === "number" ? flags.port : void 0,
       host: typeof flags.host === "string" || typeof flags.host === "boolean" ? flags.host : void 0,
       open: typeof flags.open === "string" || typeof flags.open === "boolean" ? flags.open : void 0
     }

package/dist/cli/index.js

@@ -1,5 +1,5 @@
-import { parseArgs } from "node:util";
 import * as colors from "kleur/colors";
+import yargs from "yargs-parser";
 import { ASTRO_VERSION } from "../core/constants.js";
 async function printAstroHelp() {
   const { printHelp } = await import("../core/messages.js");
@@ -43,9 +43,9 @@ function printVersion() {
   console.log();
   console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${ASTRO_VERSION}`)}`);
 }
-function resolveCommand(args) {
-  const cmd = args.positionals[2];
-  if (args.values.version) return "version";
+function resolveCommand(flags) {
+  const cmd = flags._[2];
+  if (flags.version) return "version";
   const supportedCommands = /* @__PURE__ */ new Set([
     "add",
     "sync",
@@ -68,8 +68,7 @@ function resolveCommand(args) {
   }
   return "help";
 }
-async function runCommand(cmd, args) {
-  const flags = args.values;
+async function runCommand(cmd, flags) {
   switch (cmd) {
     case "help":
       await printAstroHelp();
@@ -89,7 +88,7 @@ async function runCommand(cmd, args) {
     }
     case "telemetry": {
       const { update } = await import("./telemetry/index.js");
-      const subcommand = args.positionals[3];
+      const subcommand = flags._[3]?.toString();
       await update(subcommand, { flags });
       return;
     }
@@ -100,7 +99,7 @@ async function runCommand(cmd, args) {
     }
     case "preferences": {
       const { preferences } = await import("./preferences/index.js");
-      const [subcommand, key, value] = args.positionals.slice(3);
+      const [subcommand, key, value] = flags._.slice(3).map((v) => v.toString());
       const exitCode = await preferences(subcommand, key, value, { flags });
       return process.exit(exitCode);
     }
@@ -114,7 +113,7 @@ async function runCommand(cmd, args) {
   switch (cmd) {
     case "add": {
       const { add } = await import("./add/index.js");
-      const packages = args.positionals.slice(3);
+      const packages = flags._.slice(3);
       await add(packages, { flags });
       return;
     }
@@ -124,7 +123,7 @@ async function runCommand(cmd, args) {
     case "link":
     case "init": {
       const { db } = await import("./db/index.js");
-      await db({ positionals: args.positionals, flags });
+      await db({ flags });
       return;
     }
     case "dev": {
@@ -163,22 +162,10 @@ async function runCommand(cmd, args) {
   throw new Error(`Error running ${cmd} -- no command found.`);
 }
 async function cli(argv) {
-  const args = parseArgs({
-    args: argv,
-    allowPositionals: true,
-    strict: false,
-    options: {
-      global: { type: "boolean", short: "g" },
-      host: { type: "string" },
-      // Can be boolean too, which is covered by `strict: false`
-      open: { type: "string" }
-      // Can be boolean too, which is covered by `strict: false`
-      // TODO: Add more flags here
-    }
-  });
-  const cmd = resolveCommand(args);
+  const flags = yargs(argv, { boolean: ["global"], alias: { g: "global" } });
+  const cmd = resolveCommand(flags);
   try {
-    await runCommand(cmd, args);
+    await runCommand(cmd, flags);
   } catch (err) {
     const { throwAndExit } = await import("./throw-and-exit.js");
     await throwAndExit(cmd, err);

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.14.1";
+const ASTRO_VERSION = "4.14.2";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "4.14.1";
+  const currentVersion = "4.14.2";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.js

@@ -38,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.14.1";
+  const version = "4.14.2";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -270,7 +270,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.14.1"}`
+        `v${"4.14.2"}`
       )} ${headline}`
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.14.1",
+  "version": "4.14.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -115,8 +115,8 @@
     "@babel/plugin-transform-react-jsx": "^7.25.2",
     "@babel/traverse": "^7.25.3",
     "@babel/types": "^7.25.2",
-    "@rollup/pluginutils": "^5.1.0",
     "@oslojs/encoding": "^0.4.1",
+    "@rollup/pluginutils": "^5.1.0",
     "@types/babel__core": "^7.20.5",
     "@types/cookie": "^0.6.0",
     "acorn": "^8.12.1",
@@ -168,12 +168,13 @@
     "vitefu": "^0.2.5",
     "which-pm": "^3.0.0",
     "xxhash-wasm": "^1.0.2",
+    "yargs-parser": "^21.1.1",
     "zod": "^3.23.8",
     "zod-to-json-schema": "^3.23.2",
     "zod-to-ts": "^1.2.0",
     "@astrojs/internal-helpers": "0.4.1",
-    "@astrojs/telemetry": "3.1.0",
-    "@astrojs/markdown-remark": "5.2.0"
+    "@astrojs/markdown-remark": "5.2.0",
+    "@astrojs/telemetry": "3.1.0"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"
@@ -197,6 +198,7 @@
     "@types/micromatch": "^4.0.9",
     "@types/prompts": "^2.4.9",
     "@types/semver": "^7.5.8",
+    "@types/yargs-parser": "^21.0.3",
     "cheerio": "1.0.0",
     "eol": "^0.9.1",
     "expect-type": "^0.19.0",