astro 5.16.5 → 5.16.7

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> = {