Merge pull request #1046 from sveltejs/gh-1044

fix toString method in SSR output
sveltejs · Dec 24, 2017 · 8472142 · 8472142
2 parents 4202c56 + f8362fe
commit 8472142
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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);