svelte 4.2.11 → 4.2.13

package/README.md

@@ -14,7 +14,7 @@ Learn more at the [Svelte website](https://svelte.dev), or stop by the [Discord
 
 You can play around with Svelte in the [tutorial](https://learn.svelte.dev/), [examples](https://svelte.dev/examples), and [REPL](https://svelte.dev/repl).
 
-When you're ready to build a full-fledge application, we recommend using [SvelteKit](https://kit.svelte.dev):
+When you're ready to build a full-fledged application, we recommend using [SvelteKit](https://kit.svelte.dev):
 
 ```bash
 npm create svelte@latest my-app

package/compiler.cjs

@@ -35503,14 +35503,13 @@ class InlineComponentWrapper extends Wrapper {
 						// statements will become switch_props function body
 						// rewrite last statement, add props update logic
 						statements[statements.length - 1] = b$1`
+							for (let #i = 0; #i < ${levels}.length; #i += 1) {
+								${props} = @assign(${props}, ${levels}[#i]);
+							}
 							if (#dirty !== undefined && ${condition}) {
-								${props} = @get_spread_update(${levels}, [
+								${props} = @assign(${props}, @get_spread_update(${levels}, [
 									${changes}
-								]);
-							} else {
-								for (let #i = 0; #i < ${levels}.length; #i += 1) {
-									${props} = @assign(${props}, ${levels}[#i]);
-								}
+								]));
 							}
 						`;
 					}
@@ -42391,14 +42390,17 @@ function apply_selector(blocks, node, to_encapsulate) {
 			}
 			return false;
 		} else if (block.combinator.name === '+' || block.combinator.name === '~') {
-			const siblings = get_possible_element_siblings(node, block.combinator.name === '+');
+			const [siblings, has_slot_sibling] = get_possible_element_siblings(
+				node,
+				block.combinator.name === '+'
+			);
 			let has_match = false;
 			// NOTE: if we have :global(), we couldn't figure out what is selected within `:global` due to the
 			// css-tree limitation that does not parse the inner selector of :global
 			// so unless we are sure there will be no sibling to match, we will consider it as matched
 			const has_global = blocks.some((block) => block.global);
 			if (has_global) {
-				if (siblings.size === 0 && get_element_parent(node) !== null) {
+				if (siblings.size === 0 && get_element_parent(node) !== null && !has_slot_sibling) {
 					return false;
 				}
 				to_encapsulate.push({ node, block });
@@ -42642,13 +42644,15 @@ function get_element_parent(node) {
  * <h1>Heading 1</h1>
  * <h2>Heading 2</h2>
  * @param {import('../nodes/interfaces.js').INode} node
- * @returns {import('../nodes/interfaces.js').INode}
+ * @returns {[import('../nodes/interfaces.js').INode, boolean]}
  */
 function find_previous_sibling(node) {
 	/** @type {import('../nodes/interfaces.js').INode} */
 	let current_node = node;
+	let has_slot_sibling = false;
 	do {
 		if (current_node.type === 'Slot') {
+			has_slot_sibling = true;
 			const slot_children = current_node.children;
 			if (slot_children.length > 0) {
 				current_node = slot_children.slice(-1)[0]; // go to its last child first
@@ -42660,13 +42664,13 @@ function find_previous_sibling(node) {
 		}
 		current_node = current_node.prev;
 	} while (current_node && current_node.type === 'Slot');
-	return current_node;
+	return [current_node, has_slot_sibling];
 }
 
 /**
  * @param {import('../nodes/interfaces.js').INode} node
  * @param {boolean} adjacent_only
- * @returns {Map<import('../nodes/Element.js').default, NodeExistsValue>}
+ * @returns {[Map<import('../nodes/Element.js').default, NodeExistsValue>, boolean]}
  */
 function get_possible_element_siblings(node, adjacent_only) {
 	/** @type {Map<import('../nodes/Element.js').default, NodeExistsValue>} */
@@ -42674,7 +42678,10 @@ function get_possible_element_siblings(node, adjacent_only) {
 
 	/** @type {import('../nodes/interfaces.js').INode} */
 	let prev = node;
-	while ((prev = find_previous_sibling(prev))) {
+	let has_slot_sibling = false;
+	let slot_sibling_found = false;
+	while (([prev, slot_sibling_found] = find_previous_sibling(prev)) && prev) {
+		has_slot_sibling = has_slot_sibling || slot_sibling_found;
 		if (prev.type === 'Element') {
 			if (
 				!prev.attributes.find(
@@ -42690,7 +42697,7 @@ function get_possible_element_siblings(node, adjacent_only) {
 			const possible_last_child = get_possible_last_child(prev, adjacent_only);
 			add_to_map(possible_last_child, result);
 			if (adjacent_only && has_definite_elements(possible_last_child)) {
-				return result;
+				return [result, has_slot_sibling];
 			}
 		}
 	}
@@ -42705,7 +42712,11 @@ function get_possible_element_siblings(node, adjacent_only) {
 				parent.type === 'ElseBlock' ||
 				parent.type === 'AwaitBlock')
 		) {
-			const possible_siblings = get_possible_element_siblings(parent, adjacent_only);
+			const [possible_siblings, slot_sibling_found] = get_possible_element_siblings(
+				parent,
+				adjacent_only
+			);
+			has_slot_sibling = has_slot_sibling || slot_sibling_found;
 			add_to_map(possible_siblings, result);
 			if (parent.type === 'EachBlock') {
 				// first child of each block can select the last child of each block as previous sibling
@@ -42723,7 +42734,7 @@ function get_possible_element_siblings(node, adjacent_only) {
 			}
 		}
 	}
-	return result;
+	return [result, has_slot_sibling];
 }
 
 /**
@@ -43596,7 +43607,7 @@ function is_used_as_reference(node, parent) {
  * https://svelte.dev/docs/svelte-compiler#svelte-version
  * @type {string}
  */
-const VERSION = '4.2.11';
+const VERSION = '4.2.13';
 
 const regex_leading_directory_separator = /^[/\\]/;
 const regex_starts_with_term_export = /^Export/;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "4.2.11",
+  "version": "4.2.13",
   "description": "Cybernetically enhanced web apps",
   "type": "module",
   "module": "src/runtime/index.js",

package/src/compiler/compile/css/Selector.js

@@ -291,14 +291,17 @@ function apply_selector(blocks, node, to_encapsulate) {
 			}
 			return false;
 		} else if (block.combinator.name === '+' || block.combinator.name === '~') {
-			const siblings = get_possible_element_siblings(node, block.combinator.name === '+');
+			const [siblings, has_slot_sibling] = get_possible_element_siblings(
+				node,
+				block.combinator.name === '+'
+			);
 			let has_match = false;
 			// NOTE: if we have :global(), we couldn't figure out what is selected within `:global` due to the
 			// css-tree limitation that does not parse the inner selector of :global
 			// so unless we are sure there will be no sibling to match, we will consider it as matched
 			const has_global = blocks.some((block) => block.global);
 			if (has_global) {
-				if (siblings.size === 0 && get_element_parent(node) !== null) {
+				if (siblings.size === 0 && get_element_parent(node) !== null && !has_slot_sibling) {
 					return false;
 				}
 				to_encapsulate.push({ node, block });
@@ -542,13 +545,15 @@ function get_element_parent(node) {
  * <h1>Heading 1</h1>
  * <h2>Heading 2</h2>
  * @param {import('../nodes/interfaces.js').INode} node
- * @returns {import('../nodes/interfaces.js').INode}
+ * @returns {[import('../nodes/interfaces.js').INode, boolean]}
  */
 function find_previous_sibling(node) {
 	/** @type {import('../nodes/interfaces.js').INode} */
 	let current_node = node;
+	let has_slot_sibling = false;
 	do {
 		if (current_node.type === 'Slot') {
+			has_slot_sibling = true;
 			const slot_children = current_node.children;
 			if (slot_children.length > 0) {
 				current_node = slot_children.slice(-1)[0]; // go to its last child first
@@ -560,13 +565,13 @@ function find_previous_sibling(node) {
 		}
 		current_node = current_node.prev;
 	} while (current_node && current_node.type === 'Slot');
-	return current_node;
+	return [current_node, has_slot_sibling];
 }
 
 /**
  * @param {import('../nodes/interfaces.js').INode} node
  * @param {boolean} adjacent_only
- * @returns {Map<import('../nodes/Element.js').default, NodeExistsValue>}
+ * @returns {[Map<import('../nodes/Element.js').default, NodeExistsValue>, boolean]}
  */
 function get_possible_element_siblings(node, adjacent_only) {
 	/** @type {Map<import('../nodes/Element.js').default, NodeExistsValue>} */
@@ -574,7 +579,10 @@ function get_possible_element_siblings(node, adjacent_only) {
 
 	/** @type {import('../nodes/interfaces.js').INode} */
 	let prev = node;
-	while ((prev = find_previous_sibling(prev))) {
+	let has_slot_sibling = false;
+	let slot_sibling_found = false;
+	while (([prev, slot_sibling_found] = find_previous_sibling(prev)) && prev) {
+		has_slot_sibling = has_slot_sibling || slot_sibling_found;
 		if (prev.type === 'Element') {
 			if (
 				!prev.attributes.find(
@@ -590,7 +598,7 @@ function get_possible_element_siblings(node, adjacent_only) {
 			const possible_last_child = get_possible_last_child(prev, adjacent_only);
 			add_to_map(possible_last_child, result);
 			if (adjacent_only && has_definite_elements(possible_last_child)) {
-				return result;
+				return [result, has_slot_sibling];
 			}
 		}
 	}
@@ -605,7 +613,11 @@ function get_possible_element_siblings(node, adjacent_only) {
 				parent.type === 'ElseBlock' ||
 				parent.type === 'AwaitBlock')
 		) {
-			const possible_siblings = get_possible_element_siblings(parent, adjacent_only);
+			const [possible_siblings, slot_sibling_found] = get_possible_element_siblings(
+				parent,
+				adjacent_only
+			);
+			has_slot_sibling = has_slot_sibling || slot_sibling_found;
 			add_to_map(possible_siblings, result);
 			if (parent.type === 'EachBlock') {
 				// first child of each block can select the last child of each block as previous sibling
@@ -623,7 +635,7 @@ function get_possible_element_siblings(node, adjacent_only) {
 			}
 		}
 	}
-	return result;
+	return [result, has_slot_sibling];
 }
 
 /**

package/src/compiler/compile/render_dom/wrappers/InlineComponent/index.js

@@ -277,14 +277,13 @@ export default class InlineComponentWrapper extends Wrapper {
 						// statements will become switch_props function body
 						// rewrite last statement, add props update logic
 						statements[statements.length - 1] = b`
+							for (let #i = 0; #i < ${levels}.length; #i += 1) {
+								${props} = @assign(${props}, ${levels}[#i]);
+							}
 							if (#dirty !== undefined && ${condition}) {
-								${props} = @get_spread_update(${levels}, [
+								${props} = @assign(${props}, @get_spread_update(${levels}, [
 									${changes}
-								]);
-							} else {
-								for (let #i = 0; #i < ${levels}.length; #i += 1) {
-									${props} = @assign(${props}, ${levels}[#i]);
-								}
+								]));
 							}
 						`;
 					}

package/src/shared/version.js

@@ -6,5 +6,5 @@
  * https://svelte.dev/docs/svelte-compiler#svelte-version
  * @type {string}
  */
-export const VERSION = '4.2.11';
+export const VERSION = '4.2.13';
 export const PUBLIC_VERSION = '4';