astro 6.1.10 → 6.2.0

package/dist/assets/{utils/svg.js → svg/utils.js}

@@ -1,23 +1,20 @@
-import { optimize } from "svgo";
 import { ELEMENT_NODE, TEXT_NODE, parse, renderSync } from "ultrahtml";
 import { AstroError, AstroErrorData } from "../../core/errors/index.js";
 import { dropAttributes } from "../runtime.js";
-function parseSvg({
+async function parseSvg({
   path,
   contents,
-  svgoConfig
+  svgOptimizer
 }) {
   let processedContents = contents;
-  if (svgoConfig) {
+  if (svgOptimizer) {
     try {
-      const config = typeof svgoConfig === "boolean" ? void 0 : svgoConfig;
-      const result = optimize(contents, config);
-      processedContents = result.data;
+      processedContents = await svgOptimizer.optimize(contents);
     } catch (cause) {
       throw new AstroError(
         {
           ...AstroErrorData.CannotOptimizeSvg,
-          message: AstroErrorData.CannotOptimizeSvg.message(path)
+          message: AstroErrorData.CannotOptimizeSvg.message(path, svgOptimizer.name)
         },
         { cause }
       );
@@ -43,16 +40,16 @@ function parseSvg({
   }
   return { attributes, body, styles };
 }
-function makeSvgComponent(meta, contents, svgoConfig) {
+async function makeSvgComponent(meta, contents, svgOptimizer) {
   const file = typeof contents === "string" ? contents : contents.toString("utf-8");
   const {
     attributes,
     body: children,
     styles
-  } = parseSvg({
+  } = await parseSvg({
     path: meta.fsPath,
     contents: file,
-    svgoConfig
+    svgOptimizer
   });
   const props = {
     meta,
@@ -63,16 +60,16 @@ function makeSvgComponent(meta, contents, svgoConfig) {
   return `import { createSvgComponent } from 'astro/assets/runtime';
 export default createSvgComponent(${JSON.stringify(props)})`;
 }
-function parseSvgComponentData(meta, contents, svgoConfig) {
+async function parseSvgComponentData(meta, contents, svgOptimizer) {
   const file = typeof contents === "string" ? contents : contents.toString("utf-8");
   const {
     attributes,
     body: children,
     styles
-  } = parseSvg({
+  } = await parseSvg({
     path: meta.fsPath,
     contents: file,
-    svgoConfig
+    svgOptimizer
   });
   return { attributes: dropAttributes(attributes), children, styles };
 }

package/dist/assets/vite-plugin-assets.js

@@ -31,7 +31,7 @@ import { hashTransform, propsToFilename } from "./utils/hash.js";
 import { emitImageMetadata } from "./utils/node.js";
 import { CONTENT_IMAGE_FLAG } from "../content/consts.js";
 import { getProxyCode } from "./utils/proxy.js";
-import { makeSvgComponent, parseSvgComponentData } from "./utils/svg.js";
+import { makeSvgComponent, parseSvgComponentData } from "./svg/utils.js";
 import { createPlaceholderURL, stringifyPlaceholderURL } from "./utils/url.js";
 const assetRegex = new RegExp(`\\.(${VALID_INPUT_FORMATS.join("|")})`, "i");
 const assetRegexEnds = new RegExp(`\\.(${VALID_INPUT_FORMATS.join("|")})$`, "i");
@@ -283,7 +283,11 @@ function assets({ fs, settings, sync, logger }) {
                 encoding: "utf8"
               });
               return {
-                code: makeSvgComponent(imageMetadata, contents, settings.config.experimental.svgo)
+                code: await makeSvgComponent(
+                  imageMetadata,
+                  contents,
+                  settings.config.experimental.svgOptimizer
+                )
               };
             }
             const isSSROnlyEnvironment = settings.buildOutput === "server" && this.environment.name === ASTRO_VITE_ENVIRONMENT_NAMES.ssr;
@@ -294,10 +298,10 @@ function assets({ fs, settings, sync, logger }) {
               const contents = await fs.promises.readFile(imageMetadata.fsPath, {
                 encoding: "utf8"
               });
-              const svgData = parseSvgComponentData(
+              const svgData = await parseSvgComponentData(
                 imageMetadata,
                 contents,
-                settings.config.experimental.svgo
+                settings.config.experimental.svgOptimizer
               );
               const metadataWithSvg = { ...imageMetadata, __svgData: svgData };
               return {

package/dist/cli/flags.js

@@ -1,6 +1,7 @@
-import { createNodeLogger, nodeLogDestination } from "../core/logger/node.js";
+import { createNodeLoggerFromFlags } from "../core/logger/impls/node.js";
+import { createJsonLoggerFromFlags } from "../core/logger/impls/json.js";
 function flagsToAstroInlineConfig(flags) {
-  return {
+  const inlineConfig = {
     // Inline-only configs
     configFile: typeof flags.config === "string" ? flags.config : void 0,
     mode: typeof flags.mode === "string" ? flags.mode : void 0,
@@ -18,18 +19,27 @@ function flagsToAstroInlineConfig(flags) {
       allowedHosts: typeof flags.allowedHosts === "string" ? flags.allowedHosts.split(",") : typeof flags.allowedHosts === "boolean" && flags.allowedHosts === true ? flags.allowedHosts : []
     }
   };
+  if (flags.experimentalJson) {
+    inlineConfig.experimental = {
+      logger: {
+        entrypoint: "astro/logger/json"
+      }
+    };
+  }
+  return inlineConfig;
 }
 function createLoggerFromFlags(flags) {
-  const logging = {
-    destination: nodeLogDestination,
-    level: "info"
-  };
+  let logLevel = flags.level;
   if (flags.verbose) {
-    logging.level = "debug";
+    logLevel = "debug";
   } else if (flags.silent) {
-    logging.level = "silent";
+    logLevel = "silent";
+  }
+  if (flags.experimentalJson) {
+    return createJsonLoggerFromFlags({ logLevel });
+  } else {
+    return createNodeLoggerFromFlags({ logLevel });
   }
-  return createNodeLogger({ logLevel: logging.level });
 }
 export {
   createLoggerFromFlags,

package/dist/cli/help/index.js

@@ -25,7 +25,8 @@ const DEFAULT_HELP_PAYLOAD = {
       ["--verbose", "Enable verbose logging."],
       ["--silent", "Disable all logging."],
       ["--version", "Show the version number and exit."],
-      ["--help", "Show this help message."]
+      ["--help", "Show this help message."],
+      ["--experimental-json", "Enables JSON logging."]
     ]
   }
 };

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "6.1.10";
+  version = "6.2.0";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/cli/preferences/index.js

@@ -9,7 +9,8 @@ import * as msg from "../../core/messages/runtime.js";
 import { DEFAULT_PREFERENCES } from "../../preferences/defaults.js";
 import dlv from "../../preferences/dlv.js";
 import { coerce, isValidKey } from "../../preferences/index.js";
-import { createLoggerFromFlags, flagsToAstroInlineConfig } from "../flags.js";
+import { flagsToAstroInlineConfig } from "../flags.js";
+import { loadOrCreateNodeLogger } from "../../core/logger/load.js";
 const { bgGreen, black, bold, dim, yellow } = colors;
 const PREFERENCES_SUBCOMMANDS = [
   "get",
@@ -49,8 +50,8 @@ async function preferences(subcommand, key, value, { flags }) {
     return 0;
   }
   const inlineConfig = flagsToAstroInlineConfig(flags);
-  const logger = createLoggerFromFlags(flags);
   const { astroConfig } = await resolveConfig(inlineConfig ?? {}, "dev");
+  const logger = await loadOrCreateNodeLogger(astroConfig, inlineConfig ?? {});
   const settings = await createSettings(
     astroConfig,
     inlineConfig.logLevel,

package/dist/config/entrypoint.d.ts

@@ -8,6 +8,8 @@ export { validateConfig } from '../core/config/validate.js';
 export { envField } from '../env/config.js';
 export { defineConfig, getViteConfig } from './index.js';
 export { sessionDrivers } from '../core/session/drivers.js';
+export { svgoOptimizer } from '../assets/svg/svgo.js';
+export { logHandlers } from '../core/logger/handlers.js';
 /**
  * Return the configuration needed to use the Sharp-based image service
  */

package/dist/config/entrypoint.js

@@ -4,6 +4,8 @@ import { validateConfig } from "../core/config/validate.js";
 import { envField } from "../env/config.js";
 import { defineConfig, getViteConfig } from "./index.js";
 import { sessionDrivers } from "../core/session/drivers.js";
+import { svgoOptimizer } from "../assets/svg/svgo.js";
+import { logHandlers } from "../core/logger/handlers.js";
 function sharpImageService(config = {}) {
   return {
     entrypoint: "astro/assets/services/sharp",
@@ -28,10 +30,12 @@ export {
   envField,
   fontProviders,
   getViteConfig,
+  logHandlers,
   memoryCache,
   mergeConfig,
   passthroughImageService,
   sessionDrivers,
   sharpImageService,
+  svgoOptimizer,
   validateConfig
 };

package/dist/config/index.js

@@ -1,5 +1,3 @@
-import { createRoutesList } from "../core/routing/create-manifest.js";
-import { getPrerenderDefault } from "../prerender/utils.js";
 function defineConfig(config) {
   return config;
 }
@@ -8,19 +6,23 @@ function getViteConfig(userViteConfig, inlineAstroConfig = {}) {
     const cmd = command === "serve" ? "dev" : "build";
     const [
       { mergeConfig },
-      { createNodeLogger },
+      { loadOrCreateNodeLogger },
       { resolveConfig, createSettings },
       { createVite },
-      { runHookConfigSetup, runHookConfigDone }
+      { runHookConfigSetup, runHookConfigDone },
+      { createRoutesList },
+      { getPrerenderDefault }
     ] = await Promise.all([
       import("vite"),
-      import("../core/logger/node.js"),
+      import("../core/logger/load.js"),
       import("../core/config/index.js"),
       import("../core/create-vite.js"),
-      import("../integrations/hooks.js")
+      import("../integrations/hooks.js"),
+      import("../core/routing/create-manifest.js"),
+      import("../prerender/utils.js")
     ]);
-    const logger = createNodeLogger(inlineAstroConfig);
     const { astroConfig: config } = await resolveConfig(inlineAstroConfig, cmd);
+    const logger = await loadOrCreateNodeLogger(config, inlineAstroConfig);
     let settings = await createSettings(config, inlineAstroConfig.logLevel, userViteConfig.root);
     settings = await runHookConfigSetup({ settings, command: cmd, logger });
     const routesList = await createRoutesList(

package/dist/container/index.js

@@ -3,8 +3,6 @@ import { getDefaultClientDirectives } from "../core/client-directive/index.js";
 import { ASTRO_CONFIG_DEFAULTS } from "../core/config/schemas/index.js";
 import { validateConfig } from "../core/config/validate.js";
 import { createKey } from "../core/encryption.js";
-import { AstroLogger } from "../core/logger/core.js";
-import { nodeLogDestination } from "../core/logger/node.js";
 import { NOOP_MIDDLEWARE_FN } from "../core/middleware/noop-middleware.js";
 import { removeLeadingForwardSlash } from "../core/path.js";
 import { RenderContext } from "../core/render-context.js";
@@ -13,6 +11,7 @@ import { getPattern } from "../core/routing/pattern.js";
 import { validateSegment } from "../core/routing/segment.js";
 import { SlotString } from "../runtime/server/render/slot.js";
 import { ContainerPipeline } from "./pipeline.js";
+import { createConsoleLogger } from "../core/logger/impls/console.js";
 function createManifest(manifest, renderers, middleware) {
   function middlewareInstance() {
     return {
@@ -64,7 +63,8 @@ function createManifest(manifest, renderers, middleware) {
     logLevel: "silent",
     experimentalQueuedRendering: manifest?.experimentalQueuedRendering ?? {
       enabled: false
-    }
+    },
+    experimentalLogger: manifest?.experimentalLogger ?? void 0
   };
 }
 class experimental_AstroContainer {
@@ -82,10 +82,7 @@ class experimental_AstroContainer {
     astroConfig
   }) {
     this.#pipeline = ContainerPipeline.create({
-      logger: new AstroLogger({
-        level: "info",
-        destination: nodeLogDestination
-      }),
+      logger: createConsoleLogger({ level: "error" }),
       manifest: createManifest(manifest, renderers),
       streaming,
       renderers: renderers ?? manifest?.renderers ?? [],

package/dist/content/content-layer.js

@@ -192,7 +192,7 @@ ${contentConfig.error.message}`
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "6.1.10") {
+    if (previousAstroVersion && previousAstroVersion !== "6.2.0") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -200,8 +200,8 @@ ${contentConfig.error.message}`
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("6.1.10") {
-      this.#store.metaStore().set("astro-version", "6.1.10");
+    if ("6.2.0") {
+      this.#store.metaStore().set("astro-version", "6.2.0");
     }
     if (currentConfigDigest) {
       this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/core/app/base.d.ts

@@ -2,8 +2,9 @@ import type { RoutesList } from '../../types/astro.js';
 import type { RemotePattern, RouteData } from '../../types/public/index.js';
 import type { Pipeline } from '../base-pipeline.js';
 import { getSetCookiesFromResponse } from '../cookies/index.js';
-import { AstroIntegrationLogger, AstroLogger } from '../logger/core.js';
+import { AstroIntegrationLogger, type AstroLogger } from '../logger/core.js';
 import { type CreateRenderContext, RenderContext } from '../render-context.js';
+import type { WaitUntilHook } from '../wait-until.js';
 import type { AppPipeline } from './pipeline.js';
 import type { SSRManifest } from './types.js';
 export interface DevMatch {
@@ -44,6 +45,13 @@ export interface RenderOptions {
      * @returns {Promise<Response>} A promise resolving to the prerendered response.
      */
     prerenderedErrorPageFetch?: (url: ErrorPagePath) => Promise<Response>;
+    /**
+     * Optional platform hook to keep background work alive after the response is sent.
+     *
+     * Adapters can pass this through so runtime cache providers can schedule cache writes
+     * without blocking the response path.
+     */
+    waitUntil?: WaitUntilHook;
     /**
      * **Advanced API**: you probably do not need to use this.
      *
@@ -58,6 +66,7 @@ interface ResolvedRenderOptions {
     prerenderedErrorPageFetch: RequiredRenderOptions['prerenderedErrorPageFetch'] | undefined;
     locals: RequiredRenderOptions['locals'] | undefined;
     routeData: RequiredRenderOptions['routeData'] | undefined;
+    waitUntil: RequiredRenderOptions['waitUntil'] | undefined;
 }
 export interface RenderErrorOptions extends ResolvedRenderOptions {
     response?: Response;
@@ -77,13 +86,18 @@ export declare abstract class BaseApp<P extends Pipeline = AppPipeline> {
     manifest: SSRManifest;
     manifestData: RoutesList;
     pipeline: P;
-    adapterLogger: AstroIntegrationLogger;
     baseWithoutTrailingSlash: string;
-    logger: AstroLogger;
+    get logger(): AstroLogger;
+    get adapterLogger(): AstroIntegrationLogger;
     constructor(manifest: SSRManifest, streaming?: boolean, ...args: any[]);
     abstract isDev(): boolean;
     createRenderContext(payload: CreateRenderContext): Promise<RenderContext>;
     getAdapterLogger(): AstroIntegrationLogger;
+    /**
+     * Resets the cached adapter logger so it picks up a new logger instance.
+     * Used by BuildApp when the logger is replaced via setOptions().
+     */
+    protected resetAdapterLogger(): void;
     getAllowedDomains(): Partial<RemotePattern>[] | undefined;
     protected matchesAllowedDomains(forwardedHost: string, protocol?: string): boolean;
     static validateForwardedHost(forwardedHost: string, allowedDomains?: Partial<RemotePattern>[], protocol?: string): boolean;
@@ -124,7 +138,7 @@ export declare abstract class BaseApp<P extends Pipeline = AppPipeline> {
     devMatch(pathname?: string): Promise<DevMatch | undefined> | undefined;
     private computePathnameFromDomain;
     private redirectTrailingSlash;
-    render(request: Request, { addCookieHeader, clientAddress, locals, prerenderedErrorPageFetch, routeData, }?: RenderOptions): Promise<Response>;
+    render(request: Request, { addCookieHeader, clientAddress, locals, prerenderedErrorPageFetch, routeData, waitUntil, }?: RenderOptions): Promise<Response>;
     setCookieHeaders(response: Response): Generator<string, string[], any>;
     /**
      * Reads all the cookies written by `Astro.cookie.set()` onto the passed response.

package/dist/core/app/base.js

@@ -27,8 +27,7 @@ import {
 } from "../cookies/index.js";
 import { getCookiesFromResponse } from "../cookies/response.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
-import { consoleLogDestination } from "../logger/console.js";
-import { AstroIntegrationLogger, AstroLogger } from "../logger/core.js";
+import { AstroIntegrationLogger } from "../logger/core.js";
 import { RenderContext } from "../render-context.js";
 import { redirectTemplate } from "../routing/3xx.js";
 import { ensure404Route } from "../routing/astro-designed-error-pages.js";
@@ -41,20 +40,26 @@ class BaseApp {
   manifest;
   manifestData;
   pipeline;
-  adapterLogger;
+  #adapterLogger;
   baseWithoutTrailingSlash;
-  logger;
   #router;
+  get logger() {
+    return this.pipeline.logger;
+  }
+  get adapterLogger() {
+    if (!this.#adapterLogger) {
+      this.#adapterLogger = new AstroIntegrationLogger(
+        this.logger.options,
+        this.manifest.adapterName
+      );
+    }
+    return this.#adapterLogger;
+  }
   constructor(manifest, streaming = true, ...args) {
     this.manifest = manifest;
     this.manifestData = { routes: manifest.routes.map((route) => route.routeData) };
     this.baseWithoutTrailingSlash = removeTrailingForwardSlash(manifest.base);
     this.pipeline = this.createPipeline(streaming, manifest, ...args);
-    this.logger = new AstroLogger({
-      destination: consoleLogDestination,
-      level: manifest.logLevel
-    });
-    this.adapterLogger = new AstroIntegrationLogger(this.logger.options, manifest.adapterName);
     ensure404Route(this.manifestData);
     this.#router = this.createRouter(this.manifestData);
   }
@@ -64,6 +69,13 @@ class BaseApp {
   getAdapterLogger() {
     return this.adapterLogger;
   }
+  /**
+   * Resets the cached adapter logger so it picks up a new logger instance.
+   * Used by BuildApp when the logger is replaced via setOptions().
+   */
+  resetAdapterLogger() {
+    this.#adapterLogger = void 0;
+  }
   getAllowedDomains() {
     return this.manifest.allowedDomains;
   }
@@ -228,8 +240,10 @@ class BaseApp {
     clientAddress = Reflect.get(request, clientAddressSymbol),
     locals,
     prerenderedErrorPageFetch = fetch,
-    routeData
+    routeData,
+    waitUntil
   } = {}) {
+    await this.pipeline.getLogger();
     const timeStart = performance.now();
     const url = new URL(request.url);
     const redirect = this.redirectTrailingSlash(url.pathname);
@@ -266,7 +280,8 @@ class BaseApp {
       clientAddress,
       prerenderedErrorPageFetch,
       locals,
-      routeData
+      routeData,
+      waitUntil
     };
     if (locals) {
       if (typeof locals !== "object") {
@@ -334,7 +349,8 @@ class BaseApp {
           response = await cacheProvider.onRequest(
             {
               request,
-              url: new URL(request.url)
+              url: new URL(request.url),
+              waitUntil: resolvedRenderOptions.waitUntil
             },
             async () => {
               const res = await renderContext.render(componentInstance);
@@ -400,6 +416,7 @@ class BaseApp {
         response.headers.append("set-cookie", setCookieHeaderValue);
       }
     }
+    this.logger.flush();
     Reflect.set(response, responseSentSymbol, true);
   }
   setCookieHeaders(response) {

package/dist/core/app/dev/app.d.ts

@@ -5,7 +5,6 @@ import type { SSRManifest } from '../types.js';
 import { NonRunnablePipeline } from './pipeline.js';
 import type { RoutesList } from '../../../types/astro.js';
 export declare class DevApp extends BaseApp<NonRunnablePipeline> {
-    logger: AstroLogger;
     constructor(manifest: SSRManifest, streaming: boolean | undefined, logger: AstroLogger);
     createPipeline(streaming: boolean, manifest: SSRManifest, logger: AstroLogger): NonRunnablePipeline;
     isDev(): boolean;

package/dist/core/app/dev/app.js

@@ -9,10 +9,8 @@ import { ensure404Route } from "../../routing/astro-designed-error-pages.js";
 import { matchRoute } from "../../routing/dev.js";
 import { req } from "../../messages/runtime.js";
 class DevApp extends BaseApp {
-  logger;
   constructor(manifest, streaming = true, logger) {
     super(manifest, streaming, logger);
-    this.logger = logger;
   }
   createPipeline(streaming, manifest, logger) {
     return NonRunnablePipeline.create({

package/dist/core/app/entrypoints/index.d.ts

@@ -2,6 +2,6 @@ export type { RoutesList } from '../../../types/astro.js';
 export { App } from '../app.js';
 export { BaseApp, type RenderErrorOptions, type RenderOptions, type LogRequestPayload, } from '../base.js';
 export { fromRoutingStrategy, toRoutingStrategy } from '../common.js';
-export { createConsoleLogger } from '../logging.js';
+export { createConsoleLogger } from '../../logger/impls/console.js';
 export { deserializeManifest, deserializeRouteData, deserializeRouteInfo, serializeRouteData, serializeRouteInfo, } from '../manifest.js';
 export { AppPipeline } from '../pipeline.js';

package/dist/core/app/entrypoints/index.js

@@ -3,7 +3,7 @@ import {
   BaseApp
 } from "../base.js";
 import { fromRoutingStrategy, toRoutingStrategy } from "../common.js";
-import { createConsoleLogger } from "../logging.js";
+import { createConsoleLogger } from "../../logger/impls/console.js";
 import {
   deserializeManifest,
   deserializeRouteData,

package/dist/core/app/entrypoints/virtual/dev.js

@@ -1,6 +1,6 @@
 import { manifest } from "virtual:astro:manifest";
 import { DevApp } from "../../dev/app.js";
-import { createConsoleLogger } from "../../logging.js";
+import { createConsoleLogger } from "../../../logger/impls/console.js";
 let currentDevApp = null;
 const createApp = ({ streaming } = {}) => {
   const logger = createConsoleLogger(manifest.logLevel);

package/dist/core/app/pipeline.js

@@ -7,7 +7,7 @@ import {
 } from "../render/ssr-element.js";
 import { getFallbackRoute, routeIsFallback, routeIsRedirect } from "../routing/helpers.js";
 import { findRouteToRewrite } from "../routing/rewrite.js";
-import { createConsoleLogger } from "./logging.js";
+import { createConsoleLogger } from "../logger/impls/console.js";
 class AppPipeline extends Pipeline {
   getName() {
     return "AppPipeline";
@@ -24,7 +24,7 @@ class AppPipeline extends Pipeline {
         return createAssetLink(bundlePath, manifest.base, manifest.assetsPrefix);
       }
     };
-    const logger = createConsoleLogger(manifest.logLevel);
+    const logger = createConsoleLogger({ level: manifest.logLevel });
     const pipeline = new AppPipeline(
       logger,
       manifest,

package/dist/core/app/types.d.ts

@@ -5,13 +5,14 @@ import type { AstroConfig, CspAlgorithm, Locales, RemotePattern } from '../../ty
 import type { RouteData, SSRComponentMetadata, SSRLoadedRenderer, SSRResult } from '../../types/public/internal.js';
 import type { SinglePageBuiltModule } from '../build/types.js';
 import type { CspDirective } from '../csp/config.js';
-import type { AstroLoggerLevel } from '../logger/core.js';
+import type { AstroLoggerDestination, AstroLoggerLevel, AstroLoggerMessage } from '../logger/core.js';
 import type { RoutingStrategies } from './common.js';
 import type { CacheProviderFactory, SSRManifestCache } from '../cache/types.js';
 import type { BaseSessionConfig, SessionDriverFactory } from '../session/types.js';
 import type { DevToolbarPlacement } from '../../types/public/toolbar.js';
 import type { MiddlewareMode } from '../../types/public/integrations.js';
 import type { BaseApp } from './base.js';
+import type { LoggerHandlerConfig } from '../logger/config.js';
 type ComponentPath = string;
 export type StylesheetAsset = {
     type: 'inline';
@@ -59,7 +60,7 @@ export type SSRManifest = {
     userAssetsBase: string | undefined;
     trailingSlash: AstroConfig['trailingSlash'];
     buildFormat: NonNullable<AstroConfig['build']>['format'];
-    compressHTML: boolean;
+    compressHTML: boolean | 'jsx';
     experimentalQueuedRendering: {
         enabled: boolean;
         /** Node pool size for memory reuse (default: 1000, set to 0 to disable pooling) */
@@ -96,6 +97,11 @@ export type SSRManifest = {
     key: Promise<CryptoKey>;
     i18n: SSRManifestI18n | undefined;
     middleware?: () => Promise<AstroMiddlewareInstance> | AstroMiddlewareInstance;
+    logger?: () => Promise<{
+        default: AstroLoggerDestination<AstroLoggerMessage>;
+    }> | {
+        default: AstroLoggerDestination<AstroLoggerMessage>;
+    };
     actions?: () => Promise<SSRActions> | SSRActions;
     sessionDriver?: () => Promise<{
         default: SessionDriverFactory | null;
@@ -139,6 +145,7 @@ export type SSRManifest = {
     };
     internalFetchHeaders?: Record<string, string>;
     logLevel: AstroLoggerLevel;
+    experimentalLogger: LoggerHandlerConfig | undefined;
 };
 export type SSRActions = {
     server: Record<string, ActionClient<any, any, any>>;
@@ -167,7 +174,7 @@ export interface SSRManifestSession extends BaseSessionConfig {
     options?: Record<string, any> | undefined;
 }
 /** Public type exposed through the `astro:build:ssr` integration hook */
-export type SerializedSSRManifest = Omit<SSRManifest, 'middleware' | 'routes' | 'assets' | 'componentMetadata' | 'inlinedScripts' | 'clientDirectives' | 'serverIslandNameMap' | 'key' | 'rootDir' | 'srcDir' | 'cacheDir' | 'outDir' | 'publicDir' | 'buildClientDir' | 'buildServerDir'> & {
+export type SerializedSSRManifest = Omit<SSRManifest, 'middleware' | 'logger' | 'routes' | 'assets' | 'componentMetadata' | 'inlinedScripts' | 'clientDirectives' | 'serverIslandNameMap' | 'key' | 'rootDir' | 'srcDir' | 'cacheDir' | 'outDir' | 'publicDir' | 'buildClientDir' | 'buildServerDir'> & {
     rootDir: string;
     srcDir: string;
     cacheDir: string;

package/dist/core/base-pipeline.d.ts

@@ -23,13 +23,14 @@ import { HTMLStringCache } from '../runtime/server/html-string-cache.js';
 export declare abstract class Pipeline {
     readonly internalMiddleware: MiddlewareHandler[];
     resolvedMiddleware: MiddlewareHandler | undefined;
+    resolvedLogger: boolean;
     resolvedActions: SSRActions | undefined;
     resolvedSessionDriver: SessionDriverFactory | null | undefined;
     resolvedCacheProvider: CacheProvider | null | undefined;
     compiledCacheRoutes: CompiledCacheRoute[] | undefined;
     nodePool: NodePool | undefined;
     htmlStringCache: HTMLStringCache | undefined;
-    readonly logger: AstroLogger;
+    logger: AstroLogger;
     readonly manifest: SSRManifest;
     /**
      * "development" or "production" only
@@ -70,7 +71,7 @@ export declare abstract class Pipeline {
     /**
      * Used to provide better error messages for `Astro.clientAddress`
      */
-    adapterName?: string, clientDirectives?: Map<string, string>, inlinedScripts?: Map<string, string>, compressHTML?: boolean, i18n?: import("./app/types.js").SSRManifestI18n | undefined, middleware?: (() => Promise<import("../types/public/common.js").AstroMiddlewareInstance> | import("../types/public/common.js").AstroMiddlewareInstance) | undefined, routeCache?: RouteCache, 
+    adapterName?: string, clientDirectives?: Map<string, string>, inlinedScripts?: Map<string, string>, compressHTML?: boolean | "jsx", i18n?: import("./app/types.js").SSRManifestI18n | undefined, middleware?: (() => Promise<import("../types/public/common.js").AstroMiddlewareInstance> | import("../types/public/common.js").AstroMiddlewareInstance) | undefined, routeCache?: RouteCache, 
     /**
      * Used for `Astro.site`.
      */
@@ -116,6 +117,12 @@ export declare abstract class Pipeline {
      * Called via HMR when middleware files change during development.
      */
     clearMiddleware(): void;
+    /**
+     * Resolves the logger destination from the manifest and updates the pipeline logger.
+     * If the user configured `experimental.logger`, the bundled logger factory is loaded
+     * and replaces the default console destination. This is lazy and only resolves once.
+     */
+    getLogger(): Promise<AstroLogger>;
     getActions(): Promise<SSRActions>;
     getSessionDriver(): Promise<SessionDriverFactory | null>;
     getCacheProvider(): Promise<CacheProvider | null>;