From 6d8543f6ed6a8fce5d568b5b47ae73c86ef799a7 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Wed, 25 Jan 2017 18:16:18 -0500
Subject: [PATCH] fix apostrophe entity (#267)

---
 src/generators/server-side-rendering/index.js                  | 2 +-
 test/server-side-rendering/dynamic-text-escaped/_actual.html   | 2 +-
 test/server-side-rendering/dynamic-text-escaped/_expected.html | 2 +-
 test/server-side-rendering/entities/_actual.html               | 1 +
 test/server-side-rendering/entities/_expected.html             | 1 +
 test/server-side-rendering/entities/data.json                  | 3 +++
 test/server-side-rendering/entities/main.html                  | 1 +
 7 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 test/server-side-rendering/entities/_actual.html
 create mode 100644 test/server-side-rendering/entities/_expected.html
 create mode 100644 test/server-side-rendering/entities/data.json
 create mode 100644 test/server-side-rendering/entities/main.html

diff --git a/src/generators/server-side-rendering/index.js b/src/generators/server-side-rendering/index.js
index d74c720036bb..3187622f79ef 100644
--- a/src/generators/server-side-rendering/index.js
+++ b/src/generators/server-side-rendering/index.js
@@ -112,7 +112,7 @@ export default function ssr ( parsed, source, options, names ) {
 
 		var escaped = {
 			'"': '&quot;',
-			"'": '&39;',
+			"'": '&#39;',
 			'&': '&amp;',
 			'<': '&lt;',
 			'>': '&gt;'
diff --git a/test/server-side-rendering/dynamic-text-escaped/_actual.html b/test/server-side-rendering/dynamic-text-escaped/_actual.html
index 467e5de3d15b..cd875b439ed7 100644
--- a/test/server-side-rendering/dynamic-text-escaped/_actual.html
+++ b/test/server-side-rendering/dynamic-text-escaped/_actual.html
@@ -1 +1 @@
-&lt;p&gt;this should be &lt;em&gt;escaped&lt;/em&gt; &amp; so should &39;this&39;&lt;/p&gt;
\ No newline at end of file
+&lt;p&gt;this should be &lt;em&gt;escaped&lt;/em&gt; &amp; so should &#39;this&#39;&lt;/p&gt;
\ No newline at end of file
diff --git a/test/server-side-rendering/dynamic-text-escaped/_expected.html b/test/server-side-rendering/dynamic-text-escaped/_expected.html
index 080992cfd2c8..20f85b71beff 100644
--- a/test/server-side-rendering/dynamic-text-escaped/_expected.html
+++ b/test/server-side-rendering/dynamic-text-escaped/_expected.html
@@ -1 +1 @@
-&lt;p&gt;this should be &lt;em&gt;escaped&lt;/em&gt; &amp; so should &39;this&39;&lt;/p&gt;
+&lt;p&gt;this should be &lt;em&gt;escaped&lt;/em&gt; &amp; so should &#39;this&#39;&lt;/p&gt;
diff --git a/test/server-side-rendering/entities/_actual.html b/test/server-side-rendering/entities/_actual.html
new file mode 100644
index 000000000000..a7d44dafd3d3
--- /dev/null
+++ b/test/server-side-rendering/entities/_actual.html
@@ -0,0 +1 @@
+it&#39;s working
\ No newline at end of file
diff --git a/test/server-side-rendering/entities/_expected.html b/test/server-side-rendering/entities/_expected.html
new file mode 100644
index 000000000000..852764fc3f35
--- /dev/null
+++ b/test/server-side-rendering/entities/_expected.html
@@ -0,0 +1 @@
+it's working
diff --git a/test/server-side-rendering/entities/data.json b/test/server-side-rendering/entities/data.json
new file mode 100644
index 000000000000..fb52b739cf7d
--- /dev/null
+++ b/test/server-side-rendering/entities/data.json
@@ -0,0 +1,3 @@
+{
+	"foo": "it's working"
+}
diff --git a/test/server-side-rendering/entities/main.html b/test/server-side-rendering/entities/main.html
new file mode 100644
index 000000000000..054e96cb810f
--- /dev/null
+++ b/test/server-side-rendering/entities/main.html
@@ -0,0 +1 @@
+{{foo}}