astro 5.9.2 → 5.9.4

package/dist/container/pipeline.js

@@ -56,7 +56,8 @@ class ContainerPipeline extends Pipeline {
       routes: this.manifest?.routes.map((r) => r.routeData),
       trailingSlash: this.manifest.trailingSlash,
       buildFormat: this.manifest.buildFormat,
-      base: this.manifest.base
+      base: this.manifest.base,
+      outDir: this.manifest.outDir
     });
     const componentInstance = await this.getComponentByRoute(routeData);
     return { componentInstance, routeData, newUrl, pathname };

package/dist/content/content-layer.js

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

package/dist/core/app/pipeline.js

@@ -65,7 +65,8 @@ class AppPipeline extends Pipeline {
       routes: this.manifest?.routes.map((r) => r.routeData),
       trailingSlash: this.manifest.trailingSlash,
       buildFormat: this.manifest.buildFormat,
-      base: this.manifest.base
+      base: this.manifest.base,
+      outDir: this.manifest.outDir
     });
     const componentInstance = await this.getComponentByRoute(routeData);
     return { newUrl, pathname, componentInstance, routeData };

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

@@ -91,6 +91,7 @@ export type SSRManifestI18n = {
     domainLookupTable: Record<string, string>;
 };
 export type SSRManifestCSP = {
+    cspDestination: 'adapter' | 'meta' | 'header' | undefined;
     algorithm: CspAlgorithm;
     scriptHashes: string[];
     scriptResources: string[];

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

@@ -3,8 +3,7 @@ import type { ActionAccept, ActionClient } from '../actions/runtime/virtual/serv
 import type { ComponentInstance } from '../types/astro.js';
 import type { MiddlewareHandler, RewritePayload } from '../types/public/common.js';
 import type { RuntimeMode } from '../types/public/config.js';
-import type { RouteData, SSRLoadedRenderer, SSRManifest, SSRResult } from '../types/public/internal.js';
-import type { SSRActions } from './app/types.js';
+import type { RouteData, SSRActions, SSRLoadedRenderer, SSRManifest, SSRResult } from '../types/public/internal.js';
 import type { Logger } from './logger/core.js';
 import { RouteCache } from './render/route-cache.js';
 /**

package/dist/core/build/generate.js

@@ -16,7 +16,7 @@ import {
   removeTrailingForwardSlash
 } from "../../core/path.js";
 import { toFallbackType, toRoutingStrategy } from "../../i18n/utils.js";
-import { runHookBuildGenerated } from "../../integrations/hooks.js";
+import { runHookBuildGenerated, toIntegrationResolvedRoute } from "../../integrations/hooks.js";
 import { getServerOutputDirectory } from "../../prerender/utils.js";
 import {
   getAlgorithm,
@@ -77,6 +77,7 @@ async function generatePages(options, internals) {
 ${bgGreen(black(` ${verb} static routes `))}`);
   const builtPaths = /* @__PURE__ */ new Set();
   const pagesToGenerate = pipeline.retrieveRoutesToGenerate();
+  const routeToHeaders = /* @__PURE__ */ new Map();
   if (ssr) {
     for (const [pageData, filePath] of pagesToGenerate) {
       if (pageData.route.prerender) {
@@ -88,13 +89,13 @@ ${bgGreen(black(` ${verb} static routes `))}`);
         }
         const ssrEntryPage = await pipeline.retrieveSsrEntry(pageData.route, filePath);
         const ssrEntry = ssrEntryPage;
-        await generatePage(pageData, ssrEntry, builtPaths, pipeline);
+        await generatePage(pageData, ssrEntry, builtPaths, pipeline, routeToHeaders);
       }
     }
   } else {
     for (const [pageData, filePath] of pagesToGenerate) {
       const entry = await pipeline.retrieveSsrEntry(pageData.route, filePath);
-      await generatePage(pageData, entry, builtPaths, pipeline);
+      await generatePage(pageData, entry, builtPaths, pipeline, routeToHeaders);
     }
   }
   logger.info(
@@ -121,10 +122,14 @@ ${bgGreen(black(` ${verb} static routes `))}`);
 `));
     delete globalThis?.astroAsset?.addStaticImage;
   }
-  await runHookBuildGenerated({ settings: options.settings, logger });
+  await runHookBuildGenerated({
+    settings: options.settings,
+    logger,
+    experimentalRouteToHeaders: routeToHeaders
+  });
 }
 const THRESHOLD_SLOW_RENDER_TIME_MS = 500;
-async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
+async function generatePage(pageData, ssrEntry, builtPaths, pipeline, routeToHeaders) {
   const { config, logger } = pipeline;
   const pageModulePromise = ssrEntry.page;
   const styles = pageData.styles.sort(cssOrder).map(({ sheet }) => sheet).reduce(mergeInlineCss, []);
@@ -150,7 +155,7 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
     if (!isConcurrent) {
       logger.info(null, `  ${blue(lineIcon)} ${dim(filePath)}`, false);
     }
-    const created = await generatePath(path, pipeline, generationOptions, route);
+    const created = await generatePath(path, pipeline, generationOptions, route, routeToHeaders);
     const timeEnd = performance.now();
     const isSlow = timeEnd - timeStart > THRESHOLD_SLOW_RENDER_TIME_MS;
     const timeIncrease = (isSlow ? red : dim)(`(+${getTimeStat(timeStart, timeEnd)})`);
@@ -287,18 +292,27 @@ function getUrlForPath(pathname, base, origin, format, trailingSlash, routeType)
   }
   return new URL(buildPathname, origin);
 }
-async function generatePath(pathname, pipeline, gopts, route) {
+async function generatePath(pathname, pipeline, gopts, route, routeToHeaders) {
   const { mod } = gopts;
   const { config, logger, options } = pipeline;
   logger.debug("build", `Generating: ${pathname}`);
   if (route.type === "page") {
     addPageName(pathname, options);
   }
-  if (route.type === "fallback" && // If route is index page, continue rendering. The index page should
-  // always be rendered
-  route.pathname !== "/" && // Check if there is a translated page with the same path
-  Object.values(options.allPages).some((val) => val.route.pattern.test(pathname))) {
-    return void 0;
+  if (route.type === "fallback" && route.pathname !== "/") {
+    let locale = removeLeadingForwardSlash(pathname).split("/")[0];
+    if (Object.values(options.allPages).some((val) => {
+      if (val.route.pattern.test(pathname)) {
+        if (val.route.segments && val.route.segments.length !== 0) {
+          if (val.route.segments[0][0].content !== locale) return false;
+        }
+        return true;
+      } else {
+        return false;
+      }
+    })) {
+      return void 0;
+    }
   }
   const url = getUrlForPath(
     pathname,
@@ -332,6 +346,9 @@ async function generatePath(pathname, pipeline, gopts, route) {
     }
     throw err;
   }
+  if (pipeline.settings.adapter?.adapterFeatures?.experimentalStaticHeaders && pipeline.settings.config.experimental?.csp) {
+    routeToHeaders.set(toIntegrationResolvedRoute(route), response.headers);
+  }
   if (response.status >= 300 && response.status < 400) {
     if (routeIsRedirect(route) && !config.build.redirects) {
       return void 0;
@@ -401,6 +418,7 @@ async function createBuildManifest(settings, internals, renderers, middleware, a
       ...await trackStyleHashes(internals, settings, algorithm)
     ];
     csp = {
+      cspDestination: settings.adapter?.adapterFeatures?.experimentalStaticHeaders ? "adapter" : void 0,
       styleHashes,
       styleResources: getStyleResources(settings.config.experimental.csp),
       scriptHashes,
@@ -423,7 +441,7 @@ async function createBuildManifest(settings, internals, renderers, middleware, a
     entryModules: Object.fromEntries(internals.entrySpecifierToBundleMap.entries()),
     inlinedScripts: internals.inlinedScripts,
     routes: [],
-    adapterName: "",
+    adapterName: settings.adapter?.name ?? "",
     clientDirectives: settings.clientDirectives,
     compressHTML: settings.config.compressHTML,
     renderers,

package/dist/core/build/pipeline.js

@@ -201,7 +201,8 @@ class BuildPipeline extends Pipeline {
       routes: this.options.routesList.routes,
       trailingSlash: this.config.trailingSlash,
       buildFormat: this.config.build.format,
-      base: this.config.base
+      base: this.config.base,
+      outDir: this.manifest.outDir
     });
     const componentInstance = await this.getComponentByRoute(routeData);
     return { routeData, componentInstance, newUrl, pathname };

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

@@ -245,6 +245,7 @@ async function buildManifest(opts, internals, staticFiles, encodedKey) {
       ...await trackStyleHashes(internals, settings, algorithm)
     ];
     csp = {
+      cspDestination: settings.adapter?.adapterFeatures?.experimentalStaticHeaders ? "adapter" : void 0,
       scriptHashes,
       scriptResources: getScriptResources(settings.config.experimental.csp),
       styleHashes,

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

@@ -659,7 +659,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         })> | undefined;
     }>>>;
     session: z.ZodOptional<z.ZodObject<{
-        driver: z.ZodString;
+        driver: z.ZodOptional<z.ZodString>;
         options: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
         cookie: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodObject<{
             name: z.ZodOptional<z.ZodString>;
@@ -699,8 +699,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         }>>;
         ttl: z.ZodOptional<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
-        driver: string;
         options?: Record<string, any> | undefined;
+        driver?: string | undefined;
         cookie?: {
             name?: string | undefined;
             path?: string | undefined;
@@ -711,8 +711,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         } | undefined;
         ttl?: number | undefined;
     }, {
-        driver: string;
         options?: Record<string, any> | undefined;
+        driver?: string | undefined;
         cookie?: string | {
             name?: string | undefined;
             path?: string | undefined;
@@ -1342,8 +1342,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         collections: boolean;
     };
     session?: {
-        driver: string;
         options?: Record<string, any> | undefined;
+        driver?: string | undefined;
         cookie?: {
             name?: string | undefined;
             path?: string | undefined;
@@ -1421,8 +1421,8 @@ export declare const AstroConfigSchema: z.ZodObject<{
         destination: string;
     }> | undefined;
     session?: {
-        driver: string;
         options?: Record<string, any> | undefined;
+        driver?: string | undefined;
         cookie?: string | {
             name?: string | undefined;
             path?: string | undefined;

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

@@ -244,7 +244,7 @@ const AstroConfigSchema = z.object({
     validateSecrets: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.env.validateSecrets)
   }).strict().optional().default(ASTRO_CONFIG_DEFAULTS.env),
   session: z.object({
-    driver: z.string(),
+    driver: z.string().optional(),
     options: z.record(z.any()).optional(),
     cookie: z.object({
       name: z.string().optional(),

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

@@ -582,7 +582,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         })> | undefined;
     }>>>;
     session: z.ZodOptional<z.ZodObject<{
-        driver: z.ZodString;
+        driver: z.ZodOptional<z.ZodString>;
         options: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
         cookie: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodObject<{
             name: z.ZodOptional<z.ZodString>;
@@ -622,8 +622,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         }>>;
         ttl: z.ZodOptional<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
-        driver: string;
         options?: Record<string, any> | undefined;
+        driver?: string | undefined;
         cookie?: {
             name?: string | undefined;
             path?: string | undefined;
@@ -634,8 +634,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         } | undefined;
         ttl?: number | undefined;
     }, {
-        driver: string;
         options?: Record<string, any> | undefined;
+        driver?: string | undefined;
         cookie?: string | {
             name?: string | undefined;
             path?: string | undefined;
@@ -1343,8 +1343,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         collections: boolean;
     };
     session?: {
-        driver: string;
         options?: Record<string, any> | undefined;
+        driver?: string | undefined;
         cookie?: {
             name?: string | undefined;
             path?: string | undefined;
@@ -1422,8 +1422,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         destination: string;
     }> | undefined;
     session?: {
-        driver: string;
         options?: Record<string, any> | undefined;
+        driver?: string | undefined;
         cookie?: string | {
             name?: string | undefined;
             path?: string | undefined;
@@ -1827,8 +1827,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         collections: boolean;
     };
     session?: {
-        driver: string;
         options?: Record<string, any> | undefined;
+        driver?: string | undefined;
         cookie?: {
             name?: string | undefined;
             path?: string | undefined;
@@ -1906,8 +1906,8 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
         destination: string;
     }> | undefined;
     session?: {
-        driver: string;
         options?: Record<string, any> | undefined;
+        driver?: string | undefined;
         cookie?: string | {
             name?: string | undefined;
             path?: string | undefined;

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.9.2";
+const ASTRO_VERSION = "5.9.4";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

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

@@ -10,7 +10,7 @@ export declare const cspAlgorithmSchema: z.ZodDefault<z.ZodOptional<z.ZodEnum<["
 export declare const cspHashSchema: z.ZodType<`sha256-${string}` | `sha384-${string}` | `sha512-${string}`, z.ZodTypeDef, `sha256-${string}` | `sha384-${string}` | `sha512-${string}`>;
 export type CspHash = z.infer<typeof cspHashSchema>;
 declare const ALLOWED_DIRECTIVES: readonly ["base-uri", "child-src", "connect-src", "default-src", "fenced-frame-src", "font-src", "form-action", "frame-ancestors", "frame-src", "img-src", "manifest-src", "media-src", "object-src", "referrer", "report-to", "require-trusted-types-for", "sandbox", "trusted-types", "upgrade-insecure-requests", "worker-src"];
+type AllowedDirectives = (typeof ALLOWED_DIRECTIVES)[number];
 export type CspDirective = `${AllowedDirectives} ${string}`;
 export declare const allowedDirectivesSchema: z.ZodType<`base-uri ${string}` | `child-src ${string}` | `connect-src ${string}` | `default-src ${string}` | `fenced-frame-src ${string}` | `font-src ${string}` | `form-action ${string}` | `frame-ancestors ${string}` | `frame-src ${string}` | `img-src ${string}` | `manifest-src ${string}` | `media-src ${string}` | `object-src ${string}` | `referrer ${string}` | `report-to ${string}` | `require-trusted-types-for ${string}` | `sandbox ${string}` | `trusted-types ${string}` | `upgrade-insecure-requests ${string}` | `worker-src ${string}`, z.ZodTypeDef, `base-uri ${string}` | `child-src ${string}` | `connect-src ${string}` | `default-src ${string}` | `fenced-frame-src ${string}` | `font-src ${string}` | `form-action ${string}` | `frame-ancestors ${string}` | `frame-src ${string}` | `img-src ${string}` | `manifest-src ${string}` | `media-src ${string}` | `object-src ${string}` | `referrer ${string}` | `report-to ${string}` | `require-trusted-types-for ${string}` | `sandbox ${string}` | `trusted-types ${string}` | `upgrade-insecure-requests ${string}` | `worker-src ${string}`>;
-type AllowedDirectives = (typeof ALLOWED_DIRECTIVES)[number];
 export {};

package/dist/core/dev/dev.js

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

package/dist/core/messages.js

@@ -37,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.9.2";
+  const version = "5.9.4";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -274,7 +274,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"5.9.2"}`
+        `v${"5.9.4"}`
       )} ${headline}`
     );
   }

package/dist/core/render-context.js

@@ -415,6 +415,7 @@ class RenderContext {
         extraScriptHashes: [],
         propagators: /* @__PURE__ */ new Set()
       },
+      cspDestination: manifest.csp?.cspDestination ?? (routeData.prerender ? "meta" : "header"),
       shouldInjectCspMetaTags: !!manifest.csp,
       cspAlgorithm: manifest.csp?.algorithm ?? "SHA-256",
       // The following arrays must be cloned, otherwise they become mutable across routes.

package/dist/core/routing/manifest/create.js

@@ -253,7 +253,7 @@ function createRedirectRoutes({ settings }, routeMap) {
       component: from,
       generate,
       pathname: pathname || void 0,
-      prerender: false,
+      prerender: getPrerenderDefault(config),
       redirect: to,
       redirectRoute: routeMap.get(destination),
       fallbackRoutes: [],

package/dist/core/routing/rewrite.d.ts

@@ -9,6 +9,7 @@ type FindRouteToRewrite = {
     trailingSlash: AstroConfig['trailingSlash'];
     buildFormat: AstroConfig['build']['format'];
     base: AstroConfig['base'];
+    outDir: AstroConfig['outDir'] | string;
 };
 interface FindRouteToRewriteResult {
     routeData: RouteData;
@@ -20,7 +21,7 @@ interface FindRouteToRewriteResult {
  * 1. The new `Request` object. It contains `base`
  * 2.
  */
-export declare function findRouteToRewrite({ payload, routes, request, trailingSlash, buildFormat, base, }: FindRouteToRewrite): FindRouteToRewriteResult;
+export declare function findRouteToRewrite({ payload, routes, request, trailingSlash, buildFormat, base, outDir, }: FindRouteToRewrite): FindRouteToRewriteResult;
 /**
  * Utility function that creates a new `Request` with a new URL from an old `Request`.
  *

package/dist/core/routing/rewrite.js

@@ -5,7 +5,8 @@ import {
   appendForwardSlash,
   joinPaths,
   prependForwardSlash,
-  removeTrailingForwardSlash
+  removeTrailingForwardSlash,
+  trimSlashes
 } from "../path.js";
 import { createRequest } from "../request.js";
 import { DEFAULT_404_ROUTE } from "./astro-designed-error-pages.js";
@@ -15,7 +16,8 @@ function findRouteToRewrite({
   request,
   trailingSlash,
   buildFormat,
-  base
+  base,
+  outDir
 }) {
   let newUrl = void 0;
   if (payload instanceof URL) {
@@ -42,6 +44,9 @@ function findRouteToRewrite({
   if (pathname === "/" && base !== "/" && !shouldAppendSlash) {
     pathname = "";
   }
+  if (buildFormat === "file") {
+    pathname = pathname.replace(/\.html$/, "");
+  }
   if (base !== "/" && (pathname === "" || pathname === "/") && !shouldAppendSlash) {
     newUrl.pathname = removeTrailingForwardSlash(base);
   } else {
@@ -51,6 +56,13 @@ function findRouteToRewrite({
   let foundRoute;
   for (const route of routes) {
     if (route.pattern.test(decodedPathname)) {
+      if (route.params && route.params.length !== 0 && route.distURL && route.distURL.length !== 0) {
+        if (!route.distURL.find(
+          (url) => url.href.replace(outDir.toString(), "").replace(/(?:\/index\.html|\.html)$/, "") == trimSlashes(decodedPathname)
+        )) {
+          continue;
+        }
+      }
       foundRoute = route;
       break;
     }

package/dist/core/session.d.ts

@@ -3,7 +3,7 @@ import type { AstroCookies } from './cookies/cookies.js';
 export declare const PERSIST_SYMBOL: unique symbol;
 export declare class AstroSession<TDriver extends SessionDriverName = any> {
     #private;
-    constructor(cookies: AstroCookies, { cookie: cookieConfig, ...config }: Exclude<ResolvedSessionConfig<TDriver>, undefined>, runtimeMode?: RuntimeMode);
+    constructor(cookies: AstroCookies, { cookie: cookieConfig, ...config }: NonNullable<ResolvedSessionConfig<TDriver>>, runtimeMode?: RuntimeMode);
     /**
      * Gets a session value. Returns `undefined` if the session or value does not exist.
      */

package/dist/core/session.js

@@ -52,6 +52,15 @@ class AstroSession {
     cookie: cookieConfig = DEFAULT_COOKIE_NAME,
     ...config
   }, runtimeMode) {
+    const { driver } = config;
+    if (!driver) {
+      throw new AstroError({
+        ...SessionStorageInitError,
+        message: SessionStorageInitError.message(
+          "No driver was defined in the session configuration and the adapter did not provide a default driver."
+        )
+      });
+    }
     this.#cookies = cookies;
     let cookieConfigObject;
     if (typeof cookieConfig === "object") {
@@ -68,7 +77,7 @@ class AstroSession {
       ...cookieConfigObject,
       httpOnly: true
     };
-    this.#config = config;
+    this.#config = { ...config, driver };
   }
   /**
    * Gets a session value. Returns `undefined` if the session or value does not exist.
@@ -335,14 +344,6 @@ class AstroSession {
       this.#config.driver = "fs-lite";
       this.#config.options.base ??= ".astro/session";
     }
-    if (!this.#config?.driver) {
-      throw new AstroError({
-        ...SessionStorageInitError,
-        message: SessionStorageInitError.message(
-          "No driver was defined in the session configuration and the adapter did not provide a default driver."
-        )
-      });
-    }
     let driver = null;
     try {
       if (this.#config.driverModule) {

package/dist/integrations/hooks.d.ts

@@ -6,7 +6,7 @@ import type { PageBuildData } from '../core/build/types.js';
 import type { Logger } from '../core/logger/core.js';
 import type { AstroSettings } from '../types/astro.js';
 import type { AstroConfig } from '../types/public/config.js';
-import type { RouteOptions } from '../types/public/integrations.js';
+import type { IntegrationResolvedRoute, RouteOptions } from '../types/public/integrations.js';
 import type { RouteData } from '../types/public/internal.js';
 export declare function getToolbarServerCommunicationHelpers(server: ViteDevServer): {
     /**
@@ -84,9 +84,10 @@ type RunHookBuildSsr = {
     middlewareEntryPoint: URL | undefined;
 };
 export declare function runHookBuildSsr({ config, manifest, logger, entryPoints, middlewareEntryPoint, }: RunHookBuildSsr): Promise<void>;
-export declare function runHookBuildGenerated({ settings, logger, }: {
+export declare function runHookBuildGenerated({ settings, logger, experimentalRouteToHeaders, }: {
     settings: AstroSettings;
     logger: Logger;
+    experimentalRouteToHeaders: Map<IntegrationResolvedRoute, Headers>;
 }): Promise<void>;
 type RunHookBuildDone = {
     settings: AstroSettings;
@@ -105,4 +106,5 @@ export declare function runHookRoutesResolved({ routes, settings, logger, }: {
     settings: AstroSettings;
     logger: Logger;
 }): Promise<void>;
+export declare function toIntegrationResolvedRoute(route: RouteData): IntegrationResolvedRoute;
 export {};

package/dist/integrations/hooks.js

@@ -432,7 +432,8 @@ async function runHookBuildSsr({
 }
 async function runHookBuildGenerated({
   settings,
-  logger
+  logger,
+  experimentalRouteToHeaders
 }) {
   const dir = settings.buildOutput === "server" ? settings.config.build.client : settings.config.outDir;
   for (const integration of settings.config.integrations) {
@@ -440,7 +441,7 @@ async function runHookBuildGenerated({
       integration,
       hookName: "astro:build:generated",
       logger,
-      params: () => ({ dir })
+      params: () => ({ dir, experimentalRouteToHeaders })
     });
   }
 }
@@ -553,5 +554,6 @@ export {
   runHookRoutesResolved,
   runHookServerDone,
   runHookServerSetup,
-  runHookServerStart
+  runHookServerStart,
+  toIntegrationResolvedRoute
 };

package/dist/runtime/server/render/csp.js

@@ -25,7 +25,7 @@ function renderCspContent(result) {
   if (result.styleResources.length > 0) {
     styleResources = result.styleResources.map((r) => `${r}`).join(" ");
   }
-  const strictDynamic = result.isStrictDynamic ? ` strict-dynamic` : "";
+  const strictDynamic = result.isStrictDynamic ? ` 'strict-dynamic'` : "";
   const scriptSrc = `script-src ${scriptResources} ${Array.from(finalScriptHashes).join(" ")}${strictDynamic};`;
   const styleSrc = `style-src ${styleResources} ${Array.from(finalStyleHashes).join(" ")};`;
   return `${directives} ${scriptSrc} ${styleSrc}`;

package/dist/runtime/server/render/head.js

@@ -9,6 +9,20 @@ const uniqueElements = (item, index, all) => {
 };
 function renderAllHeadContent(result) {
   result._metadata.hasRenderedHead = true;
+  let content = "";
+  if (result.shouldInjectCspMetaTags && result.cspDestination === "meta") {
+    content += renderElement(
+      "meta",
+      {
+        props: {
+          "http-equiv": "content-security-policy",
+          content: renderCspContent(result)
+        },
+        children: ""
+      },
+      false
+    );
+  }
   const styles = Array.from(result.styles).filter(uniqueElements).map(
     (style) => style.props.rel === "stylesheet" ? renderElement("link", style) : renderElement("style", style)
   );
@@ -20,25 +34,12 @@ function renderAllHeadContent(result) {
     return renderElement("script", script, false);
   });
   const links = Array.from(result.links).filter(uniqueElements).map((link) => renderElement("link", link, false));
-  let content = styles.join("\n") + links.join("\n") + scripts.join("\n");
+  content += styles.join("\n") + links.join("\n") + scripts.join("\n");
   if (result._metadata.extraHead.length > 0) {
     for (const part of result._metadata.extraHead) {
       content += part;
     }
   }
-  if (result.shouldInjectCspMetaTags) {
-    content += renderElement(
-      "meta",
-      {
-        props: {
-          "http-equiv": "content-security-policy",
-          content: renderCspContent(result)
-        },
-        children: ""
-      },
-      false
-    );
-  }
   return markHTMLString(content);
 }
 function renderHead() {

package/dist/runtime/server/render/page.js

@@ -2,6 +2,7 @@ import { isAstroComponentFactory } from "./astro/index.js";
 import { renderToAsyncIterable, renderToReadableStream, renderToString } from "./astro/render.js";
 import { encoder } from "./common.js";
 import { renderComponentToString } from "./component.js";
+import { renderCspContent } from "./csp.js";
 import { isDeno, isNode } from "./util.js";
 async function renderPage(result, componentFactory, props, children, streaming, route) {
   if (!isAstroComponentFactory(componentFactory)) {
@@ -17,11 +18,15 @@ async function renderPage(result, componentFactory, props, children, streaming,
       route
     );
     const bytes = encoder.encode(str);
+    const headers2 = new Headers([
+      ["Content-Type", "text/html"],
+      ["Content-Length", bytes.byteLength.toString()]
+    ]);
+    if (result.cspDestination === "header" || result.cspDestination === "adapter") {
+      headers2.set("content-security-policy", renderCspContent(result));
+    }
     return new Response(bytes, {
-      headers: new Headers([
-        ["Content-Type", "text/html"],
-        ["Content-Length", bytes.byteLength.toString()]
-      ])
+      headers: headers2
     });
   }
   result._metadata.headInTree = result.componentMetadata.get(componentFactory.moduleId)?.containsHead ?? false;
@@ -46,6 +51,9 @@ async function renderPage(result, componentFactory, props, children, streaming,
   if (body instanceof Response) return body;
   const init = result.response;
   const headers = new Headers(init.headers);
+  if (result.shouldInjectCspMetaTags && result.cspDestination === "header" || result.cspDestination === "adapter") {
+    headers.set("content-security-policy", renderCspContent(result));
+  }
   if (!streaming && typeof body === "string") {
     body = encoder.encode(body);
     headers.set("Content-Length", body.byteLength.toString());

package/dist/runtime/server/render/server-islands.js

@@ -99,7 +99,7 @@ let response = await fetch('${serverIslandUrl}', {
 });`
     );
     const content = `${method}replaceServerIsland('${hostId}', response);`;
-    if (this.result.shouldInjectCspMetaTags) {
+    if (this.result.cspDestination) {
       this.result._metadata.extraScriptHashes.push(
         await generateCspDigest(SERVER_ISLAND_REPLACER, this.result.cspAlgorithm)
       );

package/dist/types/public/config.d.ts

@@ -123,7 +123,7 @@ interface BuiltinSessionConfig<TDriver extends keyof BuiltinDriverOptions> exten
 }
 interface CustomSessionConfig extends CommonSessionConfig {
     /** Entrypoint for a custom session driver */
-    driver: string;
+    driver?: string;
     options?: Record<string, unknown>;
 }
 interface TestSessionConfig extends CommonSessionConfig {

package/dist/types/public/integrations.d.ts

@@ -73,6 +73,16 @@ export interface AstroAdapterFeatures {
      * Determine the type of build output the adapter is intended for. Defaults to `server`;
      */
     buildOutput?: 'static' | 'server';
+    /**
+     * If supported by the adapter and enabled, Astro won't add any `<meta http-equiv>` tags
+     * in the static pages, instead it will return a mapping in the
+     * `astro:build:generated` hook, so adapters can consume them and add them inside
+     * their hosting headers configuration file.
+     *
+     * NOTE: the semantics and list of headers might change until the feature
+     * is out of experimental
+     */
+    experimentalStaticHeaders?: boolean;
 }
 export interface AstroAdapter {
     name: string;
@@ -90,7 +100,7 @@ export interface AstroAdapter {
 }
 export type AstroAdapterFeatureMap = {
     /**
-     * The adapter is able serve static pages
+     * The adapter is able to serve static pages
      */
     staticOutput?: AdapterSupport;
     /**
@@ -194,6 +204,7 @@ export interface BaseIntegrationHooks {
     'astro:build:generated': (options: {
         dir: URL;
         logger: AstroIntegrationLogger;
+        experimentalRouteToHeaders: Map<IntegrationResolvedRoute, Headers>;
     }) => void | Promise<void>;
     'astro:build:done': (options: {
         pages: {

package/dist/types/public/internal.d.ts

@@ -6,7 +6,7 @@ import type { Params } from './common.js';
 import type { AstroConfig, RedirectConfig } from './config.js';
 import type { AstroGlobal, AstroGlobalPartial } from './context.js';
 import type { AstroRenderer } from './integrations.js';
-export type { SSRManifest } from '../../core/app/types.js';
+export type { SSRManifest, SSRManifestCSP, SSRActions } from '../../core/app/types.js';
 export interface NamedSSRLoadedRendererValue extends SSRLoadedRendererValue {
     name: string;
 }
@@ -225,8 +225,18 @@ export interface SSRResult {
     key: Promise<CryptoKey>;
     _metadata: SSRMetadata;
     /**
-     * Whether Astro should inject the CSP <meta> tag into the head of the component.
+     * `header`:
+     * - <meta> for static pages
+     * - Response header for dynamic pages
+     *
+     * `meta`:
+     * - <meta> for all pages
+     *
+     * `adapter`:
+     * - nothing for static pages (the adapter does this)
+     * - Response header for dynamic pages
      */
+    cspDestination: NonNullable<SSRManifestCSP['cspDestination']>;
     shouldInjectCspMetaTags: boolean;
     cspAlgorithm: SSRManifestCSP['algorithm'];
     scriptHashes: SSRManifestCSP['scriptHashes'];

package/dist/vite-plugin-astro-server/pipeline.js

@@ -146,7 +146,8 @@ class DevPipeline extends Pipeline {
       routes: this.routesList?.routes,
       trailingSlash: this.config.trailingSlash,
       buildFormat: this.config.build.format,
-      base: this.config.base
+      base: this.config.base,
+      outDir: this.manifest.outDir
     });
     const componentInstance = await this.getComponentByRoute(routeData);
     return { newUrl, pathname, componentInstance, routeData };

package/dist/vite-plugin-astro-server/plugin.js

@@ -144,6 +144,7 @@ function createDevelopmentManifest(settings) {
   }
   if (shouldTrackCspHashes(settings.config.experimental.csp)) {
     csp = {
+      cspDestination: settings.adapter?.adapterFeatures?.experimentalStaticHeaders ? "adapter" : void 0,
       scriptHashes: getScriptHashes(settings.config.experimental.csp),
       scriptResources: getScriptResources(settings.config.experimental.csp),
       styleHashes: getStyleHashes(settings.config.experimental.csp),
@@ -167,7 +168,7 @@ function createDevelopmentManifest(settings) {
     assets: /* @__PURE__ */ new Set(),
     entryModules: {},
     routes: [],
-    adapterName: settings?.adapter?.name || "",
+    adapterName: settings?.adapter?.name ?? "",
     clientDirectives: settings.clientDirectives,
     renderers: [],
     base: settings.config.base,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.9.2",
+  "version": "5.9.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -157,8 +157,8 @@
     "zod-to-json-schema": "^3.24.5",
     "zod-to-ts": "^1.2.0",
     "@astrojs/internal-helpers": "0.6.1",
-    "@astrojs/telemetry": "3.3.0",
-    "@astrojs/markdown-remark": "6.3.2"
+    "@astrojs/markdown-remark": "6.3.2",
+    "@astrojs/telemetry": "3.3.0"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"