Avoid generators in render head API (#10528)

withastro · Mar 22, 2024 · 8cac744 · 8cac744
1 parent ca5455a
commit 8cac744
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/packages/astro/src/runtime/server/render/component.ts b/packages/astro/src/runtime/server/render/component.ts
@@ -516,9 +516,7 @@ export async function renderComponentToString(
 	// we can ensure getting a value for `head`.
 	let head = '';
 	if (isPage && !result.partial && nonAstroPageNeedsHeadInjection(Component)) {
-		for (const headChunk of maybeRenderHead()) {
-			head += chunkToString(result, headChunk);
-		}
+		head += chunkToString(result, maybeRenderHead());
 	}
 
 	try {

diff --git a/packages/astro/src/runtime/server/render/head.ts b/packages/astro/src/runtime/server/render/head.ts
@@ -51,16 +51,16 @@ export function renderAllHeadContent(result: SSRResult) {
 	return markHTMLString(content);
 }
 
-export function* renderHead(): Generator<RenderHeadInstruction> {
-	yield createRenderInstruction({ type: 'head' });
+export function renderHead(): RenderHeadInstruction {
+	return createRenderInstruction({ type: 'head' });
 }
 
 // This function is called by Astro components that do not contain a <head> component
 // This accommodates the fact that using a <head> is optional in Astro, so this
 // is called before a component's first non-head HTML element. If the head was
 // already injected it is a noop.
-export function* maybeRenderHead(): Generator<MaybeRenderHeadInstruction> {
+export function maybeRenderHead(): MaybeRenderHeadInstruction {
 	// This is an instruction informing the page rendering that head might need rendering.
 	// This allows the page to deduplicate head injections.
-	yield createRenderInstruction({ type: 'maybe-head' });
+	return createRenderInstruction({ type: 'maybe-head' });
 }
diff --git a/packages/astro/test/streaming.test.js b/packages/astro/test/streaming.test.js
@@ -47,7 +47,7 @@ describe('Streaming', () => {
 				let chunk = decoder.decode(bytes);
 				chunks.push(chunk);
 			}
-			assert.equal(chunks.length, 3);
+			assert.ok(chunks.length >= 2);
 		});
 	});