From e3d66869df5b75b81da6183c5d68cde53b2439aa Mon Sep 17 00:00:00 2001
From: Jesse Skinner <jesse@thefutureoftheweb.com>
Date: Mon, 13 Jan 2020 11:24:34 -0500
Subject: [PATCH] fix stringifying of attributes in presence of spread in SSR
 (#4247)

---
 src/runtime/internal/ssr.ts                          |  4 +---
 .../spread-attributes-white-space/_expected.html     |  8 ++++++++
 .../spread-attributes-white-space/main.svelte        | 12 ++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 test/server-side-rendering/samples/spread-attributes-white-space/_expected.html
 create mode 100644 test/server-side-rendering/samples/spread-attributes-white-space/main.svelte

diff --git a/src/runtime/internal/ssr.ts b/src/runtime/internal/ssr.ts
index b032284d52..646a81d817 100644
--- a/src/runtime/internal/ssr.ts
+++ b/src/runtime/internal/ssr.ts
@@ -25,9 +25,7 @@ export function spread(args, classes_to_add) {
 		else if (boolean_attributes.has(name.toLowerCase())) {
 			if (value) str += " " + name;
 		} else if (value != null) {
-			str += " " + name + "=" + JSON.stringify(String(value)
-				.replace(/"/g, '&#34;')
-				.replace(/'/g, '&#39;'));
+			str += ` ${name}="${String(value).replace(/"/g, '&#34;').replace(/'/g, '&#39;')}"`;
 		}
 	});
 
diff --git a/test/server-side-rendering/samples/spread-attributes-white-space/_expected.html b/test/server-side-rendering/samples/spread-attributes-white-space/_expected.html
new file mode 100644
index 0000000000..a73bb17e8c
--- /dev/null
+++ b/test/server-side-rendering/samples/spread-attributes-white-space/_expected.html
@@ -0,0 +1,8 @@
+<input value="
+	bar
+">
+
+<input class="
+	white
+	space
+">
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/spread-attributes-white-space/main.svelte b/test/server-side-rendering/samples/spread-attributes-white-space/main.svelte
new file mode 100644
index 0000000000..6919d9ea54
--- /dev/null
+++ b/test/server-side-rendering/samples/spread-attributes-white-space/main.svelte
@@ -0,0 +1,12 @@
+<script>
+	let props = {
+		value: '\n\tbar\n',
+	};
+</script>
+
+<input {...props} />
+
+<input class="
+	white
+	space
+" {...({})}>