WIP fix for sveltejs#4731: preserveWhitespace in SSR

bwbroersma · Apr 28, 2020 · 33d8a65 · 33d8a65
1 parent e3fef0f
commit 33d8a65
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 3 deletions.
diff --git a/src/compiler/compile/render_ssr/handlers/Element.ts b/src/compiler/compile/render_ssr/handlers/Element.ts
@@ -12,7 +12,11 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
 	slot_scopes: Map<any, any>;
 }) {
 
-	const children = remove_whitespace_children(node.children, node.next);
+	const children = (
+		options.preserveWhitespace
+			? node.children
+			: remove_whitespace_children(node.children, node.next)
+	);
 
 	// awkward special case
 	let node_contents;

diff --git a/src/compiler/compile/render_ssr/handlers/InlineComponent.ts b/src/compiler/compile/render_ssr/handlers/InlineComponent.ts
@@ -68,7 +68,11 @@ export default function(node: InlineComponent, renderer: Renderer, options: Rend
 
 	const slot_fns = [];
 
-	const children = remove_whitespace_children(node.children, node.next);
+	const children = (
+		options.preserveWhitespace
+			? node.children
+			: remove_whitespace_children(node.children, node.next)
+	);
 
 	if (children.length) {
 		const slot_scopes = new Map();

diff --git a/src/compiler/compile/render_ssr/index.ts b/src/compiler/compile/render_ssr/index.ts
@@ -18,8 +18,14 @@ export default function ssr(
 
 	const { name } = component;
 
+	const children = (
+		options.preserveWhitespace
+			? component.fragment.children
+			: trim(component.fragment.children)
+	);
+
 	// create $$render function
-	renderer.render(trim(component.fragment.children), Object.assign({
+	renderer.render(children, Object.assign({
 		locate: component.locate
 	}, options));
 

diff --git a/test/server-side-rendering/samples/preserve-whitespace/_config.js b/test/server-side-rendering/samples/preserve-whitespace/_config.js
@@ -0,0 +1,5 @@
+export default {
+	compileOptions: {
+		preserveWhitespace: true
+	}
+};
diff --git a/test/server-side-rendering/samples/preserve-whitespace/_expected.html b/test/server-side-rendering/samples/preserve-whitespace/_expected.html
@@ -0,0 +1,11 @@
+
+<div>
+    <div>
+        <p> Some text </p>
+    </div>
+    <select>
+        <option value="1">1</option>
+        <option value="2">2</option>
+    </select>
+</div>
+
diff --git a/test/server-side-rendering/samples/preserve-whitespace/main.svelte b/test/server-side-rendering/samples/preserve-whitespace/main.svelte
@@ -0,0 +1,11 @@
+
+<div>
+    <div>
+        <p> Some text </p>
+    </div>
+    <select>
+        <option value="1">1</option>
+        <option value="2">2</option>
+    </select>
+</div>
+