From 27fbf382ce1114982a6ca83866c03027e19f1f9c Mon Sep 17 00:00:00 2001
From: Conduitry <git@fur.army>
Date: Thu, 8 Feb 2018 01:24:56 -0500
Subject: [PATCH 1/7] remove <noscript> elements in DOM mode (#1108)

---
 src/generators/nodes/Element.ts                  | 4 ++++
 test/runtime/samples/noscript-removal/_config.js | 9 +++++++++
 test/runtime/samples/noscript-removal/main.html  | 5 +++++
 3 files changed, 18 insertions(+)
 create mode 100644 test/runtime/samples/noscript-removal/_config.js
 create mode 100644 test/runtime/samples/noscript-removal/main.html
diff --git a/src/generators/nodes/Element.ts b/src/generators/nodes/Element.ts
index 48852c27ea..1b4d9368d8 100644
--- a/src/generators/nodes/Element.ts
+++ b/src/generators/nodes/Element.ts
@@ -162,6 +162,8 @@ export default class Element extends Node {
 			this.generator.slots.add(slotName);
 		}
 
+		if (this.name === 'noscript') return;
+
 		const childState = {
 			parentNode: this.var,
 			parentNodes: parentNodes && block.getUniqueName(`${this.var}_nodes`) // if we're in unclaimable territory, i.e. <head>, parentNodes is null
@@ -417,6 +419,8 @@ export default class Element extends Node {
 		function toHTML(node: Element | Text) {
 			if (node.type === 'Text') return escapeHTML(node.data);
 
+			if (node.name === 'noscript') return '';
+
 			let open = `<${node.name}`;
 
 			if (node._needsCssAttribute) {
diff --git a/test/runtime/samples/noscript-removal/_config.js b/test/runtime/samples/noscript-removal/_config.js
new file mode 100644
index 0000000000..d935af9493
--- /dev/null
+++ b/test/runtime/samples/noscript-removal/_config.js
@@ -0,0 +1,9 @@
+export default {
+	'skip-ssr': true,
+
+	html: `
+	<div>foo</div>
+
+	<div>foo<div>foo</div></div>
+`,
+};
diff --git a/test/runtime/samples/noscript-removal/main.html b/test/runtime/samples/noscript-removal/main.html
new file mode 100644
index 0000000000..0cc2155e5d
--- /dev/null
+++ b/test/runtime/samples/noscript-removal/main.html
@@ -0,0 +1,5 @@
+<noscript>foo</noscript>
+
+<div>foo<noscript>foo</noscript></div>
+
+<div>foo<div>foo<noscript>foo</noscript></div></div>

From 7ff328a2f9543acd43eaeb35674158c2b9f988ba Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 8 Jan 2018 21:56:30 -0500
Subject: [PATCH 2/7] failing test for #1082

---
 .../runtime/samples/script-style-non-top-level/_config.js | 8 ++++++++
 test/runtime/samples/script-style-non-top-level/main.html | 4 ++++
 2 files changed, 12 insertions(+)
 create mode 100644 test/runtime/samples/script-style-non-top-level/_config.js
 create mode 100644 test/runtime/samples/script-style-non-top-level/main.html

diff --git a/test/runtime/samples/script-style-non-top-level/_config.js b/test/runtime/samples/script-style-non-top-level/_config.js
new file mode 100644
index 0000000000..1aade72239
--- /dev/null
+++ b/test/runtime/samples/script-style-non-top-level/_config.js
@@ -0,0 +1,8 @@
+export default {
+	html: `
+		<div>
+			<style>div { color: red; }</style>
+			<script>alert('<>');</script>
+		</div>
+	`
+};
\ No newline at end of file
diff --git a/test/runtime/samples/script-style-non-top-level/main.html b/test/runtime/samples/script-style-non-top-level/main.html
new file mode 100644
index 0000000000..94cf72e4bd
--- /dev/null
+++ b/test/runtime/samples/script-style-non-top-level/main.html
@@ -0,0 +1,4 @@
+<div>
+	<style>div { color: red; }</style>
+	<script>alert('<>');</script>
+</div>
\ No newline at end of file

From 9b8ba7e924d1d1b398aebcdfe6bbe4e49ab0a4c0 Mon Sep 17 00:00:00 2001
From: Conduitry <git@fur.army>
Date: Thu, 8 Feb 2018 14:14:21 -0500
Subject: [PATCH 3/7] rework handling of non-root <script> and <style>

---
 src/generators/nodes/Element.ts                | 14 +++++++-------
 .../server-side-rendering/visitors/Element.ts  |  2 --
 .../server-side-rendering/visitors/Text.ts     | 11 ++++++++++-
 src/parse/state/tag.ts                         | 18 +++++++++++++++---
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/generators/nodes/Element.ts b/src/generators/nodes/Element.ts
index 48852c27ea..b1bd650bf7 100644
--- a/src/generators/nodes/Element.ts
+++ b/src/generators/nodes/Element.ts
@@ -232,7 +232,7 @@ export default class Element extends Node {
 				);
 			} else {
 				block.builders.create.addLine(
-					`${name}.innerHTML = ${stringify(this.children.map(toHTML).join(''))};`
+					`${name}.innerHTML = ${stringify(this.children.map(node => toHTML(node, false)).join(''))};`
 				);
 			}
 		} else {
@@ -414,8 +414,10 @@ export default class Element extends Node {
 			);
 		}
 
-		function toHTML(node: Element | Text) {
-			if (node.type === 'Text') return escapeHTML(node.data);
+		function toHTML(node: Element | Text, dontEscapeText: Boolean) {
+			if (node.type === 'Text') {
+				return dontEscapeText ? node.data : escapeHTML(node.data);
+			}
 
 			let open = `<${node.name}`;
 
@@ -433,11 +435,9 @@ export default class Element extends Node {
 
 			if (isVoidElementName(node.name)) return open + '>';
 
-			if (node.name === 'script' || node.name === 'style') {
-				return `${open}>${node.data}</${node.name}>`;
-			}
+			const shouldNotEscapeText = node.name === 'script' || node.name === 'style';
 
-			return `${open}>${node.children.map(toHTML).join('')}</${node.name}>`;
+			return `${open}>${node.children.map(node => toHTML(node, shouldNotEscapeText)).join('')}</${node.name}>`;
 		}
 	}
 
diff --git a/src/generators/server-side-rendering/visitors/Element.ts b/src/generators/server-side-rendering/visitors/Element.ts
index 486f0f01a3..21ec923e3d 100644
--- a/src/generators/server-side-rendering/visitors/Element.ts
+++ b/src/generators/server-side-rendering/visitors/Element.ts
@@ -68,8 +68,6 @@ export default function visitElement(
 
 	if (node.name === 'textarea' && textareaContents !== undefined) {
 		generator.append(textareaContents);
-	} else if (node.name === 'script' || node.name === 'style') {
-		generator.append(escape(node.data));
 	} else {
 		node.children.forEach((child: Node) => {
 			visit(generator, block, child);
diff --git a/src/generators/server-side-rendering/visitors/Text.ts b/src/generators/server-side-rendering/visitors/Text.ts
index 44b1665b2b..4d305f73da 100644
--- a/src/generators/server-side-rendering/visitors/Text.ts
+++ b/src/generators/server-side-rendering/visitors/Text.ts
@@ -8,5 +8,14 @@ export default function visitText(
 	block: Block,
 	node: Node
 ) {
-	generator.append(escapeHTML(escape(node.data).replace(/(\${|`|\\)/g, '\\$1')));
+	let text = escape(node.data).replace(/(\${|`|\\)/g, '\\$1');
+	if (
+		!node.parent ||
+		node.parent.type !== 'Element' ||
+		(node.parent.name !== 'script' && node.parent.name !== 'style')
+	) {
+		// unless this Text node is inside a <script> or <style> element, escape &,<,>
+		text = escapeHTML(text);
+	}
+	generator.append(text);
 }
diff --git a/src/parse/state/tag.ts b/src/parse/state/tag.ts
index a659dc6d3d..8b701cae1d 100644
--- a/src/parse/state/tag.ts
+++ b/src/parse/state/tag.ts
@@ -224,10 +224,22 @@ export default function tag(parser: Parser) {
 		);
 		parser.read(/<\/textarea>/);
 		element.end = parser.index;
-	} else if (name === 'script' || name === 'style') {
+	} else if (name === 'script') {
 		// special case
-		element.data = parser.readUntil(new RegExp(`</${name}>`));
-		parser.eat(`</${name}>`, true);
+		const start = parser.index;
+		const data = parser.readUntil(/<\/script>/);
+		const end = parser.index;
+		element.children.push({ start, end, type: 'Text', data });
+		parser.eat('</script>', true);
+		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;
 	} else {
 		parser.stack.push(element);

From 9d2ccbb43310500b59ff193681f4bee9680410ac Mon Sep 17 00:00:00 2001
From: Conduitry <git@fur.army>
Date: Thu, 8 Feb 2018 14:18:39 -0500
Subject: [PATCH 4/7] add test

---
 .../non-root-style-interpolation/_config.js   | 28 +++++++++++++++++++
 .../non-root-style-interpolation/main.html    | 20 +++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 test/runtime/samples/non-root-style-interpolation/_config.js
 create mode 100644 test/runtime/samples/non-root-style-interpolation/main.html

diff --git a/test/runtime/samples/non-root-style-interpolation/_config.js b/test/runtime/samples/non-root-style-interpolation/_config.js
new file mode 100644
index 0000000000..a5d963e897
--- /dev/null
+++ b/test/runtime/samples/non-root-style-interpolation/_config.js
@@ -0,0 +1,28 @@
+export default {
+	data: {
+		color: 'red',
+	},
+
+	html: `
+		<div>
+			<style>
+			/* something with < and > */
+				div {
+					color: blue;
+				}
+			</style>
+			foo
+		</div>
+
+		<div>
+			<div>
+				<style>
+					div > div {
+						color: red;
+					}
+				</style>
+				foo
+			</div>
+		</div>
+	`,
+};
diff --git a/test/runtime/samples/non-root-style-interpolation/main.html b/test/runtime/samples/non-root-style-interpolation/main.html
new file mode 100644
index 0000000000..107c5e89ae
--- /dev/null
+++ b/test/runtime/samples/non-root-style-interpolation/main.html
@@ -0,0 +1,20 @@
+<div>
+	<style>
+	/* something with < and > */
+		div {
+			color: blue;
+		}
+	</style>
+	foo
+</div>
+
+<div>
+	<div>
+		<style>
+			div > div {
+				color: {{color}};
+			}
+		</style>
+		foo
+	</div>
+</div>

From bef0f9b0c75e9f2fce96b213cf5515c0acb49c10 Mon Sep 17 00:00:00 2001
From: Conduitry <git@fur.army>
Date: Thu, 8 Feb 2018 14:29:38 -0500
Subject: [PATCH 5/7] make test more robust

---
 .../non-root-style-interpolation/_config.js   | 21 +++++++++++++++++++
 .../non-root-style-interpolation/main.html    | 21 +++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/test/runtime/samples/non-root-style-interpolation/_config.js b/test/runtime/samples/non-root-style-interpolation/_config.js
index a5d963e897..3585e61f0b 100644
--- a/test/runtime/samples/non-root-style-interpolation/_config.js
+++ b/test/runtime/samples/non-root-style-interpolation/_config.js
@@ -14,6 +14,27 @@ export default {
 			foo
 		</div>
 
+		<div>
+			<div>
+				<style>
+					div > div {
+						color: blue;
+					}
+				</style>
+				foo
+			</div>
+		</div>
+
+		<div>
+			<style>
+			/* something with < and > */
+				div {
+					color: red;
+				}
+			</style>
+			foo
+		</div>
+
 		<div>
 			<div>
 				<style>
diff --git a/test/runtime/samples/non-root-style-interpolation/main.html b/test/runtime/samples/non-root-style-interpolation/main.html
index 107c5e89ae..804d2a3ef2 100644
--- a/test/runtime/samples/non-root-style-interpolation/main.html
+++ b/test/runtime/samples/non-root-style-interpolation/main.html
@@ -8,6 +8,27 @@
 	foo
 </div>
 
+<div>
+	<div>
+		<style>
+			div > div {
+				color: blue;
+			}
+		</style>
+		foo
+	</div>
+</div>
+
+<div>
+	<style>
+	/* something with < and > */
+		div {
+			color: {{color}};
+		}
+	</style>
+	foo
+</div>
+
 <div>
 	<div>
 		<style>

From e4edfb3cf93521f0caf31bbf0fc972b82bda6188 Mon Sep 17 00:00:00 2001
From: Conduitry <git@fur.army>
Date: Thu, 8 Feb 2018 19:31:42 -0500
Subject: [PATCH 6/7] simplify toHTML by relying on node.parent

---
 src/generators/nodes/Element.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/generators/nodes/Element.ts b/src/generators/nodes/Element.ts
index b1bd650bf7..c70f22b447 100644
--- a/src/generators/nodes/Element.ts
+++ b/src/generators/nodes/Element.ts
@@ -232,7 +232,7 @@ export default class Element extends Node {
 				);
 			} else {
 				block.builders.create.addLine(
-					`${name}.innerHTML = ${stringify(this.children.map(node => toHTML(node, false)).join(''))};`
+					`${name}.innerHTML = ${stringify(this.children.map(toHTML).join(''))};`
 				);
 			}
 		} else {
@@ -414,9 +414,13 @@ export default class Element extends Node {
 			);
 		}
 
-		function toHTML(node: Element | Text, dontEscapeText: Boolean) {
+		function toHTML(node: Element | Text) {
 			if (node.type === 'Text') {
-				return dontEscapeText ? node.data : escapeHTML(node.data);
+				return node.parent &&
+					node.parent.type === 'Element' &&
+					(node.parent.name === 'script' || node.parent.name === 'style')
+					? node.data
+					: escapeHTML(node.data);
 			}
 
 			let open = `<${node.name}`;
@@ -435,9 +439,7 @@ export default class Element extends Node {
 
 			if (isVoidElementName(node.name)) return open + '>';
 
-			const shouldNotEscapeText = node.name === 'script' || node.name === 'style';
-
-			return `${open}>${node.children.map(node => toHTML(node, shouldNotEscapeText)).join('')}</${node.name}>`;
+			return `${open}>${node.children.map(toHTML).join('')}</${node.name}>`;
 		}
 	}
 

From 68b3b261662f87d4c1e1d54db577e6a7a3b292e1 Mon Sep 17 00:00:00 2001
From: Conduitry <git@fur.army>
Date: Fri, 9 Feb 2018 08:25:04 -0500
Subject: [PATCH 7/7] do not escape html characters in tags in non-root <style>
 in SSR mode

---
 .../server-side-rendering/visitors/MustacheTag.ts         | 8 +++++++-
 .../samples/non-root-style-interpolation/_config.js       | 7 +++++--
 .../samples/non-root-style-interpolation/main.html        | 6 ++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/generators/server-side-rendering/visitors/MustacheTag.ts b/src/generators/server-side-rendering/visitors/MustacheTag.ts
index 29fa7aa083..795e78dd33 100644
--- a/src/generators/server-side-rendering/visitors/MustacheTag.ts
+++ b/src/generators/server-side-rendering/visitors/MustacheTag.ts
@@ -10,5 +10,11 @@ export default function visitMustacheTag(
 	block.contextualise(node.expression);
 	const { snippet } = node.metadata;
 
-	generator.append('${__escape(' + snippet + ')}');
+	generator.append(
+		node.parent &&
+		node.parent.type === 'Element' &&
+		node.parent.name === 'style'
+			? '${' + snippet + '}'
+			: '${__escape(' + snippet + ')}'
+	);
 }
diff --git a/test/runtime/samples/non-root-style-interpolation/_config.js b/test/runtime/samples/non-root-style-interpolation/_config.js
index 3585e61f0b..01cefdd67e 100644
--- a/test/runtime/samples/non-root-style-interpolation/_config.js
+++ b/test/runtime/samples/non-root-style-interpolation/_config.js
@@ -1,12 +1,13 @@
 export default {
 	data: {
 		color: 'red',
+		foo: '/* < & > */',
 	},
 
 	html: `
 		<div>
 			<style>
-			/* something with < and > */
+				/* something with < and > */
 				div {
 					color: blue;
 				}
@@ -27,7 +28,8 @@ export default {
 
 		<div>
 			<style>
-			/* something with < and > */
+				/* something with < and > */
+				/* < & > */
 				div {
 					color: red;
 				}
@@ -38,6 +40,7 @@ export default {
 		<div>
 			<div>
 				<style>
+					/* < & > */
 					div > div {
 						color: red;
 					}
diff --git a/test/runtime/samples/non-root-style-interpolation/main.html b/test/runtime/samples/non-root-style-interpolation/main.html
index 804d2a3ef2..1908f64808 100644
--- a/test/runtime/samples/non-root-style-interpolation/main.html
+++ b/test/runtime/samples/non-root-style-interpolation/main.html
@@ -1,6 +1,6 @@
 <div>
 	<style>
-	/* something with < and > */
+		/* something with < and > */
 		div {
 			color: blue;
 		}
@@ -21,7 +21,8 @@
 
 <div>
 	<style>
-	/* something with < and > */
+		/* something with < and > */
+		{{foo}}
 		div {
 			color: {{color}};
 		}
@@ -32,6 +33,7 @@
 <div>
 	<div>
 		<style>
+			{{foo}}
 			div > div {
 				color: {{color}};
 			}
