astro 5.2.2 → 5.2.4

package/dist/content/content-layer.js

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

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

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

package/dist/core/messages.js

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

package/dist/core/render-context.js

@@ -24,9 +24,8 @@ import { callMiddleware } from "./middleware/callMiddleware.js";
 import { sequence } from "./middleware/index.js";
 import { renderRedirect } from "./redirects/render.js";
 import { Slots, getParams, getProps } from "./render/index.js";
-import { isRoute404or500 } from "./routing/match.js";
+import { isRoute404or500, isRouteServerIsland } from "./routing/match.js";
 import { copyRequest, getOriginPathname, setOriginPathname } from "./routing/rewrite.js";
-import { SERVER_ISLAND_COMPONENT } from "./server-islands/endpoint.js";
 import { AstroSession } from "./session.js";
 const apiContextRoutesSymbol = Symbol.for("context.routes");
 class RenderContext {
@@ -479,7 +478,7 @@ class RenderContext {
       return this.#currentLocale;
     }
     let computedLocale;
-    if (routeData.component === SERVER_ISLAND_COMPONENT) {
+    if (isRouteServerIsland(routeData)) {
       let referer = this.request.headers.get("referer");
       if (referer) {
         if (URL.canParse(referer)) {

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

@@ -14,7 +14,7 @@ import {
   UnsupportedExternalRedirect
 } from "../../errors/errors-data.js";
 import { AstroError } from "../../errors/index.js";
-import { removeLeadingForwardSlash, slash } from "../../path.js";
+import { hasFileExtension, 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";
@@ -145,10 +145,10 @@ function createFileBasedRoutes({ settings, cwd, fsMod }, logger) {
       } else {
         components.push(item.file);
         const component = item.file;
-        const { trailingSlash } = settings.config;
+        const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
+        const trailingSlash = trailingSlashForPath(pathname, settings.config);
         const pattern = getPattern(segments, settings.config.base, trailingSlash);
         const generate = getRouteGenerator(segments, trailingSlash);
-        const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
         const route = joinSegments(segments);
         routes.push({
           route,
@@ -178,6 +178,7 @@ function createFileBasedRoutes({ settings, cwd, fsMod }, logger) {
   }
   return routes;
 }
+const trailingSlashForPath = (pathname, config) => pathname && hasFileExtension(pathname) ? "ignore" : config.trailingSlash;
 function createInjectedRoutes({ settings, cwd }) {
   const { config } = settings;
   const prerender = getPrerenderDefault(config);
@@ -190,11 +191,10 @@ function createInjectedRoutes({ settings, cwd }) {
       return getParts(s, component);
     });
     const type = resolved.endsWith(".astro") ? "page" : "endpoint";
-    const isPage = type === "page";
-    const trailingSlash = isPage ? config.trailingSlash : "never";
+    const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
+    const trailingSlash = trailingSlashForPath(pathname, config);
     const pattern = getPattern(segments, settings.config.base, trailingSlash);
     const generate = getRouteGenerator(segments, trailingSlash);
-    const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
     const params = segments.flat().filter((p) => p.dynamic).map((p) => p.content);
     const route = joinSegments(segments);
     routes.push({

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

@@ -13,3 +13,26 @@ export declare function isRoute500(route: string): boolean;
  * @returns {boolean} `true` if the route matches a 404 or 500 error page, otherwise `false`.
  */
 export declare function isRoute404or500(route: RouteData): boolean;
+/**
+ * Determines if a given route is associated with the server island component.
+ *
+ * @param {RouteData} route - The route data object to evaluate.
+ * @return {boolean} Returns true if the route's component is the server island component, otherwise false.
+ */
+export declare function isRouteServerIsland(route: RouteData): boolean;
+/**
+ * Determines whether the given `Request` is targeted to a "server island" based on its URL.
+ *
+ * @param {Request} request - The request object to be evaluated.
+ * @param {string} [base=''] - The base path provided via configuration.
+ * @return {boolean} - Returns `true` if the request is for a server island, otherwise `false`.
+ */
+export declare function isRequestServerIsland(request: Request, base?: string): boolean;
+/**
+ * Checks if the given request corresponds to a 404 or 500 route based on the specified base path.
+ *
+ * @param {Request} request - The HTTP request object to be checked.
+ * @param {string} [base=''] - The base path to trim from the request's URL before checking the route. Default is an empty string.
+ * @return {boolean} Returns true if the request matches a 404 or 500 route; otherwise, returns false.
+ */
+export declare function requestIs404Or500(request: Request, base?: string): boolean;

package/dist/core/routing/match.js

@@ -1,3 +1,4 @@
+import { SERVER_ISLAND_BASE_PREFIX, SERVER_ISLAND_COMPONENT } from "../server-islands/endpoint.js";
 function matchRoute(pathname, manifest) {
   const decodedPathname = decodeURI(pathname);
   return manifest.routes.find((route) => {
@@ -18,10 +19,26 @@ function isRoute500(route) {
 function isRoute404or500(route) {
   return isRoute404(route.route) || isRoute500(route.route);
 }
+function isRouteServerIsland(route) {
+  return route.component === SERVER_ISLAND_COMPONENT;
+}
+function isRequestServerIsland(request, base = "") {
+  const url = new URL(request.url);
+  const pathname = url.pathname.slice(base.length);
+  return pathname.startsWith(SERVER_ISLAND_BASE_PREFIX);
+}
+function requestIs404Or500(request, base = "") {
+  const url = new URL(request.url);
+  const pathname = url.pathname.slice(base.length);
+  return isRoute404(pathname) || isRoute500(pathname);
+}
 export {
+  isRequestServerIsland,
   isRoute404,
   isRoute404or500,
   isRoute500,
+  isRouteServerIsland,
   matchAllRoutes,
-  matchRoute
+  matchRoute,
+  requestIs404Or500
 };

package/dist/core/routing/rewrite.js

@@ -25,9 +25,10 @@ function findRouteToRewrite({
     pathname = shouldAppendForwardSlash(trailingSlash, buildFormat) ? appendForwardSlash(newUrl.pathname) : removeTrailingForwardSlash(newUrl.pathname);
     pathname = pathname.slice(base.length);
   }
+  const decodedPathname = decodeURI(pathname);
   let foundRoute;
   for (const route of routes) {
-    if (route.pattern.test(decodeURI(pathname))) {
+    if (route.pattern.test(decodedPathname)) {
       foundRoute = route;
       break;
     }
@@ -36,7 +37,7 @@ function findRouteToRewrite({
     return {
       routeData: foundRoute,
       newUrl,
-      pathname
+      pathname: decodedPathname
     };
   } else {
     const custom404 = routes.find((route) => route.route === "/404");

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

@@ -2,6 +2,7 @@ import type { ComponentInstance, RoutesList } from '../../types/astro.js';
 import type { RouteData, SSRManifest } from '../../types/public/internal.js';
 export declare const SERVER_ISLAND_ROUTE = "/_server-islands/[name]";
 export declare const SERVER_ISLAND_COMPONENT = "_server-islands.astro";
+export declare const SERVER_ISLAND_BASE_PREFIX = "_server-islands";
 type ConfigFields = Pick<SSRManifest, 'base' | 'trailingSlash'>;
 export declare function getServerIslandRouteData(config: ConfigFields): RouteData;
 export declare function injectServerIslandRoute(config: ConfigFields, routeManifest: RoutesList): void;

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

@@ -8,6 +8,7 @@ import { decryptString } from "../encryption.js";
 import { getPattern } from "../routing/manifest/pattern.js";
 const SERVER_ISLAND_ROUTE = "/_server-islands/[name]";
 const SERVER_ISLAND_COMPONENT = "_server-islands.astro";
+const SERVER_ISLAND_BASE_PREFIX = "_server-islands";
 function getServerIslandRouteData(config) {
   const segments = [
     [{ content: "_server-islands", dynamic: false, spread: false }],
@@ -120,6 +121,7 @@ function createEndpoint(manifest) {
   return instance;
 }
 export {
+  SERVER_ISLAND_BASE_PREFIX,
   SERVER_ISLAND_COMPONENT,
   SERVER_ISLAND_ROUTE,
   createEndpoint,

package/dist/i18n/index.d.ts

@@ -3,7 +3,6 @@ import type { AstroConfig, Locales, ValidRedirectStatus } from '../types/public/
 import type { APIContext } from '../types/public/context.js';
 import type { RoutingStrategies } from './utils.js';
 export declare function requestHasLocale(locales: Locales): (context: APIContext) => boolean;
-export declare function requestIs404Or500(request: Request, base?: string): boolean;
 export declare function pathHasLocale(path: string, locales: Locales): boolean;
 type GetLocaleRelativeUrl = GetLocaleOptions & {
     locale: string;

package/dist/i18n/index.js

@@ -3,18 +3,12 @@ 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) {
     return pathHasLocale(context.url.pathname, locales);
   };
 }
-function requestIs404Or500(request, base = "") {
-  const url = new URL(request.url);
-  const pathname = url.pathname.slice(base.length);
-  return isRoute404(pathname) || isRoute500(pathname);
-}
 function pathHasLocale(path, locales) {
   const segments = path.split("/");
   for (const segment of segments) {
@@ -276,7 +270,6 @@ export {
   redirectToDefaultLocale,
   redirectToFallback,
   requestHasLocale,
-  requestIs404Or500,
   toCodes,
   toPaths
 };

package/dist/i18n/middleware.js

@@ -1,11 +1,11 @@
 import { REROUTE_DIRECTIVE_HEADER, ROUTE_TYPE_HEADER } from "../core/constants.js";
+import { isRequestServerIsland, requestIs404Or500 } from "../core/routing/match.js";
 import {
   normalizeTheLocale,
   notFound,
   redirectToDefaultLocale,
   redirectToFallback,
-  requestHasLocale,
-  requestIs404Or500
+  requestHasLocale
 } from "./index.js";
 function createI18nMiddleware(i18n, base, trailingSlash, format) {
   if (!i18n) return (_, next) => next();
@@ -58,6 +58,9 @@ function createI18nMiddleware(i18n, base, trailingSlash, format) {
     if (requestIs404Or500(context.request, base)) {
       return response;
     }
+    if (isRequestServerIsland(context.request, base)) {
+      return response;
+    }
     const { currentLocale } = context;
     switch (i18n.strategy) {
       // NOTE: theoretically, we should never hit this code path

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

@@ -4,20 +4,20 @@ import { writeHtmlResponse, writeRedirectResponse } from "./response.js";
 function trailingSlashMiddleware(settings) {
   const { trailingSlash } = settings.config;
   return function devTrailingSlash(req, res, next) {
-    const url = req.url;
-    const destination = collapseDuplicateTrailingSlashes(url, true);
-    if (url && destination !== url) {
-      return writeRedirectResponse(res, 301, destination);
-    }
+    const url = new URL(`http://localhost${req.url}`);
     let pathname;
     try {
-      pathname = decodeURI(new URL(url, "http://localhost").pathname);
+      pathname = decodeURI(url.pathname);
     } catch (e) {
       return next(e);
     }
     if (pathname.startsWith("/_") || pathname.startsWith("/@")) {
       return next();
     }
+    const destination = collapseDuplicateTrailingSlashes(pathname, true);
+    if (pathname && destination !== pathname) {
+      return writeRedirectResponse(res, 301, `${destination}${url.search}`);
+    }
     if (trailingSlash === "never" && pathname.endsWith("/") && pathname !== "/" || trailingSlash === "always" && !pathname.endsWith("/") && !hasFileExtension(pathname)) {
       const html = trailingSlashMismatchTemplate(pathname, trailingSlash);
       return writeHtmlResponse(res, 404, html);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.2.2",
+  "version": "5.2.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -128,7 +128,7 @@
     "fast-glob": "^3.3.3",
     "flattie": "^1.1.1",
     "github-slugger": "^2.0.0",
-    "html-escaper": "^3.0.3",
+    "html-escaper": "3.0.3",
     "http-cache-semantics": "^4.1.1",
     "js-yaml": "^4.1.0",
     "kleur": "^4.1.5",
@@ -138,12 +138,12 @@
     "mrmime": "^2.0.0",
     "neotraverse": "^0.6.18",
     "p-limit": "^6.2.0",
-    "p-queue": "^8.0.1",
-    "preferred-pm": "^4.0.0",
+    "p-queue": "^8.1.0",
+    "preferred-pm": "^4.1.0",
     "prompts": "^2.4.2",
     "rehype": "^13.0.2",
-    "semver": "^7.6.3",
-    "shiki": "^1.29.1",
+    "semver": "^7.7.0",
+    "shiki": "^1.29.2",
     "tinyexec": "^0.3.2",
     "tsconfck": "^3.1.4",
     "ultrahtml": "^1.5.3",
@@ -155,20 +155,20 @@
     "which-pm": "^3.0.0",
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^21.1.1",
-    "yocto-spinner": "^0.1.2",
+    "yocto-spinner": "^0.2.0",
     "zod": "^3.24.1",
     "zod-to-json-schema": "^3.24.1",
     "zod-to-ts": "^1.2.0",
-    "@astrojs/internal-helpers": "0.5.0",
     "@astrojs/telemetry": "3.2.0",
-    "@astrojs/markdown-remark": "6.1.0"
+    "@astrojs/markdown-remark": "6.1.0",
+    "@astrojs/internal-helpers": "0.5.1"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.4",
-    "@playwright/test": "^1.49.1",
+    "@playwright/test": "^1.50.0",
     "@types/aria-query": "^5.0.4",
     "@types/common-ancestor-path": "^1.0.2",
     "@types/cssesc": "^3.0.2",
@@ -176,7 +176,7 @@
     "@types/diff": "^5.2.3",
     "@types/dlv": "^1.1.5",
     "@types/hast": "^3.0.4",
-    "@types/html-escaper": "^3.0.2",
+    "@types/html-escaper": "3.0.2",
     "@types/http-cache-semantics": "^4.0.4",
     "@types/js-yaml": "^4.0.9",
     "@types/micromatch": "^4.0.9",
@@ -187,7 +187,7 @@
     "eol": "^0.10.0",
     "execa": "^8.0.1",
     "expect-type": "^1.1.0",
-    "fs-fixture": "^2.6.0",
+    "fs-fixture": "^2.7.0",
     "mdast-util-mdx": "^3.0.0",
     "mdast-util-mdx-jsx": "^3.2.0",
     "node-mocks-http": "^1.16.2",
@@ -196,11 +196,11 @@
     "rehype-slug": "^6.0.0",
     "rehype-toc": "^3.0.2",
     "remark-code-titles": "^0.1.2",
-    "rollup": "^4.31.0",
+    "rollup": "^4.32.1",
     "sass": "^1.83.4",
-    "undici": "^7.2.3",
+    "undici": "^7.3.0",
     "unified": "^11.0.5",
-    "vitest": "^3.0.2",
+    "vitest": "^3.0.4",
     "astro-scripts": "0.0.14"
   },
   "engines": {