astro 7.2.2 → 7.2.4

package/dist/core/fetch/features.js

@@ -0,0 +1,27 @@
+const FetchFeatures = {
+  redirects: 1 << 0,
+  sessions: 1 << 1,
+  actions: 1 << 2,
+  middleware: 1 << 3,
+  i18n: 1 << 4,
+  cache: 1 << 5
+};
+const ALL_FETCH_FEATURES = FetchFeatures.redirects | FetchFeatures.sessions | FetchFeatures.actions | FetchFeatures.middleware | FetchFeatures.i18n | FetchFeatures.cache;
+const usedFeatures = /* @__PURE__ */ new WeakMap();
+function markFeatureUsed(manifest, feature) {
+  const entry = usedFeatures.get(manifest);
+  if (entry) {
+    entry.bits |= feature;
+  } else {
+    usedFeatures.set(manifest, { bits: feature });
+  }
+}
+function getUsedFeatures(manifest) {
+  return usedFeatures.get(manifest)?.bits ?? 0;
+}
+export {
+  ALL_FETCH_FEATURES,
+  FetchFeatures,
+  getUsedFeatures,
+  markFeatureUsed
+};

package/dist/core/fetch/fetch-state.d.ts

@@ -4,8 +4,33 @@ import type { Params, Props, RewritePayload } from '../../types/public/common.js
 import type { APIContext, AstroGlobal } from '../../types/public/context.js';
 import type { RouteData, SSRResult } from '../../types/public/internal.js';
 import { AstroCookies } from '../cookies/index.js';
-import { type Pipeline } from '../render/index.js';
-import type { ResolvedRenderOptions } from '../app/base.js';
+import type { RenderErrorOptions, ResolvedRenderOptions } from '../app/base.js';
+import type { SSRManifest } from '../app/types.js';
+import { type RequestLogPayload } from '../environment/index.js';
+import type { AstroLogger } from '../logger/core.js';
+/**
+ * Per-render facade inputs passed by `BaseApp.render`'s fast path to the
+ * internal `FetchState` constructor and stored as plain state fields.
+ *
+ * MEMBERSHIP CLAMP: frozen at `{ streaming?, renderError?, logRequest? }`.
+ * Any addition must be facade-INSTANCE behavior — something a public
+ * overridable/reassignable method dispatches — never static or per-manifest
+ * data. This type is never exported from a public entrypoint;
+ * only `BaseApp.render` constructs it; only the `FetchState` constructor
+ * consumes it; it is never stored on a request, in a registry, or passed to
+ * any other function.
+ */
+export interface FacadeHooks {
+    /** Overrides the environment's `defaultStreaming` for this render. */
+    streaming?: boolean;
+    /**
+     * Late-bound `app.renderError` dispatch for deep chain-internal error
+     * reroutes (preserves cloudflare's instance-property reassignment).
+     */
+    renderError?: (request: Request, options: RenderErrorOptions) => Promise<Response>;
+    /** Late-bound `app.logThisRequest` dispatch (dev request lines). */
+    logRequest?: (payload: RequestLogPayload) => void;
+}
 /**
  * The public contract of {@link FetchState} exposed to user-land code
  * (custom fetch handlers, Hono middleware, etc.).
@@ -65,7 +90,27 @@ export declare function getFetchStateFromAPIContext(context: APIContext): FetchS
  */
 export declare class FetchState implements AstroFetchState {
     #private;
-    pipeline: Pipeline;
+    /** The manifest — the single ambient source of static, build-time data. */
+    manifest: SSRManifest;
+    /** The manifest's identity-stable logger, captured once at construction. */
+    logger: AstroLogger;
+    /**
+     * Whether page renders stream. From the facade hooks on the fast path,
+     * else the environment's default.
+     */
+    streaming: boolean;
+    /**
+     * Internal facade hook: late-bound `app.renderError` dispatch. Undefined on
+     * bare and custom-handler paths — those fall through to the environment's
+     * error strategy (`renderErrorPage`).
+     */
+    renderError: ((request: Request, options: RenderErrorOptions) => Promise<Response>) | undefined;
+    /**
+     * Internal facade hook: late-bound `app.logThisRequest` dispatch. Undefined
+     * on bare and custom-handler paths — those fall through to the
+     * environment's `logRequest` behavior.
+     */
+    logRequest: ((payload: RequestLogPayload) => void) | undefined;
     /**
      * The request to render. Mutated during rewrites so subsequent renders
      * see the rewritten URL.
@@ -75,7 +120,7 @@ export declare class FetchState implements AstroFetchState {
     /**
      * The pathname to use for routing and rendering. Starts out as the raw,
      * base-stripped, decoded pathname from the request. May be further
-     * normalized by `AstroHandler` after routeData is known (in dev, when
+     * normalized by `handleRequest` after routeData is known (in dev, when
      * the matched route has no `.html` extension, `.html` / `/index.html`
      * suffixes are stripped).
      */
@@ -102,7 +147,7 @@ export declare class FetchState implements AstroFetchState {
     response: Response | undefined;
     /**
      * Default HTTP status for the rendered response. Callers override
-     * before rendering runs (e.g. `AstroHandler` sets this from
+     * before rendering runs (e.g. `handleRequest` sets this from
      * `BaseApp.getDefaultStatusCode`; error handlers set `404` / `500`).
      */
     status: number;
@@ -150,9 +195,9 @@ export declare class FetchState implements AstroFetchState {
     result: SSRResult | undefined;
     /** Initial props (from container/error handler). */
     initialProps: Props;
-    constructor(pipeline: Pipeline, request: Request, options?: ResolvedRenderOptions);
+    constructor(manifest: SSRManifest, request: Request, options?: ResolvedRenderOptions, hooks?: FacadeHooks);
     /**
-     * Triggers a rewrite. Delegates to the Rewrites handler.
+     * Triggers a rewrite. Delegates to the rewrites handler module.
      */
     rewrite(payload: RewritePayload): Promise<Response>;
     /**

package/dist/core/fetch/fetch-state.js

@@ -1,20 +1,17 @@
 import colors from "piccolore";
 import {
-  collapseDuplicateLeadingSlashes,
   collapseDuplicateSlashes,
   prependForwardSlash,
-  removeTrailingForwardSlash
+  stripRequestBase
 } from "@astrojs/internal-helpers/path";
 import { deserializeActionResult } from "../../actions/runtime/client.js";
 import { createCallAction, createGetActionResult, hasActionPayload } from "../../actions/utils.js";
 import { AstroCookies } from "../cookies/index.js";
 import { Slots } from "../render/index.js";
 import {
-  appSymbol,
   ASTRO_GENERATOR,
   fetchStateSymbol,
   originPathnameSymbol,
-  pipelineSymbol,
   responseSentSymbol
 } from "../constants.js";
 import { normalizeCspResourceEntry, pushDirective } from "../csp/runtime.js";
@@ -27,7 +24,7 @@ import {
   computePreferredLocaleList as computePreferredLocaleListUtil
 } from "../../i18n/utils.js";
 import { getParams, getProps } from "../render/index.js";
-import { Rewrites } from "../rewrites/handler.js";
+import { executeRewrite } from "../rewrites/handler.js";
 import { isRoute404or500, isRouteServerIsland } from "../routing/match.js";
 import { MultiLevelEncodingError, validateAndDecodePathname } from "../util/pathname.js";
 import { getOriginPathname, setOriginPathname } from "../routing/rewrite.js";
@@ -35,6 +32,12 @@ import { computePathnameFromDomain } from "../i18n/domain.js";
 import { getCustom404Route, routeHasHtmlExtension } from "../routing/helpers.js";
 import { getRenderOptions } from "../app/render-options.js";
 import { getFirstForwardedValue, validateForwardedHeaders } from "../app/validate-headers.js";
+import { getEnvironment } from "../environment/index.js";
+import { getLogger } from "../logger/manifest-logger.js";
+import { getSite } from "../manifest/derived.js";
+import { getRouteCache } from "../render/route-cache.js";
+import { getRouteTable, matchAllRoutes, matchRoute } from "../routing/route-table.js";
+import { getServerIslands } from "../server-islands/mappings.js";
 function getFetchStateFromAPIContext(context) {
   const state = context[fetchStateSymbol];
   if (!state) {
@@ -45,7 +48,27 @@ function getFetchStateFromAPIContext(context) {
   return state;
 }
 class FetchState {
-  pipeline;
+  /** The manifest — the single ambient source of static, build-time data. */
+  manifest;
+  /** The manifest's identity-stable logger, captured once at construction. */
+  logger;
+  /**
+   * Whether page renders stream. From the facade hooks on the fast path,
+   * else the environment's default.
+   */
+  streaming;
+  /**
+   * Internal facade hook: late-bound `app.renderError` dispatch. Undefined on
+   * bare and custom-handler paths — those fall through to the environment's
+   * error strategy (`renderErrorPage`).
+   */
+  renderError;
+  /**
+   * Internal facade hook: late-bound `app.logThisRequest` dispatch. Undefined
+   * on bare and custom-handler paths — those fall through to the
+   * environment's `logRequest` behavior.
+   */
+  logRequest;
   /**
    * The request to render. Mutated during rewrites so subsequent renders
    * see the rewritten URL.
@@ -55,7 +78,7 @@ class FetchState {
   /**
    * The pathname to use for routing and rendering. Starts out as the raw,
    * base-stripped, decoded pathname from the request. May be further
-   * normalized by `AstroHandler` after routeData is known (in dev, when
+   * normalized by `handleRequest` after routeData is known (in dev, when
    * the matched route has no `.html` extension, `.html` / `/index.html`
    * suffixes are stripped).
    */
@@ -82,7 +105,7 @@ class FetchState {
   response;
   /**
    * Default HTTP status for the rendered response. Callers override
-   * before rendering runs (e.g. `AstroHandler` sets this from
+   * before rendering runs (e.g. `handleRequest` sets this from
    * `BaseApp.getDefaultStatusCode`; error handlers set `404` / `500`).
    */
   status = 200;
@@ -145,8 +168,6 @@ class FetchState {
   result;
   /** Initial props (from container/error handler). */
   initialProps = {};
-  /** Rewrites handler instance. Lazy-initialized on first rewrite(). */
-  #rewrites;
   /** Memoized Astro page partial. */
   #astroPagePartial;
   /**
@@ -162,8 +183,12 @@ class FetchState {
   #preferredLocale;
   /** Memoized preferred locale list. */
   #preferredLocaleList;
-  constructor(pipeline, request, options) {
-    this.pipeline = pipeline;
+  constructor(manifest, request, options, hooks) {
+    this.manifest = manifest;
+    this.logger = getLogger(manifest);
+    this.streaming = hooks?.streaming ?? getEnvironment(manifest).defaultStreaming(manifest);
+    this.renderError = hooks?.renderError;
+    this.logRequest = hooks?.logRequest;
     this.request = request;
     options ??= getRenderOptions(request);
     this.routeData = options?.routeData;
@@ -190,10 +215,10 @@ class FetchState {
     const domainPathname = computePathnameFromDomain(
       request,
       url,
-      pipeline.manifest.i18n,
-      pipeline.manifest.base,
-      pipeline.manifest.trailingSlash,
-      pipeline.logger,
+      manifest.i18n,
+      manifest.base,
+      manifest.trailingSlash,
+      this.logger,
       pathname
     );
     if (domainPathname) {
@@ -207,33 +232,31 @@ class FetchState {
     this.locals = options?.locals ?? {};
     this.url = url;
     this.cookies = new AstroCookies(request);
-    if (pipeline.manifest.allowedDomains && pipeline.manifest.allowedDomains.length > 0 && !this.routeData?.prerender) {
+    if (manifest.allowedDomains && manifest.allowedDomains.length > 0 && !this.routeData?.prerender) {
       this.#applyForwardedHeaders();
     }
     if (!Reflect.get(this.request, originPathnameSymbol)) {
-      setOriginPathname(
-        this.request,
-        this.pathname,
-        pipeline.manifest.trailingSlash,
-        pipeline.manifest.buildFormat
-      );
+      setOriginPathname(this.request, this.pathname, manifest.trailingSlash, manifest.buildFormat);
     }
     this.#resolveRouteData();
   }
   /**
-   * Triggers a rewrite. Delegates to the Rewrites handler.
+   * Triggers a rewrite. Delegates to the rewrites handler module.
    */
   rewrite(payload) {
-    return (this.#rewrites ??= new Rewrites()).execute(this, payload);
+    return executeRewrite(this, payload);
   }
   /**
    * Creates the SSR result for the current page render.
    */
   async createResult(mod, ctx) {
-    const pipeline = this.pipeline;
-    const { clientDirectives, inlinedScripts, compressHTML, manifest, renderers, resolve } = pipeline;
+    const manifest = this.manifest;
+    const env = getEnvironment(manifest);
+    const { clientDirectives, inlinedScripts, compressHTML } = manifest;
+    const renderers = env.getRenderers(manifest);
+    const resolve = (specifier) => env.resolve(manifest, specifier);
     const routeData = this.routeData;
-    const { links, scripts, styles } = await pipeline.headElements(routeData);
+    const { links, scripts, styles } = await env.headElements(manifest, routeData);
     const extraStyleHashes = [];
     const extraScriptHashes = [];
     const shouldInjectCspMetaTags = this.shouldInjectCspMetaTags ?? manifest.shouldInjectCspMetaTags;
@@ -246,7 +269,7 @@ class FetchState {
         extraScriptHashes.push(await generateCspDigest(script.children, cspAlgorithm));
       }
     }
-    const componentMetadata = await pipeline.componentMetadata(routeData) ?? manifest.componentMetadata;
+    const componentMetadata = await env.componentMetadata(manifest, routeData) ?? manifest.componentMetadata;
     const headers = new Headers({ "Content-Type": "text/html" });
     const partial = typeof this.partial === "boolean" ? this.partial : Boolean(mod.partial);
     const actionResult = hasActionPayload(this.locals) ? deserializeActionResult(this.locals._actionPayload.actionResult) : void 0;
@@ -286,7 +309,7 @@ class FetchState {
       styles,
       actionResult,
       async getServerIslandNameMap() {
-        const serverIslands = await pipeline.getServerIslands();
+        const serverIslands = await getServerIslands(manifest);
         return serverIslands.serverIslandNameMap ?? /* @__PURE__ */ new Map();
       },
       key: manifest.key,
@@ -355,11 +378,7 @@ class FetchState {
     Object.defineProperty(Astro, "slots", {
       get: () => {
         if (!_slots) {
-          _slots = new Slots(
-            result,
-            slotValues,
-            this.pipeline.logger
-          );
+          _slots = new Slots(result, slotValues, this.logger);
         }
         return _slots;
       }
@@ -371,7 +390,7 @@ class FetchState {
    */
   createAstroPagePartial(result, apiContext) {
     const state = this;
-    const { cookies, locals, params, pipeline, url } = this;
+    const { cookies, locals, params, logger, url } = this;
     const { response } = result;
     const redirect = (path, status = 302) => {
       if (state.request[responseSentSymbol]) {
@@ -408,7 +427,7 @@ class FetchState {
       rewrite,
       request: this.request,
       response,
-      site: pipeline.site,
+      site: getSite(this.manifest),
       getActionResult: createGetActionResult(locals),
       get callAction() {
         return callAction;
@@ -423,13 +442,13 @@ class FetchState {
       get logger() {
         return {
           info(msg) {
-            pipeline.logger.info(null, msg);
+            logger.info(null, msg);
           },
           warn(msg) {
-            pipeline.logger.warn(null, msg);
+            logger.warn(null, msg);
           },
           error(msg) {
-            pipeline.logger.error(null, msg);
+            logger.error(null, msg);
           }
         };
       }
@@ -438,7 +457,7 @@ class FetchState {
     return partial;
   }
   getClientAddress() {
-    const { pipeline, clientAddress } = this;
+    const { clientAddress } = this;
     const routeData = this.routeData;
     if (routeData.prerender) {
       throw new AstroError({
@@ -449,10 +468,10 @@ class FetchState {
     if (clientAddress) {
       return clientAddress;
     }
-    if (pipeline.adapterName) {
+    if (this.manifest.adapterName) {
       throw new AstroError({
         ...AstroErrorData.ClientAddressNotAvailable,
-        message: AstroErrorData.ClientAddressNotAvailable.message(pipeline.adapterName)
+        message: AstroErrorData.ClientAddressNotAvailable.message(this.manifest.adapterName)
       });
     }
     throw new AstroError(AstroErrorData.StaticClientAddressNotAvailable);
@@ -462,10 +481,9 @@ class FetchState {
   }
   getCsp() {
     const state = this;
-    const { pipeline } = this;
-    if (!pipeline.manifest.csp) {
-      if (pipeline.runtimeMode === "production") {
-        pipeline.logger.warn(
+    if (!this.manifest.csp) {
+      if (getEnvironment(this.manifest).runtimeMode === "production") {
+        this.logger.warn(
           "csp",
           `context.csp was used when rendering the route ${colors.green(state.routeData.route)}, but CSP was not configured. For more information, see https://docs.astro.build/en/reference/configuration-reference/#securitycsp`
         );
@@ -489,7 +507,7 @@ class FetchState {
       warnedFallback.add(key);
       const general = `${family}-src`;
       const specific = `${general}-${kind === "element" ? "elem" : "attr"}`;
-      pipeline.logger.warn(
+      state.logger.warn(
         "csp",
         `A resource was added to \`${specific}\`, but \`${general}\` also defines custom resources (${defaultResources.join(
           " "
@@ -523,7 +541,7 @@ class FetchState {
   computeCurrentLocale() {
     const {
       url,
-      pipeline: { i18n },
+      manifest: { i18n },
       routeData
     } = this;
     if (!i18n || !routeData) return;
@@ -567,7 +585,7 @@ class FetchState {
   }
   computePreferredLocale() {
     const {
-      pipeline: { i18n },
+      manifest: { i18n },
       request
     } = this;
     if (!i18n) return;
@@ -575,7 +593,7 @@ class FetchState {
   }
   computePreferredLocaleList() {
     const {
-      pipeline: { i18n },
+      manifest: { i18n },
       request
     } = this;
     if (!i18n) return;
@@ -589,7 +607,7 @@ class FetchState {
   async loadComponentInstance() {
     if (this.componentInstance) return this.componentInstance;
     if (this.#componentInstancePromise) return this.#componentInstancePromise;
-    this.#componentInstancePromise = this.pipeline.getComponentByRoute(this.routeData).then((mod) => {
+    this.#componentInstancePromise = getEnvironment(this.manifest).getComponentByRoute(this.manifest, this.routeData).then((mod) => {
       this.componentInstance = mod;
       return mod;
     });
@@ -666,7 +684,7 @@ class FetchState {
         get() {
           if (!warned) {
             warned = true;
-            state.pipeline.logger.warn(
+            state.logger.warn(
               "session",
               "`Astro.session` was accessed but no session storage is configured. Either configure the storage manually or use an adapter that provides session storage. For more information, see https://docs.astro.build/en/guides/sessions/"
             );
@@ -704,18 +722,20 @@ class FetchState {
   #stripHtmlExtension() {
     if (this.routeData && this.routeData.type === "page" && !routeHasHtmlExtension(this.routeData)) {
       this.pathname = this.pathname.replace(/\/index\.html$/, "/").replace(/\.html$/, "");
+      if (this.manifest.trailingSlash === "always" && this.pathname !== "" && !this.pathname.endsWith("/")) {
+        this.pathname += "/";
+      }
     }
   }
   #resolveRouteData() {
-    const pipeline = this.pipeline;
     if (this.routeData) {
       this.#stripHtmlExtension();
       return;
     }
-    const matched = pipeline.matchRoute(this.pathname);
-    if (matched && matched.prerender && pipeline.manifest.serverLike) {
+    const matched = matchRoute(this.manifest, this.pathname);
+    if (matched && matched.prerender && this.manifest.serverLike) {
       if (matched.params.length > 0) {
-        const allMatches = pipeline.matchAllRoutes(this.pathname);
+        const allMatches = matchAllRoutes(this.manifest, this.pathname);
         this.routeData = allMatches.find((r) => !r.prerender);
       } else {
         this.routeData = void 0;
@@ -723,37 +743,31 @@ class FetchState {
     } else {
       this.routeData = matched;
     }
-    pipeline.logger.debug("router", "Astro matched the following route for " + this.request.url);
-    pipeline.logger.debug("router", "RouteData:\n" + this.routeData);
+    this.logger.debug("router", "Astro matched the following route for " + this.request.url);
+    this.logger.debug("router", "RouteData:\n" + this.routeData);
     if (!this.routeData) {
-      const custom404 = getCustom404Route(pipeline.manifestData);
+      const custom404 = getCustom404Route(getRouteTable(this.manifest));
       if (custom404 && !custom404.prerender) {
         this.routeData = custom404;
       }
     }
     if (!this.routeData) {
-      pipeline.logger.debug("router", "Astro hasn't found routes that match " + this.request.url);
-      pipeline.logger.debug("router", "Here's the available routes:\n", pipeline.manifestData);
+      this.logger.debug("router", "Astro hasn't found routes that match " + this.request.url);
+      this.logger.debug("router", "Here's the available routes:\n", getRouteTable(this.manifest));
       return;
     }
     this.#stripHtmlExtension();
   }
   /**
-   * Strips the pipeline's base from a normalized request pathname and prepends
+   * Strips the manifest's base from a normalized request pathname and prepends
    * a forward slash.
    *
-   * Mirrors `BaseApp.removeBase`, including the
-   * `collapseDuplicateLeadingSlashes` fix that prevents middleware
-   * authorization bypass when the URL starts with `//`.
+   * Mirrors `BaseApp.removeBase`: the router matches against this stripped path
+   * while middleware reads the un-stripped `context.url.pathname`, so both must
+   * strip the base identically.
    */
   #computePathname(normalizedPathname) {
-    let pathname = collapseDuplicateLeadingSlashes(normalizedPathname);
-    const base = this.pipeline.manifest.base;
-    if (pathname.startsWith(base)) {
-      const baseWithoutTrailingSlash = removeTrailingForwardSlash(base);
-      pathname = pathname.slice(baseWithoutTrailingSlash.length + 1);
-    }
-    return prependForwardSlash(pathname);
+    return prependForwardSlash(stripRequestBase(normalizedPathname, this.manifest.base));
   }
   /**
    * Decodes and normalizes the public request pathname before deriving the
@@ -766,7 +780,7 @@ class FetchState {
       if (e instanceof MultiLevelEncodingError) {
         this.invalidEncoding = true;
       } else {
-        this.pipeline.logger.error(null, e.toString());
+        this.logger.error(null, e.toString());
       }
     }
     return collapseDuplicateSlashes(pathname);
@@ -782,7 +796,7 @@ class FetchState {
    */
   #applyForwardedHeaders() {
     const headers = this.request.headers;
-    const allowedDomains = this.pipeline.manifest.allowedDomains;
+    const allowedDomains = this.manifest.allowedDomains;
     const validated = validateForwardedHeaders(
       getFirstForwardedValue(headers.get("x-forwarded-proto") ?? void 0),
       getFirstForwardedValue(headers.get("x-forwarded-host") ?? void 0),
@@ -815,12 +829,7 @@ class FetchState {
         this.clientAddress = forwardedFor;
       }
     }
-    const oldRequest = this.request;
-    this.request = new Request(this.url, oldRequest);
-    const app = Reflect.get(oldRequest, appSymbol);
-    if (app !== void 0) {
-      Reflect.set(this.request, appSymbol, app);
-    }
+    this.request = new Request(this.url, this.request);
   }
   /**
    * Returns the resolved `props` for this render, computing them lazily
@@ -834,17 +843,16 @@ class FetchState {
       this.props = this.initialProps;
       return this.props;
     }
-    const pipeline = this.pipeline;
     const mod = await this.loadComponentInstance();
     this.props = await getProps({
       mod,
       routeData: this.routeData,
-      routeCache: pipeline.routeCache,
+      routeCache: getRouteCache(this.manifest),
       pathname: this.pathname,
-      logger: pipeline.logger,
-      serverLike: pipeline.manifest.serverLike,
-      base: pipeline.manifest.base,
-      trailingSlash: pipeline.manifest.trailingSlash
+      logger: this.logger,
+      serverLike: this.manifest.serverLike,
+      base: this.manifest.base,
+      trailingSlash: this.manifest.trailingSlash
     });
     return this.props;
   }
@@ -884,7 +892,7 @@ class FetchState {
         return state.computePreferredLocaleList();
       },
       request: this.request,
-      site: this.pipeline.site,
+      site: getSite(this.manifest),
       url: this.url,
       get originPathname() {
         return getOriginPathname(state.request);
@@ -895,13 +903,13 @@ class FetchState {
       get logger() {
         return {
           info(msg) {
-            state.pipeline.logger.info(null, msg);
+            state.logger.info(null, msg);
           },
           warn(msg) {
-            state.pipeline.logger.warn(null, msg);
+            state.logger.warn(null, msg);
           },
           error(msg) {
-            state.pipeline.logger.error(null, msg);
+            state.logger.error(null, msg);
           }
         };
       }
@@ -925,7 +933,6 @@ class FetchState {
     const rewrite = async (reroutePayload) => {
       return await state.rewrite(reroutePayload);
     };
-    Reflect.set(actionApiContext, pipelineSymbol, this.pipeline);
     actionApiContext[fetchStateSymbol] = this;
     this.apiContext = Object.assign(actionApiContext, {
       props: this.props,

package/dist/core/fetch/index.d.ts

@@ -1,6 +1,12 @@
 import { FetchState as BaseFetchState } from './fetch-state.js';
 import type { AstroFetchState } from './fetch-state.js';
 export type { AstroFetchState };
+/**
+ * The public per-request state, constructible from a bare `Request`.
+ * Static, build-time data comes from the ambient manifest — the manifest
+ * module bundled into every Astro-built server — so no app, pipeline, or
+ * request-attached handle is needed.
+ */
 export declare class FetchState extends BaseFetchState {
     constructor(request: Request);
 }
@@ -52,9 +58,10 @@ export declare function redirects(state: FetchState): Promise<Response> | undefi
  */
 export declare function actions(state: FetchState): Promise<Response | undefined> | undefined;
 /**
- * Post-processes a response against the app's i18n configuration.
+ * Post-processes a response against the manifest's i18n configuration.
  * Handles locale redirects, 404s for invalid locales, and fallback
- * routing. Returns the response unmodified if i18n is not configured.
+ * routing. Returns the response unmodified if i18n is not configured
+ * (or the routing strategy is `manual`).
  */
 export declare function i18n(state: FetchState, response: Response): Promise<Response>;
 /**