astro 5.8.2 → 5.9.0

package/dist/actions/runtime/utils.d.ts

@@ -10,7 +10,7 @@ export type Locals = {
 export declare const ACTION_API_CONTEXT_SYMBOL: unique symbol;
 export declare const formContentTypes: string[];
 export declare function hasContentType(contentType: string, expected: string[]): boolean;
-export type ActionAPIContext = Pick<APIContext, 'rewrite' | 'request' | 'url' | 'isPrerendered' | 'locals' | 'clientAddress' | 'cookies' | 'currentLocale' | 'generator' | 'routePattern' | 'site' | 'params' | 'preferredLocale' | 'preferredLocaleList' | 'originPathname' | 'session'> & {
+export type ActionAPIContext = Pick<APIContext, 'rewrite' | 'request' | 'url' | 'isPrerendered' | 'locals' | 'clientAddress' | 'cookies' | 'currentLocale' | 'generator' | 'routePattern' | 'site' | 'params' | 'preferredLocale' | 'preferredLocaleList' | 'originPathname' | 'session' | 'insertDirective' | 'insertScriptResource' | 'insertStyleResource' | 'insertScriptHash' | 'insertStyleHash'> & {
     /**
      * @deprecated
      * The use of `rewrite` in Actions is deprecated

package/dist/assets/fonts/config.d.ts

@@ -116,9 +116,9 @@ export declare const localFontFamilySchema: z.ZodObject<z.objectUtil.extendShape
             url: string | URL;
             tech?: string | undefined;
         })[]];
-        style?: "normal" | "italic" | "oblique" | undefined;
         weight?: string | number | undefined;
-        display?: "fallback" | "auto" | "optional" | "block" | "swap" | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+        display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
         stretch?: string | undefined;
         featureSettings?: string | undefined;
         variationSettings?: string | undefined;
@@ -131,9 +131,9 @@ export declare const localFontFamilySchema: z.ZodObject<z.objectUtil.extendShape
             url: string | URL;
             tech?: string | undefined;
         })[]];
-        style?: "normal" | "italic" | "oblique" | undefined;
         weight?: string | number | undefined;
-        display?: "fallback" | "auto" | "optional" | "block" | "swap" | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+        display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
         stretch?: string | undefined;
         featureSettings?: string | undefined;
         variationSettings?: string | undefined;
@@ -151,9 +151,9 @@ export declare const localFontFamilySchema: z.ZodObject<z.objectUtil.extendShape
             url: string | URL;
             tech?: string | undefined;
         })[]];
-        style?: "normal" | "italic" | "oblique" | undefined;
         weight?: string | number | undefined;
-        display?: "fallback" | "auto" | "optional" | "block" | "swap" | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+        display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
         stretch?: string | undefined;
         featureSettings?: string | undefined;
         variationSettings?: string | undefined;
@@ -166,9 +166,9 @@ export declare const localFontFamilySchema: z.ZodObject<z.objectUtil.extendShape
             url: string | URL;
             tech?: string | undefined;
         })[]];
-        style?: "normal" | "italic" | "oblique" | undefined;
         weight?: string | number | undefined;
-        display?: "fallback" | "auto" | "optional" | "block" | "swap" | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+        display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
         stretch?: string | undefined;
         featureSettings?: string | undefined;
         variationSettings?: string | undefined;
@@ -188,9 +188,9 @@ export declare const localFontFamilySchema: z.ZodObject<z.objectUtil.extendShape
             url: string | URL;
             tech?: string | undefined;
         })[]];
-        style?: "normal" | "italic" | "oblique" | undefined;
         weight?: string | number | undefined;
-        display?: "fallback" | "auto" | "optional" | "block" | "swap" | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+        display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
         stretch?: string | undefined;
         featureSettings?: string | undefined;
         variationSettings?: string | undefined;
@@ -203,9 +203,9 @@ export declare const localFontFamilySchema: z.ZodObject<z.objectUtil.extendShape
             url: string | URL;
             tech?: string | undefined;
         })[]];
-        style?: "normal" | "italic" | "oblique" | undefined;
         weight?: string | number | undefined;
-        display?: "fallback" | "auto" | "optional" | "block" | "swap" | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+        display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
         stretch?: string | undefined;
         featureSettings?: string | undefined;
         variationSettings?: string | undefined;
@@ -254,7 +254,7 @@ export declare const remoteFontFamilySchema: z.ZodObject<z.objectUtil.extendShap
      * Font [variation settings](https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-variation-settings).
      */
     variationSettings: z.ZodOptional<z.ZodString>;
-}, "style" | "weight">>, {
+}, "weight" | "style">>, {
     /**
      * @default `["sans-serif"]`
      *
@@ -333,16 +333,16 @@ export declare const remoteFontFamilySchema: z.ZodObject<z.objectUtil.extendShap
         entrypoint: string | URL;
         config?: Record<string, any> | undefined;
     };
+    weights?: [string | number, ...(string | number)[]] | undefined;
+    styles?: ["normal" | "italic" | "oblique", ...("normal" | "italic" | "oblique")[]] | undefined;
+    subsets?: [string, ...string[]] | undefined;
     fallbacks?: string[] | undefined;
     optimizedFallbacks?: boolean | undefined;
-    display?: "fallback" | "auto" | "optional" | "block" | "swap" | undefined;
+    display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
     stretch?: string | undefined;
     featureSettings?: string | undefined;
     variationSettings?: string | undefined;
     unicodeRange?: [string, ...string[]] | undefined;
-    weights?: [string | number, ...(string | number)[]] | undefined;
-    styles?: ["normal" | "italic" | "oblique", ...("normal" | "italic" | "oblique")[]] | undefined;
-    subsets?: [string, ...string[]] | undefined;
 }, {
     name: string;
     cssVariable: string;
@@ -350,14 +350,14 @@ export declare const remoteFontFamilySchema: z.ZodObject<z.objectUtil.extendShap
         entrypoint: string | URL;
         config?: Record<string, any> | undefined;
     };
+    weights?: [string | number, ...(string | number)[]] | undefined;
+    styles?: ["normal" | "italic" | "oblique", ...("normal" | "italic" | "oblique")[]] | undefined;
+    subsets?: [string, ...string[]] | undefined;
     fallbacks?: string[] | undefined;
     optimizedFallbacks?: boolean | undefined;
-    display?: "fallback" | "auto" | "optional" | "block" | "swap" | undefined;
+    display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
     stretch?: string | undefined;
     featureSettings?: string | undefined;
     variationSettings?: string | undefined;
     unicodeRange?: [string, ...string[]] | undefined;
-    weights?: [string | number, ...(string | number)[]] | undefined;
-    styles?: ["normal" | "italic" | "oblique", ...("normal" | "italic" | "oblique")[]] | undefined;
-    subsets?: [string, ...string[]] | undefined;
 }>;

package/dist/container/index.js

@@ -45,7 +45,8 @@ function createManifest(manifest, renderers, middleware) {
     i18n: manifest?.i18n,
     checkOrigin: false,
     middleware: manifest?.middleware ?? middlewareInstance,
-    key: createKey()
+    key: createKey(),
+    csp: manifest?.csp
   };
 }
 class experimental_AstroContainer {

package/dist/content/content-layer.js

@@ -1,4 +1,5 @@
 import { promises as fs, existsSync } from "node:fs";
+import { createMarkdownProcessor } from "@astrojs/markdown-remark";
 import PQueue from "p-queue";
 import xxhash from "xxhash-wasm";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
@@ -24,6 +25,7 @@ class ContentLayer {
   #watcher;
   #lastConfigDigest;
   #unsubscribe;
+  #markdownProcessor;
   #generateDigest;
   #queue;
   constructor({ settings, logger, store, watcher }) {
@@ -85,6 +87,7 @@ class ContentLayer {
       logger: this.#logger.forkIntegrationLogger(loaderName),
       config: this.#settings.config,
       parseData,
+      renderMarkdown: this.#processMarkdown.bind(this),
       generateDigest: await this.#getGenerateDigest(),
       watcher: this.#watcher,
       refreshContextData,
@@ -94,6 +97,14 @@ class ContentLayer {
       ])
     };
   }
+  async #processMarkdown(content) {
+    this.#markdownProcessor ??= await createMarkdownProcessor(this.#settings.config.markdown);
+    const { code, metadata } = await this.#markdownProcessor.render(content);
+    return {
+      html: code,
+      metadata
+    };
+  }
   /**
    * Enqueues a sync job that runs the `load()` method of each collection's loader, which will load the data and save it in the data store.
    * The loader itself is responsible for deciding whether this will clear and reload the full collection, or
@@ -153,7 +164,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "5.8.2") {
+    if (previousAstroVersion && previousAstroVersion !== "5.9.0") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -161,8 +172,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.8.2") {
-      await this.#store.metaStore().set("astro-version", "5.8.2");
+    if ("5.9.0") {
+      await this.#store.metaStore().set("astro-version", "5.9.0");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/content/loaders/types.d.ts

@@ -2,6 +2,7 @@ import type { FSWatcher } from 'vite';
 import type { ZodSchema } from 'zod';
 import type { AstroIntegrationLogger } from '../../core/logger/core.js';
 import type { AstroConfig } from '../../types/public/config.js';
+import type { RenderedContent } from '../data-store.js';
 import type { DataStore, MetaStore } from '../mutable-data-store.js';
 export type { DataStore, MetaStore };
 export interface ParseDataOptions<TData extends Record<string, unknown>> {
@@ -24,6 +25,8 @@ export interface LoaderContext {
     config: AstroConfig;
     /** Validates and parses the data according to the collection schema */
     parseData<TData extends Record<string, unknown>>(props: ParseDataOptions<TData>): Promise<TData>;
+    /** Renders markdown content to HTML and metadata */
+    renderMarkdown(content: string): Promise<RenderedContent>;
     /** Generates a non-cryptographic content digest. This can be used to check if the data has changed */
     generateDigest(data: Record<string, unknown> | string): string;
     /** When running in dev, this is a filesystem watcher that can be used to trigger updates */

package/dist/content/utils.d.ts

@@ -64,6 +64,7 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             config: z.ZodAny;
             entryTypes: z.ZodAny;
             parseData: z.ZodAny;
+            renderMarkdown: z.ZodAny;
             generateDigest: z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodUnknown>;
             watcher: z.ZodOptional<z.ZodAny>;
             refreshContextData: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
@@ -77,6 +78,7 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             parseData?: any;
             store?: any;
             entryTypes?: any;
+            renderMarkdown?: any;
             refreshContextData?: Record<string, unknown> | undefined;
         }, {
             collection: string;
@@ -88,11 +90,13 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             parseData?: any;
             store?: any;
             entryTypes?: any;
+            renderMarkdown?: any;
             refreshContextData?: Record<string, unknown> | undefined;
         }>], null>, z.ZodUnknown>;
         schema: z.ZodOptional<z.ZodAny>;
         render: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodUnknown>>;
     }, "strip", z.ZodTypeAny, {
+        name: string;
         load: (args_0: {
             collection: string;
             generateDigest: (args_0: any) => unknown;
@@ -103,12 +107,13 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             parseData?: any;
             store?: any;
             entryTypes?: any;
+            renderMarkdown?: any;
             refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
-        name: string;
         schema?: any;
         render?: ((args_0: any) => unknown) | undefined;
     }, {
+        name: string;
         load: (args_0: {
             collection: string;
             generateDigest: (args_0: any) => unknown;
@@ -119,9 +124,9 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             parseData?: any;
             store?: any;
             entryTypes?: any;
+            renderMarkdown?: any;
             refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
-        name: string;
         schema?: any;
         render?: ((args_0: any) => unknown) | undefined;
     }>]>;
@@ -130,6 +135,7 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     type: "content_layer";
     loader: ((...args: unknown[]) => unknown) | {
+        name: string;
         load: (args_0: {
             collection: string;
             generateDigest: (args_0: any) => unknown;
@@ -140,9 +146,9 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             parseData?: any;
             store?: any;
             entryTypes?: any;
+            renderMarkdown?: any;
             refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
-        name: string;
         schema?: any;
         render?: ((args_0: any) => unknown) | undefined;
     };
@@ -151,6 +157,7 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
 }, {
     type: "content_layer";
     loader: ((...args: unknown[]) => unknown) | {
+        name: string;
         load: (args_0: {
             collection: string;
             generateDigest: (args_0: any) => unknown;
@@ -161,9 +168,9 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             parseData?: any;
             store?: any;
             entryTypes?: any;
+            renderMarkdown?: any;
             refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
-        name: string;
         schema?: any;
         render?: ((args_0: any) => unknown) | undefined;
     };
@@ -202,6 +209,7 @@ declare const contentConfigParser: z.ZodObject<{
                 config: z.ZodAny;
                 entryTypes: z.ZodAny;
                 parseData: z.ZodAny;
+                renderMarkdown: z.ZodAny;
                 generateDigest: z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodUnknown>;
                 watcher: z.ZodOptional<z.ZodAny>;
                 refreshContextData: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
@@ -215,6 +223,7 @@ declare const contentConfigParser: z.ZodObject<{
                 parseData?: any;
                 store?: any;
                 entryTypes?: any;
+                renderMarkdown?: any;
                 refreshContextData?: Record<string, unknown> | undefined;
             }, {
                 collection: string;
@@ -226,11 +235,13 @@ declare const contentConfigParser: z.ZodObject<{
                 parseData?: any;
                 store?: any;
                 entryTypes?: any;
+                renderMarkdown?: any;
                 refreshContextData?: Record<string, unknown> | undefined;
             }>], null>, z.ZodUnknown>;
             schema: z.ZodOptional<z.ZodAny>;
             render: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodUnknown>>;
         }, "strip", z.ZodTypeAny, {
+            name: string;
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -241,12 +252,13 @@ declare const contentConfigParser: z.ZodObject<{
                 parseData?: any;
                 store?: any;
                 entryTypes?: any;
+                renderMarkdown?: any;
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
-            name: string;
             schema?: any;
             render?: ((args_0: any) => unknown) | undefined;
         }, {
+            name: string;
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -257,9 +269,9 @@ declare const contentConfigParser: z.ZodObject<{
                 parseData?: any;
                 store?: any;
                 entryTypes?: any;
+                renderMarkdown?: any;
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
-            name: string;
             schema?: any;
             render?: ((args_0: any) => unknown) | undefined;
         }>]>;
@@ -268,6 +280,7 @@ declare const contentConfigParser: z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         type: "content_layer";
         loader: ((...args: unknown[]) => unknown) | {
+            name: string;
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -278,9 +291,9 @@ declare const contentConfigParser: z.ZodObject<{
                 parseData?: any;
                 store?: any;
                 entryTypes?: any;
+                renderMarkdown?: any;
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
-            name: string;
             schema?: any;
             render?: ((args_0: any) => unknown) | undefined;
         };
@@ -289,6 +302,7 @@ declare const contentConfigParser: z.ZodObject<{
     }, {
         type: "content_layer";
         loader: ((...args: unknown[]) => unknown) | {
+            name: string;
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -299,9 +313,9 @@ declare const contentConfigParser: z.ZodObject<{
                 parseData?: any;
                 store?: any;
                 entryTypes?: any;
+                renderMarkdown?: any;
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
-            name: string;
             schema?: any;
             render?: ((args_0: any) => unknown) | undefined;
         };
@@ -318,6 +332,7 @@ declare const contentConfigParser: z.ZodObject<{
     } | {
         type: "content_layer";
         loader: ((...args: unknown[]) => unknown) | {
+            name: string;
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -328,9 +343,9 @@ declare const contentConfigParser: z.ZodObject<{
                 parseData?: any;
                 store?: any;
                 entryTypes?: any;
+                renderMarkdown?: any;
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
-            name: string;
             schema?: any;
             render?: ((args_0: any) => unknown) | undefined;
         };
@@ -347,6 +362,7 @@ declare const contentConfigParser: z.ZodObject<{
     } | {
         type: "content_layer";
         loader: ((...args: unknown[]) => unknown) | {
+            name: string;
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -357,9 +373,9 @@ declare const contentConfigParser: z.ZodObject<{
                 parseData?: any;
                 store?: any;
                 entryTypes?: any;
+                renderMarkdown?: any;
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
-            name: string;
             schema?: any;
             render?: ((args_0: any) => unknown) | undefined;
         };

package/dist/content/utils.js

@@ -63,6 +63,7 @@ const collectionConfigParser = z.union([
                 config: z.any(),
                 entryTypes: z.any(),
                 parseData: z.any(),
+                renderMarkdown: z.any(),
                 generateDigest: z.function(z.tuple([z.any()], z.string())),
                 watcher: z.any().optional(),
                 refreshContextData: z.record(z.unknown()).optional()

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

@@ -3,9 +3,10 @@ import type { ActionAccept, ActionClient } from '../../actions/runtime/virtual/s
 import type { RoutingStrategies } from '../../i18n/utils.js';
 import type { ComponentInstance, SerializedRouteData } from '../../types/astro.js';
 import type { AstroMiddlewareInstance } from '../../types/public/common.js';
-import type { AstroConfig, Locales, ResolvedSessionConfig } from '../../types/public/config.js';
+import type { AstroConfig, CspAlgorithm, Locales, ResolvedSessionConfig } from '../../types/public/config.js';
 import type { RouteData, SSRComponentMetadata, SSRLoadedRenderer, SSRResult } from '../../types/public/internal.js';
 import type { SinglePageBuiltModule } from '../build/types.js';
+import type { CspDirective } from '../csp/config.js';
 type ComponentPath = string;
 export type StylesheetAsset = {
     type: 'inline';
@@ -76,6 +77,7 @@ export type SSRManifest = {
     publicDir: string | URL;
     buildClientDir: string | URL;
     buildServerDir: string | URL;
+    csp: SSRManifestCSP | undefined;
 };
 export type SSRActions = {
     server: Record<string, ActionClient<unknown, ActionAccept, ZodType>>;
@@ -88,6 +90,15 @@ export type SSRManifestI18n = {
     defaultLocale: string;
     domainLookupTable: Record<string, string>;
 };
+export type SSRManifestCSP = {
+    algorithm: CspAlgorithm;
+    scriptHashes: string[];
+    scriptResources: string[];
+    isStrictDynamic: boolean;
+    styleHashes: string[];
+    styleResources: string[];
+    directives: CspDirective[];
+};
 /** Public type exposed through the `astro:build:ssr` integration hook */
 export type SerializedSSRManifest = Omit<SSRManifest, 'middleware' | 'routes' | 'assets' | 'componentMetadata' | 'inlinedScripts' | 'clientDirectives' | 'serverIslandNameMap' | 'key'> & {
     routes: SerializedRouteInfo[];

package/dist/core/base-pipeline.js

@@ -46,11 +46,11 @@ class Pipeline {
     } else if (this.middleware) {
       const middlewareInstance = await this.middleware();
       const onRequest = middlewareInstance.onRequest ?? NOOP_MIDDLEWARE_FN;
+      const internalMiddlewares = [onRequest];
       if (this.manifest.checkOrigin) {
-        this.resolvedMiddleware = sequence(createOriginCheckMiddleware(), onRequest);
-      } else {
-        this.resolvedMiddleware = onRequest;
+        internalMiddlewares.unshift(createOriginCheckMiddleware());
       }
+      this.resolvedMiddleware = sequence(...internalMiddlewares);
       return this.resolvedMiddleware;
     } else {
       this.resolvedMiddleware = NOOP_MIDDLEWARE_FN;

package/dist/core/build/generate.d.ts

@@ -1,3 +1,3 @@
-import { type BuildInternals } from '../../core/build/internal.js';
+import { type BuildInternals } from './internal.js';
 import type { StaticBuildOptions } from './types.js';
 export declare function generatePages(options: StaticBuildOptions, internals: BuildInternals): Promise<void>;

package/dist/core/build/generate.js

@@ -9,7 +9,6 @@ import {
   getStaticImageList,
   prepareAssetsGenerationEnv
 } from "../../assets/build/generate.js";
-import { hasPrerenderedPages } from "../../core/build/internal.js";
 import {
   isRelativePath,
   joinPaths,
@@ -19,6 +18,18 @@ import {
 import { toFallbackType, toRoutingStrategy } from "../../i18n/utils.js";
 import { runHookBuildGenerated } from "../../integrations/hooks.js";
 import { getServerOutputDirectory } from "../../prerender/utils.js";
+import {
+  getAlgorithm,
+  getDirectives,
+  getScriptHashes,
+  getScriptResources,
+  getStrictDynamic,
+  getStyleHashes,
+  getStyleResources,
+  shouldTrackCspHashes,
+  trackScriptHashes,
+  trackStyleHashes
+} from "../csp/common.js";
 import { NoPrerenderedRoutesWithDomains } from "../errors/errors-data.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { NOOP_MIDDLEWARE_FN } from "../middleware/noop-middleware.js";
@@ -31,6 +42,7 @@ import { matchRoute } from "../routing/match.js";
 import { stringifyParams } from "../routing/params.js";
 import { getOutputFilename } from "../util.js";
 import { getOutFile, getOutFolder } from "./common.js";
+import { hasPrerenderedPages } from "./internal.js";
 import { cssOrder, mergeInlineCss } from "./internal.js";
 import { BuildPipeline } from "./pipeline.js";
 import { getTimeStat, shouldAppendForwardSlash } from "./util.js";
@@ -46,7 +58,7 @@ async function generatePages(options, internals) {
     const renderers = await import(renderersEntryUrl.toString());
     const middleware = internals.middlewareEntryPoint ? await import(internals.middlewareEntryPoint.toString()).then((mod) => mod.onRequest) : NOOP_MIDDLEWARE_FN;
     const actions = internals.astroActionsEntryPoint ? await import(internals.astroActionsEntryPoint.toString()).then((mod) => mod) : NOOP_ACTIONS_MOD;
-    manifest = createBuildManifest(
+    manifest = await createBuildManifest(
       options.settings,
       internals,
       renderers.renderers,
@@ -365,8 +377,9 @@ function getPrettyRouteName(route) {
   }
   return route.component;
 }
-function createBuildManifest(settings, internals, renderers, middleware, actions, key) {
+async function createBuildManifest(settings, internals, renderers, middleware, actions, key) {
   let i18nManifest = void 0;
+  let csp = void 0;
   if (settings.config.i18n) {
     i18nManifest = {
       fallback: settings.config.i18n.fallback,
@@ -377,6 +390,26 @@ function createBuildManifest(settings, internals, renderers, middleware, actions
       domainLookupTable: {}
     };
   }
+  if (shouldTrackCspHashes(settings.config.experimental.csp)) {
+    const algorithm = getAlgorithm(settings.config.experimental.csp);
+    const scriptHashes = [
+      ...getScriptHashes(settings.config.experimental.csp),
+      ...await trackScriptHashes(internals, settings, algorithm)
+    ];
+    const styleHashes = [
+      ...getStyleHashes(settings.config.experimental.csp),
+      ...await trackStyleHashes(internals, settings, algorithm)
+    ];
+    csp = {
+      styleHashes,
+      styleResources: getStyleResources(settings.config.experimental.csp),
+      scriptHashes,
+      scriptResources: getScriptResources(settings.config.experimental.csp),
+      algorithm,
+      directives: getDirectives(settings.config.experimental.csp),
+      isStrictDynamic: getStrictDynamic(settings.config.experimental.csp)
+    };
+  }
   return {
     hrefRoot: settings.config.root.toString(),
     srcDir: settings.config.srcDir,
@@ -408,7 +441,8 @@ function createBuildManifest(settings, internals, renderers, middleware, actions
     },
     actions: () => actions,
     checkOrigin: (settings.config.security?.checkOrigin && settings.buildOutput === "server") ?? false,
-    key
+    key,
+    csp
   };
 }
 export {

package/dist/core/build/internal.d.ts

@@ -64,6 +64,7 @@ export interface BuildInternals {
      */
     propagatedStylesMap: Map<string, Set<StylesheetAsset>>;
     staticFiles: Set<string>;
+    clientChunksAndAssets: Set<string>;
     ssrEntryChunk?: Rollup.OutputChunk;
     manifestEntryChunk?: Rollup.OutputChunk;
     manifestFileName?: string;

package/dist/core/build/internal.js

@@ -19,7 +19,8 @@ function createBuildInternals() {
     entryPoints: /* @__PURE__ */ new Map(),
     prerenderOnlyChunks: [],
     astroActionsEntryPoint: void 0,
-    middlewareEntryPoint: void 0
+    middlewareEntryPoint: void 0,
+    clientChunksAndAssets: /* @__PURE__ */ new Set()
   };
 }
 function trackPageData(internals, _component, pageData, componentModuleId, componentURL) {

package/dist/core/build/plugins/index.js

@@ -16,7 +16,7 @@ import { pluginSSR } from "./plugin-ssr.js";
 function registerAllPlugins({ internals, options, register }) {
   register(pluginComponentEntry(internals));
   register(pluginAnalyzer(internals));
-  register(pluginInternals(internals));
+  register(pluginInternals(options, internals));
   register(pluginManifest(options, internals));
   register(pluginRenderers(options));
   register(pluginMiddleware(options, internals));

package/dist/core/build/plugins/plugin-internals.d.ts

@@ -1,3 +1,4 @@
 import type { BuildInternals } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin.js';
-export declare function pluginInternals(internals: BuildInternals): AstroBuildPlugin;
+import type { StaticBuildOptions } from '../types.js';
+export declare function pluginInternals(options: StaticBuildOptions, internals: BuildInternals): AstroBuildPlugin;

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

@@ -1,5 +1,5 @@
 import { normalizeEntryId } from "./plugin-component-entry.js";
-function vitePluginInternals(input, internals) {
+function vitePluginInternals(input, opts, internals) {
   return {
     name: "@astro/plugin-build-internals",
     config(config, options) {
@@ -35,7 +35,10 @@ function vitePluginInternals(input, internals) {
         );
       }
       await Promise.all(promises);
-      for (const [, chunk] of Object.entries(bundle)) {
+      for (const [_, chunk] of Object.entries(bundle)) {
+        if (chunk.fileName.startsWith(opts.settings.config.build.assets)) {
+          internals.clientChunksAndAssets.add(chunk.fileName);
+        }
         if (chunk.type === "chunk" && chunk.facadeModuleId) {
           const specifiers = mapping.get(chunk.facadeModuleId) || /* @__PURE__ */ new Set([chunk.facadeModuleId]);
           for (const specifier of specifiers) {
@@ -46,13 +49,13 @@ function vitePluginInternals(input, internals) {
     }
   };
 }
-function pluginInternals(internals) {
+function pluginInternals(options, internals) {
   return {
     targets: ["client", "server"],
     hooks: {
       "build:before": ({ input }) => {
         return {
-          vitePlugin: vitePluginInternals(input, internals)
+          vitePlugin: vitePluginInternals(input, options, internals)
         };
       }
     }