astro 4.10.3 → 4.11.1

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/@types/astro.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import type { OutgoingHttpHeaders } from 'node:http';
 import type { AddressInfo } from 'node:net';
 import type { MarkdownHeading, MarkdownVFile, RehypePlugins, RemarkPlugins, RemarkRehype, ShikiConfig } from '@astrojs/markdown-remark';

package/dist/actions/runtime/store.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import { AsyncLocalStorage } from 'node:async_hooks';
 import type { APIContext } from '../../@types/astro.js';
 export type ActionAPIContext = Omit<APIContext, 'getActionResult' | 'props'>;

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/build/remote.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 export type RemoteCacheEntry = {
     data: string;
     expires: number;

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/services/vendor/squoosh/avif/avif_node_dec.wasm.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" resolution-mode="require"/>
 declare const _default: Buffer;
 export default _default;

package/dist/assets/services/vendor/squoosh/avif/avif_node_enc.wasm.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" resolution-mode="require"/>
 declare const _default: Buffer;
 export default _default;

package/dist/assets/services/vendor/squoosh/codecs.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 interface DecodeModule extends EmscriptenWasm.Module {
     decode: (data: Uint8Array) => ImageData;
 }

package/dist/assets/services/vendor/squoosh/image.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { ImageOutputFormat } from '../../../types.js';
 type RotateOperation = {
     type: 'rotate';

package/dist/assets/services/vendor/squoosh/image_data.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 export default class ImageData {
     static from(input: ImageData): ImageData;
     private _data;

package/dist/assets/services/vendor/squoosh/impl.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import ImageData from './image_data.js';
 export declare function decodeBuffer(_buffer: Buffer | Uint8Array): Promise<ImageData>;
 export declare function rotate(image: ImageData, numRotations: number): Promise<ImageData>;

package/dist/assets/services/vendor/squoosh/mozjpeg/mozjpeg_node_dec.wasm.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" resolution-mode="require"/>
 declare const _default: Buffer;
 export default _default;

package/dist/assets/services/vendor/squoosh/mozjpeg/mozjpeg_node_enc.wasm.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" resolution-mode="require"/>
 declare const _default: Buffer;
 export default _default;

package/dist/assets/services/vendor/squoosh/png/squoosh_oxipng_bg.wasm.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" resolution-mode="require"/>
 declare const _default: Buffer;
 export default _default;

package/dist/assets/services/vendor/squoosh/png/squoosh_png_bg.wasm.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" resolution-mode="require"/>
 declare const _default: Buffer;
 export default _default;

package/dist/assets/services/vendor/squoosh/resize/squoosh_resize_bg.wasm.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" resolution-mode="require"/>
 declare const _default: Buffer;
 export default _default;

package/dist/assets/services/vendor/squoosh/rotate/rotate.wasm.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" resolution-mode="require"/>
 declare const _default: Buffer;
 export default _default;

package/dist/assets/services/vendor/squoosh/utils/workerPool.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import { Worker } from 'worker_threads';
 interface Job<I> {
     msg: I;

package/dist/assets/services/vendor/squoosh/webp/webp_node_dec.wasm.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" resolution-mode="require"/>
 declare const _default: Buffer;
 export default _default;

package/dist/assets/services/vendor/squoosh/webp/webp_node_enc.wasm.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" resolution-mode="require"/>
 declare const _default: Buffer;
 export default _default;

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/cli/add/babel.d.ts

@@ -2,16 +2,16 @@ import parser from '@babel/parser';
 import traverse from '@babel/traverse';
 import * as t from '@babel/types';
 export declare const visit: {
-    <S>(parent: traverse.Node, opts: traverse.TraverseOptions<S>, scope: traverse.Scope | undefined, state: S, parentPath?: traverse.NodePath<traverse.Node> | undefined): void;
-    (parent: traverse.Node, opts?: traverse.TraverseOptions<traverse.Node> | undefined, scope?: traverse.Scope | undefined, state?: any, parentPath?: traverse.NodePath<traverse.Node> | undefined): void;
+    <S>(parent: traverse.Node, opts: traverse.TraverseOptions<S>, scope: traverse.Scope | undefined, state: S, parentPath?: traverse.NodePath): void;
+    (parent: traverse.Node, opts?: traverse.TraverseOptions, scope?: traverse.Scope, state?: any, parentPath?: traverse.NodePath): void;
     visitors: typeof traverse.visitors;
     verify: typeof traverse.visitors.verify;
     explode: typeof traverse.visitors.explode;
     cheap: (node: traverse.Node, enter: (node: traverse.Node) => void) => void;
-    node: (node: traverse.Node, opts: traverse.TraverseOptions<traverse.Node>, scope?: traverse.Scope | undefined, state?: any, path?: traverse.NodePath<traverse.Node> | undefined, skipKeys?: Record<string, boolean> | undefined) => void;
-    clearNode: (node: traverse.Node, opts?: traverse.RemovePropertiesOptions | undefined) => void;
-    removeProperties: (tree: traverse.Node, opts?: traverse.RemovePropertiesOptions | undefined) => traverse.Node;
-    hasType: (tree: traverse.Node, type: "CatchClause" | "ClassBody" | "Identifier" | "Program" | "SpreadElement" | "Super" | "SwitchCase" | "TemplateElement" | "VariableDeclarator" | "JSXIdentifier" | "JSXNamespacedName" | "JSXMemberExpression" | "JSXEmptyExpression" | "JSXExpressionContainer" | "JSXSpreadAttribute" | "JSXAttribute" | "JSXOpeningElement" | "JSXOpeningFragment" | "JSXClosingElement" | "JSXClosingFragment" | "JSXElement" | "JSXFragment" | "JSXText" | "ArrayExpression" | "ArrowFunctionExpression" | "AssignmentExpression" | "AwaitExpression" | "BinaryExpression" | "CallExpression" | "ClassExpression" | "ConditionalExpression" | "FunctionExpression" | "ImportExpression" | "LogicalExpression" | "MemberExpression" | "MetaProperty" | "NewExpression" | "ObjectExpression" | "SequenceExpression" | "TaggedTemplateExpression" | "TemplateLiteral" | "ThisExpression" | "UnaryExpression" | "UpdateExpression" | "YieldExpression" | "ClassDeclaration" | "FunctionDeclaration" | "ImportDeclaration" | "ExportNamedDeclaration" | "ExportDefaultDeclaration" | "ExportAllDeclaration" | "ImportSpecifier" | "ImportDefaultSpecifier" | "ImportNamespaceSpecifier" | "ExportSpecifier" | "ObjectPattern" | "ArrayPattern" | "RestElement" | "AssignmentPattern" | "ExpressionStatement" | "BlockStatement" | "StaticBlock" | "EmptyStatement" | "DebuggerStatement" | "WithStatement" | "ReturnStatement" | "LabeledStatement" | "BreakStatement" | "ContinueStatement" | "IfStatement" | "SwitchStatement" | "ThrowStatement" | "TryStatement" | "WhileStatement" | "DoWhileStatement" | "ForStatement" | "ForInStatement" | "ForOfStatement" | "VariableDeclaration" | "File" | "RestProperty" | "SpreadProperty" | "AnyTypeAnnotation" | "ArgumentPlaceholder" | "ArrayTypeAnnotation" | "BigIntLiteral" | "BindExpression" | "BooleanLiteral" | "BooleanLiteralTypeAnnotation" | "BooleanTypeAnnotation" | "ClassAccessorProperty" | "ClassImplements" | "ClassMethod" | "ClassPrivateMethod" | "ClassPrivateProperty" | "ClassProperty" | "DecimalLiteral" | "DeclareClass" | "DeclareExportAllDeclaration" | "DeclareExportDeclaration" | "DeclareFunction" | "DeclareInterface" | "DeclareModule" | "DeclareModuleExports" | "DeclareOpaqueType" | "DeclareTypeAlias" | "DeclareVariable" | "DeclaredPredicate" | "Decorator" | "Directive" | "DirectiveLiteral" | "DoExpression" | "EmptyTypeAnnotation" | "EnumBooleanBody" | "EnumBooleanMember" | "EnumDeclaration" | "EnumDefaultedMember" | "EnumNumberBody" | "EnumNumberMember" | "EnumStringBody" | "EnumStringMember" | "EnumSymbolBody" | "ExistsTypeAnnotation" | "ExportDefaultSpecifier" | "ExportNamespaceSpecifier" | "FunctionTypeAnnotation" | "FunctionTypeParam" | "GenericTypeAnnotation" | "Import" | "ImportAttribute" | "IndexedAccessType" | "InferredPredicate" | "InterfaceDeclaration" | "InterfaceExtends" | "InterfaceTypeAnnotation" | "InterpreterDirective" | "IntersectionTypeAnnotation" | "JSXSpreadChild" | "MixedTypeAnnotation" | "ModuleExpression" | "Noop" | "NullLiteral" | "NullLiteralTypeAnnotation" | "NullableTypeAnnotation" | "NumberLiteral" | "NumberLiteralTypeAnnotation" | "NumberTypeAnnotation" | "NumericLiteral" | "ObjectMethod" | "ObjectProperty" | "ObjectTypeAnnotation" | "ObjectTypeCallProperty" | "ObjectTypeIndexer" | "ObjectTypeInternalSlot" | "ObjectTypeProperty" | "ObjectTypeSpreadProperty" | "OpaqueType" | "OptionalCallExpression" | "OptionalIndexedAccessType" | "OptionalMemberExpression" | "ParenthesizedExpression" | "PipelineBareFunction" | "PipelinePrimaryTopicReference" | "PipelineTopicExpression" | "Placeholder" | "PrivateName" | "QualifiedTypeIdentifier" | "RecordExpression" | "RegExpLiteral" | "RegexLiteral" | "StringLiteral" | "StringLiteralTypeAnnotation" | "StringTypeAnnotation" | "SymbolTypeAnnotation" | "TSAnyKeyword" | "TSArrayType" | "TSAsExpression" | "TSBigIntKeyword" | "TSBooleanKeyword" | "TSCallSignatureDeclaration" | "TSConditionalType" | "TSConstructSignatureDeclaration" | "TSConstructorType" | "TSDeclareFunction" | "TSDeclareMethod" | "TSEnumDeclaration" | "TSEnumMember" | "TSExportAssignment" | "TSExpressionWithTypeArguments" | "TSExternalModuleReference" | "TSFunctionType" | "TSImportEqualsDeclaration" | "TSImportType" | "TSIndexSignature" | "TSIndexedAccessType" | "TSInferType" | "TSInstantiationExpression" | "TSInterfaceBody" | "TSInterfaceDeclaration" | "TSIntersectionType" | "TSIntrinsicKeyword" | "TSLiteralType" | "TSMappedType" | "TSMethodSignature" | "TSModuleBlock" | "TSModuleDeclaration" | "TSNamedTupleMember" | "TSNamespaceExportDeclaration" | "TSNeverKeyword" | "TSNonNullExpression" | "TSNullKeyword" | "TSNumberKeyword" | "TSObjectKeyword" | "TSOptionalType" | "TSParameterProperty" | "TSParenthesizedType" | "TSPropertySignature" | "TSQualifiedName" | "TSRestType" | "TSSatisfiesExpression" | "TSStringKeyword" | "TSSymbolKeyword" | "TSThisType" | "TSTupleType" | "TSTypeAliasDeclaration" | "TSTypeAnnotation" | "TSTypeAssertion" | "TSTypeLiteral" | "TSTypeOperator" | "TSTypeParameter" | "TSTypeParameterDeclaration" | "TSTypeParameterInstantiation" | "TSTypePredicate" | "TSTypeQuery" | "TSTypeReference" | "TSUndefinedKeyword" | "TSUnionType" | "TSUnknownKeyword" | "TSVoidKeyword" | "ThisTypeAnnotation" | "TopicReference" | "TupleExpression" | "TupleTypeAnnotation" | "TypeAlias" | "TypeAnnotation" | "TypeCastExpression" | "TypeParameter" | "TypeParameterDeclaration" | "TypeParameterInstantiation" | "TypeofTypeAnnotation" | "UnionTypeAnnotation" | "V8IntrinsicIdentifier" | "Variance" | "VoidTypeAnnotation", denylistTypes?: string[] | undefined) => boolean;
+    node: (node: traverse.Node, opts: traverse.TraverseOptions, scope?: traverse.Scope, state?: any, path?: traverse.NodePath, skipKeys?: Record<string, boolean>) => void;
+    clearNode: (node: traverse.Node, opts?: traverse.RemovePropertiesOptions) => void;
+    removeProperties: (tree: traverse.Node, opts?: traverse.RemovePropertiesOptions) => traverse.Node;
+    hasType: (tree: traverse.Node, type: traverse.Node["type"], denylistTypes?: string[]) => boolean;
     cache: typeof traverse.cache;
 };
 export { t };

package/dist/config/index.d.ts

@@ -3,5 +3,5 @@ import type { AstroInlineConfig, AstroUserConfig } from '../@types/astro.js';
 export declare function defineConfig(config: AstroUserConfig): AstroUserConfig;
 export declare function getViteConfig(userViteConfig: ViteUserConfig, inlineAstroConfig?: AstroInlineConfig): ({ mode, command }: {
     mode: string;
-    command: 'serve' | 'build';
+    command: "serve" | "build";
 }) => Promise<Record<string, any>>;

package/dist/config/vite-plugin-content-listen.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type fsMod from 'node:fs';
 import type { Plugin } from 'vite';
 import type { AstroSettings } from '../@types/astro.js';

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: import("../assets/types.js").ImageInputFormat;
     width: number;
     height: number;
-    format: "jpeg" | "jpg" | "png" | "tiff" | "webp" | "gif" | "svg" | "avif";
-    orientation?: number | undefined;
+    src: string;
     fsPath: string;
+    orientation?: number;
 }, string>;

package/dist/content/server-listeners.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type fsMod from 'node:fs';
 import type { ViteDevServer } from 'vite';
 import type { AstroSettings } from '../@types/astro.js';

package/dist/content/types-generator.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type fsMod from 'node:fs';
 import { type ViteDevServer } from 'vite';
 import type { AstroSettings } from '../@types/astro.js';
@@ -22,7 +21,7 @@ export declare function createContentTypesGenerator({ contentConfigObserver, fs,
         typesGenerated: true;
     } | {
         typesGenerated: false;
-        reason: 'no-content-dir';
+        reason: "no-content-dir";
     }>;
     queueEvent: (rawEvent: RawContentEvent) => void;
 }>;

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/content/utils.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import fsMod from 'node:fs';
 import matter from 'gray-matter';
 import type { PluginContext } from 'rollup';

package/dist/content/vite-plugin-content-imports.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type fsMod from 'node:fs';
 import type { Plugin } from 'vite';
 import type { AstroSettings } from '../@types/astro.js';

package/dist/content/vite-plugin-content-virtual-mod.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import nodeFs from 'node:fs';
 import { type Plugin } from 'vite';
 import type { AstroSettings } from '../@types/astro.js';

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

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { OutgoingHttpHeaders } from 'node:http';
 /**
  * Takes in a nullable WebAPI Headers object and produces a NodeJS OutgoingHttpHeaders object suitable for usage

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/node.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { RouteData } from '../../@types/astro.js';
 import { App } from './index.js';

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