From f8362fe5fb1ca86521970123aa2b024ec482c086 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sun, 24 Dec 2017 11:18:46 -0500
Subject: [PATCH] fix toString method in SSR output - closes #1044

---
 src/generators/server-side-rendering/index.ts          | 2 +-
 test/js/samples/ssr-no-oncreate-etc/expected-bundle.js | 2 +-
 test/js/samples/ssr-no-oncreate-etc/expected.js        | 2 +-
 test/server-side-rendering/index.js                    | 6 +++++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/generators/server-side-rendering/index.ts b/src/generators/server-side-rendering/index.ts
index 827d5720e1..85118ef5fb 100644
--- a/src/generators/server-side-rendering/index.ts
+++ b/src/generators/server-side-rendering/index.ts
@@ -124,7 +124,7 @@ export default function ssr(
 				head: result.head,
 				css: { code: cssCode, map: null },
 				toString() {
-					return result.html;
+					return html;
 				}
 			};
 		}
diff --git a/test/js/samples/ssr-no-oncreate-etc/expected-bundle.js b/test/js/samples/ssr-no-oncreate-etc/expected-bundle.js
index 42f630e0e9..42c2006f75 100644
--- a/test/js/samples/ssr-no-oncreate-etc/expected-bundle.js
+++ b/test/js/samples/ssr-no-oncreate-etc/expected-bundle.js
@@ -25,7 +25,7 @@ SvelteComponent.render = function(state, options = {}) {
 		head: result.head,
 		css: { code: cssCode, map: null },
 		toString() {
-			return result.html;
+			return html;
 		}
 	};
 };
diff --git a/test/js/samples/ssr-no-oncreate-etc/expected.js b/test/js/samples/ssr-no-oncreate-etc/expected.js
index 7168662072..d9b616e763 100644
--- a/test/js/samples/ssr-no-oncreate-etc/expected.js
+++ b/test/js/samples/ssr-no-oncreate-etc/expected.js
@@ -27,7 +27,7 @@ SvelteComponent.render = function(state, options = {}) {
 		head: result.head,
 		css: { code: cssCode, map: null },
 		toString() {
-			return result.html;
+			return html;
 		}
 	};
 }
diff --git a/test/server-side-rendering/index.js b/test/server-side-rendering/index.js
index 5682779703..019c452c2f 100644
--- a/test/server-side-rendering/index.js
+++ b/test/server-side-rendering/index.js
@@ -59,7 +59,11 @@ describe("ssr", () => {
 
 				const data = tryToLoadJson(`${dir}/data.json`);
 
-				const { html, css, head } = component.render(data);
+				const rendered = component.render(data);
+				const { html, css, head } = rendered;
+
+				// rendered.toString() === rendered.html
+				assert.equal(rendered, html);
 
 				fs.writeFileSync(`${dir}/_actual.html`, html);
 				if (css.code) fs.writeFileSync(`${dir}/_actual.css`, css.code);