[ci] format

packages/astro/src/runtime/server/render/astro/head-and-content.ts

@@ -12,10 +12,7 @@ export function isHeadAndContent(obj: unknown): obj is HeadAndContent {
 	return typeof obj === 'object' && !!(obj as any)[headAndContentSym];
 }
 
-export function createHeadAndContent(
+export function createHeadAndContent(head: string, content: RenderTemplateResult): HeadAndContent {
-	head: string,
-	content: RenderTemplateResult
-): HeadAndContent {
 	return {
 		[headAndContentSym]: true,
 		head,

packages/astro/src/runtime/server/render/common.ts

@@ -2,13 +2,13 @@ import type { SSRResult } from '../../../@types/astro';
 import type { RenderInstruction } from './types.js';
 
 import { HTMLBytes, markHTMLString } from '../escape.js';
-import { renderAllHeadContent } from './head.js';
 import {
 	determineIfNeedsHydrationScript,
 	determinesIfNeedsDirectiveScript,
 	getPrescripts,
 	PrescriptType,
 } from '../scripts.js';
+import { renderAllHeadContent } from './head.js';
 import { isSlotString, type SlotString } from './slot.js';
 
 export const Fragment = Symbol.for('astro:fragment');

packages/astro/src/runtime/server/render/types.ts

@@ -10,6 +10,6 @@ export type RenderDirectiveInstruction = {
 export type RenderHeadInstruction = {
 	type: 'head';
 	result: SSRResult;
-}
+};
 
 export type RenderInstruction = RenderDirectiveInstruction | RenderHeadInstruction;

packages/astro/test/units/render/head.test.js

@@ -7,7 +7,7 @@ import {
 	renderSlot,
 	maybeRenderHead,
 	renderHead,
-	Fragment
+	Fragment,
 } from '../../../dist/runtime/server/index.js';
 import {
 	createBasicEnvironment,
@@ -41,41 +41,63 @@ describe('core/render', () => {
 						${renderSlot(result, slots['default'])}
 					</body>
 				</html>`;
-			})
+			});
 
 			const PageLayout = createComponent((result, _props, slots) => {
-				return render`${renderComponent(result, 'Layout', BaseLayout, {}, {
+				return render`${renderComponent(
-						'default': () => render`
+					result,
+					'Layout',
+					BaseLayout,
+					{},
+					{
+						default: () => render`
 							${maybeRenderHead(result)}
 							<main>
 								${renderSlot(result, slots['default'])}
 							</main>
 						`,
-						'head': () => render`
+						head: () => render`
-							${renderComponent(result, 'Fragment', Fragment, { slot: 'head' }, {
+							${renderComponent(
-								'default': () => render`${renderSlot(result, slots['head'])}`
+								result,
-							})}
+								'Fragment',
-						`
+								Fragment,
-					})}
+								{ slot: 'head' },
+								{
+									default: () => render`${renderSlot(result, slots['head'])}`,
+								}
+							)}
+						`,
+					}
+				)}
 				`;
 			});
 
 			const Page = createComponent((result, _props) => {
-				return render`${renderComponent(result, 'PageLayout', PageLayout, {}, {
+				return render`${renderComponent(
-					'default': () => render`${maybeRenderHead(result)}<div>hello world</div>`,
+					result,
-					'head': () => render`
+					'PageLayout',
-						${renderComponent(result, 'Fragment', Fragment, {slot: 'head'}, {
+					PageLayout,
-							'default': () => render`<meta charset="utf-8">`
+					{},
-						})}
+					{
-					`
+						default: () => render`${maybeRenderHead(result)}<div>hello world</div>`,
-				})}`;
+						head: () => render`
+						${renderComponent(
+							result,
+							'Fragment',
+							Fragment,
+							{ slot: 'head' },
+							{
+								default: () => render`<meta charset="utf-8">`,
+							}
+						)}
+					`,
+					}
+				)}`;
 			});
 
 			const ctx = createRenderContext({
 				request: new Request('http://example.com/'),
-				links: [
+				links: [{ name: 'link', props: { rel: 'stylesheet', href: '/main.css' }, children: '' }],
-					{ name: 'link', props: {rel:'stylesheet', href:'/main.css'}, children: '' }
-				]
 			});
 			const PageModule = createAstroModule(Page);
 
@@ -97,41 +119,63 @@ describe('core/render', () => {
 						${renderSlot(result, slots['default'])}
 					</body>
 				</html>`;
-			})
+			});
 
 			const PageLayout = createComponent((result, _props, slots) => {
-				return render`${renderComponent(result, 'Layout', BaseLayout, {}, {
+				return render`${renderComponent(
-						'default': () => render`
+					result,
+					'Layout',
+					BaseLayout,
+					{},
+					{
+						default: () => render`
 							${maybeRenderHead(result)}
 							<main>
 								${renderSlot(result, slots['default'])}
 							</main>
 						`,
-						'head': () => render`
+						head: () => render`
-							${renderComponent(result, 'Fragment', Fragment, { slot: 'head' }, {
+							${renderComponent(
-								'default': () => render`${renderSlot(result, slots['head'])}`
+								result,
-							})}
+								'Fragment',
-						`
+								Fragment,
-					})}
+								{ slot: 'head' },
+								{
+									default: () => render`${renderSlot(result, slots['head'])}`,
+								}
+							)}
+						`,
+					}
+				)}
 				`;
 			});
 
 			const Page = createComponent((result, _props) => {
-				return render`${renderComponent(result, 'PageLayout', PageLayout, {}, {
+				return render`${renderComponent(
-					'default': () => render`${maybeRenderHead(result)}<div>hello world</div>`,
+					result,
-					'head': () => render`
+					'PageLayout',
-						${renderComponent(result, 'Fragment', Fragment, {slot: 'head'}, {
+					PageLayout,
-							'default': () => render`<meta charset="utf-8">`
+					{},
-						})}
+					{
-					`
+						default: () => render`${maybeRenderHead(result)}<div>hello world</div>`,
-				})}`;
+						head: () => render`
+						${renderComponent(
+							result,
+							'Fragment',
+							Fragment,
+							{ slot: 'head' },
+							{
+								default: () => render`<meta charset="utf-8">`,
+							}
+						)}
+					`,
+					}
+				)}`;
 			});
 
 			const ctx = createRenderContext({
 				request: new Request('http://example.com/'),
-				links: [
+				links: [{ name: 'link', props: { rel: 'stylesheet', href: '/main.css' }, children: '' }],
-					{ name: 'link', props: {rel:'stylesheet', href:'/main.css'}, children: '' }
-				]
 			});
 			const PageModule = createAstroModule(Page);
 
@@ -147,26 +191,36 @@ describe('core/render', () => {
 		it('Multi-level layouts and head injection, without any content in layouts', async () => {
 			const BaseLayout = createComponent((result, _props, slots) => {
 				return render`${renderSlot(result, slots['default'])}`;
-			})
+			});
 
 			const PageLayout = createComponent((result, _props, slots) => {
-				return render`${renderComponent(result, 'Layout', BaseLayout, {}, {
+				return render`${renderComponent(
-						'default': () => render`${renderSlot(result, slots['default'])}	`,
+					result,
-					})}
+					'Layout',
+					BaseLayout,
+					{},
+					{
+						default: () => render`${renderSlot(result, slots['default'])}	`,
+					}
+				)}
 				`;
 			});
 
 			const Page = createComponent((result, _props) => {
-				return render`${renderComponent(result, 'PageLayout', PageLayout, {}, {
+				return render`${renderComponent(
-					'default': () => render`${maybeRenderHead(result)}<div>hello world</div>`,
+					result,
-				})}`;
+					'PageLayout',
+					PageLayout,
+					{},
+					{
+						default: () => render`${maybeRenderHead(result)}<div>hello world</div>`,
+					}
+				)}`;
 			});
 
 			const ctx = createRenderContext({
 				request: new Request('http://example.com/'),
-				links: [
+				links: [{ name: 'link', props: { rel: 'stylesheet', href: '/main.css' }, children: '' }],
-					{ name: 'link', props: {rel:'stylesheet', href:'/main.css'}, children: '' }
-				]
 			});
 			const PageModule = createAstroModule(Page);