astro 5.1.10 → 5.2.1

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

@@ -9,7 +9,7 @@ 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 { createRouteManifest } from "../core/routing/index.js";
+import { createRoutesList } from "../core/routing/index.js";
 import { getRoutePrerenderOption } from "../core/routing/manifest/prerender.js";
 import { toFallbackType, toRoutingStrategy } from "../i18n/utils.js";
 import { runHookRoutesResolved } from "../integrations/hooks.js";
@@ -19,21 +19,22 @@ import { recordServerError } from "./error.js";
 import { DevPipeline } from "./pipeline.js";
 import { handleRequest } from "./request.js";
 import { setRouteError } from "./server-state.js";
+import { trailingSlashMiddleware } from "./trailing-slash.js";
 function createVitePluginAstroServer({
   settings,
   logger,
   fs: fsMod,
-  manifest: routeManifest,
-  ssrManifest: devSSRManifest
+  routesList,
+  manifest
 }) {
   return {
     name: "astro:server",
     configureServer(viteServer) {
       const loader = createViteLoader(viteServer);
-      const pipeline = DevPipeline.create(routeManifest, {
+      const pipeline = DevPipeline.create(routesList, {
         loader,
         logger,
-        manifest: devSSRManifest,
+        manifest,
         settings
       });
       const controller = createController({ loader });
@@ -41,7 +42,7 @@ function createVitePluginAstroServer({
       async function rebuildManifest(path = null) {
         pipeline.clearRouteCache();
         if (path !== null) {
-          const route = routeManifest.routes.find(
+          const route = routesList.routes.find(
             (r) => normalizePath(path) === normalizePath(fileURLToPath(new URL(r.component, settings.config.root)))
           );
           if (!route) {
@@ -52,15 +53,15 @@ 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 });
+            await runHookRoutesResolved({ routes: routesList.routes, settings, logger });
           } catch (_) {
           }
         } else {
-          routeManifest = await createRouteManifest({ settings, fsMod }, logger, { dev: true });
+          routesList = await createRoutesList({ settings, fsMod }, logger, { dev: true });
         }
         warnMissingAdapter(logger, settings);
         pipeline.manifest.checkOrigin = settings.config.security.checkOrigin && settings.buildOutput === "server";
-        pipeline.setManifestData(routeManifest);
+        pipeline.setManifestData(routesList);
       }
       viteServer.watcher.on("add", rebuildManifest.bind(null, null));
       viteServer.watcher.on("unlink", rebuildManifest.bind(null, null));
@@ -90,6 +91,10 @@ function createVitePluginAstroServer({
           route: "",
           handle: baseMiddleware(settings, logger)
         });
+        viteServer.middlewares.stack.unshift({
+          route: "",
+          handle: trailingSlashMiddleware(settings)
+        });
         viteServer.middlewares.use(async function astroDevHandler(request, response) {
           if (request.url === void 0 || !request.method) {
             response.writeHead(500, "Incomplete request");
@@ -99,7 +104,7 @@ function createVitePluginAstroServer({
           localStorage.run(request, () => {
             handleRequest({
               pipeline,
-              manifestData: routeManifest,
+              routesList,
               controller,
               incomingRequest: request,
               incomingResponse: response
@@ -129,6 +134,12 @@ function createDevelopmentManifest(settings) {
   }
   return {
     hrefRoot: settings.config.root.toString(),
+    srcDir: settings.config.srcDir,
+    cacheDir: settings.config.cacheDir,
+    outDir: settings.config.outDir,
+    buildServerDir: settings.config.build.server,
+    buildClientDir: settings.config.build.client,
+    publicDir: settings.config.publicDir,
     trailingSlash: settings.config.trailingSlash,
     buildFormat: settings.config.build.format,
     compressHTML: settings.config.compressHTML,

package/dist/vite-plugin-astro-server/request.d.ts

@@ -1,14 +1,14 @@
 import type http from 'node:http';
-import type { ManifestData } from '../types/astro.js';
+import type { RoutesList } from '../types/astro.js';
 import type { DevServerController } from './controller.js';
 import type { DevPipeline } from './pipeline.js';
 type HandleRequest = {
     pipeline: DevPipeline;
-    manifestData: ManifestData;
+    routesList: RoutesList;
     controller: DevServerController;
     incomingRequest: http.IncomingMessage;
     incomingResponse: http.ServerResponse;
 };
 /** The main logic to route dev server requests to pages in Astro. */
-export declare function handleRequest({ pipeline, manifestData, controller, incomingRequest, incomingResponse, }: HandleRequest): Promise<void>;
+export declare function handleRequest({ pipeline, routesList, controller, incomingRequest, incomingResponse, }: HandleRequest): Promise<void>;
 export {};

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

@@ -5,7 +5,7 @@ import { handle500Response } from "./response.js";
 import { handleRoute, matchRoute } from "./route.js";
 async function handleRequest({
   pipeline,
-  manifestData,
+  routesList,
   controller,
   incomingRequest,
   incomingResponse
@@ -35,7 +35,7 @@ async function handleRequest({
     controller,
     pathname,
     async run() {
-      const matchedRoute = await matchRoute(pathname, manifestData, pipeline);
+      const matchedRoute = await matchRoute(pathname, routesList, pipeline);
       const resolvedPathname = matchedRoute?.resolvedPathname ?? pathname;
       return await handleRoute({
         matchedRoute,
@@ -43,7 +43,7 @@ async function handleRequest({
         pathname: resolvedPathname,
         body,
         pipeline,
-        manifestData,
+        routesList,
         incomingRequest,
         incomingResponse
       });

package/dist/vite-plugin-astro-server/route.d.ts

@@ -1,5 +1,5 @@
 import type http from 'node:http';
-import type { ComponentInstance, ManifestData } from '../types/astro.js';
+import type { ComponentInstance, RoutesList } from '../types/astro.js';
 import type { RouteData } from '../types/public/internal.js';
 import type { DevPipeline } from './pipeline.js';
 type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (...args: any) => Promise<infer R> ? R : any;
@@ -10,16 +10,16 @@ export interface MatchedRoute {
     preloadedComponent: ComponentInstance;
     mod: ComponentInstance;
 }
-export declare function matchRoute(pathname: string, manifestData: ManifestData, pipeline: DevPipeline): Promise<MatchedRoute | undefined>;
+export declare function matchRoute(pathname: string, routesList: RoutesList, pipeline: DevPipeline): Promise<MatchedRoute | undefined>;
 type HandleRoute = {
     matchedRoute: AsyncReturnType<typeof matchRoute>;
     url: URL;
     pathname: string;
     body: ArrayBuffer | undefined;
-    manifestData: ManifestData;
+    routesList: RoutesList;
     incomingRequest: http.IncomingMessage;
     incomingResponse: http.ServerResponse;
     pipeline: DevPipeline;
 };
-export declare function handleRoute({ matchedRoute, url, pathname, body, pipeline, manifestData, incomingRequest, incomingResponse, }: HandleRoute): Promise<void>;
+export declare function handleRoute({ matchedRoute, url, pathname, body, pipeline, routesList, incomingRequest, incomingResponse, }: HandleRoute): Promise<void>;
 export {};

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

@@ -27,9 +27,9 @@ function getCustom404Route(manifestData) {
 function getCustom500Route(manifestData) {
   return manifestData.routes.find((r) => isRoute500(r.route));
 }
-async function matchRoute(pathname, manifestData, pipeline) {
+async function matchRoute(pathname, routesList, pipeline) {
   const { config, logger, routeCache, serverLike, settings } = pipeline;
-  const matches = matchAllRoutes(pathname, manifestData);
+  const matches = matchAllRoutes(pathname, routesList);
   const preloadedMatches = await getSortedPreloadedMatches({ pipeline, matches, settings });
   for await (const { preloadedComponent, route: maybeRoute, filePath } of preloadedMatches) {
     try {
@@ -58,7 +58,7 @@ async function matchRoute(pathname, manifestData, pipeline) {
   }
   const altPathname = pathname.replace(/\/index\.html$/, "/").replace(/\.html$/, "");
   if (altPathname !== pathname) {
-    return await matchRoute(altPathname, manifestData, pipeline);
+    return await matchRoute(altPathname, routesList, pipeline);
   }
   if (matches.length) {
     const possibleRoutes = matches.flatMap((route) => route.component);
@@ -71,7 +71,7 @@ async function matchRoute(pathname, manifestData, pipeline) {
 ${AstroErrorData.NoMatchingStaticPathFound.hint(possibleRoutes)}`
     );
   }
-  const custom404 = getCustom404Route(manifestData);
+  const custom404 = getCustom404Route(routesList);
   if (custom404) {
     const filePath = new URL(`./${custom404.component}`, config.root);
     const preloadedComponent = await pipeline.preload(custom404, filePath);
@@ -91,7 +91,7 @@ async function handleRoute({
   pathname,
   body,
   pipeline,
-  manifestData,
+  routesList,
   incomingRequest,
   incomingResponse
 }) {
@@ -148,7 +148,7 @@ async function handleRoute({
       !response.headers.has(NOOP_MIDDLEWARE_HEADER) && !isReroute ? response.status : statusCodedMatched ?? response.status
     );
   } catch (err) {
-    const custom500 = getCustom500Route(manifestData);
+    const custom500 = getCustom500Route(routesList);
     if (!custom500) {
       throw err;
     }
@@ -177,7 +177,7 @@ async function handleRoute({
   if (statusCode === 404 && // If the body isn't null, that means the user sets the 404 status
   // but uses the current route to handle the 404
   response.body === null && response.headers.get(REROUTE_DIRECTIVE_HEADER) !== "no") {
-    const fourOhFourRoute = await matchRoute("/404", manifestData, pipeline);
+    const fourOhFourRoute = await matchRoute("/404", routesList, pipeline);
     if (fourOhFourRoute) {
       renderContext = await RenderContext.create({
         locals,

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

@@ -0,0 +1,3 @@
+import type * as vite from 'vite';
+import type { AstroSettings } from '../types/astro.js';
+export declare function trailingSlashMiddleware(settings: AstroSettings): vite.Connect.NextHandleFunction;

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

@@ -0,0 +1,30 @@
+import { collapseDuplicateTrailingSlashes, hasFileExtension } from "@astrojs/internal-helpers/path";
+import { trailingSlashMismatchTemplate } from "../template/4xx.js";
+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);
+    }
+    let pathname;
+    try {
+      pathname = decodeURI(new URL(url, "http://localhost").pathname);
+    } catch (e) {
+      return next(e);
+    }
+    if (pathname.startsWith("/_") || pathname.startsWith("/@")) {
+      return next();
+    }
+    if (trailingSlash === "never" && pathname.endsWith("/") && pathname !== "/" || trailingSlash === "always" && !pathname.endsWith("/") && !hasFileExtension(pathname)) {
+      const html = trailingSlashMismatchTemplate(pathname, trailingSlash);
+      return writeHtmlResponse(res, 404, html);
+    }
+    return next();
+  };
+}
+export {
+  trailingSlashMiddleware
+};

package/dist/vite-plugin-scanner/index.d.ts

@@ -1,9 +1,9 @@
 import type { Plugin as VitePlugin } from 'vite';
 import type { Logger } from '../core/logger/core.js';
-import type { AstroSettings, ManifestData } from '../types/astro.js';
+import type { AstroSettings, RoutesList } from '../types/astro.js';
 export interface AstroPluginScannerOptions {
     settings: AstroSettings;
     logger: Logger;
-    manifest: ManifestData;
+    routesList: RoutesList;
 }
-export default function astroScannerPlugin({ settings, logger, manifest, }: AstroPluginScannerOptions): VitePlugin;
+export default function astroScannerPlugin({ settings, logger, routesList, }: AstroPluginScannerOptions): VitePlugin;

package/dist/vite-plugin-scanner/index.js

@@ -9,7 +9,7 @@ const KNOWN_FILE_EXTENSIONS = [".astro", ".js", ".ts"];
 function astroScannerPlugin({
   settings,
   logger,
-  manifest
+  routesList
 }) {
   return {
     name: "astro:scanner",
@@ -26,7 +26,7 @@ function astroScannerPlugin({
       const fileIsPage = isPage(fileURL, settings);
       const fileIsEndpoint = isEndpoint(fileURL, settings);
       if (!(fileIsPage || fileIsEndpoint)) return;
-      const route = manifest.routes.find((r) => {
+      const route = routesList.routes.find((r) => {
         const filePath = new URL(`./${r.component}`, settings.config.root);
         return normalizePath(fileURLToPath(filePath)) === filename;
       });
@@ -69,7 +69,7 @@ function astroScannerPlugin({
       const fileIsPage = isPage(fileURL, settings);
       const fileIsEndpoint = isEndpoint(fileURL, settings);
       if (!(fileIsPage || fileIsEndpoint)) return;
-      const route = manifest.routes.find((r) => {
+      const route = routesList.routes.find((r) => {
         const filePath = new URL(`./${r.component}`, settings.config.root);
         return normalizePath(fileURLToPath(filePath)) === filename;
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.1.10",
+  "version": "5.2.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -150,7 +150,7 @@
     "unist-util-visit": "^5.0.0",
     "unstorage": "^1.14.4",
     "vfile": "^6.0.3",
-    "vite": "^6.0.9",
+    "vite": "^6.0.11",
     "vitefu": "^1.0.5",
     "which-pm": "^3.0.0",
     "xxhash-wasm": "^1.1.0",
@@ -159,8 +159,8 @@
     "zod": "^3.24.1",
     "zod-to-json-schema": "^3.24.1",
     "zod-to-ts": "^1.2.0",
-    "@astrojs/internal-helpers": "0.4.2",
-    "@astrojs/markdown-remark": "6.0.2",
+    "@astrojs/internal-helpers": "0.5.0",
+    "@astrojs/markdown-remark": "6.1.0",
     "@astrojs/telemetry": "3.2.0"
   },
   "optionalDependencies": {

package/templates/content/types.d.ts

@@ -31,6 +31,21 @@ declare module 'astro:content' {
 		ContentEntryMap[C]
 	>['slug'];
 
+	export type ReferenceDataEntry<
+		C extends CollectionKey,
+		E extends keyof DataEntryMap[C] = string,
+	> = {
+		collection: C;
+		id: E;
+	};
+	export type ReferenceContentEntry<
+		C extends keyof ContentEntryMap,
+		E extends ValidContentEntrySlug<C> | (string & {}) = string,
+	> = {
+		collection: C;
+		slug: E;
+	};
+
 	/** @deprecated Use `getEntry` instead. */
 	export function getEntryBySlug<
 		C extends keyof ContentEntryMap,
@@ -61,19 +76,17 @@ declare module 'astro:content' {
 	export function getEntry<
 		C extends keyof ContentEntryMap,
 		E extends ValidContentEntrySlug<C> | (string & {}),
-	>(entry: {
-		collection: C;
-		slug: E;
-	}): E extends ValidContentEntrySlug<C>
+	>(
+		entry: ReferenceContentEntry<C, E>,
+	): E extends ValidContentEntrySlug<C>
 		? Promise<CollectionEntry<C>>
 		: Promise<CollectionEntry<C> | undefined>;
 	export function getEntry<
 		C extends keyof DataEntryMap,
 		E extends keyof DataEntryMap[C] | (string & {}),
-	>(entry: {
-		collection: C;
-		id: E;
-	}): E extends keyof DataEntryMap[C]
+	>(
+		entry: ReferenceDataEntry<C, E>,
+	): E extends keyof DataEntryMap[C]
 		? Promise<DataEntryMap[C][E]>
 		: Promise<CollectionEntry<C> | undefined>;
 	export function getEntry<
@@ -99,16 +112,10 @@ declare module 'astro:content' {
 
 	/** Resolve an array of entry references from the same collection */
 	export function getEntries<C extends keyof ContentEntryMap>(
-		entries: {
-			collection: C;
-			slug: ValidContentEntrySlug<C>;
-		}[],
+		entries: ReferenceContentEntry<C, ValidContentEntrySlug<C>>[],
 	): Promise<CollectionEntry<C>[]>;
 	export function getEntries<C extends keyof DataEntryMap>(
-		entries: {
-			collection: C;
-			id: keyof DataEntryMap[C];
-		}[],
+		entries: ReferenceDataEntry<C, keyof DataEntryMap[C]>[],
 	): Promise<CollectionEntry<C>[]>;
 
 	export function render<C extends keyof AnyEntryMap>(
@@ -120,14 +127,8 @@ declare module 'astro:content' {
 	): import('astro/zod').ZodEffects<
 		import('astro/zod').ZodString,
 		C extends keyof ContentEntryMap
-			? {
-					collection: C;
-					slug: ValidContentEntrySlug<C>;
-				}
-			: {
-					collection: C;
-					id: keyof DataEntryMap[C];
-				}
+			? ReferenceContentEntry<C, ValidContentEntrySlug<C>>
+			: ReferenceDataEntry<C, keyof DataEntryMap[C]>
 	>;
 	// Allow generic `string` to avoid excessive type errors in the config
 	// if `dev` is not running to update as you edit.