astro 5.0.5 → 5.0.7

package/astro-jsx.d.ts

@@ -679,6 +679,7 @@ declare namespace astroHTML.JSX {
 
 	interface DialogHTMLAttributes extends HTMLAttributes {
 		open?: boolean | string | undefined | null;
+		closedby?: 'none' | 'closerequest' | 'any' | undefined | null;
 	}
 
 	interface EmbedHTMLAttributes extends HTMLAttributes {

package/dist/actions/plugins.js

@@ -1,3 +1,4 @@
+import { shouldAppendForwardSlash } from "../core/build/util.js";
 import {
   NOOP_ACTIONS,
   RESOLVED_VIRTUAL_INTERNAL_MODULE_ID,
@@ -69,6 +70,12 @@ export * from 'astro/actions/runtime/virtual/server.js';`;
       } else {
         code += `
 export * from 'astro/actions/runtime/virtual/client.js';`;
+        code = code.replace(
+          "'/** @TRAILING_SLASH@ **/'",
+          JSON.stringify(
+            shouldAppendForwardSlash(settings.config.trailingSlash, settings.config.build.format)
+          )
+        );
       }
       return code;
     }

package/dist/actions/runtime/virtual/server.js

@@ -1,6 +1,9 @@
 import { z } from "zod";
+import { shouldAppendForwardSlash } from "../../../core/build/util.js";
 import { ActionCalledFromServerError } from "../../../core/errors/errors-data.js";
 import { AstroError } from "../../../core/errors/errors.js";
+import { removeTrailingForwardSlash } from "../../../core/path.js";
+import { apiContextRoutesSymbol } from "../../../core/render-context.js";
 import { ACTION_RPC_ROUTE_PATTERN } from "../../consts.js";
 import {
   ACTION_API_CONTEXT_SYMBOL,
@@ -143,7 +146,12 @@ function getActionContext(context) {
       calledFrom: callerInfo.from,
       name: callerInfo.name,
       handler: async () => {
-        const baseAction = await getAction(callerInfo.name);
+        const pipeline = Reflect.get(context, apiContextRoutesSymbol);
+        const callerInfoName = shouldAppendForwardSlash(
+          pipeline.manifest.trailingSlash,
+          pipeline.manifest.buildFormat
+        ) ? removeTrailingForwardSlash(callerInfo.name) : callerInfo.name;
+        const baseAction = await getAction(callerInfoName);
         let input;
         try {
           input = await parseRequestBody(context.request);

package/dist/actions/runtime/virtual/shared.d.ts

@@ -1,10 +1,12 @@
 import type { z } from 'zod';
+import { appendForwardSlash as _appendForwardSlash } from '../../../core/path.js';
 import type { ErrorInferenceObject, MaybePromise, ActionAPIContext as _ActionAPIContext } from '../utils.js';
 export type ActionAPIContext = _ActionAPIContext;
 export declare const ACTION_QUERY_PARAMS: {
     actionName: string;
     actionPayload: string;
 };
+export declare const appendForwardSlash: typeof _appendForwardSlash;
 export declare const ACTION_ERROR_CODES: readonly ["BAD_REQUEST", "UNAUTHORIZED", "FORBIDDEN", "NOT_FOUND", "TIMEOUT", "CONFLICT", "PRECONDITION_FAILED", "PAYLOAD_TOO_LARGE", "UNSUPPORTED_MEDIA_TYPE", "UNPROCESSABLE_CONTENT", "TOO_MANY_REQUESTS", "CLIENT_CLOSED_REQUEST", "INTERNAL_SERVER_ERROR"];
 export type ActionErrorCode = (typeof ACTION_ERROR_CODES)[number];
 export declare class ActionError<_T extends ErrorInferenceObject = ErrorInferenceObject> extends Error {

package/dist/actions/runtime/virtual/shared.js

@@ -2,8 +2,10 @@ import { parse as devalueParse, stringify as devalueStringify } from "devalue";
 import { REDIRECT_STATUS_CODES } from "../../../core/constants.js";
 import { ActionsReturnedInvalidDataError } from "../../../core/errors/errors-data.js";
 import { AstroError } from "../../../core/errors/errors.js";
+import { appendForwardSlash as _appendForwardSlash } from "../../../core/path.js";
 import { ACTION_QUERY_PARAMS as _ACTION_QUERY_PARAMS } from "../../consts.js";
 const ACTION_QUERY_PARAMS = _ACTION_QUERY_PARAMS;
+const appendForwardSlash = _appendForwardSlash;
 const ACTION_ERROR_CODES = [
   "BAD_REQUEST",
   "UNAUTHORIZED",
@@ -227,6 +229,7 @@ export {
   ACTION_QUERY_PARAMS,
   ActionError,
   ActionInputError,
+  appendForwardSlash,
   callSafely,
   deserializeActionResult,
   getActionQueryString,

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

@@ -1,3 +1,2 @@
 import type { AstroSettings, ManifestData } from '../../types/astro.js';
 export declare function injectImageEndpoint(settings: AstroSettings, manifest: ManifestData, mode: 'dev' | 'build', cwd?: string): void;
-export declare function ensureImageEndpointRoute(settings: AstroSettings, manifest: ManifestData, mode: 'dev' | 'build', cwd?: string): void;

package/dist/assets/endpoint/config.js

@@ -7,11 +7,6 @@ import { getPattern } from "../../core/routing/manifest/pattern.js";
 function injectImageEndpoint(settings, manifest, mode, cwd) {
   manifest.routes.unshift(getImageEndpointData(settings, mode, cwd));
 }
-function ensureImageEndpointRoute(settings, manifest, mode, cwd) {
-  if (!manifest.routes.some((route) => route.route === settings.config.image.endpoint.route)) {
-    manifest.routes.unshift(getImageEndpointData(settings, mode, cwd));
-  }
-}
 function getImageEndpointData(settings, mode, cwd) {
   const endpointEntrypoint = settings.config.image.endpoint.entrypoint === void 0 ? mode === "dev" ? "astro/assets/endpoint/node" : "astro/assets/endpoint/generic" : settings.config.image.endpoint.entrypoint;
   const segments = [
@@ -41,6 +36,5 @@ function getImageEndpointData(settings, mode, cwd) {
   };
 }
 export {
-  ensureImageEndpointRoute,
   injectImageEndpoint
 };

package/dist/cli/check/index.js

@@ -25,11 +25,7 @@ async function check(flags) {
   }
   if (!flags.noSync && !flags.help) {
     const { default: sync } = await import("../../core/sync/index.js");
-    try {
-      await sync(flagsToAstroInlineConfig(flags));
-    } catch (_) {
-      return process.exit(1);
-    }
+    await sync(flagsToAstroInlineConfig(flags));
   }
   const { check: checker, parseArgsAsCheckConfig } = checkPackage;
   const config = parseArgsAsCheckConfig(process.argv);

package/dist/content/content-layer.js

@@ -114,7 +114,7 @@ class ContentLayer {
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion !== "5.0.5") {
+    if (previousAstroVersion !== "5.0.7") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -122,8 +122,8 @@ class ContentLayer {
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.0.5") {
-      await this.#store.metaStore().set("astro-version", "5.0.5");
+    if ("5.0.7") {
+      await this.#store.metaStore().set("astro-version", "5.0.7");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("config-digest", currentConfigDigest);

package/dist/content/mutable-data-store.js

@@ -7,6 +7,7 @@ import { IMAGE_IMPORT_PREFIX } from "./consts.js";
 import { ImmutableDataStore } from "./data-store.js";
 import { contentModuleToId } from "./utils.js";
 const SAVE_DEBOUNCE_MS = 500;
+const MAX_DEPTH = 10;
 class MutableDataStore extends ImmutableDataStore {
   #file;
   #assetsFile;
@@ -61,7 +62,7 @@ class MutableDataStore extends ImmutableDataStore {
     this.#assetsFile = filePath;
     if (this.#assetImports.size === 0) {
       try {
-        await fs.writeFile(filePath, "export default new Map();");
+        await this.#writeFileAtomic(filePath, "export default new Map();");
       } catch (err) {
         throw new AstroError(AstroErrorData.UnknownFilesystemError, { cause: err });
       }
@@ -84,7 +85,7 @@ export default new Map([${exports.join(", ")}]);
 		`
     );
     try {
-      await fs.writeFile(filePath, code);
+      await this.#writeFileAtomic(filePath, code);
     } catch (err) {
       throw new AstroError(AstroErrorData.UnknownFilesystemError, { cause: err });
     }
@@ -94,7 +95,7 @@ export default new Map([${exports.join(", ")}]);
     this.#modulesFile = filePath;
     if (this.#moduleImports.size === 0) {
       try {
-        await fs.writeFile(filePath, "export default new Map();");
+        await this.#writeFileAtomic(filePath, "export default new Map();");
       } catch (err) {
         throw new AstroError(AstroErrorData.UnknownFilesystemError, { cause: err });
       }
@@ -111,7 +112,7 @@ export default new Map([
 ${lines.join(",\n")}]);
 		`;
     try {
-      await fs.writeFile(filePath, code);
+      await this.#writeFileAtomic(filePath, code);
     } catch (err) {
       throw new AstroError(AstroErrorData.UnknownFilesystemError, { cause: err });
     }
@@ -153,6 +154,30 @@ ${lines.join(",\n")}]);
       }, SAVE_DEBOUNCE_MS);
     }
   }
+  #writing = /* @__PURE__ */ new Set();
+  #pending = /* @__PURE__ */ new Set();
+  async #writeFileAtomic(filePath, data, depth = 0) {
+    if (depth > MAX_DEPTH) {
+      return;
+    }
+    const fileKey = filePath.toString();
+    if (this.#writing.has(fileKey)) {
+      this.#pending.add(fileKey);
+      return;
+    }
+    this.#writing.add(fileKey);
+    const tempFile = filePath instanceof URL ? new URL(`${filePath.href}.tmp`) : `${filePath}.tmp`;
+    try {
+      await fs.writeFile(tempFile, data);
+      await fs.rename(tempFile, filePath);
+    } finally {
+      this.#writing.delete(fileKey);
+      if (this.#pending.has(fileKey)) {
+        this.#pending.delete(fileKey);
+        await this.#writeFileAtomic(filePath, data, depth + 1);
+      }
+    }
+  }
   scopedStore(collectionName) {
     return {
       get: (key) => this.get(collectionName, key),
@@ -250,7 +275,7 @@ ${lines.join(",\n")}]);
       return;
     }
     try {
-      await fs.writeFile(filePath, this.toString());
+      await this.#writeFileAtomic(filePath, this.toString());
       this.#file = filePath;
       this.#dirty = false;
     } catch (err) {

package/dist/core/app/index.js

@@ -3,7 +3,6 @@ import {
   REROUTABLE_STATUS_CODES,
   REROUTE_DIRECTIVE_HEADER,
   clientAddressSymbol,
-  clientLocalsSymbol,
   responseSentSymbol
 } from "../constants.js";
 import { getSetCookiesFromResponse } from "../cookies/index.js";
@@ -19,7 +18,8 @@ import {
 } from "../path.js";
 import { RenderContext } from "../render-context.js";
 import { createAssetLink } from "../render/ssr-element.js";
-import { createDefaultRoutes, injectDefaultRoutes } from "../routing/default.js";
+import { ensure404Route } from "../routing/astro-designed-error-pages.js";
+import { createDefaultRoutes } from "../routing/default.js";
 import { matchRoute } from "../routing/match.js";
 import { AppPipeline } from "./pipeline.js";
 import { deserializeManifest } from "./common.js";
@@ -36,9 +36,10 @@ class App {
   #renderOptionsDeprecationWarningShown = false;
   constructor(manifest, streaming = true) {
     this.#manifest = manifest;
-    this.#manifestData = injectDefaultRoutes(manifest, {
+    this.#manifestData = {
       routes: manifest.routes.map((route) => route.routeData)
-    });
+    };
+    ensure404Route(this.#manifestData);
     this.#baseWithoutTrailingSlash = removeTrailingForwardSlash(this.#manifest.base);
     this.#pipeline = this.#createPipeline(this.#manifestData, streaming);
     this.#adapterLogger = new AstroIntegrationLogger(

package/dist/core/build/index.js

@@ -2,7 +2,6 @@ import fs from "node:fs";
 import { performance } from "node:perf_hooks";
 import { fileURLToPath } from "node:url";
 import { blue, bold, green } from "kleur/colors";
-import { injectImageEndpoint } from "../../assets/endpoint/config.js";
 import { telemetry } from "../../events/index.js";
 import { eventCliSession } from "../../events/session.js";
 import {
@@ -20,7 +19,6 @@ import { AstroError, AstroErrorData } from "../errors/index.js";
 import { levels, timerMessage } from "../logger/core.js";
 import { apply as applyPolyfill } from "../polyfill.js";
 import { createRouteManifest } from "../routing/index.js";
-import { getServerIslandRouteData } from "../server-islands/endpoint.js";
 import { clearContentLayerCache } from "../sync/index.js";
 import { ensureProcessNodeEnv } from "../util.js";
 import { collectPagesData } from "./page-data.js";
@@ -74,9 +72,6 @@ class AstroBuilder {
       logger
     });
     this.manifest = await createRouteManifest({ settings: this.settings }, this.logger);
-    if (this.settings.buildOutput === "server") {
-      injectImageEndpoint(this.settings, this.manifest, "build");
-    }
     await runHookConfigDone({ settings: this.settings, logger, command: "build" });
     if (!this.settings.config.adapter && this.settings.buildOutput === "server") {
       throw new AstroError(AstroErrorData.NoAdapterInstalled);
@@ -144,12 +139,12 @@ class AstroBuilder {
       viteConfig,
       key: keyPromise
     };
-    const { internals, ssrOutputChunkNames, ssrOutputAssetNames, contentFileNames } = await viteBuild(opts);
+    const { internals, ssrOutputChunkNames, contentFileNames } = await viteBuild(opts);
     const hasServerIslands = this.settings.serverIslandNameMap.size > 0;
     if (hasServerIslands && this.settings.buildOutput !== "server") {
       throw new AstroError(AstroErrorData.NoAdapterInstalledServerIslands);
     }
-    await staticBuild(opts, internals, ssrOutputChunkNames, ssrOutputAssetNames, contentFileNames);
+    await staticBuild(opts, internals, ssrOutputChunkNames, contentFileNames);
     this.timer.assetsStart = performance.now();
     Object.keys(assets).map((k) => {
       if (!assets[k]) return;
@@ -162,7 +157,7 @@ class AstroBuilder {
     await runHookBuildDone({
       settings: this.settings,
       pages: pageNames,
-      routes: Object.values(allPages).flat().map((pageData) => pageData.route).concat(hasServerIslands ? getServerIslandRouteData(this.settings.config) : []),
+      routes: Object.values(allPages).flat().map((pageData) => pageData.route),
       logging: this.logger
     });
     if (this.logger.level && levels[this.logger.level()] <= levels["info"]) {

package/dist/core/build/page-data.js

@@ -1,11 +1,15 @@
 import * as colors from "kleur/colors";
 import { debug } from "../logger/core.js";
+import { DEFAULT_COMPONENTS } from "../routing/default.js";
 import { makePageDataKey } from "./plugins/util.js";
 function collectPagesData(opts) {
   const { settings, manifest } = opts;
   const assets = {};
   const allPages = {};
   for (const route of manifest.routes) {
+    if (DEFAULT_COMPONENTS.some((component) => route.component === component)) {
+      continue;
+    }
     const key = makePageDataKey(route.route, route.component);
     if (route.pathname) {
       allPages[key] = {

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

@@ -3,11 +3,11 @@ import glob from "fast-glob";
 import { getAssetsPrefix } from "../../../assets/utils/getAssetsPrefix.js";
 import { normalizeTheLocale } from "../../../i18n/index.js";
 import { toFallbackType, toRoutingStrategy } from "../../../i18n/utils.js";
-import { unwrapSupportKind } from "../../../integrations/features-validation.js";
 import { runHookBuildSsr } from "../../../integrations/hooks.js";
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../../vite-plugin-scripts/index.js";
 import { encodeKey } from "../../encryption.js";
 import { fileExtension, joinPaths, prependForwardSlash } from "../../path.js";
+import { DEFAULT_COMPONENTS } from "../../routing/default.js";
 import { serializeRouteData } from "../../routing/index.js";
 import { addRollupInput } from "../add-rollup-input.js";
 import { getOutFile, getOutFolder } from "../common.js";
@@ -130,6 +130,18 @@ function buildManifest(opts, internals, staticFiles, encodedKey) {
       return prependForwardSlash(joinPaths(settings.config.base, pth));
     }
   };
+  for (const route of opts.manifest.routes) {
+    if (!DEFAULT_COMPONENTS.find((component) => route.component === component)) {
+      continue;
+    }
+    routes.push({
+      file: "",
+      links: [],
+      scripts: [],
+      styles: [],
+      routeData: serializeRouteData(route, settings.config.trailingSlash)
+    });
+  }
   for (const route of opts.manifest.routes) {
     if (!route.prerender) continue;
     if (!route.pathname) continue;

package/dist/core/build/static-build.d.ts

@@ -4,10 +4,9 @@ import type { StaticBuildOptions } from './types.js';
 export declare function viteBuild(opts: StaticBuildOptions): Promise<{
     internals: BuildInternals;
     ssrOutputChunkNames: string[];
-    ssrOutputAssetNames: string[];
     contentFileNames: undefined;
 }>;
-export declare function staticBuild(opts: StaticBuildOptions, internals: BuildInternals, ssrOutputChunkNames: string[], ssrOutputAssetNames: string[], contentFileNames?: string[]): Promise<void>;
+export declare function staticBuild(opts: StaticBuildOptions, internals: BuildInternals, ssrOutputChunkNames: string[], contentFileNames?: string[]): Promise<void>;
 export declare function copyFiles(fromFolder: URL, toFolder: URL, includeDotfiles?: boolean): Promise<void[] | undefined>;
 /**
  * This function takes the virtual module name of any page entrypoint and

package/dist/core/build/static-build.js

@@ -69,20 +69,16 @@ async function viteBuild(opts) {
     teardown();
   }
   const ssrOutputChunkNames = [];
-  const ssrOutputAssetNames = [];
   for (const output of ssrOutputs) {
     for (const chunk of output.output) {
       if (chunk.type === "chunk") {
         ssrOutputChunkNames.push(chunk.fileName);
       }
-      if (chunk.type === "asset") {
-        ssrOutputAssetNames.push(chunk.fileName);
-      }
     }
   }
-  return { internals, ssrOutputChunkNames, ssrOutputAssetNames, contentFileNames };
+  return { internals, ssrOutputChunkNames, contentFileNames };
 }
-async function staticBuild(opts, internals, ssrOutputChunkNames, ssrOutputAssetNames, contentFileNames) {
+async function staticBuild(opts, internals, ssrOutputChunkNames, contentFileNames) {
   const { settings } = opts;
   if (settings.buildOutput === "static") {
     settings.timer.start("Static generate");
@@ -93,7 +89,7 @@ async function staticBuild(opts, internals, ssrOutputChunkNames, ssrOutputAssetN
     settings.timer.start("Server generate");
     await generatePages(opts, internals);
     await cleanStaticOutput(opts, internals);
-    await ssrMoveAssets(opts, ssrOutputAssetNames);
+    await ssrMoveAssets(opts);
     settings.timer.end("Server generate");
   }
 }
@@ -309,15 +305,21 @@ async function copyFiles(fromFolder, toFolder, includeDotfiles = false) {
     })
   );
 }
-async function ssrMoveAssets(opts, ssrOutputAssetNames) {
+async function ssrMoveAssets(opts) {
   opts.logger.info("build", "Rearranging server assets...");
   const serverRoot = opts.settings.buildOutput === "static" ? opts.settings.config.build.client : opts.settings.config.build.server;
   const clientRoot = opts.settings.config.build.client;
-  if (ssrOutputAssetNames.length > 0) {
+  const assets = opts.settings.config.build.assets;
+  const serverAssets = new URL(`./${assets}/`, appendForwardSlash(serverRoot.toString()));
+  const clientAssets = new URL(`./${assets}/`, appendForwardSlash(clientRoot.toString()));
+  const files = await glob(`**/*`, {
+    cwd: fileURLToPath(serverAssets)
+  });
+  if (files.length > 0) {
     await Promise.all(
-      ssrOutputAssetNames.map(async function moveAsset(filename) {
-        const currentUrl = new URL(filename, appendForwardSlash(serverRoot.toString()));
-        const clientUrl = new URL(filename, appendForwardSlash(clientRoot.toString()));
+      files.map(async function moveAsset(filename) {
+        const currentUrl = new URL(filename, appendForwardSlash(serverAssets.toString()));
+        const clientUrl = new URL(filename, appendForwardSlash(clientAssets.toString()));
         const dir = new URL(path.parse(clientUrl.href).dir);
         if (!fs.existsSync(dir)) await fs.promises.mkdir(dir, { recursive: true });
         return fs.promises.rename(currentUrl, clientUrl);

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.0.5";
+const ASTRO_VERSION = "5.0.7";
 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

@@ -3,14 +3,12 @@ import * as vite from "vite";
 import {
   runHookConfigDone,
   runHookConfigSetup,
-  runHookRoutesResolved,
   runHookServerDone,
   runHookServerStart
 } from "../../integrations/hooks.js";
 import { createDevelopmentManifest } from "../../vite-plugin-astro-server/plugin.js";
 import { createVite } from "../create-vite.js";
 import { apply as applyPolyfill } from "../polyfill.js";
-import { injectDefaultDevRoutes } from "../routing/dev-default.js";
 import { createRouteManifest } from "../routing/index.js";
 import { syncInternal } from "../sync/index.js";
 import { warnMissingAdapter } from "./adapter-validation.js";
@@ -36,10 +34,8 @@ async function createContainer({
   const isServerOpenBoolean = serverOpen && !isRestart;
   const open = isServerOpenURL ? serverOpen : isServerOpenBoolean ? base : false;
   const rendererClientEntries = settings.renderers.map((r) => r.clientEntrypoint).filter(Boolean);
-  let manifest = await createRouteManifest({ settings, fsMod: fs }, logger, { dev: true });
+  const manifest = await createRouteManifest({ settings, fsMod: fs }, logger, { dev: true });
   const devSSRManifest = createDevelopmentManifest(settings);
-  manifest = injectDefaultDevRoutes(settings, devSSRManifest, manifest);
-  await runHookRoutesResolved({ settings, logger, routes: manifest.routes });
   await runHookConfigDone({ settings, logger, command: "dev" });
   warnMissingAdapter(logger, settings);
   const mode = inlineConfig?.mode ?? "development";

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

package/dist/core/messages.js

@@ -38,7 +38,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.0.5";
+  const version = "5.0.7";
   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.0.5"}`
+        `v${"5.0.7"}`
       )} ${headline}`
     );
   }

package/dist/core/render/params-and-props.js

@@ -19,6 +19,7 @@ async function getProps(opts) {
     ssr: serverLike,
     base
   });
+  if (!staticPaths.length) return {};
   const params = getParams(route, decodeURI(pathname));
   const matchedStaticPath = findPathItemByKey(staticPaths, params, route, logger);
   if (!matchedStaticPath && (serverLike ? route.prerender : true)) {
@@ -36,7 +37,7 @@ async function getProps(opts) {
 }
 function getParams(route, pathname) {
   if (!route.params.length) return {};
-  const paramsMatch = route.pattern.exec(pathname);
+  const paramsMatch = route.pattern.exec(pathname) || route.fallbackRoutes.map((fallbackRoute) => fallbackRoute.pattern.exec(pathname)).find((x) => x);
   if (!paramsMatch) return {};
   const params = {};
   route.params.forEach((key, i) => {

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

@@ -1,11 +1,11 @@
-import type { ComponentInstance, ManifestData } from '../../types/astro.js';
+import type { ComponentInstance } from '../../types/astro.js';
 import type { SSRManifest } from '../app/types.js';
-export declare function injectDefaultRoutes(ssrManifest: SSRManifest, routeManifest: ManifestData): ManifestData;
 type DefaultRouteParams = {
     instance: ComponentInstance;
     matchesComponent(filePath: URL): boolean;
     route: string;
     component: string;
 };
+export declare const DEFAULT_COMPONENTS: string[];
 export declare function createDefaultRoutes(manifest: SSRManifest): DefaultRouteParams[];
 export {};

package/dist/core/routing/default.js

@@ -2,19 +2,10 @@ import { DEFAULT_404_COMPONENT } from "../constants.js";
 import {
   SERVER_ISLAND_COMPONENT,
   SERVER_ISLAND_ROUTE,
-  createEndpoint as createServerIslandEndpoint,
-  ensureServerIslandRoute
+  createEndpoint as createServerIslandEndpoint
 } from "../server-islands/endpoint.js";
-import {
-  DEFAULT_404_ROUTE,
-  default404Instance,
-  ensure404Route
-} from "./astro-designed-error-pages.js";
-function injectDefaultRoutes(ssrManifest, routeManifest) {
-  ensure404Route(routeManifest);
-  ensureServerIslandRoute(ssrManifest, routeManifest);
-  return routeManifest;
-}
+import { DEFAULT_404_ROUTE, default404Instance } from "./astro-designed-error-pages.js";
+const DEFAULT_COMPONENTS = [DEFAULT_404_COMPONENT, SERVER_ISLAND_COMPONENT];
 function createDefaultRoutes(manifest) {
   const root = new URL(manifest.hrefRoot);
   return [
@@ -33,6 +24,6 @@ function createDefaultRoutes(manifest) {
   ];
 }
 export {
-  createDefaultRoutes,
-  injectDefaultRoutes
+  DEFAULT_COMPONENTS,
+  createDefaultRoutes
 };

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

@@ -4,6 +4,7 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { bold } from "kleur/colors";
 import pLimit from "p-limit";
+import { injectImageEndpoint } from "../../../assets/endpoint/config.js";
 import { toRoutingStrategy } from "../../../i18n/utils.js";
 import { runHookRoutesResolved } from "../../../integrations/hooks.js";
 import { getPrerenderDefault } from "../../../prerender/utils.js";
@@ -11,7 +12,9 @@ import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "../../constants.js";
 import { MissingIndexForInternationalization } from "../../errors/errors-data.js";
 import { AstroError } from "../../errors/index.js";
 import { removeLeadingForwardSlash, slash } from "../../path.js";
+import { injectServerIslandRoute } from "../../server-islands/endpoint.js";
 import { resolvePages } from "../../util.js";
+import { ensure404Route } from "../astro-designed-error-pages.js";
 import { routeComparator } from "../priority.js";
 import { getRouteGenerator } from "./generator.js";
 import { getPattern } from "./pattern.js";
@@ -493,9 +496,14 @@ async function createRouteManifest(params, logger, { dev = false } = {}) {
       }
     }
   }
-  if (!dev) {
-    await runHookRoutesResolved({ routes, settings, logger });
+  if (dev) {
+    ensure404Route({ routes });
   }
+  if (dev || settings.buildOutput === "server") {
+    injectImageEndpoint(settings, { routes }, dev ? "dev" : "build");
+    injectServerIslandRoute(settings.config, { routes });
+  }
+  await runHookRoutesResolved({ routes, settings, logger });
   return {
     routes
   };

package/dist/core/server-islands/endpoint.d.ts

@@ -4,6 +4,6 @@ export declare const SERVER_ISLAND_ROUTE = "/_server-islands/[name]";
 export declare const SERVER_ISLAND_COMPONENT = "_server-islands.astro";
 type ConfigFields = Pick<SSRManifest, 'base' | 'trailingSlash'>;
 export declare function getServerIslandRouteData(config: ConfigFields): RouteData;
-export declare function ensureServerIslandRoute(config: ConfigFields, routeManifest: ManifestData): void;
+export declare function injectServerIslandRoute(config: ConfigFields, routeManifest: ManifestData): void;
 export declare function createEndpoint(manifest: SSRManifest): ComponentInstance;
 export {};

package/dist/core/server-islands/endpoint.js

@@ -28,10 +28,7 @@ function getServerIslandRouteData(config) {
   };
   return route;
 }
-function ensureServerIslandRoute(config, routeManifest) {
-  if (routeManifest.routes.some((route) => route.route === "/_server-islands/[name]")) {
-    return;
-  }
+function injectServerIslandRoute(config, routeManifest) {
   routeManifest.routes.unshift(getServerIslandRouteData(config));
 }
 function badRequest(reason) {
@@ -125,6 +122,6 @@ export {
   SERVER_ISLAND_COMPONENT,
   SERVER_ISLAND_ROUTE,
   createEndpoint,
-  ensureServerIslandRoute,
-  getServerIslandRouteData
+  getServerIslandRouteData,
+  injectServerIslandRoute
 };

package/dist/i18n/index.d.ts

@@ -97,7 +97,7 @@ export type MiddlewarePayload = {
     fallbackType: 'redirect' | 'rewrite';
 };
 export declare function redirectToDefaultLocale({ trailingSlash, format, base, defaultLocale, }: MiddlewarePayload): (context: APIContext, statusCode?: ValidRedirectStatus) => Response;
-export declare function notFound({ base, locales }: MiddlewarePayload): (context: APIContext, response?: Response) => Response | undefined;
+export declare function notFound({ base, locales, fallback }: MiddlewarePayload): (context: APIContext, response?: Response) => Response | undefined;
 export type RedirectToFallback = (context: APIContext, response: Response) => Promise<Response>;
 export declare function redirectToFallback({ fallback, locales, defaultLocale, strategy, base, fallbackType, }: MiddlewarePayload): (context: APIContext, response: Response) => Promise<Response>;
 export declare function createMiddleware(i18nManifest: SSRManifest['i18n'], base: SSRManifest['base'], trailingSlash: SSRManifest['trailingSlash'], format: SSRManifest['buildFormat']): import("../types/public/common.js").MiddlewareHandler;

package/dist/i18n/index.js

@@ -177,9 +177,11 @@ function redirectToDefaultLocale({
     }
   };
 }
-function notFound({ base, locales }) {
+function notFound({ base, locales, fallback }) {
   return function(context, response) {
-    if (response?.headers.get(REROUTE_DIRECTIVE_HEADER) === "no") return response;
+    if (response?.headers.get(REROUTE_DIRECTIVE_HEADER) === "no" && typeof fallback === "undefined") {
+      return response;
+    }
     const url = context.url;
     const isRoot = url.pathname === base + "/" || url.pathname === base;
     if (!(isRoot || pathHasLocale(url.pathname, locales))) {

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

@@ -1,7 +1,7 @@
 import { clsx } from "clsx";
 import { HTMLString, markHTMLString } from "../escape.js";
 const voidElementNames = /^(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)$/i;
-const htmlBooleanAttributes = /^(?:allowfullscreen|async|autofocus|autoplay|checked|controls|default|defer|disabled|disablepictureinpicture|disableremoteplayback|formnovalidate|hidden|loop|nomodule|novalidate|open|playsinline|readonly|required|reversed|scoped|seamless|selected|itemscope)$/i;
+const htmlBooleanAttributes = /^(?:allowfullscreen|async|autofocus|autoplay|checked|controls|default|defer|disabled|disablepictureinpicture|disableremoteplayback|formnovalidate|hidden|inert|loop|nomodule|novalidate|open|playsinline|readonly|required|reversed|scoped|seamless|selected|itemscope)$/i;
 const AMPERSAND_REGEX = /&/g;
 const DOUBLE_QUOTE_REGEX = /"/g;
 const STATIC_DIRECTIVES = /* @__PURE__ */ new Set(["set:html", "set:text"]);

package/dist/virtual-modules/i18n.js

@@ -131,10 +131,10 @@ if (i18n?.routing === "manual") {
     fallbackType = toFallbackType(customOptions);
     const manifest = {
       ...i18n,
-      fallback: void 0,
       strategy,
       domainLookupTable: {},
-      fallbackType
+      fallbackType,
+      fallback: i18n.fallback
     };
     return I18nInternals.createMiddleware(manifest, base, trailingSlash, format);
   };

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

@@ -9,7 +9,6 @@ import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { patchOverlay } from "../core/errors/overlay.js";
 import { NOOP_MIDDLEWARE_FN } from "../core/middleware/noop-middleware.js";
 import { createViteLoader } from "../core/module-loader/index.js";
-import { injectDefaultDevRoutes } from "../core/routing/dev-default.js";
 import { createRouteManifest } from "../core/routing/index.js";
 import { getRoutePrerenderOption } from "../core/routing/manifest/prerender.js";
 import { toFallbackType, toRoutingStrategy } from "../i18n/utils.js";
@@ -53,16 +52,12 @@ function createVitePluginAstroServer({
           try {
             const content = await fsMod.promises.readFile(routePath, "utf-8");
             await getRoutePrerenderOption(content, route, settings, logger);
+            await runHookRoutesResolved({ routes: routeManifest.routes, settings, logger });
           } catch (_) {
           }
         } else {
-          routeManifest = injectDefaultDevRoutes(
-            settings,
-            devSSRManifest,
-            await createRouteManifest({ settings, fsMod }, logger, { dev: true })
-          );
+          routeManifest = await createRouteManifest({ settings, fsMod }, logger, { dev: true });
         }
-        await runHookRoutesResolved({ routes: routeManifest.routes, settings, logger });
         warnMissingAdapter(logger, settings);
         pipeline.manifest.checkOrigin = settings.config.security.checkOrigin && settings.buildOutput === "server";
         pipeline.setManifestData(routeManifest);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.0.5",
+  "version": "5.0.7",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",

package/templates/actions.mjs

@@ -1,4 +1,9 @@
-import { ActionError, deserializeActionResult, getActionQueryString } from 'astro:actions';
+import {
+	ActionError,
+	appendForwardSlash,
+	deserializeActionResult,
+	getActionQueryString,
+} from 'astro:actions';
 
 const ENCODED_DOT = '%2E';
 
@@ -83,7 +88,15 @@ async function handleAction(param, path, context) {
 			headers.set('Content-Length', '0');
 		}
 	}
-	const rawResult = await fetch(`${import.meta.env.BASE_URL.replace(/\/$/, '')}/_actions/${path}`, {
+
+	const shouldAppendTrailingSlash = '/** @TRAILING_SLASH@ **/';
+	let actionPath = import.meta.env.BASE_URL.replace(/\/$/, '') + '/_actions/' + path;
+
+	if (shouldAppendTrailingSlash) {
+		actionPath = appendForwardSlash(actionPath);
+	}
+
+	const rawResult = await fetch(actionPath, {
 		method: 'POST',
 		body,
 		headers,

package/templates/env.mjs

@@ -1,6 +1,7 @@
 // @ts-check
 import { schema } from 'virtual:astro:env/internal';
 import {
+	// biome-ignore lint/correctness/noUnusedImports: `_getEnv` is used by the generated code
 	getEnv as _getEnv,
 	createInvalidVariablesError,
 	getEnvFieldType,

package/dist/core/routing/dev-default.d.ts

@@ -1,3 +0,0 @@
-import type { AstroSettings, ManifestData } from '../../types/astro.js';
-import type { SSRManifest } from '../app/types.js';
-export declare function injectDefaultDevRoutes(settings: AstroSettings, ssrManifest: SSRManifest, routeManifest: ManifestData): ManifestData;

package/dist/core/routing/dev-default.js

@@ -1,10 +0,0 @@
-import { ensureImageEndpointRoute } from "../../assets/endpoint/config.js";
-import { injectDefaultRoutes } from "./default.js";
-function injectDefaultDevRoutes(settings, ssrManifest, routeManifest) {
-  ensureImageEndpointRoute(settings, routeManifest, "dev");
-  injectDefaultRoutes(ssrManifest, routeManifest);
-  return routeManifest;
-}
-export {
-  injectDefaultDevRoutes
-};