astro 7.0.0-beta.3 → 7.0.0-beta.5

package/dist/assets/build/generate.js

@@ -1,11 +1,11 @@
 import fs, { readFileSync } from "node:fs";
 import { basename } from "node:path/posix";
 import colors from "piccolore";
-import { getOutDirWithinCwd } from "../../core/build/common.js";
 import { getTimeStat } from "../../core/build/util.js";
 import { AstroError } from "../../core/errors/errors.js";
 import { AstroErrorData } from "../../core/errors/index.js";
 import { isRemotePath, removeLeadingForwardSlash } from "../../core/path.js";
+import { getClientOutputDirectory } from "../../prerender/utils.js";
 import { getConfiguredImageService } from "../internal.js";
 import { isESMImportedImage } from "../utils/imageKind.js";
 import { loadRemoteImage, revalidateRemoteImage } from "./remote.js";
@@ -29,8 +29,9 @@ async function prepareAssetsGenerationEnv(options, totalCount) {
     serverRoot = new URL(".prerender/", settings.config.build.server);
     clientRoot = settings.config.build.client;
   } else {
-    serverRoot = getOutDirWithinCwd(settings.config.outDir);
-    clientRoot = settings.config.outDir;
+    const clientOutputDir = getClientOutputDirectory(settings);
+    serverRoot = clientOutputDir;
+    clientRoot = clientOutputDir;
   }
   return {
     logger,

package/dist/cli/add/index.js

@@ -48,6 +48,7 @@ export default {
 public-hoist-pattern[]=*lit*
 `,
   CLOUDFLARE_WRANGLER_CONFIG: (name, compatibilityDate) => `{
+	"$schema": "./node_modules/wrangler/config-schema.json",
 	"compatibility_date": ${JSON.stringify(compatibilityDate)},
 	"compatibility_flags": ["global_fetch_strictly_public"],
 	"name": ${JSON.stringify(name)},

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

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "7.0.0-beta.3";
+  version = "7.0.0-beta.5";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/container/index.d.ts

@@ -67,7 +67,7 @@ export type ContainerRenderOptions = {
      */
     routeType?: RouteType;
     /**
-     * Allows to pass `Astro.props` to an Astro component:
+     * Allows passing `Astro.props` to an Astro component:
      *
      * ```js
      * container.renderToString(Endpoint, { props: { "lorem": "ipsum" } });
@@ -75,9 +75,9 @@ export type ContainerRenderOptions = {
      */
     props?: Props;
     /**
-     * When `false`, it forces to render the component as it was a full-fledged page.
+     * When `false`, it forces the component to render as if it were a full-fledged page.
      *
-     * By default, the container API render components as [partials](https://docs.astro.build/en/basics/astro-pages/#page-partials).
+     * By default, the container API renders components as [partials](https://docs.astro.build/en/basics/astro-pages/#page-partials).
      *
      */
     partial?: boolean;

package/dist/content/content-layer.js

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

package/dist/content/runtime.d.ts

@@ -70,7 +70,7 @@ type RenderResult = {
 };
 export declare function updateImageReferencesInData<T extends Record<string, unknown>>(data: T, fileName?: string, imageAssetMap?: Map<string, ImageMetadata>): T;
 export declare function renderEntry(entry: DataEntry): Promise<RenderResult>;
-export declare function createReference(): (collection: string) => z.ZodPipe<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
+export declare function createReference(): (collection: string) => z.ZodPipe<z.ZodUnion<readonly [z.ZodPipe<z.ZodNumber, z.ZodTransform<string, number>>, z.ZodString, z.ZodObject<{
     id: z.ZodString;
     collection: z.ZodString;
 }, z.core.$strip>, z.ZodObject<{

package/dist/content/runtime.js

@@ -484,6 +484,7 @@ async function render({
 function createReference() {
   return function reference(collection) {
     return z.union([
+      z.number().transform((num) => num.toString(10)),
       z.string(),
       z.object({
         id: z.string(),

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

@@ -23,6 +23,25 @@ import {
 } from "./consts.js";
 import { getDataStoreFile } from "./content-layer.js";
 import { getContentPaths, isDeferredModule } from "./utils.js";
+function invalidateAssetImports(viteServer, filePath) {
+  const timestamp = Date.now();
+  for (const environment of Object.values(viteServer.environments)) {
+    const modules = environment.moduleGraph.getModulesByFile(filePath);
+    if (modules) {
+      for (const module of modules) {
+        environment.moduleGraph.invalidateModule(module, void 0, timestamp, true);
+      }
+    }
+    if (isRunnableDevEnvironment(environment)) {
+      const runnerModules = environment.runner.evaluatedModules.getModulesByFile(filePath);
+      if (runnerModules) {
+        for (const runnerModule of runnerModules) {
+          environment.runner.evaluatedModules.invalidateModule(runnerModule);
+        }
+      }
+    }
+  }
+}
 function invalidateDataStore(viteServer) {
   const environment = viteServer.environments[ASTRO_VITE_ENVIRONMENT_NAMES.ssr];
   const module = environment.moduleGraph.getModuleById(RESOLVED_DATA_STORE_VIRTUAL_ID);
@@ -67,8 +86,11 @@ function astroContentVirtualModPlugin({
     },
     buildStart() {
       if (devServer) {
+        const assetImportsPath = fileURLToPath(new URL(ASSET_IMPORTS_FILE, settings.dotAstroDir));
         devServer.watcher.add(fileURLToPath(dataStoreFile));
+        devServer.watcher.add(assetImportsPath);
         invalidateDataStore(devServer);
+        invalidateAssetImports(devServer, assetImportsPath);
       }
     },
     resolveId: {
@@ -175,14 +197,19 @@ function astroContentVirtualModPlugin({
     configureServer(server) {
       devServer = server;
       const dataStorePath = fileURLToPath(dataStoreFile);
+      const assetImportsPath = fileURLToPath(new URL(ASSET_IMPORTS_FILE, settings.dotAstroDir));
       server.watcher.on("add", (addedPath) => {
         if (addedPath === dataStorePath) {
           invalidateDataStore(server);
+          invalidateAssetImports(server, assetImportsPath);
         }
       });
       server.watcher.on("change", (changedPath) => {
         if (changedPath === dataStorePath) {
           invalidateDataStore(server);
+          invalidateAssetImports(server, assetImportsPath);
+        } else if (changedPath === assetImportsPath) {
+          invalidateAssetImports(server, assetImportsPath);
         }
       });
     }

package/dist/core/app/base.js

@@ -14,7 +14,6 @@ import { DefaultFetchHandler } from "../fetch/default-handler.js";
 import { appSymbol } from "../constants.js";
 import { DefaultErrorHandler } from "../errors/default-handler.js";
 import { setRenderOptions } from "./render-options.js";
-import { MultiLevelEncodingError } from "../util/pathname.js";
 class BaseApp {
   manifest;
   manifestData;
@@ -237,20 +236,13 @@ class BaseApp {
       waitUntil
     };
     let response;
-    try {
-      if (this.#fetchHandler instanceof DefaultFetchHandler) {
-        Reflect.set(request, appSymbol, this);
-        response = await this.#fetchHandler.renderWithOptions(request, resolvedOptions);
-      } else {
-        setRenderOptions(request, resolvedOptions);
-        Reflect.set(request, appSymbol, this);
-        response = await this.#fetchHandler.fetch(request);
-      }
-    } catch (err) {
-      if (err instanceof MultiLevelEncodingError) {
-        return new Response("Bad Request", { status: 400 });
-      }
-      throw err;
+    if (this.#fetchHandler instanceof DefaultFetchHandler) {
+      Reflect.set(request, appSymbol, this);
+      response = await this.#fetchHandler.renderWithOptions(request, resolvedOptions);
+    } else {
+      setRenderOptions(request, resolvedOptions);
+      Reflect.set(request, appSymbol, this);
+      response = await this.#fetchHandler.fetch(request);
     }
     this.#warnMissingFeatures();
     if (response.headers.get(ASTRO_ERROR_HEADER)) {

package/dist/core/app/prepare-response.d.ts

@@ -1,7 +1,6 @@
 /**
- * Strips internal-only headers from the response before sending it to the
- * user agent, and optionally appends cookies written via `Astro.cookie.set()`
- * to the `Set-Cookie` header.
+ * Appends cookies written via `Astro.cookie.set()` to the `Set-Cookie` header
+ * and marks the response as sent.
  *
  * This is a pure function with no dependencies on the app; it is shared by
  * `AstroHandler` and the various error handlers.

package/dist/core/app/prepare-response.js

@@ -1,11 +1,6 @@
-import { INTERNAL_RESPONSE_HEADERS, responseSentSymbol } from "../constants.js";
+import { responseSentSymbol } from "../constants.js";
 import { getSetCookiesFromResponse } from "../cookies/index.js";
 function prepareResponse(response, { addCookieHeader }) {
-  for (const headerName of INTERNAL_RESPONSE_HEADERS) {
-    if (response.headers.has(headerName)) {
-      response.headers.delete(headerName);
-    }
-  }
   if (addCookieHeader) {
     for (const setCookieHeaderValue of getSetCookiesFromResponse(response)) {
       response.headers.append("set-cookie", setCookieHeaderValue);

package/dist/core/build/generate.js

@@ -267,7 +267,7 @@ async function renderPath({
       relativeLocation: locationSite,
       from: fromPath
     });
-    if (config.compressHTML === true) {
+    if (config.compressHTML) {
       body = body.replaceAll("\n", "");
     }
     if (route.type !== "redirect") {

package/dist/core/build/plugins/plugin-css.js

@@ -107,6 +107,7 @@ function rollupPluginAstroBuildCSS(options) {
         if (meta.importedCss.size < 1) continue;
         if (this.environment?.name === ASTRO_VITE_ENVIRONMENT_NAMES.client) {
           for (const id of Object.keys(chunk.modules)) {
+            if (!isCSSRequest(id)) continue;
             for (const pageData of getParentClientOnlys(id, this, internals)) {
               for (const importedCssImport of meta.importedCss) {
                 const cssToInfoRecord = pagesToCss[pageData.moduleSpecifier] ??= {};

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

@@ -49,7 +49,7 @@ export declare const ASTRO_CONFIG_DEFAULTS: {
     devToolbar: {
         enabled: true;
     };
-    compressHTML: true;
+    compressHTML: "jsx";
     server: {
         host: false;
         port: number;
@@ -57,7 +57,7 @@ export declare const ASTRO_CONFIG_DEFAULTS: {
         allowedHosts: never[];
     };
     integrations: never[];
-    markdown: Required<Omit<import("@astrojs/markdown-remark").AstroMarkdownOptions, "image">>;
+    markdown: Required<Omit<import("@astrojs/internal-helpers/markdown").AstroMarkdownOptions, "image">>;
     vite: {};
     legacy: {
         collectionsBackwardsCompat: false;
@@ -329,8 +329,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         processor: z.ZodDefault<z.ZodObject<{
             name: z.ZodString;
             options: z.ZodDefault<z.ZodCustom<object, object>>;
-            createRenderer: z.ZodCustom<(shared: import("@astrojs/markdown-remark").AstroMarkdownOptions) => Promise<import("@astrojs/markdown-remark").MarkdownRenderer>, (shared: import("@astrojs/markdown-remark").AstroMarkdownOptions) => Promise<import("@astrojs/markdown-remark").MarkdownRenderer>>;
-            createMdxRenderer: z.ZodOptional<z.ZodCustom<((shared: import("@astrojs/markdown-remark").AstroMarkdownOptions, mdx: import("@astrojs/internal-helpers/markdown").MdxRendererOptions) => Promise<import("@astrojs/internal-helpers/markdown").MdxRenderer>) | undefined, ((shared: import("@astrojs/markdown-remark").AstroMarkdownOptions, mdx: import("@astrojs/internal-helpers/markdown").MdxRendererOptions) => Promise<import("@astrojs/internal-helpers/markdown").MdxRenderer>) | undefined>>;
+            createRenderer: z.ZodCustom<(shared: import("@astrojs/internal-helpers/markdown").AstroMarkdownOptions) => Promise<import("@astrojs/internal-helpers/markdown").MarkdownRenderer>, (shared: import("@astrojs/internal-helpers/markdown").AstroMarkdownOptions) => Promise<import("@astrojs/internal-helpers/markdown").MarkdownRenderer>>;
+            createMdxRenderer: z.ZodOptional<z.ZodCustom<((shared: import("@astrojs/internal-helpers/markdown").AstroMarkdownOptions, mdx: import("@astrojs/internal-helpers/markdown").MdxRendererOptions) => Promise<import("@astrojs/internal-helpers/markdown").MdxRenderer>) | undefined, ((shared: import("@astrojs/internal-helpers/markdown").AstroMarkdownOptions, mdx: import("@astrojs/internal-helpers/markdown").MdxRendererOptions) => Promise<import("@astrojs/internal-helpers/markdown").MdxRenderer>) | undefined>>;
         }, z.core.$strip>>;
     }, z.core.$strip>>;
     vite: z.ZodDefault<z.ZodCustom<ViteUserConfig, ViteUserConfig>>;

package/dist/core/config/schemas/base.js

@@ -2,7 +2,7 @@ import {
   markdownConfigDefaults,
   syntaxHighlightDefaults
 } from "@astrojs/internal-helpers/markdown";
-import { unified } from "@astrojs/markdown-remark";
+import { satteri } from "@astrojs/markdown-satteri";
 import { bundledThemes } from "shiki";
 import * as z from "zod/v4";
 import { FontFamilySchema } from "../../../assets/fonts/config.js";
@@ -38,7 +38,7 @@ const ASTRO_CONFIG_DEFAULTS = {
   devToolbar: {
     enabled: true
   },
-  compressHTML: true,
+  compressHTML: "jsx",
   server: {
     host: false,
     port: 4321,
@@ -238,7 +238,7 @@ const AstroConfigSchema = z.object({
     remarkRehype: z.custom((data) => data instanceof Object && !Array.isArray(data)).default(ASTRO_CONFIG_DEFAULTS.markdown.remarkRehype),
     // Deprecated: left undefined unless the user explicitly sets them, so the
     // deprecation warning only fires when actually used. The active processor
-    // (`unified()`) supplies the real default (`gfm`/smart punctuation on) when
+    // (`satteri()`) supplies the real default (`gfm`/smart punctuation on) when
     // these are absent.
     gfm: z.boolean().optional(),
     smartypants: z.union([z.boolean(), smartypantsOptionsSchema]).transform((val) => {
@@ -256,7 +256,7 @@ const AstroConfigSchema = z.object({
       createMdxRenderer: z.custom(
         (v) => v === void 0 || typeof v === "function"
       ).optional()
-    }).default(() => unified())
+    }).default(() => satteri())
   }).prefault({}),
   vite: z.custom((data) => data instanceof Object && !Array.isArray(data)).default(ASTRO_CONFIG_DEFAULTS.vite),
   i18n: z.optional(

package/dist/core/config/validate.js

@@ -30,7 +30,7 @@ function warnDeprecatedMarkdownOptions(config) {
   const names = deprecated.map((key) => `\`markdown.${key}\``).join(" and ");
   const isPlural = deprecated.length > 1;
   console.warn(
-    `[astro] ${names} ${isPlural ? "are" : "is"} deprecated. Move ${isPlural ? "them" : "it"} onto your processor instead (e.g. \`unified({ gfm: false, smartypants: false })\`). Will be removed in a future major.`
+    `[astro] ${names} ${isPlural ? "are" : "is"} deprecated. Move ${isPlural ? "them" : "it"} onto your processor instead (e.g. \`satteri({ features: { gfm: false, smartPunctuation: false } })\`, or \`unified({ gfm: false, smartypants: false })\` from \`@astrojs/markdown-remark\`). Will be removed in a future major.`
   );
 }
 let didWarnAboutLegacyMarkdownPlugins = false;
@@ -45,7 +45,15 @@ async function coerceLegacyMarkdownPlugins(config) {
   if (remarkPlugins.length === 0 && rehypePlugins.length === 0 && Object.keys(remarkRehype).length === 0) {
     return;
   }
-  const { unified, isUnifiedProcessor } = await import("@astrojs/markdown-remark");
+  let unified;
+  let isUnifiedProcessor;
+  try {
+    ({ unified, isUnifiedProcessor } = await import("@astrojs/markdown-remark"));
+  } catch {
+    throw new Error(
+      "`markdown.remarkPlugins`, `markdown.rehypePlugins`, and `markdown.remarkRehype` run on the `unified` processor from `@astrojs/markdown-remark`, which is no longer installed by default now that S\xE4tteri is the default Markdown processor. Install it with:\n  npm install @astrojs/markdown-remark"
+    );
+  }
   const current = md.processor;
   if (!current || isUnifiedProcessor(current)) {
     const target = current ?? (md.processor = unified());

package/dist/core/constants.d.ts

@@ -1,46 +1,5 @@
 export declare const ASTRO_VERSION: string;
 export declare const ASTRO_GENERATOR: string;
-/**
- * The name for the header used to help rerouting behavior.
- * When set to "no", astro will NOT try to reroute an error response to the corresponding error page, which is the default behavior that can sometimes lead to loops.
- *
- * ```ts
- * const response = new Response("keep this content as-is", {
- *     status: 404,
- *     headers: {
- *         // note that using a variable name as the key of an object needs to be wrapped in square brackets in javascript
- *         // without them, the header name will be interpreted as "REROUTE_DIRECTIVE_HEADER" instead of "X-Astro-Reroute"
- *         [REROUTE_DIRECTIVE_HEADER]: 'no',
- *     }
- * })
- * ```
- * Alternatively...
- * ```ts
- * response.headers.set(REROUTE_DIRECTIVE_HEADER, 'no');
- * ```
- */
-export declare const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
-/**
- * Header and value that are attached to a Response object when a **user rewrite** occurs.
- *
- * This metadata is used to determine the origin of a Response. If a rewrite has occurred, it should be prioritised over other logic.
- */
-export declare const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
-export declare const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";
-/**
- * This header is set by the no-op Astro middleware.
- */
-export declare const NOOP_MIDDLEWARE_HEADER = "X-Astro-Noop";
-/**
- * The name for the header used to help i18n middleware, which only needs to act on "page" and "fallback" route types.
- */
-export declare const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
-/**
- * Internal headers that should be stripped from the response before
- * sending it to the user agent. Add new internal headers here so
- * `prepareResponse` removes them automatically.
- */
-export declare const INTERNAL_RESPONSE_HEADERS: readonly ["X-Astro-Reroute", "X-Astro-Rewrite", "X-Astro-Noop", "X-Astro-Route-Type"];
 /**
  * Set by internal handlers (e.g. PagesHandler) to signal that a
  * response should be replaced with the corresponding error page.

package/dist/core/constants.js

@@ -1,16 +1,5 @@
-const ASTRO_VERSION = "7.0.0-beta.3";
+const ASTRO_VERSION = "7.0.0-beta.5";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
-const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
-const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
-const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";
-const NOOP_MIDDLEWARE_HEADER = "X-Astro-Noop";
-const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
-const INTERNAL_RESPONSE_HEADERS = [
-  REROUTE_DIRECTIVE_HEADER,
-  REWRITE_DIRECTIVE_HEADER_KEY,
-  NOOP_MIDDLEWARE_HEADER,
-  ROUTE_TYPE_HEADER
-];
 const ASTRO_ERROR_HEADER = "X-Astro-Error";
 const DEFAULT_404_COMPONENT = "astro-default-404.astro";
 const REDIRECT_STATUS_CODES = [301, 302, 303, 307, 308, 300, 304];
@@ -57,15 +46,9 @@ export {
   ASTRO_VERSION,
   ASTRO_VITE_ENVIRONMENT_NAMES,
   DEFAULT_404_COMPONENT,
-  INTERNAL_RESPONSE_HEADERS,
   MIDDLEWARE_PATH_SEGMENT_NAME,
-  NOOP_MIDDLEWARE_HEADER,
   REDIRECT_STATUS_CODES,
   REROUTABLE_STATUS_CODES,
-  REROUTE_DIRECTIVE_HEADER,
-  REWRITE_DIRECTIVE_HEADER_KEY,
-  REWRITE_DIRECTIVE_HEADER_VALUE,
-  ROUTE_TYPE_HEADER,
   SUPPORTED_MARKDOWN_FILE_EXTENSIONS,
   appSymbol,
   clientAddressSymbol,

package/dist/core/dev/dev.js

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

package/dist/core/errors/default-handler.js

@@ -6,6 +6,7 @@ import { AstroMiddleware } from "../middleware/astro-middleware.js";
 import { PagesHandler } from "../pages/handler.js";
 import { matchRoute } from "../routing/match.js";
 import { provideSession } from "../session/handler.js";
+import { validateHost } from "../app/validate-headers.js";
 class DefaultErrorHandler {
   #app;
   #astroMiddleware;
@@ -31,15 +32,27 @@ class DefaultErrorHandler {
     if (errorRouteData) {
       if (errorRouteData.prerender) {
         const maybeDotHtml = errorRouteData.route.endsWith(`/${status}`) ? ".html" : "";
-        const statusURL = new URL(`${app.baseWithoutTrailingSlash}/${status}${maybeDotHtml}`, url);
+        const allowedDomains = app.manifest.allowedDomains;
+        const validatedHost = validateHost(url.host, url.protocol.replace(":", ""), allowedDomains);
+        const safeOrigin = validatedHost ? url.origin : `${url.protocol}//localhost`;
+        const statusURL = new URL(
+          `${app.baseWithoutTrailingSlash}/${status}${maybeDotHtml}`,
+          safeOrigin
+        );
         if (statusURL.toString() !== request.url && resolvedRenderOptions.prerenderedErrorPageFetch) {
-          const response2 = await resolvedRenderOptions.prerenderedErrorPageFetch(
-            statusURL.toString()
-          );
-          const override = { status, removeContentEncodingHeaders: true };
-          const newResponse = mergeResponses(response2, originalResponse, override);
-          prepareResponse(newResponse, resolvedRenderOptions);
-          return newResponse;
+          try {
+            const response2 = await resolvedRenderOptions.prerenderedErrorPageFetch(
+              statusURL.toString()
+            );
+            const override = { status, removeContentEncodingHeaders: true };
+            const newResponse = mergeResponses(response2, originalResponse, override);
+            prepareResponse(newResponse, resolvedRenderOptions);
+            return newResponse;
+          } catch {
+            const response2 = mergeResponses(new Response(null, { status }), originalResponse);
+            prepareResponse(response2, resolvedRenderOptions);
+            return response2;
+          }
         }
       }
       const mod = await app.pipeline.getComponentByRoute(errorRouteData);
@@ -66,6 +79,7 @@ class DefaultErrorHandler {
           return this.renderError(request, {
             ...resolvedRenderOptions,
             status,
+            error,
             response: originalResponse,
             skipMiddleware: true,
             pathname: resolvedPathname

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

@@ -108,6 +108,12 @@ export declare class FetchState implements AstroFetchState {
     status: number;
     /** Whether user middleware should be skipped for this request. */
     skipMiddleware: boolean;
+    /**
+     * Set to `true` when the request path was encoded too many times to fully
+     * decode (see {@link validateAndDecodePathname}). These requests are
+     * rejected with a `400` before middleware or routing run.
+     */
+    invalidEncoding: boolean;
     /** A flag that tells the render content if the rewriting was triggered. */
     isRewriting: boolean;
     /** A safety net in case of loops (rewrite counter). */
@@ -122,6 +128,10 @@ export declare class FetchState implements AstroFetchState {
     clientAddress: string | undefined;
     /** Whether this is a partial render (container API). */
     partial: boolean | undefined;
+    /** Internal metadata about the current response route type. */
+    responseRouteType: 'page' | 'fallback' | undefined;
+    /** Internal flag to prevent rerouting this response to an error page. */
+    skipErrorReroute: boolean;
     /** Whether to inject CSP meta tags. */
     shouldInjectCspMetaTags: boolean | undefined;
     /** Request-scoped locals object, shared with user middleware. */
@@ -227,4 +237,5 @@ export declare class FetchState implements AstroFetchState {
      * after an in-flight rewrite swaps the route / request / params.
      */
     invalidateContexts(): void;
+    resetResponseMetadata(): void;
 }

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

@@ -29,6 +29,7 @@ import { getParams, getProps } from "../render/index.js";
 import { Rewrites } from "../rewrites/handler.js";
 import { isRoute404or500, isRouteServerIsland } from "../routing/match.js";
 import { normalizeUrl } from "../util/normalized-url.js";
+import { MultiLevelEncodingError, validateAndDecodePathname } from "../util/pathname.js";
 import { getOriginPathname, setOriginPathname } from "../routing/rewrite.js";
 import { computePathnameFromDomain } from "../i18n/domain.js";
 import { getCustom404Route, routeHasHtmlExtension } from "../routing/helpers.js";
@@ -87,6 +88,12 @@ class FetchState {
   status = 200;
   /** Whether user middleware should be skipped for this request. */
   skipMiddleware = false;
+  /**
+   * Set to `true` when the request path was encoded too many times to fully
+   * decode (see {@link validateAndDecodePathname}). These requests are
+   * rejected with a `400` before middleware or routing run.
+   */
+  invalidEncoding = false;
   /** A flag that tells the render content if the rewriting was triggered. */
   isRewriting = false;
   /** A safety net in case of loops (rewrite counter). */
@@ -110,6 +117,10 @@ class FetchState {
   clientAddress;
   /** Whether this is a partial render (container API). */
   partial;
+  /** Internal metadata about the current response route type. */
+  responseRouteType;
+  /** Internal flag to prevent rerouting this response to an error page. */
+  skipErrorReroute = false;
   /** Whether to inject CSP meta tags. */
   shouldInjectCspMetaTags;
   /** Request-scoped locals object, shared with user middleware. */
@@ -190,7 +201,7 @@ class FetchState {
     this.locals = options?.locals ?? {};
     this.url = normalizeUrl(url);
     this.cookies = new AstroCookies(request);
-    if (pipeline.manifest.allowedDomains && pipeline.manifest.allowedDomains.length > 0) {
+    if (pipeline.manifest.allowedDomains && pipeline.manifest.allowedDomains.length > 0 && !this.routeData?.prerender) {
       this.#applyForwardedHeaders();
     }
     if (!Reflect.get(this.request, originPathnameSymbol)) {
@@ -694,8 +705,12 @@ class FetchState {
     }
     pathname = prependForwardSlash(pathname);
     try {
-      return decodeURI(pathname);
+      return validateAndDecodePathname(pathname);
     } catch (e) {
+      if (e instanceof MultiLevelEncodingError) {
+        this.invalidEncoding = true;
+        return pathname;
+      }
       this.pipeline.logger.error(null, e.toString());
       return pathname;
     }
@@ -875,6 +890,10 @@ class FetchState {
     this.actionApiContext = null;
     this.apiContext = null;
   }
+  resetResponseMetadata() {
+    this.responseRouteType = void 0;
+    this.skipErrorReroute = false;
+  }
 }
 export {
   FetchState,

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

@@ -13,13 +13,18 @@ export declare function astro(state: FetchState): Promise<Response>;
 export declare function trailingSlash(state: FetchState): Response | undefined;
 /**
  * Runs Astro's middleware chain for the given state, calling `next` at
- * the bottom of the chain to produce the response. Lazily creates
- * the render context if needed.
+ * the bottom of the chain to produce the response. Lazily creates the
+ * render context if needed. Unmatched routes render the 404 error page;
+ * errors thrown by user middleware are logged and render the 500 error
+ * page; errors surfaced through `next` (the host framework's downstream
+ * chain) propagate to the host instead.
  */
 export declare function middleware(state: FetchState, next: (state: FetchState) => Promise<Response>): Promise<Response>;
 /**
  * Dispatches the request to the matched route (endpoint, page, redirect,
- * or fallback). Lazily creates the render context if needed.
+ * or fallback). Lazily creates the render context if needed. Unmatched
+ * routes render the 404 error page; render-time errors are logged and
+ * render the 500 error page.
  */
 export declare function pages(state: FetchState): Promise<Response>;
 /**

package/dist/core/fetch/index.js

@@ -51,7 +51,7 @@ function middleware(state, next) {
     mw = new AstroMiddleware(app.pipeline);
     middlewareInstances.set(app, mw);
   }
-  return mw.handle(state, (s, _ctx) => next(s));
+  return mw.handleWithErrorFallback(app, state, (s, _ctx) => next(s));
 }
 const pagesHandlers = /* @__PURE__ */ new WeakMap();
 function pages(state) {
@@ -61,7 +61,7 @@ function pages(state) {
     handler = new PagesHandler(app.pipeline);
     pagesHandlers.set(app, handler);
   }
-  return handler.handle(state, state.getAPIContext());
+  return handler.handleWithErrorFallback(app, state);
 }
 function sessions(state) {
   return provideSession(state);