astro 5.1.6 → 5.1.8

package/dist/actions/integration.js

@@ -27,7 +27,7 @@ function astroIntegrationActionsRouteHandler({
           throw error;
         }
         const stringifiedActionsImport = JSON.stringify(
-          viteID(new URL("./actions/index.ts", params.config.srcDir))
+          viteID(new URL("./actions", params.config.srcDir))
         );
         settings.injectedTypes.push({
           filename: ACTIONS_TYPES_FILE,

package/dist/assets/layout.js

@@ -84,10 +84,14 @@ const getSizesAttribute = ({
     return void 0;
   }
   switch (layout) {
+    // If screen is wider than the max size then image width is the max size,
+    // otherwise it's the width of the screen
     case `responsive`:
       return `(min-width: ${width}px) ${width}px, 100vw`;
+    // Image is always the same width, whatever the size of the screen
     case `fixed`:
       return `${width}px`;
+    // Image is always the width of the screen
     case `full-width`:
       return `100vw`;
     case "none":

package/dist/cli/add/index.js

@@ -307,6 +307,8 @@ async function add(names, { flags }) {
       logger.info("SKIP_FORMAT", msg.success(`Configuration up-to-date.`));
       break;
     }
+    // NOTE: failure shouldn't happen in practice because `updateAstroConfig` doesn't return that.
+    // Pipe this to the same handling as `UpdateResult.updated` for now.
     case 3 /* failure */:
     case 1 /* updated */:
     case void 0: {

package/dist/content/content-layer.js

@@ -15,6 +15,7 @@ import {
   globalContentConfigObserver,
   safeStringify
 } from "./utils.js";
+import { createWatcherWrapper } from "./watcher.js";
 class ContentLayer {
   #logger;
   #store;
@@ -29,7 +30,9 @@ class ContentLayer {
     this.#logger = logger;
     this.#store = store;
     this.#settings = settings;
-    this.#watcher = watcher;
+    if (watcher) {
+      this.#watcher = createWatcherWrapper(watcher);
+    }
     this.#queue = new PQueue({ concurrency: 1 });
   }
   /**
@@ -55,6 +58,7 @@ class ContentLayer {
   dispose() {
     this.#queue.clear();
     this.#unsubscribe?.();
+    this.#watcher?.removeAllTrackedListeners();
   }
   async #getGenerateDigest() {
     if (this.#generateDigest) {
@@ -148,7 +152,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "5.1.6") {
+    if (previousAstroVersion && previousAstroVersion !== "5.1.8") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -156,8 +160,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.1.6") {
-      await this.#store.metaStore().set("astro-version", "5.1.6");
+    if ("5.1.8") {
+      await this.#store.metaStore().set("astro-version", "5.1.8");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);
@@ -165,6 +169,9 @@ ${contentConfig.error.message}`);
     if (astroConfigDigest) {
       await this.#store.metaStore().set("astro-config-digest", astroConfigDigest);
     }
+    if (!options?.loaders?.length) {
+      this.#watcher?.removeAllTrackedListeners();
+    }
     await Promise.all(
       Object.entries(contentConfig.config.collections).map(async ([name, collection]) => {
         if (collection.type !== CONTENT_LAYER_TYPE) {

package/dist/content/loaders/file.js

@@ -71,6 +71,7 @@ function file(fileName, options) {
       }
       const filePath = fileURLToPath(url);
       await syncData(filePath, context);
+      watcher?.add(filePath);
       watcher?.on("change", async (changedPath) => {
         if (changedPath === filePath) {
           logger.info(`Reloading data from ${fileName}`);

package/dist/content/loaders/glob.js

@@ -219,6 +219,7 @@ function glob(globOptions) {
       if (!watcher) {
         return;
       }
+      watcher.add(filePath);
       const matchesGlob = (entry) => !entry.startsWith("../") && micromatch.isMatch(entry, globOptions.pattern);
       const basePath = fileURLToPath(baseDir);
       async function onChange(changedPath) {

package/dist/content/runtime.js

@@ -468,7 +468,6 @@ This is an Astro bug, so please file an issue at https://github.com/withastro/as
           return;
         }
         const flattenedErrorPath = ctx.path.join(".");
-        const collectionIsInStore = store.hasCollection(collection);
         if (typeof lookup === "object") {
           if (lookup.collection !== collection) {
             ctx.addIssue({
@@ -479,18 +478,7 @@ This is an Astro bug, so please file an issue at https://github.com/withastro/as
           }
           return lookup;
         }
-        if (collectionIsInStore) {
-          const entry2 = store.get(collection, lookup);
-          if (!entry2) {
-            ctx.addIssue({
-              code: ZodIssueCode.custom,
-              message: `**${flattenedErrorPath}**: Reference to ${collection} invalid. Entry ${lookup} does not exist.`
-            });
-            return;
-          }
-          return { id: lookup, collection };
-        }
-        if (!lookupMap[collection] && store.collections().size <= 1) {
+        if (!lookupMap[collection]) {
           return { id: lookup, collection };
         }
         const { type, entries } = lookupMap[collection];

package/dist/content/server-listeners.js

@@ -13,14 +13,7 @@ async function attachContentServerListeners({
 }) {
   const contentPaths = getContentPaths(settings.config, fs);
   if (!settings.config.legacy?.collections) {
-    const contentGenerator = await createContentTypesGenerator({
-      fs,
-      settings,
-      logger,
-      viteServer,
-      contentConfigObserver: globalContentConfigObserver
-    });
-    await contentGenerator.init();
+    await attachListeners();
   } else if (fs.existsSync(contentPaths.contentDir)) {
     logger.debug(
       "content",
@@ -58,10 +51,9 @@ async function attachContentServerListeners({
       "addDir",
       (entry) => contentGenerator.queueEvent({ name: "addDir", entry })
     );
-    viteServer.watcher.on(
-      "change",
-      (entry) => contentGenerator.queueEvent({ name: "change", entry })
-    );
+    viteServer.watcher.on("change", (entry) => {
+      contentGenerator.queueEvent({ name: "change", entry });
+    });
     viteServer.watcher.on("unlink", (entry) => {
       contentGenerator.queueEvent({ name: "unlink", entry });
     });

package/dist/content/types-generator.js

@@ -226,7 +226,13 @@ async function createContentTypesGenerator({
       entry: pathToFileURL(rawEvent.entry),
       name: rawEvent.name
     };
-    if (!event.entry.pathname.startsWith(contentPaths.contentDir.pathname)) return;
+    if (settings.config.legacy.collections) {
+      if (!event.entry.pathname.startsWith(contentPaths.contentDir.pathname)) {
+        return;
+      }
+    } else if (contentPaths.config.url.pathname !== event.entry.pathname) {
+      return;
+    }
     events.push(event);
     debounceTimeout && clearTimeout(debounceTimeout);
     const runEventsSafe = async () => {

package/dist/content/watcher.d.ts

@@ -0,0 +1,5 @@
+import type { FSWatcher } from 'vite';
+export type WrappedWatcher = FSWatcher & {
+    removeAllTrackedListeners(): void;
+};
+export declare function createWatcherWrapper(watcher: FSWatcher): WrappedWatcher;

package/dist/content/watcher.js

@@ -0,0 +1,38 @@
+function createWatcherWrapper(watcher) {
+  const listeners = /* @__PURE__ */ new Map();
+  const handler = {
+    get(target, prop, receiver) {
+      if (prop === "on") {
+        return function(event, callback) {
+          if (!listeners.has(event)) {
+            listeners.set(event, /* @__PURE__ */ new Set());
+          }
+          listeners.get(event).add(callback);
+          return Reflect.get(target, prop, receiver).call(target, event, callback);
+        };
+      }
+      if (prop === "off") {
+        return function(event, callback) {
+          listeners.get(event)?.delete(callback);
+          return Reflect.get(target, prop, receiver).call(target, event, callback);
+        };
+      }
+      if (prop === "removeAllTrackedListeners") {
+        return function() {
+          for (const [event, callbacks] of listeners.entries()) {
+            for (const callback of callbacks) {
+              target.off(event, callback);
+            }
+            callbacks.clear();
+          }
+          listeners.clear();
+        };
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  };
+  return new Proxy(watcher, handler);
+}
+export {
+  createWatcherWrapper
+};

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.1.6";
+const ASTRO_VERSION = "5.1.8";
 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/container.js

@@ -57,19 +57,20 @@ async function createContainer({
       ssrManifest: devSSRManifest
     }
   );
+  const viteServer = await vite.createServer(viteConfig);
   await syncInternal({
     settings,
     mode,
     logger,
     skip: {
-      content: true,
+      content: !isRestart,
       cleanup: true
     },
     force: inlineConfig?.force,
     manifest,
-    command: "dev"
+    command: "dev",
+    watcher: viteServer.watcher
   });
-  const viteServer = await vite.createServer(viteConfig);
   const container = {
     inlineConfig: inlineConfig ?? {},
     fs,

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

package/dist/core/dev/restart.js

@@ -1,6 +1,7 @@
 import { fileURLToPath } from "node:url";
 import * as vite from "vite";
 import { globalContentLayer } from "../../content/content-layer.js";
+import { attachContentServerListeners } from "../../content/server-listeners.js";
 import { eventCliSession, telemetry } from "../../events/index.js";
 import { SETTINGS_FILE } from "../../preferences/constants.js";
 import { createNodeLogger, createSettings, resolveConfig } from "../config/index.js";
@@ -101,6 +102,7 @@ async function createContainerWithAutomaticRestart({
     } else {
       restart.container = result;
       setupContainer();
+      await attachContentServerListeners(restart.container);
       if (server) {
         server.resolvedUrls = result.viteServer.resolvedUrls;
       }

package/dist/core/messages.js

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

package/dist/core/routing/3xx.d.ts

@@ -1,5 +1,5 @@
 export type RedirectTemplate = {
-    from: string;
+    from?: string;
     location: string | URL;
     status: number;
 };

package/dist/core/routing/3xx.js

@@ -6,7 +6,7 @@ function redirectTemplate({ status, location, from }) {
 <meta name="robots" content="noindex">
 <link rel="canonical" href="${location}">
 <body>
-	<a href="${location}">Redirecting from <code>${from}</code> to <code>${location}</code></a>
+	<a href="${location}">Redirecting ${from ? `from <code>${from}</code> ` : ""}to <code>${location}</code></a>
 </body>`;
 }
 export {

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

@@ -483,6 +483,8 @@ async function createRouteManifest(params, logger, { dev = false } = {}) {
   }
   if (dev || settings.buildOutput === "server") {
     injectImageEndpoint(settings, { routes }, dev ? "dev" : "build");
+  }
+  if (dev || settings.config.adapter) {
     injectServerIslandRoute(settings.config, { routes });
   }
   await runHookRoutesResolved({ routes, settings, logger });

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

@@ -4,6 +4,8 @@ import type { RouteData } from '../../types/public/internal.js';
 export declare function matchRoute(pathname: string, manifest: ManifestData): RouteData | undefined;
 /** Finds all matching routes from pathname */
 export declare function matchAllRoutes(pathname: string, manifest: ManifestData): RouteData[];
+export declare function isRoute404(route: string): boolean;
+export declare function isRoute500(route: string): boolean;
 /**
  * Determines if the given route matches a 404 or 500 error page.
  *

package/dist/core/routing/match.js

@@ -7,11 +7,21 @@ function matchRoute(pathname, manifest) {
 function matchAllRoutes(pathname, manifest) {
   return manifest.routes.filter((route) => route.pattern.test(decodeURI(pathname)));
 }
+const ROUTE404_RE = /^\/404\/?$/;
+const ROUTE500_RE = /^\/500\/?$/;
+function isRoute404(route) {
+  return ROUTE404_RE.test(route);
+}
+function isRoute500(route) {
+  return ROUTE500_RE.test(route);
+}
 function isRoute404or500(route) {
-  return route.pattern.test("/404") || route.pattern.test("/500");
+  return isRoute404(route.route) || isRoute500(route.route);
 }
 export {
+  isRoute404,
   isRoute404or500,
+  isRoute500,
   matchAllRoutes,
   matchRoute
 };

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

@@ -1,4 +1,5 @@
 import fsMod from 'node:fs';
+import { type FSWatcher } from 'vite';
 import type { AstroSettings, ManifestData } from '../../types/astro.js';
 import type { AstroInlineConfig } from '../../types/public/config.js';
 import type { Logger } from '../logger/core.js';
@@ -13,6 +14,7 @@ export type SyncOptions = {
     };
     manifest: ManifestData;
     command: 'build' | 'dev' | 'sync';
+    watcher?: FSWatcher;
 };
 export default function sync(inlineConfig: AstroInlineConfig, { fs, telemetry: _telemetry }?: {
     fs?: typeof fsMod;
@@ -33,4 +35,4 @@ export declare function clearContentLayerCache({ settings, logger, fs, isDev, }:
  *
  * @experimental The JavaScript API is experimental
  */
-export declare function syncInternal({ mode, logger, fs, settings, skip, force, manifest, command, }: SyncOptions): Promise<void>;
+export declare function syncInternal({ mode, logger, fs, settings, skip, force, manifest, command, watcher, }: SyncOptions): Promise<void>;

package/dist/core/sync/index.js

@@ -74,7 +74,8 @@ async function syncInternal({
   skip,
   force,
   manifest,
-  command
+  command,
+  watcher
 }) {
   const isDev = command === "dev";
   if (force) {
@@ -98,8 +99,12 @@ async function syncInternal({
     const contentLayer = globalContentLayer.init({
       settings,
       logger,
-      store
+      store,
+      watcher
     });
+    if (watcher) {
+      contentLayer.watchContentConfig();
+    }
     await contentLayer.sync();
     if (!skip?.cleanup) {
       contentLayer.dispose();

package/dist/env/vite-plugin-import-meta-env.js

@@ -1,5 +1,6 @@
 import { transform } from "esbuild";
 import MagicString from "magic-string";
+import { createFilter, isCSSRequest } from "vite";
 const importMetaEnvOnlyRe = /\bimport\.meta\.env\b(?!\.)/;
 function getReferencedPrivateKeys(source, privateEnv) {
   const references = /* @__PURE__ */ new Set();
@@ -43,6 +44,7 @@ function importMetaEnv({ envLoader }) {
   let isDev;
   let devImportMetaEnvPrepend;
   let viteConfig;
+  const filter = createFilter(null, ["**/*.html", "**/*.htm", "**/*.json"]);
   return {
     name: "astro:vite-plugin-env",
     config(_, { command }) {
@@ -65,7 +67,7 @@ function importMetaEnv({ envLoader }) {
       }
     },
     transform(source, id, options) {
-      if (!options?.ssr || !source.includes("import.meta.env")) {
+      if (!options?.ssr || !source.includes("import.meta.env") || !filter(id) || isCSSRequest(id) || viteConfig.assetsInclude(id)) {
         return;
       }
       privateEnv ??= envLoader.getPrivateEnv();

package/dist/i18n/index.js

@@ -3,6 +3,7 @@ import { shouldAppendForwardSlash } from "../core/build/util.js";
 import { REROUTE_DIRECTIVE_HEADER } from "../core/constants.js";
 import { MissingLocale, i18nNoLocaleFoundInPath } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/index.js";
+import { isRoute404, isRoute500 } from "../core/routing/match.js";
 import { createI18nMiddleware } from "./middleware.js";
 function requestHasLocale(locales) {
   return function(context) {
@@ -11,7 +12,8 @@ function requestHasLocale(locales) {
 }
 function requestIs404Or500(request, base = "") {
   const url = new URL(request.url);
-  return url.pathname.startsWith(`${base}/404`) || url.pathname.startsWith(`${base}/500`);
+  const pathname = url.pathname.slice(base.length);
+  return isRoute404(pathname) || isRoute500(pathname);
 }
 function pathHasLocale(path, locales) {
   const segments = path.split("/");

package/dist/i18n/middleware.js

@@ -60,6 +60,7 @@ function createI18nMiddleware(i18n, base, trailingSlash, format) {
     }
     const { currentLocale } = context;
     switch (i18n.strategy) {
+      // NOTE: theoretically, we should never hit this code path
       case "manual": {
         return response;
       }

package/dist/jsx/rehype.js

@@ -111,14 +111,17 @@ function findMatchingImport(tagName, imports) {
       if (local === tagSpecifier) {
         if (tagSpecifier !== tagName) {
           switch (imported) {
+            // Namespace import: "<buttons.Foo.Bar />" => name: "Foo.Bar"
             case "*": {
               const accessPath = tagName.slice(tagSpecifier.length + 1);
               return { name: accessPath, path: source };
             }
+            // Default import: "<buttons.Foo.Bar />" => name: "default.Foo.Bar"
             case "default": {
               const accessPath = tagName.slice(tagSpecifier.length + 1);
               return { name: `default.${accessPath}`, path: source };
             }
+            // Named import: "<buttons.Foo.Bar />" => name: "buttons.Foo.Bar"
             default: {
               return { name: tagName, path: source };
             }

package/dist/runtime/client/dev-toolbar/apps/audit/rules/perf.js

@@ -23,7 +23,12 @@ const perf = [
     selector: 'img:not([loading]), img[loading="eager"], iframe:not([loading]), iframe[loading="eager"]',
     match(element) {
       const htmlElement = element;
-      const elementYPosition = htmlElement.getBoundingClientRect().y + window.scrollY;
+      let currentElement = element;
+      let elementYPosition = 0;
+      while (currentElement) {
+        elementYPosition += currentElement.offsetTop;
+        currentElement = currentElement.offsetParent;
+      }
       if (elementYPosition < window.innerHeight) return false;
       if (htmlElement.src.startsWith("data:")) return false;
       return true;
@@ -36,7 +41,12 @@ const perf = [
     selector: 'img[loading="lazy"], iframe[loading="lazy"]',
     match(element) {
       const htmlElement = element;
-      const elementYPosition = htmlElement.getBoundingClientRect().y + window.scrollY;
+      let currentElement = element;
+      let elementYPosition = 0;
+      while (currentElement) {
+        elementYPosition += currentElement.offsetTop;
+        currentElement = currentElement.offsetParent;
+      }
       if (elementYPosition > window.innerHeight) return false;
       if (htmlElement.src.startsWith("data:")) return false;
       return true;

package/dist/runtime/server/hydration.js

@@ -37,6 +37,8 @@ function extractDirectives(inputProps, clientDirectives) {
           extracted.hydration.componentExport.value = value;
           break;
         }
+        // This is a special prop added to prove that the client hydration method
+        // was added statically.
         case "client:component-hydration": {
           break;
         }

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

@@ -79,7 +79,7 @@ export type PaginateFunction = <PaginateData, AdditionalPaginateProps extends Pr
         page: Page<PaginateData>;
     } & OmitIndexSignature<AdditionalPaginateProps>>;
 }[];
-export type APIRoute<Props extends Record<string, any> = Record<string, any>, APIParams extends Record<string, string | undefined> = Record<string, string | undefined>> = (context: APIContext<Props, APIParams>) => Response | Promise<Response>;
+export type APIRoute<APIProps extends Record<string, any> = Record<string, any>, APIParams extends Record<string, string | undefined> = Record<string, string | undefined>> = (context: APIContext<APIProps, APIParams>) => Response | Promise<Response>;
 export type RewritePayload = string | URL | Request;
 export type MiddlewareNext = (rewritePayload?: RewritePayload) => Promise<Response>;
 export type MiddlewareHandler = (context: APIContext, next: MiddlewareNext) => Promise<Response> | Response | Promise<void> | void;

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

@@ -3,7 +3,8 @@ import path from "node:path";
 import { appendForwardSlash } from "@astrojs/internal-helpers/path";
 import { bold } from "kleur/colors";
 import notFoundTemplate, { subpathNotUsedTemplate } from "../template/4xx.js";
-import { writeHtmlResponse } from "./response.js";
+import { writeHtmlResponse, writeRedirectResponse } from "./response.js";
+const manySlashes = /\/{2,}$/;
 function baseMiddleware(settings, logger) {
   const { config } = settings;
   const site = config.site ? new URL(config.base, config.site) : void 0;
@@ -12,6 +13,10 @@ function baseMiddleware(settings, logger) {
   const devRootReplacement = devRoot.endsWith("/") ? "/" : "";
   return function devBaseMiddleware(req, res, next) {
     const url = req.url;
+    if (manySlashes.test(url)) {
+      const destination = url.replace(manySlashes, "/");
+      return writeRedirectResponse(res, 301, destination);
+    }
     let pathname;
     try {
       pathname = decodeURI(new URL(url, "http://localhost").pathname);

package/dist/vite-plugin-astro-server/response.d.ts

@@ -4,5 +4,6 @@ import type { ModuleLoader } from '../core/module-loader/index.js';
 export declare function handle404Response(origin: string, req: http.IncomingMessage, res: http.ServerResponse): Promise<void>;
 export declare function handle500Response(loader: ModuleLoader, res: http.ServerResponse, err: ErrorWithMetadata): Promise<void>;
 export declare function writeHtmlResponse(res: http.ServerResponse, statusCode: number, html: string): void;
+export declare function writeRedirectResponse(res: http.ServerResponse, statusCode: number, location: string): void;
 export declare function writeWebResponse(res: http.ServerResponse, webResponse: Response): Promise<void>;
 export declare function writeSSRResult(webRequest: Request, webResponse: Response, res: http.ServerResponse): Promise<void>;

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

@@ -2,6 +2,7 @@ import { Http2ServerResponse } from "node:http2";
 import { Readable } from "node:stream";
 import { getSetCookiesFromResponse } from "../core/cookies/index.js";
 import { getViteErrorPayload } from "../core/errors/dev/index.js";
+import { redirectTemplate } from "../core/routing/3xx.js";
 import notFoundTemplate from "../template/4xx.js";
 async function handle404Response(origin, req, res) {
   const pathname = decodeURI(new URL(origin + req.url).pathname);
@@ -37,6 +38,16 @@ function writeHtmlResponse(res, statusCode, html) {
   res.write(html);
   res.end();
 }
+function writeRedirectResponse(res, statusCode, location) {
+  const html = redirectTemplate({ status: statusCode, location });
+  res.writeHead(statusCode, {
+    Location: location,
+    "Content-Type": "text/html",
+    "Content-Length": Buffer.byteLength(html, "utf-8")
+  });
+  res.write(html);
+  res.end();
+}
 async function writeWebResponse(res, webResponse) {
   const { status, headers, body, statusText } = webResponse;
   const setCookieHeaders = Array.from(getSetCookiesFromResponse(webResponse));
@@ -87,6 +98,7 @@ export {
   handle404Response,
   handle500Response,
   writeHtmlResponse,
+  writeRedirectResponse,
   writeSSRResult,
   writeWebResponse
 };

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

@@ -14,6 +14,7 @@ import { getProps } from "../core/render/index.js";
 import { createRequest } from "../core/request.js";
 import { redirectTemplate } from "../core/routing/3xx.js";
 import { matchAllRoutes } from "../core/routing/index.js";
+import { isRoute404, isRoute500 } from "../core/routing/match.js";
 import { PERSIST_SYMBOL } from "../core/session.js";
 import { getSortedPreloadedMatches } from "../prerender/routing.js";
 import { writeSSRResult, writeWebResponse } from "./response.js";
@@ -21,12 +22,10 @@ function isLoggedRequest(url) {
   return url !== "/favicon.ico";
 }
 function getCustom404Route(manifestData) {
-  const route404 = /^\/404\/?$/;
-  return manifestData.routes.find((r) => route404.test(r.route));
+  return manifestData.routes.find((r) => isRoute404(r.route));
 }
 function getCustom500Route(manifestData) {
-  const route500 = /^\/500\/?$/;
-  return manifestData.routes.find((r) => route500.test(r.route));
+  return manifestData.routes.find((r) => isRoute500(r.route));
 }
 async function matchRoute(pathname, manifestData, pipeline) {
   const { config, logger, routeCache, serverLike, settings } = pipeline;
@@ -175,7 +174,9 @@ async function handleRoute({
       })
     );
   }
-  if (statusCode === 404 && response.headers.get(REROUTE_DIRECTIVE_HEADER) !== "no") {
+  if (statusCode === 404 && // If the body isn't null, that means the user sets the 404 status
+  // but uses the current route to handle the 404
+  response.body === null && response.headers.get(REROUTE_DIRECTIVE_HEADER) !== "no") {
     const fourOhFourRoute = await matchRoute("/404", manifestData, pipeline);
     if (fourOhFourRoute) {
       renderContext = await RenderContext.create({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.1.6",
+  "version": "5.1.8",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -105,7 +105,7 @@
   "dependencies": {
     "@astrojs/compiler": "^2.10.3",
     "@oslojs/encoding": "^1.1.0",
-    "@rollup/pluginutils": "^5.1.3",
+    "@rollup/pluginutils": "^5.1.4",
     "@types/cookie": "^0.6.0",
     "acorn": "^8.14.0",
     "aria-query": "^5.3.2",
@@ -116,51 +116,51 @@
     "common-ancestor-path": "^1.0.1",
     "cookie": "^0.7.2",
     "cssesc": "^3.0.0",
-    "debug": "^4.3.7",
+    "debug": "^4.4.0",
     "deterministic-object-hash": "^2.0.2",
     "devalue": "^5.1.1",
     "diff": "^5.2.0",
     "dlv": "^1.1.3",
     "dset": "^3.1.4",
-    "es-module-lexer": "^1.5.4",
-    "esbuild": "^0.21.5",
+    "es-module-lexer": "^1.6.0",
+    "esbuild": "^0.24.2",
     "estree-walker": "^3.0.3",
-    "fast-glob": "^3.3.2",
+    "fast-glob": "^3.3.3",
     "flattie": "^1.1.1",
     "github-slugger": "^2.0.0",
     "html-escaper": "^3.0.3",
     "http-cache-semantics": "^4.1.1",
     "js-yaml": "^4.1.0",
     "kleur": "^4.1.5",
-    "magic-string": "^0.30.14",
+    "magic-string": "^0.30.17",
     "magicast": "^0.3.5",
     "micromatch": "^4.0.8",
     "mrmime": "^2.0.0",
     "neotraverse": "^0.6.18",
-    "p-limit": "^6.1.0",
+    "p-limit": "^6.2.0",
     "p-queue": "^8.0.1",
     "preferred-pm": "^4.0.0",
     "prompts": "^2.4.2",
     "rehype": "^13.0.2",
     "semver": "^7.6.3",
-    "shiki": "^1.23.1",
-    "tinyexec": "^0.3.1",
+    "shiki": "^1.29.1",
+    "tinyexec": "^0.3.2",
     "tsconfck": "^3.1.4",
     "ultrahtml": "^1.5.3",
     "unist-util-visit": "^5.0.0",
-    "unstorage": "^1.14.0",
+    "unstorage": "^1.14.4",
     "vfile": "^6.0.3",
-    "vite": "^6.0.5",
-    "vitefu": "^1.0.4",
+    "vite": "^6.0.9",
+    "vitefu": "^1.0.5",
     "which-pm": "^3.0.0",
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^21.1.1",
-    "yocto-spinner": "^0.1.0",
-    "zod": "^3.23.8",
-    "zod-to-json-schema": "^3.23.5",
+    "yocto-spinner": "^0.1.2",
+    "zod": "^3.24.1",
+    "zod-to-json-schema": "^3.24.1",
     "zod-to-ts": "^1.2.0",
     "@astrojs/internal-helpers": "0.4.2",
-    "@astrojs/markdown-remark": "6.0.1",
+    "@astrojs/markdown-remark": "6.0.2",
     "@astrojs/telemetry": "3.2.0"
   },
   "optionalDependencies": {
@@ -168,7 +168,7 @@
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.4",
-    "@playwright/test": "^1.49.0",
+    "@playwright/test": "^1.49.1",
     "@types/aria-query": "^5.0.4",
     "@types/common-ancestor-path": "^1.0.2",
     "@types/cssesc": "^3.0.2",
@@ -189,18 +189,18 @@
     "expect-type": "^1.1.0",
     "fs-fixture": "^2.6.0",
     "mdast-util-mdx": "^3.0.0",
-    "mdast-util-mdx-jsx": "^3.1.3",
-    "node-mocks-http": "^1.16.1",
+    "mdast-util-mdx-jsx": "^3.2.0",
+    "node-mocks-http": "^1.16.2",
     "parse-srcset": "^1.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
-    "rollup": "^4.27.4",
-    "sass": "^1.81.0",
-    "undici": "^7.2.0",
+    "rollup": "^4.31.0",
+    "sass": "^1.83.4",
+    "undici": "^7.2.3",
     "unified": "^11.0.5",
-    "vitest": "^3.0.0-beta.3",
+    "vitest": "^3.0.2",
     "astro-scripts": "0.0.14"
   },
   "engines": {