astro 5.16.6 → 5.16.7

package/dist/assets/utils/vendor/image-size/types/utils.js

@@ -1,44 +1,45 @@
 const decoder = new TextDecoder();
 const toUTF8String = (input, start = 0, end = input.length) => decoder.decode(input.slice(start, end));
-const toHexString = (input, start = 0, end = input.length) => input.slice(start, end).reduce((memo, i) => memo + ("0" + i.toString(16)).slice(-2), "");
-const readInt16LE = (input, offset = 0) => {
-  const val = input[offset] + input[offset + 1] * 2 ** 8;
-  return val | (val & 2 ** 15) * 131070;
+const toHexString = (input, start = 0, end = input.length) => input.slice(start, end).reduce((memo, i) => memo + `0${i.toString(16)}`.slice(-2), "");
+const getView = (input, offset) => new DataView(input.buffer, input.byteOffset + offset);
+const readInt16LE = (input, offset = 0) => getView(input, offset).getInt16(0, true);
+const readUInt16BE = (input, offset = 0) => getView(input, offset).getUint16(0, false);
+const readUInt16LE = (input, offset = 0) => getView(input, offset).getUint16(0, true);
+const readUInt24LE = (input, offset = 0) => {
+  const view = getView(input, offset);
+  return view.getUint16(0, true) + (view.getUint8(2) << 16);
 };
-const readUInt16BE = (input, offset = 0) => input[offset] * 2 ** 8 + input[offset + 1];
-const readUInt16LE = (input, offset = 0) => input[offset] + input[offset + 1] * 2 ** 8;
-const readUInt24LE = (input, offset = 0) => input[offset] + input[offset + 1] * 2 ** 8 + input[offset + 2] * 2 ** 16;
-const readInt32LE = (input, offset = 0) => input[offset] + input[offset + 1] * 2 ** 8 + input[offset + 2] * 2 ** 16 + (input[offset + 3] << 24);
-const readUInt32BE = (input, offset = 0) => input[offset] * 2 ** 24 + input[offset + 1] * 2 ** 16 + input[offset + 2] * 2 ** 8 + input[offset + 3];
-const readUInt32LE = (input, offset = 0) => input[offset] + input[offset + 1] * 2 ** 8 + input[offset + 2] * 2 ** 16 + input[offset + 3] * 2 ** 24;
+const readInt32LE = (input, offset = 0) => getView(input, offset).getInt32(0, true);
+const readUInt32BE = (input, offset = 0) => getView(input, offset).getUint32(0, false);
+const readUInt32LE = (input, offset = 0) => getView(input, offset).getUint32(0, true);
+const readUInt64 = (input, offset, isBigEndian) => getView(input, offset).getBigUint64(0, !isBigEndian);
 const methods = {
   readUInt16BE,
   readUInt16LE,
   readUInt32BE,
   readUInt32LE
 };
-function readUInt(input, bits, offset, isBigEndian) {
-  offset = offset || 0;
+function readUInt(input, bits, offset = 0, isBigEndian = false) {
   const endian = isBigEndian ? "BE" : "LE";
-  const methodName = "readUInt" + bits + endian;
+  const methodName = `readUInt${bits}${endian}`;
   return methods[methodName](input, offset);
 }
-function readBox(buffer, offset) {
-  if (buffer.length - offset < 4) return;
-  const boxSize = readUInt32BE(buffer, offset);
-  if (buffer.length - offset < boxSize) return;
+function readBox(input, offset) {
+  if (input.length - offset < 4) return;
+  const boxSize = readUInt32BE(input, offset);
+  if (input.length - offset < boxSize) return;
   return {
-    name: toUTF8String(buffer, 4 + offset, 8 + offset),
+    name: toUTF8String(input, 4 + offset, 8 + offset),
     offset,
     size: boxSize
   };
 }
-function findBox(buffer, boxName, offset) {
-  while (offset < buffer.length) {
-    const box = readBox(buffer, offset);
+function findBox(input, boxName, currentOffset) {
+  while (currentOffset < input.length) {
+    const box = readBox(input, currentOffset);
     if (!box) break;
     if (box.name === boxName) return box;
-    offset += box.size;
+    currentOffset += box.size > 0 ? box.size : 8;
   }
 }
 export {
@@ -51,6 +52,7 @@ export {
   readUInt24LE,
   readUInt32BE,
   readUInt32LE,
+  readUInt64,
   toHexString,
   toUTF8String
 };

package/dist/assets/utils/vendor/image-size/types/webp.js

@@ -1,4 +1,4 @@
-import { toHexString, toUTF8String, readInt16LE, readUInt24LE } from "./utils.js";
+import { readInt16LE, readUInt24LE, toHexString, toUTF8String } from "./utils.js";
 function calculateExtended(input) {
   return {
     height: 1 + readUInt24LE(input, 7),
@@ -24,18 +24,17 @@ const WEBP = {
     const vp8Header = "VP8" === toUTF8String(input, 12, 15);
     return riffHeader && webpHeader && vp8Header;
   },
-  calculate(input) {
-    const chunkHeader = toUTF8String(input, 12, 16);
-    input = input.slice(20, 30);
+  calculate(_input) {
+    const chunkHeader = toUTF8String(_input, 12, 16);
+    const input = _input.slice(20, 30);
     if (chunkHeader === "VP8X") {
       const extendedHeader = input[0];
       const validStart = (extendedHeader & 192) === 0;
       const validEnd = (extendedHeader & 1) === 0;
       if (validStart && validEnd) {
         return calculateExtended(input);
-      } else {
-        throw new TypeError("Invalid WebP");
       }
+      throw new TypeError("Invalid WebP");
     }
     if (chunkHeader === "VP8 " && input[0] !== 47) {
       return calculateLossy(input);

package/dist/assets/utils/vendor/image-size/utils/bit-reader.d.ts

@@ -0,0 +1,10 @@
+/** This class helps read Uint8Array bit-by-bit */
+export declare class BitReader {
+    private readonly input;
+    private readonly endianness;
+    private byteOffset;
+    private bitOffset;
+    constructor(input: Uint8Array, endianness: 'big-endian' | 'little-endian');
+    /** Reads a specified number of bits, and move the offset */
+    getBits(length?: number): number;
+}

package/dist/assets/utils/vendor/image-size/utils/bit-reader.js

@@ -0,0 +1,41 @@
+class BitReader {
+  constructor(input, endianness) {
+    this.input = input;
+    this.endianness = endianness;
+  }
+  // Skip the first 16 bits (2 bytes) of signature
+  byteOffset = 2;
+  bitOffset = 0;
+  /** Reads a specified number of bits, and move the offset */
+  getBits(length = 1) {
+    let result = 0;
+    let bitsRead = 0;
+    while (bitsRead < length) {
+      if (this.byteOffset >= this.input.length) {
+        throw new Error("Reached end of input");
+      }
+      const currentByte = this.input[this.byteOffset];
+      const bitsLeft = 8 - this.bitOffset;
+      const bitsToRead = Math.min(length - bitsRead, bitsLeft);
+      if (this.endianness === "little-endian") {
+        const mask = (1 << bitsToRead) - 1;
+        const bits = currentByte >> this.bitOffset & mask;
+        result |= bits << bitsRead;
+      } else {
+        const mask = (1 << bitsToRead) - 1 << 8 - this.bitOffset - bitsToRead;
+        const bits = (currentByte & mask) >> 8 - this.bitOffset - bitsToRead;
+        result = result << bitsToRead | bits;
+      }
+      bitsRead += bitsToRead;
+      this.bitOffset += bitsToRead;
+      if (this.bitOffset === 8) {
+        this.byteOffset++;
+        this.bitOffset = 0;
+      }
+    }
+    return result;
+  }
+}
+export {
+  BitReader
+};

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

@@ -109,6 +109,13 @@ function assets({ fs, settings, sync, logger }) {
 							export { default as Font } from "astro/components/Font.astro";
 							import * as fontsMod from 'virtual:astro:assets/fonts/internal';
 							import { createGetFontData } from "astro/assets/fonts/runtime";
+							
+							export const viteFSConfig = ${JSON.stringify(resolvedConfig.server.fs)} ?? {};
+							
+							export const safeModulePaths = new Set(${JSON.stringify(
+              // @ts-expect-error safeModulePaths is internal to Vite
+              Array.from(resolvedConfig.safeModulePaths)
+            )} ?? []);
 
 							const assetQueryParams = ${settings.adapter?.client?.assetQueryParams ? `new URLSearchParams(${JSON.stringify(
               Array.from(settings.adapter.client.assetQueryParams.entries())

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -1,6 +1,6 @@
 class BuildTimeAstroVersionProvider {
   // Injected during the build through esbuild define
-  version = "5.16.6";
+  version = "5.16.7";
 }
 export {
   BuildTimeAstroVersionProvider

package/dist/config/entrypoint.d.ts

@@ -1,7 +1,6 @@
 import type { SharpImageServiceConfig } from '../assets/services/sharp.js';
 import type { ImageServiceConfig } from '../types/public/index.js';
-export { defineAstroFontProvider, fontProviders } from '../assets/fonts/providers/index.js';
-export type { AstroFontProvider } from '../assets/fonts/types.js';
+export { fontProviders } from '../assets/fonts/providers/index.js';
 export { mergeConfig } from '../core/config/merge.js';
 export { validateConfig } from '../core/config/validate.js';
 export { envField } from '../env/config.js';

package/dist/config/entrypoint.js

@@ -1,4 +1,4 @@
-import { defineAstroFontProvider, fontProviders } from "../assets/fonts/providers/index.js";
+import { fontProviders } from "../assets/fonts/providers/index.js";
 import { mergeConfig } from "../core/config/merge.js";
 import { validateConfig } from "../core/config/validate.js";
 import { envField } from "../env/config.js";
@@ -16,7 +16,6 @@ function passthroughImageService() {
   };
 }
 export {
-  defineAstroFontProvider,
   defineConfig,
   envField,
   fontProviders,

package/dist/content/content-layer.js

@@ -164,7 +164,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "5.16.6") {
+    if (previousAstroVersion && previousAstroVersion !== "5.16.7") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -172,8 +172,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.16.6") {
-      await this.#store.metaStore().set("astro-version", "5.16.6");
+    if ("5.16.7") {
+      await this.#store.metaStore().set("astro-version", "5.16.7");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/content/utils.js

@@ -128,8 +128,15 @@ async function getEntryDataAndImages(entry, collectionConfig, shouldEmitFile, ex
       schema = schema({
         image: () => z.string().transform((val) => {
           let normalizedPath = val;
-          if (val && !val.startsWith("./") && !val.startsWith("../") && !val.startsWith("/") && !val.startsWith("~") && !val.startsWith("@") && !val.includes("://")) {
-            normalizedPath = `./${val}`;
+          const isUrl = val.includes("://");
+          const isAbsolute = val.startsWith("/");
+          const isRelative = val.startsWith(".");
+          if (val && !isUrl && !isAbsolute && !isRelative) {
+            const entryDir = path.dirname(entry._internal.filePath);
+            const resolvedPath = path.resolve(entryDir, val);
+            if (fsMod.existsSync(resolvedPath)) {
+              normalizedPath = `./${val}`;
+            }
           }
           imageImports.add(normalizedPath);
           return `${IMAGE_IMPORT_PREFIX}${normalizedPath}`;

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

@@ -1,4 +1,4 @@
-import { type RemotePattern } from '../../assets/utils/remotePattern.js';
+import { type RemotePattern } from '@astrojs/internal-helpers/remote';
 import type { RoutesList } from '../../types/astro.js';
 import type { RouteData, SSRManifest } from '../../types/public/internal.js';
 import { getSetCookiesFromResponse } from '../cookies/index.js';

package/dist/core/app/index.js

@@ -3,7 +3,7 @@ import {
   hasFileExtension,
   isInternalPath
 } from "@astrojs/internal-helpers/path";
-import { matchPattern } from "../../assets/utils/remotePattern.js";
+import { matchPattern } from "@astrojs/internal-helpers/remote";
 import { normalizeTheLocale } from "../../i18n/index.js";
 import {
   clientAddressSymbol,

package/dist/core/config/schemas/base.d.ts

@@ -900,6 +900,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             weights: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodNumber]>, "atleastone">>;
             styles: z.ZodOptional<z.ZodArray<z.ZodEnum<["normal", "italic", "oblique"]>, "atleastone">>;
             subsets: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
+            formats: z.ZodOptional<z.ZodArray<z.ZodEnum<["woff2", "woff", "otf", "ttf", "eot"]>, "atleastone">>;
             display: z.ZodOptional<z.ZodEnum<["auto", "block", "swap", "fallback", "optional"]>>;
             stretch: z.ZodOptional<z.ZodString>;
             featureSettings: z.ZodOptional<z.ZodString>;
@@ -921,6 +922,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             subsets?: [string, ...string[]] | undefined;
             fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
+            formats?: ["woff2" | "woff" | "otf" | "ttf" | "eot", ...("woff2" | "woff" | "otf" | "ttf" | "eot")[]] | undefined;
             display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
             stretch?: string | undefined;
             featureSettings?: string | undefined;
@@ -938,6 +940,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             subsets?: [string, ...string[]] | undefined;
             fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
+            formats?: ["woff2" | "woff" | "otf" | "ttf" | "eot", ...("woff2" | "woff" | "otf" | "ttf" | "eot")[]] | undefined;
             display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
             stretch?: string | undefined;
             featureSettings?: string | undefined;
@@ -1072,6 +1075,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             subsets?: [string, ...string[]] | undefined;
             fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
+            formats?: ["woff2" | "woff" | "otf" | "ttf" | "eot", ...("woff2" | "woff" | "otf" | "ttf" | "eot")[]] | undefined;
             display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
             stretch?: string | undefined;
             featureSettings?: string | undefined;
@@ -1128,6 +1132,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             subsets?: [string, ...string[]] | undefined;
             fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
+            formats?: ["woff2" | "woff" | "otf" | "ttf" | "eot", ...("woff2" | "woff" | "otf" | "ttf" | "eot")[]] | undefined;
             display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
             stretch?: string | undefined;
             featureSettings?: string | undefined;
@@ -1373,6 +1378,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             subsets?: [string, ...string[]] | undefined;
             fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
+            formats?: ["woff2" | "woff" | "otf" | "ttf" | "eot", ...("woff2" | "woff" | "otf" | "ttf" | "eot")[]] | undefined;
             display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
             stretch?: string | undefined;
             featureSettings?: string | undefined;
@@ -1633,6 +1639,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
             subsets?: [string, ...string[]] | undefined;
             fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
+            formats?: ["woff2" | "woff" | "otf" | "ttf" | "eot", ...("woff2" | "woff" | "otf" | "ttf" | "eot")[]] | undefined;
             display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
             stretch?: string | undefined;
             featureSettings?: string | undefined;

package/dist/core/config/schemas/relative.d.ts

@@ -745,6 +745,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             weights: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodNumber]>, "atleastone">>;
             styles: z.ZodOptional<z.ZodArray<z.ZodEnum<["normal", "italic", "oblique"]>, "atleastone">>;
             subsets: z.ZodOptional<z.ZodArray<z.ZodString, "atleastone">>;
+            formats: z.ZodOptional<z.ZodArray<z.ZodEnum<["woff2", "woff", "otf", "ttf", "eot"]>, "atleastone">>;
             display: z.ZodOptional<z.ZodEnum<["auto", "block", "swap", "fallback", "optional"]>>;
             stretch: z.ZodOptional<z.ZodString>;
             featureSettings: z.ZodOptional<z.ZodString>;
@@ -766,6 +767,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             subsets?: [string, ...string[]] | undefined;
             fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
+            formats?: ["woff2" | "woff" | "otf" | "ttf" | "eot", ...("woff2" | "woff" | "otf" | "ttf" | "eot")[]] | undefined;
             display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
             stretch?: string | undefined;
             featureSettings?: string | undefined;
@@ -783,6 +785,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             subsets?: [string, ...string[]] | undefined;
             fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
+            formats?: ["woff2" | "woff" | "otf" | "ttf" | "eot", ...("woff2" | "woff" | "otf" | "ttf" | "eot")[]] | undefined;
             display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
             stretch?: string | undefined;
             featureSettings?: string | undefined;
@@ -917,6 +920,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             subsets?: [string, ...string[]] | undefined;
             fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
+            formats?: ["woff2" | "woff" | "otf" | "ttf" | "eot", ...("woff2" | "woff" | "otf" | "ttf" | "eot")[]] | undefined;
             display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
             stretch?: string | undefined;
             featureSettings?: string | undefined;
@@ -973,6 +977,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             subsets?: [string, ...string[]] | undefined;
             fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
+            formats?: ["woff2" | "woff" | "otf" | "ttf" | "eot", ...("woff2" | "woff" | "otf" | "ttf" | "eot")[]] | undefined;
             display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
             stretch?: string | undefined;
             featureSettings?: string | undefined;
@@ -1296,6 +1301,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             subsets?: [string, ...string[]] | undefined;
             fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
+            formats?: ["woff2" | "woff" | "otf" | "ttf" | "eot", ...("woff2" | "woff" | "otf" | "ttf" | "eot")[]] | undefined;
             display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
             stretch?: string | undefined;
             featureSettings?: string | undefined;
@@ -1556,6 +1562,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             subsets?: [string, ...string[]] | undefined;
             fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
+            formats?: ["woff2" | "woff" | "otf" | "ttf" | "eot", ...("woff2" | "woff" | "otf" | "ttf" | "eot")[]] | undefined;
             display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
             stretch?: string | undefined;
             featureSettings?: string | undefined;
@@ -1798,6 +1805,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             subsets?: [string, ...string[]] | undefined;
             fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
+            formats?: ["woff2" | "woff" | "otf" | "ttf" | "eot", ...("woff2" | "woff" | "otf" | "ttf" | "eot")[]] | undefined;
             display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
             stretch?: string | undefined;
             featureSettings?: string | undefined;
@@ -2058,6 +2066,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
             subsets?: [string, ...string[]] | undefined;
             fallbacks?: string[] | undefined;
             optimizedFallbacks?: boolean | undefined;
+            formats?: ["woff2" | "woff" | "otf" | "ttf" | "eot", ...("woff2" | "woff" | "otf" | "ttf" | "eot")[]] | undefined;
             display?: "auto" | "block" | "swap" | "fallback" | "optional" | undefined;
             stretch?: string | undefined;
             featureSettings?: string | undefined;

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.16.6";
+const ASTRO_VERSION = "5.16.7";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/dev/dev.js

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

package/dist/core/messages.js

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

package/dist/runtime/server/render/astro/render.js

@@ -1,6 +1,11 @@
 import { AstroError, AstroErrorData } from "../../../../core/errors/index.js";
 import { isPromise } from "../../util.js";
-import { chunkToByteArray, chunkToString, encoder } from "../common.js";
+import {
+  chunkToByteArray,
+  chunkToByteArrayOrString,
+  chunkToString,
+  encoder
+} from "../common.js";
 import { promiseWithResolvers } from "../util.js";
 import { isHeadAndContent } from "./head-and-content.js";
 import { isRenderTemplateResult } from "./render-template.js";
@@ -162,13 +167,31 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
         throw error;
       }
       let length = 0;
+      let stringToEncode = "";
       for (let i = 0, len = buffer.length; i < len; i++) {
-        length += buffer[i].length;
+        const bufferEntry = buffer[i];
+        if (typeof bufferEntry === "string") {
+          const nextIsString = i + 1 < len && typeof buffer[i + 1] === "string";
+          stringToEncode += bufferEntry;
+          if (!nextIsString) {
+            const encoded = encoder.encode(stringToEncode);
+            length += encoded.length;
+            stringToEncode = "";
+            buffer[i] = encoded;
+          } else {
+            buffer[i] = "";
+          }
+        } else {
+          length += bufferEntry.length;
+        }
       }
       let mergedArray = new Uint8Array(length);
       let offset = 0;
       for (let i = 0, len = buffer.length; i < len; i++) {
         const item = buffer[i];
+        if (item === "") {
+          continue;
+        }
         mergedArray.set(item, offset);
         offset += item.length;
       }
@@ -198,7 +221,7 @@ async function renderToAsyncIterable(result, componentFactory, props, children,
       if (chunk instanceof Response) {
         throw new AstroError(AstroErrorData.ResponseSentError);
       }
-      const bytes = chunkToByteArray(result, chunk);
+      const bytes = chunkToByteArrayOrString(result, chunk);
       if (bytes.length > 0) {
         buffer.push(bytes);
         next?.resolve();

package/dist/runtime/server/render/common.d.ts

@@ -27,4 +27,5 @@ export declare const encoder: TextEncoder;
 export declare const decoder: TextDecoder;
 export declare function chunkToString(result: SSRResult, chunk: Exclude<RenderDestinationChunk, Response>): string;
 export declare function chunkToByteArray(result: SSRResult, chunk: Exclude<RenderDestinationChunk, Response>): Uint8Array;
+export declare function chunkToByteArrayOrString(result: SSRResult, chunk: Exclude<RenderDestinationChunk, Response>): Uint8Array | string;
 export declare function isRenderInstance(obj: unknown): obj is RenderInstance;

package/dist/runtime/server/render/common.js

@@ -92,6 +92,13 @@ function chunkToByteArray(result, chunk) {
     return encoder.encode(stringified.toString());
   }
 }
+function chunkToByteArrayOrString(result, chunk) {
+  if (ArrayBuffer.isView(chunk)) {
+    return chunk;
+  } else {
+    return stringifyChunk(result, chunk).toString();
+  }
+}
 function isRenderInstance(obj) {
   return !!obj && typeof obj === "object" && "render" in obj && typeof obj.render === "function";
 }
@@ -99,6 +106,7 @@ export {
   Fragment,
   Renderer,
   chunkToByteArray,
+  chunkToByteArrayOrString,
   chunkToString,
   decoder,
   encoder,

package/dist/transitions/router.js

@@ -283,7 +283,9 @@ async function transition(direction, from, to, options, historyState) {
         preparationEvent.preventDefault();
         return;
       }
+      const fragment = preparationEvent.to.hash;
       preparationEvent.to = redirectedTo;
+      preparationEvent.to.hash = fragment;
     }
     parser ??= new DOMParser();
     preparationEvent.newDocument = parser.parseFromString(response.html, response.mediaType);

package/dist/types/public/config.d.ts

@@ -4,7 +4,7 @@ import type { RehypePlugins, RemarkPlugins, RemarkRehype, ShikiConfig, SyntaxHig
 import type { Config as SvgoConfig } from 'svgo';
 import type { BuiltinDriverName, BuiltinDriverOptions, Driver, Storage } from 'unstorage';
 import type { UserConfig as OriginalViteUserConfig, SSROptions as ViteSSROptions } from 'vite';
-import type { AstroFontProvider, FontFamily } from '../../assets/fonts/types.js';
+import type { FontFamily, FontProvider } from '../../assets/fonts/types.js';
 import type { ImageFit, ImageLayout } from '../../assets/types.js';
 import type { AssetsPrefix } from '../../core/app/types.js';
 import type { AstroConfigType } from '../../core/config/schemas/index.js';
@@ -18,7 +18,7 @@ export type Locales = (string | {
     codes: [string, ...string[]];
     path: string;
 })[];
-export type { AstroFontProvider as FontProvider };
+export type { FontProvider };
 export type { CspAlgorithm };
 export type { RemotePattern };
 type NormalizeLocales<T extends Locales> = {