astro 4.5.9 → 4.5.11

package/astro-jsx.d.ts

@@ -526,7 +526,7 @@ declare namespace astroHTML.JSX {
 			| 'search'
 			| 'send'
 			| undefined
-		| null;
+			| null;
 		exportparts?: string | undefined | null;
 		hidden?: boolean | string | undefined | null;
 		id?: string | undefined | null;
@@ -584,6 +584,9 @@ declare namespace astroHTML.JSX {
 		results?: number | string | undefined | null;
 		security?: string | undefined | null;
 		unselectable?: 'on' | 'off' | undefined | null; // Internet Explorer
+
+		// Allow data- attribute
+		[key: `data-${string}`]: any;
 	}
 
 	type HTMLAttributeReferrerPolicy =
@@ -1344,6 +1347,9 @@ declare namespace astroHTML.JSX {
 		yChannelSelector?: string | undefined | null;
 		z?: number | string | undefined | null;
 		zoomAndPan?: string | undefined | null;
+
+		// Allow data- attribute
+		[key: `data-${string}`]: any;
 	}
 
 	interface DefinedIntrinsicElements {

package/components/Code.astro

@@ -80,7 +80,7 @@ const highlighter = await getCachedHighlighter({
 			? Object.keys(bundledLanguages).includes(lang)
 				? lang
 				: 'plaintext'
-			: lang,
+			: (lang as any),
 	],
 	theme,
 	themes,
@@ -89,7 +89,7 @@ const highlighter = await getCachedHighlighter({
 
 const html = highlighter.highlight(code, typeof lang === 'string' ? lang : lang.name, {
 	inline,
-	attributes: rest,
+	attributes: rest as any,
 });
 ---
 

package/components/Picture.astro

@@ -1,7 +1,7 @@
 ---
 import { getImage, type LocalImageProps, type RemoteImageProps } from 'astro:assets';
 import type { GetImageResult, ImageOutputFormat } from '../dist/@types/astro';
-import { isESMImportedImage } from '../dist/assets/utils/imageKind';
+import { isESMImportedImage, resolveSrc } from '../dist/assets/utils/imageKind';
 import { AstroError, AstroErrorData } from '../dist/core/errors/index.js';
 import type { HTMLAttributes } from '../types';
 
@@ -27,20 +27,27 @@ if (props.alt === undefined || props.alt === null) {
 	throw new AstroError(AstroErrorData.ImageMissingAlt);
 }
 
+const originalSrc = await resolveSrc(props.src);
 const optimizedImages: GetImageResult[] = await Promise.all(
 	formats.map(
 		async (format) =>
-			await getImage({ ...props, format: format, widths: props.widths, densities: props.densities })
+			await getImage({
+				...props,
+				src: originalSrc,
+				format: format,
+				widths: props.widths,
+				densities: props.densities,
+			})
 	)
 );
 
 let resultFallbackFormat = fallbackFormat ?? defaultFallbackFormat;
 if (
 	!fallbackFormat &&
-	isESMImportedImage(props.src) &&
-	specialFormatsFallback.includes(props.src.format)
+	isESMImportedImage(originalSrc) &&
+	originalSrc.format in specialFormatsFallback
 ) {
-	resultFallbackFormat = props.src.format;
+	resultFallbackFormat = originalSrc.format;
 }
 
 const fallbackImage = await getImage({

package/dist/assets/build/generate.js

@@ -1,11 +1,11 @@
 import fs, { readFileSync } from "node:fs";
-import { basename, join } from "node:path/posix";
+import { basename } from "node:path/posix";
 import { dim, green } from "kleur/colors";
 import { getOutDirWithinCwd } from "../../core/build/common.js";
 import { getTimeStat } from "../../core/build/util.js";
 import { AstroError } from "../../core/errors/errors.js";
 import { AstroErrorData } from "../../core/errors/index.js";
-import { isRemotePath, prependForwardSlash } from "../../core/path.js";
+import { isRemotePath, removeLeadingForwardSlash } from "../../core/path.js";
 import { isServerLikeOutput } from "../../prerender/utils.js";
 import { getConfiguredImageService } from "../internal.js";
 import { isESMImportedImage } from "../utils/imageKind.js";
@@ -45,10 +45,7 @@ async function prepareAssetsGenerationEnv(pipeline, totalCount) {
   };
 }
 function getFullImagePath(originalFilePath, env) {
-  return new URL(
-    "." + prependForwardSlash(join(env.assetsFolder, basename(originalFilePath))),
-    env.serverRoot
-  );
+  return new URL(removeLeadingForwardSlash(originalFilePath), env.serverRoot);
 }
 async function generateImagesForPath(originalFilePath, transformsAndPath, env, queue) {
   const originalImageData = await loadImage(originalFilePath, env);
@@ -57,7 +54,7 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env, q
       throw e;
     });
   }
-  if (!env.isSSR && !isRemotePath(originalFilePath) && !globalThis.astroAsset.referencedImages?.has(transformsAndPath.originalSrcPath)) {
+  if (!env.isSSR && transformsAndPath.originalSrcPath && !globalThis.astroAsset.referencedImages?.has(transformsAndPath.originalSrcPath)) {
     try {
       if (transformsAndPath.originalSrcPath) {
         env.logger.debug(

package/dist/assets/internal.js

@@ -1,7 +1,7 @@
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { DEFAULT_HASH_PROPS } from "./consts.js";
 import { isLocalService } from "./services/service.js";
-import { isESMImportedImage, isRemoteImage } from "./utils/imageKind.js";
+import { isESMImportedImage, isRemoteImage, resolveSrc } from "./utils/imageKind.js";
 import { probe } from "./utils/remoteProbe.js";
 async function getConfiguredImageService() {
   if (!globalThis?.astroAsset?.imageService) {
@@ -40,7 +40,7 @@ async function getImage(options, imageConfig) {
   const service = await getConfiguredImageService();
   const resolvedOptions = {
     ...options,
-    src: typeof options.src === "object" && "then" in options.src ? (await options.src).default ?? await options.src : options.src
+    src: await resolveSrc(options.src)
   };
   if (options.inferSize && isRemoteImage(resolvedOptions.src)) {
     try {
@@ -55,7 +55,7 @@ async function getImage(options, imageConfig) {
       });
     }
   }
-  const originalPath = isESMImportedImage(resolvedOptions.src) ? resolvedOptions.src.fsPath : resolvedOptions.src;
+  const originalFilePath = isESMImportedImage(resolvedOptions.src) ? resolvedOptions.src.fsPath : void 0;
   const clonedSrc = isESMImportedImage(resolvedOptions.src) ? (
     // @ts-expect-error - clone is a private, hidden prop
     resolvedOptions.src.clone ?? resolvedOptions.src
@@ -74,10 +74,14 @@ async function getImage(options, imageConfig) {
   );
   if (isLocalService(service) && globalThis.astroAsset.addStaticImage && !(isRemoteImage(validatedOptions.src) && imageURL === validatedOptions.src)) {
     const propsToHash = service.propertiesToHash ?? DEFAULT_HASH_PROPS;
-    imageURL = globalThis.astroAsset.addStaticImage(validatedOptions, propsToHash, originalPath);
+    imageURL = globalThis.astroAsset.addStaticImage(
+      validatedOptions,
+      propsToHash,
+      originalFilePath
+    );
     srcSets = srcSetTransforms.map((srcSet) => ({
       transform: srcSet.transform,
-      url: globalThis.astroAsset.addStaticImage(srcSet.transform, propsToHash, originalPath),
+      url: globalThis.astroAsset.addStaticImage(srcSet.transform, propsToHash, originalFilePath),
       descriptor: srcSet.descriptor,
       attributes: srcSet.attributes
     }));

package/dist/assets/types.d.ts

@@ -6,7 +6,7 @@ export type ImageQuality = ImageQualityPreset | number;
 export type ImageInputFormat = (typeof VALID_INPUT_FORMATS)[number];
 export type ImageOutputFormat = (typeof VALID_OUTPUT_FORMATS)[number] | (string & {});
 export type AssetsGlobalStaticImagesList = Map<string, {
-    originalSrcPath: string;
+    originalSrcPath: string | undefined;
     transforms: Map<string, {
         finalPath: string;
         transform: ImageTransform;
@@ -15,7 +15,7 @@ export type AssetsGlobalStaticImagesList = Map<string, {
 declare global {
     var astroAsset: {
         imageService?: ImageService;
-        addStaticImage?: ((options: ImageTransform, hashProperties: string[], fsPath: string) => string) | undefined;
+        addStaticImage?: ((options: ImageTransform, hashProperties: string[], fsPath: string | undefined) => string) | undefined;
         staticImages?: AssetsGlobalStaticImagesList;
         referencedImages?: Set<string>;
     };

package/dist/assets/utils/imageKind.d.ts

@@ -1,3 +1,4 @@
-import type { ImageMetadata } from '../types.js';
+import type { ImageMetadata, UnresolvedImageTransform } from '../types.js';
 export declare function isESMImportedImage(src: ImageMetadata | string): src is ImageMetadata;
 export declare function isRemoteImage(src: ImageMetadata | string): src is string;
+export declare function resolveSrc(src: UnresolvedImageTransform['src']): Promise<string | ImageMetadata>;

package/dist/assets/utils/imageKind.js

@@ -4,7 +4,11 @@ function isESMImportedImage(src) {
 function isRemoteImage(src) {
   return typeof src === "string";
 }
+async function resolveSrc(src) {
+  return typeof src === "object" && "then" in src ? (await src).default ?? await src : src;
+}
 export {
   isESMImportedImage,
-  isRemoteImage
+  isRemoteImage,
+  resolveSrc
 };

package/dist/assets/utils/transformToPath.d.ts

@@ -1,3 +1,3 @@
 import type { ImageTransform } from '../types.js';
-export declare function propsToFilename(transform: ImageTransform, hash: string): string;
+export declare function propsToFilename(filePath: string, transform: ImageTransform, hash: string): string;
 export declare function hashTransform(transform: ImageTransform, imageService: string, propertiesToHash: string[]): string;

package/dist/assets/utils/transformToPath.js

@@ -1,16 +1,15 @@
-import { basename, extname } from "node:path";
+import { basename, dirname, extname } from "node:path";
 import { deterministicString } from "deterministic-object-hash";
 import { removeQueryString } from "../../core/path.js";
 import { shorthash } from "../../runtime/server/shorthash.js";
 import { isESMImportedImage } from "./imageKind.js";
-function propsToFilename(transform, hash) {
-  let filename = removeQueryString(
-    isESMImportedImage(transform.src) ? transform.src.src : transform.src
-  );
+function propsToFilename(filePath, transform, hash) {
+  let filename = decodeURIComponent(removeQueryString(filePath));
   const ext = extname(filename);
-  filename = decodeURIComponent(basename(filename, ext));
+  filename = basename(filename, ext);
+  const prefixDirname = isESMImportedImage(transform.src) ? dirname(filePath) : "";
   let outputExt = transform.format ? `.${transform.format}` : ext;
-  return `/${filename}_${hash}${outputExt}`;
+  return decodeURIComponent(`${prefixDirname}/${filename}_${hash}${outputExt}`);
 }
 function hashTransform(transform, imageService, propertiesToHash) {
   const hashFields = propertiesToHash.reduce(

package/dist/assets/vite-plugin-assets.js

@@ -7,6 +7,7 @@ import {
   appendForwardSlash,
   joinPaths,
   prependForwardSlash,
+  removeBase,
   removeQueryString
 } from "../core/path.js";
 import { isServerLikeOutput } from "../prerender/utils.js";
@@ -57,12 +58,18 @@ function assets({
 					export { default as Picture } from "astro/components/Picture.astro";
 
 					export const imageConfig = ${JSON.stringify(settings.config.image)};
-					export const outDir = new URL(${JSON.stringify(
+					// This is used by the @astrojs/node integration to locate images.
+					// It's unused on other platforms, but on some platforms like Netlify (and presumably also Vercel)
+					// new URL("dist/...") is interpreted by the bundler as a signal to include that directory
+					// in the Lambda bundle, which would bloat the bundle with images.
+					// To prevent this, we mark the URL construction as pure,
+					// so that it's tree-shaken away for all platforms that don't need it.
+					export const outDir = /* #__PURE__ */ new URL(${JSON.stringify(
             new URL(
               isServerLikeOutput(settings.config) ? settings.config.build.client : settings.config.outDir
             )
           )});
-					export const assetsDir = new URL(${JSON.stringify(settings.config.build.assets)}, outDir);
+					export const assetsDir = /* #__PURE__ */ new URL(${JSON.stringify(settings.config.build.assets)}, outDir);
 					export const getImage = async (options) => await getImageInternal(options, imageConfig);
 				`;
         }
@@ -71,34 +78,40 @@ function assets({
         if (mode != "build") {
           return;
         }
-        globalThis.astroAsset.addStaticImage = (options, hashProperties, originalPath) => {
+        globalThis.astroAsset.addStaticImage = (options, hashProperties, originalFSPath) => {
           if (!globalThis.astroAsset.staticImages) {
             globalThis.astroAsset.staticImages = /* @__PURE__ */ new Map();
           }
           const ESMImportedImageSrc = isESMImportedImage(options.src) ? options.src.src : options.src;
           const fileExtension = extname(ESMImportedImageSrc);
-          const pf = getAssetsPrefix(fileExtension, settings.config.build.assetsPrefix);
-          const finalOriginalImagePath = ESMImportedImageSrc.replace(pf, "");
+          const assetPrefix = getAssetsPrefix(fileExtension, settings.config.build.assetsPrefix);
+          const finalOriginalPath = removeBase(
+            removeBase(ESMImportedImageSrc, settings.config.base),
+            assetPrefix
+          );
           const hash = hashTransform(
             options,
             settings.config.image.service.entrypoint,
             hashProperties
           );
           let finalFilePath;
-          let transformsForPath = globalThis.astroAsset.staticImages.get(finalOriginalImagePath);
+          let transformsForPath = globalThis.astroAsset.staticImages.get(finalOriginalPath);
           let transformForHash = transformsForPath?.transforms.get(hash);
           if (transformsForPath && transformForHash) {
             finalFilePath = transformForHash.finalPath;
           } else {
             finalFilePath = prependForwardSlash(
-              joinPaths(settings.config.build.assets, propsToFilename(options, hash))
+              joinPaths(
+                isESMImportedImage(options.src) ? "" : settings.config.build.assets,
+                prependForwardSlash(propsToFilename(finalOriginalPath, options, hash))
+              )
             );
             if (!transformsForPath) {
-              globalThis.astroAsset.staticImages.set(finalOriginalImagePath, {
-                originalSrcPath: originalPath,
+              globalThis.astroAsset.staticImages.set(finalOriginalPath, {
+                originalSrcPath: originalFSPath,
                 transforms: /* @__PURE__ */ new Map()
               });
-              transformsForPath = globalThis.astroAsset.staticImages.get(finalOriginalImagePath);
+              transformsForPath = globalThis.astroAsset.staticImages.get(finalOriginalPath);
             }
             transformsForPath.transforms.set(hash, {
               finalPath: finalFilePath,
@@ -106,7 +119,7 @@ function assets({
             });
           }
           if (settings.config.build.assetsPrefix) {
-            return encodeURI(joinPaths(pf, finalFilePath));
+            return encodeURI(joinPaths(assetPrefix, finalFilePath));
           } else {
             return encodeURI(prependForwardSlash(joinPaths(settings.config.base, finalFilePath)));
           }

package/dist/content/index.d.ts

@@ -2,7 +2,7 @@ export { CONTENT_FLAG, PROPAGATED_ASSET_FLAG } from './consts.js';
 export { errorMap } from './error-map.js';
 export { attachContentServerListeners } from './server-listeners.js';
 export { createContentTypesGenerator } from './types-generator.js';
-export { contentObservable, getContentPaths, getDotAstroTypeReference } from './utils.js';
+export { contentObservable, getContentPaths, getDotAstroTypeReference, hasAssetPropagationFlag, } from './utils.js';
 export { astroContentAssetPropagationPlugin } from './vite-plugin-content-assets.js';
 export { astroContentImportPlugin } from './vite-plugin-content-imports.js';
 export { astroContentVirtualModPlugin } from './vite-plugin-content-virtual-mod.js';

package/dist/content/index.js

@@ -2,7 +2,12 @@ import { CONTENT_FLAG, PROPAGATED_ASSET_FLAG } from "./consts.js";
 import { errorMap } from "./error-map.js";
 import { attachContentServerListeners } from "./server-listeners.js";
 import { createContentTypesGenerator } from "./types-generator.js";
-import { contentObservable, getContentPaths, getDotAstroTypeReference } from "./utils.js";
+import {
+  contentObservable,
+  getContentPaths,
+  getDotAstroTypeReference,
+  hasAssetPropagationFlag
+} from "./utils.js";
 import { astroContentAssetPropagationPlugin } from "./vite-plugin-content-assets.js";
 import { astroContentImportPlugin } from "./vite-plugin-content-imports.js";
 import { astroContentVirtualModPlugin } from "./vite-plugin-content-virtual-mod.js";
@@ -17,5 +22,6 @@ export {
   createContentTypesGenerator,
   errorMap,
   getContentPaths,
-  getDotAstroTypeReference
+  getDotAstroTypeReference,
+  hasAssetPropagationFlag
 };

package/dist/content/utils.d.ts

@@ -184,4 +184,5 @@ export declare function getEntrySlug({ id, collection, generatedSlug, contentEnt
     contentEntryType: Pick<ContentEntryType, 'getEntryInfo'>;
 }): Promise<string>;
 export declare function getExtGlob(exts: string[]): string;
+export declare function hasAssetPropagationFlag(id: string): boolean;
 export {};

package/dist/content/utils.js

@@ -8,7 +8,7 @@ import { z } from "zod";
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { MarkdownError } from "../core/errors/index.js";
 import { isYAMLException } from "../core/errors/utils.js";
-import { CONTENT_FLAGS, CONTENT_TYPES_FILE } from "./consts.js";
+import { CONTENT_FLAGS, CONTENT_TYPES_FILE, PROPAGATED_ASSET_FLAG } from "./consts.js";
 import { errorMap } from "./error-map.js";
 import { createImage } from "./runtime-assets.js";
 const collectionConfigParser = z.union([
@@ -345,6 +345,13 @@ function getExtGlob(exts) {
     exts[0]
   ) : `{${exts.join(",")}}`;
 }
+function hasAssetPropagationFlag(id) {
+  try {
+    return new URL(id, "file://").searchParams.has(PROPAGATED_ASSET_FLAG);
+  } catch {
+    return false;
+  }
+}
 export {
   collectionConfigParser,
   contentConfigParser,
@@ -363,6 +370,7 @@ export {
   getExtGlob,
   globalContentConfigObserver,
   hasAnyContentFlag,
+  hasAssetPropagationFlag,
   hasContentFlag,
   hasUnderscoreBelowContentDirectoryPath,
   loadContentConfig,

package/dist/core/build/plugins/plugin-css.js

@@ -1,5 +1,6 @@
 import { isBuildableCSSRequest } from "../../../vite-plugin-astro-server/util.js";
-import { PROPAGATED_ASSET_FLAG } from "../../../content/consts.js";
+import { RESOLVED_VIRTUAL_MODULE_ID as ASTRO_CONTENT_VIRTUAL_MODULE_ID } from "../../../content/consts.js";
+import { hasAssetPropagationFlag } from "../../../content/index.js";
 import * as assetName from "../css-asset-name.js";
 import {
   getParentExtendedModuleInfos,
@@ -52,14 +53,9 @@ function rollupPluginAstroBuildCSS(options) {
             }
             const ctx = { getModuleInfo: meta.getModuleInfo };
             for (const pageInfo of getParentModuleInfos(id, ctx)) {
-              if (new URL(pageInfo.id, "file://").searchParams.has(PROPAGATED_ASSET_FLAG)) {
+              if (hasAssetPropagationFlag(pageInfo.id)) {
                 const chunkId2 = assetName.createNameHash(id, [id]);
                 internals.cssModuleToChunkIdMap.set(id, chunkId2);
-                if (isContentCollectionCache) {
-                  const propagatedStyles = internals.propagatedStylesMap.get(pageInfo.id) ?? /* @__PURE__ */ new Set();
-                  propagatedStyles.add({ type: "external", src: chunkId2 });
-                  internals.propagatedStylesMap.set(pageInfo.id, propagatedStyles);
-                }
                 return chunkId2;
               }
             }
@@ -90,15 +86,11 @@ function rollupPluginAstroBuildCSS(options) {
           }
         }
         for (const id of Object.keys(chunk.modules)) {
-          for (const { info: pageInfo, depth, order } of getParentExtendedModuleInfos(
-            id,
-            this,
-            function until(importer) {
-              return new URL(importer, "file://").searchParams.has(PROPAGATED_ASSET_FLAG);
-            }
-          )) {
-            if (new URL(pageInfo.id, "file://").searchParams.has(PROPAGATED_ASSET_FLAG)) {
-              for (const parentInfo of getParentModuleInfos(id, this)) {
+          const parentModuleInfos = getParentExtendedModuleInfos(id, this, hasAssetPropagationFlag);
+          for (const { info: pageInfo, depth, order } of parentModuleInfos) {
+            if (hasAssetPropagationFlag(pageInfo.id)) {
+              const walkId = isContentCollectionCache ? ASTRO_CONTENT_VIRTUAL_MODULE_ID : id;
+              for (const parentInfo of getParentModuleInfos(walkId, this)) {
                 if (moduleIsTopLevelPage(parentInfo) === false)
                   continue;
                 const pageViteID = parentInfo.id;

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "4.5.9";
+  const currentVersion = "4.5.11";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

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

package/dist/core/request.js

@@ -33,7 +33,7 @@ function createRequest({
       get() {
         logger.warn(
           null,
-          `\`Astro.request.headers\` is not available in "static" output mode. To enable header access: set \`output: "server"\` or \`output: "hybrid"\` in your config file.`
+          `\`Astro.request.headers\` is unavailable in "static" output mode, and in prerendered pages within "hybrid" and "server" output modes. If you need access to request headers, make sure that \`output\` is configured as either \`"server"\` or \`output: "hybrid"\` in your config file, and that the page accessing the headers is rendered on-demand.`
         );
         return _headers;
       }

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

@@ -7,7 +7,7 @@ function ensure404Route(manifest) {
       params: [],
       pattern: /\/404/,
       prerender: false,
-      segments: [],
+      segments: [[{ content: "404", dynamic: false, spread: false }]],
       type: "page",
       route: "/404",
       fallbackRoutes: [],

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

@@ -10,6 +10,7 @@ import { MissingIndexForInternationalization } from "../../errors/errors-data.js
 import { AstroError } from "../../errors/index.js";
 import { removeLeadingForwardSlash, slash } from "../../path.js";
 import { resolvePages } from "../../util.js";
+import { routeComparator } from "../priority.js";
 import { getRouteGenerator } from "./generator.js";
 const require2 = createRequire(import.meta.url);
 function countOccurrences(needle, haystack) {
@@ -101,54 +102,6 @@ function isSemanticallyEqualSegment(segmentA, segmentB) {
   }
   return true;
 }
-function routeComparator(a, b) {
-  const commonLength = Math.min(a.segments.length, b.segments.length);
-  for (let index = 0; index < commonLength; index++) {
-    const aSegment = a.segments[index];
-    const bSegment = b.segments[index];
-    const aIsStatic = aSegment.every((part) => !part.dynamic && !part.spread);
-    const bIsStatic = bSegment.every((part) => !part.dynamic && !part.spread);
-    if (aIsStatic && bIsStatic) {
-      const aContent = aSegment.map((part) => part.content).join("");
-      const bContent = bSegment.map((part) => part.content).join("");
-      if (aContent !== bContent) {
-        return aContent.localeCompare(bContent);
-      }
-    }
-    if (aIsStatic !== bIsStatic) {
-      return aIsStatic ? -1 : 1;
-    }
-    const aAllDynamic = aSegment.every((part) => part.dynamic);
-    const bAllDynamic = bSegment.every((part) => part.dynamic);
-    if (aAllDynamic !== bAllDynamic) {
-      return aAllDynamic ? 1 : -1;
-    }
-    const aHasSpread = aSegment.some((part) => part.spread);
-    const bHasSpread = bSegment.some((part) => part.spread);
-    if (aHasSpread !== bHasSpread) {
-      return aHasSpread ? 1 : -1;
-    }
-  }
-  const aLength = a.segments.length;
-  const bLength = b.segments.length;
-  if (aLength !== bLength) {
-    const aEndsInRest = a.segments.at(-1)?.some((part) => part.spread);
-    const bEndsInRest = b.segments.at(-1)?.some((part) => part.spread);
-    if (aEndsInRest !== bEndsInRest && Math.abs(aLength - bLength) === 1) {
-      if (aLength > bLength && aEndsInRest) {
-        return 1;
-      }
-      if (bLength > aLength && bEndsInRest) {
-        return -1;
-      }
-    }
-    return aLength > bLength ? -1 : 1;
-  }
-  if (a.type === "endpoint" !== (b.type === "endpoint")) {
-    return a.type === "endpoint" ? -1 : 1;
-  }
-  return a.route.localeCompare(b.route);
-}
 function createFileBasedRoutes({ settings, cwd, fsMod }, logger) {
   const components = [];
   const routes = [];

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

@@ -0,0 +1,23 @@
+import type { RouteData } from '../../@types/astro.js';
+/**
+ * Comparator for sorting routes in resolution order.
+ *
+ * The routes are sorted in by the following rules in order, following the first rule that
+ * applies:
+ * - More specific routes are sorted before less specific routes. Here, "specific" means
+ *   the number of segments in the route, so a parent route is always sorted after its children.
+ *   For example, `/foo/bar` is sorted before `/foo`.
+ *   Index routes, originating from a file named `index.astro`, are considered to have one more
+ *   segment than the URL they represent.
+ * - Static routes are sorted before dynamic routes.
+ *   For example, `/foo/bar` is sorted before `/foo/[bar]`.
+ * - Dynamic routes with single parameters are sorted before dynamic routes with rest parameters.
+ *   For example, `/foo/[bar]` is sorted before `/foo/[...bar]`.
+ * - Prerendered routes are sorted before non-prerendered routes.
+ * - Endpoints are sorted before pages.
+ *   For example, a file `/foo.ts` is sorted before `/bar.astro`.
+ * - If both routes are equal regarding all previosu conditions, they are sorted alphabetically.
+ *   For example, `/bar` is sorted before `/foo`.
+ *   The definition of "alphabetically" is dependent on the default locale of the running system.
+ */
+export declare function routeComparator(a: RouteData, b: RouteData): number;

package/dist/core/routing/priority.js

@@ -0,0 +1,51 @@
+function routeComparator(a, b) {
+  const commonLength = Math.min(a.segments.length, b.segments.length);
+  for (let index = 0; index < commonLength; index++) {
+    const aSegment = a.segments[index];
+    const bSegment = b.segments[index];
+    const aIsStatic = aSegment.every((part) => !part.dynamic && !part.spread);
+    const bIsStatic = bSegment.every((part) => !part.dynamic && !part.spread);
+    if (aIsStatic && bIsStatic) {
+      const aContent = aSegment.map((part) => part.content).join("");
+      const bContent = bSegment.map((part) => part.content).join("");
+      if (aContent !== bContent) {
+        return aContent.localeCompare(bContent);
+      }
+    }
+    if (aIsStatic !== bIsStatic) {
+      return aIsStatic ? -1 : 1;
+    }
+    const aAllDynamic = aSegment.every((part) => part.dynamic);
+    const bAllDynamic = bSegment.every((part) => part.dynamic);
+    if (aAllDynamic !== bAllDynamic) {
+      return aAllDynamic ? 1 : -1;
+    }
+    const aHasSpread = aSegment.some((part) => part.spread);
+    const bHasSpread = bSegment.some((part) => part.spread);
+    if (aHasSpread !== bHasSpread) {
+      return aHasSpread ? 1 : -1;
+    }
+  }
+  const aLength = a.segments.length;
+  const bLength = b.segments.length;
+  if (aLength !== bLength) {
+    const aEndsInRest = a.segments.at(-1)?.some((part) => part.spread);
+    const bEndsInRest = b.segments.at(-1)?.some((part) => part.spread);
+    if (aEndsInRest !== bEndsInRest && Math.abs(aLength - bLength) === 1) {
+      if (aLength > bLength && aEndsInRest) {
+        return 1;
+      }
+      if (bLength > aLength && bEndsInRest) {
+        return -1;
+      }
+    }
+    return aLength > bLength ? -1 : 1;
+  }
+  if (a.type === "endpoint" !== (b.type === "endpoint")) {
+    return a.type === "endpoint" ? -1 : 1;
+  }
+  return a.route.localeCompare(b.route);
+}
+export {
+  routeComparator
+};

package/dist/prerender/routing.js

@@ -1,4 +1,5 @@
 import { RedirectComponentInstance, routeIsRedirect } from "../core/redirects/index.js";
+import { routeComparator } from "../core/routing/priority.js";
 import { getPrerenderStatus } from "./metadata.js";
 async function getSortedPreloadedMatches({
   pipeline,
@@ -9,7 +10,7 @@ async function getSortedPreloadedMatches({
     pipeline,
     matches,
     settings
-  })).sort((a, b) => prioritizePrerenderedMatchesComparator(a.route, b.route));
+  })).sort((a, b) => routeComparator(a.route, b.route)).sort((a, b) => prioritizePrerenderedMatchesComparator(a.route, b.route));
 }
 async function preloadAndSetPrerenderStatus({
   pipeline,

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

@@ -222,7 +222,7 @@ async function handleRoute({
       })
     );
   }
-  if (response.status === 404 && has404Route(manifestData) && response.headers.get(REROUTE_DIRECTIVE_HEADER) !== "no") {
+  if (response.status === 404 && response.headers.get(REROUTE_DIRECTIVE_HEADER) !== "no") {
     const fourOhFourRoute = await matchRoute("/404", manifestData, pipeline);
     if (options)
       return handleRoute({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.5.9",
+  "version": "4.5.11",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -162,7 +162,7 @@
     "zod": "^3.22.4",
     "zod-to-json-schema": "^3.22.4",
     "@astrojs/internal-helpers": "0.3.0",
-    "@astrojs/markdown-remark": "4.3.1",
+    "@astrojs/markdown-remark": "4.3.2",
     "@astrojs/telemetry": "3.0.4"
   },
   "optionalDependencies": {

package/types.d.ts

@@ -1,12 +1,13 @@
 import './astro-jsx';
 import type { AstroBuiltinAttributes } from './dist/@types/astro.js';
-import type { Simplify } from './dist/type-utils.js';
+import type { OmitIndexSignature, Simplify } from './dist/type-utils.js';
 
 /** Any supported HTML or SVG element name, as defined by the HTML specification */
 export type HTMLTag = keyof astroHTML.JSX.DefinedIntrinsicElements;
+
 /** The built-in attributes for any known HTML or SVG element name */
 export type HTMLAttributes<Tag extends HTMLTag> = Omit<
-	astroHTML.JSX.IntrinsicElements[Tag],
+	astroHTML.JSX.DefinedIntrinsicElements[Tag],
 	keyof Omit<AstroBuiltinAttributes, 'class:list'>
 >;
 
@@ -15,9 +16,15 @@ export type HTMLAttributes<Tag extends HTMLTag> = Omit<
  */
 export type CSSProperty = keyof astroHTML.JSX.KebabCSSDOMProperties;
 
-type PolymorphicAttributes<P extends { as: HTMLTag }> = Omit<P & HTMLAttributes<P['as']>, 'as'> & {
+type PolymorphicAttributes<P extends { as: HTMLTag }> = Omit<P, 'as'> & {
 	as?: P['as'];
-};
+} & Omit<
+		// This is the same as HTMLAttributes<P['as']>, except we're using OmitIndexSignature to remove the index signature,
+		// used for data attribute, because it seems like it get too complex for TypeScript with it, not sure why.
+		OmitIndexSignature<astroHTML.JSX.DefinedIntrinsicElements[P['as']]>,
+		keyof Omit<AstroBuiltinAttributes, 'class:list'>
+	>;
+
 export type Polymorphic<P extends { as: HTMLTag }> = PolymorphicAttributes<
 	Omit<P, 'as'> & { as: NonNullable<P['as']> }
 >;