Fix style tag moving inside html (#587)

* fix(#585): followup to fix style tag moving inside html * chore: remove change from diff * chore: update test * chore: add changeset Co-authored-by: Nate Moore <[email protected]>
withastro · Oct 24, 2022 · 6b204bd · 6b204bd
1 parent fd2fc28
commit 6b204bd
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/.changeset/thin-wasps-promise.md b/.changeset/thin-wasps-promise.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/compiler': patch
+---
+
+Fix bug with trailing `style` tags being moved into the `html` element
diff --git a/internal/parser.go b/internal/parser.go
@@ -1107,6 +1107,11 @@ func inBodyIM(p *parser) bool {
 			p.framesetOK = false
 		}
 	case StartTagToken:
+		// if literal and we only have html and body open
+		if p.literal {
+			p.im = inLiteralIM
+			return false
+		}
 		// It's possible we were moved here from inHeadIM
 		// via the children of a Component. We need to clear the originalIM
 		// and switch the implicit `head` tag to `body`

diff --git a/internal/printer/printer_test.go b/internal/printer/printer_test.go
@@ -2545,8 +2545,18 @@ const c = '\''
 		{
 			name:   "style after html",
 			source: `<html><body><h1>Hello world!</h1></body></html><style></style>`,
+			want:   []ASTNode{{Type: "element", Name: "html", Children: []ASTNode{{Type: "element", Name: "body", Children: []ASTNode{{Type: "element", Name: "h1", Children: []ASTNode{{Type: "text", Value: "Hello world!"}}}}}}}, {Type: "element", Name: "style"}},
+		},
+		{
+			name:   "style in html",
+			source: `<html><body><h1>Hello world!</h1></body><style></style></html>`,
 			want:   []ASTNode{{Type: "element", Name: "html", Children: []ASTNode{{Type: "element", Name: "body", Children: []ASTNode{{Type: "element", Name: "h1", Children: []ASTNode{{Type: "text", Value: "Hello world!"}}}}}, {Type: "element", Name: "style"}}}},
 		},
+		{
+			name:   "style in body",
+			source: `<html><body><h1>Hello world!</h1><style></style></body></html>`,
+			want:   []ASTNode{{Type: "element", Name: "html", Children: []ASTNode{{Type: "element", Name: "body", Children: []ASTNode{{Type: "element", Name: "h1", Children: []ASTNode{{Type: "text", Value: "Hello world!"}}}, {Type: "element", Name: "style"}}}}}},
+		},
 	}
 
 	for _, tt := range tests {

diff --git a/packages/compiler/test/parse/orphan-head.ts b/packages/compiler/test/parse/orphan-head.ts
@@ -27,7 +27,7 @@ test('orphan head', () => {
   assert.ok(result, 'able to parse');
 
   const [doctype, html, ...others] = result.ast.children;
-  assert.equal(others.length, 0, `Expected only two child nodes!`);
+  assert.equal(others.length, 1, `Expected only three child nodes!`);
   assert.equal(doctype.type, 'doctype', `Expected first child node to be of type "doctype"`);
   assert.equal(html.type, 'element', `Expected first child node to be of type "element"`);
 });