Handle slot before <head> (#540)

* fix(#531): handle slots before <head> * chore: add changeset * chore: update test Co-authored-by: Nate Moore <[email protected]>
withastro · Oct 5, 2022 · 8ee78a6 · 8ee78a6
1 parent 52ebfb7
commit 8ee78a6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/.changeset/nervous-ducks-fetch.md b/.changeset/nervous-ducks-fetch.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+handle slots that contains the head element
diff --git a/internal/parser.go b/internal/parser.go
@@ -708,6 +708,14 @@ func beforeHeadIM(p *parser) bool {
 		return true
 	case StartTagToken:
 		switch p.tok.DataAtom {
+		case a.Slot:
+			p.addElement()
+			if p.hasSelfClosingToken {
+				p.addLoc()
+				p.oe.pop()
+				p.acknowledgeSelfClosingTag()
+			}
+			return true
 		case a.Head:
 			p.addElement()
 			p.head = p.top()

diff --git a/internal/printer/printer_test.go b/internal/printer/printer_test.go
@@ -109,6 +109,13 @@ func TestPrinter(t *testing.T) {
 				code: `<html><head><title>Ah</title>` + RENDER_HEAD_RESULT + `</head></html>`,
 			},
 		},
+		{
+			name:   "head inside slot",
+			source: `<html><slot><head></head></slot></html>`,
+			want: want{
+				code: `<html>${$$renderSlot($$result,$$slots["default"],$$render` + BACKTICK + `<head>` + RENDER_HEAD_RESULT + `</head>` + BACKTICK + `)}</html>`,
+			},
+		},
 		{
 			name:   "head slot",
 			source: `<html><head><slot /></html>`,