in v2, don't parse for interpolations in non-root style elements (#1339)

sveltejs · Apr 15, 2018 · bed13d2 · bed13d2
1 parent 1c4b166
commit bed13d2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/src/parse/state/tag.ts b/src/parse/state/tag.ts
@@ -248,13 +248,21 @@ export default function tag(parser: Parser) {
 		element.end = parser.index;
 	} else if (name === 'style') {
 		// special case
-		element.children = readSequence(
-			parser,
-			() =>
-				parser.template.slice(parser.index, parser.index + 8) === '</style>'
-		);
-		parser.read(/<\/style>/);
-		element.end = parser.index;
+		if (parser.v2) {
+			const start = parser.index;
+			const data = parser.readUntil(/<\/style>/);
+			const end = parser.index;
+			element.children.push({ start, end, type: 'Text', data });
+			parser.eat('</style>', true);
+		} else {
+			element.children = readSequence(
+				parser,
+				() =>
+					parser.template.slice(parser.index, parser.index + 8) === '</style>'
+			);
+			parser.read(/<\/style>/);
+			element.end = parser.index;
+		}
 	} else {
 		parser.stack.push(element);
 	}

diff --git a/test/runtime/samples/script-style-non-top-level/main-v2.html b/test/runtime/samples/script-style-non-top-level/main-v2.html
@@ -0,0 +1,4 @@
+<div>
+	<style>div { color: red; }</style>
+	<script>alert('<>');</script>
+</div>