diff options
| -rw-r--r-- | packages/astro/src/core/render/result.ts | 10 | ||||
| -rw-r--r-- | packages/astro/src/runtime/server/index.ts | 2 | ||||
| -rw-r--r-- | packages/astro/src/runtime/server/render/component.ts | 2 | ||||
| -rw-r--r-- | packages/astro/src/runtime/server/render/index.ts | 2 | ||||
| -rw-r--r-- | packages/astro/src/runtime/server/render/slot.ts | 6 |
5 files changed, 14 insertions, 8 deletions
diff --git a/packages/astro/src/core/render/result.ts b/packages/astro/src/core/render/result.ts index 93f3fbaad..26ea22eee 100644 --- a/packages/astro/src/core/render/result.ts +++ b/packages/astro/src/core/render/result.ts @@ -9,7 +9,11 @@ import type { SSRLoadedRenderer, SSRResult, } from '../../@types/astro'; -import { renderSlotToString, stringifyChunk, type ComponentSlots } from '../../runtime/server/index.js'; +import { + renderSlotToString, + stringifyChunk, + type ComponentSlots, +} from '../../runtime/server/index.js'; import { renderJSX } from '../../runtime/server/jsx.js'; import { AstroCookies } from '../cookies/index.js'; import { AstroError, AstroErrorData } from '../errors/index.js'; @@ -105,7 +109,9 @@ class Slots { const expression = getFunctionExpression(component); if (expression) { const slot = () => expression(...args); - return await renderSlotToString(result, slot).then((res) => (res != null ? String(res) : res)); + return await renderSlotToString(result, slot).then((res) => + res != null ? String(res) : res + ); } // JSX if (typeof component === 'function') { diff --git a/packages/astro/src/runtime/server/index.ts b/packages/astro/src/runtime/server/index.ts index 6f575676b..3c388fafa 100644 --- a/packages/astro/src/runtime/server/index.ts +++ b/packages/astro/src/runtime/server/index.ts @@ -17,8 +17,8 @@ export { renderHTMLElement, renderPage, renderScriptElement, - renderSlotToString, renderSlot, + renderSlotToString, renderStyleElement, renderTemplate as render, renderTemplate, diff --git a/packages/astro/src/runtime/server/render/component.ts b/packages/astro/src/runtime/server/render/component.ts index 4d2b441e1..1c427bf2a 100644 --- a/packages/astro/src/runtime/server/render/component.ts +++ b/packages/astro/src/runtime/server/render/component.ts @@ -17,7 +17,7 @@ import { } from './astro/index.js'; import { Fragment, Renderer, stringifyChunk } from './common.js'; import { componentIsHTMLElement, renderHTMLElement } from './dom.js'; -import { renderSlotToString, renderSlots, type ComponentSlots } from './slot.js'; +import { renderSlots, renderSlotToString, type ComponentSlots } from './slot.js'; import { formatList, internalSpreadAttributes, renderElement, voidElementNames } from './util.js'; const rendererAliases = new Map([['solid', 'solid-js']]); diff --git a/packages/astro/src/runtime/server/render/index.ts b/packages/astro/src/runtime/server/render/index.ts index 30f85b3ac..efa0715d2 100644 --- a/packages/astro/src/runtime/server/render/index.ts +++ b/packages/astro/src/runtime/server/render/index.ts @@ -10,7 +10,7 @@ export { renderComponent, renderComponentToIterable } from './component.js'; export { renderHTMLElement } from './dom.js'; export { maybeRenderHead, renderHead } from './head.js'; export { renderPage } from './page.js'; -export { renderSlotToString, renderSlot, type ComponentSlots } from './slot.js'; +export { renderSlot, renderSlotToString, type ComponentSlots } from './slot.js'; export { renderScriptElement, renderStyleElement, renderUniqueStylesheet } from './tags.js'; export type { RenderInstruction } from './types'; export { addAttribute, defineScriptVars, voidElementNames } from './util.js'; diff --git a/packages/astro/src/runtime/server/render/slot.ts b/packages/astro/src/runtime/server/render/slot.ts index b2ee52d1f..afc956002 100644 --- a/packages/astro/src/runtime/server/render/slot.ts +++ b/packages/astro/src/runtime/server/render/slot.ts @@ -25,18 +25,18 @@ export function isSlotString(str: string): str is any { return !!(str as any)[slotString]; } -export async function * renderSlot( +export async function* renderSlot( result: SSRResult, slotted: ComponentSlotValue | RenderTemplateResult, fallback?: ComponentSlotValue | RenderTemplateResult ): AsyncGenerator<any, void, undefined> { if (slotted) { let iterator = renderChild(typeof slotted === 'function' ? slotted(result) : slotted); - yield * iterator; + yield* iterator; } if (fallback) { - yield * renderSlot(result, fallback); + yield* renderSlot(result, fallback); } } |