astro 7.0.0-beta.4 → 7.0.0-beta.6

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.4";
+  version = "7.0.0-beta.6";
 }
 export {
   BuildTimeAstroVersionProvider

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.4") {
+    if (previousAstroVersion && previousAstroVersion !== "7.0.0-beta.6") {
       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.4") {
-      this.#store.metaStore().set("astro-version", "7.0.0-beta.4");
+    if ("7.0.0-beta.6") {
+      this.#store.metaStore().set("astro-version", "7.0.0-beta.6");
     }
     if (currentConfigDigest) {
       this.#store.metaStore().set("content-config-digest", currentConfigDigest);

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-manifest.js

@@ -258,10 +258,7 @@ async function buildManifest(opts, internals, staticFiles, encodedKey) {
     allowedDomains: settings.config.security?.allowedDomains,
     key: encodedKey,
     sessionConfig: sessionConfigToManifest(settings.config.session),
-    cacheConfig: cacheConfigToManifest(
-      settings.config.experimental?.cache,
-      settings.config.experimental?.routeRules
-    ),
+    cacheConfig: cacheConfigToManifest(settings.config.cache, settings.config.routeRules),
     csp,
     image: {
       objectFit: settings.config.image.objectFit,

package/dist/core/build/vite-build-config.js

@@ -35,6 +35,12 @@ function createViteBuildConfig(opts) {
         ...viteConfig.build?.rolldownOptions,
         // Setting as `exports-only` allows us to safely delete inputs that are only used during prerendering
         preserveEntrySignatures: "exports-only",
+        checks: {
+          ...viteConfig.build?.rolldownOptions?.checks,
+          // Disable Rolldown's built-in plugin timing warnings. These fire by default
+          // and produce noisy warnings about slow plugins during normal builds.
+          pluginTimings: false
+        },
         ...legacyAdapter && settings.buildOutput === "server" ? { input: LEGACY_SSR_ENTRY_VIRTUAL_MODULE } : {},
         output: {
           hoistTransitiveImports: false,

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

@@ -1,7 +1,7 @@
 import * as z from 'zod/v4';
 /**
- * Cache provider configuration (experimental.cache).
- * Provider only - routes are configured via experimental.routeRules.
+ * Cache provider configuration (`cache`).
+ * Provider only - routes are configured via `routeRules`.
  */
 export declare const CacheSchema: z.ZodObject<{
     provider: z.ZodOptional<z.ZodObject<{
@@ -11,14 +11,15 @@ export declare const CacheSchema: z.ZodObject<{
     }, z.core.$strip>>;
 }, z.core.$strip>;
 /**
- * Route rules configuration (experimental.routeRules).
- * Maps glob patterns to route rules.
+ * Route rules configuration (`routeRules`).
+ * Maps route patterns to route rules. Patterns use the same `[param]` and
+ * `[...rest]` syntax as file-based routing; glob wildcards (`*`) are not supported.
  *
  * Example:
  * ```ts
  * routeRules: {
- *   '/api/*': { swr: 600 },
- *   '/products/*': { maxAge: 3600, tags: ['products'] },
+ *   '/api/[...path]': { swr: 600 },
+ *   '/products/[...slug]': { maxAge: 3600, tags: ['products'] },
  * }
  * ```
  */

package/dist/core/cache/runtime/noop.js

@@ -26,7 +26,7 @@ class DisabledAstroCache {
       hasWarned = true;
       this.#logger?.warn(
         "cache",
-        "`cache.set()` was called but caching is not enabled. Configure a cache provider in your Astro config under `experimental.cache` to enable caching."
+        "`cache.set()` was called but caching is not enabled. Configure a cache provider in your Astro config under `cache` to enable caching."
       );
     }
   }

package/dist/core/cache/utils.d.ts

@@ -10,7 +10,7 @@ export declare function normalizeRouteRuleCacheOptions(rule: {
     tags?: string[];
 } | undefined): CacheOptions | undefined;
 /**
- * Extract cache routes from experimental.routeRules config.
+ * Extract cache routes from the `routeRules` config.
  */
-export declare function extractCacheRoutesFromRouteRules(routeRules: AstroConfig['experimental']['routeRules']): Record<string, CacheOptions> | undefined;
-export declare function cacheConfigToManifest(cacheConfig: AstroConfig['experimental']['cache'], routeRulesConfig: AstroConfig['experimental']['routeRules']): SSRManifestCache | undefined;
+export declare function extractCacheRoutesFromRouteRules(routeRules: AstroConfig['routeRules']): Record<string, CacheOptions> | undefined;
+export declare function cacheConfigToManifest(cacheConfig: AstroConfig['cache'], routeRulesConfig: AstroConfig['routeRules']): SSRManifestCache | undefined;

package/dist/core/cache/vite-plugin.js

@@ -7,7 +7,7 @@ const RESOLVED_VIRTUAL_CACHE_PROVIDER_ID = "\0" + VIRTUAL_CACHE_PROVIDER_ID;
 function vitePluginCacheProvider({
   settings
 }) {
-  const providerConfig = settings.config.experimental?.cache?.provider;
+  const providerConfig = settings.config.cache?.provider;
   if (!providerConfig) {
     return;
   }

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;
@@ -504,6 +504,18 @@ export declare const AstroConfigSchema: z.ZodObject<{
         unicodeRange: z.ZodOptional<z.ZodTuple<[z.ZodString], z.ZodString>>;
         options: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
     }, z.core.$strict>>>;
+    cache: z.ZodOptional<z.ZodObject<{
+        provider: z.ZodOptional<z.ZodObject<{
+            config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+            entrypoint: z.ZodUnion<readonly [z.ZodString, z.ZodCustom<URL, URL>]>;
+            name: z.ZodOptional<z.ZodString>;
+        }, z.core.$strip>>;
+    }, z.core.$strip>>;
+    routeRules: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+        maxAge: z.ZodOptional<z.ZodNumber>;
+        swr: z.ZodOptional<z.ZodNumber>;
+        tags: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    }, z.core.$strip>>>;
     experimental: z.ZodPrefault<z.ZodObject<{
         clientPrerender: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         contentIntellisense: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -512,18 +524,6 @@ export declare const AstroConfigSchema: z.ZodObject<{
             name: z.ZodString;
             optimize: z.ZodCustom<(contents: string) => string | Promise<string>, (contents: string) => string | Promise<string>>;
         }, z.core.$strip>>;
-        cache: z.ZodOptional<z.ZodObject<{
-            provider: z.ZodOptional<z.ZodObject<{
-                config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
-                entrypoint: z.ZodUnion<readonly [z.ZodString, z.ZodCustom<URL, URL>]>;
-                name: z.ZodOptional<z.ZodString>;
-            }, z.core.$strip>>;
-        }, z.core.$strip>>;
-        routeRules: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
-            maxAge: z.ZodOptional<z.ZodNumber>;
-            swr: z.ZodOptional<z.ZodNumber>;
-            tags: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        }, z.core.$strip>>>;
     }, z.core.$strict>>;
     legacy: z.ZodPrefault<z.ZodObject<{
         collectionsBackwardsCompat: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;

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

@@ -38,7 +38,7 @@ const ASTRO_CONFIG_DEFAULTS = {
   devToolbar: {
     enabled: true
   },
-  compressHTML: true,
+  compressHTML: "jsx",
   server: {
     host: false,
     port: 4321,
@@ -327,13 +327,13 @@ const AstroConfigSchema = z.object({
     config: z.record(z.string(), z.any()).optional()
   }).optional(),
   fonts: z.array(FontFamilySchema).optional(),
+  cache: CacheSchema.optional(),
+  routeRules: RouteRulesSchema.optional(),
   experimental: z.strictObject({
     clientPrerender: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.clientPrerender),
     contentIntellisense: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.contentIntellisense),
     chromeDevtoolsWorkspace: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.chromeDevtoolsWorkspace),
-    svgOptimizer: SvgOptimizerSchema.optional(),
-    cache: CacheSchema.optional(),
-    routeRules: RouteRulesSchema.optional()
+    svgOptimizer: SvgOptimizerSchema.optional()
   }).prefault({}),
   legacy: z.object({
     collectionsBackwardsCompat: z.boolean().optional().default(false)

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

@@ -392,6 +392,18 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         unicodeRange: z.ZodOptional<z.ZodTuple<[z.ZodString], z.ZodString>>;
         options: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
     }, z.core.$strict>>>;
+    cache: z.ZodOptional<z.ZodObject<{
+        provider: z.ZodOptional<z.ZodObject<{
+            config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+            entrypoint: z.ZodUnion<readonly [z.ZodString, z.ZodCustom<URL, URL>]>;
+            name: z.ZodOptional<z.ZodString>;
+        }, z.core.$strip>>;
+    }, z.core.$strip>>;
+    routeRules: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+        maxAge: z.ZodOptional<z.ZodNumber>;
+        swr: z.ZodOptional<z.ZodNumber>;
+        tags: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    }, z.core.$strip>>>;
     experimental: z.ZodPrefault<z.ZodObject<{
         clientPrerender: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         contentIntellisense: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -400,18 +412,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             name: z.ZodString;
             optimize: z.ZodCustom<(contents: string) => string | Promise<string>, (contents: string) => string | Promise<string>>;
         }, z.core.$strip>>;
-        cache: z.ZodOptional<z.ZodObject<{
-            provider: z.ZodOptional<z.ZodObject<{
-                config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
-                entrypoint: z.ZodUnion<readonly [z.ZodString, z.ZodCustom<URL, URL>]>;
-                name: z.ZodOptional<z.ZodString>;
-            }, z.core.$strip>>;
-        }, z.core.$strip>>;
-        routeRules: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
-            maxAge: z.ZodOptional<z.ZodNumber>;
-            swr: z.ZodOptional<z.ZodNumber>;
-            tags: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        }, z.core.$strip>>>;
     }, z.core.$strict>>;
     legacy: z.ZodPrefault<z.ZodObject<{
         collectionsBackwardsCompat: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -590,18 +590,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             name: string;
             optimize: (contents: string) => string | Promise<string>;
         } | undefined;
-        cache?: {
-            provider?: {
-                entrypoint: string | URL;
-                config?: Record<string, any> | undefined;
-                name?: string | undefined;
-            } | undefined;
-        } | undefined;
-        routeRules?: Record<string, {
-            maxAge?: number | undefined;
-            swr?: number | undefined;
-            tags?: string[] | undefined;
-        }> | undefined;
     };
     legacy: {
         collectionsBackwardsCompat: boolean;
@@ -696,6 +684,18 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         unicodeRange?: [string, ...string[]] | undefined;
         options?: Record<string, any> | undefined;
     }[] | undefined;
+    cache?: {
+        provider?: {
+            entrypoint: string | URL;
+            config?: Record<string, any> | undefined;
+            name?: string | undefined;
+        } | undefined;
+    } | undefined;
+    routeRules?: Record<string, {
+        maxAge?: number | undefined;
+        swr?: number | undefined;
+        tags?: string[] | undefined;
+    }> | undefined;
 }, {
     base: string;
     trailingSlash: "never" | "ignore" | "always";
@@ -840,18 +840,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             name: string;
             optimize: (contents: string) => string | Promise<string>;
         } | undefined;
-        cache?: {
-            provider?: {
-                entrypoint: string | URL;
-                config?: Record<string, any> | undefined;
-                name?: string | undefined;
-            } | undefined;
-        } | undefined;
-        routeRules?: Record<string, {
-            maxAge?: number | undefined;
-            swr?: number | undefined;
-            tags?: string[] | undefined;
-        }> | undefined;
     };
     legacy: {
         collectionsBackwardsCompat: boolean;
@@ -946,4 +934,16 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         unicodeRange?: [string, ...string[]] | undefined;
         options?: Record<string, any> | undefined;
     }[] | undefined;
+    cache?: {
+        provider?: {
+            entrypoint: string | URL;
+            config?: Record<string, any> | undefined;
+            name?: string | undefined;
+        } | undefined;
+    } | undefined;
+    routeRules?: Record<string, {
+        maxAge?: number | undefined;
+        swr?: number | undefined;
+        tags?: string[] | undefined;
+    }> | undefined;
 }>>;

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.4";
+const ASTRO_VERSION = "7.0.0-beta.6";
 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.4";
+  const currentVersion = "7.0.0-beta.6";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

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

@@ -79,6 +79,7 @@ class DefaultErrorHandler {
           return this.renderError(request, {
             ...resolvedRenderOptions,
             status,
+            error,
             response: originalResponse,
             skipMiddleware: true,
             pathname: resolvedPathname

package/dist/core/errors/errors-data.js

@@ -793,8 +793,8 @@ const CacheProviderNotFound = {
 const CacheNotEnabled = {
   name: "CacheNotEnabled",
   title: "Cache is not enabled.",
-  message: "`Astro.cache` is not available because the cache feature is not enabled. To use caching, configure a cache provider in your Astro config under `experimental.cache`.",
-  hint: 'Use an adapter that provides a default cache provider, or set one explicitly: `experimental: { cache: { provider: "..." } }`. See https://docs.astro.build/en/reference/experimental-flags/route-caching/.'
+  message: "`Astro.cache` is not available because the cache feature is not enabled. To use caching, configure a cache provider in your Astro config under `cache`.",
+  hint: 'Use an adapter that provides a default cache provider, or set one explicitly: `cache: { provider: "..." }`. See https://docs.astro.build/en/guides/caching/.'
 };
 const CacheQueryConfigConflict = {
   name: "CacheQueryConfigConflict",

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,7 +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 { validateAndDecodePathname } from "../util/pathname.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";
@@ -88,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). */
@@ -111,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. */
@@ -697,6 +707,10 @@ class FetchState {
     try {
       return validateAndDecodePathname(pathname);
     } catch (e) {
+      if (e instanceof MultiLevelEncodingError) {
+        this.invalidEncoding = true;
+        return pathname;
+      }
       this.pipeline.logger.error(null, e.toString());
       return pathname;
     }
@@ -876,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);

package/dist/core/i18n/handler.js

@@ -3,7 +3,6 @@ import { computeFallbackRoute } from "../../i18n/fallback.js";
 import { I18nRouter } from "../../i18n/router.js";
 import { PipelineFeatures } from "../base-pipeline.js";
 import { shouldAppendForwardSlash } from "../build/util.js";
-import { REROUTE_DIRECTIVE_HEADER, ROUTE_TYPE_HEADER } from "../constants.js";
 class I18n {
   #i18n;
   #base;
@@ -36,25 +35,20 @@ class I18n {
   async finalize(state, response) {
     state.pipeline.usedFeatures |= PipelineFeatures.i18n;
     const i18n = this.#i18n;
-    const typeHeader = response.headers.get(ROUTE_TYPE_HEADER);
-    if (typeHeader) {
-      response.headers.delete(ROUTE_TYPE_HEADER);
-    }
-    const isReroute = response.headers.get(REROUTE_DIRECTIVE_HEADER);
-    if (isReroute === "no" && typeof i18n.fallback === "undefined") {
+    if (state.skipErrorReroute && typeof i18n.fallback === "undefined") {
       return response;
     }
-    if (typeHeader !== "page" && typeHeader !== "fallback") {
+    if (state.responseRouteType !== "page" && state.responseRouteType !== "fallback") {
       return response;
     }
-    const url = new URL(state.request.url);
+    const url = state.url;
     const currentLocale = state.computeCurrentLocale();
     const isPrerendered = state.routeData.prerender;
     const routerContext = {
       currentLocale,
       currentDomain: url.hostname,
-      routeType: typeHeader,
-      isReroute: isReroute === "yes"
+      routeType: state.responseRouteType,
+      isReroute: false
     };
     const routeDecision = this.#router.match(url.pathname, routerContext);
     switch (routeDecision.type) {
@@ -74,7 +68,7 @@ class I18n {
             status: 404,
             headers: response.headers
           });
-          prerenderedRes.headers.set(REROUTE_DIRECTIVE_HEADER, "no");
+          state.skipErrorReroute = true;
           if (routeDecision.location) {
             prerenderedRes.headers.set("Location", routeDecision.location);
           }
@@ -90,7 +84,7 @@ class I18n {
         break;
     }
     if (i18n.fallback && i18n.fallbackType) {
-      const effectiveStatus = typeHeader === "fallback" ? 404 : response.status;
+      const effectiveStatus = state.responseRouteType === "fallback" ? 404 : response.status;
       const fallbackDecision = computeFallbackRoute({
         pathname: url.pathname,
         responseStatus: effectiveStatus,

package/dist/core/messages/runtime.js

@@ -269,7 +269,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"7.0.0-beta.4"}`
+        `v${"7.0.0-beta.6"}`
       )} ${headline}`
     );
   }