astro 2.8.0 → 2.8.1

package/dist/{core → cli}/add/index.d.ts

@@ -1,15 +1,16 @@
 import type yargs from 'yargs-parser';
-import { type LogOptions } from '../logger/core.js';
-export interface AddOptions {
+import { type LogOptions } from '../../core/logger/core.js';
+interface AddOptions {
     logging: LogOptions;
     flags: yargs.Arguments;
     cwd?: string;
 }
-export interface IntegrationInfo {
+interface IntegrationInfo {
     id: string;
     packageName: string;
     dependencies: [name: string, version: string][];
     type: 'integration' | 'adapter';
 }
-export default function add(names: string[], { cwd, flags, logging }: AddOptions): Promise<void>;
+export declare function add(names: string[], { cwd, flags, logging }: AddOptions): Promise<void>;
 export declare function validateIntegrations(integrations: string[]): Promise<IntegrationInfo[]>;
+export {};

package/dist/{core → cli}/add/index.js

@@ -8,18 +8,18 @@ import path from "path";
 import preferredPM from "preferred-pm";
 import prompts from "prompts";
 import { fileURLToPath, pathToFileURL } from "url";
-import { loadTSConfig, resolveConfigPath } from "../config/index.js";
+import { loadTSConfig, resolveConfigPath } from "../../core/config/index.js";
 import {
   defaultTSConfig,
   presets,
   updateTSConfigForFramework
-} from "../config/tsconfig.js";
-import { debug, info } from "../logger/core.js";
-import * as msg from "../messages.js";
-import { printHelp } from "../messages.js";
-import { appendForwardSlash } from "../path.js";
-import { apply as applyPolyfill } from "../polyfill.js";
-import { parseNpmName } from "../util.js";
+} from "../../core/config/tsconfig.js";
+import { debug, info } from "../../core/logger/core.js";
+import * as msg from "../../core/messages.js";
+import { printHelp } from "../../core/messages.js";
+import { appendForwardSlash } from "../../core/path.js";
+import { apply as applyPolyfill } from "../../core/polyfill.js";
+import { parseNpmName } from "../../core/util.js";
 import { generate, parse, t, visit } from "./babel.js";
 import { ensureImport } from "./imports.js";
 import { wrapDefaultExport } from "./wrapper.js";
@@ -637,7 +637,8 @@ async function validateIntegrations(integrations) {
           const meta = pkgJson["peerDependenciesMeta"] || {};
           for (const peer in pkgJson["peerDependencies"]) {
             const optional = ((_a = meta[peer]) == null ? void 0 : _a.optional) || false;
-            if (!optional) {
+            const isAstro = peer === "astro";
+            if (!optional && !isAstro) {
               dependencies.push([peer, pkgJson["peerDependencies"][peer]]);
             }
           }
@@ -824,6 +825,6 @@ async function setupIntegrationConfig(opts) {
   }
 }
 export {
-  add as default,
+  add,
   validateIntegrations
 };

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

@@ -0,0 +1,6 @@
+import type yargs from 'yargs-parser';
+interface DocsOptions {
+    flags: yargs.Arguments;
+}
+export declare function docs({ flags }: DocsOptions): Promise<import("execa").ExecaReturnValue<string> | undefined>;
+export {};

package/dist/cli/docs/index.js

@@ -0,0 +1,18 @@
+import { printHelp } from "../../core/messages.js";
+import { openInBrowser } from "./open.js";
+async function docs({ flags }) {
+  if (flags.help || flags.h) {
+    printHelp({
+      commandName: "astro docs",
+      tables: {
+        Flags: [["--help (-h)", "See all available flags."]]
+      },
+      description: `Launches the Astro Docs website directly from the terminal.`
+    });
+    return;
+  }
+  return await openInBrowser("https://docs.astro.build/");
+}
+export {
+  docs
+};

package/dist/cli/index.js

@@ -1,6 +1,5 @@
 import fs from "fs";
 import * as colors from "kleur/colors";
-import { arch, platform } from "node:os";
 import yargs from "yargs-parser";
 import { ZodError } from "zod";
 import {
@@ -17,7 +16,6 @@ import { enableVerboseLogging, nodeLogDestination } from "../core/logger/node.js
 import { formatConfigErrorMessage, formatErrorMessage, printHelp } from "../core/messages.js";
 import * as event from "../events/index.js";
 import { eventConfigError, eventError, telemetry } from "../events/index.js";
-import { openInBrowser } from "./open.js";
 function printAstroHelp() {
   printHelp({
     commandName: "astro",
@@ -48,52 +46,10 @@ function printAstroHelp() {
     }
   });
 }
-async function printVersion() {
+function printVersion() {
   console.log();
   console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${ASTRO_VERSION}`)}`);
 }
-async function printInfo({
-  cwd,
-  flags,
-  logging
-}) {
-  var _a;
-  const whichPm = await import("which-pm");
-  const packageManager = await whichPm.default(process.cwd());
-  let adapter = "Couldn't determine.";
-  let integrations = [];
-  const MAX_PADDING = 25;
-  function printRow(label, value) {
-    const padding = MAX_PADDING - label.length;
-    console.log(`${colors.bold(label)}` + " ".repeat(padding) + `${colors.green(value)}`);
-  }
-  try {
-    const { userConfig } = await openConfig({
-      cwd,
-      flags,
-      cmd: "info",
-      logging
-    });
-    if ((_a = userConfig.adapter) == null ? void 0 : _a.name) {
-      adapter = userConfig.adapter.name;
-    }
-    if (userConfig.integrations) {
-      integrations = ((userConfig == null ? void 0 : userConfig.integrations) ?? []).filter(Boolean).flat().map((i) => i == null ? void 0 : i.name);
-    }
-  } catch (_e) {
-  }
-  console.log();
-  printRow("Astro version", `v${ASTRO_VERSION}`);
-  printRow("Package manager", packageManager.name);
-  printRow("Platform", platform());
-  printRow("Architecture", arch());
-  printRow("Adapter", adapter);
-  let integrationsString = "None or couldn't determine.";
-  if (integrations.length > 0) {
-    integrationsString = integrations.join(", ");
-  }
-  printRow("Integrations", integrationsString);
-}
 function resolveCommand(flags) {
   const cmd = flags._[2];
   if (flags.version)
@@ -131,22 +87,35 @@ async function handleConfigError(e, { cmd, cwd, flags, logging }) {
 async function runCommand(cmd, flags) {
   var _a;
   const root = flags.root;
-  let logging = {
-    dest: nodeLogDestination,
-    level: "info"
-  };
   switch (cmd) {
     case "help":
       printAstroHelp();
-      return process.exit(0);
+      return;
     case "version":
-      await printVersion();
-      return process.exit(0);
+      printVersion();
+      return;
     case "info": {
-      await printInfo({ cwd: root, flags, logging });
-      return process.exit(0);
+      const { printInfo } = await import("./info/index.js");
+      await printInfo({ cwd: root, flags });
+      return;
+    }
+    case "docs": {
+      telemetry.record(event.eventCliSession(cmd));
+      const { docs } = await import("./docs/index.js");
+      await docs({ flags });
+      return;
+    }
+    case "telemetry": {
+      const { update } = await import("./telemetry/index.js");
+      const subcommand = (_a = flags._[3]) == null ? void 0 : _a.toString();
+      await update(subcommand, { flags });
+      return;
     }
   }
+  const logging = {
+    dest: nodeLogDestination,
+    level: "info"
+  };
   if (flags.verbose) {
     logging.level = "debug";
     enableVerboseLogging();
@@ -155,29 +124,11 @@ async function runCommand(cmd, flags) {
   }
   switch (cmd) {
     case "add": {
-      const { default: add } = await import("../core/add/index.js");
       telemetry.record(event.eventCliSession(cmd));
+      const { add } = await import("./add/index.js");
       const packages = flags._.slice(3);
-      return await add(packages, { cwd: root, flags, logging });
-    }
-    case "docs": {
-      telemetry.record(event.eventCliSession(cmd));
-      if (flags.help || flags.h) {
-        printHelp({
-          commandName: "astro docs",
-          tables: {
-            Flags: [["--help (-h)", "See all available flags."]]
-          },
-          description: `Launches the Astro Docs website directly from the terminal.`
-        });
-        return;
-      }
-      return await openInBrowser("https://docs.astro.build/");
-    }
-    case "telemetry": {
-      const telemetryHandler = await import("./telemetry.js");
-      const subcommand = (_a = flags._[3]) == null ? void 0 : _a.toString();
-      return await telemetryHandler.update(subcommand, { flags });
+      await add(packages, { cwd: root, flags, logging });
+      return;
     }
   }
   if (!process.env.NODE_ENV) {
@@ -186,8 +137,7 @@ async function runCommand(cmd, flags) {
   let { astroConfig: initialAstroConfig, userConfig: initialUserConfig } = await openConfig({
     cwd: root,
     flags,
-    cmd,
-    logging
+    cmd
   }).catch(async (e) => {
     await handleConfigError(e, { cmd, cwd: root, flags, logging });
     return {};

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

@@ -0,0 +1,7 @@
+import type yargs from 'yargs-parser';
+interface InfoOptions {
+    cwd?: string;
+    flags: yargs.Arguments;
+}
+export declare function printInfo({ cwd, flags }: InfoOptions): Promise<void>;
+export {};

package/dist/cli/info/index.js

@@ -0,0 +1,45 @@
+import * as colors from "kleur/colors";
+import { arch, platform } from "node:os";
+import whichPm from "which-pm";
+import { openConfig } from "../../core/config/index.js";
+import { ASTRO_VERSION } from "../../core/constants.js";
+async function printInfo({ cwd, flags }) {
+  var _a;
+  const packageManager = await whichPm(process.cwd());
+  let adapter = "Couldn't determine.";
+  let integrations = [];
+  const MAX_PADDING = 25;
+  function printRow(label, value) {
+    const padding = MAX_PADDING - label.length;
+    console.log(`${colors.bold(label)}` + " ".repeat(padding) + `${colors.green(value)}`);
+  }
+  try {
+    const { userConfig } = await openConfig({
+      cwd,
+      flags,
+      cmd: "info"
+    });
+    if ((_a = userConfig.adapter) == null ? void 0 : _a.name) {
+      adapter = userConfig.adapter.name;
+    }
+    if (userConfig.integrations) {
+      integrations = ((userConfig == null ? void 0 : userConfig.integrations) ?? []).filter(Boolean).flat().map((i) => i == null ? void 0 : i.name);
+    }
+  } catch (_e) {
+  }
+  console.log();
+  const packageManagerName = (packageManager == null ? void 0 : packageManager.name) ?? "Couldn't determine.";
+  printRow("Astro version", `v${ASTRO_VERSION}`);
+  printRow("Package manager", packageManagerName);
+  printRow("Platform", platform());
+  printRow("Architecture", arch());
+  printRow("Adapter", adapter);
+  let integrationsString = "None or couldn't determine.";
+  if (integrations.length > 0) {
+    integrationsString = integrations.join(", ");
+  }
+  printRow("Integrations", integrationsString);
+}
+export {
+  printInfo
+};

package/dist/cli/{telemetry.d.ts → telemetry/index.d.ts}

@@ -1,5 +1,6 @@
 import type yargs from 'yargs-parser';
-export interface TelemetryOptions {
+interface TelemetryOptions {
     flags: yargs.Arguments;
 }
 export declare function update(subcommand: string, { flags }: TelemetryOptions): Promise<void>;
+export {};

package/dist/cli/{telemetry.js → telemetry/index.js}

@@ -1,5 +1,5 @@
-import * as msg from "../core/messages.js";
-import { telemetry } from "../events/index.js";
+import * as msg from "../../core/messages.js";
+import { telemetry } from "../../events/index.js";
 async function update(subcommand, { flags }) {
   const isValid = ["enable", "disable", "reset"].includes(subcommand);
   if (flags.help || flags.h || !isValid) {

package/dist/config/index.js

@@ -25,10 +25,7 @@ function getViteConfig(inlineConfig) {
       dest: nodeLogDestination,
       level: "info"
     };
-    const { astroConfig: config } = await openConfig({
-      cmd,
-      logging
-    });
+    const { astroConfig: config } = await openConfig({ cmd });
     const settings = createSettings(config, inlineConfig.root);
     await runHookConfigSetup({ settings, command: cmd, logging });
     const viteConfig = await createVite(

package/dist/content/vite-plugin-content-virtual-mod.js

@@ -168,8 +168,8 @@ function globWithUnderscoresIgnored(relContentDir, exts) {
   const contentDir = appendForwardSlash(relContentDir);
   return [
     `${contentDir}**/*${extGlob}`,
-    `!${contentDir}_*/**${extGlob}`,
-    `!${contentDir}_*${extGlob}`
+    `!${contentDir}**/_*/**${extGlob}`,
+    `!${contentDir}**/_*${extGlob}`
   ];
 }
 export {

package/dist/core/config/config.d.ts

@@ -2,7 +2,6 @@
 import type { Arguments as Flags } from 'yargs-parser';
 import type { AstroConfig, AstroUserConfig, CLIFlags } from '../../@types/astro';
 import fs from 'fs';
-import type { LogOptions } from '../logger/core.js';
 export declare const LEGACY_ASTRO_CONFIG_KEYS: Set<string>;
 /** Turn raw config values into normalized values */
 export declare function validateConfig(userConfig: any, root: string, cmd: string): Promise<AstroConfig>;
@@ -14,7 +13,6 @@ interface LoadConfigOptions {
     flags?: Flags;
     cmd: string;
     validate?: boolean;
-    logging: LogOptions;
     /** Invalidate when reloading a previously loaded config */
     isRestart?: boolean;
     fsMod?: typeof fs;

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.8.0";
+const ASTRO_VERSION = "2.8.1";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/dev.js

@@ -54,7 +54,7 @@ async function dev(settings, options) {
       isRestart: options.isRestart
     })
   );
-  const currentVersion = "2.8.0";
+  const currentVersion = "2.8.1";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/dev/restart.js

@@ -57,7 +57,6 @@ async function restartContainer({
       cwd: resolvedRoot,
       flags,
       cmd: "dev",
-      logging,
       isRestart: true,
       fsMod: container.fs
     });

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.8.0";
+  const version = "2.8.1";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -233,7 +233,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"2.8.0"}`
+        `v${"2.8.1"}`
       )} ${headline}`
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",