astro 7.0.1 → 7.0.3

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

@@ -1,5 +1,5 @@
 import type fsMod from 'node:fs';
-import type { Plugin as VitePlugin } from 'vite';
+import { type Plugin as VitePlugin } from 'vite';
 import type { BuildInternals } from '../core/build/internal.js';
 import type { StaticBuildOptions } from '../core/build/types.js';
 import type { AstroSettings } from '../types/astro.js';

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

@@ -1,3 +1,7 @@
+import { fileURLToPath } from "node:url";
+import {
+  normalizePath as viteNormalizePath
+} from "vite";
 import { shouldAppendForwardSlash } from "../core/build/util.js";
 import { getServerOutputDirectory } from "../prerender/utils.js";
 import {
@@ -27,11 +31,13 @@ function vitePluginActionsBuild(opts, internals) {
     }
   };
 }
+const ACTIONS_DIR_NAME = "actions";
 function vitePluginActions({
   fs,
   settings
 }) {
   let resolvedActionsId;
+  const normalizedSrcDir = viteNormalizePath(fileURLToPath(settings.config.srcDir));
   return {
     name: VIRTUAL_MODULE_ID,
     enforce: "pre",
@@ -69,7 +75,27 @@ function vitePluginActions({
         }
       }
       server.watcher.on("add", watcherCallback);
-      server.watcher.on("change", watcherCallback);
+      server.watcher.on("change", (path) => {
+        watcherCallback();
+        const normalizedPath = viteNormalizePath(path);
+        if (!normalizedPath.startsWith(normalizedSrcDir)) return;
+        const relativePath = normalizedPath.slice(normalizedSrcDir.length);
+        if (!relativePath.startsWith(`${ACTIONS_DIR_NAME}/`)) return;
+        for (const name of [
+          ASTRO_VITE_ENVIRONMENT_NAMES.ssr,
+          ASTRO_VITE_ENVIRONMENT_NAMES.astro
+        ]) {
+          const environment = server.environments[name];
+          if (!environment) continue;
+          const virtualMod = environment.moduleGraph.getModuleById(
+            ACTIONS_RESOLVED_ENTRYPOINT_VIRTUAL_MODULE_ID
+          );
+          if (virtualMod) {
+            environment.moduleGraph.invalidateModule(virtualMod);
+          }
+          environment.hot.send("astro:actions-updated", {});
+        }
+      });
     },
     load: {
       filter: {

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "7.0.1";
+  version = "7.0.3";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/content/content-layer.js

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

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

@@ -86,7 +86,7 @@ export interface RenderErrorOptions extends ResolvedRenderOptions {
      */
     pathname?: string;
 }
-type ErrorPagePath = `${string}/404` | `${string}/500` | `${string}/404/` | `${string}/500/` | `${string}404.html` | `${string}500.html`;
+type ErrorPagePath = `${string}/404` | `${string}/500` | `${string}/404/` | `${string}/500/` | `${string}/404/index.html` | `${string}/500/index.html` | `${string}404.html` | `${string}500.html`;
 export declare abstract class BaseApp<P extends Pipeline = AppPipeline> {
     #private;
     manifest: SSRManifest;

package/dist/core/app/base.js

@@ -5,6 +5,7 @@ import {
 } from "@astrojs/internal-helpers/path";
 import { matchPattern } from "@astrojs/internal-helpers/remote";
 import { computePathnameFromDomain } from "../i18n/domain.js";
+import { isLocalizedErrorRoute } from "../../i18n/error-routes.js";
 import { PipelineFeatures } from "../base-pipeline.js";
 import { ASTRO_ERROR_HEADER, clientAddressSymbol } from "../constants.js";
 import { getSetCookiesFromResponse } from "../cookies/index.js";
@@ -13,6 +14,7 @@ import { AstroIntegrationLogger } from "../logger/core.js";
 import { DefaultFetchHandler } from "../fetch/default-handler.js";
 import { appSymbol } from "../constants.js";
 import { DefaultErrorHandler } from "../errors/default-handler.js";
+import { isRoute404, isRoute500 } from "../routing/internal/route-errors.js";
 import { setRenderOptions } from "./render-options.js";
 class BaseApp {
   manifest;
@@ -332,8 +334,13 @@ class BaseApp {
       }
     }
     const route = removeTrailingForwardSlash(routeData.route);
-    if (route.endsWith("/404")) return 404;
-    if (route.endsWith("/500")) return 500;
+    const locales = this.manifest.i18n?.locales;
+    if (isRoute404(route) || isLocalizedErrorRoute(route, 404, locales)) {
+      return 404;
+    }
+    if (isRoute500(route) || isLocalizedErrorRoute(route, 500, locales)) {
+      return 500;
+    }
     return 200;
   }
   getManifest() {

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

@@ -14,6 +14,11 @@ export declare class DevApp extends BaseApp<NonRunnablePipeline> {
      * Called via HMR when middleware files change.
      */
     clearMiddleware(): void;
+    /**
+     * Clears the cached actions so they are re-resolved on the next request.
+     * Called via HMR when action files change.
+     */
+    clearActions(): void;
     /**
      * Updates the routes list when files change during development.
      * Called via HMR when new pages are added/removed.

package/dist/core/app/dev/app.js

@@ -25,6 +25,13 @@ class DevApp extends BaseApp {
   clearMiddleware() {
     this.pipeline.clearMiddleware();
   }
+  /**
+   * Clears the cached actions so they are re-resolved on the next request.
+   * Called via HMR when action files change.
+   */
+  clearActions() {
+    this.pipeline.clearActions();
+  }
   /**
    * Updates the routes list when files change during development.
    * Called via HMR when new pages are added/removed.

package/dist/core/app/dev/pipeline.d.ts

@@ -9,6 +9,7 @@ export declare class NonRunnablePipeline extends Pipeline {
     getName(): string;
     static create({ logger, manifest, streaming }: DevPipelineCreate): NonRunnablePipeline;
     headElements(routeData: RouteData): Promise<HeadElements>;
+    clearActions(): void;
     componentMetadata(): void;
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
     tryRewrite(payload: RewritePayload, request: Request): Promise<TryRewriteResult>;

package/dist/core/app/dev/pipeline.js

@@ -94,6 +94,10 @@ class NonRunnablePipeline extends Pipeline {
     }
     return { scripts, styles, links };
   }
+  // Called via HMR when action files change. Not available on production　environment.
+  clearActions() {
+    this.resolvedActions = void 0;
+  }
   componentMetadata() {
   }
   async getComponentByRoute(routeData) {

package/dist/core/app/entrypoints/virtual/dev.js

@@ -29,6 +29,10 @@ const createApp = ({ streaming } = {}) => {
       if (!currentDevApp) return;
       currentDevApp.clearMiddleware();
     });
+    import.meta.hot.on("astro:actions-updated", () => {
+      if (!currentDevApp) return;
+      currentDevApp.clearActions();
+    });
   }
   return currentDevApp;
 };

package/dist/core/build/generate.js

@@ -24,7 +24,7 @@ import { createRequest } from "../request.js";
 import { redirectTemplate } from "../routing/3xx.js";
 import { routeIsRedirect } from "../routing/helpers.js";
 import { matchRoute } from "../routing/match.js";
-import { getOutputFilename } from "../util.js";
+import { getOutputFilename } from "../output-filename.js";
 import { getOutFile, getOutFolder } from "./common.js";
 import { createDefaultPrerenderer } from "./default-prerenderer.js";
 import { hasPrerenderedPages } from "./internal.js";

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

@@ -1,7 +1,7 @@
 import { fileURLToPath } from "node:url";
 import { glob } from "tinyglobby";
 import { getAssetsPrefix } from "../../../assets/utils/getAssetsPrefix.js";
-import { normalizeTheLocale } from "../../../i18n/index.js";
+import { normalizeTheLocale } from "../../../i18n/path.js";
 import { resolveMiddlewareMode } from "../../../integrations/adapter-utils.js";
 import { runHookBuildSsr } from "../../../integrations/hooks.js";
 import { SERIALIZED_MANIFEST_RESOLVED_ID } from "../../../manifest/serialized.js";

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "7.0.1";
+const ASTRO_VERSION = "7.0.3";
 const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 const ASTRO_ERROR_HEADER = "X-Astro-Error";
 const DEFAULT_404_COMPONENT = "astro-default-404.astro";

package/dist/core/dev/dev.js

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

package/dist/core/errors/default-handler.js

@@ -7,6 +7,8 @@ import { PagesHandler } from "../pages/handler.js";
 import { matchRoute } from "../routing/match.js";
 import { provideSession } from "../session/handler.js";
 import { validateHost } from "../app/validate-headers.js";
+import { getErrorRoutePath } from "../../i18n/error-routes.js";
+import { getOutputFilename } from "../output-filename.js";
 class DefaultErrorHandler {
   #app;
   #astroMiddleware;
@@ -26,17 +28,26 @@ class DefaultErrorHandler {
   }) {
     const app = this.#app;
     const resolvedPathname = pathname ?? new FetchState(app.pipeline, request).pathname;
-    const errorRoutePath = `/${status}${app.manifest.trailingSlash === "always" ? "/" : ""}`;
+    const errorRoutePath = getErrorRoutePath(
+      resolvedPathname,
+      status,
+      app.manifestData.routes,
+      app.manifest.i18n?.locales,
+      app.manifest.trailingSlash === "always"
+    );
     const errorRouteData = matchRoute(errorRoutePath, app.manifestData);
     const url = new URL(request.url);
     if (errorRouteData) {
       if (errorRouteData.prerender) {
-        const maybeDotHtml = errorRouteData.route.endsWith(`/${status}`) ? ".html" : "";
         const allowedDomains = app.manifest.allowedDomains;
         const validatedHost = validateHost(url.host, url.protocol.replace(":", ""), allowedDomains);
         const safeOrigin = validatedHost ? url.origin : `${url.protocol}//localhost`;
         const statusURL = new URL(
-          `${app.baseWithoutTrailingSlash}/${status}${maybeDotHtml}`,
+          `${app.baseWithoutTrailingSlash}${getOutputFilename(
+            app.manifest.buildFormat,
+            errorRouteData.route,
+            errorRouteData
+          )}`,
           safeOrigin
         );
         if (statusURL.toString() !== request.url && resolvedRenderOptions.prerenderedErrorPageFetch) {

package/dist/core/i18n/domain.js

@@ -5,7 +5,7 @@ import {
   prependForwardSlash,
   removeTrailingForwardSlash
 } from "@astrojs/internal-helpers/path";
-import { normalizeTheLocale } from "../../i18n/index.js";
+import { normalizeTheLocale } from "../../i18n/path.js";
 function computePathnameFromDomain(request, url, i18n, base, trailingSlash, logger) {
   let pathname = void 0;
   if (i18n && (i18n.strategy === "domains-prefix-always" || i18n.strategy === "domains-prefix-other-locales" || i18n.strategy === "domains-prefix-always-no-redirect")) {

package/dist/core/messages/runtime.js

@@ -269,7 +269,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"7.0.1"}`
+        `v${"7.0.3"}`
       )} ${headline}`
     );
   }

package/dist/core/output-filename.d.ts

@@ -0,0 +1,3 @@
+import type { AstroConfig } from '../types/public/config.js';
+import type { RouteData } from '../types/public/internal.js';
+export declare function getOutputFilename(buildFormat: NonNullable<AstroConfig['build']>['format'], name: string, routeData: RouteData): string;

package/dist/core/output-filename.js

@@ -0,0 +1,20 @@
+import { removeTrailingForwardSlash } from "./path.js";
+const STATUS_CODE_PAGES = /* @__PURE__ */ new Set(["/404", "/500"]);
+function getOutputFilename(buildFormat, name, routeData) {
+  if (routeData.type === "endpoint") {
+    return name;
+  }
+  if (name === "/" || name === "") {
+    return name === "" ? "index.html" : "/index.html";
+  }
+  if (buildFormat === "file" || STATUS_CODE_PAGES.has(name)) {
+    return `${removeTrailingForwardSlash(name || "index")}.html`;
+  }
+  if (buildFormat === "preserve" && !routeData.isIndex) {
+    return `${removeTrailingForwardSlash(name || "index")}.html`;
+  }
+  return `${removeTrailingForwardSlash(name)}/index.html`;
+}
+export {
+  getOutputFilename
+};

package/dist/core/routing/dev.js

@@ -4,6 +4,7 @@ import { getProps } from "../render/index.js";
 import { getCustom404Route } from "./helpers.js";
 import { NoMatchingStaticPathFound } from "../errors/errors-data.js";
 import { isAstroError } from "../errors/errors.js";
+import { getErrorRoutePath } from "../../i18n/error-routes.js";
 async function matchRoute(pathname, routesList, pipeline, manifest) {
   const { logger, routeCache } = pipeline;
   const matches = matchAllRoutes(pathname, routesList);
@@ -11,6 +12,7 @@ async function matchRoute(pathname, routesList, pipeline, manifest) {
     matches,
     manifest
   });
+  let firstError = null;
   for await (const { route: maybeRoute, filePath } of preloadedMatches) {
     try {
       await getProps({
@@ -32,9 +34,13 @@ async function matchRoute(pathname, routesList, pipeline, manifest) {
       if (isAstroError(e) && e.title === NoMatchingStaticPathFound.title) {
         continue;
       }
-      throw e;
+      firstError ??= e;
+      continue;
     }
   }
+  if (firstError) {
+    throw firstError;
+  }
   const altPathname = pathname.replace(/\/index\.html$/, "/").replace(/\.html$/, "");
   if (altPathname !== pathname) {
     return await matchRoute(altPathname, routesList, pipeline, manifest);
@@ -50,7 +56,14 @@ async function matchRoute(pathname, routesList, pipeline, manifest) {
 ${NoMatchingStaticPathFound.hint(possibleRoutes)}`
     );
   }
-  const custom404 = getCustom404Route(routesList);
+  const errorRoutePath = getErrorRoutePath(
+    pathname,
+    404,
+    routesList.routes,
+    manifest.i18n?.locales,
+    manifest.trailingSlash === "always"
+  );
+  const custom404 = routesList.routes.find((route) => route.route === errorRoutePath) ?? getCustom404Route(routesList);
   if (custom404) {
     const filePath = new URL(`./${custom404.component}`, manifest.rootDir);
     return {

package/dist/core/util.d.ts

@@ -1,16 +1,9 @@
 import type { AstroSettings } from '../types/astro.js';
 import type { AstroConfig } from '../types/public/config.js';
-import type { RouteData } from '../types/public/internal.js';
 /** Check if a file is a markdown file based on its extension */
 export declare function isMarkdownFile(fileId: string, option?: {
     suffix?: string;
 }): boolean;
-/**
- * Get the correct output filename for a route, based on your config.
- * Handles both "/foo" and "foo" `name` formats.
- * Handles `/404` and `/` correctly.
- */
-export declare function getOutputFilename(buildFormat: NonNullable<AstroConfig['build']>['format'], name: string, routeData: RouteData): string;
 /** is a specifier an npm package? */
 export declare function parseNpmName(spec: string): {
     scope?: string;

package/dist/core/util.js

@@ -1,9 +1,8 @@
 import fs from "node:fs";
-import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { hasSpecialQueries } from "../vite-plugin-utils/index.js";
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "./constants.js";
-import { removeQueryString, removeTrailingForwardSlash, slash } from "./path.js";
+import { removeQueryString, slash } from "./path.js";
 function isMarkdownFile(fileId, option) {
   if (hasSpecialQueries(fileId)) {
     return false;
@@ -15,22 +14,6 @@ function isMarkdownFile(fileId, option) {
   }
   return false;
 }
-const STATUS_CODE_PAGES = /* @__PURE__ */ new Set(["/404", "/500"]);
-function getOutputFilename(buildFormat, name, routeData) {
-  if (routeData.type === "endpoint") {
-    return name;
-  }
-  if (name === "/" || name === "") {
-    return path.posix.join(name, "index.html");
-  }
-  if (buildFormat === "file" || STATUS_CODE_PAGES.has(name)) {
-    return `${removeTrailingForwardSlash(name || "index")}.html`;
-  }
-  if (buildFormat === "preserve" && !routeData.isIndex) {
-    return `${removeTrailingForwardSlash(name || "index")}.html`;
-  }
-  return path.posix.join(name, "index.html");
-}
 function parseNpmName(spec) {
   if (!spec || spec[0] === "." || spec[0] === "/") return void 0;
   let scope;
@@ -119,7 +102,6 @@ function ensureProcessNodeEnv(defaultNodeEnv) {
 export {
   VALID_ID_PREFIX,
   ensureProcessNodeEnv,
-  getOutputFilename,
   isEndpoint,
   isMarkdownFile,
   isPage,

package/dist/i18n/error-routes.d.ts

@@ -0,0 +1,4 @@
+import type { SSRManifest } from '../core/app/types.js';
+import type { Locales } from '../types/public/config.js';
+export declare function isLocalizedErrorRoute(route: string, status: 404 | 500, locales: Locales | undefined): boolean;
+export declare function getErrorRoutePath(pathname: string, status: 404 | 500, routes: Pick<SSRManifest['routes'][number]['routeData'], 'route'>[], locales: Locales | undefined, appendTrailingSlash?: boolean): string;

package/dist/i18n/error-routes.js

@@ -0,0 +1,26 @@
+import { pathHasLocale } from "./path.js";
+function isLocalizedErrorRoute(route, status, locales) {
+  if (!locales) return false;
+  const suffix = `/${status}`;
+  if (!route.endsWith(suffix)) return false;
+  const localeSegment = route.slice(0, -suffix.length);
+  if (!localeSegment || localeSegment.includes("/", 1)) return false;
+  return pathHasLocale(localeSegment, locales);
+}
+function getErrorRoutePath(pathname, status, routes, locales, appendTrailingSlash = false) {
+  const suffix = appendTrailingSlash ? "/" : "";
+  if (locales) {
+    const firstSegment = pathname.split("/").find(Boolean);
+    if (firstSegment && pathHasLocale(`/${firstSegment}`, locales)) {
+      const localized = `/${firstSegment}/${status}`;
+      if (routes.some((route) => route.route === localized)) {
+        return `${localized}${suffix}`;
+      }
+    }
+  }
+  return `/${status}${suffix}`;
+}
+export {
+  getErrorRoutePath,
+  isLocalizedErrorRoute
+};

package/dist/i18n/index.d.ts

@@ -3,7 +3,6 @@ import type { SSRManifest } from '../core/app/types.js';
 import type { AstroConfig, Locales, ValidRedirectStatus } from '../types/public/config.js';
 import type { APIContext } from '../types/public/context.js';
 export declare function requestHasLocale(locales: Locales): (context: APIContext) => boolean;
-export declare function pathHasLocale(path: string, locales: Locales): boolean;
 type GetLocaleRelativeUrl = GetLocaleOptions & {
     locale: string;
     base: string;
@@ -67,19 +66,6 @@ export declare function getPathByLocale(locale: string, locales: Locales): strin
  * @param locales
  */
 export declare function getLocaleByPath(path: string, locales: Locales): string;
-/**
- *
- * Given a locale, this function:
- * - replaces the `_` with a `-`;
- * - transforms all letters to be lowercase;
- */
-export declare function normalizeTheLocale(locale: string): string;
-/**
- *
- * Given a path or path segment, this function:
- * - removes the `.html` extension if it exists
- */
-export declare function normalizeThePath(path: string): string;
 /**
  * Returns an array of only locales, by picking the `code`
  * @param locales

package/dist/i18n/index.js

@@ -8,26 +8,12 @@ import { getFetchStateFromAPIContext } from "../core/fetch/fetch-state.js";
 import { i18nNoLocaleFoundInPath, MissingLocale } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/index.js";
 import { createI18nMiddleware } from "./middleware.js";
+import { normalizeTheLocale, pathHasLocale } from "./path.js";
 function requestHasLocale(locales) {
   return function(context) {
     return pathHasLocale(context.url.pathname, locales);
   };
 }
-function pathHasLocale(path, locales) {
-  const segments = path.split("/").map(normalizeThePath);
-  for (const segment of segments) {
-    for (const locale of locales) {
-      if (typeof locale === "string") {
-        if (normalizeTheLocale(segment) === normalizeTheLocale(locale)) {
-          return true;
-        }
-      } else if (segment === locale.path) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
 function getLocaleRelativeUrl({
   locale,
   base,
@@ -133,12 +119,6 @@ function getLocaleByPath(path, locales) {
   }
   throw new AstroError(i18nNoLocaleFoundInPath);
 }
-function normalizeTheLocale(locale) {
-  return locale.replaceAll("_", "-").toLowerCase();
-}
-function normalizeThePath(path) {
-  return path.endsWith(".html") ? path.slice(0, -5) : path;
-}
 function getAllCodes(locales) {
   const result = [];
   for (const loopLocale of locales) {
@@ -281,10 +261,7 @@ export {
   getLocaleRelativeUrl,
   getLocaleRelativeUrlList,
   getPathByLocale,
-  normalizeTheLocale,
-  normalizeThePath,
   notFound,
-  pathHasLocale,
   redirectToDefaultLocale,
   redirectToFallback,
   requestHasLocale,

package/dist/i18n/path.d.ts

@@ -0,0 +1,15 @@
+import type { Locales } from '../types/public/config.js';
+export declare function pathHasLocale(path: string, locales: Locales): boolean;
+/**
+ *
+ * Given a locale, this function:
+ * - replaces the `_` with a `-`;
+ * - transforms all letters to be lowercase;
+ */
+export declare function normalizeTheLocale(locale: string): string;
+/**
+ *
+ * Given a path or path segment, this function:
+ * - removes the `.html` extension if it exists
+ */
+export declare function normalizeThePath(path: string): string;

package/dist/i18n/path.js

@@ -0,0 +1,26 @@
+function pathHasLocale(path, locales) {
+  const segments = path.split("/").map(normalizeThePath);
+  for (const segment of segments) {
+    for (const locale of locales) {
+      if (typeof locale === "string") {
+        if (normalizeTheLocale(segment) === normalizeTheLocale(locale)) {
+          return true;
+        }
+      } else if (segment === locale.path) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+function normalizeTheLocale(locale) {
+  return locale.replaceAll("_", "-").toLowerCase();
+}
+function normalizeThePath(path) {
+  return path.endsWith(".html") ? path.slice(0, -5) : path;
+}
+export {
+  normalizeTheLocale,
+  normalizeThePath,
+  pathHasLocale
+};

package/dist/i18n/router.js

@@ -1,5 +1,5 @@
 import { removeTrailingForwardSlash } from "@astrojs/internal-helpers/path";
-import { normalizeTheLocale, pathHasLocale } from "./index.js";
+import { normalizeTheLocale, pathHasLocale } from "./path.js";
 class I18nRouter {
   #strategy;
   #defaultLocale;

package/dist/i18n/utils.js

@@ -1,4 +1,5 @@
-import { getAllCodes, normalizeTheLocale, normalizeThePath } from "./index.js";
+import { getAllCodes } from "./index.js";
+import { normalizeTheLocale, normalizeThePath } from "./path.js";
 function parseLocale(header) {
   if (header === "*") {
     return [{ locale: header, qualityValue: void 0 }];

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

@@ -1,3 +1,4 @@
+import { isRoute404, isRoute500 } from "../../../core/routing/internal/route-errors.js";
 import { renderToAsyncIterable, renderToReadableStream, renderToString } from "./astro/render.js";
 import { encoder } from "./common.js";
 import { renderComponentToString } from "./component.js";
@@ -61,12 +62,12 @@ async function renderPage(result, componentFactory, props, children, streaming,
   }
   let status = init.status;
   let statusText = init.statusText;
-  if (route?.route === "/404") {
+  if (route?.route && isRoute404(route.route)) {
     status = 404;
     if (statusText === "OK") {
       statusText = "Not Found";
     }
-  } else if (route?.route === "/500") {
+  } else if (route?.route && isRoute500(route.route)) {
     status = 500;
     if (statusText === "OK") {
       statusText = "Internal Server Error";

package/dist/virtual-modules/i18n.d.ts

@@ -1,5 +1,6 @@
 import type { RedirectToFallback } from '../i18n/index.js';
 import * as I18nInternals from '../i18n/index.js';
+import { normalizeTheLocale as normalizeTheLocaleInternal } from '../i18n/path.js';
 import type { MiddlewareHandler } from '../types/public/common.js';
 import type { AstroConfig, ValidRedirectStatus } from '../types/public/config.js';
 import type { APIContext } from '../types/public/context.js';
@@ -249,7 +250,7 @@ export declare let middleware: (customOptions: I18nMiddlewareOptions) => Middlew
  * normalizeTheLocale("it_VT") // returns `it-vt`
  * ```
  */
-export declare const normalizeTheLocale: typeof I18nInternals.normalizeTheLocale;
+export declare const normalizeTheLocale: typeof normalizeTheLocaleInternal;
 /**
  * Retrieves the configured locale codes for each locale defined in your
  * configuration. When multiple codes are associated to a locale, only the

package/dist/virtual-modules/i18n.js

@@ -7,6 +7,10 @@ import {
 } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/index.js";
 import * as I18nInternals from "../i18n/index.js";
+import {
+  normalizeTheLocale as normalizeTheLocaleInternal,
+  pathHasLocale as pathHasLocaleInternal
+} from "../i18n/path.js";
 const { trailingSlash, site, i18n, build } = config;
 const { format } = build;
 const isBuild = import.meta.env.PROD;
@@ -72,7 +76,7 @@ const getAbsoluteLocaleUrlList = (path, options) => I18nInternals.getLocaleAbsol
 });
 const getPathByLocale = (locale) => I18nInternals.getPathByLocale(locale, locales);
 const getLocaleByPath = (path) => I18nInternals.getLocaleByPath(path, locales);
-const pathHasLocale = (path) => I18nInternals.pathHasLocale(path, locales);
+const pathHasLocale = (path) => pathHasLocaleInternal(path, locales);
 let redirectToDefaultLocale;
 if (i18n?.routing === "manual") {
   redirectToDefaultLocale = I18nInternals.redirectToDefaultLocale({
@@ -149,7 +153,7 @@ if (i18n?.routing === "manual") {
 } else {
   middleware = noop("middleware");
 }
-const normalizeTheLocale = I18nInternals.normalizeTheLocale;
+const normalizeTheLocale = normalizeTheLocaleInternal;
 const toCodes = I18nInternals.toCodes;
 const toPaths = I18nInternals.toPaths;
 export {

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

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

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

@@ -63,6 +63,13 @@ class AstroServerApp extends BaseApp {
   clearMiddleware() {
     this.pipeline.clearMiddleware();
   }
+  /**
+   * Clears the cached actions so they are re-resolved on the next request.
+   * Called via HMR when action files change.
+   */
+  clearActions() {
+    this.pipeline.clearActions();
+  }
   async devMatch(pathname) {
     const matchedRoute = await matchRoute(
       pathname,
@@ -148,6 +155,18 @@ class AstroServerApp extends BaseApp {
           });
           body = Buffer.concat(bytes);
         }
+        const abortController = new AbortController();
+        const socket = incomingRequest.socket;
+        const onSocketClose = () => {
+          if (!abortController.signal.aborted) {
+            abortController.abort();
+          }
+        };
+        if (socket.destroyed) {
+          onSocketClose();
+        } else {
+          socket.on("close", onSocketClose);
+        }
         const request = createRequest({
           url,
           headers: incomingRequest.headers,
@@ -155,7 +174,8 @@ class AstroServerApp extends BaseApp {
           body,
           logger: self.logger,
           isPrerendered: matchedRoute.routeData.prerender,
-          routePattern: matchedRoute.routeData.component
+          routePattern: matchedRoute.routeData.component,
+          init: { signal: abortController.signal }
         });
         const locals = Reflect.get(incomingRequest, clientLocalsSymbol);
         for (const [name, value] of Object.entries(self.settings.config.server.headers ?? {})) {

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

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

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

@@ -14,6 +14,7 @@ export declare class RunnablePipeline extends Pipeline {
     readonly getDebugInfo: () => Promise<string>;
     private constructor();
     static create(manifestData: RoutesList, { loader, logger, manifest, settings, getDebugInfo, }: Pick<RunnablePipeline, 'loader' | 'logger' | 'manifest' | 'settings' | 'getDebugInfo'>): RunnablePipeline;
+    clearActions(): void;
     headElements(routeData: RouteData): Promise<HeadElements>;
     componentMetadata(routeData: RouteData): Promise<Map<string, import("../types/public/internal.js").SSRComponentMetadata>>;
     preload(routeData: RouteData, filePath: URL): Promise<ComponentInstance>;

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

@@ -57,6 +57,10 @@ class RunnablePipeline extends Pipeline {
     pipeline.routesList = manifestData;
     return pipeline;
   }
+  // Called via HMR when action files change. Not available on production.
+  clearActions() {
+    this.resolvedActions = void 0;
+  }
   async headElements(routeData) {
     const { manifest, runtimeMode, settings } = this;
     const filePath = new URL(`${routeData.component}`, manifest.rootDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "7.0.1",
+  "version": "7.0.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -136,8 +136,8 @@
     "github-slugger": "^2.0.0",
     "html-escaper": "3.0.3",
     "http-cache-semantics": "^4.2.0",
-    "jsonc-parser": "^3.3.1",
     "js-yaml": "^4.1.1",
+    "jsonc-parser": "^3.3.1",
     "magic-string": "^0.30.21",
     "magicast": "^0.5.2",
     "mrmime": "^2.0.1",
@@ -166,8 +166,8 @@
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
+    "@astrojs/markdown-satteri": "0.3.2",
     "@astrojs/internal-helpers": "0.10.0",
-    "@astrojs/markdown-satteri": "0.3.1",
     "@astrojs/telemetry": "3.3.2"
   },
   "optionalDependencies": {