fix: sync transformHtmlTemplate

harlan-zw · harlan-zw · commit f696d9d41313 · 2026-01-11T13:52:02.000+11:00
diff --git a/packages/unhead/src/server/transformHtmlTemplate.ts b/packages/unhead/src/server/transformHtmlTemplate.ts
@@ -1,18 +1,16 @@
-import type { RenderSSRHeadOptions, Unhead } from '../types'
+import type { SSRHeadPayload, Unhead } from '../types'
 import { applyHeadToHtml, parseHtmlForIndexes, parseHtmlForUnheadExtraction } from '../parser'
-import { renderSSRHead } from './renderSSRHead'
 
 /**
  * Transform an HTML template string by extracting any head tags and attributes from it, pushing them to Unhead,
  * and injecting the resulting head tags back into the HTML.
  * Uses optimized parsing and index-based HTML construction for best performance.
  */
 /* @__NO_SIDE_EFFECTS__ */
-export async function transformHtmlTemplate(head: Unhead<any>, html: string, options?: RenderSSRHeadOptions) {
+export function transformHtmlTemplate(head: Unhead<any, SSRHeadPayload>, html: string) {
   const template = parseHtmlForUnheadExtraction(html)
   head.push(template.input, { _index: 0 })
-  const headHtml = renderSSRHead(head, options)
-  return applyHeadToHtml(template, headHtml)
+  return applyHeadToHtml(template, head.render())
 }
 
 /**
@@ -25,9 +23,8 @@ export async function transformHtmlTemplate(head: Unhead<any>, html: string, opt
  * ordered incorrectly, so use with caution.
  */
 /* @__NO_SIDE_EFFECTS__ */
-export async function transformHtmlTemplateRaw(head: Unhead<any>, html: string, options?: RenderSSRHeadOptions) {
-  const headHtml = renderSSRHead(head, options)
+export function transformHtmlTemplateRaw(head: Unhead<any, SSRHeadPayload>, html: string) {
   // For raw mode, we only need indexes, not head extraction
   const template = parseHtmlForIndexes(html)
-  return applyHeadToHtml(template, headHtml)
+  return applyHeadToHtml(template, head.render())
 }
diff --git a/packages/unhead/test/unit/server/ssr.test.ts b/packages/unhead/test/unit/server/ssr.test.ts
@@ -1,4 +1,3 @@
-import { createHead } from '@unhead/dom'
 import { describe, it } from 'vitest'
 import { useHead, useSeoMeta } from '../../../src'
 import { renderSSRHead } from '../../../src/server'
@@ -391,7 +390,7 @@ describe('ssr', () => {
         </style>
     </head>
 `
-    const processedHtml = await transformHtmlTemplate(createHead(), input)
+    const processedHtml = transformHtmlTemplate(createServerHeadWithContext(), input)
     expect(processedHtml).toMatchInlineSnapshot(`
       "
           <head>
diff --git a/packages/unhead/test/util.ts b/packages/unhead/test/util.ts
@@ -1,4 +1,5 @@
-import type { CreateClientHeadOptions, CreateServerHeadOptions, ResolvableHead, SerializableHead, SSRHeadPayload, Unhead } from '../src/types'
+import type { ServerUnhead } from '../src/server'
+import type { CreateClientHeadOptions, CreateServerHeadOptions, SerializableHead, SSRHeadPayload } from '../src/types'
 import { JSDOM } from 'jsdom'
 import { createHead as createClientHead } from '../src/client'
 import { createHead as createServerHead } from '../src/server'
@@ -8,7 +9,7 @@ export function createClientHeadWithContext(resolvedOptions: CreateClientHeadOpt
   return createClientHead(resolvedOptions)
 }
 
-export function createServerHeadWithContext(resolvedOptions: CreateServerHeadOptions = {}): Unhead<ResolvableHead> {
+export function createServerHeadWithContext(resolvedOptions: CreateServerHeadOptions = {}): ServerUnhead {
   return createServerHead({
     disableDefaults: true,
     ...resolvedOptions,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import { createHead } from '@unhead/dom'`
`2`	`1`	`import { describe, it } from 'vitest'`
`3`	`2`	`import { useHead, useSeoMeta } from '../../../src'`
`4`	`3`	`import { renderSSRHead } from '../../../src/server'`
`@@ -391,7 +390,7 @@ describe('ssr', () => {`
`391`	`390`	`</style>`
`392`	`391`	`</head>`
`393`	`392`	`
`394`		`- const processedHtml = await transformHtmlTemplate(createHead(), input)`
	`393`	`+ const processedHtml = transformHtmlTemplate(createServerHeadWithContext(), input)`
`395`	`394`	expect(processedHtml).toMatchInlineSnapshot(`
`396`	`395`	`"`
`397`	`396`	`<head>`