Merge pull request #268 from sveltejs/gh-267

fix apostrophe entity
sveltejs · Jan 25, 2017 · 4cad216 · 4cad216
2 parents 6cde8ff + 6d8543f
commit 4cad216
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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/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
@@ -0,0 +1 @@
+it&#39;s working
diff --git a/test/server-side-rendering/entities/_expected.html 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
@@ -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
@@ -0,0 +1 @@
+{{foo}}