astro 4.10.3 → 4.11.0

package/components/Code.astro

@@ -3,6 +3,7 @@ import type { ThemePresets } from '@astrojs/markdown-remark';
 import type {
 	BuiltinLanguage,
 	LanguageRegistration,
+	ShikiTransformer,
 	SpecialLanguage,
 	ThemeRegistration,
 	ThemeRegistrationRaw,
@@ -50,6 +51,12 @@ interface Props extends Omit<HTMLAttributes<'pre'>, 'lang'> {
 	 * @default false
 	 */
 	inline?: boolean;
+	/**
+	 * Shiki transformers to customize the generated HTML by manipulating the hast tree.
+	 * Supports all transformers listed here: https://shiki.style/packages/transformers#transformers
+	 * Instructions for custom transformers: https://shiki.style/guide/transformers
+	 */
+	transformers?: ShikiTransformer[];
 }
 
 const {
@@ -59,6 +66,7 @@ const {
 	themes = {},
 	wrap = false,
 	inline = false,
+	transformers = [],
 	...rest
 } = Astro.props;
 
@@ -85,6 +93,7 @@ const highlighter = await getCachedHighlighter({
 	theme,
 	themes,
 	wrap,
+	transformers,
 });
 
 const html = await highlighter.highlight(code, typeof lang === 'string' ? lang : lang.name, {

package/dist/actions/runtime/virtual/server.d.ts

@@ -14,7 +14,7 @@ export type ActionClient<TOutput, TAccept extends Accept, TInputSchema extends I
 } : ((input?: any) => Promise<Awaited<TOutput>>) & {
     safe: (input?: any) => Promise<SafeResult<never, Awaited<TOutput>>>;
 };
-export declare function defineAction<TOutput, TAccept extends Accept = 'json', TInputSchema extends InputSchema<Accept> | undefined = TAccept extends 'form' ? z.ZodType<FormData> : undefined>({ accept, input: inputSchema, handler, }: {
+export declare function defineAction<TOutput, TAccept extends Accept, TInputSchema extends InputSchema<Accept> | undefined = TAccept extends 'form' ? z.ZodType<FormData> : undefined>({ accept, input: inputSchema, handler, }: {
     input?: TInputSchema;
     accept?: TAccept;
     handler: Handler<TInputSchema, TOutput>;

package/dist/assets/internal.d.ts

@@ -1,5 +1,5 @@
 import type { AstroConfig } from '../@types/astro.js';
 import { type ImageService } from './services/service.js';
-import type { GetImageResult, UnresolvedImageTransform } from './types.js';
+import { type GetImageResult, type UnresolvedImageTransform } from './types.js';
 export declare function getConfiguredImageService(): Promise<ImageService>;
 export declare function getImage(options: UnresolvedImageTransform, imageConfig: AstroConfig['image']): Promise<GetImageResult>;

package/dist/assets/internal.js

@@ -1,6 +1,9 @@
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { DEFAULT_HASH_PROPS } from "./consts.js";
 import { isLocalService } from "./services/service.js";
+import {
+  isImageMetadata
+} from "./types.js";
 import { isESMImportedImage, isRemoteImage, resolveSrc } from "./utils/imageKind.js";
 import { probe } from "./utils/remoteProbe.js";
 async function getConfiguredImageService() {
@@ -36,6 +39,9 @@ async function getImage(options, imageConfig) {
       )
     });
   }
+  if (isImageMetadata(options)) {
+    throw new AstroError(AstroErrorData.ExpectedNotESMImage);
+  }
   const service = await getConfiguredImageService();
   const resolvedOptions = {
     ...options,

package/dist/assets/types.d.ts

@@ -20,16 +20,20 @@ declare global {
         referencedImages?: Set<string>;
     };
 }
+declare const isESMImport: unique symbol;
+export type OmitBrand<T> = Omit<T, typeof isESMImport>;
 /**
  * Type returned by ESM imports of images
  */
-export interface ImageMetadata {
+export type ImageMetadata = {
     src: string;
     width: number;
     height: number;
     format: ImageInputFormat;
     orientation?: number;
-}
+    [isESMImport]?: true;
+};
+export declare function isImageMetadata(src: any): src is ImageMetadata;
 /**
  * A yet to be completed with an url `SrcSetValue`. Other hooks will only see a resolved value, where the URL of the image has been added.
  */
@@ -49,6 +53,8 @@ export type UnresolvedImageTransform = Omit<ImageTransform, 'src'> & {
         default: ImageMetadata;
     }>;
     inferSize?: boolean;
+} & {
+    [isESMImport]?: never;
 };
 /**
  * Options accepted by the image transformation service.

package/dist/assets/types.js

@@ -0,0 +1,7 @@
+const isESMImport = Symbol("#isESM");
+function isImageMetadata(src) {
+  return src.fsPath && !("fsPath" in src);
+}
+export {
+  isImageMetadata
+};

package/dist/container/pipeline.d.ts

@@ -8,5 +8,4 @@ export declare class ContainerPipeline extends Pipeline {
     tryRewrite(payload: RewritePayload, request: Request): Promise<[RouteData, ComponentInstance, URL]>;
     insertRoute(route: RouteData, componentInstance: ComponentInstance): void;
     getComponentByRoute(_routeData: RouteData): Promise<ComponentInstance>;
-    rewriteKnownRoute(pathname: string, _sourceRoute: RouteData): ComponentInstance;
 }

package/dist/container/pipeline.js

@@ -1,11 +1,12 @@
 import { Pipeline } from "../core/base-pipeline.js";
-import { InvalidRewrite404, RouteNotFound } from "../core/errors/errors-data.js";
+import { RouteNotFound } from "../core/errors/errors-data.js";
 import { AstroError } from "../core/errors/index.js";
 import {
   createModuleScriptElement,
   createStylesheetElementSet
 } from "../core/render/ssr-element.js";
-import { DEFAULT_404_ROUTE, default404Page } from "../core/routing/astro-designed-error-pages.js";
+import { DEFAULT_404_ROUTE } from "../core/routing/astro-designed-error-pages.js";
+import { findRouteToRewrite } from "../core/routing/rewrite.js";
 class ContainerPipeline extends Pipeline {
   /**
    * Internal cache to store components instances by `RouteData`.
@@ -52,30 +53,16 @@ class ContainerPipeline extends Pipeline {
     return { links, styles, scripts };
   }
   async tryRewrite(payload, request) {
-    let foundRoute;
-    let finalUrl = void 0;
-    for (const route of this.manifest.routes) {
-      if (payload instanceof URL) {
-        finalUrl = payload;
-      } else if (payload instanceof Request) {
-        finalUrl = new URL(payload.url);
-      } else {
-        finalUrl = new URL(payload, new URL(request.url).origin);
-      }
-      if (route.routeData.pattern.test(decodeURI(finalUrl.pathname))) {
-        foundRoute = route.routeData;
-        break;
-      } else if (finalUrl.pathname === "/404") {
-        foundRoute = DEFAULT_404_ROUTE;
-        break;
-      }
-    }
-    if (foundRoute && finalUrl) {
-      const componentInstance = await this.getComponentByRoute(foundRoute);
-      return [foundRoute, componentInstance, finalUrl];
-    } else {
-      throw new AstroError(RouteNotFound);
-    }
+    const [foundRoute, finalUrl] = findRouteToRewrite({
+      payload,
+      request,
+      routes: this.manifest?.routes.map((r) => r.routeData),
+      trailingSlash: this.manifest.trailingSlash,
+      buildFormat: this.manifest.buildFormat,
+      base: this.manifest.base
+    });
+    const componentInstance = await this.getComponentByRoute(foundRoute);
+    return [foundRoute, componentInstance, finalUrl];
   }
   insertRoute(route, componentInstance) {
     this.#componentsInterner.set(route, {
@@ -90,12 +77,6 @@ class ContainerPipeline extends Pipeline {
   // @ts-expect-error It needs to be implemented.
   async getComponentByRoute(_routeData) {
   }
-  rewriteKnownRoute(pathname, _sourceRoute) {
-    if (pathname === "/404") {
-      return { default: default404Page };
-    }
-    throw new AstroError(InvalidRewrite404);
-  }
 }
 export {
   ContainerPipeline

package/dist/content/runtime-assets.d.ts

@@ -2,10 +2,10 @@ import type { PluginContext } from 'rollup';
 import { z } from 'zod';
 export declare function createImage(pluginContext: PluginContext, shouldEmitFile: boolean, entryFilePath: string): () => z.ZodEffects<z.ZodString, z.ZodNever | {
     ASTRO_ASSET: string;
-    src: string;
+    format: "jpeg" | "jpg" | "png" | "tiff" | "webp" | "gif" | "svg" | "avif";
     width: number;
     height: number;
-    format: "jpeg" | "jpg" | "png" | "tiff" | "webp" | "gif" | "svg" | "avif";
-    orientation?: number | undefined;
+    src: string;
     fsPath: string;
+    orientation?: number | undefined;
 }, string>;

package/dist/content/types-generator.js

@@ -318,13 +318,26 @@ async function writeContentFiles({
       // This ensures `getCollection('empty-collection')` doesn't raise a type error
       collectionConfig?.type ?? "data"
     ) : collection.type;
+    const collectionEntryKeys = Object.keys(collection.entries).sort();
+    const dataType = collectionConfig?.schema ? `InferEntrySchema<${collectionKey}>` : "any";
     switch (resolvedType) {
       case "content":
+        if (collectionEntryKeys.length === 0) {
+          contentTypesStr += `${collectionKey}: Record<string, {
+  id: string;
+  slug: string;
+  body: string;
+  collection: ${collectionKey};
+  data: ${dataType};
+  render(): Render[".md"];
+}>;
+`;
+          break;
+        }
         contentTypesStr += `${collectionKey}: {
 `;
-        for (const entryKey of Object.keys(collection.entries).sort()) {
+        for (const entryKey of collectionEntryKeys) {
           const entryMetadata = collection.entries[entryKey];
-          const dataType = collectionConfig?.schema ? `InferEntrySchema<${collectionKey}>` : "any";
           const renderType = `{ render(): Render[${JSON.stringify(
             path.extname(JSON.parse(entryKey))
           )}] }`;
@@ -342,16 +355,24 @@ async function writeContentFiles({
 `;
         break;
       case "data":
-        dataTypesStr += `${collectionKey}: {
+        if (collectionEntryKeys.length === 0) {
+          dataTypesStr += `${collectionKey}: Record<string, {
+  id: string;
+  collection: ${collectionKey};
+  data: ${dataType};
+}>;
 `;
-        for (const entryKey of Object.keys(collection.entries).sort()) {
-          const dataType = collectionConfig?.schema ? `InferEntrySchema<${collectionKey}>` : "any";
-          dataTypesStr += `${entryKey}: {
+        } else {
+          dataTypesStr += `${collectionKey}: {
+`;
+          for (const entryKey of collectionEntryKeys) {
+            dataTypesStr += `${entryKey}: {
 	id: ${entryKey};
   collection: ${collectionKey};
   data: ${dataType}
 };
 `;
+          }
           dataTypesStr += `};
 `;
         }

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

@@ -39,6 +39,10 @@ export interface RenderErrorOptions {
      * Whether to skip middleware while rendering the error page. Defaults to false.
      */
     skipMiddleware?: boolean;
+    /**
+     * Allows passing an error to 500.astro. It will be available through `Astro.props.error`.
+     */
+    error?: unknown;
 }
 export declare class App {
     #private;

package/dist/core/app/index.js

@@ -195,8 +195,9 @@ class App {
     }
     if (locals) {
       if (typeof locals !== "object") {
-        this.#logger.error(null, new AstroError(AstroErrorData.LocalsNotAnObject).stack);
-        return this.#renderError(request, { status: 500 });
+        const error = new AstroError(AstroErrorData.LocalsNotAnObject);
+        this.#logger.error(null, error.stack);
+        return this.#renderError(request, { status: 500, error });
       }
       Reflect.set(request, clientLocalsSymbol, locals);
     }
@@ -229,13 +230,16 @@ class App {
       response = await renderContext.render(await mod.page());
     } catch (err) {
       this.#logger.error(null, err.stack || err.message || String(err));
-      return this.#renderError(request, { locals, status: 500 });
+      return this.#renderError(request, { locals, status: 500, error: err });
     }
     if (REROUTABLE_STATUS_CODES.includes(response.status) && response.headers.get(REROUTE_DIRECTIVE_HEADER) !== "no") {
       return this.#renderError(request, {
         locals,
         response,
-        status: response.status
+        status: response.status,
+        // We don't have an error to report here. Passing null means we pass nothing intentionally
+        // while undefined means there's no error
+        error: response.status === 500 ? null : void 0
       });
     }
     if (response.headers.has(REROUTE_DIRECTIVE_HEADER)) {
@@ -276,7 +280,13 @@ class App {
    * If it is a known error code, try sending the according page (e.g. 404.astro / 500.astro).
    * This also handles pre-rendered /404 or /500 routes
    */
-  async #renderError(request, { locals, status, response: originalResponse, skipMiddleware = false }) {
+  async #renderError(request, {
+    locals,
+    status,
+    response: originalResponse,
+    skipMiddleware = false,
+    error
+  }) {
     const errorRoutePath = `/${status}${this.#manifest.trailingSlash === "always" ? "/" : ""}`;
     const errorRouteData = matchRoute(errorRoutePath, this.#manifestData);
     const url = new URL(request.url);
@@ -300,7 +310,8 @@ class App {
           pathname: this.#getPathnameFromRequest(request),
           request,
           routeData: errorRouteData,
-          status
+          status,
+          props: { error }
         });
         const response2 = await renderContext.render(await mod.page());
         return this.#mergeResponses(response2, originalResponse);

package/dist/core/app/pipeline.d.ts

@@ -7,7 +7,6 @@ export declare class AppPipeline extends Pipeline {
     headElements(routeData: RouteData): Pick<SSRResult, 'scripts' | 'styles' | 'links'>;
     componentMetadata(): void;
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
-    tryRewrite(payload: RewritePayload, request: Request, sourceRoute: RouteData): Promise<[RouteData, ComponentInstance, URL]>;
+    tryRewrite(payload: RewritePayload, request: Request, _sourceRoute: RouteData): Promise<[RouteData, ComponentInstance, URL]>;
     getModuleForRoute(route: RouteData): Promise<SinglePageBuiltModule>;
-    rewriteKnownRoute(pathname: string, _sourceRoute: RouteData): ComponentInstance;
 }

package/dist/core/app/pipeline.js

@@ -5,6 +5,7 @@ import { AstroError } from "../errors/index.js";
 import { RedirectSinglePageBuiltModule } from "../redirects/component.js";
 import { createModuleScriptElement, createStylesheetElementSet } from "../render/ssr-element.js";
 import { DEFAULT_404_ROUTE } from "../routing/astro-designed-error-pages.js";
+import { findRouteToRewrite } from "../routing/rewrite.js";
 class AppPipeline extends Pipeline {
   #manifestData;
   static create(manifestData, {
@@ -62,38 +63,17 @@ class AppPipeline extends Pipeline {
     const module = await this.getModuleForRoute(routeData);
     return module.page();
   }
-  async tryRewrite(payload, request, sourceRoute) {
-    let foundRoute;
-    let finalUrl = void 0;
-    for (const route of this.#manifestData.routes) {
-      if (payload instanceof URL) {
-        finalUrl = payload;
-      } else if (payload instanceof Request) {
-        finalUrl = new URL(payload.url);
-      } else {
-        finalUrl = new URL(payload, new URL(request.url).origin);
-      }
-      if (route.pattern.test(decodeURI(finalUrl.pathname))) {
-        foundRoute = route;
-        break;
-      } else if (finalUrl.pathname === "/404") {
-        foundRoute = DEFAULT_404_ROUTE;
-        break;
-      }
-    }
-    if (foundRoute && finalUrl) {
-      if (foundRoute.pathname === "/404") {
-        const componentInstance = this.rewriteKnownRoute(foundRoute.pathname, sourceRoute);
-        return [foundRoute, componentInstance, finalUrl];
-      } else {
-        const componentInstance = await this.getComponentByRoute(foundRoute);
-        return [foundRoute, componentInstance, finalUrl];
-      }
-    }
-    throw new AstroError({
-      ...RewriteEncounteredAnError,
-      message: RewriteEncounteredAnError.message(payload.toString())
+  async tryRewrite(payload, request, _sourceRoute) {
+    const [foundRoute, finalUrl] = findRouteToRewrite({
+      payload,
+      request,
+      routes: this.manifest?.routes.map((r) => r.routeData),
+      trailingSlash: this.manifest.trailingSlash,
+      buildFormat: this.manifest.buildFormat,
+      base: this.manifest.base
     });
+    const componentInstance = await this.getComponentByRoute(foundRoute);
+    return [foundRoute, componentInstance, finalUrl];
   }
   async getModuleForRoute(route) {
     if (route.component === DEFAULT_404_COMPONENT) {
@@ -121,14 +101,6 @@ class AppPipeline extends Pipeline {
       );
     }
   }
-  // We don't need to check the source route, we already are in SSR
-  rewriteKnownRoute(pathname, _sourceRoute) {
-    if (pathname === "/404") {
-      return { default: () => new Response(null, { status: 404 }) };
-    } else {
-      return { default: () => new Response(null, { status: 500 }) };
-    }
-  }
 }
 export {
   AppPipeline

package/dist/core/base-pipeline.d.ts

@@ -73,15 +73,6 @@ export declare abstract class Pipeline {
      * @param routeData
      */
     abstract getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
-    /**
-     * Attempts to execute a rewrite of a known Astro route:
-     * - /404 -> src/pages/404.astro -> template
-     * - /500 -> src/pages/500.astro
-     *
-     * @param pathname The pathname where the user wants to rewrite e.g. "/404"
-     * @param sourceRoute The original route where the first request started. This is needed in case a pipeline wants to check if the current route is pre-rendered or not
-     */
-    abstract rewriteKnownRoute(pathname: string, sourceRoute: RouteData): ComponentInstance;
 }
 export interface HeadElements extends Pick<SSRResult, 'scripts' | 'styles' | 'links'> {
 }

package/dist/core/build/pipeline.d.ts

@@ -38,7 +38,6 @@ export declare class BuildPipeline extends Pipeline {
      */
     retrieveRoutesToGenerate(): Map<PageBuildData, string>;
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
-    tryRewrite(payload: RewritePayload, request: Request, sourceRoute: RouteData): Promise<[RouteData, ComponentInstance, URL]>;
+    tryRewrite(payload: RewritePayload, request: Request, _sourceRoute: RouteData): Promise<[RouteData, ComponentInstance, URL]>;
     retrieveSsrEntry(route: RouteData, filePath: string): Promise<SinglePageBuiltModule>;
-    rewriteKnownRoute(_pathname: string, sourceRoute: RouteData): ComponentInstance;
 }

package/dist/core/build/pipeline.js

@@ -1,7 +1,6 @@
 import { getOutputDirectory } from "../../prerender/utils.js";
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
-import { InvalidRewrite404, RewriteEncounteredAnError } from "../errors/errors-data.js";
-import { AstroError } from "../errors/index.js";
+import { DEFAULT_404_COMPONENT } from "../constants.js";
 import { routeIsFallback, routeIsRedirect } from "../redirects/helpers.js";
 import { RedirectSinglePageBuiltModule } from "../redirects/index.js";
 import { Pipeline } from "../render/index.js";
@@ -10,7 +9,8 @@ import {
   createModuleScriptsSet,
   createStylesheetElementSet
 } from "../render/ssr-element.js";
-import { DEFAULT_404_ROUTE } from "../routing/astro-designed-error-pages.js";
+import { default404Page } from "../routing/astro-designed-error-pages.js";
+import { findRouteToRewrite } from "../routing/rewrite.js";
 import { isServerLikeOutput } from "../util.js";
 import { getOutDirWithinCwd } from "./common.js";
 import { cssOrder, getPageData, mergeInlineCss } from "./internal.js";
@@ -201,45 +201,25 @@ class BuildPipeline extends Pipeline {
     if (this.#componentsInterner.has(routeData)) {
       const entry = this.#componentsInterner.get(routeData);
       return await entry.page();
+    } else if (routeData.component === DEFAULT_404_COMPONENT) {
+      return { default: default404Page };
     } else {
       const filePath = this.#routesByFilePath.get(routeData);
       const module = await this.retrieveSsrEntry(routeData, filePath);
       return module.page();
     }
   }
-  async tryRewrite(payload, request, sourceRoute) {
-    let foundRoute;
-    let finalUrl = void 0;
-    for (const route of this.options.manifest.routes) {
-      if (payload instanceof URL) {
-        finalUrl = payload;
-      } else if (payload instanceof Request) {
-        finalUrl = new URL(payload.url);
-      } else {
-        finalUrl = new URL(payload, new URL(request.url).origin);
-      }
-      if (route.pattern.test(decodeURI(finalUrl.pathname))) {
-        foundRoute = route;
-        break;
-      } else if (finalUrl.pathname === "/404") {
-        foundRoute = DEFAULT_404_ROUTE;
-        break;
-      }
-    }
-    if (foundRoute && finalUrl) {
-      if (foundRoute.pathname === "/404") {
-        const componentInstance = await this.rewriteKnownRoute(foundRoute.pathname, sourceRoute);
-        return [foundRoute, componentInstance, finalUrl];
-      } else {
-        const componentInstance = await this.getComponentByRoute(foundRoute);
-        return [foundRoute, componentInstance, finalUrl];
-      }
-    } else {
-      throw new AstroError({
-        ...RewriteEncounteredAnError,
-        message: RewriteEncounteredAnError.message(payload.toString())
-      });
-    }
+  async tryRewrite(payload, request, _sourceRoute) {
+    const [foundRoute, finalUrl] = findRouteToRewrite({
+      payload,
+      request,
+      routes: this.options.manifest.routes,
+      trailingSlash: this.config.trailingSlash,
+      buildFormat: this.config.build.format,
+      base: this.config.base
+    });
+    const componentInstance = await this.getComponentByRoute(foundRoute);
+    return [foundRoute, componentInstance, finalUrl];
   }
   async retrieveSsrEntry(route, filePath) {
     if (this.#componentsInterner.has(route)) {
@@ -285,12 +265,6 @@ class BuildPipeline extends Pipeline {
     }
     return RedirectSinglePageBuiltModule;
   }
-  rewriteKnownRoute(_pathname, sourceRoute) {
-    if (!isServerLikeOutput(this.config) || sourceRoute.prerender) {
-      throw new AstroError(InvalidRewrite404);
-    }
-    throw new Error(`Unreachable, in SSG this route shouldn't be generated`);
-  }
 }
 function createEntryURL(filePath, outFolder) {
   return new URL("./" + filePath + `?time=${Date.now()}`, outFolder);

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.10.3";
+const ASTRO_VERSION = "4.11.0";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
 const DEFAULT_404_COMPONENT = "astro-default-404.astro";

package/dist/core/cookies/cookies.d.ts

@@ -58,6 +58,11 @@ declare class AstroCookies implements AstroCookiesInterface {
      * @param options Options for the cookie, such as the path and security settings.
      */
     set(key: string, value: string | Record<string, any>, options?: AstroCookieSetOptions): void;
+    /**
+     * Merges a new AstroCookies instance into the current instance. Any new cookies
+     * will be added to the current instance, overwriting any existing cookies with the same name.
+     */
+    merge(cookies: AstroCookies): void;
     /**
      * Astro.cookies.header() returns an iterator for the cookies that have previously
      * been set by either Astro.cookies.set() or Astro.cookies.delete().

package/dist/core/cookies/cookies.js

@@ -136,6 +136,18 @@ class AstroCookies {
       });
     }
   }
+  /**
+   * Merges a new AstroCookies instance into the current instance. Any new cookies
+   * will be added to the current instance, overwriting any existing cookies with the same name.
+   */
+  merge(cookies) {
+    const outgoing = cookies.#outgoing;
+    if (outgoing) {
+      for (const [key, value] of outgoing) {
+        this.#ensureOutgoingMap().set(key, value);
+      }
+    }
+  }
   /**
    * Astro.cookies.header() returns an iterator for the cookies that have previously
    * been set by either Astro.cookies.set() or Astro.cookies.delete().

package/dist/core/cookies/response.d.ts

@@ -1,4 +1,5 @@
 import { AstroCookies } from './cookies.js';
 export declare function attachCookiesToResponse(response: Response, cookies: AstroCookies): void;
 export declare function responseHasCookies(response: Response): boolean;
+export declare function getFromResponse(response: Response): AstroCookies | undefined;
 export declare function getSetCookiesFromResponse(response: Response): Generator<string, string[]>;

package/dist/core/cookies/response.js

@@ -26,6 +26,7 @@ function* getSetCookiesFromResponse(response) {
 }
 export {
   attachCookiesToResponse,
+  getFromResponse,
   getSetCookiesFromResponse,
   responseHasCookies
 };

package/dist/core/create-vite.js

@@ -146,10 +146,6 @@ async function createVite(commandConfig, { settings, logger, mode, command, fs =
     server: {
       hmr: process.env.NODE_ENV === "test" || process.env.NODE_ENV === "production" ? false : void 0,
       // disable HMR for test
-      // handle Vite URLs
-      proxy: {
-        // add proxies here
-      },
       watch: {
         // Prevent watching during the build to speed it up
         ignored: mode === "build" ? ["**"] : void 0

package/dist/core/dev/dev.js

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

package/dist/core/errors/errors-data.d.ts

@@ -588,6 +588,26 @@ export declare const ExpectedImageOptions: {
     title: string;
     message: (options: string) => string;
 };
+/**
+ * @docs
+ * @see
+ * - [Images](https://docs.astro.build/en/guides/images/)
+ * @description
+ * An ESM-imported image cannot be passed directly to `getImage()`. Instead, pass an object with the image in the `src` property.
+ *
+ * ```diff
+ * import { getImage } from "astro:assets";
+ * import myImage from "../assets/my_image.png";
+ * - const optimizedImage = await getImage( myImage );
+ * + const optimizedImage = await getImage({ src: myImage });
+ * ```
+ */
+export declare const ExpectedNotESMImage: {
+    name: string;
+    title: string;
+    message: string;
+    hint: string;
+};
 /**
  * @docs
  * @see
@@ -1010,17 +1030,6 @@ export declare const RewriteEncounteredAnError: {
     title: string;
     message: (route: string, stack?: string) => string;
 };
-/**
- * @docs
- * @description
- *
- * The user tried to rewrite a 404 page inside a static page.
- */
-export declare const InvalidRewrite404: {
-    name: string;
-    title: string;
-    message: string;
-};
 /**
  * @docs
  * @description

package/dist/core/errors/errors-data.js

@@ -209,6 +209,12 @@ const ExpectedImageOptions = {
   title: "Expected image options.",
   message: (options) => `Expected getImage() parameter to be an object. Received \`${options}\`.`
 };
+const ExpectedNotESMImage = {
+  name: "ExpectedNotESMImage",
+  title: "Expected image options, not an ESM-imported image.",
+  message: "An ESM-imported image cannot be passed directly to `getImage()`. Instead, pass an object with the image in the `src` property.",
+  hint: "Try changing `getImage(myImage)` to `getImage({ src: myImage })`"
+};
 const IncompatibleDescriptorOptions = {
   name: "IncompatibleDescriptorOptions",
   title: "Cannot set both `densities` and `widths`",
@@ -361,11 +367,6 @@ const RewriteEncounteredAnError = {
   title: "Astro couldn't find the route to rewrite, or if was found but it emitted an error during the rendering phase.",
   message: (route, stack) => `The route ${route} that you tried to render doesn't exist, or it emitted an error during the rendering phase. ${stack ? stack : ""}.`
 };
-const InvalidRewrite404 = {
-  name: "InvalidRewrite404",
-  title: "You attempted to rewrite a 404 inside a static page, and this isn't allowed.",
-  message: "Rewriting a 404 is only allowed inside on-demand pages."
-};
 const CantRenderPage = {
   name: "CantRenderPage",
   title: "Astro can't render the route.",
@@ -581,6 +582,7 @@ export {
   EnvUnsupportedGetSecret,
   ExpectedImage,
   ExpectedImageOptions,
+  ExpectedNotESMImage,
   FailedToFetchRemoteImageDimensions,
   FailedToFindPageMapSSR,
   FailedToLoadModuleSSR,
@@ -604,7 +606,6 @@ export {
   InvalidGlob,
   InvalidImageService,
   InvalidPrerenderExport,
-  InvalidRewrite404,
   LocalImageUsedWrongly,
   LocalsNotAnObject,
   MarkdownFrontmatterParseError,

package/dist/core/messages.js

@@ -37,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.10.3";
+  const version = "4.11.0";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -269,7 +269,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.10.3"}`
+        `v${"4.11.0"}`
       )} ${headline}`
     );
   }

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

@@ -29,7 +29,7 @@ export declare class RenderContext {
      * A safety net in case of loops
      */
     counter: number;
-    static create({ locals, middleware, pathname, pipeline, request, routeData, status, }: Pick<RenderContext, 'pathname' | 'pipeline' | 'request' | 'routeData'> & Partial<Pick<RenderContext, 'locals' | 'middleware' | 'status'>>): RenderContext;
+    static create({ locals, middleware, pathname, pipeline, request, routeData, status, props, }: Pick<RenderContext, 'pathname' | 'pipeline' | 'request' | 'routeData'> & Partial<Pick<RenderContext, 'locals' | 'middleware' | 'status' | 'props'>>): RenderContext;
     /**
      * The main function of the RenderContext.
      *

package/dist/core/render-context.js

@@ -15,6 +15,7 @@ import {
   responseSentSymbol
 } from "./constants.js";
 import { AstroCookies, attachCookiesToResponse } from "./cookies/index.js";
+import { getFromResponse } from "./cookies/response.js";
 import { AstroError, AstroErrorData } from "./errors/index.js";
 import { callMiddleware } from "./middleware/callMiddleware.js";
 import { sequence } from "./middleware/index.js";
@@ -52,7 +53,8 @@ class RenderContext {
     pipeline,
     request,
     routeData,
-    status = 200
+    status = 200,
+    props
   }) {
     return new RenderContext(
       pipeline,
@@ -61,7 +63,11 @@ class RenderContext {
       pathname,
       request,
       routeData,
-      status
+      status,
+      void 0,
+      void 0,
+      void 0,
+      props
     );
   }
   /**
@@ -113,14 +119,16 @@ class RenderContext {
           );
         }
       }
+      let response2;
       switch (this.routeData.type) {
-        case "endpoint":
-          return renderEndpoint(componentInstance, ctx, serverLike, logger);
+        case "endpoint": {
+          response2 = await renderEndpoint(componentInstance, ctx, serverLike, logger);
+          break;
+        }
         case "redirect":
           return renderRedirect(this);
         case "page": {
           const result = await this.createResult(componentInstance);
-          let response2;
           try {
             response2 = await renderPage(
               result,
@@ -138,12 +146,17 @@ class RenderContext {
           if (this.routeData.route === "/404" || this.routeData.route === "/500" || this.isRewriting) {
             response2.headers.set(REROUTE_DIRECTIVE_HEADER, "no");
           }
-          return response2;
+          break;
         }
         case "fallback": {
           return new Response(null, { status: 500, headers: { [ROUTE_TYPE_HEADER]: "fallback" } });
         }
       }
+      const responseCookies = getFromResponse(response2);
+      if (responseCookies) {
+        cookies.merge(responseCookies);
+      }
+      return response2;
     };
     const response = await callMiddleware(
       middleware,

package/dist/core/request.js

@@ -12,7 +12,13 @@ function createRequest({
   locals,
   staticLike = false
 }) {
-  const headersObj = staticLike ? void 0 : headers instanceof Headers ? headers : new Headers(Object.entries(headers));
+  const headersObj = staticLike ? void 0 : headers instanceof Headers ? headers : new Headers(
+    // Filter out HTTP/2 pseudo-headers. These are internally-generated headers added to all HTTP/2 requests with trusted metadata about the request.
+    // Examples include `:method`, `:scheme`, `:authority`, and `:path`.
+    // They are always prefixed with a colon to distinguish them from other headers, and it is an error to add the to a Headers object manually.
+    // See https://httpwg.org/specs/rfc7540.html#HttpRequest
+    Object.entries(headers).filter(([name]) => !name.startsWith(":"))
+  );
   if (typeof url === "string") url = new URL(url);
   const imageEndpoint = prependForwardSlash(appendForwardSlash(base)) + "_image";
   if (staticLike && url.pathname !== imageEndpoint) {

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

@@ -0,0 +1,10 @@
+import type { AstroConfig, RewritePayload, RouteData } from '../../@types/astro.js';
+export type FindRouteToRewrite = {
+    payload: RewritePayload;
+    routes: RouteData[];
+    request: Request;
+    trailingSlash: AstroConfig['trailingSlash'];
+    buildFormat: AstroConfig['build']['format'];
+    base: AstroConfig['base'];
+};
+export declare function findRouteToRewrite({ payload, routes, request, trailingSlash, buildFormat, base, }: FindRouteToRewrite): [RouteData, URL];

package/dist/core/routing/rewrite.js

@@ -0,0 +1,41 @@
+import { shouldAppendForwardSlash } from "../build/util.js";
+import { appendForwardSlash, removeTrailingForwardSlash } from "../path.js";
+import { DEFAULT_404_ROUTE } from "./astro-designed-error-pages.js";
+function findRouteToRewrite({
+  payload,
+  routes,
+  request,
+  trailingSlash,
+  buildFormat,
+  base
+}) {
+  let finalUrl = void 0;
+  if (payload instanceof URL) {
+    finalUrl = payload;
+  } else if (payload instanceof Request) {
+    finalUrl = new URL(payload.url);
+  } else {
+    finalUrl = new URL(payload, new URL(request.url).origin);
+  }
+  let foundRoute;
+  for (const route of routes) {
+    const pathname = shouldAppendForwardSlash(trailingSlash, buildFormat) ? appendForwardSlash(finalUrl.pathname) : base !== "/" ? removeTrailingForwardSlash(finalUrl.pathname) : finalUrl.pathname;
+    if (route.pattern.test(decodeURI(pathname))) {
+      foundRoute = route;
+      break;
+    }
+  }
+  if (foundRoute) {
+    return [foundRoute, finalUrl];
+  } else {
+    const custom404 = routes.find((route) => route.route === "/404");
+    if (custom404) {
+      return [custom404, finalUrl];
+    } else {
+      return [DEFAULT_404_ROUTE, finalUrl];
+    }
+  }
+}
+export {
+  findRouteToRewrite
+};

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

@@ -19,7 +19,6 @@ export declare class DevPipeline extends Pipeline {
     preload(routeData: RouteData, filePath: URL): Promise<ComponentInstance>;
     clearRouteCache(): void;
     getComponentByRoute(routeData: RouteData): Promise<ComponentInstance>;
-    tryRewrite(payload: RewritePayload, request: Request, sourceRoute: RouteData): Promise<[RouteData, ComponentInstance, URL]>;
+    tryRewrite(payload: RewritePayload, request: Request, _sourceRoute: RouteData): Promise<[RouteData, ComponentInstance, URL]>;
     setManifestData(manifestData: ManifestData): void;
-    rewriteKnownRoute(route: string, sourceRoute: RouteData): ComponentInstance;
 }

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

@@ -1,12 +1,15 @@
 import { fileURLToPath } from "node:url";
 import { getInfoOutput } from "../cli/info/index.js";
 import {} from "../core/base-pipeline.js";
+import { shouldAppendForwardSlash } from "../core/build/util.js";
 import { ASTRO_VERSION, DEFAULT_404_COMPONENT } from "../core/constants.js";
 import { enhanceViteSSRError } from "../core/errors/dev/index.js";
-import { InvalidRewrite404, RewriteEncounteredAnError } from "../core/errors/errors-data.js";
+import { RewriteEncounteredAnError } from "../core/errors/errors-data.js";
 import { AggregateError, AstroError, CSSError, MarkdownError } from "../core/errors/index.js";
+import { prependForwardSlash, removeTrailingForwardSlash } from "../core/path.js";
 import { Pipeline, loadRenderer } from "../core/render/index.js";
 import { DEFAULT_404_ROUTE, default404Page } from "../core/routing/astro-designed-error-pages.js";
+import { findRouteToRewrite } from "../core/routing/rewrite.js";
 import { isPage, isServerLikeOutput, resolveIdToUrl, viteID } from "../core/util.js";
 import { PAGE_SCRIPT_ID } from "../vite-plugin-scripts/index.js";
 import { getStylesForURL } from "./css.js";
@@ -133,54 +136,24 @@ class DevPipeline extends Pipeline {
       return await this.preload(routeData, filePath);
     }
   }
-  async tryRewrite(payload, request, sourceRoute) {
-    let foundRoute;
+  async tryRewrite(payload, request, _sourceRoute) {
     if (!this.manifestData) {
       throw new Error("Missing manifest data. This is an internal error, please file an issue.");
     }
-    let finalUrl = void 0;
-    for (const route of this.manifestData.routes) {
-      if (payload instanceof URL) {
-        finalUrl = payload;
-      } else if (payload instanceof Request) {
-        finalUrl = new URL(payload.url);
-      } else {
-        finalUrl = new URL(payload, new URL(request.url).origin);
-      }
-      if (route.pattern.test(decodeURI(finalUrl.pathname))) {
-        foundRoute = route;
-        break;
-      } else if (finalUrl.pathname === "/404") {
-        foundRoute = DEFAULT_404_ROUTE;
-        break;
-      }
-    }
-    if (foundRoute && finalUrl) {
-      if (foundRoute.pathname === "/404") {
-        const componentInstance = this.rewriteKnownRoute(foundRoute.pathname, sourceRoute);
-        return [foundRoute, componentInstance, finalUrl];
-      } else {
-        const componentInstance = await this.getComponentByRoute(foundRoute);
-        return [foundRoute, componentInstance, finalUrl];
-      }
-    } else {
-      throw new AstroError({
-        ...RewriteEncounteredAnError,
-        message: RewriteEncounteredAnError.message(payload.toString())
-      });
-    }
+    const [foundRoute, finalUrl] = findRouteToRewrite({
+      payload,
+      request,
+      routes: this.manifestData?.routes,
+      trailingSlash: this.config.trailingSlash,
+      buildFormat: this.config.build.format,
+      base: this.config.base
+    });
+    const componentInstance = await this.getComponentByRoute(foundRoute);
+    return [foundRoute, componentInstance, finalUrl];
   }
   setManifestData(manifestData) {
     this.manifestData = manifestData;
   }
-  rewriteKnownRoute(route, sourceRoute) {
-    if (isServerLikeOutput(this.config) && sourceRoute.prerender) {
-      if (route === "/404") {
-        return { default: default404Page };
-      }
-    }
-    throw new AstroError(InvalidRewrite404);
-  }
 }
 export {
   DevPipeline

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

@@ -11,7 +11,7 @@ async function handleRequest({
   incomingResponse
 }) {
   const { config, loader } = pipeline;
-  const origin = `${loader.isHttps() ? "https" : "http"}://${incomingRequest.headers.host}`;
+  const origin = `${loader.isHttps() ? "https" : "http"}://${incomingRequest.headers[":authority"] ?? incomingRequest.headers.host}`;
   const url = new URL(origin + incomingRequest.url);
   let pathname;
   if (config.trailingSlash === "never" && !incomingRequest.url) {

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

@@ -108,11 +108,8 @@ async function handleRoute({
 }) {
   const timeStart = performance.now();
   const { config, loader, logger } = pipeline;
-  if (!matchedRoute && !config.i18n) {
-    if (isLoggedRequest(pathname)) {
-      logger.info(null, req({ url: pathname, method: incomingRequest.method, statusCode: 404 }));
-    }
-    return handle404Response(origin, incomingRequest, incomingResponse);
+  if (!matchedRoute) {
+    throw new Error("No route matched, and default 404 route was not found.");
   }
   let request;
   let renderContext;
@@ -121,96 +118,40 @@ async function handleRoute({
   let route;
   const middleware = (await loadMiddleware(loader)).onRequest;
   const locals = Reflect.get(incomingRequest, clientLocalsSymbol);
-  if (!matchedRoute) {
-    if (config.i18n) {
-      const locales = config.i18n.locales;
-      const pathNameHasLocale = pathname.split("/").filter(Boolean).some((segment) => {
-        let found = false;
-        for (const locale of locales) {
-          if (typeof locale === "string") {
-            if (normalizeTheLocale(locale) === normalizeTheLocale(segment)) {
-              found = true;
-              break;
-            }
-          } else {
-            if (locale.path === segment) {
-              found = true;
-              break;
-            }
-          }
-        }
-        return found;
-      });
-      if (!pathNameHasLocale && pathname !== "/") {
-        return handle404Response(origin, incomingRequest, incomingResponse);
-      }
-    }
-    request = createRequest({
-      base: config.base,
-      url,
-      headers: incomingRequest.headers,
-      logger,
-      // no route found, so we assume the default for rendering the 404 page
-      staticLike: config.output === "static" || config.output === "hybrid"
-    });
-    route = {
-      component: "",
-      generate(_data) {
-        return "";
-      },
-      params: [],
-      // Disable eslint as we only want to generate an empty RegExp
-      // eslint-disable-next-line prefer-regex-literals
-      pattern: new RegExp(""),
-      prerender: false,
-      segments: [],
-      type: "fallback",
-      route: "",
-      fallbackRoutes: [],
-      isIndex: false
-    };
-    renderContext = RenderContext.create({
-      pipeline,
-      pathname,
-      middleware,
-      request,
-      routeData: route
-    });
-  } else {
-    const filePath = matchedRoute.filePath;
-    const { preloadedComponent } = matchedRoute;
-    route = matchedRoute.route;
-    request = createRequest({
-      base: config.base,
-      url,
-      headers: incomingRequest.headers,
-      method: incomingRequest.method,
-      body,
-      logger,
-      clientAddress: incomingRequest.socket.remoteAddress,
-      staticLike: config.output === "static" || route.prerender
-    });
-    for (const [name, value] of Object.entries(config.server.headers ?? {})) {
-      if (value) incomingResponse.setHeader(name, value);
-    }
-    options = {
-      pipeline,
-      filePath,
-      preload: preloadedComponent,
-      pathname,
-      request,
-      route
-    };
-    mod = preloadedComponent;
-    renderContext = RenderContext.create({
-      locals,
-      pipeline,
-      pathname,
-      middleware,
-      request,
-      routeData: route
-    });
+  const filePath = matchedRoute.filePath;
+  const { preloadedComponent } = matchedRoute;
+  route = matchedRoute.route;
+  request = createRequest({
+    base: config.base,
+    url,
+    headers: incomingRequest.headers,
+    method: incomingRequest.method,
+    body,
+    logger,
+    clientAddress: incomingRequest.socket.remoteAddress,
+    staticLike: config.output === "static" || route.prerender
+  });
+  for (const [name, value] of Object.entries(config.server.headers ?? {})) {
+    if (value) incomingResponse.setHeader(name, value);
   }
+  options = {
+    pipeline,
+    filePath,
+    preload: preloadedComponent,
+    pathname,
+    request,
+    route
+  };
+  mod = preloadedComponent;
+  const isPrerendered404 = matchedRoute.route.route === "/404" && matchedRoute.route.prerender;
+  renderContext = RenderContext.create({
+    locals,
+    pipeline,
+    pathname,
+    middleware: isPrerendered404 ? void 0 : middleware,
+    request,
+    routeData: route
+  });
   let response;
   try {
     response = await renderContext.render(mod);
@@ -220,9 +161,10 @@ async function handleRoute({
       throw err;
     }
     logger.error("router", err.stack || err.message);
-    const filePath = new URL(`./${custom500.component}`, config.root);
-    const preloadedComponent = await pipeline.preload(custom500, filePath);
-    response = await renderContext.render(preloadedComponent);
+    const filePath500 = new URL(`./${custom500.component}`, config.root);
+    const preloaded500Component = await pipeline.preload(custom500, filePath500);
+    renderContext.props.error = err;
+    response = await renderContext.render(preloaded500Component);
     status = 500;
   }
   if (isLoggedRequest(pathname)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.10.3",
+  "version": "4.11.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -169,9 +169,9 @@
     "yargs-parser": "^21.1.1",
     "zod": "^3.23.8",
     "zod-to-json-schema": "^3.23.0",
+    "@astrojs/markdown-remark": "5.1.0",
     "@astrojs/internal-helpers": "0.4.0",
-    "@astrojs/telemetry": "3.1.0",
-    "@astrojs/markdown-remark": "5.1.0"
+    "@astrojs/telemetry": "3.1.0"
   },
   "optionalDependencies": {
     "sharp": "^0.33.3"
@@ -214,6 +214,7 @@
     "rollup": "^4.18.0",
     "sass": "^1.77.5",
     "srcset-parse": "^1.1.0",
+    "undici": "^6.19.2",
     "unified": "^11.0.4",
     "astro-scripts": "0.0.14"
   },