astro 6.0.8 → 6.1.0

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

@@ -204,8 +204,11 @@ export interface AstroPrerenderer {
     getStaticPaths: () => Promise<PathWithRoute[]>;
     /**
      * Renders a single page. Called by Astro for each path returned by getStaticPaths.
-     * @param request - The request to render
-     * @param options - Render options including routeData
+     * @param request - The request to render. The URL reflects the build format
+     *   (e.g. trailing slash for `directory` format). To get the canonical pathname,
+     *   use the `pathname` from the `PathWithRoute` entry returned by `getStaticPaths`.
+     * @param options - Render options
+     * @param options.routeData - The matched route for this path
      */
     render: (request: Request, options: {
         routeData: RouteData;
@@ -379,6 +382,10 @@ export interface IntegrationResolvedRoute extends Pick<RouteData, 'params' | 'pa
      * {@link RouteData.redirectRoute}
      */
     redirectRoute?: IntegrationResolvedRoute;
+    /**
+     * {@link RouteData.fallbackRoutes}
+     */
+    fallbackRoutes: IntegrationResolvedRoute[];
     /**
      * @param {any} data The optional parameters of the route
      *

package/dist/vite-plugin-app/app.d.ts

@@ -26,6 +26,11 @@ export declare class AstroServerApp extends BaseApp<RunnablePipeline> {
      * Called via HMR when content collection data changes.
      */
     clearRouteCache(): void;
+    /**
+     * Clears the cached middleware so it is re-resolved on the next request.
+     * Called via HMR when middleware files change.
+     */
+    clearMiddleware(): void;
     devMatch(pathname: string): Promise<DevMatch | undefined>;
     static create(manifest: SSRManifest, routesList: RoutesList, logger: Logger, loader: ModuleLoader, settings: AstroSettings, getDebugInfo: () => Promise<string>): Promise<AstroServerApp>;
     createPipeline(_streaming: boolean, manifest: SSRManifest, settings: AstroSettings, logger: Logger, loader: ModuleLoader, manifestData: RoutesList, getDebugInfo: () => Promise<string>): RunnablePipeline;

package/dist/vite-plugin-app/app.js

@@ -1,5 +1,6 @@
 import { removeTrailingForwardSlash } from "@astrojs/internal-helpers/path";
 import { BaseApp } from "../core/app/entrypoints/index.js";
+import { getFirstForwardedValue, validateForwardedHeaders } from "../core/app/validate-headers.js";
 import { shouldAppendForwardSlash } from "../core/build/util.js";
 import { clientLocalsSymbol } from "../core/constants.js";
 import {
@@ -48,6 +49,13 @@ class AstroServerApp extends BaseApp {
   clearRouteCache() {
     this.pipeline.clearRouteCache();
   }
+  /**
+   * Clears the cached middleware so it is re-resolved on the next request.
+   * Called via HMR when middleware files change.
+   */
+  clearMiddleware() {
+    this.pipeline.clearMiddleware();
+  }
   async devMatch(pathname) {
     const matchedRoute = await matchRoute(
       pathname,
@@ -86,7 +94,15 @@ class AstroServerApp extends BaseApp {
     incomingResponse,
     isHttps
   }) {
-    const origin = `${isHttps ? "https" : "http"}://${incomingRequest.headers[":authority"] ?? incomingRequest.headers.host}`;
+    const validated = validateForwardedHeaders(
+      getFirstForwardedValue(incomingRequest.headers["x-forwarded-proto"]),
+      getFirstForwardedValue(incomingRequest.headers["x-forwarded-host"]),
+      getFirstForwardedValue(incomingRequest.headers["x-forwarded-port"]),
+      this.manifest.allowedDomains
+    );
+    const protocol = validated.protocol ?? (isHttps ? "https" : "http");
+    const host = validated.host ?? incomingRequest.headers[":authority"] ?? incomingRequest.headers.host;
+    const origin = `${protocol}://${host}`;
     const url = new URL(origin + incomingRequest.url);
     let pathname;
     if (this.manifest.trailingSlash === "never" && !incomingRequest.url) {

package/dist/vite-plugin-app/createAstroServerApp.js

@@ -58,6 +58,10 @@ async function createAstroServerApp(controller, settings, loader, logger) {
       app.clearRouteCache();
       actualLogger.debug("router", "Route cache cleared due to content change");
     });
+    import.meta.hot.on("astro:middleware-updated", () => {
+      app.clearMiddleware();
+      actualLogger.debug("router", "Middleware cache cleared due to file change");
+    });
   }
   return {
     handler(incomingRequest, incomingResponse) {

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

@@ -211,7 +211,8 @@ async function createDevelopmentManifest(settings) {
     componentMetadata: /* @__PURE__ */ new Map(),
     inlinedScripts: /* @__PURE__ */ new Map(),
     i18n: i18nManifest,
-    checkOrigin: (settings.config.security?.checkOrigin && settings.buildOutput === "server") ?? false,
+    checkOrigin: settings.config.security?.checkOrigin ?? false,
+    allowedDomains: settings.config.security?.allowedDomains,
     actionBodySizeLimit: settings.config.security?.actionBodySizeLimit ? settings.config.security.actionBodySizeLimit : 1024 * 1024,
     // 1mb default
     serverIslandBodySizeLimit: settings.config.security?.serverIslandBodySizeLimit ? settings.config.security.serverIslandBodySizeLimit : 1024 * 1024,

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

@@ -1,9 +1,9 @@
 import npath from "node:path";
 import { isCSSRequest } from "vite";
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "../core/constants.js";
+import { isPropagatedAssetBoundary } from "../core/head-propagation/boundary.js";
 import { unwrapId } from "../core/util.js";
 import { hasSpecialQueries } from "../vite-plugin-utils/index.js";
-import { PROPAGATED_ASSET_QUERY_PARAM } from "../content/consts.js";
 const fileExtensionsToSSR = /* @__PURE__ */ new Set([".astro", ".mdoc", ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS]);
 const STRIP_QUERY_PARAMS_REGEX = /\?.*$/;
 async function* crawlGraph(environment, _id, isRootFile, scanned = /* @__PURE__ */ new Set()) {
@@ -35,7 +35,7 @@ async function* crawlGraph(environment, _id, isRootFile, scanned = /* @__PURE__
         if (!importedModule.id) continue;
         const importedModulePathname = importedModule.id.replace(STRIP_QUERY_PARAMS_REGEX, "");
         const isFileTypeNeedingSSR = fileExtensionsToSSR.has(npath.extname(importedModulePathname));
-        const isPropagationStoppingPoint = importedModule.id.includes(PROPAGATED_ASSET_QUERY_PARAM);
+        const isPropagationStoppingPoint = isPropagatedAssetBoundary(importedModule.id);
         if (isFileTypeNeedingSSR && // Should not SSR a module with ?astroPropagatedAssets
         !isPropagationStoppingPoint) {
           const mod = environment.moduleGraph.getModuleById(importedModule.id);

package/dist/vite-plugin-head/index.js

@@ -1,23 +1,49 @@
-import { getParentModuleInfos, getTopLevelPageModuleInfos } from "../core/build/graph.js";
+import { hasHeadInjectComment } from "../core/head-propagation/comment.js";
+import {
+  buildImporterGraphFromModuleInfo,
+  computeInTreeAncestors
+} from "../core/head-propagation/graph.js";
+import { getTopLevelPageModuleInfos } from "../core/build/graph.js";
 import { getAstroMetadata } from "../vite-plugin-astro/index.js";
 import { ASTRO_VITE_ENVIRONMENT_NAMES } from "../core/constants.js";
-const injectExp = /(?:^\/\/|\/\/!)\s*astro-head-inject/;
 function configHeadVitePlugin() {
   let environment;
-  function propagateMetadata(id, prop, value, seen = /* @__PURE__ */ new Set()) {
-    if (seen.has(id)) return;
-    seen.add(id);
-    const mod = environment.moduleGraph.getModuleById(id);
-    const info = this.getModuleInfo(id);
-    if (info?.meta.astro) {
-      const astroMetadata = getAstroMetadata(info);
-      if (astroMetadata) {
-        Reflect.set(astroMetadata, prop, value);
+  function buildImporterGraphFromEnvironment(seed) {
+    const queue = [seed];
+    const collected = /* @__PURE__ */ new Set();
+    while (queue.length > 0) {
+      const current = queue.pop();
+      if (collected.has(current)) continue;
+      collected.add(current);
+      const mod = environment.moduleGraph.getModuleById(current);
+      for (const importer of mod?.importers ?? []) {
+        if (importer.id) {
+          queue.push(importer.id);
+        }
       }
     }
-    for (const parent of mod?.importers || []) {
-      if (parent.id) {
-        propagateMetadata.call(this, parent.id, prop, value, seen);
+    return buildImporterGraphFromModuleInfo(collected, (id) => {
+      const mod = environment.moduleGraph.getModuleById(id);
+      if (!mod) return null;
+      return {
+        importers: Array.from(mod.importers).map((importer) => importer.id).filter((moduleId) => !!moduleId),
+        dynamicImporters: []
+      };
+    });
+  }
+  function propagateMetadata(seed, prop, value) {
+    const importerGraph = buildImporterGraphFromEnvironment(seed);
+    const allAncestors = computeInTreeAncestors({
+      seeds: [seed],
+      importerGraph
+    });
+    for (const id of allAncestors) {
+      const info = this.getModuleInfo(id);
+      if (info?.meta.astro) {
+        const astroMetadata = getAstroMetadata(info);
+        if (astroMetadata) {
+          Reflect.set(astroMetadata, prop, value);
+        }
       }
     }
   }
@@ -52,7 +78,7 @@ function configHeadVitePlugin() {
       if (info && getAstroMetadata(info)?.containsHead) {
         propagateMetadata.call(this, id, "containsHead", true);
       }
-      if (injectExp.test(source)) {
+      if (hasHeadInjectComment(source)) {
         propagateMetadata.call(this, id, "propagation", "in-tree");
       }
     }
@@ -66,6 +92,9 @@ function astroHeadBuildPlugin(internals) {
     },
     generateBundle(_opts, bundle) {
       const map = internals.componentMetadata;
+      const moduleIds = /* @__PURE__ */ new Set();
+      const selfPropagationSeeds = /* @__PURE__ */ new Set();
+      const commentPropagationSeeds = /* @__PURE__ */ new Set();
       function getOrCreateMetadata(id) {
         if (map.has(id)) return map.get(id);
         const metadata = {
@@ -78,6 +107,7 @@ function astroHeadBuildPlugin(internals) {
       for (const [, output] of Object.entries(bundle)) {
         if (output.type !== "chunk") continue;
         for (const [id, mod] of Object.entries(output.modules)) {
+          moduleIds.add(id);
           const modinfo = this.getModuleInfo(id);
           if (modinfo) {
             const meta = getAstroMetadata(modinfo);
@@ -88,21 +118,29 @@ function astroHeadBuildPlugin(internals) {
               }
             }
             if (meta?.propagation === "self") {
-              for (const info of getParentModuleInfos(id, this)) {
-                let metadata = getOrCreateMetadata(info.id);
-                if (metadata.propagation !== "self") {
-                  metadata.propagation = "in-tree";
-                }
-              }
+              selfPropagationSeeds.add(id);
             }
           }
-          if (mod.code && injectExp.test(mod.code)) {
-            for (const info of getParentModuleInfos(id, this)) {
-              getOrCreateMetadata(info.id).propagation = "in-tree";
-            }
+          if (mod.code && hasHeadInjectComment(mod.code)) {
+            commentPropagationSeeds.add(id);
           }
         }
       }
+      const importerGraph = buildImporterGraphFromModuleInfo(
+        moduleIds,
+        (id) => this.getModuleInfo(id)
+      );
+      const allPropagationSeeds = /* @__PURE__ */ new Set([...selfPropagationSeeds, ...commentPropagationSeeds]);
+      const allAncestors = computeInTreeAncestors({
+        seeds: allPropagationSeeds,
+        importerGraph
+      });
+      for (const id of allAncestors) {
+        const metadata = getOrCreateMetadata(id);
+        if (metadata.propagation !== "self") {
+          metadata.propagation = "in-tree";
+        }
+      }
     }
   };
 }

package/dist/vite-plugin-scripts/index.js

@@ -4,8 +4,12 @@ const BEFORE_HYDRATION_SCRIPT_ID = `${SCRIPT_ID_PREFIX}${"before-hydration"}.js`
 const PAGE_SCRIPT_ID = `${SCRIPT_ID_PREFIX}${"page"}.js`;
 const PAGE_SSR_SCRIPT_ID = `${SCRIPT_ID_PREFIX}${"page-ssr"}.js`;
 function astroScriptsPlugin({ settings }) {
+  let command;
   return {
     name: "astro:scripts",
+    config(_, env) {
+      command = env.command;
+    },
     resolveId: {
       filter: {
         id: new RegExp(`^${SCRIPT_ID_PREFIX}`)
@@ -37,6 +41,7 @@ function astroScriptsPlugin({ settings }) {
       }
     },
     buildStart() {
+      if (command === "serve") return;
       const hasHydrationScripts = settings.scripts.some((s) => s.stage === "before-hydration");
       if (hasHydrationScripts && (this.environment.name === ASTRO_VITE_ENVIRONMENT_NAMES.client || this.environment.name === ASTRO_VITE_ENVIRONMENT_NAMES.prerender || this.environment.name === ASTRO_VITE_ENVIRONMENT_NAMES.ssr)) {
         this.emitFile({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "6.0.8",
+  "version": "6.1.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -101,9 +101,9 @@
     "README.md"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^3.0.0",
+    "@astrojs/compiler": "^3.0.1",
     "@capsizecss/unpack": "^4.0.0",
-    "@clack/prompts": "^1.0.1",
+    "@clack/prompts": "^1.1.0",
     "@oslojs/encoding": "^1.1.0",
     "@rollup/pluginutils": "^5.3.0",
     "aria-query": "^5.3.2",
@@ -136,11 +136,11 @@
     "picomatch": "^4.0.3",
     "rehype": "^13.0.2",
     "semver": "^7.7.4",
-    "shiki": "^4.0.0",
+    "shiki": "^4.0.2",
     "smol-toml": "^1.6.0",
-    "svgo": "^4.0.0",
-    "tinyclip": "^0.1.6",
-    "tinyexec": "^1.0.2",
+    "svgo": "^4.0.1",
+    "tinyclip": "^0.1.12",
+    "tinyexec": "^1.0.4",
     "tinyglobby": "^0.2.15",
     "tsconfck": "^3.1.6",
     "ultrahtml": "^1.6.0",
@@ -154,14 +154,14 @@
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
     "@astrojs/internal-helpers": "0.8.0",
-    "@astrojs/markdown-remark": "7.0.1",
+    "@astrojs/markdown-remark": "7.1.0",
     "@astrojs/telemetry": "3.3.0"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0"
   },
   "devDependencies": {
-    "@astrojs/compiler-rs": "^0.1.4",
+    "@astrojs/compiler-rs": "^0.1.6",
     "@playwright/test": "1.58.2",
     "@types/aria-query": "^5.0.4",
     "@types/dlv": "^1.1.5",
@@ -185,11 +185,11 @@
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
     "rollup": "^4.58.0",
-    "sass": "^1.97.3",
+    "sass": "^1.98.0",
     "typescript": "^5.9.3",
     "undici": "^7.22.0",
     "unified": "^11.0.5",
-    "vitest": "^3.2.4",
+    "vitest": "^4.1.0",
     "@astrojs/check": "0.9.8",
     "astro-scripts": "0.0.14"
   },