astro 7.0.0-alpha.2 → 7.0.0-beta.4

package/dist/core/build/generate.js

@@ -167,20 +167,6 @@ ${colors.bgGreen(colors.black(` ${verb} static routes `))}`);
     colors.green(`\u2713 Completed in ${getTimeStat(generatePagesTimer, performance.now())}.
 `)
   );
-  if (options.settings.logLevel === "debug" && options.settings.config.experimental?.queuedRendering && prerenderer.app) {
-    try {
-      const stats = prerenderer.app.getQueueStats();
-      if (stats && (stats.acquireFromPool > 0 || stats.acquireNew > 0)) {
-        logger.info(
-          null,
-          colors.dim(
-            `[Queue Pool] ${stats.acquireFromPool.toLocaleString()} reused / ${stats.acquireNew.toLocaleString()} new nodes | Hit rate: ${stats.hitRate.toFixed(1)}% | Pool: ${stats.poolSize}/${stats.maxSize}`
-          )
-        );
-      }
-    } catch {
-    }
-  }
   if (staticImageList.size) {
     logger.info("SKIP_FORMAT", `${colors.bgGreen(colors.black(` generating optimized images `))}`);
     const totalCount = Array.from(staticImageList.values()).map((x) => x.transforms.size).reduce((a, b) => a + b, 0);

package/dist/core/build/pipeline.js

@@ -9,9 +9,6 @@ import { createDefaultRoutes } from "../routing/default.js";
 import { getFallbackRoute, routeIsFallback, routeIsRedirect } from "../routing/helpers.js";
 import { findRouteToRewrite } from "../routing/rewrite.js";
 import { cssOrder, mergeInlineCss, getPageData } from "./runtime.js";
-import { newNodePool } from "../../runtime/server/render/queue/pool.js";
-import { HTMLStringCache } from "../../runtime/server/html-string-cache.js";
-import { queueRenderingEnabled } from "../app/manifest.js";
 class BuildPipeline extends Pipeline {
   internals;
   options;
@@ -65,12 +62,6 @@ class BuildPipeline extends Pipeline {
     super(logger, manifest, "production", manifest.renderers, resolve, manifest.serverLike);
     this.manifest = manifest;
     this.defaultRoutes = defaultRoutes;
-    if (queueRenderingEnabled(this.manifest.experimentalQueuedRendering)) {
-      this.nodePool = newNodePool(this.manifest.experimentalQueuedRendering);
-      if (this.manifest.experimentalQueuedRendering.contentCache) {
-        this.htmlStringCache = new HTMLStringCache(1e3);
-      }
-    }
   }
   getRoutes() {
     return this.getOptions().routesList.routes;

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/build/plugins/plugin-manifest.js

@@ -221,9 +221,9 @@ async function buildManifest(opts, internals, staticFiles, encodedKey) {
     }
   }
   const middlewareMode = resolveMiddlewareMode(opts.settings.adapter?.adapterFeatures);
-  let experimentalLogger = void 0;
-  if (settings.config.experimental.logger) {
-    experimentalLogger = settings.config.experimental.logger;
+  let loggerConfig = void 0;
+  if (settings.config.logger) {
+    loggerConfig = settings.config.logger;
   }
   return {
     rootDir: opts.settings.config.root.toString(),
@@ -244,11 +244,6 @@ async function buildManifest(opts, internals, staticFiles, encodedKey) {
     trailingSlash: settings.config.trailingSlash,
     compressHTML: settings.config.compressHTML,
     assetsPrefix: settings.config.build.assetsPrefix,
-    experimentalQueuedRendering: {
-      enabled: settings.config.experimental.queuedRendering?.enabled ?? false,
-      poolSize: 0,
-      contentCache: false
-    },
     componentMetadata: Array.from(internals.componentMetadata),
     renderers: [],
     clientDirectives: Array.from(settings.clientDirectives),
@@ -282,7 +277,7 @@ async function buildManifest(opts, internals, staticFiles, encodedKey) {
     internalFetchHeaders,
     logLevel: settings.logLevel,
     shouldInjectCspMetaTags: shouldTrackCspHashes(settings.config.security.csp),
-    experimentalLogger
+    loggerConfig
   };
 }
 export {

package/dist/core/config/config.js

@@ -67,13 +67,14 @@ async function loadConfig(root, configFile, fsMod = fs) {
   }
 }
 function splitInlineConfig(inlineConfig) {
-  const { configFile, mode, logLevel, ...inlineUserConfig } = inlineConfig;
+  const { configFile, mode, logLevel, _logger, ...inlineUserConfig } = inlineConfig;
   return {
     inlineUserConfig,
     inlineOnlyConfig: {
       configFile,
       mode,
-      logLevel
+      logLevel,
+      _logger
     }
   };
 }

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

@@ -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;
@@ -75,17 +75,11 @@ export declare const ASTRO_CONFIG_DEFAULTS: {
         validateSecrets: false;
     };
     prerenderConflictBehavior: "warn";
+    fetchFile: string;
     experimental: {
-        advancedRouting: false;
         clientPrerender: false;
         contentIntellisense: false;
         chromeDevtoolsWorkspace: false;
-        queuedRendering: {
-            enabled: false;
-        };
-        logger: {
-            entrypoint: string;
-        };
     };
 };
 export declare const AstroConfigSchema: z.ZodObject<{
@@ -335,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>>;
@@ -462,6 +456,11 @@ export declare const AstroConfigSchema: z.ZodObject<{
         ignore: "ignore";
         warn: "warn";
     }>>>;
+    fetchFile: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
+    logger: z.ZodOptional<z.ZodObject<{
+        entrypoint: z.ZodString;
+        config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+    }, z.core.$strip>>;
     fonts: z.ZodOptional<z.ZodArray<z.ZodObject<{
         name: z.ZodString;
         cssVariable: z.ZodString;
@@ -506,9 +505,6 @@ export declare const AstroConfigSchema: z.ZodObject<{
         options: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
     }, z.core.$strict>>>;
     experimental: z.ZodPrefault<z.ZodObject<{
-        advancedRouting: z.ZodDefault<z.ZodOptional<z.ZodUnion<readonly [z.ZodBoolean, z.ZodObject<{
-            fetchFile: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
-        }, z.core.$strict>]>>>;
         clientPrerender: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         contentIntellisense: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         chromeDevtoolsWorkspace: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -528,15 +524,6 @@ export declare const AstroConfigSchema: z.ZodObject<{
             swr: z.ZodOptional<z.ZodNumber>;
             tags: z.ZodOptional<z.ZodArray<z.ZodString>>;
         }, z.core.$strip>>>;
-        queuedRendering: z.ZodPrefault<z.ZodOptional<z.ZodObject<{
-            enabled: z.ZodPrefault<z.ZodOptional<z.ZodBoolean>>;
-            poolSize: z.ZodOptional<z.ZodNumber>;
-            contentCache: z.ZodOptional<z.ZodBoolean>;
-        }, z.core.$strip>>>;
-        logger: z.ZodOptional<z.ZodObject<{
-            entrypoint: z.ZodString;
-            config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
-        }, 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

@@ -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";
@@ -64,17 +64,11 @@ const ASTRO_CONFIG_DEFAULTS = {
     validateSecrets: false
   },
   prerenderConflictBehavior: "warn",
+  fetchFile: "fetch",
   experimental: {
-    advancedRouting: false,
     clientPrerender: false,
     contentIntellisense: false,
-    chromeDevtoolsWorkspace: false,
-    queuedRendering: {
-      enabled: false
-    },
-    logger: {
-      entrypoint: "astro/logger/node"
-    }
+    chromeDevtoolsWorkspace: false
   }
 };
 const highlighterTypesSchema = z.union([z.literal("shiki"), z.literal("prism")]).default(syntaxHighlightDefaults.type);
@@ -244,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) => {
@@ -262,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(
@@ -327,29 +321,19 @@ const AstroConfigSchema = z.object({
   }).strict().optional().default(ASTRO_CONFIG_DEFAULTS.env),
   session: SessionSchema.optional(),
   prerenderConflictBehavior: z.enum(["error", "warn", "ignore"]).optional().default(ASTRO_CONFIG_DEFAULTS.prerenderConflictBehavior),
+  fetchFile: z.string().nullable().optional().default(ASTRO_CONFIG_DEFAULTS.fetchFile),
+  logger: z.object({
+    entrypoint: z.string(),
+    config: z.record(z.string(), z.any()).optional()
+  }).optional(),
   fonts: z.array(FontFamilySchema).optional(),
   experimental: z.strictObject({
-    advancedRouting: z.union([
-      z.boolean(),
-      z.strictObject({
-        fetchFile: z.string().nullable().optional().default("app")
-      })
-    ]).optional().default(ASTRO_CONFIG_DEFAULTS.experimental.advancedRouting),
     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(),
-    queuedRendering: z.object({
-      enabled: z.boolean().optional().prefault(false),
-      poolSize: z.number().int().nonnegative().optional(),
-      contentCache: z.boolean().optional()
-    }).optional().prefault(ASTRO_CONFIG_DEFAULTS.experimental.queuedRendering),
-    logger: z.object({
-      entrypoint: z.string(),
-      config: z.record(z.string(), z.any()).optional()
-    }).optional()
+    routeRules: RouteRulesSchema.optional()
   }).prefault({}),
   legacy: z.object({
     collectionsBackwardsCompat: z.boolean().optional().default(false)

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

@@ -344,6 +344,11 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         ignore: "ignore";
         warn: "warn";
     }>>>;
+    fetchFile: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
+    logger: z.ZodOptional<z.ZodObject<{
+        entrypoint: z.ZodString;
+        config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+    }, z.core.$strip>>;
     fonts: z.ZodOptional<z.ZodArray<z.ZodObject<{
         name: z.ZodString;
         cssVariable: z.ZodString;
@@ -388,9 +393,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         options: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
     }, z.core.$strict>>>;
     experimental: z.ZodPrefault<z.ZodObject<{
-        advancedRouting: z.ZodDefault<z.ZodOptional<z.ZodUnion<readonly [z.ZodBoolean, z.ZodObject<{
-            fetchFile: z.ZodDefault<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
-        }, z.core.$strict>]>>>;
         clientPrerender: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         contentIntellisense: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         chromeDevtoolsWorkspace: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -410,15 +412,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             swr: z.ZodOptional<z.ZodNumber>;
             tags: z.ZodOptional<z.ZodArray<z.ZodString>>;
         }, z.core.$strip>>>;
-        queuedRendering: z.ZodPrefault<z.ZodOptional<z.ZodObject<{
-            enabled: z.ZodPrefault<z.ZodOptional<z.ZodBoolean>>;
-            poolSize: z.ZodOptional<z.ZodNumber>;
-            contentCache: z.ZodOptional<z.ZodBoolean>;
-        }, z.core.$strip>>>;
-        logger: z.ZodOptional<z.ZodObject<{
-            entrypoint: z.ZodString;
-            config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
-        }, z.core.$strip>>;
     }, z.core.$strict>>;
     legacy: z.ZodPrefault<z.ZodObject<{
         collectionsBackwardsCompat: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
@@ -588,18 +581,11 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         validateSecrets: boolean;
     };
     prerenderConflictBehavior: "error" | "ignore" | "warn";
+    fetchFile: string | null;
     experimental: {
-        advancedRouting: boolean | {
-            fetchFile: string | null;
-        };
         clientPrerender: boolean;
         contentIntellisense: boolean;
         chromeDevtoolsWorkspace: boolean;
-        queuedRendering: {
-            enabled: boolean;
-            poolSize?: number | undefined;
-            contentCache?: boolean | undefined;
-        };
         svgOptimizer?: {
             name: string;
             optimize: (contents: string) => string | Promise<string>;
@@ -616,10 +602,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             swr?: number | undefined;
             tags?: string[] | undefined;
         }> | undefined;
-        logger?: {
-            entrypoint: string;
-            config?: Record<string, any> | undefined;
-        } | undefined;
     };
     legacy: {
         collectionsBackwardsCompat: boolean;
@@ -693,6 +675,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         } | undefined;
         ttl?: number | undefined;
     } | undefined;
+    logger?: {
+        entrypoint: string;
+        config?: Record<string, any> | undefined;
+    } | undefined;
     fonts?: {
         name: string;
         cssVariable: string;
@@ -845,18 +831,11 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         validateSecrets: boolean;
     };
     prerenderConflictBehavior: "error" | "ignore" | "warn";
+    fetchFile: string | null;
     experimental: {
-        advancedRouting: boolean | {
-            fetchFile: string | null;
-        };
         clientPrerender: boolean;
         contentIntellisense: boolean;
         chromeDevtoolsWorkspace: boolean;
-        queuedRendering: {
-            enabled: boolean;
-            poolSize?: number | undefined;
-            contentCache?: boolean | undefined;
-        };
         svgOptimizer?: {
             name: string;
             optimize: (contents: string) => string | Promise<string>;
@@ -873,10 +852,6 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             swr?: number | undefined;
             tags?: string[] | undefined;
         }> | undefined;
-        logger?: {
-            entrypoint: string;
-            config?: Record<string, any> | undefined;
-        } | undefined;
     };
     legacy: {
         collectionsBackwardsCompat: boolean;
@@ -950,6 +925,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         } | undefined;
         ttl?: number | undefined;
     } | undefined;
+    logger?: {
+        entrypoint: string;
+        config?: Record<string, any> | undefined;
+    } | undefined;
     fonts?: {
         name: string;
         cssVariable: string;

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

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "7.0.0-alpha.2";
+const ASTRO_VERSION = "7.0.0-beta.4";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";

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-alpha.2";
+  const currentVersion = "7.0.0-beta.4";
   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);

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 { 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";
@@ -190,7 +191,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)) {
@@ -274,13 +275,6 @@ class FetchState {
       },
       key: manifest.key,
       trailingSlash: manifest.trailingSlash,
-      _experimentalQueuedRendering: {
-        pool: pipeline.nodePool,
-        htmlStringCache: pipeline.htmlStringCache,
-        enabled: manifest.experimentalQueuedRendering?.enabled,
-        poolSize: manifest.experimentalQueuedRendering?.poolSize,
-        contentCache: manifest.experimentalQueuedRendering?.contentCache
-      },
       _metadata: {
         hasHydrationScript: false,
         rendererSpecificHydrationScripts: /* @__PURE__ */ new Set(),
@@ -701,7 +695,7 @@ class FetchState {
     }
     pathname = prependForwardSlash(pathname);
     try {
-      return decodeURI(pathname);
+      return validateAndDecodePathname(pathname);
     } catch (e) {
       this.pipeline.logger.error(null, e.toString());
       return pathname;
@@ -829,13 +823,6 @@ class FetchState {
         return state.getCsp();
       },
       get logger() {
-        if (!state.pipeline.manifest.experimentalLogger) {
-          state.pipeline.logger.warn(
-            null,
-            "The Astro.logger is available only when experimental.logger is defined."
-          );
-          return void 0;
-        }
         return {
           info(msg) {
             state.pipeline.logger.info(null, msg);

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

@@ -6,7 +6,7 @@
 export type FetchHandler = (request: Request) => Promise<Response>;
 /**
  * An object with a `fetch` method that handles incoming requests.
- * This is the shape expected by `src/app.ts` and aligns with the
+ * This is the shape expected by `src/fetch.ts` and aligns with the
  * convention used by Cloudflare Workers, Bun, and Hono.
  *
  * @example

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

@@ -5,14 +5,12 @@ import {
 import { ASTRO_VITE_ENVIRONMENT_NAMES } from "../constants.js";
 const FETCHABLE_MODULE_ID = "virtual:astro:fetchable";
 const FETCHABLE_RESOLVED_MODULE_ID = "\0" + FETCHABLE_MODULE_ID;
-const DEFAULT_FETCH_FILE = "app";
+const DEFAULT_FETCH_FILE = "fetch";
 function vitePluginFetchable({ settings }) {
   let resolvedUserAppId;
   let userAppPresent = false;
-  const advancedRoutingConfig = settings.config.experimental.advancedRouting;
-  const advancedRoutingEnabled = !!advancedRoutingConfig;
-  const fetchFile = (typeof advancedRoutingConfig === "object" ? advancedRoutingConfig.fetchFile : void 0) ?? DEFAULT_FETCH_FILE;
-  const fetchFileDisabled = typeof advancedRoutingConfig === "object" && advancedRoutingConfig.fetchFile === null;
+  const fetchFile = settings.config.fetchFile ?? DEFAULT_FETCH_FILE;
+  const fetchFileDisabled = settings.config.fetchFile === null;
   const normalizedSrcDir = viteNormalizePath(fileURLToPath(settings.config.srcDir));
   return {
     name: "@astro/plugin-fetchable",
@@ -48,7 +46,7 @@ function vitePluginFetchable({ settings }) {
           return FETCHABLE_RESOLVED_MODULE_ID;
         }
         const resolved = await this.resolve(`${normalizedSrcDir}${fetchFile}`);
-        userAppPresent = advancedRoutingEnabled && !!resolved;
+        userAppPresent = !!resolved;
         resolvedUserAppId = resolved?.id;
         return FETCHABLE_RESOLVED_MODULE_ID;
       }

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

@@ -10,6 +10,7 @@ type HonoContextLike = {
     set?: (key: string, value: unknown) => void;
 };
 type HonoMiddlewareHandler = (context: HonoContextLike, next: () => Promise<void>) => Promise<Response | void>;
+export declare function getFetchState(context: HonoContextLike): FetchState;
 export declare function astro(): HonoMiddlewareHandler;
 export declare function trailingSlash(): HonoMiddlewareHandler;
 export declare function middleware(): HonoMiddlewareHandler;

package/dist/core/hono/index.js

@@ -92,6 +92,7 @@ export {
   actions,
   astro,
   cache,
+  getFetchState,
   i18n,
   middleware,
   pages,

package/dist/core/logger/impls/node.js

@@ -28,7 +28,6 @@ function node_default(options) {
   return nodeLogDestination(options);
 }
 function createNodeLoggerFromFlags(inlineConfig) {
-  if (inlineConfig.logger) return inlineConfig.logger;
   return new AstroLogger({
     destination: nodeLogDestination(),
     level: inlineConfig.logLevel ?? "info"

package/dist/core/logger/load.js

@@ -72,9 +72,10 @@ async function loadLogger(config, level = "info") {
   throw error;
 }
 async function loadOrCreateNodeLogger(astroConfig, inlineAstroConfig) {
+  if (inlineAstroConfig._logger) return inlineAstroConfig._logger;
   try {
-    if (astroConfig.experimental.logger) {
-      return await loadLogger(astroConfig.experimental.logger, inlineAstroConfig.logLevel);
+    if (astroConfig.logger) {
+      return await loadLogger(astroConfig.logger, inlineAstroConfig.logLevel);
     } else {
       return createNodeLoggerFromFlags(inlineAstroConfig);
     }

package/dist/core/messages/runtime.js

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

package/dist/core/middleware/index.js

@@ -75,7 +75,14 @@ function createContext({
     session: void 0,
     cache: new DisabledAstroCache(),
     csp: void 0,
-    logger: void 0
+    logger: {
+      info() {
+      },
+      warn() {
+      },
+      error() {
+      }
+    }
   };
   return Object.assign(context, {
     getActionResult: createGetActionResult(context.locals),

package/dist/core/middleware/vite-plugin.d.ts

@@ -3,6 +3,7 @@ import type { AstroSettings } from '../../types/astro.js';
 import type { BuildInternals } from '../build/internal.js';
 import type { StaticBuildOptions } from '../build/types.js';
 export declare const MIDDLEWARE_MODULE_ID = "virtual:astro:middleware";
+export declare function isMiddlewarePath(relativePath: string): boolean;
 export declare function vitePluginMiddleware({ settings }: {
     settings: AstroSettings;
 }): VitePlugin;