merge

Author: Rich-Harris

packages/svelte/src/compiler/phases/3-transform/client/visitors/IfBlock.js

@@ -16,10 +16,17 @@ export function IfBlock(node, context) {
 
 	// compile to if rather than $.if for non-reactive if statements
 	// NOTE: doesn't handle else/elseif yet or mismatches. also, this probably breaks transition locality
-	if (!node.metadata.expression.has_state && !(node.alternate || node.elseif)) {
+	if (!node.metadata.expression.has_state && !node.elseif) {
 		state.init.push(
-			b.stmt(b.call('$.next')),
-			b.if(node.test, b.block([b.let(b.id('$$anchor'), state.node), ...consequent.body]))
+			b.block([
+				b.let(b.id('$$anchor'), state.node),
+				b.stmt(b.call('$.next')),
+				b.if(
+					node.test,
+					consequent,
+					node.alternate ? /** @type {BlockStatement} */ (context.visit(node.alternate)) : undefined
+				)
+			])
 		);
 
 		return;

packages/svelte/tests/snapshot/samples/non-reactive-control-structures/_expected/client/index.svelte.js

@@ -1,21 +1,24 @@
 import "svelte/internal/disclose-version";
 import * as $ from "svelte/internal/client";
 
-var root = $.template(`<!> <!>`, 1);
+var root = $.template(`<!> <!> <!>`, 1);
 
 export default function Non_reactive_control_structures($$anchor) {
 	const a = true;
 	let b = true;
 	var fragment = root();
 	var node = $.first_child(fragment);
 
-	$.next();
-
-	if (a) {
+	{
 		let $$anchor = node;
-		var text = $.text("hello");
 
-		$.append($$anchor, text);
+		$.next();
+
+		if (a) {
+			var text = $.text("hello");
+
+			$.append($$anchor, text);
+		}
 	}
 
 	var node_1 = $.sibling(node, 2);
@@ -26,5 +29,23 @@ export default function Non_reactive_control_structures($$anchor) {
 		$.append($$anchor, text_1);
 	});
 
+	var node_2 = $.sibling(node_1, 2);
+
+	{
+		let $$anchor = node_2;
+
+		$.next();
+
+		if (a) {
+			var text_2 = $.text("hi");
+
+			$.append($$anchor, text_2);
+		} else {
+			var text_3 = $.text("earth");
+
+			$.append($$anchor, text_3);
+		}
+	}
+
 	$.append($$anchor, fragment);
 }

packages/svelte/tests/snapshot/samples/non-reactive-control-structures/_expected/server/index.svelte.js

@@ -20,5 +20,15 @@ export default function Non_reactive_control_structures($$payload) {
 		$$payload.out += "<!--[!-->";
 	}
 
+	$$payload.out += `<!--]--> `;
+
+	if (a) {
+		$$payload.out += "<!--[-->";
+		$$payload.out += `hi`;
+	} else {
+		$$payload.out += "<!--[!-->";
+		$$payload.out += `earth`;
+	}
+
 	$$payload.out += `<!--]-->`;
 }

packages/svelte/tests/snapshot/samples/non-reactive-control-structures/index.svelte

@@ -12,3 +12,9 @@
 {#if b}
   world
 {/if}
+
+{#if a}
+  hi
+{:else}
+	earth
+{/if}