From 8c8f9703a0232c4e66c42a45bce53a1694fdc0a3 Mon Sep 17 00:00:00 2001
From: Conduitry <git@fur.army>
Date: Mon, 8 Jan 2018 07:21:13 -0500
Subject: [PATCH 1/7] in stringified Text nodes, only escape &, <, >

---
 src/utils/stringify.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/utils/stringify.ts b/src/utils/stringify.ts
index b5f982eb1d81..0fb151c16239 100644
--- a/src/utils/stringify.ts
+++ b/src/utils/stringify.ts
@@ -9,13 +9,11 @@ export function escape(data: string, { onlyEscapeAtSymbol = false } = {}) {
 }
 
 const escaped = {
-	'"': '&quot;',
-	"'": '&##39;',
 	'&': '&amp;',
 	'<': '&lt;',
-	'>': '&gt;'
+	'>': '&gt;',
 };
 
 export function escapeHTML(html) {
-	return String(html).replace(/["'&<>]/g, match => escaped[match]);
-}
\ No newline at end of file
+	return String(html).replace(/[&<>]/g, match => escaped[match]);
+}

From 41744e25fc0ff302ec40c32eb74a0935ec11ea1b Mon Sep 17 00:00:00 2001
From: Conduitry <git@fur.army>
Date: Mon, 8 Jan 2018 07:22:40 -0500
Subject: [PATCH 2/7] parse non-top-level <script> and <style> tags as one
 piece of Text

---
 src/parse/state/tag.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/parse/state/tag.ts b/src/parse/state/tag.ts
index dae32bc3df93..0ba2e6363d33 100644
--- a/src/parse/state/tag.ts
+++ b/src/parse/state/tag.ts
@@ -213,6 +213,7 @@ export default function tag(parser: Parser) {
 	parser.eat('>', true);
 
 	if (selfClosing) {
+		// don't push self-closing elements onto the stack
 		element.end = parser.index;
 	} else if (name === 'textarea') {
 		// special case
@@ -223,8 +224,14 @@ export default function tag(parser: Parser) {
 		);
 		parser.read(/<\/textarea>/);
 		element.end = parser.index;
+	} else if (name === 'script' || name === 'style') {
+		// special case
+		const start = parser.index;
+		const data = parser.readUntil(new RegExp(`</${name}>`));
+		const end = parser.index;
+		element.children.push({ start, end, type: 'Text', data });
+		parser.eat(`</${name}>`, true);
 	} else {
-		// don't push self-closing elements onto the stack
 		parser.stack.push(element);
 	}
 }

From c42e6f9d71d3d547247a9494a31dea32e1e1baa1 Mon Sep 17 00:00:00 2001
From: Conduitry <git@fur.army>
Date: Mon, 8 Jan 2018 08:02:49 -0500
Subject: [PATCH 3/7] store <script> and <style> contents on Element node
 itself

---
 src/parse/state/tag.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/parse/state/tag.ts b/src/parse/state/tag.ts
index 0ba2e6363d33..a659dc6d3d76 100644
--- a/src/parse/state/tag.ts
+++ b/src/parse/state/tag.ts
@@ -226,11 +226,9 @@ export default function tag(parser: Parser) {
 		element.end = parser.index;
 	} else if (name === 'script' || name === 'style') {
 		// special case
-		const start = parser.index;
-		const data = parser.readUntil(new RegExp(`</${name}>`));
-		const end = parser.index;
-		element.children.push({ start, end, type: 'Text', data });
+		element.data = parser.readUntil(new RegExp(`</${name}>`));
 		parser.eat(`</${name}>`, true);
+		element.end = parser.index;
 	} else {
 		parser.stack.push(element);
 	}

From 1f229cfed5a73a7b20e5e2eec8d877f8b945e2f3 Mon Sep 17 00:00:00 2001
From: Conduitry <git@fur.army>
Date: Mon, 8 Jan 2018 12:46:14 -0500
Subject: [PATCH 4/7] update SSR rendering of <script> and <style>

---
 src/generators/server-side-rendering/visitors/Element.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/generators/server-side-rendering/visitors/Element.ts b/src/generators/server-side-rendering/visitors/Element.ts
index a1645d0860e2..db728d6e8da3 100644
--- a/src/generators/server-side-rendering/visitors/Element.ts
+++ b/src/generators/server-side-rendering/visitors/Element.ts
@@ -60,6 +60,8 @@ export default function visitElement(
 
 	if (node.name === 'textarea' && textareaContents !== undefined) {
 		generator.append(textareaContents);
+	} else if (node.name === 'script' || node.name === 'style') {
+		generator.append(node.data);
 	} else {
 		node.children.forEach((child: Node) => {
 			visit(generator, block, child);

From 00a0445cc99331a5b61c3a95bb40eeb641e4f421 Mon Sep 17 00:00:00 2001
From: Conduitry <git@fur.army>
Date: Mon, 8 Jan 2018 13:46:29 -0500
Subject: [PATCH 5/7] update DOM rendering of <script> and <style>

---
 src/generators/nodes/Element.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/generators/nodes/Element.ts b/src/generators/nodes/Element.ts
index 5c0ffabf1466..ab9c5b8dc4d9 100644
--- a/src/generators/nodes/Element.ts
+++ b/src/generators/nodes/Element.ts
@@ -432,6 +432,10 @@ 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}>`;
+			}
+
 			return `${open}>${node.children.map(toHTML).join('')}</${node.name}>`;
 		}
 	}
@@ -756,4 +760,4 @@ const events = [
 			node.isMediaNode() &&
 			(name === 'buffered' || name === 'seekable')
 	}
-];
\ No newline at end of file
+];

From fbb856ebbda613fca3fe9109a6bfe7c69dafc687 Mon Sep 17 00:00:00 2001
From: Conduitry <git@fur.army>
Date: Mon, 8 Jan 2018 13:46:41 -0500
Subject: [PATCH 6/7] update test

---
 .../samples/component-data-empty/_actual.html                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/server-side-rendering/samples/component-data-empty/_actual.html b/test/server-side-rendering/samples/component-data-empty/_actual.html
index 55ea8a032c17..85fe1fe73331 100644
--- a/test/server-side-rendering/samples/component-data-empty/_actual.html
+++ b/test/server-side-rendering/samples/component-data-empty/_actual.html
@@ -1,3 +1,3 @@
 <div>
-	<p>foo: &#39;&#39;</p>
+	<p>foo: ''</p>
 </div>
\ No newline at end of file

From f6e6cb6988ed5e6f6d02d0406af17f0a7457cea9 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 8 Jan 2018 21:48:28 -0500
Subject: [PATCH 7/7] add test to ensure only <, > and & are escaped

---
 .../samples/html-non-entities-inside-elements/_config.js     | 5 +++++
 .../samples/html-non-entities-inside-elements/main.html      | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 test/runtime/samples/html-non-entities-inside-elements/_config.js
 create mode 100644 test/runtime/samples/html-non-entities-inside-elements/main.html

diff --git a/test/runtime/samples/html-non-entities-inside-elements/_config.js b/test/runtime/samples/html-non-entities-inside-elements/_config.js
new file mode 100644
index 000000000000..bc217d6d020c
--- /dev/null
+++ b/test/runtime/samples/html-non-entities-inside-elements/_config.js
@@ -0,0 +1,5 @@
+export default {
+	html: `
+		<div>'foo'<span/></div>
+	`
+};
\ No newline at end of file
diff --git a/test/runtime/samples/html-non-entities-inside-elements/main.html b/test/runtime/samples/html-non-entities-inside-elements/main.html
new file mode 100644
index 000000000000..7b49c004db8e
--- /dev/null
+++ b/test/runtime/samples/html-non-entities-inside-elements/main.html
@@ -0,0 +1 @@
+<div>'foo'<span/></div>
\ No newline at end of file