astro 5.16.5 → 6.0.0-alpha.1

package/dist/core/render-context.d.ts

@@ -1,23 +1,24 @@
-import type { ActionAPIContext } from '../actions/runtime/utils.js';
+import type { ActionAPIContext } from '../actions/runtime/types.js';
 import type { ComponentInstance } from '../types/astro.js';
 import type { MiddlewareHandler, Props } from '../types/public/common.js';
-import type { APIContext, AstroGlobal, AstroGlobalPartial } from '../types/public/context.js';
+import type { APIContext, AstroGlobal } from '../types/public/context.js';
 import type { RouteData, SSRResult } from '../types/public/internal.js';
-import type { SSRActions } from './app/types.js';
+import type { ServerIslandMappings, SSRActions } from './app/types.js';
 import { AstroCookies } from './cookies/index.js';
 import { type Pipeline } from './render/index.js';
 import { AstroSession } from './session.js';
-export declare const apiContextRoutesSymbol: unique symbol;
 /**
  * Each request is rendered using a `RenderContext`.
  * It contains data unique to each request. It is responsible for executing middleware, calling endpoints, and rendering the page by gathering necessary data from a `Pipeline`.
  */
+export type CreateRenderContext = Pick<RenderContext, 'pathname' | 'pipeline' | 'request' | 'routeData' | 'clientAddress'> & Partial<Pick<RenderContext, 'locals' | 'status' | 'props' | 'partial' | 'actions' | 'shouldInjectCspMetaTags' | 'skipMiddleware'>>;
 export declare class RenderContext {
     #private;
     readonly pipeline: Pipeline;
     locals: App.Locals;
     readonly middleware: MiddlewareHandler;
     readonly actions: SSRActions;
+    readonly serverIslands: ServerIslandMappings;
     pathname: string;
     request: Request;
     routeData: RouteData;
@@ -30,6 +31,7 @@ export declare class RenderContext {
     partial: undefined | boolean;
     shouldInjectCspMetaTags: boolean;
     session: AstroSession | undefined;
+    skipMiddleware: boolean;
     private constructor();
     /**
      * A flag that tells the render content if the rewriting was triggered
@@ -40,7 +42,7 @@ export declare class RenderContext {
      */
     counter: number;
     result: SSRResult | undefined;
-    static create({ locals, middleware, pathname, pipeline, request, routeData, clientAddress, status, props, partial, actions, shouldInjectCspMetaTags, }: Pick<RenderContext, 'pathname' | 'pipeline' | 'request' | 'routeData' | 'clientAddress'> & Partial<Pick<RenderContext, 'locals' | 'middleware' | 'status' | 'props' | 'partial' | 'actions' | 'shouldInjectCspMetaTags'>>): Promise<RenderContext>;
+    static create({ locals, pathname, pipeline, request, routeData, clientAddress, status, props, partial, shouldInjectCspMetaTags, skipMiddleware, }: CreateRenderContext): Promise<RenderContext>;
     /**
      * The main function of the RenderContext.
      *
@@ -64,8 +66,8 @@ export declare class RenderContext {
      *
      * The page level partial is used as the prototype of the user-visible `Astro` global object, which is instantiated once per use of a component.
      */
-    createAstro(result: SSRResult, astroStaticPartial: AstroGlobalPartial, props: Record<string, any>, slotValues: Record<string, any> | null, apiContext: ActionAPIContext): AstroGlobal;
-    createAstroPagePartial(result: SSRResult, astroStaticPartial: AstroGlobalPartial, apiContext: ActionAPIContext): Omit<AstroGlobal, 'props' | 'self' | 'slots'>;
+    createAstro(result: SSRResult, props: Record<string, any>, slotValues: Record<string, any> | null, apiContext: ActionAPIContext): AstroGlobal;
+    createAstroPagePartial(result: SSRResult, apiContext: ActionAPIContext): Omit<AstroGlobal, 'props' | 'self' | 'slots'>;
     getClientAddress(): string;
     computeCurrentLocale(): string | undefined;
     computePreferredLocale(): string | undefined;

package/dist/core/render-context.js

@@ -1,6 +1,6 @@
 import colors from "piccolore";
+import { deserializeActionResult } from "../actions/runtime/client.js";
 import { getActionContext } from "../actions/runtime/server.js";
-import { deserializeActionResult } from "../actions/runtime/shared.js";
 import { createCallAction, createGetActionResult, hasActionPayload } from "../actions/utils.js";
 import {
   computeCurrentLocale,
@@ -10,12 +10,12 @@ import {
 import { renderEndpoint } from "../runtime/server/endpoint.js";
 import { renderPage } from "../runtime/server/index.js";
 import {
-  ASTRO_VERSION,
-  clientAddressSymbol,
+  ASTRO_GENERATOR,
   REROUTE_DIRECTIVE_HEADER,
   REWRITE_DIRECTIVE_HEADER_KEY,
   REWRITE_DIRECTIVE_HEADER_VALUE,
   ROUTE_TYPE_HEADER,
+  pipelineSymbol,
   responseSentSymbol
 } from "./constants.js";
 import { AstroCookies, attachCookiesToResponse } from "./cookies/index.js";
@@ -32,13 +32,13 @@ import { isRoute404or500, isRouteExternalRedirect, isRouteServerIsland } from ".
 import { copyRequest, getOriginPathname, setOriginPathname } from "./routing/rewrite.js";
 import { AstroSession } from "./session.js";
 import { validateAndDecodePathname } from "./util/pathname.js";
-const apiContextRoutesSymbol = Symbol.for("context.routes");
 class RenderContext {
-  constructor(pipeline, locals, middleware, actions, pathname, request, routeData, status, clientAddress, cookies = new AstroCookies(request), params = getParams(routeData, pathname), url = RenderContext.#createNormalizedUrl(request.url), props = {}, partial = void 0, shouldInjectCspMetaTags = !!pipeline.manifest.csp, session = pipeline.manifest.sessionConfig ? new AstroSession(cookies, pipeline.manifest.sessionConfig, pipeline.runtimeMode) : void 0) {
+  constructor(pipeline, locals, middleware, actions, serverIslands, pathname, request, routeData, status, clientAddress, cookies = new AstroCookies(request), params = getParams(routeData, pathname), url = RenderContext.#createNormalizedUrl(request.url), props = {}, partial = void 0, shouldInjectCspMetaTags = !!pipeline.manifest.csp, session = void 0, skipMiddleware = false) {
     this.pipeline = pipeline;
     this.locals = locals;
     this.middleware = middleware;
     this.actions = actions;
+    this.serverIslands = serverIslands;
     this.pathname = pathname;
     this.request = request;
     this.routeData = routeData;
@@ -51,6 +51,7 @@ class RenderContext {
     this.partial = partial;
     this.shouldInjectCspMetaTags = shouldInjectCspMetaTags;
     this.session = session;
+    this.skipMiddleware = skipMiddleware;
   }
   static #createNormalizedUrl(requestUrl) {
     const url = new URL(requestUrl);
@@ -75,7 +76,6 @@ class RenderContext {
   result = void 0;
   static async create({
     locals = {},
-    middleware,
     pathname,
     pipeline,
     request,
@@ -84,33 +84,45 @@ class RenderContext {
     status = 200,
     props,
     partial = void 0,
-    actions,
-    shouldInjectCspMetaTags
+    shouldInjectCspMetaTags,
+    skipMiddleware = false
   }) {
     const pipelineMiddleware = await pipeline.getMiddleware();
-    const pipelineActions = actions ?? await pipeline.getActions();
+    const pipelineActions = await pipeline.getActions();
+    const pipelineSessionDriver = await pipeline.getSessionDriver();
+    const serverIslands = await pipeline.getServerIslands();
     setOriginPathname(
       request,
       pathname,
       pipeline.manifest.trailingSlash,
       pipeline.manifest.buildFormat
     );
+    const cookies = new AstroCookies(request);
+    const session = pipeline.manifest.sessionConfig && pipelineSessionDriver ? new AstroSession(
+      cookies,
+      pipeline.manifest.sessionConfig,
+      pipeline.runtimeMode,
+      pipelineSessionDriver
+    ) : void 0;
     return new RenderContext(
       pipeline,
       locals,
-      sequence(...pipeline.internalMiddleware, middleware ?? pipelineMiddleware),
+      sequence(...pipeline.internalMiddleware, pipelineMiddleware),
       pipelineActions,
+      serverIslands,
       pathname,
       request,
       routeData,
       status,
       clientAddress,
-      void 0,
+      cookies,
       void 0,
       void 0,
       props,
       partial,
-      shouldInjectCspMetaTags ?? !!pipeline.manifest.csp
+      shouldInjectCspMetaTags ?? !!pipeline.manifest.csp,
+      session,
+      skipMiddleware
     );
   }
   /**
@@ -126,15 +138,16 @@ class RenderContext {
    */
   async render(componentInstance, slots = {}) {
     const { middleware, pipeline } = this;
-    const { logger, serverLike, streaming, manifest } = pipeline;
+    const { logger, streaming, manifest } = pipeline;
     const props = Object.keys(this.props).length > 0 ? this.props : await getProps({
       mod: componentInstance,
       routeData: this.routeData,
       routeCache: this.pipeline.routeCache,
       pathname: this.pathname,
       logger,
-      serverLike,
-      base: manifest.base
+      serverLike: manifest.serverLike,
+      base: manifest.base,
+      trailingSlash: manifest.trailingSlash
     });
     const actionApiContext = this.createActionAPIContext();
     const apiContext = this.createAPIContext(props, actionApiContext);
@@ -156,7 +169,7 @@ class RenderContext {
           pathname,
           newUrl
         } = await pipeline.tryRewrite(payload, this.request);
-        if (this.pipeline.serverLike === true && this.routeData.prerender === false && routeData.prerender === true) {
+        if (this.pipeline.manifest.serverLike === true && this.routeData.prerender === false && routeData.prerender === true) {
           throw new AstroError({
             ...ForbiddenRewrite,
             message: ForbiddenRewrite.message(this.pathname, pathname, routeData.component),
@@ -246,7 +259,7 @@ class RenderContext {
     if (isRouteExternalRedirect(this.routeData)) {
       return renderRedirect(this);
     }
-    const response = await callMiddleware(middleware, apiContext, lastNext);
+    const response = this.skipMiddleware ? await lastNext(apiContext) : await callMiddleware(middleware, apiContext, lastNext);
     if (response.headers.get(ROUTE_TYPE_HEADER)) {
       response.headers.delete(ROUTE_TYPE_HEADER);
     }
@@ -255,10 +268,14 @@ class RenderContext {
   }
   createAPIContext(props, context) {
     const redirect = (path, status = 302) => new Response(null, { status, headers: { Location: path } });
-    Reflect.set(context, apiContextRoutesSymbol, this.pipeline);
+    const rewrite = async (reroutePayload) => {
+      return await this.#executeRewrite(reroutePayload);
+    };
+    Reflect.set(context, pipelineSymbol, this.pipeline);
     return Object.assign(context, {
       props,
       redirect,
+      rewrite,
       getActionResult: createGetActionResult(context.locals),
       callAction: createCallAction(context)
     });
@@ -271,7 +288,7 @@ class RenderContext {
       this.request
     );
     const isI18nFallback = routeData.fallbackRoutes && routeData.fallbackRoutes.length > 0;
-    if (this.pipeline.serverLike && !this.routeData.prerender && routeData.prerender && !isI18nFallback) {
+    if (this.pipeline.manifest.serverLike && !this.routeData.prerender && routeData.prerender && !isI18nFallback) {
       throw new AstroError({
         ...ForbiddenRewrite,
         message: ForbiddenRewrite.message(this.pathname, pathname, routeData.component),
@@ -312,10 +329,6 @@ class RenderContext {
   createActionAPIContext() {
     const renderContext = this;
     const { params, pipeline, url } = this;
-    const generator = `Astro v${ASTRO_VERSION}`;
-    const rewrite = async (reroutePayload) => {
-      return await this.#executeRewrite(reroutePayload);
-    };
     return {
       // Don't allow reassignment of cookies because it doesn't work
       get cookies() {
@@ -329,7 +342,7 @@ class RenderContext {
       get currentLocale() {
         return renderContext.computeCurrentLocale();
       },
-      generator,
+      generator: ASTRO_GENERATOR,
       get locals() {
         return renderContext.locals;
       },
@@ -343,7 +356,6 @@ class RenderContext {
       get preferredLocaleList() {
         return renderContext.computePreferredLocaleList();
       },
-      rewrite,
       request: this.request,
       site: pipeline.site,
       url,
@@ -451,7 +463,7 @@ class RenderContext {
       compressHTML,
       cookies,
       /** This function returns the `Astro` faux-global */
-      createAstro: (astroGlobal, props, slots) => this.createAstro(result, astroGlobal, props, slots, ctx),
+      createAstro: (props, slots) => this.createAstro(result, props, slots, ctx),
       links,
       params: this.params,
       partial,
@@ -463,7 +475,7 @@ class RenderContext {
       scripts,
       styles,
       actionResult,
-      serverIslandNameMap: manifest.serverIslandNameMap ?? /* @__PURE__ */ new Map(),
+      serverIslandNameMap: this.serverIslands.serverIslandNameMap ?? /* @__PURE__ */ new Map(),
       key: manifest.key,
       trailingSlash: manifest.trailingSlash,
       _metadata: {
@@ -502,20 +514,12 @@ class RenderContext {
    *
    * The page level partial is used as the prototype of the user-visible `Astro` global object, which is instantiated once per use of a component.
    */
-  createAstro(result, astroStaticPartial, props, slotValues, apiContext) {
+  createAstro(result, props, slotValues, apiContext) {
     let astroPagePartial;
     if (this.isRewriting) {
-      astroPagePartial = this.#astroPagePartial = this.createAstroPagePartial(
-        result,
-        astroStaticPartial,
-        apiContext
-      );
+      astroPagePartial = this.#astroPagePartial = this.createAstroPagePartial(result, apiContext);
     } else {
-      astroPagePartial = this.#astroPagePartial ??= this.createAstroPagePartial(
-        result,
-        astroStaticPartial,
-        apiContext
-      );
+      astroPagePartial = this.#astroPagePartial ??= this.createAstroPagePartial(result, apiContext);
     }
     const astroComponentPartial = { props, self: null };
     const Astro = Object.assign(
@@ -537,7 +541,7 @@ class RenderContext {
     });
     return Astro;
   }
-  createAstroPagePartial(result, astroStaticPartial, apiContext) {
+  createAstroPagePartial(result, apiContext) {
     const renderContext = this;
     const { cookies, locals, params, pipeline, url } = this;
     const { response } = result;
@@ -554,8 +558,7 @@ class RenderContext {
     };
     const callAction = createCallAction(apiContext);
     return {
-      generator: astroStaticPartial.generator,
-      glob: astroStaticPartial.glob,
+      generator: ASTRO_GENERATOR,
       routePattern: this.routeData.route,
       isPrerendered: this.routeData.prerender,
       cookies,
@@ -647,7 +650,7 @@ class RenderContext {
     };
   }
   getClientAddress() {
-    const { pipeline, request, routeData, clientAddress } = this;
+    const { pipeline, routeData, clientAddress } = this;
     if (routeData.prerender) {
       throw new AstroError({
         ...AstroErrorData.PrerenderClientAddressNotAvailable,
@@ -657,9 +660,6 @@ class RenderContext {
     if (clientAddress) {
       return clientAddress;
     }
-    if (clientAddressSymbol in request) {
-      return Reflect.get(request, clientAddressSymbol);
-    }
     if (pipeline.adapterName) {
       throw new AstroError({
         ...AstroErrorData.ClientAddressNotAvailable,
@@ -730,6 +730,5 @@ class RenderContext {
   }
 }
 export {
-  RenderContext,
-  apiContextRoutesSymbol
+  RenderContext
 };

package/dist/core/routing/astro-designed-error-pages.js

@@ -2,7 +2,6 @@ import notFoundTemplate from "../../template/4xx.js";
 import { DEFAULT_404_COMPONENT } from "../constants.js";
 const DEFAULT_404_ROUTE = {
   component: DEFAULT_404_COMPONENT,
-  generate: () => "",
   params: [],
   pattern: /^\/404\/?$/,
   prerender: false,
@@ -12,7 +11,8 @@ const DEFAULT_404_ROUTE = {
   route: "/404",
   fallbackRoutes: [],
   isIndex: false,
-  origin: "internal"
+  origin: "internal",
+  distURL: []
 };
 function ensure404Route(manifest) {
   if (!manifest.routes.some((route) => route.route === "/404")) {

package/dist/core/routing/default.js

@@ -7,7 +7,7 @@ import {
 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);
+  const root = new URL(manifest.rootDir);
   return [
     {
       instance: default404Instance,

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

@@ -0,0 +1,22 @@
+import type { RouteData } from '../../types/public/internal.js';
+import type { RouteInfo } from '../app/types.js';
+type RedirectRouteData = RouteData & {
+    redirect: string;
+};
+/**
+ * Function guard that checks if a route is redirect. If so, `RouteData.redirectRoute` and
+ * `RouteData.redirect` aren't `undefined` anymore
+ * @param route
+ */
+export declare function routeIsRedirect(route: RouteData | undefined): route is RedirectRouteData;
+export declare function routeIsFallback(route: RouteData | undefined): boolean;
+/**
+ * Give a route, it returns its fallback routes from a `list` of `RouteInfo[]`.
+ *
+ * It throws an error if no fallback routes were found. This means there's an error
+ * when we construct the list of routes
+ * @param route
+ * @param routeList
+ */
+export declare function getFallbackRoute(route: RouteData, routeList: RouteInfo[]): RouteData;
+export {};

package/dist/core/routing/helpers.js

@@ -0,0 +1,25 @@
+function routeIsRedirect(route) {
+  return route?.type === "redirect";
+}
+function routeIsFallback(route) {
+  return route?.type === "fallback";
+}
+function getFallbackRoute(route, routeList) {
+  const fallbackRoute = routeList.find((r) => {
+    if (route.route === "/" && r.routeData.route === "/") {
+      return true;
+    }
+    return r.routeData.fallbackRoutes.find((f) => {
+      return f.route === route.route;
+    });
+  });
+  if (!fallbackRoute) {
+    throw new Error(`No fallback route found for route ${route.route}`);
+  }
+  return fallbackRoute.routeData;
+}
+export {
+  getFallbackRoute,
+  routeIsFallback,
+  routeIsRedirect
+};

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

@@ -1,3 +1,3 @@
+export { routeIsRedirect } from './helpers.js';
 export { createRoutesList } from './manifest/create.js';
-export { serializeRouteData } from './manifest/serialization.js';
 export { matchAllRoutes } from './match.js';

package/dist/core/routing/index.js

@@ -1,8 +1,8 @@
+import { routeIsRedirect } from "./helpers.js";
 import { createRoutesList } from "./manifest/create.js";
-import { serializeRouteData } from "./manifest/serialization.js";
 import { matchAllRoutes } from "./match.js";
 export {
   createRoutesList,
   matchAllRoutes,
-  serializeRouteData
+  routeIsRedirect
 };

package/dist/core/routing/manifest/create.d.ts

@@ -10,8 +10,13 @@ interface CreateRouteManifestParams {
     fsMod?: typeof nodeFs;
 }
 /** Create manifest of all static routes */
-export declare function createRoutesList(params: CreateRouteManifestParams, logger: Logger, { dev }?: {
+export declare function createRoutesList(params: CreateRouteManifestParams, logger: Logger, { dev, skipBuildOutputAssignment, }?: {
     dev?: boolean;
+    /**
+     * When `true`, the assignment of `settings.buildOutput` is skipped.
+     * Usually, that's needed when this function has already been called.
+     */
+    skipBuildOutputAssignment?: boolean;
 }): Promise<RoutesList>;
 export declare function resolveInjectedRoute(entrypoint: string, root: URL, cwd?: string): {
     resolved: string;

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

@@ -5,9 +5,9 @@ import { fileURLToPath } from "node:url";
 import pLimit from "p-limit";
 import colors from "piccolore";
 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";
+import { toRoutingStrategy } from "../../app/index.js";
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "../../constants.js";
 import {
   MissingIndexForInternationalization,
@@ -19,7 +19,6 @@ 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";
 import { getRoutePrerenderOption } from "./prerender.js";
 import { validateSegment } from "./segment.js";
@@ -148,7 +147,6 @@ function createFileBasedRoutes({ settings, cwd, fsMod }, logger) {
         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 route = joinSegments(segments);
         routes.push({
           route,
@@ -158,7 +156,6 @@ function createFileBasedRoutes({ settings, cwd, fsMod }, logger) {
           segments,
           params,
           component,
-          generate,
           pathname: pathname || void 0,
           prerender,
           fallbackRoutes: [],
@@ -178,7 +175,7 @@ function createFileBasedRoutes({ settings, cwd, fsMod }, logger) {
   }
   return routes;
 }
-const trailingSlashForPath = (pathname, config) => pathname && hasFileExtension(pathname) ? "ignore" : config.trailingSlash;
+const trailingSlashForPath = (pathname, config) => pathname && hasFileExtension(pathname) ? "never" : config.trailingSlash;
 function createInjectedRoutes({ settings, cwd }) {
   const { config } = settings;
   const prerender = getPrerenderDefault(config);
@@ -194,7 +191,6 @@ function createInjectedRoutes({ settings, cwd }) {
     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 params = segments.flat().filter((p) => p.dynamic).map((p) => p.content);
     const route = joinSegments(segments);
     routes.push({
@@ -206,7 +202,6 @@ function createInjectedRoutes({ settings, cwd }) {
       segments,
       params,
       component,
-      generate,
       pathname: pathname || void 0,
       prerender: prerenderInjected ?? prerender,
       fallbackRoutes: [],
@@ -226,7 +221,6 @@ function createRedirectRoutes({ settings }, routeMap) {
       return getParts(s, from);
     });
     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);
@@ -251,7 +245,6 @@ function createRedirectRoutes({ settings }, routeMap) {
       segments,
       params,
       component: from,
-      generate,
       pathname: pathname || void 0,
       prerender: getPrerenderDefault(config),
       redirect: to,
@@ -301,7 +294,10 @@ function detectRouteCollision(a, b, _config, logger) {
   );
   logger.warn("router", "A collision will result in an hard error in following versions of Astro.");
 }
-async function createRoutesList(params, logger, { dev = false } = {}) {
+async function createRoutesList(params, logger, {
+  dev = false,
+  skipBuildOutputAssignment = false
+} = {}) {
   const { settings } = params;
   const { config } = settings;
   const routeMap = /* @__PURE__ */ new Map();
@@ -321,7 +317,9 @@ async function createRoutesList(params, logger, { dev = false } = {}) {
   const routes = [
     ...[...filteredFiledBasedRoutes, ...injectedRoutes, ...redirectRoutes].sort(routeComparator)
   ];
-  settings.buildOutput = getPrerenderDefault(config) ? "static" : "server";
+  if (skipBuildOutputAssignment !== true) {
+    settings.buildOutput = getPrerenderDefault(config) ? "static" : "server";
+  }
   const limit = pLimit(10);
   let promises = [];
   for (const route of routes) {
@@ -472,7 +470,6 @@ async function createRoutesList(params, logger, { dev = false } = {}) {
                 validateSegment(s);
                 return getParts(s, route);
               });
-              const generate = getRouteGenerator(segments, config.trailingSlash);
               const index = routes.findIndex((r) => r === fallbackToRoute);
               if (index >= 0) {
                 const fallbackRoute = {
@@ -480,7 +477,6 @@ async function createRoutesList(params, logger, { dev = false } = {}) {
                   pathname,
                   route,
                   segments,
-                  generate,
                   pattern: getPattern(segments, config.base, config.trailingSlash),
                   type: "fallback",
                   fallbackRoutes: []

package/dist/core/routing/manifest/generator.d.ts

@@ -1,3 +1,5 @@
 import type { AstroConfig } from '../../../types/public/config.js';
 import type { RoutePart } from '../../../types/public/internal.js';
-export declare function getRouteGenerator(segments: RoutePart[][], addTrailingSlash: AstroConfig['trailingSlash']): (params: Record<string, string | number>) => string;
+type RouteGenerator = (data?: any) => string;
+export declare function getRouteGenerator(segments: RoutePart[][], addTrailingSlash: AstroConfig['trailingSlash']): RouteGenerator;
+export {};

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

@@ -1,8 +1,9 @@
 import type { GetStaticPathsItem } from '../../types/public/common.js';
+import type { AstroConfig } from '../../types/public/index.js';
 import type { RouteData } from '../../types/public/internal.js';
 /**
  * given a route's Params object, validate parameter
  * values and create a stringified key for the route
  * that can be used to match request routes
  */
-export declare function stringifyParams(params: GetStaticPathsItem['params'], route: RouteData): string;
+export declare function stringifyParams(params: GetStaticPathsItem['params'], route: RouteData, trailingSlash: AstroConfig['trailingSlash']): string;

package/dist/core/routing/params.js

@@ -1,15 +1,15 @@
 import { trimSlashes } from "../path.js";
+import { getRouteGenerator } from "./manifest/generator.js";
 import { validateGetStaticPathsParameter } from "./validation.js";
-function stringifyParams(params, route) {
-  const validatedParams = Object.entries(params).reduce((acc, next) => {
-    validateGetStaticPathsParameter(next, route.component);
-    const [key, value] = next;
+function stringifyParams(params, route, trailingSlash) {
+  const validatedParams = {};
+  for (const [key, value] of Object.entries(params)) {
+    validateGetStaticPathsParameter([key, value], route.component);
     if (value !== void 0) {
-      acc[key] = typeof value === "string" ? trimSlashes(value) : value.toString();
+      validatedParams[key] = trimSlashes(value);
     }
-    return acc;
-  }, {});
-  return route.generate(validatedParams);
+  }
+  return getRouteGenerator(route.segments, trailingSlash)(validatedParams);
 }
 export {
   stringifyParams

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

@@ -1,7 +1,6 @@
 import type { ComponentInstance } from '../../types/astro.js';
 import type { GetStaticPathsResult } from '../../types/public/common.js';
 import type { RouteData } from '../../types/public/internal.js';
-import type { Logger } from '../logger/core.js';
 /** Throws error for invalid parameter in getStaticPaths() response */
 export declare function validateGetStaticPathsParameter([key, value]: [string, any], route: string): void;
 /** Error for deprecated or malformed route components */
@@ -10,4 +9,4 @@ export declare function validateDynamicRouteModule(mod: ComponentInstance, { ssr
     route: RouteData;
 }): void;
 /** Throw error and log warnings for malformed getStaticPaths() response */
-export declare function validateGetStaticPathsResult(result: GetStaticPathsResult, logger: Logger, route: RouteData): void;
+export declare function validateGetStaticPathsResult(result: GetStaticPathsResult, route: RouteData): void;

package/dist/core/routing/validation.js

@@ -1,5 +1,5 @@
 import { AstroError, AstroErrorData } from "../errors/index.js";
-const VALID_PARAM_TYPES = ["string", "number", "undefined"];
+const VALID_PARAM_TYPES = ["string", "undefined"];
 function validateGetStaticPathsParameter([key, value], route) {
   if (!VALID_PARAM_TYPES.includes(typeof value)) {
     throw new AstroError({
@@ -22,7 +22,7 @@ function validateDynamicRouteModule(mod, {
     });
   }
 }
-function validateGetStaticPathsResult(result, logger, route) {
+function validateGetStaticPathsResult(result, route) {
   if (!Array.isArray(result)) {
     throw new AstroError({
       ...AstroErrorData.InvalidGetStaticPathsReturn,
@@ -49,22 +49,6 @@ function validateGetStaticPathsResult(result, logger, route) {
         }
       });
     }
-    for (const [key, val] of Object.entries(pathObject.params)) {
-      if (!(typeof val === "undefined" || typeof val === "string" || typeof val === "number")) {
-        logger.warn(
-          "router",
-          `getStaticPaths() returned an invalid path param: "${key}". A string, number or undefined value was expected, but got \`${JSON.stringify(
-            val
-          )}\`.`
-        );
-      }
-      if (typeof val === "string" && val === "") {
-        logger.warn(
-          "router",
-          `getStaticPaths() returned an invalid path param: "${key}". \`undefined\` expected for an optional param, but got empty string.`
-        );
-      }
-    }
   });
 }
 export {