astro 5.2.3 → 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.3") {
+    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.3") {
-      await this.#store.metaStore().set("astro-version", "5.2.3");
+    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.3";
+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.3";
+  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.3";
+  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.3"}`
+        `v${"5.2.4"}`
       )} ${headline}`
     );
   }

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,10 +191,10 @@ function createInjectedRoutes({ settings, cwd }) {
       return getParts(s, component);
     });
     const type = resolved.endsWith(".astro") ? "page" : "endpoint";
-    const { trailingSlash } = config;
+    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/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.3",
+  "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",
@@ -159,9 +159,9 @@
     "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/telemetry": "3.2.0"
+    "@astrojs/internal-helpers": "0.5.1"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"