astro 2.9.2 → 2.9.4

package/components/ViewTransitions.astro

@@ -13,6 +13,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 <script>
 	type Fallback = 'none' | 'animate' | 'swap';
 	type Direction = 'forward' | 'back';
+	type Events = 'astro:load' | 'astro:beforeload';
 
 	// The History API does not tell you if navigation is forward or back, so
 	// you can figure it using an index. On pushState the index is incremented so you
@@ -25,6 +26,8 @@ const { fallback = 'animate' } = Astro.props as Props;
 	const supportsViewTransitions = !!document.startViewTransition;
 	const transitionEnabledOnThisPage = () =>
 		!!document.querySelector('[name="astro-view-transitions-enabled"]');
+	const triggerEvent = (name: Events) => document.dispatchEvent(new Event(name));
+	const onload = () => triggerEvent('astro:load');
 
 	async function getHTML(href: string) {
 		const res = await fetch(href);
@@ -40,12 +43,34 @@ const { fallback = 'animate' } = Astro.props as Props;
 		return 'animate';
 	}
 
+	function runScripts() {
+		let wait = Promise.resolve();
+		for (const script of Array.from(document.scripts)) {
+			const s = document.createElement('script');
+			s.innerHTML = script.innerHTML;
+			for (const attr of script.attributes) {
+				if (attr.name === 'src') {
+					const p = new Promise((r) => {
+						s.onload = r;
+					});
+					wait = wait.then(() => p as any);
+				}
+				s.setAttribute(attr.name, attr.value);
+			}
+			script.replaceWith(s);
+		}
+		return wait;
+	}
+
 	const parser = new DOMParser();
 
 	async function updateDOM(dir: Direction, html: string, fallback?: Fallback) {
 		const doc = parser.parseFromString(html, 'text/html');
 		doc.documentElement.dataset.astroTransition = dir;
-		const swap = () => document.documentElement.replaceWith(doc.documentElement);
+		const swap = () => {
+			document.documentElement.replaceWith(doc.documentElement);
+			triggerEvent('astro:beforeload');
+		};
 
 		// Wait on links to finish, to prevent FOUC
 		const links = Array.from(doc.querySelectorAll('head link[rel=stylesheet]')).map(
@@ -95,6 +120,8 @@ const { fallback = 'animate' } = Astro.props as Props;
 			await finished;
 		} finally {
 			document.documentElement.removeAttribute('data-astro-transition');
+			await runScripts();
+			onload();
 		}
 	}
 
@@ -126,6 +153,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 				link.href &&
 				(!link.target || link.target === '_self') &&
 				link.origin === location.origin &&
+				!link.hash &&
 				ev.button === 0 && // left clicks only
 				!ev.metaKey && // new tab (mac)
 				!ev.ctrlKey && // new tab (windows)
@@ -140,13 +168,19 @@ const { fallback = 'animate' } = Astro.props as Props;
 				history.pushState({ index: currentHistoryIndex }, '', link.href);
 			}
 		});
-		window.addEventListener('popstate', () => {
+		window.addEventListener('popstate', (ev) => {
 			if (!transitionEnabledOnThisPage()) {
 				// The current page doesn't haven't View Transitions,
 				// respect that with a full page reload
 				location.reload();
 				return;
 			}
+			// hash change creates no state.
+			if (ev.state === null) {
+				history.replaceState({ index: currentHistoryIndex }, '');
+				ev.preventDefault();
+				return;
+			}
 			const nextIndex = history.state?.index ?? currentHistoryIndex + 1;
 			const direction: Direction = nextIndex > currentHistoryIndex ? 'forward' : 'back';
 			navigate(direction, location.href);
@@ -171,5 +205,6 @@ const { fallback = 'animate' } = Astro.props as Props;
 				{ passive: true, capture: true }
 			);
 		});
+		addEventListener('load', onload);
 	}
 </script>

package/dist/@types/astro.d.ts

@@ -1826,6 +1826,7 @@ export interface SSRMetadata {
     headInTree: boolean;
     extraHead: string[];
     propagators: Map<AstroComponentFactory, AstroComponentInstance>;
+    contentKeys: Set<string>;
 }
 export interface PreviewServer {
     host?: string;

package/dist/assets/internal.d.ts

@@ -1,5 +1,7 @@
+import type { AstroSettings } from '../@types/astro.js';
 import { type ImageService } from './services/service.js';
 import type { GetImageResult, ImageMetadata, ImageTransform } from './types.js';
+export declare function injectImageEndpoint(settings: AstroSettings): AstroSettings;
 export declare function isESMImportedImage(src: ImageMetadata | string): src is ImageMetadata;
 export declare function getConfiguredImageService(): Promise<ImageService>;
 export declare function getImage(options: ImageTransform, serviceConfig: Record<string, any>): Promise<GetImageResult>;

package/dist/assets/internal.js

@@ -1,5 +1,13 @@
 import { AstroError, AstroErrorData } from "../core/errors/index.js";
 import { isLocalService } from "./services/service.js";
+function injectImageEndpoint(settings) {
+  settings.injectedRoutes.push({
+    pattern: "/_image",
+    entryPoint: "astro/assets/image-endpoint",
+    prerender: false
+  });
+  return settings;
+}
 function isESMImportedImage(src) {
   return typeof src === "object";
 }
@@ -44,5 +52,6 @@ async function getImage(options, serviceConfig) {
 export {
   getConfiguredImageService,
   getImage,
+  injectImageEndpoint,
   isESMImportedImage
 };

package/dist/assets/services/squoosh.js

@@ -18,10 +18,8 @@ const qualityTable = {
   webp: baseQuality
   // Squoosh's PNG encoder does not support a quality setting, so we can skip that here
 };
-async function getRotationForEXIF(transform, inputBuffer) {
-  const filePath = transform.src.slice("/@fs".length);
-  const filePathURL = new URL("." + filePath, "file:");
-  const meta = await imageMetadata(filePathURL, inputBuffer);
+async function getRotationForEXIF(inputBuffer) {
+  const meta = await imageMetadata(inputBuffer);
   if (!meta)
     return void 0;
   switch (meta.orientation) {
@@ -47,7 +45,7 @@ const service = {
     if (format === "svg")
       return { data: inputBuffer, format: "svg" };
     const operations = [];
-    const rotation = await getRotationForEXIF(transform, inputBuffer);
+    const rotation = await getRotationForEXIF(inputBuffer);
     if (rotation) {
       operations.push(rotation);
     }

package/dist/assets/types.d.ts

@@ -15,7 +15,7 @@ declare global {
     };
 }
 /**
- * Type returned by ESM imports of images and direct calls to imageMetadata
+ * Type returned by ESM imports of images
  */
 export interface ImageMetadata {
     src: string;

package/dist/assets/utils/emitAsset.js

@@ -1,4 +1,4 @@
-import fs from "node:fs";
+import fs from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { prependForwardSlash, slash } from "../../core/path.js";
@@ -8,26 +8,36 @@ async function emitESMImage(id, watchMode, fileEmitter) {
     return void 0;
   }
   const url = pathToFileURL(id);
-  const meta = await imageMetadata(url);
-  if (!meta) {
+  let fileData;
+  try {
+    fileData = await fs.readFile(url);
+  } catch (err) {
     return void 0;
   }
+  const fileMetadata = await imageMetadata(fileData);
+  if (!fileMetadata) {
+    return void 0;
+  }
+  const emittedImage = {
+    src: "",
+    ...fileMetadata
+  };
   if (!watchMode) {
     const pathname = decodeURI(url.pathname);
-    const filename = path.basename(pathname, path.extname(pathname) + `.${meta.format}`);
+    const filename = path.basename(pathname, path.extname(pathname) + `.${fileMetadata.format}`);
     const handle = fileEmitter({
       name: filename,
-      source: await fs.promises.readFile(url),
+      source: await fs.readFile(url),
       type: "asset"
     });
-    meta.src = `__ASTRO_ASSET_IMAGE__${handle}__`;
+    emittedImage.src = `__ASTRO_ASSET_IMAGE__${handle}__`;
   } else {
-    url.searchParams.append("origWidth", meta.width.toString());
-    url.searchParams.append("origHeight", meta.height.toString());
-    url.searchParams.append("origFormat", meta.format);
-    meta.src = `/@fs` + prependForwardSlash(fileURLToNormalizedPath(url));
+    url.searchParams.append("origWidth", fileMetadata.width.toString());
+    url.searchParams.append("origHeight", fileMetadata.height.toString());
+    url.searchParams.append("origFormat", fileMetadata.format);
+    emittedImage.src = `/@fs` + prependForwardSlash(fileURLToNormalizedPath(url));
   }
-  return meta;
+  return emittedImage;
 }
 function fileURLToNormalizedPath(filePath) {
   return slash(fileURLToPath(filePath) + filePath.search).replace(/\\/g, "/");

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

@@ -1,3 +1,3 @@
 /// <reference types="node" />
 import type { ImageMetadata } from '../types.js';
-export declare function imageMetadata(src: URL | string, data?: Buffer): Promise<ImageMetadata | undefined>;
+export declare function imageMetadata(data: Buffer): Promise<Omit<ImageMetadata, 'src'> | undefined>;

package/dist/assets/utils/metadata.js

@@ -1,22 +1,11 @@
-import fs from "node:fs/promises";
-import { fileURLToPath } from "node:url";
 import imageSize from "../vendor/image-size/index.js";
-async function imageMetadata(src, data) {
-  let file = data;
-  if (!file) {
-    try {
-      file = await fs.readFile(src);
-    } catch (e) {
-      return void 0;
-    }
-  }
-  const { width, height, type, orientation } = imageSize(file);
+async function imageMetadata(data) {
+  const { width, height, type, orientation } = imageSize(data);
   const isPortrait = (orientation || 0) >= 5;
   if (!width || !height || !type) {
     return void 0;
   }
   return {
-    src: fileURLToPath(src),
     width: isPortrait ? height : width,
     height: isPortrait ? width : height,
     format: type,

package/dist/cli/add/index.js

@@ -86,7 +86,7 @@ async function add(names, { flags, logging }) {
           ["svelte", "astro add svelte"],
           ["solid-js", "astro add solid-js"],
           ["lit", "astro add lit"],
-          ["alpine", "astro add alpine"]
+          ["alpinejs", "astro add alpinejs"]
         ],
         "SSR Adapters": [
           ["netlify", "astro add netlify"],

package/dist/cli/load-settings.js

@@ -17,11 +17,10 @@ async function loadSettings({ cmd, flags, logging }) {
     await handleConfigError(e, { cmd, cwd: root, flags, logging });
     return {};
   });
-  const mode = cmd === "build" ? "build" : "dev";
   if (!initialAstroConfig)
     return;
   telemetry.record(event.eventCliSession(cmd, initialUserConfig, flags));
-  return createSettings(initialAstroConfig, mode, root);
+  return createSettings(initialAstroConfig, root);
 }
 async function handleConfigError(e, { cmd, cwd, flags, logging }) {
   const path = await resolveConfigPath({ cwd, flags, fs });

package/dist/config/index.js

@@ -26,7 +26,7 @@ function getViteConfig(inlineConfig) {
       level: "info"
     };
     const { astroConfig: config } = await openConfig({ cmd });
-    const settings = createSettings(config, cmd, inlineConfig.root);
+    const settings = createSettings(config, inlineConfig.root);
     await runHookConfigSetup({ settings, command: cmd, logging });
     const viteConfig = await createVite(
       {

package/dist/content/runtime.js

@@ -5,8 +5,8 @@ import {
   createComponent,
   createHeadAndContent,
   renderComponent,
-  renderScriptElement,
   renderTemplate,
+  renderUniqueScriptElement,
   renderUniqueStylesheet,
   unescapeHTML
 } from "../runtime/server/index.js";
@@ -222,7 +222,7 @@ async function render({
           }).join("");
         }
         if (Array.isArray(collectedScripts)) {
-          scripts = collectedScripts.map((script) => renderScriptElement(script)).join("");
+          scripts = collectedScripts.map((script) => renderUniqueScriptElement(result, script)).join("");
         }
         let props = baseProps;
         if (id.endsWith("mdx")) {

package/dist/core/build/generate.js

@@ -84,11 +84,14 @@ function chunkIsPage(settings, output, internals) {
   return false;
 }
 async function generatePages(opts, internals) {
+  var _a, _b;
   const timer = performance.now();
   const ssr = isServerLikeOutput(opts.settings.config);
   const outFolder = ssr ? opts.settings.config.build.server : getOutDirWithinCwd(opts.settings.config.outDir);
-  if (ssr && !hasPrerenderedPages(internals))
+  if (ssr && !hasPrerenderedPages(internals)) {
+    (_a = globalThis == null ? void 0 : globalThis.astroAsset) == null ? true : delete _a.addStaticImage;
     return;
+  }
   const verb = ssr ? "prerendering" : "generating";
   info(opts.logging, null, `
 ${bgGreen(black(` ${verb} static routes `))}`);
@@ -139,7 +142,7 @@ ${bgGreen(black(` generating optimized images `))}`);
     for (const imageData of getStaticImageList()) {
       await generateImage(opts, imageData[1].options, imageData[1].path);
     }
-    delete globalThis.astroAsset.addStaticImage;
+    (_b = globalThis == null ? void 0 : globalThis.astroAsset) == null ? true : delete _b.addStaticImage;
   }
   await runHookBuildGenerated({
     config: opts.settings.config,

package/dist/core/build/index.js

@@ -1,12 +1,14 @@
 import * as colors from "kleur/colors";
 import fs from "node:fs";
 import { performance } from "node:perf_hooks";
+import { injectImageEndpoint } from "../../assets/internal.js";
 import {
   runHookBuildDone,
   runHookBuildStart,
   runHookConfigDone,
   runHookConfigSetup
 } from "../../integrations/index.js";
+import { isServerLikeOutput } from "../../prerender/utils.js";
 import { createVite } from "../create-vite.js";
 import { debug, info, levels, timerMessage, warn } from "../logger/core.js";
 import { printHelp } from "../messages.js";
@@ -60,6 +62,9 @@ class AstroBuilder {
       command: "build",
       logging
     });
+    if (this.settings.config.experimental.assets && isServerLikeOutput(this.settings.config)) {
+      this.settings = injectImageEndpoint(this.settings);
+    }
     this.manifest = createRouteManifest({ settings: this.settings }, this.logging);
     const viteConfig = await createVite(
       {

package/dist/core/config/settings.d.ts

@@ -1,4 +1,4 @@
 import type { AstroConfig, AstroSettings, AstroUserConfig } from '../../@types/astro';
-export declare function createBaseSettings(config: AstroConfig, mode: 'build' | 'dev'): AstroSettings;
-export declare function createSettings(config: AstroConfig, mode: 'build' | 'dev', cwd?: string): AstroSettings;
+export declare function createBaseSettings(config: AstroConfig): AstroSettings;
+export declare function createSettings(config: AstroConfig, cwd?: string): AstroSettings;
 export declare function createDefaultDevSettings(userConfig?: AstroUserConfig, root?: string | URL): Promise<AstroSettings>;

package/dist/core/config/settings.js

@@ -3,7 +3,6 @@ import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { getContentPaths } from "../../content/index.js";
 import jsxRenderer from "../../jsx/renderer.js";
-import { isServerLikeOutput } from "../../prerender/utils.js";
 import { markdownContentEntryType } from "../../vite-plugin-markdown/content-entry-type.js";
 import { getDefaultClientDirectives } from "../client-directive/index.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
@@ -12,14 +11,14 @@ import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from "./../constants.js";
 import { createDefaultDevConfig } from "./config.js";
 import { AstroTimer } from "./timer.js";
 import { loadTSConfig } from "./tsconfig.js";
-function createBaseSettings(config, mode) {
+function createBaseSettings(config) {
   const { contentDir } = getContentPaths(config);
   return {
     config,
     tsConfig: void 0,
     tsConfigPath: void 0,
     adapter: void 0,
-    injectedRoutes: config.experimental.assets && (isServerLikeOutput(config) || mode === "dev") ? [{ pattern: "/_image", entryPoint: "astro/assets/image-endpoint", prerender: false }] : [],
+    injectedRoutes: [],
     pageExtensions: [".astro", ".html", ...SUPPORTED_MARKDOWN_FILE_EXTENSIONS],
     contentEntryTypes: [markdownContentEntryType],
     dataEntryTypes: [
@@ -92,9 +91,9 @@ function createBaseSettings(config, mode) {
     timer: new AstroTimer()
   };
 }
-function createSettings(config, mode, cwd) {
+function createSettings(config, cwd) {
   const tsconfig = loadTSConfig(cwd);
-  const settings = createBaseSettings(config, mode);
+  const settings = createBaseSettings(config);
   const watchFiles = (tsconfig == null ? void 0 : tsconfig.exists) ? [tsconfig.path, ...tsconfig.extendedPaths] : [];
   if (cwd) {
     watchFiles.push(fileURLToPath(new URL("./package.json", pathToFileURL(cwd))));
@@ -109,7 +108,7 @@ async function createDefaultDevSettings(userConfig = {}, root) {
     root = fileURLToPath(root);
   }
   const config = await createDefaultDevConfig(userConfig, root);
-  return createBaseSettings(config, "dev");
+  return createBaseSettings(config);
 }
 export {
   createBaseSettings,

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.9.2";
+const ASTRO_VERSION = "2.9.4";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/container.js

@@ -1,5 +1,6 @@
 import nodeFs from "node:fs";
 import * as vite from "vite";
+import { injectImageEndpoint } from "../../assets/internal.js";
 import {
   runHookConfigDone,
   runHookConfigSetup,
@@ -29,6 +30,9 @@ async function createContainer(params = {}) {
     logging,
     isRestart
   });
+  if (settings.config.experimental.assets) {
+    settings = injectImageEndpoint(settings);
+  }
   const { host, headers, open } = settings.config.server;
   const rendererClientEntries = settings.renderers.map((r) => r.clientEntrypoint).filter(Boolean);
   const viteConfig = await createVite(

package/dist/core/dev/dev.js

@@ -54,7 +54,7 @@ async function dev(settings, options) {
       isRestart: options.isRestart
     })
   );
-  const currentVersion = "2.9.2";
+  const currentVersion = "2.9.4";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/dev/restart.js

@@ -62,7 +62,7 @@ async function restartContainer({
     });
     info(logging, "astro", logMsg + "\n");
     let astroConfig = newConfig.astroConfig;
-    const settings = createSettings(astroConfig, "dev", resolvedRoot);
+    const settings = createSettings(astroConfig, resolvedRoot);
     await close();
     return {
       container: await createRestartedContainer(container, settings, needsStart),

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.9.2";
+  const version = "2.9.4";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -233,7 +233,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"2.9.2"}`
+        `v${"2.9.4"}`
       )} ${headline}`
     );
   }

package/dist/core/render/result.js

@@ -1,9 +1,6 @@
-import { isHTMLString } from "../../runtime/server/escape.js";
-import {
-  renderSlotToString,
-  stringifyChunk
-} from "../../runtime/server/index.js";
+import { renderSlotToString } from "../../runtime/server/index.js";
 import { renderJSX } from "../../runtime/server/jsx.js";
+import { chunkToString } from "../../runtime/server/render/index.js";
 import { AstroCookies } from "../cookies/index.js";
 import { AstroError, AstroErrorData } from "../errors/index.js";
 import { warn } from "../logger/core.js";
@@ -62,7 +59,7 @@ class Slots {
       const component = typeof slotValue === "function" ? await slotValue(result) : await slotValue;
       const expression = getFunctionExpression(component);
       if (expression) {
-        const slot = async () => isHTMLString(await expression) ? expression : expression(...args);
+        const slot = async () => typeof expression === "function" ? expression(...args) : expression;
         return await renderSlotToString(result, slot).then((res) => {
           return res != null ? String(res) : res;
         });
@@ -74,7 +71,7 @@ class Slots {
       }
     }
     const content = await renderSlotToString(result, this.#slots[name]);
-    const outHTML = stringifyChunk(result, content);
+    const outHTML = chunkToString(result, content);
     return outHTML;
   }
 }
@@ -181,7 +178,8 @@ function createResult(args) {
       hasDirectives: /* @__PURE__ */ new Set(),
       headInTree: false,
       extraHead: [],
-      propagators: /* @__PURE__ */ new Map()
+      propagators: /* @__PURE__ */ new Map(),
+      contentKeys: /* @__PURE__ */ new Set()
     }
   };
   return result;

package/dist/runtime/server/index.d.ts

@@ -3,7 +3,7 @@ export { createAstro } from './astro-global.js';
 export { renderEndpoint } from './endpoint.js';
 export { escapeHTML, HTMLBytes, HTMLString, isHTMLString, markHTMLString, unescapeHTML, } from './escape.js';
 export { renderJSX } from './jsx.js';
-export { addAttribute, createHeadAndContent, defineScriptVars, Fragment, maybeRenderHead, renderTemplate as render, renderAstroTemplateResult as renderAstroComponent, renderComponent, renderComponentToIterable, Renderer as Renderer, renderHead, renderHTMLElement, renderPage, renderScriptElement, renderSlot, renderSlotToString, renderTemplate, renderToString, renderUniqueStylesheet, stringifyChunk, voidElementNames, } from './render/index.js';
+export { addAttribute, createHeadAndContent, defineScriptVars, Fragment, maybeRenderHead, renderTemplate as render, renderComponent, Renderer as Renderer, renderHead, renderHTMLElement, renderPage, renderScriptElement, renderSlot, renderSlotToString, renderTemplate, renderToString, renderUniqueScriptElement, renderUniqueStylesheet, voidElementNames, } from './render/index.js';
 export type { AstroComponentFactory, AstroComponentInstance, ComponentSlots, RenderInstruction, } from './render/index.js';
 export { renderTransition } from './transition.js';
 export declare function mergeSlots(...slotted: unknown[]): Record<string, () => any>;

package/dist/runtime/server/index.js

@@ -17,9 +17,7 @@ import {
   Fragment,
   maybeRenderHead,
   renderTemplate,
-  renderAstroTemplateResult,
   renderComponent,
-  renderComponentToIterable,
   Renderer,
   renderHead,
   renderHTMLElement,
@@ -29,8 +27,8 @@ import {
   renderSlotToString,
   renderTemplate as renderTemplate2,
   renderToString,
+  renderUniqueScriptElement,
   renderUniqueStylesheet,
-  stringifyChunk,
   voidElementNames
 } from "./render/index.js";
 import { renderTransition } from "./transition.js";
@@ -106,9 +104,7 @@ export {
   maybeRenderHead,
   mergeSlots,
   renderTemplate as render,
-  renderAstroTemplateResult as renderAstroComponent,
   renderComponent,
-  renderComponentToIterable,
   renderEndpoint,
   renderHTMLElement,
   renderHead,
@@ -120,9 +116,9 @@ export {
   renderTemplate2 as renderTemplate,
   renderToString,
   renderTransition,
+  renderUniqueScriptElement,
   renderUniqueStylesheet,
   spreadAttributes,
-  stringifyChunk,
   unescapeHTML,
   voidElementNames
 };

package/dist/runtime/server/jsx.js

@@ -3,12 +3,11 @@ import {
   HTMLString,
   escapeHTML,
   markHTMLString,
-  renderComponentToIterable,
   renderToString,
   spreadAttributes,
   voidElementNames
 } from "./index.js";
-import { HTMLParts } from "./render/common.js";
+import { renderComponentToString } from "./render/component.js";
 const ClientOnlyPlaceholder = "astro-client-only";
 class Skip {
   constructor(vnode) {
@@ -164,7 +163,7 @@ Did you forget to import the component or is it possible there is a typo?`);
       props[Skip.symbol] = skip;
       let output;
       if (vnode.type === ClientOnlyPlaceholder && vnode.props["client:only"]) {
-        output = await renderComponentToIterable(
+        output = await renderComponentToString(
           result,
           vnode.props["client:display-name"] ?? "",
           null,
@@ -172,7 +171,7 @@ Did you forget to import the component or is it possible there is a typo?`);
           slots
         );
       } else {
-        output = await renderComponentToIterable(
+        output = await renderComponentToString(
           result,
           typeof vnode.type === "function" ? vnode.type.name : vnode.type,
           vnode.type,
@@ -180,15 +179,7 @@ Did you forget to import the component or is it possible there is a typo?`);
           slots
         );
       }
-      if (typeof output !== "string" && Symbol.asyncIterator in output) {
-        let parts = new HTMLParts();
-        for await (const chunk of output) {
-          parts.append(chunk, result);
-        }
-        return markHTMLString(parts.toString());
-      } else {
-        return markHTMLString(output);
-      }
+      return markHTMLString(output);
     }
   }
   return markHTMLString(`${vnode}`);

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

@@ -1 +1,2 @@
-export declare function renderChild(child: any): AsyncIterable<any>;
+import { type RenderDestination } from './common.js';
+export declare function renderChild(destination: RenderDestination, child: any): Promise<void>;