astro 1.6.13 → 1.6.14

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

@@ -10,7 +10,7 @@ import type { SerializedSSRManifest } from '../core/app/types';
 import type { PageBuildData } from '../core/build/types';
 import type { AstroConfigSchema } from '../core/config';
 import type { AstroCookies } from '../core/cookies';
-import type { AstroComponentFactory } from '../runtime/server';
+import type { AstroComponentFactory, AstroComponentInstance } from '../runtime/server';
 import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from './../core/constants.js';
 export type { MarkdownHeading, MarkdownMetadata, MarkdownRenderingResult, RehypePlugins, RemarkPlugins, ShikiConfig, } from '@astrojs/markdown-remark';
 export type { SSRManifest } from '../core/app/types';
@@ -1074,7 +1074,7 @@ interface AstroSharedContext<Props extends Record<string, any> = Record<string,
     /**
      * Redirect to another page (**SSR Only**).
      */
-    redirect(path: string, status?: 301 | 302 | 308): Response;
+    redirect(path: string, status?: 301 | 302 | 303 | 307 | 308): Response;
 }
 export interface APIContext<Props extends Record<string, any> = Record<string, any>> extends AstroSharedContext<Props> {
     site: URL | undefined;
@@ -1265,10 +1265,24 @@ export interface SSRMetadata {
     hasDirectives: Set<string>;
     hasRenderedHead: boolean;
 }
+/**
+ * A hint on whether the Astro runtime needs to wait on a component to render head
+ * content. The meanings:
+ *
+ * - __none__ (default) The component does not propagation head content.
+ * - __self__ The component appends head content.
+ * - __in-tree__ Another component within this component's dependency tree appends head content.
+ *
+ * These are used within the runtime to know whether or not a component should be waited on.
+ */
+export declare type PropagationHint = 'none' | 'self' | 'in-tree';
 export interface SSRResult {
     styles: Set<SSRElement>;
     scripts: Set<SSRElement>;
     links: Set<SSRElement>;
+    propagation: Map<string, PropagationHint>;
+    propagators: Map<AstroComponentFactory, AstroComponentInstance>;
+    extraHead: Array<any>;
     cookies: AstroCookies | undefined;
     createAstro(Astro: AstroGlobalPartial, props: Record<string, any>, slots: Record<string, any> | null): AstroGlobal;
     resolve: (s: string) => Promise<string>;

package/dist/core/app/index.js

@@ -165,7 +165,7 @@ _baseWithoutTrailingSlash = new WeakMap();
 _renderPage = new WeakSet();
 renderPage_fn = async function(request, routeData, mod, status = 200) {
   const url = new URL(request.url);
-  const manifest = __privateGet(this, _manifest);
+  const pathname = "/" + this.removeBase(url.pathname);
   const info = __privateGet(this, _routeDataToRouteInfo).get(routeData);
   const links = createLinkStylesheetElementSet(info.links);
   let scripts = /* @__PURE__ */ new Set();
@@ -185,7 +185,7 @@ renderPage_fn = async function(request, routeData, mod, status = 200) {
     const ctx = createRenderContext({
       request,
       origin: url.origin,
-      pathname: url.pathname,
+      pathname,
       scripts,
       links,
       route: routeData,
@@ -204,11 +204,12 @@ renderPage_fn = async function(request, routeData, mod, status = 200) {
 _callEndpoint = new WeakSet();
 callEndpoint_fn = async function(request, routeData, mod, status = 200) {
   const url = new URL(request.url);
+  const pathname = "/" + this.removeBase(url.pathname);
   const handler = mod;
   const ctx = createRenderContext({
     request,
     origin: url.origin,
-    pathname: url.pathname,
+    pathname,
     route: routeData,
     status
   });

package/dist/core/build/graph.d.ts

@@ -1,7 +1,7 @@
 import type { GetModuleInfo, ModuleInfo } from 'rollup';
 export declare function walkParentInfos(id: string, ctx: {
     getModuleInfo: GetModuleInfo;
-}, depth?: number, seen?: Set<string>, childId?: string): Generator<[ModuleInfo, number, number], void, unknown>;
+}, depth?: number, order?: number, seen?: Set<string>, childId?: string): Generator<[ModuleInfo, number, number], void, unknown>;
 export declare function moduleIsTopLevelPage(info: ModuleInfo): boolean;
 export declare function getTopLevelPages(id: string, ctx: {
     getModuleInfo: GetModuleInfo;

package/dist/core/build/graph.js

@@ -1,9 +1,11 @@
 import { resolvedPagesVirtualModuleId } from "../app/index.js";
-function* walkParentInfos(id, ctx, depth = 0, seen = /* @__PURE__ */ new Set(), childId = "") {
+function* walkParentInfos(id, ctx, depth = 0, order = 0, seen = /* @__PURE__ */ new Set(), childId = "") {
   seen.add(id);
   const info = ctx.getModuleInfo(id);
   if (info) {
-    let order = childId ? info.importedIds.indexOf(childId) : 0;
+    if (childId) {
+      order += info.importedIds.indexOf(childId);
+    }
     yield [info, depth, order];
   }
   const importers = ((info == null ? void 0 : info.importers) || []).concat((info == null ? void 0 : info.dynamicImporters) || []);
@@ -11,7 +13,7 @@ function* walkParentInfos(id, ctx, depth = 0, seen = /* @__PURE__ */ new Set(),
     if (seen.has(imp)) {
       continue;
     }
-    yield* walkParentInfos(imp, ctx, ++depth, seen, id);
+    yield* walkParentInfos(imp, ctx, ++depth, order, seen, id);
   }
 }
 function moduleIsTopLevelPage(info) {

package/dist/core/compile/compile.d.ts

@@ -5,10 +5,11 @@ export interface CompileProps {
     astroConfig: AstroConfig;
     viteConfig: ResolvedConfig;
     filename: string;
+    id: string | undefined;
     source: string;
 }
 export interface CompileResult extends TransformResult {
     cssDeps: Set<string>;
     source: string;
 }
-export declare function compile({ astroConfig, viteConfig, filename, source, }: CompileProps): Promise<CompileResult>;
+export declare function compile({ astroConfig, viteConfig, filename, id: moduleId, source, }: CompileProps): Promise<CompileResult>;

package/dist/core/compile/compile.js

@@ -7,6 +7,7 @@ async function compile({
   astroConfig,
   viteConfig,
   filename,
+  id: moduleId,
   source
 }) {
   var _a;
@@ -15,6 +16,7 @@ async function compile({
   let transformResult;
   try {
     transformResult = await transform(source, {
+      moduleId,
       pathname: filename,
       projectRoot: astroConfig.root.toString(),
       site: (_a = astroConfig.site) == null ? void 0 : _a.toString(),

package/dist/core/constants.js

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

package/dist/core/create-vite.js

@@ -7,6 +7,7 @@ import { vitePluginAstroServer } from "../vite-plugin-astro-server/index.js";
 import astroVitePlugin from "../vite-plugin-astro/index.js";
 import configAliasVitePlugin from "../vite-plugin-config-alias/index.js";
 import envVitePlugin from "../vite-plugin-env/index.js";
+import astroHeadPropagationPlugin from "../vite-plugin-head-propagation/index.js";
 import htmlVitePlugin from "../vite-plugin-html/index.js";
 import astroIntegrationsContainerPlugin from "../vite-plugin-integrations-container/index.js";
 import jsxVitePlugin from "../vite-plugin-jsx/index.js";
@@ -59,7 +60,7 @@ async function createVite(commandConfig, { settings, logging, mode, fs = nodeFs
     appType: "custom",
     optimizeDeps: {
       entries: ["src/**/*"],
-      exclude: ["node-fetch"]
+      exclude: ["astro", "node-fetch"]
     },
     plugins: [
       configAliasVitePlugin({ settings }),
@@ -73,7 +74,8 @@ async function createVite(commandConfig, { settings, logging, mode, fs = nodeFs
       jsxVitePlugin({ settings, logging }),
       astroPostprocessVitePlugin({ settings }),
       astroIntegrationsContainerPlugin({ settings, logging }),
-      astroScriptsPageSSRPlugin({ settings })
+      astroScriptsPageSSRPlugin({ settings }),
+      astroHeadPropagationPlugin({ settings })
     ],
     publicDir: fileURLToPath(settings.config.publicDir),
     root: fileURLToPath(settings.config.root),

package/dist/core/dev/dev.js

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

package/dist/core/errors/dev/utils.js

@@ -10,7 +10,7 @@ const incompatiblePackages = {
 };
 const incompatPackageExp = new RegExp(`(${Object.keys(incompatiblePackages).join("|")})`);
 function collectErrorMetadata(e, rootFolder) {
-  const err = AggregateError.is(e) ? e.errors : [e];
+  const err = AggregateError.is(e) || Array.isArray(e.errors) ? e.errors : [e];
   err.forEach((error) => {
     var _a;
     if (error.stack) {

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   site,
   isRestart = false
 }) {
-  const version = "1.6.13";
+  const version = "1.6.14";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -263,7 +263,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"1.6.13"}`
+        `v${"1.6.14"}`
       )} ${headline}`
     );
   }

package/dist/core/render/context.d.ts

@@ -1,4 +1,4 @@
-import type { RouteData, SSRElement } from '../../@types/astro';
+import type { RouteData, SSRElement, SSRResult } from '../../@types/astro';
 /**
  * The RenderContext represents the parts of rendering that are specific to one request.
  */
@@ -10,6 +10,7 @@ export interface RenderContext {
     scripts?: Set<SSRElement>;
     links?: Set<SSRElement>;
     styles?: Set<SSRElement>;
+    propagation?: SSRResult['propagation'];
     route?: RouteData;
     status?: number;
 }

package/dist/core/render/core.js

@@ -66,6 +66,7 @@ async function renderPage(mod, ctx, env) {
     params,
     props: pageProps,
     pathname: ctx.pathname,
+    propagation: ctx.propagation,
     resolve: env.resolve,
     renderers: env.renderers,
     request: ctx.request,

package/dist/core/render/dev/head.d.ts

@@ -0,0 +1,3 @@
+import type { SSRResult } from '../../../@types/astro';
+import type { ModuleLoader } from '../../module-loader/index';
+export declare function getPropagationMap(filePath: URL, loader: ModuleLoader): Promise<SSRResult['propagation']>;

package/dist/core/render/dev/head.js

@@ -0,0 +1,26 @@
+import { getAstroMetadata } from "../../../vite-plugin-astro/index.js";
+import { viteID } from "../../util.js";
+import { crawlGraph } from "./vite.js";
+async function getPropagationMap(filePath, loader) {
+  const map = /* @__PURE__ */ new Map();
+  const rootID = viteID(filePath);
+  addInjection(map, loader.getModuleInfo(rootID));
+  for await (const moduleNode of crawlGraph(loader, rootID, true)) {
+    const id = moduleNode.id;
+    if (id) {
+      addInjection(map, loader.getModuleInfo(id));
+    }
+  }
+  return map;
+}
+function addInjection(map, modInfo) {
+  if (modInfo) {
+    const astro = getAstroMetadata(modInfo);
+    if (astro && astro.propagation) {
+      map.set(modInfo.id, astro.propagation);
+    }
+  }
+}
+export {
+  getPropagationMap
+};

package/dist/core/render/dev/index.d.ts

@@ -1,32 +1,8 @@
-import type { AstroSettings, ComponentInstance, RouteData, RuntimeMode, SSRLoadedRenderer } from '../../../@types/astro';
-import { LogOptions } from '../../logger/core.js';
+import type { AstroSettings, ComponentInstance, RouteData, SSRLoadedRenderer } from '../../../@types/astro';
 import type { ModuleLoader } from '../../module-loader/index';
-import { RouteCache } from '../route-cache.js';
 import type { DevelopmentEnvironment } from './environment';
 export { createDevelopmentEnvironment } from './environment.js';
 export type { DevelopmentEnvironment };
-export interface SSROptionsOld {
-    /** an instance of the AstroSettings */
-    settings: AstroSettings;
-    /** location of file on disk */
-    filePath: URL;
-    /** logging options */
-    logging: LogOptions;
-    /** "development" or "production" */
-    mode: RuntimeMode;
-    /** production website */
-    origin: string;
-    /** the web request (needed for dynamic routes) */
-    pathname: string;
-    /** optional, in case we need to render something outside of a dev server */
-    route?: RouteData;
-    /** pass in route cache because SSR can’t manage cache-busting */
-    routeCache: RouteCache;
-    /** Module loader (Vite) */
-    loader: ModuleLoader;
-    /** Request */
-    request: Request;
-}
 export interface SSROptions {
     /** The environment instance */
     env: DevelopmentEnvironment;

package/dist/core/render/dev/index.js

@@ -6,6 +6,7 @@ import { isPage, resolveIdToUrl } from "../../util.js";
 import { createRenderContext, renderPage as coreRenderPage } from "../index.js";
 import { filterFoundRenderers, loadRenderer } from "../renderer.js";
 import { getStylesForURL } from "./css.js";
+import { getPropagationMap } from "./head.js";
 import { getScriptsForURL } from "./scripts.js";
 import { createDevelopmentEnvironment } from "./environment.js";
 async function loadRenderers(moduleLoader, settings) {
@@ -81,12 +82,13 @@ async function getScriptsAndStyles({ env, filePath }) {
       children: content
     });
   });
-  return { scripts, styles, links };
+  const propagationMap = await getPropagationMap(filePath, env.loader);
+  return { scripts, styles, links, propagationMap };
 }
 async function renderPage(options) {
   const [renderers, mod] = options.preload;
   options.env.renderers = renderers;
-  const { scripts, links, styles } = await getScriptsAndStyles({
+  const { scripts, links, styles, propagationMap } = await getScriptsAndStyles({
     env: options.env,
     filePath: options.filePath
   });
@@ -97,6 +99,7 @@ async function renderPage(options) {
     scripts,
     links,
     styles,
+    propagation: propagationMap,
     route: options.route
   });
   return await coreRenderPage(mod, ctx, options.env);

package/dist/core/render/result.d.ts

@@ -17,6 +17,7 @@ export interface CreateResultArgs {
     links?: Set<SSRElement>;
     scripts?: Set<SSRElement>;
     styles?: Set<SSRElement>;
+    propagation?: SSRResult['propagation'];
     request: Request;
     status: number;
 }

package/dist/core/render/result.js

@@ -16,7 +16,7 @@ var __privateSet = (obj, member, value, setter) => {
   setter ? setter.call(obj, value) : member.set(obj, value);
   return value;
 };
-var _cache, _result, _slots, _loggingOpts;
+var _result, _slots, _loggingOpts;
 import { bold } from "kleur/colors";
 import { renderSlot, stringifyChunk } from "../../runtime/server/index.js";
 import { renderJSX } from "../../runtime/server/jsx.js";
@@ -44,7 +44,6 @@ function getFunctionExpression(slot) {
 }
 class Slots {
   constructor(result, slots, logging) {
-    __privateAdd(this, _cache, /* @__PURE__ */ new Map());
     __privateAdd(this, _result, void 0);
     __privateAdd(this, _slots, void 0);
     __privateAdd(this, _loggingOpts, void 0);
@@ -74,46 +73,34 @@ class Slots {
     return Boolean(__privateGet(this, _slots)[name]);
   }
   async render(name, args = []) {
-    const cacheable = args.length === 0;
-    if (!__privateGet(this, _slots))
-      return void 0;
-    if (cacheable && __privateGet(this, _cache).has(name)) {
-      const result = __privateGet(this, _cache).get(name);
-      return result;
-    }
-    if (!this.has(name))
-      return void 0;
-    if (!cacheable) {
+    if (!__privateGet(this, _slots) || !this.has(name))
+      return;
+    if (!Array.isArray(args)) {
+      warn(
+        __privateGet(this, _loggingOpts),
+        "Astro.slots.render",
+        `Expected second parameter to be an array, received a ${typeof args}. If you're trying to pass an array as a single argument and getting unexpected results, make sure you're passing your array as a item of an array. Ex: Astro.slots.render('default', [["Hello", "World"]])`
+      );
+    } else if (args.length > 0) {
       const component = await __privateGet(this, _slots)[name]();
-      if (!Array.isArray(args)) {
-        warn(
-          __privateGet(this, _loggingOpts),
-          "Astro.slots.render",
-          `Expected second parameter to be an array, received a ${typeof args}. If you're trying to pass an array as a single argument and getting unexpected results, make sure you're passing your array as a item of an array. Ex: Astro.slots.render('default', [["Hello", "World"]])`
+      const expression = getFunctionExpression(component);
+      if (expression) {
+        const slot = expression(...args);
+        return await renderSlot(__privateGet(this, _result), slot).then(
+          (res) => res != null ? String(res) : res
+        );
+      }
+      if (typeof component === "function") {
+        return await renderJSX(__privateGet(this, _result), component(...args)).then(
+          (res) => res != null ? String(res) : res
         );
-      } else {
-        const expression = getFunctionExpression(component);
-        if (expression) {
-          const slot = expression(...args);
-          return await renderSlot(__privateGet(this, _result), slot).then(
-            (res) => res != null ? String(res) : res
-          );
-        }
-        if (typeof component === "function") {
-          return await renderJSX(__privateGet(this, _result), component(...args)).then(
-            (res) => res != null ? String(res) : res
-          );
-        }
       }
     }
     const content = await renderSlot(__privateGet(this, _result), __privateGet(this, _slots)[name]);
     const outHTML = stringifyChunk(__privateGet(this, _result), content);
-    if (cacheable)
-      __privateGet(this, _cache).set(name, outHTML);
     return outHTML;
   }
 }
-_cache = new WeakMap();
 _result = new WeakMap();
 _slots = new WeakMap();
 _loggingOpts = new WeakMap();
@@ -138,6 +125,9 @@ function createResult(args) {
     styles: args.styles ?? /* @__PURE__ */ new Set(),
     scripts: args.scripts ?? /* @__PURE__ */ new Set(),
     links: args.links ?? /* @__PURE__ */ new Set(),
+    propagation: args.propagation ?? /* @__PURE__ */ new Map(),
+    propagators: /* @__PURE__ */ new Map(),
+    extraHead: [],
     cookies,
     createAstro(astroGlobal, props, slots) {
       const astroSlots = new Slots(result, slots, args.logging);

package/dist/jsx/babel.js

@@ -122,7 +122,8 @@ function astroJSX() {
             state.file.metadata.astro = {
               clientOnlyComponents: [],
               hydratedComponents: [],
-              scripts: []
+              scripts: [],
+              propagation: "none"
             };
           }
           path.node.body.splice(

package/dist/runtime/server/astro-component.d.ts

@@ -0,0 +1,2 @@
+import type { AstroComponentFactory } from './render/index.js';
+export declare function createComponent(arg1: AstroComponentFactory, moduleId: string): AstroComponentFactory;

package/dist/runtime/server/astro-component.js

@@ -0,0 +1,20 @@
+function baseCreateComponent(cb, moduleId) {
+  cb.isAstroComponentFactory = true;
+  cb.moduleId = moduleId;
+  return cb;
+}
+function createComponentWithOptions(opts) {
+  const cb = baseCreateComponent(opts.factory, opts.moduleId);
+  cb.propagation = opts.propagation;
+  return cb;
+}
+function createComponent(arg1, moduleId) {
+  if (typeof arg1 === "function") {
+    return baseCreateComponent(arg1, moduleId);
+  } else {
+    return createComponentWithOptions(arg1);
+  }
+}
+export {
+  createComponent
+};

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

@@ -1,11 +1,10 @@
+export { createComponent } from './astro-component.js';
 export { createAstro } from './astro-global.js';
 export { renderEndpoint } from './endpoint.js';
 export { escapeHTML, HTMLBytes, HTMLString, markHTMLString, unescapeHTML } from './escape.js';
 export { renderJSX } from './jsx.js';
-export { addAttribute, defineScriptVars, Fragment, maybeRenderHead, renderAstroComponent, renderComponent, Renderer as Renderer, renderHead, renderHTMLElement, renderPage, renderSlot, renderTemplate as render, renderTemplate, renderToString, stringifyChunk, voidElementNames, } from './render/index.js';
-export type { AstroComponentFactory, RenderInstruction } from './render/index.js';
-import type { AstroComponentFactory } from './render/index.js';
-export declare function createComponent(cb: AstroComponentFactory): AstroComponentFactory;
+export { addAttribute, createHeadAndContent, defineScriptVars, Fragment, maybeRenderHead, renderAstroTemplateResult as renderAstroComponent, renderComponent, renderComponentToIterable, Renderer as Renderer, renderHead, renderHTMLElement, renderPage, renderSlot, renderTemplate as render, renderTemplate, renderToString, renderUniqueStylesheet, stringifyChunk, voidElementNames, } from './render/index.js';
+export type { AstroComponentFactory, AstroComponentInstance, RenderInstruction, } from './render/index.js';
 export declare function mergeSlots(...slotted: unknown[]): Record<string, () => any>;
 /** @internal Assosciate JSX components with a specific renderer (see /src/vite-plugin-jsx/tag.ts) */
 export declare function __astro_tag_component__(Component: unknown, rendererName: string): void;

package/dist/runtime/server/index.js

@@ -1,14 +1,17 @@
+import { createComponent } from "./astro-component.js";
 import { createAstro } from "./astro-global.js";
 import { renderEndpoint } from "./endpoint.js";
 import { escapeHTML, HTMLBytes, HTMLString, markHTMLString, unescapeHTML } from "./escape.js";
 import { renderJSX } from "./jsx.js";
 import {
   addAttribute,
+  createHeadAndContent,
   defineScriptVars,
   Fragment,
   maybeRenderHead,
-  renderAstroComponent,
+  renderAstroTemplateResult,
   renderComponent,
+  renderComponentToIterable,
   Renderer,
   renderHead,
   renderHTMLElement,
@@ -17,16 +20,12 @@ import {
   renderTemplate,
   renderTemplate as renderTemplate2,
   renderToString,
+  renderUniqueStylesheet,
   stringifyChunk,
   voidElementNames
 } from "./render/index.js";
 import { markHTMLString as markHTMLString2 } from "./escape.js";
-import { Renderer as Renderer2 } from "./render/index.js";
-import { addAttribute as addAttribute2 } from "./render/index.js";
-function createComponent(cb) {
-  cb.isAstroComponentFactory = true;
-  return cb;
-}
+import { addAttribute as addAttribute2, Renderer as Renderer2 } from "./render/index.js";
 function mergeSlots(...slotted) {
   const slots = {};
   for (const slot of slotted) {
@@ -88,6 +87,7 @@ export {
   addAttribute,
   createAstro,
   createComponent,
+  createHeadAndContent,
   defineScriptVars,
   defineStyleVars,
   escapeHTML,
@@ -95,8 +95,9 @@ export {
   maybeRenderHead,
   mergeSlots,
   renderTemplate as render,
-  renderAstroComponent,
+  renderAstroTemplateResult as renderAstroComponent,
   renderComponent,
+  renderComponentToIterable,
   renderEndpoint,
   renderHTMLElement,
   renderHead,
@@ -105,6 +106,7 @@ export {
   renderSlot,
   renderTemplate2 as renderTemplate,
   renderToString,
+  renderUniqueStylesheet,
   spreadAttributes,
   stringifyChunk,
   unescapeHTML,

package/dist/runtime/server/jsx.js

@@ -3,7 +3,7 @@ import {
   escapeHTML,
   HTMLString,
   markHTMLString,
-  renderComponent,
+  renderComponentToIterable,
   renderToString,
   spreadAttributes,
   voidElementNames
@@ -159,7 +159,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 renderComponent(
+        output = await renderComponentToIterable(
           result,
           vnode.props["client:display-name"] ?? "",
           null,
@@ -167,7 +167,7 @@ Did you forget to import the component or is it possible there is a typo?`);
           slots
         );
       } else {
-        output = await renderComponent(
+        output = await renderComponentToIterable(
           result,
           typeof vnode.type === "function" ? vnode.type.name : vnode.type,
           vnode.type,

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

@@ -1,5 +1,9 @@
 import { escapeHTML, isHTMLString, markHTMLString } from "../escape.js";
-import { AstroComponent, renderAstroComponent } from "./astro.js";
+import {
+  isAstroComponentInstance,
+  isRenderTemplateResult,
+  renderAstroTemplateResult
+} from "./astro/index.js";
 import { SlotString } from "./slot.js";
 async function* renderChild(child) {
   child = await child;
@@ -19,8 +23,10 @@ async function* renderChild(child) {
   } else if (typeof child === "string") {
     yield markHTMLString(escapeHTML(child));
   } else if (!child && child !== 0) {
-  } else if (child instanceof AstroComponent || Object.prototype.toString.call(child) === "[object AstroComponent]") {
-    yield* renderAstroComponent(child);
+  } else if (isRenderTemplateResult(child)) {
+    yield* renderAstroTemplateResult(child);
+  } else if (isAstroComponentInstance(child)) {
+    yield* child.render();
   } else if (ArrayBuffer.isView(child)) {
     yield child;
   } else if (typeof child === "object" && (Symbol.asyncIterator in child || Symbol.iterator in child)) {

package/dist/runtime/server/render/astro/factory.d.ts

@@ -0,0 +1,13 @@
+import type { PropagationHint, SSRResult } from '../../../../@types/astro';
+import type { HeadAndContent } from './head-and-content';
+import type { RenderTemplateResult } from './render-template';
+export declare type AstroFactoryReturnValue = RenderTemplateResult | Response | HeadAndContent;
+export interface AstroComponentFactory {
+    (result: any, props: any, slots: any): AstroFactoryReturnValue;
+    isAstroComponentFactory?: boolean;
+    moduleId: string | undefined;
+    propagation?: PropagationHint;
+}
+export declare function isAstroComponentFactory(obj: any): obj is AstroComponentFactory;
+export declare function renderToString(result: SSRResult, componentFactory: AstroComponentFactory, props: any, children: any): Promise<string>;
+export declare function isAPropagatingComponent(result: SSRResult, factory: AstroComponentFactory): boolean;

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

@@ -0,0 +1,31 @@
+import { HTMLParts } from "../common.js";
+import { isHeadAndContent } from "./head-and-content.js";
+import { renderAstroTemplateResult } from "./render-template.js";
+function isAstroComponentFactory(obj) {
+  return obj == null ? false : obj.isAstroComponentFactory === true;
+}
+async function renderToString(result, componentFactory, props, children) {
+  const factoryResult = await componentFactory(result, props, children);
+  if (factoryResult instanceof Response) {
+    const response = factoryResult;
+    throw response;
+  }
+  let parts = new HTMLParts();
+  const templateResult = isHeadAndContent(factoryResult) ? factoryResult.content : factoryResult;
+  for await (const chunk of renderAstroTemplateResult(templateResult)) {
+    parts.append(chunk, result);
+  }
+  return parts.toString();
+}
+function isAPropagatingComponent(result, factory) {
+  let hint = factory.propagation || "none";
+  if (factory.moduleId && result.propagation.has(factory.moduleId) && hint === "none") {
+    hint = result.propagation.get(factory.moduleId);
+  }
+  return hint === "in-tree" || hint === "self";
+}
+export {
+  isAPropagatingComponent,
+  isAstroComponentFactory,
+  renderToString
+};