astro 5.10.2 → 5.11.0

package/dist/content/content-layer.js

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

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

@@ -67,7 +67,15 @@ export declare class App {
     getAdapterLogger(): AstroIntegrationLogger;
     set setManifestData(newManifestData: RoutesList);
     removeBase(pathname: string): string;
-    match(request: Request): RouteData | undefined;
+    /**
+     * Given a `Request`, it returns the `RouteData` that matches its `pathname`. By default, prerendered
+     * routes aren't returned, even if they are matched.
+     *
+     * When `allowPrerenderedRoutes` is `true`, the function returns matched prerendered routes too.
+     * @param request
+     * @param allowPrerenderedRoutes
+     */
+    match(request: Request, allowPrerenderedRoutes?: boolean): RouteData | undefined;
     render(request: Request, renderOptions?: RenderOptions): Promise<Response>;
     setCookieHeaders(response: Response): Generator<string, string[], any>;
     /**

package/dist/core/app/index.js

@@ -107,7 +107,15 @@ class App {
       return pathname;
     }
   }
-  match(request) {
+  /**
+   * Given a `Request`, it returns the `RouteData` that matches its `pathname`. By default, prerendered
+   * routes aren't returned, even if they are matched.
+   *
+   * When `allowPrerenderedRoutes` is `true`, the function returns matched prerendered routes too.
+   * @param request
+   * @param allowPrerenderedRoutes
+   */
+  match(request, allowPrerenderedRoutes = false) {
     const url = new URL(request.url);
     if (this.#manifest.assets.has(url.pathname)) return void 0;
     let pathname = this.#computePathnameFromDomain(request);
@@ -115,7 +123,12 @@ class App {
       pathname = prependForwardSlash(this.removeBase(url.pathname));
     }
     let routeData = matchRoute(decodeURI(pathname), this.#manifestData);
-    if (!routeData || routeData.prerender) return void 0;
+    if (!routeData) return void 0;
+    if (allowPrerenderedRoutes) {
+      return routeData;
+    } else if (routeData.prerender) {
+      return void 0;
+    }
     return routeData;
   }
   #computePathnameFromDomain(request) {

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

@@ -2,7 +2,7 @@ import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { RouteData } from '../../types/public/internal.js';
 import type { RenderOptions } from './index.js';
 import { App } from './index.js';
-import type { SSRManifest } from './types.js';
+import type { NodeAppHeadersJson, SSRManifest } from './types.js';
 export { apply as applyPolyfills } from '../polyfill.js';
 /**
  * Allow the request body to be explicitly overridden. For example, this
@@ -12,7 +12,9 @@ interface NodeRequest extends IncomingMessage {
     body?: unknown;
 }
 export declare class NodeApp extends App {
-    match(req: NodeRequest | Request): RouteData | undefined;
+    headersMap: NodeAppHeadersJson | undefined;
+    setHeadersMap(headers: NodeAppHeadersJson): void;
+    match(req: NodeRequest | Request, allowPrerenderedRoutes?: boolean): RouteData | undefined;
     render(request: NodeRequest | Request, options?: RenderOptions): Promise<Response>;
     /**
      * @deprecated Instead of passing `RouteData` and locals individually, pass an object with `routeData` and `locals` properties.

package/dist/core/app/node.js

@@ -6,13 +6,17 @@ import { createOutgoingHttpHeaders } from "./createOutgoingHttpHeaders.js";
 import { App } from "./index.js";
 import { apply } from "../polyfill.js";
 class NodeApp extends App {
-  match(req) {
+  headersMap = void 0;
+  setHeadersMap(headers) {
+    this.headersMap = headers;
+  }
+  match(req, allowPrerenderedRoutes = false) {
     if (!(req instanceof Request)) {
       req = NodeApp.createRequest(req, {
         skipBody: true
       });
     }
-    return super.match(req);
+    return super.match(req, allowPrerenderedRoutes);
   }
   render(req, routeDataOrOptions, maybeLocals) {
     if (!(req instanceof Request)) {

package/dist/core/app/pipeline.js

@@ -66,7 +66,7 @@ class AppPipeline extends Pipeline {
       trailingSlash: this.manifest.trailingSlash,
       buildFormat: this.manifest.buildFormat,
       base: this.manifest.base,
-      outDir: this.manifest.outDir
+      outDir: this.serverLike ? this.manifest.buildClientDir : this.manifest.outDir
     });
     const componentInstance = await this.getComponentByRoute(routeData);
     return { newUrl, pathname, componentInstance, routeData };

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

@@ -110,4 +110,11 @@ export type SerializedSSRManifest = Omit<SSRManifest, 'middleware' | 'routes' |
     serverIslandNameMap: [string, string][];
     key: string;
 };
+export type NodeAppHeadersJson = {
+    pathname: string;
+    headers: {
+        key: string;
+        value: string;
+    }[];
+}[];
 export {};

package/dist/core/build/generate.js

@@ -146,7 +146,7 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline, routeToHea
     styles,
     mod: pageModule
   };
-  async function generatePathWithLogs(path, route, index, paths, isConcurrent) {
+  async function generatePathWithLogs(path, route, integrationRoute, index, paths, isConcurrent) {
     const timeStart = performance.now();
     pipeline.logger.debug("build", `Generating: ${path}`);
     const filePath = getOutputFilename(config, path, pageData.route);
@@ -154,7 +154,14 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline, routeToHea
     if (!isConcurrent) {
       logger.info(null, `  ${blue(lineIcon)} ${dim(filePath)}`, false);
     }
-    const created = await generatePath(path, pipeline, generationOptions, route, routeToHeaders);
+    const created = await generatePath(
+      path,
+      pipeline,
+      generationOptions,
+      route,
+      integrationRoute,
+      routeToHeaders
+    );
     const timeEnd = performance.now();
     const isSlow = timeEnd - timeStart > THRESHOLD_SLOW_RENDER_TIME_MS;
     const timeIncrease = (isSlow ? red : dim)(`(+${getTimeStat(timeStart, timeEnd)})`);
@@ -166,6 +173,7 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline, routeToHea
     }
   }
   for (const route of eachRouteInRouteData(pageData)) {
+    const integrationRoute = toIntegrationResolvedRoute(route);
     const icon = route.type === "page" || route.type === "redirect" || route.type === "fallback" ? green("\u25B6") : magenta("\u03BB");
     logger.info(null, `${icon} ${getPrettyRouteName(route)}`);
     const paths = await getPathsForRoute(route, pageModule, pipeline, builtPaths);
@@ -174,13 +182,15 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline, routeToHea
       const promises = [];
       for (let i = 0; i < paths.length; i++) {
         const path = paths[i];
-        promises.push(limit(() => generatePathWithLogs(path, route, i, paths, true)));
+        promises.push(
+          limit(() => generatePathWithLogs(path, route, integrationRoute, i, paths, true))
+        );
       }
       await Promise.all(promises);
     } else {
       for (let i = 0; i < paths.length; i++) {
         const path = paths[i];
-        await generatePathWithLogs(path, route, i, paths, false);
+        await generatePathWithLogs(path, route, integrationRoute, i, paths, false);
       }
     }
   }
@@ -291,7 +301,7 @@ function getUrlForPath(pathname, base, origin, format, trailingSlash, routeType)
   }
   return new URL(buildPathname, origin);
 }
-async function generatePath(pathname, pipeline, gopts, route, routeToHeaders) {
+async function generatePath(pathname, pipeline, gopts, route, integrationRoute, routeToHeaders) {
   const { mod } = gopts;
   const { config, logger, options } = pipeline;
   logger.debug("build", `Generating: ${pathname}`);
@@ -345,14 +355,12 @@ async function generatePath(pathname, pipeline, gopts, route, routeToHeaders) {
     }
     throw err;
   }
-  if (pipeline.settings.adapter?.adapterFeatures?.experimentalStaticHeaders && pipeline.settings.config.experimental?.csp) {
-    routeToHeaders.set(toIntegrationResolvedRoute(route), response.headers);
-  }
+  const responseHeaders = response.headers;
   if (response.status >= 300 && response.status < 400) {
     if (routeIsRedirect(route) && !config.build.redirects) {
       return void 0;
     }
-    const locationSite = getRedirectLocationOrThrow(response.headers);
+    const locationSite = getRedirectLocationOrThrow(responseHeaders);
     const siteURL = config.site;
     const location = siteURL ? new URL(locationSite, siteURL) : locationSite;
     const fromPath = new URL(request.url).pathname;
@@ -380,6 +388,9 @@ async function generatePath(pathname, pipeline, gopts, route, routeToHeaders) {
   } else {
     route.distURL = [outFile];
   }
+  if (pipeline.settings.adapter?.adapterFeatures?.experimentalStaticHeaders && pipeline.settings.config.experimental?.csp) {
+    routeToHeaders.set(pathname, { headers: responseHeaders, route: integrationRoute });
+  }
   await fs.promises.mkdir(outFolder, { recursive: true });
   await fs.promises.writeFile(outFile, body);
   return true;

package/dist/core/build/pipeline.js

@@ -202,7 +202,7 @@ class BuildPipeline extends Pipeline {
       trailingSlash: this.config.trailingSlash,
       buildFormat: this.config.build.format,
       base: this.config.base,
-      outDir: this.manifest.outDir
+      outDir: this.serverLike ? this.manifest.buildClientDir : this.manifest.outDir
     });
     const componentInstance = await this.getComponentByRoute(routeData);
     return { routeData, componentInstance, newUrl, pathname };

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

@@ -189,9 +189,13 @@ async function buildManifest(opts, internals, staticFiles, encodedKey) {
     });
     staticFiles.push(file);
   }
+  const needsStaticHeaders = settings.adapter?.adapterFeatures?.experimentalStaticHeaders ?? false;
   for (const route of opts.routesList.routes) {
     const pageData = internals.pagesByKeys.get(makePageDataKey(route.route, route.component));
-    if (route.prerender || !pageData) continue;
+    if (!pageData) continue;
+    if (route.prerender && !needsStaticHeaders) {
+      continue;
+    }
     const scripts = [];
     if (settings.scripts.some((script) => script.stage === "page")) {
       const src = entryModules[PAGE_SCRIPT_ID];

package/dist/core/constants.js

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

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.10.2";
+  const currentVersion = "5.11.0";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.js

@@ -37,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.10.2";
+  const version = "5.11.0";
   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.10.2"}`
+        `v${"5.11.0"}`
       )} ${headline}`
     );
   }

package/dist/core/render-context.js

@@ -253,7 +253,8 @@ class RenderContext {
       reroutePayload,
       this.request
     );
-    if (this.pipeline.serverLike && !this.routeData.prerender && routeData.prerender) {
+    const isI18nFallback = routeData.fallbackRoutes && routeData.fallbackRoutes.length > 0;
+    if (this.pipeline.serverLike && !this.routeData.prerender && routeData.prerender && !isI18nFallback) {
       throw new AstroError({
         ...ForbiddenRewrite,
         message: ForbiddenRewrite.message(this.pathname, pathname, routeData.component),

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

@@ -9,7 +9,7 @@ type FindRouteToRewrite = {
     trailingSlash: AstroConfig['trailingSlash'];
     buildFormat: AstroConfig['build']['format'];
     base: AstroConfig['base'];
-    outDir: AstroConfig['outDir'] | string;
+    outDir: URL | string;
 };
 interface FindRouteToRewriteResult {
     routeData: RouteData;

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 { IntegrationResolvedRoute, RouteOptions } from '../types/public/integrations.js';
+import type { IntegrationResolvedRoute, RouteOptions, RouteToHeaders } from '../types/public/integrations.js';
 import type { RouteData } from '../types/public/internal.js';
 export declare function getToolbarServerCommunicationHelpers(server: ViteDevServer): {
     /**
@@ -87,7 +87,7 @@ export declare function runHookBuildSsr({ config, manifest, logger, entryPoints,
 export declare function runHookBuildGenerated({ settings, logger, experimentalRouteToHeaders, }: {
     settings: AstroSettings;
     logger: Logger;
-    experimentalRouteToHeaders: Map<IntegrationResolvedRoute, Headers>;
+    experimentalRouteToHeaders: RouteToHeaders;
 }): Promise<void>;
 type RunHookBuildDone = {
     settings: AstroSettings;

package/dist/runtime/server/render/server-islands.d.ts

@@ -10,8 +10,15 @@ export declare class ServerIslandComponent {
     displayName: string;
     hostId: string | undefined;
     islandContent: string | undefined;
+    componentPath: string | undefined;
+    componentExport: string | undefined;
+    componentId: string | undefined;
     constructor(result: SSRResult, props: Record<string | number, any>, slots: ComponentSlots, displayName: string);
     init(): Promise<ThinHead>;
     render(destination: RenderDestination): Promise<void>;
+    getComponentPath(): string;
+    getComponentExport(): string;
+    getHostId(): Promise<string>;
+    getIslandContent(): Promise<string>;
 }
 export declare const renderServerIslandRuntime: () => string;

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

@@ -39,6 +39,9 @@ class ServerIslandComponent {
   displayName;
   hostId;
   islandContent;
+  componentPath;
+  componentExport;
+  componentId;
   constructor(result, props, slots, displayName) {
     this.result = result;
     this.props = props;
@@ -46,8 +49,64 @@ class ServerIslandComponent {
     this.displayName = displayName;
   }
   async init() {
+    const content = await this.getIslandContent();
+    if (this.result.cspDestination) {
+      this.result._metadata.extraScriptHashes.push(
+        await generateCspDigest(SERVER_ISLAND_REPLACER, this.result.cspAlgorithm)
+      );
+      const contentDigest = await generateCspDigest(content, this.result.cspAlgorithm);
+      this.result._metadata.extraScriptHashes.push(contentDigest);
+    }
+    return createThinHead();
+  }
+  async render(destination) {
+    const hostId = await this.getHostId();
+    const islandContent = await this.getIslandContent();
+    destination.write(createRenderInstruction({ type: "server-island-runtime" }));
+    destination.write("<!--[if astro]>server-island-start<![endif]-->");
+    for (const name in this.slots) {
+      if (name === "fallback") {
+        await renderChild(destination, this.slots.fallback(this.result));
+      }
+    }
+    destination.write(
+      `<script type="module" data-astro-rerun data-island-id="${hostId}">${islandContent}</script>`
+    );
+  }
+  getComponentPath() {
+    if (this.componentPath) {
+      return this.componentPath;
+    }
     const componentPath = this.props["server:component-path"];
+    if (!componentPath) {
+      throw new Error(`Could not find server component path`);
+    }
+    this.componentPath = componentPath;
+    return componentPath;
+  }
+  getComponentExport() {
+    if (this.componentExport) {
+      return this.componentExport;
+    }
     const componentExport = this.props["server:component-export"];
+    if (!componentExport) {
+      throw new Error(`Could not find server component export`);
+    }
+    this.componentExport = componentExport;
+    return componentExport;
+  }
+  async getHostId() {
+    if (!this.hostId) {
+      this.hostId = await crypto.randomUUID();
+    }
+    return this.hostId;
+  }
+  async getIslandContent() {
+    if (this.islandContent) {
+      return this.islandContent;
+    }
+    const componentPath = this.getComponentPath();
+    const componentExport = this.getComponentExport();
     const componentId = this.result.serverIslandNameMap.get(componentPath);
     if (!componentId) {
       throw new Error(`Could not find server component name`);
@@ -60,13 +119,13 @@ class ServerIslandComponent {
     const renderedSlots = {};
     for (const name in this.slots) {
       if (name !== "fallback") {
-        const content2 = await renderSlotToString(this.result, this.slots[name]);
-        renderedSlots[name] = content2.toString();
+        const content = await renderSlotToString(this.result, this.slots[name]);
+        renderedSlots[name] = content.toString();
       }
     }
     const key = await this.result.key;
     const propsEncrypted = Object.keys(this.props).length === 0 ? "" : await encryptString(key, JSON.stringify(this.props));
-    const hostId = crypto.randomUUID();
+    const hostId = await this.getHostId();
     const slash = this.result.base.endsWith("/") ? "" : "/";
     let serverIslandUrl = `${this.result.base}${slash}_server-islands/${componentId}${this.result.trailingSlash === "always" ? "/" : ""}`;
     const potentialSearchParams = createSearchParams(
@@ -98,29 +157,8 @@ let response = await fetch('${serverIslandUrl}', {
 	body: JSON.stringify(data),
 });`
     );
-    const content = `${method}replaceServerIsland('${hostId}', response);`;
-    if (this.result.cspDestination) {
-      this.result._metadata.extraScriptHashes.push(
-        await generateCspDigest(SERVER_ISLAND_REPLACER, this.result.cspAlgorithm)
-      );
-      const contentDigest = await generateCspDigest(content, this.result.cspAlgorithm);
-      this.result._metadata.extraScriptHashes.push(contentDigest);
-    }
-    this.islandContent = content;
-    this.hostId = hostId;
-    return createThinHead();
-  }
-  async render(destination) {
-    destination.write(createRenderInstruction({ type: "server-island-runtime" }));
-    destination.write("<!--[if astro]>server-island-start<![endif]-->");
-    for (const name in this.slots) {
-      if (name === "fallback") {
-        await renderChild(destination, this.slots.fallback(this.result));
-      }
-    }
-    destination.write(
-      `<script type="module" data-astro-rerun data-island-id="${this.hostId}">${this.islandContent}</script>`
-    );
+    this.islandContent = `${method}replaceServerIsland('${hostId}', response);`;
+    return this.islandContent;
   }
 }
 const renderServerIslandRuntime = () => {

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

@@ -3,7 +3,7 @@ export type { MarkdownHeading, RehypePlugins, RemarkPlugins, ShikiConfig, } from
 export type { ExternalImageService, ImageService, LocalImageService, } from '../../assets/services/service.js';
 export type { GetImageResult, ImageInputFormat, ImageMetadata, ImageOutputFormat, ImageQuality, ImageQualityPreset, ImageTransform, UnresolvedImageTransform, } from '../../assets/types.js';
 export type { ContainerRenderer } from '../../container/index.js';
-export type { AssetsPrefix, SSRManifest } from '../../core/app/types.js';
+export type { AssetsPrefix, NodeAppHeadersJson, SSRManifest } from '../../core/app/types.js';
 export type { AstroCookieGetOptions, AstroCookieSetOptions, AstroCookies, } from '../../core/cookies/index.js';
 export type { AstroIntegrationLogger } from '../../core/logger/core.js';
 export { AstroSession } from '../../core/session.js';

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

@@ -204,7 +204,7 @@ export interface BaseIntegrationHooks {
     'astro:build:generated': (options: {
         dir: URL;
         logger: AstroIntegrationLogger;
-        experimentalRouteToHeaders: Map<IntegrationResolvedRoute, Headers>;
+        experimentalRouteToHeaders: RouteToHeaders;
     }) => void | Promise<void>;
     'astro:build:done': (options: {
         pages: {
@@ -243,6 +243,11 @@ export type IntegrationRouteData = Omit<RouteData, 'isIndex' | 'fallbackRoutes'
      */
     redirectRoute?: IntegrationRouteData;
 };
+export type RouteToHeaders = Map<string, HeaderPayload>;
+export type HeaderPayload = {
+    headers: Headers;
+    route: IntegrationResolvedRoute;
+};
 export interface IntegrationResolvedRoute extends Pick<RouteData, 'generate' | 'params' | 'pathname' | 'segments' | 'type' | 'redirect' | 'origin'> {
     /**
      * {@link RouteData.route}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.10.2",
+  "version": "5.11.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -158,8 +158,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"