astro 6.1.3 → 6.1.5

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

@@ -4,13 +4,31 @@ import { appendForwardSlash, prependForwardSlash } from "@astrojs/internal-helpe
 import colors from "piccolore";
 import { notFoundTemplate, subpathNotUsedTemplate } from "../template/4xx.js";
 import { writeHtmlResponse } from "./response.js";
+function resolveDevRoot(base, site) {
+  const effectiveBase = base || "/";
+  const siteUrl = site ? new URL(effectiveBase, site) : void 0;
+  const devRootURL = new URL(effectiveBase, "http://localhost");
+  const devRoot = siteUrl ? siteUrl.pathname : devRootURL.pathname;
+  const devRootReplacement = devRoot.endsWith("/") ? "/" : "";
+  return { devRoot, devRootReplacement };
+}
+function evaluateBaseRewrite(url, pathname, acceptHeader, devRoot, devRootReplacement) {
+  if (pathname.startsWith(devRoot)) {
+    let newUrl = url.replace(devRoot, devRootReplacement);
+    if (!newUrl.startsWith("/")) newUrl = prependForwardSlash(newUrl);
+    return { action: "rewrite", newUrl };
+  }
+  if (pathname === "/" || pathname === "/index.html") {
+    return { action: "not-found-subpath", pathname, devRoot };
+  }
+  if (acceptHeader?.includes("text/html")) {
+    return { action: "not-found", pathname };
+  }
+  return { action: "check-public" };
+}
 function baseMiddleware(settings, logger) {
   const { config } = settings;
-  const base = config.base || "/";
-  const site = config.site ? new URL(base, config.site) : void 0;
-  const devRootURL = new URL(base, "http://localhost");
-  const devRoot = site ? site.pathname : devRootURL.pathname;
-  const devRootReplacement = devRoot.endsWith("/") ? "/" : "";
+  const { devRoot, devRootReplacement } = resolveDevRoot(config.base, config.site);
   return function devBaseMiddleware(req, res, next) {
     const url = req.url;
     let pathname;
@@ -19,40 +37,52 @@ function baseMiddleware(settings, logger) {
     } catch (e) {
       return next(e);
     }
-    if (pathname.startsWith(devRoot)) {
-      req.url = url.replace(devRoot, devRootReplacement);
-      if (!req.url.startsWith("/")) req.url = prependForwardSlash(req.url);
-      return next();
-    }
-    if (pathname === "/" || pathname === "/index.html") {
-      const html = subpathNotUsedTemplate(devRoot, pathname);
-      return writeHtmlResponse(res, 404, html);
-    }
-    if (req.headers.accept?.includes("text/html")) {
-      const html = notFoundTemplate(pathname);
-      return writeHtmlResponse(res, 404, html);
-    }
-    const publicPath = new URL("." + req.url, config.publicDir);
-    fs.stat(publicPath, (_err, stats) => {
-      if (stats) {
-        const publicDir = appendForwardSlash(
-          path.posix.relative(config.root.pathname, config.publicDir.pathname)
-        );
-        const expectedLocation = new URL(devRootURL.pathname + url, devRootURL).pathname;
-        logger.error(
-          "router",
-          `Request URLs for ${colors.bold(
-            publicDir
-          )} assets must also include your base. "${expectedLocation}" expected, but received "${url}".`
-        );
-        const html = subpathNotUsedTemplate(devRoot, pathname);
+    const decision = evaluateBaseRewrite(
+      url,
+      pathname,
+      req.headers.accept,
+      devRoot,
+      devRootReplacement
+    );
+    switch (decision.action) {
+      case "rewrite":
+        req.url = decision.newUrl;
+        return next();
+      case "not-found-subpath": {
+        const html = subpathNotUsedTemplate(decision.devRoot, decision.pathname);
+        return writeHtmlResponse(res, 404, html);
+      }
+      case "not-found": {
+        const html = notFoundTemplate(decision.pathname);
         return writeHtmlResponse(res, 404, html);
-      } else {
-        next();
       }
-    });
+      case "check-public": {
+        const publicPath = new URL("." + req.url, config.publicDir);
+        fs.stat(publicPath, (_err, stats) => {
+          if (stats) {
+            const publicDir = appendForwardSlash(
+              path.posix.relative(config.root.pathname, config.publicDir.pathname)
+            );
+            const devRootURL = new URL(devRoot, "http://localhost");
+            const expectedLocation = new URL(devRootURL.pathname + url, devRootURL).pathname;
+            logger.error(
+              "router",
+              `Request URLs for ${colors.bold(
+                publicDir
+              )} assets must also include your base. "${expectedLocation}" expected, but received "${url}".`
+            );
+            const html = subpathNotUsedTemplate(devRoot, pathname);
+            return writeHtmlResponse(res, 404, html);
+          } else {
+            next();
+          }
+        });
+      }
+    }
   };
 }
 export {
-  baseMiddleware
+  baseMiddleware,
+  evaluateBaseRewrite,
+  resolveDevRoot
 };

package/dist/vite-plugin-astro-server/trailing-slash.d.ts

@@ -1,3 +1,37 @@
 import type * as vite from 'vite';
 import type { AstroSettings } from '../types/astro.js';
+/**
+ * Outcome of the trailing-slash evaluation for a dev-server request.
+ *
+ * - **`next`** — The URL is acceptable. Pass the request through to the next
+ *   middleware / route handler unchanged.
+ * - **`redirect`** — The URL contains duplicate trailing slashes (e.g.
+ *   `/about//`). The client should be permanently redirected (301) to the
+ *   collapsed form (`/about/`) so crawlers and browsers update their links.
+ * - **`reject`** — The URL's trailing-slash style conflicts with the project's
+ *   `trailingSlash` config (`'always'` or `'never'`). The dev server responds
+ *   with a 404 and a human-readable error page explaining the mismatch, giving
+ *   the developer immediate feedback that their link is wrong before it reaches
+ *   production.
+ */
+export type TrailingSlashDecision = {
+    action: 'next';
+} | {
+    action: 'redirect';
+    status: 301;
+    location: string;
+} | {
+    action: 'reject';
+    status: 404;
+    pathname: string;
+};
+/**
+ * Pure decision function for trailing-slash dev-server behavior.
+ *
+ * Evaluates a decoded `pathname`, the query-string portion (including leading
+ * `?`), and the project's `trailingSlash` config and returns the action the
+ * middleware should take. The middleware is responsible for translating the
+ * decision into an HTTP response.
+ */
+export declare function evaluateTrailingSlash(pathname: string, search: string, trailingSlash: 'always' | 'never' | 'ignore'): TrailingSlashDecision;
 export declare function trailingSlashMiddleware(settings: AstroSettings): vite.Connect.NextHandleFunction;

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

@@ -5,6 +5,19 @@ import {
 } from "@astrojs/internal-helpers/path";
 import { trailingSlashMismatchTemplate } from "../template/4xx.js";
 import { writeHtmlResponse, writeRedirectResponse } from "./response.js";
+function evaluateTrailingSlash(pathname, search, trailingSlash) {
+  if (isInternalPath(pathname)) {
+    return { action: "next" };
+  }
+  const collapsed = collapseDuplicateTrailingSlashes(pathname, true);
+  if (pathname && collapsed !== pathname) {
+    return { action: "redirect", status: 301, location: `${collapsed}${search}` };
+  }
+  if (trailingSlash === "never" && pathname.endsWith("/") && pathname !== "/" || trailingSlash === "always" && !pathname.endsWith("/") && !hasFileExtension(pathname)) {
+    return { action: "reject", status: 404, pathname };
+  }
+  return { action: "next" };
+}
 function trailingSlashMiddleware(settings) {
   const { trailingSlash } = settings.config;
   return function devTrailingSlash(req, res, next) {
@@ -15,20 +28,20 @@ function trailingSlashMiddleware(settings) {
     } catch (e) {
       return next(e);
     }
-    if (isInternalPath(pathname)) {
-      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);
+    const decision = evaluateTrailingSlash(pathname, url.search, trailingSlash);
+    switch (decision.action) {
+      case "redirect":
+        return writeRedirectResponse(res, decision.status, decision.location);
+      case "reject": {
+        const html = trailingSlashMismatchTemplate(decision.pathname, trailingSlash);
+        return writeHtmlResponse(res, decision.status, html);
+      }
+      case "next":
+        return next();
     }
-    return next();
   };
 }
 export {
+  evaluateTrailingSlash,
   trailingSlashMiddleware
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "6.1.3",
+  "version": "6.1.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -114,7 +114,6 @@
     "cookie": "^1.1.1",
     "devalue": "^5.6.3",
     "diff": "^8.0.3",
-    "dlv": "^1.1.3",
     "dset": "^3.1.4",
     "es-module-lexer": "^2.0.0",
     "esbuild": "^0.27.3",
@@ -153,9 +152,9 @@
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6",
-    "@astrojs/internal-helpers": "0.8.0",
     "@astrojs/markdown-remark": "7.1.0",
-    "@astrojs/telemetry": "3.3.0"
+    "@astrojs/telemetry": "3.3.0",
+    "@astrojs/internal-helpers": "0.8.0"
   },
   "optionalDependencies": {
     "sharp": "^0.34.0"
@@ -164,7 +163,6 @@
     "@astrojs/compiler-rs": "^0.1.6",
     "@playwright/test": "1.58.2",
     "@types/aria-query": "^5.0.4",
-    "@types/dlv": "^1.1.5",
     "@types/hast": "^3.0.4",
     "@types/html-escaper": "3.0.4",
     "@types/http-cache-semantics": "^4.2.0",