From 6476e9b34fa1bf8510082191f5c067c1fa25b3f1 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Thu, 2 Mar 2023 16:57:36 +0100
Subject: [PATCH 01/30] fix: add visibility event to types

---
 elements/index.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/elements/index.d.ts b/elements/index.d.ts
index 99476593da..d2de6767ff 100644
--- a/elements/index.d.ts
+++ b/elements/index.d.ts
@@ -196,6 +196,9 @@ export interface DOMAttributes<T extends EventTarget> {
 	// Message Events
 	'on:message'?: MessageEventHandler<T> | undefined | null;
 	'on:messageerror'?: MessageEventHandler<T> | undefined | null;
+	
+	// Document Events
+	'on:visibilitychange'?: EventHandler<Event, T> | undefined | null;
 
 	// Global Events
 	'on:cancel'?: EventHandler<Event, T> | undefined | null;

From 0966d1d282b04cec6f3b0d34a4ba73dae2d08d56 Mon Sep 17 00:00:00 2001
From: Tan Li Hau <tanhauhau@users.noreply.github.com>
Date: Fri, 3 Mar 2023 02:57:38 +0800
Subject: [PATCH 02/30] feat: improve `bind:group` behavior (#7892)

track all `#each` variables that could result in a change to the inputs and also update the `$$binding_groups` variable which holds the references to the inputs of each group accordingly.

Fixes #7633
Fixes #6112
Fixes #7884
---
 src/compiler/compile/render_dom/Block.ts      |  10 +-
 src/compiler/compile/render_dom/Renderer.ts   |  15 ++-
 .../render_dom/wrappers/Element/Attribute.ts  |  12 ++
 .../render_dom/wrappers/Element/Binding.ts    | 122 +++++++++++-------
 .../render_dom/wrappers/Element/index.ts      |   2 +
 src/runtime/internal/dom.ts                   |  63 +++++++--
 src/runtime/internal/keyed_each.ts            |   7 +-
 .../binding-input-group-each-10/_config.js    |  52 ++++++++
 .../binding-input-group-each-10/main.svelte   |  36 ++++++
 .../binding-input-group-each-11/_config.js    |  88 +++++++++++++
 .../binding-input-group-each-11/main.svelte   |  60 +++++++++
 .../binding-input-group-each-12/_config.js    |  89 +++++++++++++
 .../binding-input-group-each-12/main.svelte   |  60 +++++++++
 .../binding-input-group-each-13/_config.js    |  30 +++++
 .../binding-input-group-each-13/main.svelte   |  10 ++
 .../binding-input-group-each-8/_config.js     |  78 +++++++++++
 .../binding-input-group-each-8/main.svelte    |  36 ++++++
 .../binding-input-group-each-9/_config.js     |  49 +++++++
 .../binding-input-group-each-9/main.svelte    |  36 ++++++
 19 files changed, 791 insertions(+), 64 deletions(-)
 create mode 100644 test/runtime/samples/binding-input-group-each-10/_config.js
 create mode 100644 test/runtime/samples/binding-input-group-each-10/main.svelte
 create mode 100644 test/runtime/samples/binding-input-group-each-11/_config.js
 create mode 100644 test/runtime/samples/binding-input-group-each-11/main.svelte
 create mode 100644 test/runtime/samples/binding-input-group-each-12/_config.js
 create mode 100644 test/runtime/samples/binding-input-group-each-12/main.svelte
 create mode 100644 test/runtime/samples/binding-input-group-each-13/_config.js
 create mode 100644 test/runtime/samples/binding-input-group-each-13/main.svelte
 create mode 100644 test/runtime/samples/binding-input-group-each-8/_config.js
 create mode 100644 test/runtime/samples/binding-input-group-each-8/main.svelte
 create mode 100644 test/runtime/samples/binding-input-group-each-9/_config.js
 create mode 100644 test/runtime/samples/binding-input-group-each-9/main.svelte

diff --git a/src/compiler/compile/render_dom/Block.ts b/src/compiler/compile/render_dom/Block.ts
index 164e938674..c40dedc3b5 100644
--- a/src/compiler/compile/render_dom/Block.ts
+++ b/src/compiler/compile/render_dom/Block.ts
@@ -1,4 +1,4 @@
-import Renderer from './Renderer';
+import Renderer, { BindingGroup } from './Renderer';
 import Wrapper from './wrappers/shared/Wrapper';
 import { b, x } from 'code-red';
 import { Node, Identifier, ArrayPattern } from 'estree';
@@ -40,6 +40,7 @@ export default class Block {
 
 	bindings: Map<string, Bindings>;
 	binding_group_initialised: Set<string> = new Set();
+	binding_groups: Set<BindingGroup> = new Set();
 
 	chunks: {
 		declarations: Array<Node | Node[]>;
@@ -249,6 +250,7 @@ export default class Block {
 			}
 		}
 
+		this.render_binding_groups();
 		this.render_listeners();
 
 		const properties: Record<string, any> = {};
@@ -500,4 +502,10 @@ export default class Block {
 			}
 		}
 	}
+
+	render_binding_groups() {
+		for (const binding_group of this.binding_groups) {
+			binding_group.render();
+		}
+	}
 }
diff --git a/src/compiler/compile/render_dom/Renderer.ts b/src/compiler/compile/render_dom/Renderer.ts
index c00ef95586..ad2d1b092f 100644
--- a/src/compiler/compile/render_dom/Renderer.ts
+++ b/src/compiler/compile/render_dom/Renderer.ts
@@ -22,6 +22,15 @@ type BitMasks = Array<{
 	names: string[];
 }>;
 
+export interface BindingGroup {
+	binding_group: (to_reference?: boolean) => Node;
+	contexts: string[];
+	list_dependencies: Set<string>;
+	keypath: string;
+	elements: Identifier[];
+	render: () => void;
+}
+
 export default class Renderer {
 	component: Component; // TODO Maybe Renderer shouldn't know about Component?
 	options: CompileOptions;
@@ -33,7 +42,7 @@ export default class Renderer {
 	blocks: Array<Block | Node | Node[]> = [];
 	readonly: Set<string> = new Set();
 	meta_bindings: Array<Node | Node[]> = []; // initial values for e.g. window.innerWidth, if there's a <svelte:window> meta tag
-	binding_groups: Map<string, { binding_group: (to_reference?: boolean) => Node; is_context: boolean; contexts: string[]; index: number; keypath: string }> = new Map();
+	binding_groups: Map<string, BindingGroup> = new Map();
 
 	block: Block;
 	fragment: FragmentWrapper;
@@ -64,10 +73,6 @@ export default class Renderer {
 			this.add_to_context('#slots');
 		}
 
-		if (this.binding_groups.size > 0) {
-			this.add_to_context('$$binding_groups');
-		}
-
 		// main block
 		this.block = new Block({
 			renderer: this,
diff --git a/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts b/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
index ca35ea84db..6cb3a00218 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
@@ -85,6 +85,7 @@ export default class AttributeWrapper extends BaseAttributeWrapper {
 
 			if (node.name === 'value') {
 				handle_select_value_binding(this, node.dependencies);
+				this.parent.has_dynamic_value = true;
 			}
 		}
 
@@ -180,6 +181,17 @@ export default class AttributeWrapper extends BaseAttributeWrapper {
 			`;
 		}
 
+		if (this.node.name === 'value' && dependencies.length > 0) {
+			if (this.parent.bindings.some(binding => binding.node.name === 'group')) {
+				this.parent.dynamic_value_condition = block.get_unique_name('value_has_changed');
+				block.add_variable(this.parent.dynamic_value_condition, x`false`);
+				updater = b`
+					${updater}
+					${this.parent.dynamic_value_condition} = true;
+				`;
+			}
+		}
+
 		if (dependencies.length > 0) {
 			const condition = this.get_dom_update_conditions(block, block.renderer.dirty(dependencies));
 
diff --git a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
index 47e3795ec2..e48f3e0030 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
@@ -5,7 +5,7 @@ import InlineComponentWrapper from '../InlineComponent';
 import get_object from '../../../utils/get_object';
 import replace_object from '../../../utils/replace_object';
 import Block from '../../Block';
-import Renderer from '../../Renderer';
+import Renderer, { BindingGroup } from '../../Renderer';
 import flatten_reference from '../../../utils/flatten_reference';
 import { Node, Identifier } from 'estree';
 import add_to_set from '../../../utils/add_to_set';
@@ -26,6 +26,7 @@ export default class BindingWrapper {
 	snippet: Node;
 	is_readonly: boolean;
 	needs_lock: boolean;
+	binding_group: BindingGroup;
 
 	constructor(block: Block, node: Binding, parent: ElementWrapper | InlineComponentWrapper) {
 		this.node = node;
@@ -45,6 +46,10 @@ export default class BindingWrapper {
 
 		this.object = get_object(this.node.expression.node).name;
 
+		if (this.node.name === 'group') {
+			this.binding_group = get_binding_group(parent.renderer, this, block);
+		}
+
 		// view to model
 		this.handler = get_event_handler(this, parent.renderer, block, this.object, this.node.raw_expression);
 
@@ -67,6 +72,10 @@ export default class BindingWrapper {
 			}
 		});
 
+		if (this.binding_group) {
+			this.binding_group.list_dependencies.forEach(dep => dependencies.add(dep));
+		}
+
 		return dependencies;
 	}
 
@@ -105,6 +114,7 @@ export default class BindingWrapper {
 
 		const update_conditions: any[] = this.needs_lock ? [x`!${lock}`] : [];
 		const mount_conditions: any[] = [];
+		let update_or_condition: any = null;
 
 		const dependency_array = Array.from(this.get_dependencies());
 
@@ -142,33 +152,12 @@ export default class BindingWrapper {
 		switch (this.node.name) {
 			case 'group':
 			{
-				const { binding_group, is_context, contexts, index, keypath } = get_binding_group(parent.renderer, this.node, block);
-
 				block.renderer.add_to_context('$$binding_groups');
+				this.binding_group.elements.push(this.parent.var);
 
-				if (is_context && !block.binding_group_initialised.has(keypath)) {
-					if (contexts.length > 1) {
-						let binding_group = x`${block.renderer.reference('$$binding_groups')}[${index}]`;
-						for (const name of contexts.slice(0, -1)) {
-							binding_group = x`${binding_group}[${block.renderer.reference(name)}]`;
-							block.chunks.init.push(
-								b`${binding_group} = ${binding_group} || [];`
-							);
-						}
-					}
-					block.chunks.init.push(
-						b`${binding_group(true)} = [];`
-					);
-					block.binding_group_initialised.add(keypath);
+				if ((this.parent as ElementWrapper).has_dynamic_value) {	
+					update_or_condition = (this.parent as ElementWrapper).dynamic_value_condition;	
 				}
-
-				block.chunks.hydrate.push(
-					b`${binding_group(true)}.push(${parent.var});`
-				);
-
-				block.chunks.destroy.push(
-					b`${binding_group(true)}.splice(${binding_group(true)}.indexOf(${parent.var}), 1);`
-				);
 				break;
 			}
 
@@ -214,7 +203,8 @@ export default class BindingWrapper {
 
 		if (update_dom) {
 			if (update_conditions.length > 0) {
-				const condition = update_conditions.reduce((lhs, rhs) => x`${lhs} && ${rhs}`);
+				let condition = update_conditions.reduce((lhs, rhs) => x`${lhs} && ${rhs}`);
+				if (update_or_condition) condition = x`${update_or_condition} || (${condition})`;
 
 				block.chunks.update.push(b`
 					if (${condition}) {
@@ -279,7 +269,8 @@ function get_dom_updater(
 	return b`${element.var}.${binding.node.name} = ${binding.snippet};`;
 }
 
-function get_binding_group(renderer: Renderer, value: Binding, block: Block) {
+function get_binding_group(renderer: Renderer, binding: BindingWrapper, block: Block) {
+	const value = binding.node;
 	const { parts } = flatten_reference(value.raw_expression);
 	let keypath = parts.join('.');
 
@@ -314,41 +305,75 @@ function get_binding_group(renderer: Renderer, value: Binding, block: Block) {
 		contexts.push(name);
 	}
 
+	// create a global binding_group across blocks
 	if (!renderer.binding_groups.has(keypath)) {
 		const index = renderer.binding_groups.size;
+		// the bind:group depends on the list in the {#each} block as well
+		// as reordering (removing and adding back to the DOM) may affect the value
+		const list_dependencies = new Set<string>();
+		let parent = value.parent;
+		while (parent) {
+			if (parent.type === 'EachBlock') {
+				for (const dep of parent.expression.dynamic_dependencies()) {
+					list_dependencies.add(dep);
+				}
+			}
+			parent = parent.parent;
+		}
+
+		const elements = [];
 
 		contexts.forEach(context => {
 			renderer.add_to_context(context, true);
 		});
 
 		renderer.binding_groups.set(keypath, {
-			binding_group: (to_reference: boolean = false) => {
-				let binding_group = '$$binding_groups';
-				let _secondary_indexes = contexts;
+			binding_group: () => {
+				let obj = x`$$binding_groups[${index}]`;
 
-				if (to_reference) {
-					binding_group = block.renderer.reference(binding_group);
-					_secondary_indexes = _secondary_indexes.map(name => block.renderer.reference(name));
-				}
-
-				if (_secondary_indexes.length > 0) {
-					let obj = x`${binding_group}[${index}]`;
-					_secondary_indexes.forEach(secondary_index => {
+				if (contexts.length > 0) {
+					contexts.forEach(secondary_index => {
 						obj = x`${obj}[${secondary_index}]`;
 					});
-					return obj;
-				} else {
-					return x`${binding_group}[${index}]`;
 				}
+				return obj;
 			},
-			is_context: contexts.length > 0,
 			contexts,
-			index,
-			keypath
+			list_dependencies,
+			keypath,
+			elements,
+			render() {
+				const local_name = block.get_unique_name('binding_group');
+				const binding_group = block.renderer.reference('$$binding_groups');
+				block.add_variable(local_name);
+				if (contexts.length > 0) {
+					const indexes = { type: 'ArrayExpression', elements: contexts.map(name => block.renderer.reference(name)) };
+					block.chunks.init.push(
+						b`${local_name} = @init_binding_group_dynamic(${binding_group}[${index}], ${indexes})`
+					);
+					block.chunks.update.push(
+						b`if (${block.renderer.dirty(Array.from(list_dependencies))}) ${local_name}.u(${indexes})`
+					);
+				} else {
+					block.chunks.init.push(
+						b`${local_name} = @init_binding_group(${binding_group}[${index}])`
+					);
+				}
+				block.chunks.hydrate.push(
+					b`${local_name}.p(${elements})`
+				);
+				block.chunks.destroy.push(
+					b`${local_name}.r()`
+				);
+			}
 		});
 	}
 
-	return renderer.binding_groups.get(keypath);
+	// register the binding_group for the block
+	const binding_group = renderer.binding_groups.get(keypath);
+	block.binding_groups.add(binding_group);
+
+	return binding_group;
 }
 
 function get_event_handler(
@@ -386,7 +411,7 @@ function get_event_handler(
 		}
 	}
 
-	const value = get_value_from_dom(renderer, binding.parent, binding, block, contextual_dependencies);
+	const value = get_value_from_dom(renderer, binding.parent, binding, contextual_dependencies);
 
 	const mutation = b`
 		${lhs} = ${value};
@@ -402,10 +427,9 @@ function get_event_handler(
 }
 
 function get_value_from_dom(
-	renderer: Renderer,
+	_renderer: Renderer,
 	element: ElementWrapper | InlineComponentWrapper,
 	binding: BindingWrapper,
-	block: Block,
 	contextual_dependencies: Set<string>
 ) {
 	const { node } = element;
@@ -427,7 +451,7 @@ function get_value_from_dom(
 	// <input type='checkbox' bind:group='foo'>
 	if (name === 'group') {
 		if (type === 'checkbox') {
-			const { binding_group, contexts } = get_binding_group(renderer, binding.node, block);
+			const { binding_group, contexts } = binding.binding_group;
 			add_to_set(contextual_dependencies, contexts);
 			return x`@get_binding_group_value(${binding_group()}, this.__value, this.checked)`;
 		}
diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index 3472b0612c..eaef3a3b69 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -163,6 +163,8 @@ export default class ElementWrapper extends Wrapper {
 	has_dynamic_attribute: boolean;
 
 	select_binding_dependencies?: Set<string>;
+	has_dynamic_value: boolean;
+	dynamic_value_condition: any;
 
 	var: any;
 	void: boolean;
diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index 942e742e34..70e7dcd7f8 100644
--- a/src/runtime/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -13,7 +13,7 @@ export function end_hydrating() {
 
 type NodeEx = Node & {
 	claim_order?: number,
-	hydrate_init? : true,
+	hydrate_init?: true,
 	actual_end_child?: NodeEx,
 	childNodes: NodeListOf<NodeEx>,
 };
@@ -35,7 +35,7 @@ function init_hydrate(target: NodeEx) {
 	if (target.hydrate_init) return;
 	target.hydrate_init = true;
 
-	type NodeEx2 = NodeEx & {claim_order: number};
+	type NodeEx2 = NodeEx & { claim_order: number };
 
 	// We know that all children have claim_order values since the unclaimed have been detached if target is not <head>
 	let children: ArrayLike<NodeEx2> = target.childNodes as NodeListOf<NodeEx2>;
@@ -260,7 +260,7 @@ export function listen(node: EventTarget, event: string, handler: EventListenerO
 }
 
 export function prevent_default(fn) {
-	return function(event) {
+	return function (event) {
 		event.preventDefault();
 		// @ts-ignore
 		return fn.call(this, event);
@@ -268,7 +268,7 @@ export function prevent_default(fn) {
 }
 
 export function stop_propagation(fn) {
-	return function(event) {
+	return function (event) {
 		event.stopPropagation();
 		// @ts-ignore
 		return fn.call(this, event);
@@ -284,14 +284,14 @@ export function stop_immediate_propagation(fn) {
 }
 
 export function self(fn) {
-	return function(event) {
+	return function (event) {
 		// @ts-ignore
 		if (event.target === this) fn.call(this, event);
 	};
 }
 
 export function trusted(fn) {
-	return function(event) {
+	return function (event) {
 		// @ts-ignore
 		if (event.isTrusted) fn.call(this, event);
 	};
@@ -359,6 +359,53 @@ export function get_binding_group_value(group, __value, checked) {
 	return Array.from(value);
 }
 
+export function init_binding_group(group) {
+	let _inputs: HTMLInputElement[];
+	return {
+		/* push */ p(...inputs: HTMLInputElement[]) {
+			_inputs = inputs;
+			_inputs.forEach(input => group.push(input));
+		},
+
+		/* remove */ r() {
+			_inputs.forEach(input => group.splice(group.indexOf(input), 1));
+		}
+	};
+}
+
+export function init_binding_group_dynamic(group, indexes: number[]) {
+	let _group: HTMLInputElement[] = get_binding_group(group);
+	let _inputs: HTMLInputElement[];
+	function get_binding_group(group) {
+		for (let i = 0; i < indexes.length; i++) {
+			group = group[indexes[i]] = group[indexes[i]] || [];
+		}
+		return group;
+	}
+	function push() {
+		_inputs.forEach(input => _group.push(input));
+	}
+	function remove() {
+		_inputs.forEach(input => _group.splice(_group.indexOf(input), 1));
+	}
+	return {
+		/* update */ u(new_indexes: number[]) {
+			indexes = new_indexes;
+			const new_group = get_binding_group(group);
+			if (new_group !== _group) {
+				remove();
+				_group = new_group;
+				push();
+			}
+		},
+		/* push */ p(...inputs: HTMLInputElement[]) {
+			_inputs = inputs;
+			push();
+		},
+		/* remove */ r: remove
+	};
+}
+
 export function to_number(value) {
 	return value === '' ? null : +value;
 }
@@ -392,7 +439,7 @@ export function children(element: Element) {
 
 function init_claim_info(nodes: ChildNodeArray) {
 	if (nodes.claim_info === undefined) {
-		nodes.claim_info = {last_index: 0, total_claimed: 0};
+		nodes.claim_info = { last_index: 0, total_claimed: 0 };
 	}
 }
 
@@ -668,7 +715,7 @@ export function toggle_class(element, name, toggle) {
 	element.classList[toggle ? 'add' : 'remove'](name);
 }
 
-export function custom_event<T=any>(type: string, detail?: T, { bubbles = false, cancelable = false } = {}): CustomEvent<T> {
+export function custom_event<T = any>(type: string, detail?: T, { bubbles = false, cancelable = false } = {}): CustomEvent<T> {
 	const e: CustomEvent<T> = document.createEvent('CustomEvent');
 	e.initCustomEvent(type, bubbles, cancelable, detail);
 	return e;
diff --git a/src/runtime/internal/keyed_each.ts b/src/runtime/internal/keyed_each.ts
index 079d5f4499..a5cfaf7fb6 100644
--- a/src/runtime/internal/keyed_each.ts
+++ b/src/runtime/internal/keyed_each.ts
@@ -1,4 +1,5 @@
 import { transition_in, transition_out } from './transitions';
+import { run_all } from './utils';
 
 export function destroy_block(block, lookup) {
 	block.d(1);
@@ -32,6 +33,7 @@ export function update_keyed_each(old_blocks, dirty, get_key, dynamic, ctx, list
 	const new_blocks = [];
 	const new_lookup = new Map();
 	const deltas = new Map();
+	const updates = [];
 
 	i = n;
 	while (i--) {
@@ -43,7 +45,8 @@ export function update_keyed_each(old_blocks, dirty, get_key, dynamic, ctx, list
 			block = create_each_block(key, child_ctx);
 			block.c();
 		} else if (dynamic) {
-			block.p(child_ctx, dirty);
+			// defer updates until all the DOM shuffling is done
+			updates.push(() => block.p(child_ctx, dirty));
 		}
 
 		new_lookup.set(key, new_blocks[i] = block);
@@ -99,6 +102,8 @@ export function update_keyed_each(old_blocks, dirty, get_key, dynamic, ctx, list
 
 	while (n) insert(new_blocks[n - 1]);
 
+	run_all(updates);
+
 	return new_blocks;
 }
 
diff --git a/test/runtime/samples/binding-input-group-each-10/_config.js b/test/runtime/samples/binding-input-group-each-10/_config.js
new file mode 100644
index 0000000000..edfc508f05
--- /dev/null
+++ b/test/runtime/samples/binding-input-group-each-10/_config.js
@@ -0,0 +1,52 @@
+// https://github.com/sveltejs/svelte/issues/7633
+export default {
+	async test({ assert, target, component, window }) {
+		let inputs = target.querySelectorAll('input');
+
+		assert.equal(inputs[0].checked, true);
+		assert.equal(inputs[1].checked, false);
+		assert.equal(inputs[2].checked, false);
+
+		component.moveDown(0);
+		component.moveDown(1);
+		await Promise.resolve();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<div class="item">
+					b <label><input name="current" type="radio" value="b"> current</label>
+				</div>
+				<div class="item">
+					c <label><input name="current" type="radio" value="c"> current</label>
+				</div>
+				<div class="item">
+					a <label><input name="current" type="radio" value="a"> current</label>
+				</div>
+			`
+		);
+
+		// after shifting order, should still keep the correct radio checked
+		inputs = target.querySelectorAll('input');
+		assert.equal(inputs[0].checked, false);
+		assert.equal(inputs[1].checked, false);
+		assert.equal(inputs[2].checked, true);
+
+		(component.current = 'b');
+		await Promise.resolve();
+
+		inputs = target.querySelectorAll('input');
+		assert.equal(inputs[0].checked, true);
+		assert.equal(inputs[1].checked, false);
+		assert.equal(inputs[2].checked, false);
+
+		component.moveDown(1);
+		await Promise.resolve();
+
+		// after shifting order, should still keep the correct radio checked
+		inputs = target.querySelectorAll('input');
+		assert.equal(inputs[0].checked, true);
+		assert.equal(inputs[1].checked, false);
+		assert.equal(inputs[2].checked, false);
+	}
+};
diff --git a/test/runtime/samples/binding-input-group-each-10/main.svelte b/test/runtime/samples/binding-input-group-each-10/main.svelte
new file mode 100644
index 0000000000..7c81cada9a
--- /dev/null
+++ b/test/runtime/samples/binding-input-group-each-10/main.svelte
@@ -0,0 +1,36 @@
+<script>
+	export let list = [
+		{ name: "a", text: "This is a test." },
+		{ name: "b", text: "This is another test." },
+		{ name: "c", text: "This is also a test." },
+	];
+	export let current = "a";
+	export function moveUp(i) {
+		list = [
+			...list.slice(0, Math.max(i - 1, 0)),
+			list[i],
+			list[i - 1],
+			...list.slice(i + 1),
+		];
+	}
+	export function moveDown(i) {
+		moveUp(i + 1);
+	}
+</script>
+
+{#each list as item (item.name)}
+	<div class="item">
+		{item.name}
+		{#if true}
+			<label
+				><input
+					type="radio"
+					name="current"
+					bind:group={current}
+					value={item.name}
+				/> current</label
+			>
+		{/if}
+	</div>
+{/each}
+
diff --git a/test/runtime/samples/binding-input-group-each-11/_config.js b/test/runtime/samples/binding-input-group-each-11/_config.js
new file mode 100644
index 0000000000..a90993861a
--- /dev/null
+++ b/test/runtime/samples/binding-input-group-each-11/_config.js
@@ -0,0 +1,88 @@
+// https://github.com/sveltejs/svelte/issues/6112
+export default {
+	async test({ assert, target, component, window }) {
+		let inputs = target.querySelectorAll('input');
+
+		const check = (set) => {
+			for (let i = 0; i < inputs.length; i++) {
+				assert.equal(inputs[i].checked, set.has(i));
+			}
+		};
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<div>1</div>
+				<div>2 
+					<div class="arg">
+						<input type="radio" value="a">
+						<input type="radio" value="b">
+					</div>
+					<div class="arg">
+						<input type="radio" value="c">
+						<input type="radio" value="d">
+					</div>
+				</div>
+				<div>3 
+					<div class="arg">
+						<input type="radio" value="a">
+						<input type="radio" value="b">
+					</div>
+					<div class="arg">
+						<input type="radio" value="c">
+						<input type="radio" value="d">
+					</div>
+				</div>
+			`
+		);
+
+		check(new Set([0, 2, 5, 6]));
+
+		const event = new window.Event('change');
+
+		// dom to value
+		inputs[3].checked = true;
+		await inputs[3].dispatchEvent(event);
+
+		check(new Set([0, 3, 5, 6]));
+		assert.equal(component.pipelineOperations[1].operation.args[1].value, 'd');
+
+		// remove item
+		component.pipelineOperations = component.pipelineOperations.slice(1);
+		await Promise.resolve();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<div>2 
+					<div class="arg">
+						<input type="radio" value="a">
+						<input type="radio" value="b">
+					</div>
+					<div class="arg">
+						<input type="radio" value="c">
+						<input type="radio" value="d">
+					</div>
+				</div>
+				<div>3 
+					<div class="arg">
+						<input type="radio" value="a">
+						<input type="radio" value="b">
+					</div>
+					<div class="arg">
+						<input type="radio" value="c">
+						<input type="radio" value="d">
+					</div>
+				</div>
+			`
+		);
+
+		inputs = target.querySelectorAll('input');
+		check(new Set([0, 3, 5, 6]));
+
+		inputs[2].checked = true;
+		await inputs[2].dispatchEvent(event);
+		
+		check(new Set([0, 2, 5, 6]));
+	}
+};
diff --git a/test/runtime/samples/binding-input-group-each-11/main.svelte b/test/runtime/samples/binding-input-group-each-11/main.svelte
new file mode 100644
index 0000000000..7c759b5bb4
--- /dev/null
+++ b/test/runtime/samples/binding-input-group-each-11/main.svelte
@@ -0,0 +1,60 @@
+<script>
+	export let pipelineOperations = [
+		{
+			operation: {
+				name: "foo",
+				args: [],
+			},
+			id: 1,
+		},
+		{
+			operation: {
+				name: "bar",
+				args: [
+					{
+						name: "bar_1",
+						value: "a",
+						options: [{ value: "a" }, { value: "b" }],
+					},
+					{
+						name: "bar_2",
+						value: "c",
+						options: [{ value: "c" }, { value: "d" }],
+					},
+				],
+			},
+			id: 2,
+		},
+		{
+			operation: {
+				name: "baz",
+				args: [
+					{
+						name: "baz_1",
+						value: "b",
+						options: [{ value: "a" }, { value: "b" }],
+					},
+					{
+						name: "baz_2",
+						value: "c",
+						options: [{ value: "c" }, { value: "d" }],
+					},
+				],
+			},
+			id: 3,
+		},
+	];
+</script>
+
+{#each pipelineOperations as { operation, id } (id)}
+	<div>
+		{id}
+		{#each operation.args as arg}
+			<div class="arg">
+				{#each arg.options as { value }}
+					<input type="radio" bind:group={arg.value} {value} />
+				{/each}
+			</div>
+		{/each}
+	</div>
+{/each}
diff --git a/test/runtime/samples/binding-input-group-each-12/_config.js b/test/runtime/samples/binding-input-group-each-12/_config.js
new file mode 100644
index 0000000000..a3d6c92879
--- /dev/null
+++ b/test/runtime/samples/binding-input-group-each-12/_config.js
@@ -0,0 +1,89 @@
+// https://github.com/sveltejs/svelte/issues/6112
+export default {
+	async test({ assert, target, component, window }) {
+		let inputs = target.querySelectorAll('input');
+
+		const check = (set) => {
+			for (let i = 0; i < inputs.length; i++) {
+				assert.equal(inputs[i].checked, set.has(i));
+			}
+		};
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<div>1</div>
+				<div>2 
+					<div class="arg">
+						<input type="checkbox" value="a">
+						<input type="checkbox" value="b">
+					</div>
+					<div class="arg">
+						<input type="checkbox" value="c">
+						<input type="checkbox" value="d">
+					</div>
+				</div>
+				<div>3 
+					<div class="arg">
+						<input type="checkbox" value="a">
+						<input type="checkbox" value="b">
+					</div>
+					<div class="arg">
+						<input type="checkbox" value="c">
+						<input type="checkbox" value="d">
+					</div>
+				</div>
+			`
+		);
+
+		check(new Set([0, 2]));
+
+		const event = new window.Event('change');
+
+		// dom to value
+		inputs[3].checked = true;
+		await inputs[3].dispatchEvent(event);
+
+		check(new Set([0, 2, 3]));
+		assert.deepEqual(component.pipelineOperations[1].operation.args[1].value, ['c', 'd']);
+
+		// remove item
+		component.pipelineOperations = component.pipelineOperations.slice(1);
+		await Promise.resolve();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<div>2 
+					<div class="arg">
+						<input type="checkbox" value="a">
+						<input type="checkbox" value="b">
+					</div>
+					<div class="arg">
+						<input type="checkbox" value="c">
+						<input type="checkbox" value="d">
+					</div>
+				</div>
+				<div>3 
+					<div class="arg">
+						<input type="checkbox" value="a">
+						<input type="checkbox" value="b">
+					</div>
+					<div class="arg">
+						<input type="checkbox" value="c">
+						<input type="checkbox" value="d">
+					</div>
+				</div>
+			`
+		);
+
+		inputs = target.querySelectorAll('input');
+		check(new Set([0, 2, 3]));
+
+		inputs[5].checked = true;
+		await inputs[5].dispatchEvent(event);
+		
+		check(new Set([0, 2, 3, 5]));
+		assert.deepEqual(component.pipelineOperations[1].operation.args[0].value, ['b']);
+	}
+};
diff --git a/test/runtime/samples/binding-input-group-each-12/main.svelte b/test/runtime/samples/binding-input-group-each-12/main.svelte
new file mode 100644
index 0000000000..289353778a
--- /dev/null
+++ b/test/runtime/samples/binding-input-group-each-12/main.svelte
@@ -0,0 +1,60 @@
+<script>
+	export let pipelineOperations = [
+		{
+			operation: {
+				name: "foo",
+				args: [],
+			},
+			id: 1,
+		},
+		{
+			operation: {
+				name: "bar",
+				args: [
+					{
+						name: "bar_1",
+						value: ["a"],
+						options: [{ value: "a" }, { value: "b" }],
+					},
+					{
+						name: "bar_2",
+						value: ["c"],
+						options: [{ value: "c" }, { value: "d" }],
+					},
+				],
+			},
+			id: 2,
+		},
+		{
+			operation: {
+				name: "baz",
+				args: [
+					{
+						name: "baz_1",
+						value: [],
+						options: [{ value: "a" }, { value: "b" }],
+					},
+					{
+						name: "baz_2",
+						value: [],
+						options: [{ value: "c" }, { value: "d" }],
+					},
+				],
+			},
+			id: 3,
+		},
+	];
+</script>
+
+{#each pipelineOperations as { operation, id } (id)}
+	<div>
+		{id}
+		{#each operation.args as arg}
+			<div class="arg">
+				{#each arg.options as { value }}
+					<input type="checkbox" bind:group={arg.value} {value} />
+				{/each}
+			</div>
+		{/each}
+	</div>
+{/each}
diff --git a/test/runtime/samples/binding-input-group-each-13/_config.js b/test/runtime/samples/binding-input-group-each-13/_config.js
new file mode 100644
index 0000000000..affb94b8fb
--- /dev/null
+++ b/test/runtime/samples/binding-input-group-each-13/_config.js
@@ -0,0 +1,30 @@
+export default {
+	async test({ assert, target, window }) {
+		const [input1, input2] = target.querySelectorAll('input[type=text]');
+		const radio = target.querySelector('input[type=radio]');
+
+		assert.equal(radio.checked, false);
+		
+		const event = new window.Event('input');
+		
+		input1.value = 'world';
+		await input1.dispatchEvent(event);
+		assert.equal(radio.checked, true);
+
+		input2.value = 'foo';
+		await input2.dispatchEvent(event);
+		assert.equal(radio.checked, false);
+		
+		input1.value = 'foo';
+		await input1.dispatchEvent(event);
+		assert.equal(radio.checked, true);
+		
+		input1.value = 'bar';
+		await input1.dispatchEvent(event);
+		assert.equal(radio.checked, false);
+		
+		input2.value = 'bar';
+		await input2.dispatchEvent(event);
+		assert.equal(radio.checked, true);
+	}
+};
diff --git a/test/runtime/samples/binding-input-group-each-13/main.svelte b/test/runtime/samples/binding-input-group-each-13/main.svelte
new file mode 100644
index 0000000000..592be2ae9d
--- /dev/null
+++ b/test/runtime/samples/binding-input-group-each-13/main.svelte
@@ -0,0 +1,10 @@
+<script>
+	let name = 'world';
+	let current = '';
+</script>
+
+<input type="radio" name="current" bind:group={current} value={name}>
+
+<input type="text" bind:value={current} />
+
+<input type="text" bind:value={name} />
diff --git a/test/runtime/samples/binding-input-group-each-8/_config.js b/test/runtime/samples/binding-input-group-each-8/_config.js
new file mode 100644
index 0000000000..b17b801a83
--- /dev/null
+++ b/test/runtime/samples/binding-input-group-each-8/_config.js
@@ -0,0 +1,78 @@
+// https://github.com/sveltejs/svelte/issues/7884
+export default {
+	async test({ assert, target, component, window }) {
+		let inputs = target.querySelectorAll('input');
+
+		assert.htmlEqual(target.innerHTML, `
+			<p>{"foo":[],"bar":[]}</p>
+			<h2>foo</h2>
+			<ul>
+				<li><label><input name="foo" type="checkbox" value="1"> 1</label></li>
+				<li><label><input name="foo" type="checkbox" value="2"> 2</label></li>
+				<li><label><input name="foo" type="checkbox" value="3"> 3</label></li>
+			</ul>
+			<h2>bar</h2>
+			<ul>
+				<li><label><input name="bar" type="checkbox" value="1"> 1</label></li>
+				<li><label><input name="bar" type="checkbox" value="2"> 2</label></li>
+				<li><label><input name="bar" type="checkbox" value="3"> 3</label></li>
+			</ul>
+		`);
+
+		const event = new window.Event('change');
+
+		inputs[0].checked = true;
+		await inputs[0].dispatchEvent(event);
+		inputs[2].checked = true;
+		await inputs[2].dispatchEvent(event);
+		inputs[3].checked = true;
+		await inputs[3].dispatchEvent(event);
+
+		assert.htmlEqual(target.innerHTML, `
+			<p>{"foo":[1,3],"bar":[1]}</p>
+			<h2>foo</h2>
+			<ul>
+				<li><label><input name="foo" type="checkbox" value="1"> 1</label></li>
+				<li><label><input name="foo" type="checkbox" value="2"> 2</label></li>
+				<li><label><input name="foo" type="checkbox" value="3"> 3</label></li>
+			</ul>
+			<h2>bar</h2>
+			<ul>
+				<li><label><input name="bar" type="checkbox" value="1"> 1</label></li>
+				<li><label><input name="bar" type="checkbox" value="2"> 2</label></li>
+				<li><label><input name="bar" type="checkbox" value="3"> 3</label></li>
+			</ul>		
+		`);
+		
+		await component.update();
+
+		assert.htmlEqual(target.innerHTML, `
+			<p>{"foo":[1,3],"bar":[1],"qux":[]}</p>
+			<h2>qux</h2>
+			<ul>
+				<li><label><input name="qux" type="checkbox" value="4"> 4</label></li>
+				<li><label><input name="qux" type="checkbox" value="5"> 5</label></li>
+				<li><label><input name="qux" type="checkbox" value="6"> 6</label></li>
+			</ul>
+		`);
+
+		inputs = target.querySelectorAll('input');
+		inputs[0].checked = true;
+		await inputs[0].dispatchEvent(event);
+
+		assert.htmlEqual(target.innerHTML, `
+			<p>{"foo":[1,3],"bar":[1],"qux":[4]}</p>
+			<h2>qux</h2>
+			<ul>
+				<li><label><input name="qux" type="checkbox" value="4"> 4</label></li>
+				<li><label><input name="qux" type="checkbox" value="5"> 5</label></li>
+				<li><label><input name="qux" type="checkbox" value="6"> 6</label></li>
+			</ul>
+		`);
+		assert.equal(inputs[0].checked, true);
+		assert.equal(inputs[1].checked, false);
+		assert.equal(inputs[2].checked, false);
+	}
+};
+
+
diff --git a/test/runtime/samples/binding-input-group-each-8/main.svelte b/test/runtime/samples/binding-input-group-each-8/main.svelte
new file mode 100644
index 0000000000..a6c5bccac0
--- /dev/null
+++ b/test/runtime/samples/binding-input-group-each-8/main.svelte
@@ -0,0 +1,36 @@
+<script>
+	let keys = ["foo", "bar"];
+	let values = [1, 2, 3];
+
+	const object = {};
+
+	$: keys.forEach((key) => {
+		// Make sure Svelte has an array to bind to
+		if (!object[key]) {
+			object[key] = [];
+		}
+	});
+
+	export function update() {
+		keys = ["qux"];
+		values = [4, 5, 6];
+	}
+</script>
+
+<p>
+	{JSON.stringify(object)}
+</p>
+
+{#each keys as key (key)}
+	<h2>{key}</h2>
+	<ul>
+		{#each values as value (value)}
+			<li>
+				<label>
+					<input type="checkbox" name={key} {value} bind:group={object[key]} />
+					{value}
+				</label>
+			</li>
+		{/each}
+	</ul>
+{/each}
diff --git a/test/runtime/samples/binding-input-group-each-9/_config.js b/test/runtime/samples/binding-input-group-each-9/_config.js
new file mode 100644
index 0000000000..e2b48a83d7
--- /dev/null
+++ b/test/runtime/samples/binding-input-group-each-9/_config.js
@@ -0,0 +1,49 @@
+// https://github.com/sveltejs/svelte/issues/7633
+export default {
+	async test({ assert, target, component, window }) {
+		let inputs = target.querySelectorAll('input');
+
+		assert.equal(inputs[0].checked, true);
+		assert.equal(inputs[1].checked, false);
+		assert.equal(inputs[2].checked, false);
+
+		await component.moveDown(0);
+		await component.moveDown(1);
+		
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<div class="item">
+					b <label><input name="current" type="radio" value="b"> current</label>
+				</div>
+				<div class="item">
+					c <label><input name="current" type="radio" value="c"> current</label>
+				</div>
+				<div class="item">
+					a <label><input name="current" type="radio" value="a"> current</label>
+				</div>
+			`
+		);
+
+		// after shifting order, should still keep the correct radio checked
+		inputs = target.querySelectorAll('input');
+		assert.equal(inputs[0].checked, false);
+		assert.equal(inputs[1].checked, false);
+		assert.equal(inputs[2].checked, true);
+
+		await (component.current = 'b');
+		
+		inputs = target.querySelectorAll('input');
+		assert.equal(inputs[0].checked, true);
+		assert.equal(inputs[1].checked, false);
+		assert.equal(inputs[2].checked, false);
+
+		await component.moveDown(1);
+
+		// after shifting order, should still keep the correct radio checked
+		inputs = target.querySelectorAll('input');
+		assert.equal(inputs[0].checked, true);
+		assert.equal(inputs[1].checked, false);
+		assert.equal(inputs[2].checked, false);
+	}
+};
diff --git a/test/runtime/samples/binding-input-group-each-9/main.svelte b/test/runtime/samples/binding-input-group-each-9/main.svelte
new file mode 100644
index 0000000000..ee89123a9a
--- /dev/null
+++ b/test/runtime/samples/binding-input-group-each-9/main.svelte
@@ -0,0 +1,36 @@
+<script>
+	export let list = [
+		{ name: "a", text: "This is a test." },
+		{ name: "b", text: "This is another test." },
+		{ name: "c", text: "This is also a test." },
+	];
+	export let current = "a";
+	export function moveUp(i) {
+		list = [
+			...list.slice(0, Math.max(i - 1, 0)),
+			list[i],
+			list[i - 1],
+			...list.slice(i + 1),
+		];
+	}
+	export function moveDown(i) {
+		moveUp(i + 1);
+	}
+</script>
+
+{#each list as item}
+	<div class="item">
+		{item.name}
+		{#if true}
+			<label
+				><input
+					type="radio"
+					name="current"
+					bind:group={current}
+					value={item.name}
+				/> current</label
+			>
+		{/if}
+	</div>
+{/each}
+

From 5b2fa1f24750b77b83dcac831978efc93a6451fc Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Thu, 2 Mar 2023 11:10:12 -0800
Subject: [PATCH 03/30] chore: upgrade magic-string (#8339)

- overwrite -> update
- update comments
---
 package-lock.json                             | 21 +++++++++++--------
 package.json                                  |  2 +-
 src/compiler/compile/css/Selector.ts          |  4 ++--
 src/compiler/compile/css/Stylesheet.ts        | 14 ++++++-------
 .../samples/compile-option-dev/test.js        |  9 +++++---
 5 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b8aea534af..099ed941e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,7 +38,7 @@
         "jsdom": "^15.2.1",
         "kleur": "^4.1.5",
         "locate-character": "^2.0.5",
-        "magic-string": "^0.25.3",
+        "magic-string": "^0.30.0",
         "mocha": "^7.0.0",
         "periscopic": "^3.0.4",
         "puppeteer": "^2.0.0",
@@ -3532,12 +3532,15 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.3.tgz",
-      "integrity": "sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==",
+      "version": "0.30.0",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
+      "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
       "dev": true,
       "dependencies": {
-        "sourcemap-codec": "^1.4.4"
+        "@jridgewell/sourcemap-codec": "^1.4.13"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/mdn-data": {
@@ -7961,12 +7964,12 @@
       }
     },
     "magic-string": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.3.tgz",
-      "integrity": "sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==",
+      "version": "0.30.0",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
+      "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
       "dev": true,
       "requires": {
-        "sourcemap-codec": "^1.4.4"
+        "@jridgewell/sourcemap-codec": "^1.4.13"
       }
     },
     "mdn-data": {
diff --git a/package.json b/package.json
index 975f171fe6..a76b44135b 100644
--- a/package.json
+++ b/package.json
@@ -148,7 +148,7 @@
     "jsdom": "^15.2.1",
     "kleur": "^4.1.5",
     "locate-character": "^2.0.5",
-    "magic-string": "^0.25.3",
+    "magic-string": "^0.30.0",
     "mocha": "^7.0.0",
     "periscopic": "^3.0.4",
     "puppeteer": "^2.0.0",
diff --git a/src/compiler/compile/css/Selector.ts b/src/compiler/compile/css/Selector.ts
index c7a1d8c3b1..c2ad450416 100644
--- a/src/compiler/compile/css/Selector.ts
+++ b/src/compiler/compile/css/Selector.ts
@@ -76,7 +76,7 @@ export default class Selector {
 		this.blocks.forEach((block, i) => {
 			if (i > 0) {
 				if (block.start - c > 1) {
-					code.overwrite(c, block.start, block.combinator.name || ' ');
+					code.update(c, block.start, block.combinator.name || ' ');
 				}
 			}
 
@@ -112,7 +112,7 @@ export default class Selector {
 				}
 
 				if (selector.type === 'TypeSelector' && selector.name === '*') {
-					code.overwrite(selector.start, selector.end, attr);
+					code.update(selector.start, selector.end, attr);
 				} else {
 					code.appendLeft(selector.end, attr);
 				}
diff --git a/src/compiler/compile/css/Stylesheet.ts b/src/compiler/compile/css/Stylesheet.ts
index 9a3cbe9d13..8f54830e6a 100644
--- a/src/compiler/compile/css/Stylesheet.ts
+++ b/src/compiler/compile/css/Stylesheet.ts
@@ -35,7 +35,7 @@ function minify_declarations(
 	declarations.forEach((declaration, i) => {
 		const separator = i > 0 ? ';' : '';
 		if ((declaration.node.start - c) > separator.length) {
-			code.overwrite(c, declaration.node.start, separator);
+			code.update(c, declaration.node.start, separator);
 		}
 		declaration.minify(code);
 		c = declaration.node.end;
@@ -75,7 +75,7 @@ class Rule {
 			if (selector.used) {
 				const separator = started ? ',' : '';
 				if ((selector.node.start - c) > separator.length) {
-					code.overwrite(c, selector.node.start, separator);
+					code.update(c, selector.node.start, separator);
 				}
 
 				selector.minify(code);
@@ -133,7 +133,7 @@ class Declaration {
 				if (block.type === 'Identifier') {
 					const name = block.name;
 					if (keyframes.has(name)) {
-						code.overwrite(block.start, block.end, keyframes.get(name));
+						code.update(block.start, block.end, keyframes.get(name));
 					}
 				}
 			});
@@ -156,7 +156,7 @@ class Declaration {
 		while (regex_whitespace.test(code.original[start])) start += 1;
 
 		if (start - c > 1) {
-			code.overwrite(c, start, ':');
+			code.update(c, start, ':');
 		}
 	}
 }
@@ -204,7 +204,7 @@ class Atrule {
 			code.remove(c, this.node.block.start);
 		} else if (this.node.name === 'supports') {
 			let c = this.node.start + 9;
-			if (this.node.prelude.start - c > 1) code.overwrite(c, this.node.prelude.start, ' ');
+			if (this.node.prelude.start - c > 1) code.update(c, this.node.prelude.start, ' ');
 			this.node.prelude.children.forEach((query: CssNode) => {
 				// TODO minify queries
 				c = query.end;
@@ -213,7 +213,7 @@ class Atrule {
 		} else {
 			let c = this.node.start + this.node.name.length + 1;
 			if (this.node.prelude) {
-				if (this.node.prelude.start - c > 1) code.overwrite(c, this.node.prelude.start, ' ');
+				if (this.node.prelude.start - c > 1) code.update(c, this.node.prelude.start, ' ');
 				c = this.node.prelude.end;
 			}
 			if (this.node.block && this.node.block.start - c > 0) {
@@ -255,7 +255,7 @@ class Atrule {
 							});
 						});
 					} else {
-						code.overwrite(start, end, keyframes.get(name));
+						code.update(start, end, keyframes.get(name));
 					}
 				}
 			});
diff --git a/test/sourcemaps/samples/compile-option-dev/test.js b/test/sourcemaps/samples/compile-option-dev/test.js
index f169ab8832..eec81fc93e 100644
--- a/test/sourcemaps/samples/compile-option-dev/test.js
+++ b/test/sourcemaps/samples/compile-option-dev/test.js
@@ -18,10 +18,13 @@ export async function test({ assert, css,  js }) {
 	// TODO make util fn + move to test index.js
 	const sourcefile = 'input.svelte';
 	[
-		// TODO how to get line + column numbers?
+		// TODO: get line and col num from input.svelte rather than hardcoding here
 		[css, '--keep-me', 13, 2],
-		[css, '--done-replace-once', 6, 5],
-		[css, '--done-replace-twice', 9, 5]
+		// TODO: these should be 7, 2 and 10, 2
+		// we use locate_1 which means lines are 1-indexed and cols are 0-indexed
+		// each tab is 1 col
+		[css, '--done-replace-once', 6, 4],
+		[css, '--done-replace-twice', 9, 4]
 	]
 	.forEach(([where, content, line, column]) => {
 		assert.deepEqual(

From b336b162041d4f33252e12f15c98d89ecf2dcf23 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Fri, 3 Mar 2023 23:18:25 -0800
Subject: [PATCH 04/30] chore: upgrade to code-red 1.0 (#8349)

---
 package-lock.json                 | 96 ++++++++++++++++---------------
 package.json                      |  2 +-
 src/compiler/compile/Component.ts |  2 +-
 3 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 099ed941e4..ef63573f60 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
         "agadoo": "^2.0.0",
         "aria-query": "^5.1.1",
         "axobject-query": "^3.1.1",
-        "code-red": "^0.2.5",
+        "code-red": "^1.0.0",
         "css-tree": "^2.2.1",
         "eslint": "^8.26.0",
         "eslint-plugin-import": "^2.26.0",
@@ -381,9 +381,9 @@
       "dev": true
     },
     "node_modules/@types/estree": {
-      "version": "0.0.50",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
-      "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz",
+      "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==",
       "dev": true
     },
     "node_modules/@types/json-schema": {
@@ -655,9 +655,9 @@
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "version": "8.8.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -1111,17 +1111,16 @@
       }
     },
     "node_modules/code-red": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/code-red/-/code-red-0.2.5.tgz",
-      "integrity": "sha512-x+uQyJLNS1v0+74eXqM7FMPoM1fU/fN3tdexGWtCuVjCfxADt1TuuEGIGlFyCC2vhgINDctDb/rgSn8/ZDfJsQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/code-red/-/code-red-1.0.0.tgz",
+      "integrity": "sha512-x5fNWOBu7Ii38br3iVPuwQcDQM0f2h8ipvqw4qTLlOzYlrFQRz954qR0hPZ8asV5KG/igXNY8CRG6xtDUoKOJQ==",
       "dev": true,
       "dependencies": {
-        "@types/estree": "^0.0.50",
-        "acorn": "^8.0.5",
-        "estree-walker": "^3.0.0",
-        "is-reference": "^3.0.0",
-        "periscopic": "^3.0.4",
-        "sourcemap-codec": "^1.4.8"
+        "@jridgewell/sourcemap-codec": "^1.4.14",
+        "@types/estree": "^1.0.0",
+        "acorn": "^8.8.2",
+        "estree-walker": "^3.0.3",
+        "periscopic": "^3.1.0"
       }
     },
     "node_modules/color-convert": {
@@ -2292,10 +2291,13 @@
       }
     },
     "node_modules/estree-walker": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.1.tgz",
-      "integrity": "sha512-woY0RUD87WzMBUiZLx8NsYr23N5BKsOMZHhu2hoNRVh6NXGfoiT1KOL8G3UHlJAnEDGmfa5ubNA/AacfG+Kb0g==",
-      "dev": true
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
     },
     "node_modules/esutils": {
       "version": "2.0.3",
@@ -4031,11 +4033,12 @@
       "dev": true
     },
     "node_modules/periscopic": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-3.0.4.tgz",
-      "integrity": "sha512-SFx68DxCv0Iyo6APZuw/AKewkkThGwssmU0QWtTlvov3VAtPX+QJ4CadwSaz8nrT5jPIuxdvJWB4PnD2KNDxQg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-3.1.0.tgz",
+      "integrity": "sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==",
       "dev": true,
       "dependencies": {
+        "@types/estree": "^1.0.0",
         "estree-walker": "^3.0.0",
         "is-reference": "^3.0.0"
       }
@@ -5577,9 +5580,9 @@
       "dev": true
     },
     "@types/estree": {
-      "version": "0.0.50",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
-      "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz",
+      "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==",
       "dev": true
     },
     "@types/json-schema": {
@@ -5753,9 +5756,9 @@
       "dev": true
     },
     "acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "version": "8.8.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+      "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
       "dev": true
     },
     "acorn-globals": {
@@ -6114,17 +6117,16 @@
       }
     },
     "code-red": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/code-red/-/code-red-0.2.5.tgz",
-      "integrity": "sha512-x+uQyJLNS1v0+74eXqM7FMPoM1fU/fN3tdexGWtCuVjCfxADt1TuuEGIGlFyCC2vhgINDctDb/rgSn8/ZDfJsQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/code-red/-/code-red-1.0.0.tgz",
+      "integrity": "sha512-x5fNWOBu7Ii38br3iVPuwQcDQM0f2h8ipvqw4qTLlOzYlrFQRz954qR0hPZ8asV5KG/igXNY8CRG6xtDUoKOJQ==",
       "dev": true,
       "requires": {
-        "@types/estree": "^0.0.50",
-        "acorn": "^8.0.5",
-        "estree-walker": "^3.0.0",
-        "is-reference": "^3.0.0",
-        "periscopic": "^3.0.4",
-        "sourcemap-codec": "^1.4.8"
+        "@jridgewell/sourcemap-codec": "^1.4.14",
+        "@types/estree": "^1.0.0",
+        "acorn": "^8.8.2",
+        "estree-walker": "^3.0.3",
+        "periscopic": "^3.1.0"
       }
     },
     "color-convert": {
@@ -7029,10 +7031,13 @@
       "dev": true
     },
     "estree-walker": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.1.tgz",
-      "integrity": "sha512-woY0RUD87WzMBUiZLx8NsYr23N5BKsOMZHhu2hoNRVh6NXGfoiT1KOL8G3UHlJAnEDGmfa5ubNA/AacfG+Kb0g==",
-      "dev": true
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "dev": true,
+      "requires": {
+        "@types/estree": "^1.0.0"
+      }
     },
     "esutils": {
       "version": "2.0.3",
@@ -8351,11 +8356,12 @@
       "dev": true
     },
     "periscopic": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-3.0.4.tgz",
-      "integrity": "sha512-SFx68DxCv0Iyo6APZuw/AKewkkThGwssmU0QWtTlvov3VAtPX+QJ4CadwSaz8nrT5jPIuxdvJWB4PnD2KNDxQg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-3.1.0.tgz",
+      "integrity": "sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==",
       "dev": true,
       "requires": {
+        "@types/estree": "^1.0.0",
         "estree-walker": "^3.0.0",
         "is-reference": "^3.0.0"
       }
diff --git a/package.json b/package.json
index a76b44135b..4e05e8059c 100644
--- a/package.json
+++ b/package.json
@@ -138,7 +138,7 @@
     "agadoo": "^2.0.0",
     "aria-query": "^5.1.1",
     "axobject-query": "^3.1.1",
-    "code-red": "^0.2.5",
+    "code-red": "^1.0.0",
     "css-tree": "^2.2.1",
     "eslint": "^8.26.0",
     "eslint-plugin-import": "^2.26.0",
diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts
index f7d8e8f568..0d6a329dcb 100644
--- a/src/compiler/compile/Component.ts
+++ b/src/compiler/compile/Component.ts
@@ -951,7 +951,7 @@ export default class Component {
 		});
 	}
 
-	warn_on_undefined_store_value_references(node: Node, parent: Node, prop: string, scope: Scope) {
+	warn_on_undefined_store_value_references(node: Node, parent: Node, prop: string | number | symbol, scope: Scope) {
 		if (
 			node.type === 'LabeledStatement' &&
 			node.label.name === '$' &&

From c6d6a73b9d5b34ab84fa0febcf70c06a2bd7b08e Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Fri, 3 Mar 2023 23:18:55 -0800
Subject: [PATCH 05/30] chore: upgrade rollup plugins (#8350)

---
 package-lock.json | 280 +++++++++++++++++++++++++++++++++-------------
 package.json      |   6 +-
 2 files changed, 206 insertions(+), 80 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ef63573f60..617c851fa6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,12 +12,12 @@
         "@ampproject/remapping": "^0.3.0",
         "@jridgewell/sourcemap-codec": "^1.4.14",
         "@rollup/plugin-commonjs": "^11.0.0",
-        "@rollup/plugin-json": "^4.0.1",
+        "@rollup/plugin-json": "^6.0.0",
         "@rollup/plugin-node-resolve": "^11.2.1",
-        "@rollup/plugin-replace": "^2.3.0",
+        "@rollup/plugin-replace": "^5.0.2",
         "@rollup/plugin-sucrase": "^3.1.0",
         "@rollup/plugin-typescript": "^2.0.1",
-        "@rollup/plugin-virtual": "^2.0.0",
+        "@rollup/plugin-virtual": "^3.0.1",
         "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.8.0",
         "@types/aria-query": "^5.0.0",
         "@types/mocha": "^7.0.0",
@@ -244,14 +244,59 @@
       }
     },
     "node_modules/@rollup/plugin-json": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.0.1.tgz",
-      "integrity": "sha512-soxllkhOGgchswBAAaTe7X9G80U2tjjHvXv0sBrriLJcC/89PkP59iTrKPOfbz3SjX088mKDmMhAscuyLz8ZSg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-6.0.0.tgz",
+      "integrity": "sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==",
       "dev": true,
       "dependencies": {
-        "rollup-pluginutils": "^2.5.0"
+        "@rollup/pluginutils": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
       }
     },
+    "node_modules/@rollup/plugin-json/node_modules/@rollup/pluginutils": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz",
+      "integrity": "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "estree-walker": "^2.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-json/node_modules/@types/estree": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz",
+      "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==",
+      "dev": true
+    },
+    "node_modules/@rollup/plugin-json/node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true
+    },
     "node_modules/@rollup/plugin-node-resolve": {
       "version": "11.2.1",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz",
@@ -302,22 +347,70 @@
       "dev": true
     },
     "node_modules/@rollup/plugin-replace": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.3.0.tgz",
-      "integrity": "sha512-rzWAMqXAHC1w3eKpK6LxRqiF4f3qVFaa1sGii6Bp3rluKcwHNOpPt+hWRCmAH6SDEPtbPiLFf0pfNQyHs6Btlg==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-5.0.2.tgz",
+      "integrity": "sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA==",
       "dev": true,
       "dependencies": {
-        "magic-string": "^0.25.2",
-        "rollup-pluginutils": "^2.6.0"
+        "@rollup/pluginutils": "^5.0.1",
+        "magic-string": "^0.27.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
       }
     },
+    "node_modules/@rollup/plugin-replace/node_modules/@rollup/pluginutils": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz",
+      "integrity": "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "estree-walker": "^2.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-replace/node_modules/@types/estree": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz",
+      "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==",
+      "dev": true
+    },
+    "node_modules/@rollup/plugin-replace/node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true
+    },
     "node_modules/@rollup/plugin-replace/node_modules/magic-string": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+      "version": "0.27.0",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz",
+      "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",
       "dev": true,
       "dependencies": {
-        "sourcemap-codec": "^1.4.8"
+        "@jridgewell/sourcemap-codec": "^1.4.13"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/@rollup/plugin-sucrase": {
@@ -334,23 +427,39 @@
       }
     },
     "node_modules/@rollup/plugin-typescript": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-2.0.1.tgz",
-      "integrity": "sha512-UA/bN/DlHN19xdOllXmp7G7pM2ac9dQMg0q2T1rg4Bogzb7oHXj2WGafpiNpEm54PivcJdzGRJvRnI6zCISW3w==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-2.1.0.tgz",
+      "integrity": "sha512-7lXKGY06aofrceVez/YnN2axttFdHSqlUBpCJ6ebzDfxwLDKMgSV5lD4ykBcdgE7aK3egxuLkD/HKyRB5L8Log==",
       "dev": true,
       "dependencies": {
         "@rollup/pluginutils": "^3.0.0",
-        "resolve": "^1.12.2"
+        "resolve": "^1.13.1"
       },
       "engines": {
         "node": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0",
+        "tslib": "*",
+        "typescript": ">=2.1.0"
       }
     },
     "node_modules/@rollup/plugin-virtual": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-virtual/-/plugin-virtual-2.0.0.tgz",
-      "integrity": "sha512-yUyQjcflsN1DGcUHj3I0NYL6Y6xrna6qjdaGjM93LjFLq8NFowhR0655ICeV9bNDbk+LI4pz7Q6xqeDdj1RdlA==",
-      "dev": true
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-virtual/-/plugin-virtual-3.0.1.tgz",
+      "integrity": "sha512-fK8O0IL5+q+GrsMLuACVNk2x21g3yaw+sG2qn16SnUd3IlBsQyvWxLMGHmCmXRMecPjGRSZ/1LmZB4rjQm68og==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
     },
     "node_modules/@rollup/pluginutils": {
       "version": "3.0.1",
@@ -4407,21 +4516,6 @@
       "deprecated": "This package has been deprecated and is no longer maintained. Please use @rollup/plugin-virtual.",
       "dev": true
     },
-    "node_modules/rollup-pluginutils": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
-      "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
-      "dev": true,
-      "dependencies": {
-        "estree-walker": "^0.6.1"
-      }
-    },
-    "node_modules/rollup-pluginutils/node_modules/estree-walker": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
-      "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
-      "dev": true
-    },
     "node_modules/rollup/node_modules/acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -5457,12 +5551,37 @@
       }
     },
     "@rollup/plugin-json": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.0.1.tgz",
-      "integrity": "sha512-soxllkhOGgchswBAAaTe7X9G80U2tjjHvXv0sBrriLJcC/89PkP59iTrKPOfbz3SjX088mKDmMhAscuyLz8ZSg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-6.0.0.tgz",
+      "integrity": "sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==",
       "dev": true,
       "requires": {
-        "rollup-pluginutils": "^2.5.0"
+        "@rollup/pluginutils": "^5.0.1"
+      },
+      "dependencies": {
+        "@rollup/pluginutils": {
+          "version": "5.0.2",
+          "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz",
+          "integrity": "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==",
+          "dev": true,
+          "requires": {
+            "@types/estree": "^1.0.0",
+            "estree-walker": "^2.0.2",
+            "picomatch": "^2.3.1"
+          }
+        },
+        "@types/estree": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz",
+          "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==",
+          "dev": true
+        },
+        "estree-walker": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+          "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+          "dev": true
+        }
       }
     },
     "@rollup/plugin-node-resolve": {
@@ -5505,22 +5624,45 @@
       }
     },
     "@rollup/plugin-replace": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.3.0.tgz",
-      "integrity": "sha512-rzWAMqXAHC1w3eKpK6LxRqiF4f3qVFaa1sGii6Bp3rluKcwHNOpPt+hWRCmAH6SDEPtbPiLFf0pfNQyHs6Btlg==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-5.0.2.tgz",
+      "integrity": "sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA==",
       "dev": true,
       "requires": {
-        "magic-string": "^0.25.2",
-        "rollup-pluginutils": "^2.6.0"
+        "@rollup/pluginutils": "^5.0.1",
+        "magic-string": "^0.27.0"
       },
       "dependencies": {
+        "@rollup/pluginutils": {
+          "version": "5.0.2",
+          "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz",
+          "integrity": "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==",
+          "dev": true,
+          "requires": {
+            "@types/estree": "^1.0.0",
+            "estree-walker": "^2.0.2",
+            "picomatch": "^2.3.1"
+          }
+        },
+        "@types/estree": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz",
+          "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==",
+          "dev": true
+        },
+        "estree-walker": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+          "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+          "dev": true
+        },
         "magic-string": {
-          "version": "0.25.9",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-          "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+          "version": "0.27.0",
+          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz",
+          "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",
           "dev": true,
           "requires": {
-            "sourcemap-codec": "^1.4.8"
+            "@jridgewell/sourcemap-codec": "^1.4.13"
           }
         }
       }
@@ -5536,20 +5678,21 @@
       }
     },
     "@rollup/plugin-typescript": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-2.0.1.tgz",
-      "integrity": "sha512-UA/bN/DlHN19xdOllXmp7G7pM2ac9dQMg0q2T1rg4Bogzb7oHXj2WGafpiNpEm54PivcJdzGRJvRnI6zCISW3w==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-2.1.0.tgz",
+      "integrity": "sha512-7lXKGY06aofrceVez/YnN2axttFdHSqlUBpCJ6ebzDfxwLDKMgSV5lD4ykBcdgE7aK3egxuLkD/HKyRB5L8Log==",
       "dev": true,
       "requires": {
         "@rollup/pluginutils": "^3.0.0",
-        "resolve": "^1.12.2"
+        "resolve": "^1.13.1"
       }
     },
     "@rollup/plugin-virtual": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-virtual/-/plugin-virtual-2.0.0.tgz",
-      "integrity": "sha512-yUyQjcflsN1DGcUHj3I0NYL6Y6xrna6qjdaGjM93LjFLq8NFowhR0655ICeV9bNDbk+LI4pz7Q6xqeDdj1RdlA==",
-      "dev": true
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-virtual/-/plugin-virtual-3.0.1.tgz",
+      "integrity": "sha512-fK8O0IL5+q+GrsMLuACVNk2x21g3yaw+sG2qn16SnUd3IlBsQyvWxLMGHmCmXRMecPjGRSZ/1LmZB4rjQm68og==",
+      "dev": true,
+      "requires": {}
     },
     "@rollup/pluginutils": {
       "version": "3.0.1",
@@ -8652,23 +8795,6 @@
       "integrity": "sha512-HCTBpV8MwP5lNzZrHD2moVxHIToHU1EkzkKGVj6Z0DcgUfxrxrZmeQirQeLz2yhnkJqRjwiVywK9CS8jDYakrw==",
       "dev": true
     },
-    "rollup-pluginutils": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
-      "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
-      "dev": true,
-      "requires": {
-        "estree-walker": "^0.6.1"
-      },
-      "dependencies": {
-        "estree-walker": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
-          "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
-          "dev": true
-        }
-      }
-    },
     "run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
diff --git a/package.json b/package.json
index 4e05e8059c..c04043e346 100644
--- a/package.json
+++ b/package.json
@@ -122,12 +122,12 @@
     "@ampproject/remapping": "^0.3.0",
     "@jridgewell/sourcemap-codec": "^1.4.14",
     "@rollup/plugin-commonjs": "^11.0.0",
-    "@rollup/plugin-json": "^4.0.1",
+    "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^11.2.1",
-    "@rollup/plugin-replace": "^2.3.0",
+    "@rollup/plugin-replace": "^5.0.2",
     "@rollup/plugin-sucrase": "^3.1.0",
     "@rollup/plugin-typescript": "^2.0.1",
-    "@rollup/plugin-virtual": "^2.0.0",
+    "@rollup/plugin-virtual": "^3.0.1",
     "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.8.0",
     "@types/aria-query": "^5.0.0",
     "@types/mocha": "^7.0.0",

From 11af8509242956d5414fd8dc3205a40855437ab5 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 6 Mar 2023 09:41:38 +0100
Subject: [PATCH 06/30] fix: correct meta attributes

fixes https://github.com/sveltejs/language-tools/issues/1917
---
 elements/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/elements/index.d.ts b/elements/index.d.ts
index d2de6767ff..72a077a7d5 100644
--- a/elements/index.d.ts
+++ b/elements/index.d.ts
@@ -869,9 +869,9 @@ export interface HTMLMediaAttributes<T extends HTMLMediaElement> extends HTMLAtt
 }
 
 export interface HTMLMetaAttributes extends HTMLAttributes<HTMLMetaElement> {
-	charSet?: string | undefined | null;
+	charset?: string | undefined | null;
 	content?: string | undefined | null;
-	httpequiv?: string | undefined | null;
+	'http-equiv'?: string | undefined | null;
 	name?: string | undefined | null;
 	media?: string | undefined | null;
 }

From 757a81ac6db186b707fceb2a4be37b852a99102f Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Wed, 8 Mar 2023 08:50:11 -0800
Subject: [PATCH 07/30] chore: upgrade dependencies (#8352)

---
 package-lock.json | 901 +++++++++++++++++++++++-----------------------
 package.json      |  20 +-
 2 files changed, 458 insertions(+), 463 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 617c851fa6..a374ae9b32 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,31 +22,31 @@
         "@types/aria-query": "^5.0.0",
         "@types/mocha": "^7.0.0",
         "@types/node": "^8.10.53",
-        "@typescript-eslint/eslint-plugin": "^5.22.0",
-        "@typescript-eslint/parser": "^5.22.0",
+        "@typescript-eslint/eslint-plugin": "^5.29.0",
+        "@typescript-eslint/parser": "^5.29.0",
         "acorn": "^8.8.1",
-        "agadoo": "^2.0.0",
+        "agadoo": "^3.0.0",
         "aria-query": "^5.1.1",
         "axobject-query": "^3.1.1",
         "code-red": "^1.0.0",
-        "css-tree": "^2.2.1",
-        "eslint": "^8.26.0",
-        "eslint-plugin-import": "^2.26.0",
+        "css-tree": "^2.3.1",
+        "eslint": "^8.35.0",
+        "eslint-plugin-import": "^2.27.0",
         "eslint-plugin-svelte3": "^4.0.0",
-        "estree-walker": "^3.0.1",
-        "is-reference": "^3.0.0",
+        "estree-walker": "^3.0.3",
+        "is-reference": "^3.0.1",
         "jsdom": "^15.2.1",
         "kleur": "^4.1.5",
         "locate-character": "^2.0.5",
         "magic-string": "^0.30.0",
         "mocha": "^7.0.0",
-        "periscopic": "^3.0.4",
+        "periscopic": "^3.1.0",
         "puppeteer": "^2.0.0",
         "rollup": "^1.27.14",
         "source-map": "^0.7.4",
         "source-map-support": "^0.5.21",
         "tiny-glob": "^0.2.9",
-        "tslib": "^2.4.1",
+        "tslib": "^2.5.0",
         "typescript": "^3.7.5",
         "util": "^0.12.5"
       },
@@ -68,15 +68,15 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
-      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz",
+      "integrity": "sha512-fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
         "espree": "^9.4.0",
-        "globals": "^13.15.0",
+        "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
@@ -120,20 +120,41 @@
         "node": "*"
       }
     },
+    "node_modules/@eslint/js": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.35.0.tgz",
+      "integrity": "sha512-JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.6.tgz",
-      "integrity": "sha512-jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
+      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
         "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
+        "minimatch": "^3.0.5"
       },
       "engines": {
         "node": ">=10.10.0"
       }
     },
+    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -535,19 +556,19 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.22.0.tgz",
-      "integrity": "sha512-YCiy5PUzpAeOPGQ7VSGDEY2NeYUV1B0swde2e0HzokRsHBYjSdF6DZ51OuRZxVPHx0032lXGLvOMls91D8FXlg==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.29.0.tgz",
+      "integrity": "sha512-kgTsISt9pM53yRFQmLZ4npj99yGl3x3Pl7z4eA66OuTzAGC4bQB5H5fuLwPnqTKU3yyrrg4MIhjF17UYnL4c0w==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.22.0",
-        "@typescript-eslint/type-utils": "5.22.0",
-        "@typescript-eslint/utils": "5.22.0",
-        "debug": "^4.3.2",
+        "@typescript-eslint/scope-manager": "5.29.0",
+        "@typescript-eslint/type-utils": "5.29.0",
+        "@typescript-eslint/utils": "5.29.0",
+        "debug": "^4.3.4",
         "functional-red-black-tree": "^1.0.1",
-        "ignore": "^5.1.8",
+        "ignore": "^5.2.0",
         "regexpp": "^3.2.0",
-        "semver": "^7.3.5",
+        "semver": "^7.3.7",
         "tsutils": "^3.21.0"
       },
       "engines": {
@@ -568,9 +589,9 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -583,15 +604,15 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "5.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.22.0.tgz",
-      "integrity": "sha512-piwC4krUpRDqPaPbFaycN70KCP87+PC5WZmrWs+DlVOxxmF+zI6b6hETv7Quy4s9wbkV16ikMeZgXsvzwI3icQ==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.29.0.tgz",
+      "integrity": "sha512-ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.22.0",
-        "@typescript-eslint/types": "5.22.0",
-        "@typescript-eslint/typescript-estree": "5.22.0",
-        "debug": "^4.3.2"
+        "@typescript-eslint/scope-manager": "5.29.0",
+        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/typescript-estree": "5.29.0",
+        "debug": "^4.3.4"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -610,13 +631,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.22.0.tgz",
-      "integrity": "sha512-yA9G5NJgV5esANJCO0oF15MkBO20mIskbZ8ijfmlKIvQKg0ynVKfHZ15/nhAJN5m8Jn3X5qkwriQCiUntC9AbA==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.29.0.tgz",
+      "integrity": "sha512-etbXUT0FygFi2ihcxDZjz21LtC+Eps9V2xVx09zFoN44RRHPrkMflidGMI+2dUs821zR1tDS6Oc9IXxIjOUZwA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.22.0",
-        "@typescript-eslint/visitor-keys": "5.22.0"
+        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/visitor-keys": "5.29.0"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -627,13 +648,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "5.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.22.0.tgz",
-      "integrity": "sha512-iqfLZIsZhK2OEJ4cQ01xOq3NaCuG5FQRKyHicA3xhZxMgaxQazLUHbH/B2k9y5i7l3+o+B5ND9Mf1AWETeMISA==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.29.0.tgz",
+      "integrity": "sha512-JK6bAaaiJozbox3K220VRfCzLa9n0ib/J+FHIwnaV3Enw/TO267qe0pM1b1QrrEuy6xun374XEAsRlA86JJnyg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/utils": "5.22.0",
-        "debug": "^4.3.2",
+        "@typescript-eslint/utils": "5.29.0",
+        "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       },
       "engines": {
@@ -653,9 +674,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "5.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.22.0.tgz",
-      "integrity": "sha512-T7owcXW4l0v7NTijmjGWwWf/1JqdlWiBzPqzAWhobxft0SiEvMJB56QXmeCQjrPuM8zEfGUKyPQr/L8+cFUBLw==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.29.0.tgz",
+      "integrity": "sha512-X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -666,17 +687,17 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.22.0.tgz",
-      "integrity": "sha512-EyBEQxvNjg80yinGE2xdhpDYm41so/1kOItl0qrjIiJ1kX/L/L8WWGmJg8ni6eG3DwqmOzDqOhe6763bF92nOw==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.29.0.tgz",
+      "integrity": "sha512-mQvSUJ/JjGBdvo+1LwC+GY2XmSYjK1nAaVw2emp/E61wEVYEyibRHCqm1I1vEKbXCpUKuW4G7u9ZCaZhJbLoNQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.22.0",
-        "@typescript-eslint/visitor-keys": "5.22.0",
-        "debug": "^4.3.2",
-        "globby": "^11.0.4",
+        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/visitor-keys": "5.29.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
         "is-glob": "^4.0.3",
-        "semver": "^7.3.5",
+        "semver": "^7.3.7",
         "tsutils": "^3.21.0"
       },
       "engines": {
@@ -693,9 +714,9 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -708,15 +729,15 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "5.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.22.0.tgz",
-      "integrity": "sha512-HodsGb037iobrWSUMS7QH6Hl1kppikjA1ELiJlNSTYf/UdMEwzgj0WIp+lBNb6WZ3zTwb0tEz51j0Wee3iJ3wQ==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.29.0.tgz",
+      "integrity": "sha512-3Eos6uP1nyLOBayc/VUdKZikV90HahXE5Dx9L5YlSd/7ylQPXhLk1BYb29SDgnBnTp+jmSZUU0QxUiyHgW4p7A==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.22.0",
-        "@typescript-eslint/types": "5.22.0",
-        "@typescript-eslint/typescript-estree": "5.22.0",
+        "@typescript-eslint/scope-manager": "5.29.0",
+        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/typescript-estree": "5.29.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0"
       },
@@ -732,13 +753,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.22.0.tgz",
-      "integrity": "sha512-DbgTqn2Dv5RFWluG88tn0pP6Ex0ROF+dpDO1TNNZdRtLjUr6bdznjA6f/qNqJLjd2PgguAES2Zgxh/JzwzETDg==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.29.0.tgz",
+      "integrity": "sha512-Hpb/mCWsjILvikMQoZIE3voc9wtQcS0A9FUw3h8bhr9UxBdtI/tw1ZDZUOXHXLOVMedKCH5NxyzATwnU78bWCQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.22.0",
-        "eslint-visitor-keys": "^3.0.0"
+        "@typescript-eslint/types": "5.29.0",
+        "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -816,29 +837,47 @@
       }
     },
     "node_modules/agadoo": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/agadoo/-/agadoo-2.0.0.tgz",
-      "integrity": "sha512-68aFhseH51ZBKYKkQNxwDi1hJwTnywBjHWg068qFnMkpXShhOazNzJUPRvaLQjrqhT3EOUth5G9mt1A0/dGhOw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/agadoo/-/agadoo-3.0.0.tgz",
+      "integrity": "sha512-gq+fjT3Ilrhb88Jf+vYMjdO/+3znYfa7vJ4IMLPFsBPUxglnr40Ed3yCLrW6IABdJAedB94b2BkqR6I04lh3dg==",
       "dev": true,
       "dependencies": {
-        "acorn": "^7.1.0",
-        "rollup": "^1",
-        "rollup-plugin-virtual": "^1.0.1"
+        "@rollup/plugin-virtual": "^3.0.1",
+        "acorn": "^8.8.1",
+        "rollup": "^3.5.0"
       },
       "bin": {
-        "agadoo": "agadoo"
+        "agadoo": "cli.js"
       }
     },
-    "node_modules/agadoo/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+    "node_modules/agadoo/node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/agadoo/node_modules/rollup": {
+      "version": "3.18.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.18.0.tgz",
+      "integrity": "sha512-J8C6VfEBjkvYPESMQYxKHxNOh4A5a3FlP+0BETGo34HEcE4eTlgCrO2+eWzlu2a/sHs2QUkZco+wscH7jhhgWg==",
       "dev": true,
       "bin": {
-        "acorn": "bin/acorn"
+        "rollup": "dist/bin/rollup"
       },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=14.18.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
       }
     },
     "node_modules/agent-base": {
@@ -931,15 +970,15 @@
       "dev": true
     },
     "node_modules/array-includes": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5",
-        "get-intrinsic": "^1.1.1",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
         "is-string": "^1.0.7"
       },
       "engines": {
@@ -959,14 +998,32 @@
       }
     },
     "node_modules/array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
+      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
         "es-shim-unscopables": "^1.0.0"
       },
       "engines": {
@@ -1296,17 +1353,16 @@
       "dev": true
     },
     "node_modules/css-tree": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
-      "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
+      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
       "dev": true,
       "dependencies": {
-        "mdn-data": "2.0.28",
+        "mdn-data": "2.0.30",
         "source-map-js": "^1.0.1"
       },
       "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
-        "npm": ">=7.0.0"
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
       }
     },
     "node_modules/cssom": {
@@ -1357,9 +1413,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -1689,13 +1745,14 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.26.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.26.0.tgz",
-      "integrity": "sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz",
+      "integrity": "sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw==",
       "dev": true,
       "dependencies": {
-        "@eslint/eslintrc": "^1.3.3",
-        "@humanwhocodes/config-array": "^0.11.6",
+        "@eslint/eslintrc": "^2.0.0",
+        "@eslint/js": "8.35.0",
+        "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.10.0",
@@ -1708,13 +1765,13 @@
         "eslint-utils": "^3.0.0",
         "eslint-visitor-keys": "^3.3.0",
         "espree": "^9.4.0",
-        "esquery": "^1.4.0",
+        "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
-        "globals": "^13.15.0",
+        "globals": "^13.19.0",
         "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
@@ -1745,13 +1802,14 @@
       }
     },
     "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
+      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
       "dev": true,
       "dependencies": {
         "debug": "^3.2.7",
-        "resolve": "^1.20.0"
+        "is-core-module": "^2.11.0",
+        "resolve": "^1.22.1"
       }
     },
     "node_modules/eslint-import-resolver-node/node_modules/debug": {
@@ -1764,16 +1822,20 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
+      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
       "dev": true,
       "dependencies": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
+        "debug": "^3.2.7"
       },
       "engines": {
         "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
       }
     },
     "node_modules/eslint-module-utils/node_modules/debug": {
@@ -1785,82 +1847,26 @@
         "ms": "^2.1.1"
       }
     },
-    "node_modules/eslint-module-utils/node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "version": "2.27.5",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
+      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
       "dev": true,
       "dependencies": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "array.prototype.flatmap": "^1.3.1",
+        "debug": "^3.2.7",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
+        "eslint-import-resolver-node": "^0.3.7",
+        "eslint-module-utils": "^2.7.4",
         "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
+        "is-core-module": "^2.11.0",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
+        "object.values": "^1.1.6",
+        "resolve": "^1.22.1",
+        "semver": "^6.3.0",
         "tsconfig-paths": "^3.14.1"
       },
       "engines": {
@@ -1871,12 +1877,12 @@
       }
     },
     "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "dependencies": {
-        "ms": "2.0.0"
+        "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/doctrine": {
@@ -1903,11 +1909,14 @@
         "node": "*"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
+    "node_modules/eslint-plugin-import/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
     },
     "node_modules/eslint-plugin-svelte3": {
       "version": "4.0.0",
@@ -2310,9 +2319,9 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
+      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
       "dev": true,
       "dependencies": {
         "acorn": "^8.8.0",
@@ -2349,9 +2358,9 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
       "dependencies": {
         "estraverse": "^5.1.0"
@@ -2361,9 +2370,9 @@
       }
     },
     "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
       "engines": {
         "node": ">=4.0"
@@ -2469,9 +2478,9 @@
       "dev": true
     },
     "node_modules/fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -2676,7 +2685,7 @@
     "node_modules/functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
       "dev": true
     },
     "node_modules/functions-have-names": {
@@ -2769,9 +2778,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.17.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+      "version": "13.20.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -3144,9 +3153,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
-      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -3276,9 +3285,9 @@
       }
     },
     "node_modules/is-reference": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.0.tgz",
-      "integrity": "sha512-Eo1W3wUoHWoCoVM4GVl/a+K0IgiqE5aIo4kJABFyMum1ZORlPkC+UC357sSQUL5w5QCE5kCC9upl75b7+7CY/Q==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.1.tgz",
+      "integrity": "sha512-baJJdQLiYaJdvFbJqXrcGv3WU3QCzBlUcI5QhbesIm6/xPsvmO+2CDoi/GMOFBQEQm+PXkwOPrp9KK5ozZsp2w==",
       "dev": true,
       "dependencies": {
         "@types/estree": "*"
@@ -3655,9 +3664,9 @@
       }
     },
     "node_modules/mdn-data": {
-      "version": "2.0.28",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
-      "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
+      "version": "2.0.30",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
       "dev": true
     },
     "node_modules/merge2": {
@@ -4003,14 +4012,14 @@
       }
     },
     "node_modules/object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4448,12 +4457,12 @@
       "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
       "dev": true,
       "dependencies": {
-        "is-core-module": "^2.8.1",
+        "is-core-module": "^2.9.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -4509,13 +4518,6 @@
         "rollup": "dist/bin/rollup"
       }
     },
-    "node_modules/rollup-plugin-virtual": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-virtual/-/rollup-plugin-virtual-1.0.1.tgz",
-      "integrity": "sha512-HCTBpV8MwP5lNzZrHD2moVxHIToHU1EkzkKGVj6Z0DcgUfxrxrZmeQirQeLz2yhnkJqRjwiVywK9CS8jDYakrw==",
-      "deprecated": "This package has been deprecated and is no longer maintained. Please use @rollup/plugin-virtual.",
-      "dev": true
-    },
     "node_modules/rollup/node_modules/acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -4946,9 +4948,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",
       "dev": true
     },
     "node_modules/tsutils": {
@@ -5408,15 +5410,15 @@
       }
     },
     "@eslint/eslintrc": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
-      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz",
+      "integrity": "sha512-fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
         "espree": "^9.4.0",
-        "globals": "^13.15.0",
+        "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
@@ -5450,15 +5452,32 @@
         }
       }
     },
+    "@eslint/js": {
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.35.0.tgz",
+      "integrity": "sha512-JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw==",
+      "dev": true
+    },
     "@humanwhocodes/config-array": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.6.tgz",
-      "integrity": "sha512-jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
+      "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
       "dev": true,
       "requires": {
         "@humanwhocodes/object-schema": "^1.2.1",
         "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
+        "minimatch": "^3.0.5"
+      },
+      "dependencies": {
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        }
       }
     },
     "@humanwhocodes/module-importer": {
@@ -5768,26 +5787,26 @@
       }
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.22.0.tgz",
-      "integrity": "sha512-YCiy5PUzpAeOPGQ7VSGDEY2NeYUV1B0swde2e0HzokRsHBYjSdF6DZ51OuRZxVPHx0032lXGLvOMls91D8FXlg==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.29.0.tgz",
+      "integrity": "sha512-kgTsISt9pM53yRFQmLZ4npj99yGl3x3Pl7z4eA66OuTzAGC4bQB5H5fuLwPnqTKU3yyrrg4MIhjF17UYnL4c0w==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.22.0",
-        "@typescript-eslint/type-utils": "5.22.0",
-        "@typescript-eslint/utils": "5.22.0",
-        "debug": "^4.3.2",
+        "@typescript-eslint/scope-manager": "5.29.0",
+        "@typescript-eslint/type-utils": "5.29.0",
+        "@typescript-eslint/utils": "5.29.0",
+        "debug": "^4.3.4",
         "functional-red-black-tree": "^1.0.1",
-        "ignore": "^5.1.8",
+        "ignore": "^5.2.0",
         "regexpp": "^3.2.0",
-        "semver": "^7.3.5",
+        "semver": "^7.3.7",
         "tsutils": "^3.21.0"
       },
       "dependencies": {
         "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -5796,63 +5815,63 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.22.0.tgz",
-      "integrity": "sha512-piwC4krUpRDqPaPbFaycN70KCP87+PC5WZmrWs+DlVOxxmF+zI6b6hETv7Quy4s9wbkV16ikMeZgXsvzwI3icQ==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.29.0.tgz",
+      "integrity": "sha512-ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.22.0",
-        "@typescript-eslint/types": "5.22.0",
-        "@typescript-eslint/typescript-estree": "5.22.0",
-        "debug": "^4.3.2"
+        "@typescript-eslint/scope-manager": "5.29.0",
+        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/typescript-estree": "5.29.0",
+        "debug": "^4.3.4"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.22.0.tgz",
-      "integrity": "sha512-yA9G5NJgV5esANJCO0oF15MkBO20mIskbZ8ijfmlKIvQKg0ynVKfHZ15/nhAJN5m8Jn3X5qkwriQCiUntC9AbA==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.29.0.tgz",
+      "integrity": "sha512-etbXUT0FygFi2ihcxDZjz21LtC+Eps9V2xVx09zFoN44RRHPrkMflidGMI+2dUs821zR1tDS6Oc9IXxIjOUZwA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.22.0",
-        "@typescript-eslint/visitor-keys": "5.22.0"
+        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/visitor-keys": "5.29.0"
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "5.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.22.0.tgz",
-      "integrity": "sha512-iqfLZIsZhK2OEJ4cQ01xOq3NaCuG5FQRKyHicA3xhZxMgaxQazLUHbH/B2k9y5i7l3+o+B5ND9Mf1AWETeMISA==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.29.0.tgz",
+      "integrity": "sha512-JK6bAaaiJozbox3K220VRfCzLa9n0ib/J+FHIwnaV3Enw/TO267qe0pM1b1QrrEuy6xun374XEAsRlA86JJnyg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/utils": "5.22.0",
-        "debug": "^4.3.2",
+        "@typescript-eslint/utils": "5.29.0",
+        "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.22.0.tgz",
-      "integrity": "sha512-T7owcXW4l0v7NTijmjGWwWf/1JqdlWiBzPqzAWhobxft0SiEvMJB56QXmeCQjrPuM8zEfGUKyPQr/L8+cFUBLw==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.29.0.tgz",
+      "integrity": "sha512-X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.22.0.tgz",
-      "integrity": "sha512-EyBEQxvNjg80yinGE2xdhpDYm41so/1kOItl0qrjIiJ1kX/L/L8WWGmJg8ni6eG3DwqmOzDqOhe6763bF92nOw==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.29.0.tgz",
+      "integrity": "sha512-mQvSUJ/JjGBdvo+1LwC+GY2XmSYjK1nAaVw2emp/E61wEVYEyibRHCqm1I1vEKbXCpUKuW4G7u9ZCaZhJbLoNQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.22.0",
-        "@typescript-eslint/visitor-keys": "5.22.0",
-        "debug": "^4.3.2",
-        "globby": "^11.0.4",
+        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/visitor-keys": "5.29.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
         "is-glob": "^4.0.3",
-        "semver": "^7.3.5",
+        "semver": "^7.3.7",
         "tsutils": "^3.21.0"
       },
       "dependencies": {
         "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -5861,27 +5880,27 @@
       }
     },
     "@typescript-eslint/utils": {
-      "version": "5.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.22.0.tgz",
-      "integrity": "sha512-HodsGb037iobrWSUMS7QH6Hl1kppikjA1ELiJlNSTYf/UdMEwzgj0WIp+lBNb6WZ3zTwb0tEz51j0Wee3iJ3wQ==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.29.0.tgz",
+      "integrity": "sha512-3Eos6uP1nyLOBayc/VUdKZikV90HahXE5Dx9L5YlSd/7ylQPXhLk1BYb29SDgnBnTp+jmSZUU0QxUiyHgW4p7A==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.22.0",
-        "@typescript-eslint/types": "5.22.0",
-        "@typescript-eslint/typescript-estree": "5.22.0",
+        "@typescript-eslint/scope-manager": "5.29.0",
+        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/typescript-estree": "5.29.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0"
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.22.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.22.0.tgz",
-      "integrity": "sha512-DbgTqn2Dv5RFWluG88tn0pP6Ex0ROF+dpDO1TNNZdRtLjUr6bdznjA6f/qNqJLjd2PgguAES2Zgxh/JzwzETDg==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.29.0.tgz",
+      "integrity": "sha512-Hpb/mCWsjILvikMQoZIE3voc9wtQcS0A9FUw3h8bhr9UxBdtI/tw1ZDZUOXHXLOVMedKCH5NxyzATwnU78bWCQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.22.0",
-        "eslint-visitor-keys": "^3.0.0"
+        "@typescript-eslint/types": "5.29.0",
+        "eslint-visitor-keys": "^3.3.0"
       },
       "dependencies": {
         "eslint-visitor-keys": {
@@ -5936,21 +5955,31 @@
       "dev": true
     },
     "agadoo": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/agadoo/-/agadoo-2.0.0.tgz",
-      "integrity": "sha512-68aFhseH51ZBKYKkQNxwDi1hJwTnywBjHWg068qFnMkpXShhOazNzJUPRvaLQjrqhT3EOUth5G9mt1A0/dGhOw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/agadoo/-/agadoo-3.0.0.tgz",
+      "integrity": "sha512-gq+fjT3Ilrhb88Jf+vYMjdO/+3znYfa7vJ4IMLPFsBPUxglnr40Ed3yCLrW6IABdJAedB94b2BkqR6I04lh3dg==",
       "dev": true,
       "requires": {
-        "acorn": "^7.1.0",
-        "rollup": "^1",
-        "rollup-plugin-virtual": "^1.0.1"
+        "@rollup/plugin-virtual": "^3.0.1",
+        "acorn": "^8.8.1",
+        "rollup": "^3.5.0"
       },
       "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-          "dev": true
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "dev": true,
+          "optional": true
+        },
+        "rollup": {
+          "version": "3.18.0",
+          "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.18.0.tgz",
+          "integrity": "sha512-J8C6VfEBjkvYPESMQYxKHxNOh4A5a3FlP+0BETGo34HEcE4eTlgCrO2+eWzlu2a/sHs2QUkZco+wscH7jhhgWg==",
+          "dev": true,
+          "requires": {
+            "fsevents": "~2.3.2"
+          }
         }
       }
     },
@@ -6028,15 +6057,15 @@
       "dev": true
     },
     "array-includes": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5",
-        "get-intrinsic": "^1.1.1",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
         "is-string": "^1.0.7"
       }
     },
@@ -6047,14 +6076,26 @@
       "dev": true
     },
     "array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
+    "array.prototype.flatmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
+      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
         "es-shim-unscopables": "^1.0.0"
       }
     },
@@ -6327,12 +6368,12 @@
       "dev": true
     },
     "css-tree": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
-      "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
+      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
       "dev": true,
       "requires": {
-        "mdn-data": "2.0.28",
+        "mdn-data": "2.0.30",
         "source-map-js": "^1.0.1"
       }
     },
@@ -6380,9 +6421,9 @@
       }
     },
     "debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "requires": {
         "ms": "2.1.2"
@@ -6639,13 +6680,14 @@
       }
     },
     "eslint": {
-      "version": "8.26.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.26.0.tgz",
-      "integrity": "sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==",
+      "version": "8.35.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz",
+      "integrity": "sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw==",
       "dev": true,
       "requires": {
-        "@eslint/eslintrc": "^1.3.3",
-        "@humanwhocodes/config-array": "^0.11.6",
+        "@eslint/eslintrc": "^2.0.0",
+        "@eslint/js": "8.35.0",
+        "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.10.0",
@@ -6658,13 +6700,13 @@
         "eslint-utils": "^3.0.0",
         "eslint-visitor-keys": "^3.3.0",
         "espree": "^9.4.0",
-        "esquery": "^1.4.0",
+        "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
-        "globals": "^13.15.0",
+        "globals": "^13.19.0",
         "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
@@ -6936,13 +6978,14 @@
       }
     },
     "eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
+      "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
       "dev": true,
       "requires": {
         "debug": "^3.2.7",
-        "resolve": "^1.20.0"
+        "is-core-module": "^2.11.0",
+        "resolve": "^1.22.1"
       },
       "dependencies": {
         "debug": {
@@ -6957,13 +7000,12 @@
       }
     },
     "eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
+      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
       "dev": true,
       "requires": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
+        "debug": "^3.2.7"
       },
       "dependencies": {
         "debug": {
@@ -6974,80 +7016,39 @@
           "requires": {
             "ms": "^2.1.1"
           }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "dev": true,
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "dev": true,
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "dev": true,
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-          "dev": true
         }
       }
     },
     "eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "version": "2.27.5",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
+      "integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
       "dev": true,
       "requires": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "array.prototype.flatmap": "^1.3.1",
+        "debug": "^3.2.7",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
+        "eslint-import-resolver-node": "^0.3.7",
+        "eslint-module-utils": "^2.7.4",
         "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
+        "is-core-module": "^2.11.0",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
+        "object.values": "^1.1.6",
+        "resolve": "^1.22.1",
+        "semver": "^6.3.0",
         "tsconfig-paths": "^3.14.1"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
         },
         "doctrine": {
@@ -7068,10 +7069,10 @@
             "brace-expansion": "^1.1.7"
           }
         },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         }
       }
@@ -7109,9 +7110,9 @@
       "dev": true
     },
     "espree": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+      "version": "9.4.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
+      "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
       "dev": true,
       "requires": {
         "acorn": "^8.8.0",
@@ -7134,18 +7135,18 @@
       "dev": true
     },
     "esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
       "requires": {
         "estraverse": "^5.1.0"
       },
       "dependencies": {
         "estraverse": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
           "dev": true
         }
       }
@@ -7236,9 +7237,9 @@
       "dev": true
     },
     "fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -7401,7 +7402,7 @@
     "functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
       "dev": true
     },
     "functions-have-names": {
@@ -7470,9 +7471,9 @@
       }
     },
     "globals": {
-      "version": "13.17.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+      "version": "13.20.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
       "dev": true,
       "requires": {
         "type-fest": "^0.20.2"
@@ -7728,9 +7729,9 @@
       "dev": true
     },
     "is-core-module": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
-      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"
@@ -7815,9 +7816,9 @@
       "dev": true
     },
     "is-reference": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.0.tgz",
-      "integrity": "sha512-Eo1W3wUoHWoCoVM4GVl/a+K0IgiqE5aIo4kJABFyMum1ZORlPkC+UC357sSQUL5w5QCE5kCC9upl75b7+7CY/Q==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.1.tgz",
+      "integrity": "sha512-baJJdQLiYaJdvFbJqXrcGv3WU3QCzBlUcI5QhbesIm6/xPsvmO+2CDoi/GMOFBQEQm+PXkwOPrp9KK5ozZsp2w==",
       "dev": true,
       "requires": {
         "@types/estree": "*"
@@ -8121,9 +8122,9 @@
       }
     },
     "mdn-data": {
-      "version": "2.0.28",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
-      "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
+      "version": "2.0.30",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
       "dev": true
     },
     "merge2": {
@@ -8390,14 +8391,14 @@
       }
     },
     "object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       }
     },
     "once": {
@@ -8739,12 +8740,12 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
       "dev": true,
       "requires": {
-        "is-core-module": "^2.8.1",
+        "is-core-module": "^2.9.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       }
@@ -8789,12 +8790,6 @@
         }
       }
     },
-    "rollup-plugin-virtual": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-virtual/-/rollup-plugin-virtual-1.0.1.tgz",
-      "integrity": "sha512-HCTBpV8MwP5lNzZrHD2moVxHIToHU1EkzkKGVj6Z0DcgUfxrxrZmeQirQeLz2yhnkJqRjwiVywK9CS8jDYakrw==",
-      "dev": true
-    },
     "run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -9124,9 +9119,9 @@
       }
     },
     "tslib": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",
       "dev": true
     },
     "tsutils": {
diff --git a/package.json b/package.json
index c04043e346..1c8d3bceab 100644
--- a/package.json
+++ b/package.json
@@ -132,31 +132,31 @@
     "@types/aria-query": "^5.0.0",
     "@types/mocha": "^7.0.0",
     "@types/node": "^8.10.53",
-    "@typescript-eslint/eslint-plugin": "^5.22.0",
-    "@typescript-eslint/parser": "^5.22.0",
+    "@typescript-eslint/eslint-plugin": "^5.29.0",
+    "@typescript-eslint/parser": "^5.29.0",
     "acorn": "^8.8.1",
-    "agadoo": "^2.0.0",
+    "agadoo": "^3.0.0",
     "aria-query": "^5.1.1",
     "axobject-query": "^3.1.1",
     "code-red": "^1.0.0",
-    "css-tree": "^2.2.1",
-    "eslint": "^8.26.0",
-    "eslint-plugin-import": "^2.26.0",
+    "css-tree": "^2.3.1",
+    "eslint": "^8.35.0",
+    "eslint-plugin-import": "^2.27.0",
     "eslint-plugin-svelte3": "^4.0.0",
-    "estree-walker": "^3.0.1",
-    "is-reference": "^3.0.0",
+    "estree-walker": "^3.0.3",
+    "is-reference": "^3.0.1",
     "jsdom": "^15.2.1",
     "kleur": "^4.1.5",
     "locate-character": "^2.0.5",
     "magic-string": "^0.30.0",
     "mocha": "^7.0.0",
-    "periscopic": "^3.0.4",
+    "periscopic": "^3.1.0",
     "puppeteer": "^2.0.0",
     "rollup": "^1.27.14",
     "source-map": "^0.7.4",
     "source-map-support": "^0.5.21",
     "tiny-glob": "^0.2.9",
-    "tslib": "^2.4.1",
+    "tslib": "^2.5.0",
     "typescript": "^3.7.5",
     "util": "^0.12.5"
   }

From f9efb4d9920ff76b4b22bec8443ee2049a05cf26 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Wed, 8 Mar 2023 09:56:24 -0800
Subject: [PATCH 08/30] chore: upgrade aria-query (#8353)

---
 package-lock.json                     | 28 +++++++++++++--------------
 package.json                          |  4 ++--
 src/compiler/compile/nodes/Element.ts | 10 +++++-----
 src/compiler/compile/utils/a11y.ts    | 10 +++++-----
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a374ae9b32..66cfe635fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,14 +19,14 @@
         "@rollup/plugin-typescript": "^2.0.1",
         "@rollup/plugin-virtual": "^3.0.1",
         "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.8.0",
-        "@types/aria-query": "^5.0.0",
+        "@types/aria-query": "^5.0.1",
         "@types/mocha": "^7.0.0",
         "@types/node": "^8.10.53",
         "@typescript-eslint/eslint-plugin": "^5.29.0",
         "@typescript-eslint/parser": "^5.29.0",
         "acorn": "^8.8.1",
         "agadoo": "^3.0.0",
-        "aria-query": "^5.1.1",
+        "aria-query": "^5.1.3",
         "axobject-query": "^3.1.1",
         "code-red": "^1.0.0",
         "css-tree": "^2.3.1",
@@ -505,9 +505,9 @@
       "dev": true
     },
     "node_modules/@types/aria-query": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.0.tgz",
-      "integrity": "sha512-P+dkdFu0n08PDIvw+9nT9ByQnd+Udc8DaWPb9HKfaPwCvWvQpC5XaMRx2xLWECm9x1VKNps6vEAlirjA6+uNrQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz",
+      "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==",
       "dev": true
     },
     "node_modules/@types/estree": {
@@ -955,9 +955,9 @@
       }
     },
     "node_modules/aria-query": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.1.tgz",
-      "integrity": "sha512-4cPQjOYM2mqq7mZG8CSxkUvL2Yv/x29VhGq5LKehTsxRnoVQps1YGt9NyjcNQsznEsD4rr8a6zGxqeNTqJWjpA==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
+      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
       "dev": true,
       "dependencies": {
         "deep-equal": "^2.0.5"
@@ -5736,9 +5736,9 @@
       "from": "@sveltejs/eslint-config@github:sveltejs/eslint-config#v5.8.0"
     },
     "@types/aria-query": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.0.tgz",
-      "integrity": "sha512-P+dkdFu0n08PDIvw+9nT9ByQnd+Udc8DaWPb9HKfaPwCvWvQpC5XaMRx2xLWECm9x1VKNps6vEAlirjA6+uNrQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz",
+      "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==",
       "dev": true
     },
     "@types/estree": {
@@ -6042,9 +6042,9 @@
       }
     },
     "aria-query": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.1.tgz",
-      "integrity": "sha512-4cPQjOYM2mqq7mZG8CSxkUvL2Yv/x29VhGq5LKehTsxRnoVQps1YGt9NyjcNQsznEsD4rr8a6zGxqeNTqJWjpA==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
+      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
       "dev": true,
       "requires": {
         "deep-equal": "^2.0.5"
diff --git a/package.json b/package.json
index 1c8d3bceab..b7a62f91c6 100644
--- a/package.json
+++ b/package.json
@@ -129,14 +129,14 @@
     "@rollup/plugin-typescript": "^2.0.1",
     "@rollup/plugin-virtual": "^3.0.1",
     "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.8.0",
-    "@types/aria-query": "^5.0.0",
+    "@types/aria-query": "^5.0.1",
     "@types/mocha": "^7.0.0",
     "@types/node": "^8.10.53",
     "@typescript-eslint/eslint-plugin": "^5.29.0",
     "@typescript-eslint/parser": "^5.29.0",
     "acorn": "^8.8.1",
     "agadoo": "^3.0.0",
-    "aria-query": "^5.1.1",
+    "aria-query": "^5.1.3",
     "axobject-query": "^3.1.1",
     "code-red": "^1.0.0",
     "css-tree": "^2.3.1",
diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index 416f1d7b31..0fdea77c16 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -23,7 +23,7 @@ import { string_literal } from '../utils/stringify';
 import { Literal } from 'estree';
 import compiler_warnings from '../compiler_warnings';
 import compiler_errors from '../compiler_errors';
-import { ARIARoleDefintionKey, roles, aria, ARIAPropertyDefinition, ARIAProperty } from 'aria-query';
+import { ARIARoleDefinitionKey, roles, aria, ARIAPropertyDefinition, ARIAProperty } from 'aria-query';
 import { is_interactive_element, is_non_interactive_roles, is_presentation_role, is_interactive_roles, is_hidden_from_screen_reader, is_semantic_role_element } from '../utils/a11y';
 
 const aria_attributes = 'activedescendant atomic autocomplete busy checked colcount colindex colspan controls current describedby description details disabled dropeffect errormessage expanded flowto grabbed haspopup hidden invalid keyshortcuts label labelledby level live modal multiline multiselectable orientation owns placeholder posinset pressed readonly relevant required roledescription rowcount rowindex rowspan selected setsize sort valuemax valuemin valuenow valuetext'.split(' ');
@@ -566,7 +566,7 @@ export default class Element extends Node {
 				const value = attribute.get_static_value();
 
 				if (typeof value === 'string') {
-					value.split(regex_any_repeated_whitespaces).forEach((current_role: ARIARoleDefintionKey) => {
+					value.split(regex_any_repeated_whitespaces).forEach((current_role: ARIARoleDefinitionKey) => {
 						if (current_role && aria_role_abstract_set.has(current_role)) {
 							component.warn(attribute, compiler_warnings.a11y_no_abstract_role(current_role));
 						} else if (current_role && !aria_role_set.has(current_role)) {
@@ -640,7 +640,7 @@ export default class Element extends Node {
 		// click-events-have-key-events
 		if (handlers_map.has('click')) {
 			const role = attribute_map.get('role');
-			const is_non_presentation_role = role?.is_static && !is_presentation_role(role.get_static_value() as ARIARoleDefintionKey);
+			const is_non_presentation_role = role?.is_static && !is_presentation_role(role.get_static_value() as ARIARoleDefinitionKey);
 
 			if (
 				!this.is_dynamic_element && 
@@ -664,7 +664,7 @@ export default class Element extends Node {
 		}
 
 		// no-noninteractive-tabindex
-		if (!this.is_dynamic_element && !is_interactive_element(this.name, attribute_map) && !is_interactive_roles(attribute_map.get('role')?.get_static_value() as ARIARoleDefintionKey)) {
+		if (!this.is_dynamic_element && !is_interactive_element(this.name, attribute_map) && !is_interactive_roles(attribute_map.get('role')?.get_static_value() as ARIARoleDefinitionKey)) {
 			const tab_index = attribute_map.get('tabindex');
 			if (tab_index && (!tab_index.is_static || Number(tab_index.get_static_value()) >= 0)) {
 				component.warn(this, compiler_warnings.a11y_no_noninteractive_tabindex);
@@ -673,7 +673,7 @@ export default class Element extends Node {
 
 		// role-supports-aria-props
 		const role = attribute_map.get('role');
-		const role_value = (role ? role.get_static_value() : get_implicit_role(this.name, attribute_map)) as ARIARoleDefintionKey;
+		const role_value = (role ? role.get_static_value() : get_implicit_role(this.name, attribute_map)) as ARIARoleDefinitionKey;
 		if (typeof role_value === 'string' && roles.has(role_value)) {
 			const { props } = roles.get(role_value);
 			const invalid_aria_props = new Set(aria.keys().filter(attribute => !(attribute in props)));
diff --git a/src/compiler/compile/utils/a11y.ts b/src/compiler/compile/utils/a11y.ts
index d51125fa92..60cb31c663 100644
--- a/src/compiler/compile/utils/a11y.ts
+++ b/src/compiler/compile/utils/a11y.ts
@@ -1,5 +1,5 @@
 import {
-	ARIARoleDefintionKey,
+	ARIARoleDefinitionKey,
 	roles as roles_map,
 	elementRoles,
 	ARIARoleRelationConcept
@@ -32,17 +32,17 @@ const interactive_roles = new Set(
 	non_abstract_roles.filter((name) => !non_interactive_roles.has(name))
 );
 
-export function is_non_interactive_roles(role: ARIARoleDefintionKey) {
+export function is_non_interactive_roles(role: ARIARoleDefinitionKey) {
 	return non_interactive_roles.has(role);
 }
 
-export function is_interactive_roles(role: ARIARoleDefintionKey) {
+export function is_interactive_roles(role: ARIARoleDefinitionKey) {
 	return interactive_roles.has(role);
 }
 
 const presentation_roles = new Set(['presentation', 'none']);
 
-export function is_presentation_role(role: ARIARoleDefintionKey) {
+export function is_presentation_role(role: ARIARoleDefinitionKey) {
 	return presentation_roles.has(role);
 }
 
@@ -141,7 +141,7 @@ export function is_interactive_element(
 	return false;
 }
 
-export function is_semantic_role_element(role: ARIARoleDefintionKey, tag_name: string, attribute_map: Map<string, Attribute>) {
+export function is_semantic_role_element(role: ARIARoleDefinitionKey, tag_name: string, attribute_map: Map<string, Attribute>) {
 	for (const [schema, ax_object] of elementAXObjects.entries()) {
 		if (schema.name === tag_name && (!schema.attributes || schema.attributes.every(
 			(attr) => attribute_map.has(attr.name) && attribute_map.get(attr.name).get_static_value() === attr.value

From 80e6e2820408bdd1752cc1b866d106ad6c1d8824 Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Thu, 9 Mar 2023 05:04:38 -0500
Subject: [PATCH 09/30] chore: mark Promise.resolve() as pure to appease Agadoo
 (#8366)

---
 src/runtime/internal/scheduler.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/runtime/internal/scheduler.ts b/src/runtime/internal/scheduler.ts
index 5327e7b5b5..c910ba1039 100644
--- a/src/runtime/internal/scheduler.ts
+++ b/src/runtime/internal/scheduler.ts
@@ -8,7 +8,7 @@ export const binding_callbacks = [];
 let render_callbacks = [];
 const flush_callbacks = [];
 
-const resolved_promise = Promise.resolve();
+const resolved_promise = /* @__PURE__ */ Promise.resolve();
 let update_scheduled = false;
 
 export function schedule_update() {

From e2fe8ab46966a7c3a6702e7e5f71ac316c553288 Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Thu, 9 Mar 2023 19:31:19 -0500
Subject: [PATCH 10/30] -> v3.56.0

---
 CHANGELOG.md      | 65 ++++++++++++++++++++++++-----------------------
 package-lock.json |  4 +--
 package.json      |  2 +-
 3 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ede7feaf22..dbc87cdb0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,44 +1,45 @@
 # Svelte changelog
 
-## Unreleased
+## 3.56.0
 
+* Add `|stopImmediatePropagation` event modifier ([#5085](https://github.com/sveltejs/svelte/issues/5085))
+* Add `axis` parameter to `slide` transition ([#6182](https://github.com/sveltejs/svelte/issues/6182))
+* Add `readonly` utility to convert `writable` store to readonly ([#6518](https://github.com/sveltejs/svelte/pull/6518))
+* Add `readyState` binding for media elements ([#6666](https://github.com/sveltejs/svelte/issues/6666))
+* Generate valid automatic component names when the filename contains only special characters ([#7143](https://github.com/sveltejs/svelte/issues/7143))
+* Add `naturalWidth` and `naturalHeight` bindings ([#7771](https://github.com/sveltejs/svelte/issues/7771))
+* Support `<!-- svelte-ignore ... -->` on components ([#8082](https://github.com/sveltejs/svelte/issues/8082))
 * Add a11y warnings:
-	* `aria-activedescendant-has-tabindex`: elements with `aria-activedescendant` need to have a `tabindex` ([#8172](https://github.com/sveltejs/svelte/pull/8172))
+	* `aria-activedescendant-has-tabindex`: checks that elements with `aria-activedescendant` have a `tabindex` ([#8172](https://github.com/sveltejs/svelte/pull/8172))
 	* `role-supports-aria-props`: checks that the (implicit) element role supports the given aria attributes ([#8195](https://github.com/sveltejs/svelte/pull/8195))
-* Omit a11y warning on `<video>` tags with `aria-hidden="true"` ([#7874](https://github.com/sveltejs/svelte/issues/7874))
-* Omit a11y "no child content" warning on elements with `aria-label` ([#8299](https://github.com/sveltejs/svelte/pull/8299))
-* Omit a11y warnings on `<svelte:element>` ([#7939](https://github.com/sveltejs/svelte/issues/7939))
-* Make `noreferrer` warning less zealous ([#6289](https://github.com/sveltejs/svelte/issues/6289))
-* `trusted-types` CSP compatibility for Web Components ([#8134](https://github.com/sveltejs/svelte/issues/8134))
 * Add `data-sveltekit-replacestate` and `data-sveltekit-keepfocus` attribute typings ([#8281](https://github.com/sveltejs/svelte/issues/8281))
-* Don't throw when calling `unsubscribe` twice ([#8186](https://github.com/sveltejs/svelte/pull/8186))
-* Detect unused empty attribute CSS selectors ([#8042](https://github.com/sveltejs/svelte/issues/8042))
-* Simpler output for reactive statements if dependencies are all static ([#7942](https://github.com/sveltejs/svelte/pull/7942))
-* Flush remaining `afterUpdate` calls before `onDestroy` ([#7476](https://github.com/sveltejs/svelte/issues/7476))
-* Check value equality for `input` types `url` and `search` ([#7027](https://github.com/sveltejs/svelte/issues/7027))
-* Compute node dimensions directly before crossfading ([#4111](https://github.com/sveltejs/svelte/issues/4111))
-* Add `readonly` method to convert `writable` store to readonly ([#6518](https://github.com/sveltejs/svelte/pull/6518))
+* Compute node dimensions immediately before crossfading ([#4111](https://github.com/sveltejs/svelte/issues/4111))
+* Fix potential infinite invalidate loop with `<svelte:component>` ([#4129](https://github.com/sveltejs/svelte/issues/4129))
 * Ensure `bind:offsetHeight` updates initially ([#4233](https://github.com/sveltejs/svelte/issues/4233))
-* Better handling of `inert` attribute ([#7500](https://github.com/sveltejs/svelte/issues/7500))
-* Clear inputs when `bind:group` to `undefined` ([#8214](https://github.com/sveltejs/svelte/issues/8214))
-* Ensure nested arrays can change at the same time ([#8282](https://github.com/sveltejs/svelte/issues/8282))
-* Reduce use of template literals in SSR output for better performance ([#7539](https://github.com/sveltejs/svelte/pull/7539))
-* Allow assigning to property of const while destructuring ([#7964](https://github.com/sveltejs/svelte/issues/7964))
 * Don't set selected options if value is unbound or not passed ([#5644](https://github.com/sveltejs/svelte/issues/5644))
-* Ensure `<input>` value persists when swapping elements with spread attributes in an `#each` block ([#7578](https://github.com/sveltejs/svelte/issues/7578))
-* Select first enabled option by default when initial value is undefined ([#7041](https://github.com/sveltejs/svelte/issues/7041))
-* Fix race condition on `svelte:element` with transitions ([#7948](https://github.com/sveltejs/svelte/issues/7948))
-* Optimise `<svelte:element>` output code for static tag and static attribute ([#8161](https://github.com/sveltejs/svelte/pull/8161))
-* Decode html entities correctly ([#8026](https://github.com/sveltejs/svelte/issues/8026))
+* Validate component `:global()` selectors ([#6272](https://github.com/sveltejs/svelte/issues/6272))
+* Improve warnings:
+	* Make `noreferrer` warning less zealous ([#6289](https://github.com/sveltejs/svelte/issues/6289))
+	* Omit a11y warnings on `<video aria-hidden="true">` ([#7874](https://github.com/sveltejs/svelte/issues/7874))
+	* Omit a11y warnings on `<svelte:element>` ([#7939](https://github.com/sveltejs/svelte/issues/7939))
+	* Detect unused empty attribute CSS selectors ([#8042](https://github.com/sveltejs/svelte/issues/8042))
+	* Omit "no child content" warning on elements with `aria-label` ([#8296](https://github.com/sveltejs/svelte/issues/8296))
+* Check value equality for `<input type="search">` and `<input type="url">` ([#7027](https://github.com/sveltejs/svelte/issues/7027))
+* Do not select a disabled `<option>` by default when the initial bound value is undefined ([#7041](https://github.com/sveltejs/svelte/issues/7041))
 * Handle `{@html}` tags inside `<template>` tags ([#7364](https://github.com/sveltejs/svelte/pull/7364))
-* Introduce parameter to allow for horizontal slide transition ([#6182](https://github.com/sveltejs/svelte/issues/6182))
-* Add `naturalWidth` and `naturalHeight` bindings ([#7771](https://github.com/sveltejs/svelte/issues/7771))
-* make `<!-- svelte-ignore ... -->` work above components ([#8082](https://github.com/sveltejs/svelte/issues/8082))
-* add global compound selector validation ([#6272](https://github.com/sveltejs/svelte/issues/6272))
-* add `stopImmediatePropagation` event modifier ([#5085](https://github.com/sveltejs/svelte/issues/5085))
-* add `readyState` binding for media elements ([#6666](https://github.com/sveltejs/svelte/issues/6666))
-* call `<svelte:component>` update to `this` only when it's dirty ([#4129](https://github.com/sveltejs/svelte/issues/4129))
-* support exclusively special characters in component filenames ([#7143](https://github.com/sveltejs/svelte/issues/7143))
+* Ensure `afterUpdate` is not called after `onDestroy` ([#7476](https://github.com/sveltejs/svelte/issues/7476))
+* Improve handling of `inert` attribute ([#7500](https://github.com/sveltejs/svelte/issues/7500))
+* Reduce use of template literals in SSR output for better performance ([#7539](https://github.com/sveltejs/svelte/pull/7539))
+* Ensure `<input>` value persists when swapping elements with spread attributes in an `{#each}` block ([#7578](https://github.com/sveltejs/svelte/issues/7578))
+* Simplify generated code for reactive statements if dependencies are all static ([#7942](https://github.com/sveltejs/svelte/pull/7942))
+* Fix race condition on `<svelte:element>` with transitions ([#7948](https://github.com/sveltejs/svelte/issues/7948))
+* Allow assigning to a property of a `const` when destructuring ([#7964](https://github.com/sveltejs/svelte/issues/7964))
+* Match browser behavior for decoding malformed HTML entities ([#8026](https://github.com/sveltejs/svelte/issues/8026))
+* Ensure `trusted-types` CSP compatibility for Web Components ([#8134](https://github.com/sveltejs/svelte/issues/8134))
+* Optimise `<svelte:element>` output code for static tag and static attribute ([#8161](https://github.com/sveltejs/svelte/pull/8161))
+* Don't throw when calling unsubscribing from a store twice ([#8186](https://github.com/sveltejs/svelte/pull/8186))
+* Clear inputs when `bind:group` value is set to `undefined` ([#8214](https://github.com/sveltejs/svelte/issues/8214))
+* Fix handling of nested arrays with keyed `{#each}` containing a non-keyed `{#each}` ([#8282](https://github.com/sveltejs/svelte/issues/8282))
 
 ## 3.55.1
 
diff --git a/package-lock.json b/package-lock.json
index 66cfe635fe..ed58f94c7e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "svelte",
-  "version": "3.55.1",
+  "version": "3.56.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "svelte",
-      "version": "3.55.1",
+      "version": "3.56.0",
       "license": "MIT",
       "devDependencies": {
         "@ampproject/remapping": "^0.3.0",
diff --git a/package.json b/package.json
index b7a62f91c6..6720938b98 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "3.55.1",
+  "version": "3.56.0",
   "description": "Cybernetically enhanced web apps",
   "module": "index.mjs",
   "main": "index",

From 5c14bc5f0133cf6ae7d96d30f5cc6824e9f006aa Mon Sep 17 00:00:00 2001
From: "Lyu, Wei-Da" <36730922+jasonlyu123@users.noreply.github.com>
Date: Fri, 10 Mar 2023 16:47:30 +0800
Subject: [PATCH 11/30] fix: support es2022 class features (#8355)

Follow up to #8349. We also have to bump the parsing ECMAScript version here. Fixes #6900, fixes #6592.
---
 src/compiler/parse/acorn.ts              |  4 ++--
 test/js/samples/class-field/expected.js  | 25 ++++++++++++++++++++++++
 test/js/samples/class-field/input.svelte | 12 ++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 test/js/samples/class-field/expected.js
 create mode 100644 test/js/samples/class-field/input.svelte

diff --git a/src/compiler/parse/acorn.ts b/src/compiler/parse/acorn.ts
index bab8de7ce4..45e2f056c4 100644
--- a/src/compiler/parse/acorn.ts
+++ b/src/compiler/parse/acorn.ts
@@ -3,12 +3,12 @@ import * as code_red from 'code-red';
 
 export const parse = (source: string): Node => code_red.parse(source, {
 	sourceType: 'module',
-	ecmaVersion: 12,
+	ecmaVersion: 13,
 	locations: true
 });
 
 export const parse_expression_at = (source: string, index: number): Node => code_red.parseExpressionAt(source, index, {
 	sourceType: 'module',
-	ecmaVersion: 12,
+	ecmaVersion: 13,
 	locations: true
 });
diff --git a/test/js/samples/class-field/expected.js b/test/js/samples/class-field/expected.js
new file mode 100644
index 0000000000..875d61b934
--- /dev/null
+++ b/test/js/samples/class-field/expected.js
@@ -0,0 +1,25 @@
+/* generated by Svelte vX.Y.Z */
+import { SvelteComponent, init, safe_not_equal } from "svelte/internal";
+
+function instance($$self) {
+	class A {
+		p1;
+		p2 = 1;
+		#p3 = 2;
+
+		#getP3() {
+			return this.#p3;
+		}
+	}
+
+	return [];
+}
+
+class Component extends SvelteComponent {
+	constructor(options) {
+		super();
+		init(this, options, instance, null, safe_not_equal, {});
+	}
+}
+
+export default Component;
diff --git a/test/js/samples/class-field/input.svelte b/test/js/samples/class-field/input.svelte
new file mode 100644
index 0000000000..b990316937
--- /dev/null
+++ b/test/js/samples/class-field/input.svelte
@@ -0,0 +1,12 @@
+<script>
+	class A {
+		p1;
+		p2 = 1;
+
+		#p3 = 2;
+
+		#getP3() {
+			return this.#p3;
+		}
+	}
+</script>

From c7dcfac883a34655421932258d3d5a3b0ee96362 Mon Sep 17 00:00:00 2001
From: Theodore Brown <theodorejb@outlook.com>
Date: Mon, 13 Mar 2023 12:21:51 -0500
Subject: [PATCH 12/30] fix: select option with selected attribute when initial
 state is undefined (#8371)

Resolves a second unintended regression introduced in #6170.

Follow-up to #8331, this time addressing the root issue so the correct select option won't be deselected in the first place when the initial bound value is undefined.

Fixes #8361
---
 .../render_dom/wrappers/Element/Binding.ts    | 10 +++++---
 src/runtime/internal/dom.ts                   | 16 ++++--------
 .../_config.js                                | 25 +++++++++++++++++++
 .../main.svelte                               | 13 ++++++++++
 4 files changed, 49 insertions(+), 15 deletions(-)
 create mode 100644 test/runtime/samples/binding-select-initial-value-undefined-2/_config.js
 create mode 100644 test/runtime/samples/binding-select-initial-value-undefined-2/main.svelte

diff --git a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
index e48f3e0030..aa3d097ce3 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
@@ -145,8 +145,8 @@ export default class BindingWrapper {
 		}
 
 		// model to view
-		let update_dom = get_dom_updater(parent, this);
-		let mount_dom = update_dom;
+		let update_dom = get_dom_updater(parent, this, false);
+		let mount_dom = get_dom_updater(parent, this, true);
 
 		// special cases
 		switch (this.node.name) {
@@ -234,7 +234,8 @@ export default class BindingWrapper {
 
 function get_dom_updater(
 	element: ElementWrapper | InlineComponentWrapper,
-	binding: BindingWrapper
+	binding: BindingWrapper,
+	mounting: boolean
 ) {
 	const { node } = element;
 
@@ -249,6 +250,7 @@ function get_dom_updater(
 	if (node.name === 'select') {
 		return node.get_static_attribute_value('multiple') === true ?
 			b`@select_options(${element.var}, ${binding.snippet})` :
+			mounting ? b`@select_option(${element.var}, ${binding.snippet}, true)` :
 			b`@select_option(${element.var}, ${binding.snippet})`;
 	}
 
@@ -439,7 +441,7 @@ function get_value_from_dom(
 		return x`$$value`;
 	}
 
-	// <select bind:value='selected>
+	// <select bind:value='selected'>
 	if (node.name === 'select') {
 		return node.get_static_attribute_value('multiple') === true ?
 			x`@select_multiple_value(this)` :
diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index 70e7dcd7f8..99894d3d88 100644
--- a/src/runtime/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -606,7 +606,7 @@ export function set_style(node, key, value, important) {
 	}
 }
 
-export function select_option(select, value) {
+export function select_option(select, value, mounting) {
 	for (let i = 0; i < select.options.length; i += 1) {
 		const option = select.options[i];
 
@@ -616,7 +616,9 @@ export function select_option(select, value) {
 		}
 	}
 
-	select.selectedIndex = -1; // no option should be selected
+	if (!mounting || value !== undefined) {
+		select.selectedIndex = -1; // no option should be selected
+	}
 }
 
 export function select_options(select, value) {
@@ -626,16 +628,8 @@ export function select_options(select, value) {
 	}
 }
 
-function first_enabled_option(select) {
-	for (const option of select.options) {
-		if (!option.disabled) {
-			return option;
-		}
-	}
-}
-
 export function select_value(select) {
-	const selected_option = select.querySelector(':checked') || first_enabled_option(select);
+	const selected_option = select.querySelector(':checked');
 	return selected_option && selected_option.__value;
 }
 
diff --git a/test/runtime/samples/binding-select-initial-value-undefined-2/_config.js b/test/runtime/samples/binding-select-initial-value-undefined-2/_config.js
new file mode 100644
index 0000000000..f7c91809bd
--- /dev/null
+++ b/test/runtime/samples/binding-select-initial-value-undefined-2/_config.js
@@ -0,0 +1,25 @@
+export default {
+	skip_if_ssr: true, // TODO would be nice to fix this in SSR as well
+
+	html: `
+		<p>selected: b</p>
+
+		<select>
+			<option value='a'>a</option>
+			<option value='b'>b</option>
+			<option value='c'>c</option>
+		</select>
+
+		<p>selected: b</p>
+	`,
+
+	test({ assert, component, target }) {
+		assert.equal(component.selected, 'b');
+		const select = target.querySelector('select');
+		const options = [...target.querySelectorAll('option')];
+
+		// option with selected attribute should be selected
+		assert.equal(select.value, 'b');
+		assert.ok(options[1].selected);
+	}
+};
diff --git a/test/runtime/samples/binding-select-initial-value-undefined-2/main.svelte b/test/runtime/samples/binding-select-initial-value-undefined-2/main.svelte
new file mode 100644
index 0000000000..0640a9ce27
--- /dev/null
+++ b/test/runtime/samples/binding-select-initial-value-undefined-2/main.svelte
@@ -0,0 +1,13 @@
+<script>
+	export let selected;
+</script>
+
+<p>selected: {selected}</p>
+
+<select bind:value={selected}>
+	<option>a</option>
+	<option selected>b</option>
+	<option>c</option>
+</select>
+
+<p>selected: {selected}</p>
\ No newline at end of file

From c99dd2e0456ce462bba204692defa239d31f74ad Mon Sep 17 00:00:00 2001
From: Tan Li Hau <tanhauhau@users.noreply.github.com>
Date: Tue, 14 Mar 2023 17:17:50 +0800
Subject: [PATCH 13/30] fix: binding group with if block (#8373)

Fixes #8372

---------

Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 src/compiler/compile/render_dom/Block.ts      |  2 +-
 src/compiler/compile/render_dom/Renderer.ts   |  4 +-
 .../render_dom/wrappers/Element/Binding.ts    | 19 ++++++---
 src/runtime/internal/dom.ts                   |  2 +-
 test/runtime-puppeteer/index.ts               | 15 +++----
 .../_config.js                                | 40 +++++++++++++++++++
 .../main.svelte                               | 14 +++++++
 .../_config.js                                | 34 ++++++++++++++++
 .../main.svelte                               | 14 +++++++
 9 files changed, 128 insertions(+), 16 deletions(-)
 create mode 100644 test/runtime/samples/binding-input-group-if-gh-8372-1/_config.js
 create mode 100644 test/runtime/samples/binding-input-group-if-gh-8372-1/main.svelte
 create mode 100644 test/runtime/samples/binding-input-group-if-gh-8372-2/_config.js
 create mode 100644 test/runtime/samples/binding-input-group-if-gh-8372-2/main.svelte

diff --git a/src/compiler/compile/render_dom/Block.ts b/src/compiler/compile/render_dom/Block.ts
index c40dedc3b5..cb35673847 100644
--- a/src/compiler/compile/render_dom/Block.ts
+++ b/src/compiler/compile/render_dom/Block.ts
@@ -505,7 +505,7 @@ export default class Block {
 
 	render_binding_groups() {
 		for (const binding_group of this.binding_groups) {
-			binding_group.render();
+			binding_group.render(this);
 		}
 	}
 }
diff --git a/src/compiler/compile/render_dom/Renderer.ts b/src/compiler/compile/render_dom/Renderer.ts
index ad2d1b092f..df1d68d5cb 100644
--- a/src/compiler/compile/render_dom/Renderer.ts
+++ b/src/compiler/compile/render_dom/Renderer.ts
@@ -27,8 +27,8 @@ export interface BindingGroup {
 	contexts: string[];
 	list_dependencies: Set<string>;
 	keypath: string;
-	elements: Identifier[];
-	render: () => void;
+	add_element: (block: Block, element: Identifier) => void;
+	render: (block: Block) => void;
 }
 
 export default class Renderer {
diff --git a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
index aa3d097ce3..e656d77672 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
@@ -153,7 +153,7 @@ export default class BindingWrapper {
 			case 'group':
 			{
 				block.renderer.add_to_context('$$binding_groups');
-				this.binding_group.elements.push(this.parent.var);
+				this.binding_group.add_element(block, this.parent.var);
 
 				if ((this.parent as ElementWrapper).has_dynamic_value) {	
 					update_or_condition = (this.parent as ElementWrapper).dynamic_value_condition;	
@@ -323,7 +323,11 @@ function get_binding_group(renderer: Renderer, binding: BindingWrapper, block: B
 			parent = parent.parent;
 		}
 
-		const elements = [];
+		/**
+		 * When using bind:group with logic blocks, the inputs with bind:group may be scattered across different blocks.
+		 * This therefore keeps track of all the <input> elements that have the same bind:group within the same block.
+		 */
+		const elements = new Map<Block, any>();
 
 		contexts.forEach(context => {
 			renderer.add_to_context(context, true);
@@ -343,8 +347,13 @@ function get_binding_group(renderer: Renderer, binding: BindingWrapper, block: B
 			contexts,
 			list_dependencies,
 			keypath,
-			elements,
-			render() {
+			add_element(block, element) {
+				if (!elements.has(block)) {
+					elements.set(block, []);
+				}
+				elements.get(block).push(element);
+			},
+			render(block) {
 				const local_name = block.get_unique_name('binding_group');
 				const binding_group = block.renderer.reference('$$binding_groups');
 				block.add_variable(local_name);
@@ -362,7 +371,7 @@ function get_binding_group(renderer: Renderer, binding: BindingWrapper, block: B
 					);
 				}
 				block.chunks.hydrate.push(
-					b`${local_name}.p(${elements})`
+					b`${local_name}.p(${elements.get(block)})`
 				);
 				block.chunks.destroy.push(
 					b`${local_name}.r()`
diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index 99894d3d88..1f786d51b5 100644
--- a/src/runtime/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -359,7 +359,7 @@ export function get_binding_group_value(group, __value, checked) {
 	return Array.from(value);
 }
 
-export function init_binding_group(group) {
+export function init_binding_group(group: HTMLInputElement[]) {
 	let _inputs: HTMLInputElement[];
 	return {
 		/* push */ p(...inputs: HTMLInputElement[]) {
diff --git a/test/runtime-puppeteer/index.ts b/test/runtime-puppeteer/index.ts
index eba60544f6..efb7ac02e3 100644
--- a/test/runtime-puppeteer/index.ts
+++ b/test/runtime-puppeteer/index.ts
@@ -56,9 +56,7 @@ async function launchPuppeteer() {
 
 const assert = fs.readFileSync(`${__dirname}/assert.js`, 'utf-8');
 
-describe('runtime (puppeteer)', function() {
-	// Note: Increase the timeout in preparation for restarting Chromium due to SIGSEGV.
-	this.timeout(10000);
+describe('runtime (puppeteer)', () => {
 	before(async () => {
 		svelte = loadSvelte(false);
 		console.log('[runtime-puppeteer] Loaded Svelte');
@@ -75,7 +73,7 @@ describe('runtime (puppeteer)', function() {
 
 	const failed = new Set();
 
-	function runTest(dir, hydrate) {
+	function runTest(dir, hydrate, is_first_run) {
 		if (dir[0] === '.') return;
 		// MEMO: puppeteer can not execute Chromium properly with Node8,10 on Linux at GitHub actions.
 		const { version } = process;
@@ -254,11 +252,14 @@ describe('runtime (puppeteer)', function() {
 					prettyPrintPuppeteerAssertionError(err.message);
 					assertWarnings();
 				});
-		});
+		}).timeout(is_first_run ? 20000 : 10000);
 	}
 
+	// Increase the timeout on the first run in preparation for restarting Chromium due to SIGSEGV.
+	let first_run = true;
 	fs.readdirSync(`${__dirname}/samples`).forEach(dir => {
-		runTest(dir, false);
-		runTest(dir, true);
+		runTest(dir, false, first_run);
+		runTest(dir, true, first_run);
+		first_run = false;
 	});
 });
diff --git a/test/runtime/samples/binding-input-group-if-gh-8372-1/_config.js b/test/runtime/samples/binding-input-group-if-gh-8372-1/_config.js
new file mode 100644
index 0000000000..bdc4da2d57
--- /dev/null
+++ b/test/runtime/samples/binding-input-group-if-gh-8372-1/_config.js
@@ -0,0 +1,40 @@
+export default {
+	async test({ assert, target, component, window }) {
+		const button = target.querySelector('button');
+		const clickEvent = new window.Event('click');
+		const changeEvent = new window.Event('change');
+
+		const [input1, input2] = target.querySelectorAll('input[type="checkbox"]');
+		function validate_inputs(v1, v2) {
+			assert.equal(input1.checked, v1);
+			assert.equal(input2.checked, v2);
+		}
+
+		assert.deepEqual(component.test, []);
+		validate_inputs(false, false);
+
+		component.test = ['a', 'b'];
+		validate_inputs(true, true);
+
+		input1.checked = false;
+		await input1.dispatchEvent(changeEvent);
+		assert.deepEqual(component.test, ['b']);
+
+		input2.checked = false;
+		await input2.dispatchEvent(changeEvent);
+		assert.deepEqual(component.test, []);
+
+		input1.checked = true;
+		input2.checked = true;
+		await input1.dispatchEvent(changeEvent);
+		await input2.dispatchEvent(changeEvent);
+		assert.deepEqual(component.test, ['b', 'a']);
+
+		await button.dispatchEvent(clickEvent);
+		assert.deepEqual(component.test, ['b', 'a']); // should it be ['a'] only? valid arguments for both outcomes
+
+		input1.checked = false;
+		await input1.dispatchEvent(changeEvent);
+		assert.deepEqual(component.test, []);
+	}
+};
diff --git a/test/runtime/samples/binding-input-group-if-gh-8372-1/main.svelte b/test/runtime/samples/binding-input-group-if-gh-8372-1/main.svelte
new file mode 100644
index 0000000000..71955b6b81
--- /dev/null
+++ b/test/runtime/samples/binding-input-group-if-gh-8372-1/main.svelte
@@ -0,0 +1,14 @@
+<script>
+	export let test = [];
+	let hidden = false
+</script>
+
+<button on:click={() => hidden = !hidden}>
+	{hidden ? "show" : "hide"} b
+</button>
+
+<label>a <input type="checkbox" bind:group={test} value="a" /></label>
+{#if !hidden}
+<label>b <input type="checkbox" bind:group={test} value="b" /></label>
+{/if}
+<label>c <input value="just here, so b is not the last input" /></label>
diff --git a/test/runtime/samples/binding-input-group-if-gh-8372-2/_config.js b/test/runtime/samples/binding-input-group-if-gh-8372-2/_config.js
new file mode 100644
index 0000000000..a8d5a7137f
--- /dev/null
+++ b/test/runtime/samples/binding-input-group-if-gh-8372-2/_config.js
@@ -0,0 +1,34 @@
+export default {
+	async test({ assert, target, component, window }) {
+		const button = target.querySelector('button');
+		const clickEvent = new window.Event('click');
+		const changeEvent = new window.Event('change');
+
+		const [input1, input2] = target.querySelectorAll('input[type="radio"]');
+		function validate_inputs(v1, v2) {
+			assert.equal(input1.checked, v1);
+			assert.equal(input2.checked, v2);
+		}
+
+		component.test = 'a';
+		validate_inputs(true, false);
+
+		component.test = 'b';
+		validate_inputs(false, true);
+
+		input1.checked = true;
+		await input1.dispatchEvent(changeEvent);
+		assert.deepEqual(component.test, 'a');
+
+		input2.checked = true;
+		await input2.dispatchEvent(changeEvent);
+		assert.deepEqual(component.test, 'b');
+
+		await button.dispatchEvent(clickEvent);
+		assert.deepEqual(component.test, 'b'); // should it be undefined? valid arguments for both outcomes
+
+		input1.checked = true;
+		await input1.dispatchEvent(changeEvent);
+		assert.deepEqual(component.test, 'a');
+	}
+};
diff --git a/test/runtime/samples/binding-input-group-if-gh-8372-2/main.svelte b/test/runtime/samples/binding-input-group-if-gh-8372-2/main.svelte
new file mode 100644
index 0000000000..9add22cacc
--- /dev/null
+++ b/test/runtime/samples/binding-input-group-if-gh-8372-2/main.svelte
@@ -0,0 +1,14 @@
+<script>
+	export let test;
+	let hidden = false
+</script>
+
+<button on:click={() => hidden = !hidden}>
+	{hidden ? "show" : "hide"} b
+</button>
+
+<label>a <input type="radio" bind:group={test} value="a" /></label>
+{#if !hidden}
+<label>b <input type="radio" bind:group={test} value="b" /></label>
+{/if}
+<label>c <input value="just here, so b is not the last input" /></label>

From 127b61a4658c046f2a35136408b98fb832feaaf1 Mon Sep 17 00:00:00 2001
From: Jon Rouleau <jon@rouleau.io>
Date: Tue, 14 Mar 2023 04:46:49 -0500
Subject: [PATCH 14/30] fix: derived store restarting when unsubscribed from
 another store with a shared ancestor (#8368)

Fixes #8364

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 src/runtime/store/index.ts | 10 +++++++---
 test/store/index.ts        | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/runtime/store/index.ts b/src/runtime/store/index.ts
index ee277c6216..67c2bcb15c 100644
--- a/src/runtime/store/index.ts
+++ b/src/runtime/store/index.ts
@@ -164,7 +164,7 @@ export function derived<T>(stores: Stores, fn: Function, initial_value?: T): Rea
 	const auto = fn.length < 2;
 
 	return readable(initial_value, (set) => {
-		let inited = false;
+		let started = false;
 		const values = [];
 
 		let pending = 0;
@@ -188,7 +188,7 @@ export function derived<T>(stores: Stores, fn: Function, initial_value?: T): Rea
 			(value) => {
 				values[i] = value;
 				pending &= ~(1 << i);
-				if (inited) {
+				if (started) {
 					sync();
 				}
 			},
@@ -197,12 +197,16 @@ export function derived<T>(stores: Stores, fn: Function, initial_value?: T): Rea
 			})
 		);
 
-		inited = true;
+		started = true;
 		sync();
 
 		return function stop() {
 			run_all(unsubscribers);
 			cleanup();
+			// We need to set this to false because callbacks can still happen despite having unsubscribed:
+			// Callbacks might already be placed in the queue which doesn't know it should no longer
+			// invoke this derived store.
+			started = false;
 		};
 	});
 }
diff --git a/test/store/index.ts b/test/store/index.ts
index 7e8bdb2f64..920cabdc39 100644
--- a/test/store/index.ts
+++ b/test/store/index.ts
@@ -407,6 +407,25 @@ describe('store', () => {
 			const d = derived(fake_observable, _ => _);
 			assert.equal(get(d), 42);
 		});
+
+		it('doesn\'t restart when unsubscribed from another store with a shared ancestor', () => {
+			const a = writable(true);
+			let b_started = false;
+			const b = derived(a, (_, __) => {
+				b_started = true;
+				return () => {
+					assert.equal(b_started, true);
+					b_started = false;
+				};
+			});
+			const c = derived(a, ($a, set) => {
+				if ($a) return b.subscribe(set);
+			});
+
+			c.subscribe(() => { });
+			a.set(false);
+			assert.equal(b_started, false);
+		});
 	});
 
 	describe('get', () => {

From 26c38e750c8b570183c32e9bdf32025f7291c15b Mon Sep 17 00:00:00 2001
From: Nguyen Tran <88808276+ngtr6788@users.noreply.github.com>
Date: Tue, 14 Mar 2023 05:51:40 -0400
Subject: [PATCH 15/30] feat: add a11y
 `no-noninteractive-element-to-interactive-role` (#8167)

Part of #820
---
 .../content/docs/06-accessibility-warnings.md |  11 +
 src/compiler/compile/compiler_warnings.ts     |   4 +
 src/compiler/compile/nodes/Element.ts         |  11 +-
 src/compiler/compile/utils/a11y.ts            |  61 +-
 .../input.svelte                              |  58 +-
 .../warnings.json                             |  26 +-
 .../input.svelte                              | 109 +++
 .../warnings.json                             | 818 ++++++++++++++++++
 8 files changed, 1043 insertions(+), 55 deletions(-)
 create mode 100644 test/validator/samples/a11y-no-noninteractive-element-to-interactive-role/input.svelte
 create mode 100644 test/validator/samples/a11y-no-noninteractive-element-to-interactive-role/warnings.json

diff --git a/site/content/docs/06-accessibility-warnings.md b/site/content/docs/06-accessibility-warnings.md
index 4324ed7b75..bc793d80e7 100644
--- a/site/content/docs/06-accessibility-warnings.md
+++ b/site/content/docs/06-accessibility-warnings.md
@@ -277,6 +277,17 @@ Some HTML elements have default ARIA roles. Giving these elements an ARIA role t
 
 ---
 
+### `a11y-no-noninteractive-element-to-interactive-role`
+
+[WAI-ARIA](https://www.w3.org/TR/wai-aria-1.1/#usage_intro) roles should not be used to convert a non-interactive element to an interactive element. Interactive ARIA roles include `button`, `link`, `checkbox`, `menuitem`, `menuitemcheckbox`, `menuitemradio`, `option`, `radio`, `searchbox`, `switch` and `textbox`.
+
+```sv
+<!-- A11y: Non-interactive element <h3> cannot have interactive role 'searchbox' -->
+<h3 role="searchbox">Button</h3>
+```
+
+---
+
 ### `a11y-no-noninteractive-tabindex`
 
 Tab key navigation should be limited to elements on the page that can be interacted with.
diff --git a/src/compiler/compile/compiler_warnings.ts b/src/compiler/compile/compiler_warnings.ts
index d6b2dbc5aa..380ed5a6f0 100644
--- a/src/compiler/compile/compiler_warnings.ts
+++ b/src/compiler/compile/compiler_warnings.ts
@@ -119,6 +119,10 @@ export default {
 		code: 'a11y-no-interactive-element-to-noninteractive-role',
 		message: `A11y: <${element}> cannot have role '${role}'`
 	}),
+	a11y_no_noninteractive_element_to_interactive_role: (role: string | boolean, element: string) => ({
+		code: 'a11y-no-noninteractive-element-to-interactive-role',
+		message: `A11y: Non-interactive element <${element}> cannot have interactive role '${role}'`
+	}),
 	a11y_role_has_required_aria_props: (role: string, props: string[]) => ({
 		code: 'a11y-role-has-required-aria-props',
 		message: `A11y: Elements with the ARIA role "${role}" must have the following attributes defined: ${props.map(name => `"${name}"`).join(', ')}`
diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index 0fdea77c16..a5dc74b256 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -24,14 +24,13 @@ import { Literal } from 'estree';
 import compiler_warnings from '../compiler_warnings';
 import compiler_errors from '../compiler_errors';
 import { ARIARoleDefinitionKey, roles, aria, ARIAPropertyDefinition, ARIAProperty } from 'aria-query';
-import { is_interactive_element, is_non_interactive_roles, is_presentation_role, is_interactive_roles, is_hidden_from_screen_reader, is_semantic_role_element } from '../utils/a11y';
+import { is_interactive_element, is_non_interactive_element, is_non_interactive_roles, is_presentation_role, is_interactive_roles, is_hidden_from_screen_reader, is_semantic_role_element, is_abstract_role } from '../utils/a11y';
 
 const aria_attributes = 'activedescendant atomic autocomplete busy checked colcount colindex colspan controls current describedby description details disabled dropeffect errormessage expanded flowto grabbed haspopup hidden invalid keyshortcuts label labelledby level live modal multiline multiselectable orientation owns placeholder posinset pressed readonly relevant required roledescription rowcount rowindex rowspan selected setsize sort valuemax valuemin valuenow valuetext'.split(' ');
 const aria_attribute_set = new Set(aria_attributes);
 
 const aria_roles = roles.keys();
 const aria_role_set = new Set(aria_roles);
-const aria_role_abstract_set = new Set(roles.keys().filter(role => roles.get(role).abstract));
 
 const a11y_required_attributes = {
 	a: ['href'],
@@ -567,7 +566,7 @@ export default class Element extends Node {
 
 				if (typeof value === 'string') {
 					value.split(regex_any_repeated_whitespaces).forEach((current_role: ARIARoleDefinitionKey) => {
-						if (current_role && aria_role_abstract_set.has(current_role)) {
+						if (current_role && is_abstract_role(current_role)) {
 							component.warn(attribute, compiler_warnings.a11y_no_abstract_role(current_role));
 						} else if (current_role && !aria_role_set.has(current_role)) {
 							const match = fuzzymatch(current_role, aria_roles);
@@ -607,8 +606,12 @@ export default class Element extends Node {
 						if (is_interactive_element(this.name, attribute_map) && (is_non_interactive_roles(current_role) || is_presentation_role(current_role))) {
 							component.warn(this, compiler_warnings.a11y_no_interactive_element_to_noninteractive_role(current_role, this.name));
 						}
-					});
 
+						// no-noninteractive-element-to-interactive-role
+						if (is_non_interactive_element(this.name, attribute_map) && is_interactive_roles(current_role)) {
+							component.warn(this, compiler_warnings.a11y_no_noninteractive_element_to_interactive_role(current_role, this.name));
+						}
+					});
 				}
 			}
 
diff --git a/src/compiler/compile/utils/a11y.ts b/src/compiler/compile/utils/a11y.ts
index 60cb31c663..d0564b419e 100644
--- a/src/compiler/compile/utils/a11y.ts
+++ b/src/compiler/compile/utils/a11y.ts
@@ -7,7 +7,9 @@ import {
 import { AXObjects, AXObjectRoles, elementAXObjects } from 'axobject-query';
 import Attribute from '../nodes/Attribute';
 
-const non_abstract_roles = [...roles_map.keys()].filter((name) => !roles_map.get(name).abstract);
+const aria_roles = roles_map.keys();
+const abstract_roles = new Set(aria_roles.filter(role => roles_map.get(role).abstract));
+const non_abstract_roles = aria_roles.filter((name) => !abstract_roles.has(name));
 
 const non_interactive_roles = new Set(
 	non_abstract_roles
@@ -40,6 +42,10 @@ export function is_interactive_roles(role: ARIARoleDefinitionKey) {
 	return interactive_roles.has(role);
 }
 
+export function is_abstract_role(role: ARIARoleDefinitionKey) {
+	return abstract_roles.has(role);
+}
+
 const presentation_roles = new Set(['presentation', 'none']);
 
 export function is_presentation_role(role: ARIARoleDefinitionKey) {
@@ -65,7 +71,7 @@ export function is_hidden_from_screen_reader(tag_name: string, attribute_map: Ma
 const non_interactive_element_role_schemas: ARIARoleRelationConcept[] = [];
 
 elementRoles.entries().forEach(([schema, roles]) => {
-	if ([...roles].every((role) => non_interactive_roles.has(role))) {
+	if ([...roles].every((role) => role !== 'generic' && non_interactive_roles.has(role))) {
 		non_interactive_element_role_schemas.push(schema);
 	}
 });
@@ -82,6 +88,10 @@ const interactive_ax_objects = new Set(
 	[...AXObjects.keys()].filter((name) => AXObjects.get(name).type === 'widget')
 );
 
+const non_interactive_ax_objects = new Set(
+	[...AXObjects.keys()].filter((name) => ['windows', 'structure'].includes(AXObjects.get(name).type))
+);
+
 const interactive_element_ax_object_schemas: ARIARoleRelationConcept[] = [];
 
 elementAXObjects.entries().forEach(([schema, ax_object]) => {
@@ -90,6 +100,14 @@ elementAXObjects.entries().forEach(([schema, ax_object]) => {
 	}
 });
 
+const non_interactive_element_ax_object_schemas: ARIARoleRelationConcept[] = [];
+
+elementAXObjects.entries().forEach(([schema, ax_object]) => {
+	if ([...ax_object].every((role) => non_interactive_ax_objects.has(role))) {
+		non_interactive_element_ax_object_schemas.push(schema);
+	}
+});
+
 function match_schema(
 	schema: ARIARoleRelationConcept,
 	tag_name: string,
@@ -110,24 +128,31 @@ function match_schema(
 	});
 }
 
-export function is_interactive_element(
+export enum ElementInteractivity {
+	Interactive = 'interactive',
+	NonInteractive = 'non-interactive',
+	Static = 'static',
+}
+
+export function element_interactivity(
 	tag_name: string,
 	attribute_map: Map<string, Attribute>
-): boolean {
+): ElementInteractivity {
 	if (
 		interactive_element_role_schemas.some((schema) =>
 			match_schema(schema, tag_name, attribute_map)
 		)
 	) {
-		return true;
+		return ElementInteractivity.Interactive;
 	}
 
 	if (
+		tag_name !== 'header' && 
 		non_interactive_element_role_schemas.some((schema) =>
 			match_schema(schema, tag_name, attribute_map)
 		)
 	) {
-		return false;
+		return ElementInteractivity.NonInteractive;
 	}
 
 	if (
@@ -135,10 +160,30 @@ export function is_interactive_element(
 			match_schema(schema, tag_name, attribute_map)
 		)
 	) {
-		return true;
+		return ElementInteractivity.Interactive;
 	}
 
-	return false;
+	if (
+		non_interactive_element_ax_object_schemas.some((schema) =>
+			match_schema(schema, tag_name, attribute_map)
+		)
+	) {
+		return ElementInteractivity.NonInteractive;
+	}
+
+	return ElementInteractivity.Static;
+}
+
+export function is_interactive_element(tag_name: string, attribute_map: Map<string, Attribute>): boolean {
+	return element_interactivity(tag_name, attribute_map) === ElementInteractivity.Interactive;
+}
+
+export function is_non_interactive_element(tag_name: string, attribute_map: Map<string, Attribute>): boolean {
+	return element_interactivity(tag_name, attribute_map) === ElementInteractivity.NonInteractive;
+}
+
+export function is_static_element(tag_name: string, attribute_map: Map<string, Attribute>): boolean {
+	return element_interactivity(tag_name, attribute_map) === ElementInteractivity.Static;
 }
 
 export function is_semantic_role_element(role: ARIARoleDefinitionKey, tag_name: string, attribute_map: Map<string, Attribute>) {
diff --git a/test/validator/samples/a11y-no-interactive-element-to-noninteractive-role/input.svelte b/test/validator/samples/a11y-no-interactive-element-to-noninteractive-role/input.svelte
index 80b4fd9410..5c9bfd86ed 100644
--- a/test/validator/samples/a11y-no-interactive-element-to-noninteractive-role/input.svelte
+++ b/test/validator/samples/a11y-no-interactive-element-to-noninteractive-role/input.svelte
@@ -71,36 +71,34 @@
 <div role="widget" />
 <div role="window" />
 
-<!-- HTML elements with an inherent, non-interactive role, assigned an interactive role. -->
-<main role="button" />
-<area role="button" alt="x" />
-<article role="button" />
-<article role="button" />
-<dd role="button" />
-<dfn role="button" />
-<dt role="button" />
-<fieldset role="button" />
-<figure role="button" />
-<form role="button" />
-<frame role="button" />
-<h1 role="button">title</h1>
-<h2 role="button">title</h2>
-<h3 role="button">title</h3>
-<h4 role="button">title</h4>
-<h5 role="button">title</h5>
-<h6 role="button">title</h6>
-<hr role="button" />
-<img role="button" alt="x" />
-<li role="button" />
-<li role="presentation" />
-<nav role="button" />
-<ol role="button" />
-<table role="button" />
-<tbody role="button" />
-<td role="button" />
-<tfoot role="button" />
-<thead role="button" />
-<ul role="button" />
+<!-- VALID: div elements assigned an interactive role. -->
+<div role="button" />
+<div role="checkbox" aria-checked={true} />
+<div role="columnheader" />
+<div role="combobox" aria-controls={[]} aria-expanded={true} />
+<div role="grid" />
+<div role="gridcell" />
+<div role="link" />
+<div role="listbox" />
+<div role="menu" />
+<div role="menubar" />
+<div role="menuitem" />
+<div role="menuitemcheckbox" aria-checked />
+<div role="menuitemradio" aria-checked />
+<div role="option" aria-selected />
+<div role="progressbar" />
+<div role="radio" aria-checked />
+<div role="radiogroup" />
+<div role="row" />
+<div role="rowheader" />
+<div role="scrollbar" aria-controls={[]} aria-valuenow={0} />
+<div role="searchbox" />
+<div role="slider" aria-valuenow={0} />
+<div role="spinbutton" />
+<div role="switch" aria-checked />
+<div role="tab" />
+<div role="textbox" />
+<div role="treeitem" aria-selected={true} />
 
 <!-- HTML elements attributed with a non-interactive role -->
 <div role="alert" />
diff --git a/test/validator/samples/a11y-no-interactive-element-to-noninteractive-role/warnings.json b/test/validator/samples/a11y-no-interactive-element-to-noninteractive-role/warnings.json
index 7d8ef008cf..3199f3d0fb 100644
--- a/test/validator/samples/a11y-no-interactive-element-to-noninteractive-role/warnings.json
+++ b/test/validator/samples/a11y-no-interactive-element-to-noninteractive-role/warnings.json
@@ -635,76 +635,76 @@
 			"line": 72
 		}
 	},
-	{
+  {
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
 			"column": 28,
-			"line": 145
+			"line": 143
 		},
 		"message": "A11y: <menuitem> cannot have role 'listitem'",
 		"start": {
 			"column": 0,
-			"line": 145
+			"line": 143
 		}
 	},
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
 			"column": 38,
-			"line": 146
+			"line": 144
 		},
 		"message": "A11y: <option> cannot have role 'listitem'",
 		"start": {
 			"column": 0,
-			"line": 146
+			"line": 144
 		}
 	},
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
 			"column": 38,
-			"line": 147
+			"line": 145
 		},
 		"message": "A11y: <select> cannot have role 'listitem'",
 		"start": {
 			"column": 0,
-			"line": 147
+			"line": 145
 		}
 	},
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
 			"column": 27,
-			"line": 148
+			"line": 146
 		},
 		"message": "A11y: <summary> cannot have role 'listitem'",
 		"start": {
 			"column": 0,
-			"line": 148
+			"line": 146
 		}
 	},
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
 			"column": 40,
-			"line": 149
+			"line": 147
 		},
 		"message": "A11y: <textarea> cannot have role 'listitem'",
 		"start": {
 			"column": 0,
-			"line": 149
+			"line": 147
 		}
 	},
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
 			"column": 22,
-			"line": 150
+			"line": 148
 		},
 		"message": "A11y: <tr> cannot have role 'listitem'",
 		"start": {
 			"column": 0,
-			"line": 150
+			"line": 148
 		}
 	}
 ]
diff --git a/test/validator/samples/a11y-no-noninteractive-element-to-interactive-role/input.svelte b/test/validator/samples/a11y-no-noninteractive-element-to-interactive-role/input.svelte
new file mode 100644
index 0000000000..2e4baa5877
--- /dev/null
+++ b/test/validator/samples/a11y-no-noninteractive-element-to-interactive-role/input.svelte
@@ -0,0 +1,109 @@
+<!-- ALL INVALID: HTML elements with interactive role  -->
+<article role="button" />
+<aside role="checkbox" aria-checked={false} />
+<blockquote role="columnheader" />
+<body role="combobox" aria-controls={[]} aria-expanded />
+<br role="grid" />
+<caption role="gridcell" />
+<dd role="link" />
+<details role="listbox" />
+<dir role="menu" />
+<dl role="menubar" />
+<dfn role="menuitem" />
+<dt role="menuitemcheckbox" aria-checked />
+<fieldset role="menuitemradio" aria-checked />
+<figure>
+  <figcaption role="menuitemradio" aria-checked />
+</figure>
+<figure role="option" aria-selected />
+<footer role="radio" aria-checked />
+<form role="radiogroup" />
+<frame role="row" />
+<h1 role="rowheader">Button</h1>
+<h2 role="scrollbar" aria-controls={[]} aria-valuenow={0} >Button</h2>
+<h3 role="searchbox">Button</h3>
+<h4 role="slider" aria-valuenow={0}>Button</h4>
+<h5 role="spinbutton">Button</h5>
+<h6 role="switch" aria-checked>Button</h6>
+<hr role="tab" />
+<img role="tabpanel" alt="tabpanel" />
+<label role="textbox" />
+<legend role="toolbar" />
+<li role="tree" />
+<main role="treegrid" />
+<mark role="treeitem" aria-selected />
+<marquee role="doc-backlink" />
+<menu role="doc-biblioref" />
+<meter role="doc-glossref" />
+<nav role="doc-noteref" />
+<ol role="button" />
+<optgroup role="treeitem" aria-selected />
+<output role="treegrid" />
+<p role="columnheader" />
+<pre role="tree" />
+<progress role="combobox" aria-controls={[]} aria-expanded />
+<ruby role="toolbar" />
+<section role="radio" aria-label="radio" aria-checked />
+<table role="menu" />
+<tbody role="searchbox" />
+<td role="button" />
+<tfoot role="listbox" />
+<thead role="slider" aria-valuenow={0} />
+<time role="doc-backlink" />
+<ul role="spinbutton" />
+
+<!-- VALID under recommended settings, INVALID under strict settings: ul, ol, li has interactive roles -->
+<!-- ul -->
+<ul role="menu" />
+<ul role="menubar" />
+<ul role="radiogroup" />
+<ul role="tablist" />
+<ul role="tree" />
+<ul role="treegrid" />
+<!-- ol -->
+<ol role="menu" />
+<ol role="menubar" />
+<ol role="radiogroup" />
+<ol role="tablist" />
+<ol role="tree" />
+<ol role="treegrid" />
+<!-- li -->
+<li role="tab" />
+<li role="menuitem" />
+<li role="row" />
+<li role="treeitem" aria-selected={false} />
+
+<!-- VALID: div elements assigned an interactive role. -->
+<div role="button" />
+<div role="checkbox" aria-checked={true} />
+<div role="columnheader" />
+<div role="combobox" aria-controls={[]} aria-expanded={true} />
+<div role="grid" />
+<div role="gridcell" />
+<div role="link" />
+<div role="listbox" />
+<div role="menu" />
+<div role="menubar" />
+<div role="menuitem" />
+<div role="menuitemcheckbox" aria-checked />
+<div role="menuitemradio" aria-checked />
+<div role="option" aria-selected />
+<div role="progressbar" />
+<div role="radio" aria-checked />
+<div role="radiogroup" />
+<div role="row" />
+<div role="rowheader" />
+<div role="scrollbar" aria-controls={[]} aria-valuenow={0} />
+<div role="searchbox" />
+<div role="slider" aria-valuenow={0} />
+<div role="spinbutton" />
+<div role="switch" aria-checked />
+<div role="tab" />
+<div role="textbox" />
+<div role="treeitem" aria-selected={true} />
+
+<!-- VALID: HTML elements attributed with a non-interactive role -->
+<div role="alert" />
+<div role="document" />
+<div role="separator" />
+<div role="timer" />
diff --git a/test/validator/samples/a11y-no-noninteractive-element-to-interactive-role/warnings.json b/test/validator/samples/a11y-no-noninteractive-element-to-interactive-role/warnings.json
new file mode 100644
index 0000000000..4b4c9c3d97
--- /dev/null
+++ b/test/validator/samples/a11y-no-noninteractive-element-to-interactive-role/warnings.json
@@ -0,0 +1,818 @@
+[
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 25,
+      "line": 2
+    },
+    "message": "A11y: Non-interactive element <article> cannot have interactive role 'button'",
+    "start": {
+      "column": 0,
+      "line": 2
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 46,
+      "line": 3
+    },
+    "message": "A11y: Non-interactive element <aside> cannot have interactive role 'checkbox'",
+    "start": {
+      "column": 0,
+      "line": 3
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 34,
+      "line": 4
+    },
+    "message": "A11y: Non-interactive element <blockquote> cannot have interactive role 'columnheader'",
+    "start": {
+      "column": 0,
+      "line": 4
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 57,
+      "line": 5
+    },
+    "message": "A11y: Non-interactive element <body> cannot have interactive role 'combobox'",
+    "start": {
+      "column": 0,
+      "line": 5
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 18,
+      "line": 6
+    },
+    "message": "A11y: Non-interactive element <br> cannot have interactive role 'grid'",
+    "start": {
+      "column": 0,
+      "line": 6
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 27,
+      "line": 7
+    },
+    "message": "A11y: Non-interactive element <caption> cannot have interactive role 'gridcell'",
+    "start": {
+      "column": 0,
+      "line": 7
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 18,
+      "line": 8
+    },
+    "message": "A11y: Non-interactive element <dd> cannot have interactive role 'link'",
+    "start": {
+      "column": 0,
+      "line": 8
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 26,
+      "line": 9
+    },
+    "message": "A11y: Non-interactive element <details> cannot have interactive role 'listbox'",
+    "start": {
+      "column": 0,
+      "line": 9
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 19,
+      "line": 10
+    },
+    "message": "A11y: Non-interactive element <dir> cannot have interactive role 'menu'",
+    "start": {
+      "column": 0,
+      "line": 10
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 21,
+      "line": 11
+    },
+    "message": "A11y: Non-interactive element <dl> cannot have interactive role 'menubar'",
+    "start": {
+      "column": 0,
+      "line": 11
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 23,
+      "line": 12
+    },
+    "message": "A11y: Non-interactive element <dfn> cannot have interactive role 'menuitem'",
+    "start": {
+      "column": 0,
+      "line": 12
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 43,
+      "line": 13
+    },
+    "message": "A11y: Non-interactive element <dt> cannot have interactive role 'menuitemcheckbox'",
+    "start": {
+      "column": 0,
+      "line": 13
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 46,
+      "line": 14
+    },
+    "message": "A11y: Non-interactive element <fieldset> cannot have interactive role 'menuitemradio'",
+    "start": {
+      "column": 0,
+      "line": 14
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 50,
+      "line": 16
+    },
+    "message": "A11y: Non-interactive element <figcaption> cannot have interactive role 'menuitemradio'",
+    "start": {
+      "column": 2,
+      "line": 16
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 38,
+      "line": 18
+    },
+    "message": "A11y: Non-interactive element <figure> cannot have interactive role 'option'",
+    "start": {
+      "column": 0,
+      "line": 18
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 36,
+      "line": 19
+    },
+    "message": "A11y: Non-interactive element <footer> cannot have interactive role 'radio'",
+    "start": {
+      "column": 0,
+      "line": 19
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 26,
+      "line": 20
+    },
+    "message": "A11y: Non-interactive element <form> cannot have interactive role 'radiogroup'",
+    "start": {
+      "column": 0,
+      "line": 20
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 20,
+      "line": 21
+    },
+    "message": "A11y: Non-interactive element <frame> cannot have interactive role 'row'",
+    "start": {
+      "column": 0,
+      "line": 21
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 32,
+      "line": 22
+    },
+    "message": "A11y: Non-interactive element <h1> cannot have interactive role 'rowheader'",
+    "start": {
+      "column": 0,
+      "line": 22
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 70,
+      "line": 23
+    },
+    "message": "A11y: Non-interactive element <h2> cannot have interactive role 'scrollbar'",
+    "start": {
+      "column": 0,
+      "line": 23
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 32,
+      "line": 24
+    },
+    "message": "A11y: Non-interactive element <h3> cannot have interactive role 'searchbox'",
+    "start": {
+      "column": 0,
+      "line": 24
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 47,
+      "line": 25
+    },
+    "message": "A11y: Non-interactive element <h4> cannot have interactive role 'slider'",
+    "start": {
+      "column": 0,
+      "line": 25
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 33,
+      "line": 26
+    },
+    "message": "A11y: Non-interactive element <h5> cannot have interactive role 'spinbutton'",
+    "start": {
+      "column": 0,
+      "line": 26
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 42,
+      "line": 27
+    },
+    "message": "A11y: Non-interactive element <h6> cannot have interactive role 'switch'",
+    "start": {
+      "column": 0,
+      "line": 27
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 17,
+      "line": 28
+    },
+    "message": "A11y: Non-interactive element <hr> cannot have interactive role 'tab'",
+    "start": {
+      "column": 0,
+      "line": 28
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 38,
+      "line": 29
+    },
+    "message": "A11y: Non-interactive element <img> cannot have interactive role 'tabpanel'",
+    "start": {
+      "column": 0,
+      "line": 29
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 24,
+      "line": 30
+    },
+    "message": "A11y: Non-interactive element <label> cannot have interactive role 'textbox'",
+    "start": {
+      "column": 0,
+      "line": 30
+    }
+  },
+  {
+    "code": "a11y-label-has-associated-control",
+    "end": {
+      "column": 24,
+      "line": 30
+    },
+    "message": "A11y: A form label must be associated with a control.",
+    "start": {
+      "column": 0,
+      "line": 30
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 25,
+      "line": 31
+    },
+    "message": "A11y: Non-interactive element <legend> cannot have interactive role 'toolbar'",
+    "start": {
+      "column": 0,
+      "line": 31
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 18,
+      "line": 32
+    },
+    "message": "A11y: Non-interactive element <li> cannot have interactive role 'tree'",
+    "start": {
+      "column": 0,
+      "line": 32
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 24,
+      "line": 33
+    },
+    "message": "A11y: Non-interactive element <main> cannot have interactive role 'treegrid'",
+    "start": {
+      "column": 0,
+      "line": 33
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 38,
+      "line": 34
+    },
+    "message": "A11y: Non-interactive element <mark> cannot have interactive role 'treeitem'",
+    "start": {
+      "column": 0,
+      "line": 34
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 31,
+      "line": 35
+    },
+    "message": "A11y: Non-interactive element <marquee> cannot have interactive role 'doc-backlink'",
+    "start": {
+      "column": 0,
+      "line": 35
+    }
+  },
+  {
+    "code": "a11y-distracting-elements",
+    "end": {
+      "column": 31,
+      "line": 35
+    },
+    "message": "A11y: Avoid <marquee> elements",
+    "start": {
+      "column": 0,
+      "line": 35
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 29,
+      "line": 36
+    },
+    "message": "A11y: Non-interactive element <menu> cannot have interactive role 'doc-biblioref'",
+    "start": {
+      "column": 0,
+      "line": 36
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 29,
+      "line": 37
+    },
+    "message": "A11y: Non-interactive element <meter> cannot have interactive role 'doc-glossref'",
+    "start": {
+      "column": 0,
+      "line": 37
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 26,
+      "line": 38
+    },
+    "message": "A11y: Non-interactive element <nav> cannot have interactive role 'doc-noteref'",
+    "start": {
+      "column": 0,
+      "line": 38
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 20,
+      "line": 39
+    },
+    "message": "A11y: Non-interactive element <ol> cannot have interactive role 'button'",
+    "start": {
+      "column": 0,
+      "line": 39
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 42,
+      "line": 40
+    },
+    "message": "A11y: Non-interactive element <optgroup> cannot have interactive role 'treeitem'",
+    "start": {
+      "column": 0,
+      "line": 40
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 26,
+      "line": 41
+    },
+    "message": "A11y: Non-interactive element <output> cannot have interactive role 'treegrid'",
+    "start": {
+      "column": 0,
+      "line": 41
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 25,
+      "line": 42
+    },
+    "message": "A11y: Non-interactive element <p> cannot have interactive role 'columnheader'",
+    "start": {
+      "column": 0,
+      "line": 42
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 19,
+      "line": 43
+    },
+    "message": "A11y: Non-interactive element <pre> cannot have interactive role 'tree'",
+    "start": {
+      "column": 0,
+      "line": 43
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 61,
+      "line": 44
+    },
+    "message": "A11y: Non-interactive element <progress> cannot have interactive role 'combobox'",
+    "start": {
+      "column": 0,
+      "line": 44
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 23,
+      "line": 45
+    },
+    "message": "A11y: Non-interactive element <ruby> cannot have interactive role 'toolbar'",
+    "start": {
+      "column": 0,
+      "line": 45
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 56,
+      "line": 46
+    },
+    "message": "A11y: Non-interactive element <section> cannot have interactive role 'radio'",
+    "start": {
+      "column": 0,
+      "line": 46
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 21,
+      "line": 47
+    },
+    "message": "A11y: Non-interactive element <table> cannot have interactive role 'menu'",
+    "start": {
+      "column": 0,
+      "line": 47
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 26,
+      "line": 48
+    },
+    "message": "A11y: Non-interactive element <tbody> cannot have interactive role 'searchbox'",
+    "start": {
+      "column": 0,
+      "line": 48
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 20,
+      "line": 49
+    },
+    "message": "A11y: Non-interactive element <td> cannot have interactive role 'button'",
+    "start": {
+      "column": 0,
+      "line": 49
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 24,
+      "line": 50
+    },
+    "message": "A11y: Non-interactive element <tfoot> cannot have interactive role 'listbox'",
+    "start": {
+      "column": 0,
+      "line": 50
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 41,
+      "line": 51
+    },
+    "message": "A11y: Non-interactive element <thead> cannot have interactive role 'slider'",
+    "start": {
+      "column": 0,
+      "line": 51
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 28,
+      "line": 52
+    },
+    "message": "A11y: Non-interactive element <time> cannot have interactive role 'doc-backlink'",
+    "start": {
+      "column": 0,
+      "line": 52
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 24,
+      "line": 53
+    },
+    "message": "A11y: Non-interactive element <ul> cannot have interactive role 'spinbutton'",
+    "start": {
+      "column": 0,
+      "line": 53
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 18,
+      "line": 57
+    },
+    "message": "A11y: Non-interactive element <ul> cannot have interactive role 'menu'",
+    "start": {
+      "column": 0,
+      "line": 57
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 21,
+      "line": 58
+    },
+    "message": "A11y: Non-interactive element <ul> cannot have interactive role 'menubar'",
+    "start": {
+      "column": 0,
+      "line": 58
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 24,
+      "line": 59
+    },
+    "message": "A11y: Non-interactive element <ul> cannot have interactive role 'radiogroup'",
+    "start": {
+      "column": 0,
+      "line": 59
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 21,
+      "line": 60
+    },
+    "message": "A11y: Non-interactive element <ul> cannot have interactive role 'tablist'",
+    "start": {
+      "column": 0,
+      "line": 60
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 18,
+      "line": 61
+    },
+    "message": "A11y: Non-interactive element <ul> cannot have interactive role 'tree'",
+    "start": {
+      "column": 0,
+      "line": 61
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 22,
+      "line": 62
+    },
+    "message": "A11y: Non-interactive element <ul> cannot have interactive role 'treegrid'",
+    "start": {
+      "column": 0,
+      "line": 62
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 18,
+      "line": 64
+    },
+    "message": "A11y: Non-interactive element <ol> cannot have interactive role 'menu'",
+    "start": {
+      "column": 0,
+      "line": 64
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 21,
+      "line": 65
+    },
+    "message": "A11y: Non-interactive element <ol> cannot have interactive role 'menubar'",
+    "start": {
+      "column": 0,
+      "line": 65
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 24,
+      "line": 66
+    },
+    "message": "A11y: Non-interactive element <ol> cannot have interactive role 'radiogroup'",
+    "start": {
+      "column": 0,
+      "line": 66
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 21,
+      "line": 67
+    },
+    "message": "A11y: Non-interactive element <ol> cannot have interactive role 'tablist'",
+    "start": {
+      "column": 0,
+      "line": 67
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 18,
+      "line": 68
+    },
+    "message": "A11y: Non-interactive element <ol> cannot have interactive role 'tree'",
+    "start": {
+      "column": 0,
+      "line": 68
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 22,
+      "line": 69
+    },
+    "message": "A11y: Non-interactive element <ol> cannot have interactive role 'treegrid'",
+    "start": {
+      "column": 0,
+      "line": 69
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 17,
+      "line": 71
+    },
+    "message": "A11y: Non-interactive element <li> cannot have interactive role 'tab'",
+    "start": {
+      "column": 0,
+      "line": 71
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 22,
+      "line": 72
+    },
+    "message": "A11y: Non-interactive element <li> cannot have interactive role 'menuitem'",
+    "start": {
+      "column": 0,
+      "line": 72
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 17,
+      "line": 73
+    },
+    "message": "A11y: Non-interactive element <li> cannot have interactive role 'row'",
+    "start": {
+      "column": 0,
+      "line": 73
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-to-interactive-role",
+    "end": {
+      "column": 44,
+      "line": 74
+    },
+    "message": "A11y: Non-interactive element <li> cannot have interactive role 'treeitem'",
+    "start": {
+      "column": 0,
+      "line": 74
+    }
+  }
+]

From a6c329f4895b51a2ab24327932ad5dbffde7ba6c Mon Sep 17 00:00:00 2001
From: Nguyen Tran <88808276+ngtr6788@users.noreply.github.com>
Date: Tue, 14 Mar 2023 05:52:51 -0400
Subject: [PATCH 16/30] fix: object destructring picks up literal properties
 (#8357)

Part of #6609
---
 src/compiler/compile/nodes/shared/Context.ts  | 27 ++++++--
 .../_config.js                                | 63 +++++++++++++++++++
 .../main.svelte                               | 15 +++++
 .../_config.js                                | 17 +++++
 .../main.svelte                               | 19 ++++++
 .../_config.js                                | 19 ++++++
 .../main.svelte                               | 23 +++++++
 .../_config.js                                | 30 +++++++++
 .../main.svelte                               | 19 ++++++
 .../_config.js                                | 22 +++++++
 .../main.svelte                               |  7 +++
 .../_config.js                                | 22 +++++++
 .../main.svelte                               |  7 +++
 .../_config.js                                | 22 +++++++
 .../main.svelte                               |  7 +++
 15 files changed, 314 insertions(+), 5 deletions(-)
 create mode 100644 test/runtime/samples/await-then-destruct-number-props/_config.js
 create mode 100644 test/runtime/samples/await-then-destruct-number-props/main.svelte
 create mode 100644 test/runtime/samples/await-then-destruct-string-props/_config.js
 create mode 100644 test/runtime/samples/await-then-destruct-string-props/main.svelte
 create mode 100644 test/runtime/samples/const-tag-await-then-destructuring-literals/_config.js
 create mode 100644 test/runtime/samples/const-tag-await-then-destructuring-literals/main.svelte
 create mode 100644 test/runtime/samples/const-tag-each-destructure-literals/_config.js
 create mode 100644 test/runtime/samples/const-tag-each-destructure-literals/main.svelte
 create mode 100644 test/runtime/samples/each-block-destructured-array-as-object/_config.js
 create mode 100644 test/runtime/samples/each-block-destructured-array-as-object/main.svelte
 create mode 100644 test/runtime/samples/each-block-destructured-object-literal-props/_config.js
 create mode 100644 test/runtime/samples/each-block-destructured-object-literal-props/main.svelte
 create mode 100644 test/runtime/samples/each-block-destructured-object-literal-rest/_config.js
 create mode 100644 test/runtime/samples/each-block-destructured-object-literal-rest/main.svelte

diff --git a/src/compiler/compile/nodes/shared/Context.ts b/src/compiler/compile/nodes/shared/Context.ts
index 47180d24cd..5cef46482b 100644
--- a/src/compiler/compile/nodes/shared/Context.ts
+++ b/src/compiler/compile/nodes/shared/Context.ts
@@ -108,12 +108,28 @@ export function unpack_destructuring({
 					context_rest_properties
 				});
 				context_rest_properties.set((property.argument as Identifier).name, property);
-			} else {
-				const key = property.key as Identifier;
+			} else if (property.type === 'Property') {
+				const key = property.key;
 				const value = property.value;
 
-				used_properties.push(x`"${key.name}"`);
+				let property_name: any;
+				let new_modifier: (node: Node) => Node; 
+
+				if (property.computed) {
+					// TODO: If the property is computed, ie, { [computed_key]: prop }, the computed_key can be any type of expression.
+				} else if (key.type === 'Identifier') {
+					// e.g. { someProperty: ... }
+				  property_name = key.name;
+					new_modifier = (node) => x`${modifier(node)}.${property_name}`;
+				} else if (key.type === 'Literal') {
+					// e.g. { "property-in-quotes": ... } or { 14: ... }
+					property_name = key.value;
+					new_modifier = (node) => x`${modifier(node)}["${property_name}"]`;
+				}
+				
+			  used_properties.push(x`"${property_name}"`);
 				if (value.type === 'AssignmentPattern') {
+					// e.g. { property = default } or { property: newName = default }
 					const n = contexts.length;
 
 					mark_referenced(value.right, scope, component);
@@ -121,7 +137,7 @@ export function unpack_destructuring({
 					unpack_destructuring({
 						contexts,
 						node: value.left,
-						modifier: (node) => x`${modifier(node)}.${key.name}`,
+						modifier: new_modifier,
 						default_modifier: (node, to_ctx) =>
 							x`${node} !== undefined ? ${node} : ${update_reference(
 								contexts,
@@ -134,10 +150,11 @@ export function unpack_destructuring({
 						context_rest_properties
 					});
 				} else {
+					// e.g. { property } or { property: newName }
 					unpack_destructuring({
 						contexts,
 						node: value,
-						modifier: (node) => x`${modifier(node)}.${key.name}` as Node,
+						modifier: new_modifier,
 						default_modifier,
 						scope,
 						component,
diff --git a/test/runtime/samples/await-then-destruct-number-props/_config.js b/test/runtime/samples/await-then-destruct-number-props/_config.js
new file mode 100644
index 0000000000..6ef5e978d1
--- /dev/null
+++ b/test/runtime/samples/await-then-destruct-number-props/_config.js
@@ -0,0 +1,63 @@
+export default {
+	props: {
+		thePromise: new Promise(_ => {})
+	},
+
+	html: `
+		loading...
+	`,
+
+	async test({ assert, component, target }) {
+		await (component.thePromise = Promise.resolve([10, 11, 12, 13, 14, 15]));
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<p>[1] 11</p>
+        <p>[3] 13</p>
+				<p>[4] 14</p>
+			`
+		);
+
+		await (component.thePromise = Promise.resolve({ 1: 21, 3: 23, 4: 24 }));
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<p>[1] 21</p>
+				<p>[3] 23</p>
+				<p>[4] 24</p>
+			`
+		);
+
+		try {
+			await (component.thePromise = Promise.reject([30, 31, 32, 33, 34, 35]));
+		} catch (e) {
+			// do nothing
+		}
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<p>[0] 30</p>
+				<p>[2] 32</p>
+				<p>[5] 35</p>
+			`
+		);
+
+		try {
+		  await (component.thePromise = Promise.reject({ 0: 40, 2: 42, 5: 45 }));
+		} catch (e) {
+			// do nothing
+		}
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<p>[0] 40</p>
+				<p>[2] 42</p>
+				<p>[5] 45</p>
+			`
+		);
+	}
+};
diff --git a/test/runtime/samples/await-then-destruct-number-props/main.svelte b/test/runtime/samples/await-then-destruct-number-props/main.svelte
new file mode 100644
index 0000000000..aaeee9b353
--- /dev/null
+++ b/test/runtime/samples/await-then-destruct-number-props/main.svelte
@@ -0,0 +1,15 @@
+<script>
+	export let thePromise;
+</script>
+
+{#await thePromise}
+	loading...
+{:then { 1: a, 3: b, 4: c }}
+	<p>[1] {a}</p>
+	<p>[3] {b}</p>
+	<p>[4] {c}</p>
+{:catch { 0: d, 2: e, 5: f }}
+	<p>[0] {d}</p>
+	<p>[2] {e}</p>
+	<p>[5] {f}</p>
+{/await}
diff --git a/test/runtime/samples/await-then-destruct-string-props/_config.js b/test/runtime/samples/await-then-destruct-string-props/_config.js
new file mode 100644
index 0000000000..6517f6bf20
--- /dev/null
+++ b/test/runtime/samples/await-then-destruct-string-props/_config.js
@@ -0,0 +1,17 @@
+export default {
+	async test({ assert, target }) {
+		await Promise.resolve();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<p>prop-1: 1</p>
+			<p>prop4: 4</p>
+			<p>rest: {"prop2":2,"prop-3":3}</p>
+			<p>prop-7: 7</p>
+			<p>prop6: 6</p>
+			<p>rest: {"prop-5":5,"prop8":8}</p>
+			`
+		);
+	}
+};
diff --git a/test/runtime/samples/await-then-destruct-string-props/main.svelte b/test/runtime/samples/await-then-destruct-string-props/main.svelte
new file mode 100644
index 0000000000..608b1161f5
--- /dev/null
+++ b/test/runtime/samples/await-then-destruct-string-props/main.svelte
@@ -0,0 +1,19 @@
+<script>
+  const object = Promise.resolve({ 'prop-1': 1, 'prop2': 2, 'prop-3': 3, 'prop4': 4 });
+  const objectReject = Promise.reject({ 'prop-5': 5, 'prop6': 6, 'prop-7': 7, 'prop8': 8 });
+</script>
+
+{#await object then { 'prop-1': prop1, 'prop4': fourthProp, ...rest }}
+	<p>prop-1: {prop1}</p>
+	<p>prop4: {fourthProp}</p>
+	<p>rest: {JSON.stringify(rest)}</p>
+{/await}
+
+{#await objectReject then value}
+	resolved
+{:catch { 'prop-7': prop7, 'prop6': sixthProp, ...rest }}
+	<p>prop-7: {prop7}</p>
+	<p>prop6: {sixthProp}</p>
+	<p>rest: {JSON.stringify(rest)}</p>
+{/await}
+
diff --git a/test/runtime/samples/const-tag-await-then-destructuring-literals/_config.js b/test/runtime/samples/const-tag-await-then-destructuring-literals/_config.js
new file mode 100644
index 0000000000..cb40e7c456
--- /dev/null
+++ b/test/runtime/samples/const-tag-await-then-destructuring-literals/_config.js
@@ -0,0 +1,19 @@
+export default {
+	html: '<div>12 120 70, 30+4=34</div>',
+	async test({ component, target, assert }) {
+		component.promise1 = Promise.resolve({width: 5, height: 6});
+		component.promise2 = Promise.reject({width: 6, height: 7});
+
+		await Promise.resolve();
+		assert.htmlEqual(target.innerHTML, `
+			<div>30 300 110, 50+6=56</div>
+			<div>42 420 130, 60+7=67</div>
+		`);
+
+		component.constant = 20;
+		assert.htmlEqual(target.innerHTML, `
+			<div>30 600 220, 100+6=106</div>
+			<div>42 840 260, 120+7=127</div>
+		`);
+	}
+};
diff --git a/test/runtime/samples/const-tag-await-then-destructuring-literals/main.svelte b/test/runtime/samples/const-tag-await-then-destructuring-literals/main.svelte
new file mode 100644
index 0000000000..0875820e4a
--- /dev/null
+++ b/test/runtime/samples/const-tag-await-then-destructuring-literals/main.svelte
@@ -0,0 +1,23 @@
+<script>
+	export let promise1 = {width: 3, height: 4};
+	export let promise2 = {width: 5, height: 7};
+	export let constant = 10;
+
+	function calculate(width, height, constant) {
+		return { 'the-area': width * height, 'the-volume': width * height * constant };
+	}
+</script>
+
+{#await promise1 then { width, height }}
+	{@const {'the-area': area, 'the-volume': volume} = calculate(width, height, constant)}
+	{@const perimeter = (width + height) * constant}
+	{@const { 0: _width, 1: _height, 2: sum } = [width * constant, height, width * constant + height]}
+	<div>{area} {volume} {perimeter}, {_width}+{_height}={sum}</div>
+{/await}
+
+{#await promise2 catch { width, height }}
+	{@const {'the-area': area, 'the-volume': volume} = calculate(width, height, constant)}
+	{@const perimeter = (width + height) * constant}
+	{@const { 0: _width, 1: _height, 2: sum } = [width * constant, height, width * constant + height]}
+	<div>{area} {volume} {perimeter}, {_width}+{_height}={sum}</div>
+{/await}
diff --git a/test/runtime/samples/const-tag-each-destructure-literals/_config.js b/test/runtime/samples/const-tag-each-destructure-literals/_config.js
new file mode 100644
index 0000000000..00f8b31540
--- /dev/null
+++ b/test/runtime/samples/const-tag-each-destructure-literals/_config.js
@@ -0,0 +1,30 @@
+export default {
+	html: `
+		<div>12 120 70, 30+4=34</div>
+		<div>35 350 120, 50+7=57</div>
+		<div>48 480 140, 60+8=68</div>
+	`,
+	async test({ component, target, assert }) {
+		component.constant = 20;
+
+		assert.htmlEqual(target.innerHTML, `
+			<div>12 240 140, 60+4=64</div>
+			<div>35 700 240, 100+7=107</div>
+			<div>48 960 280, 120+8=128</div>
+		`);
+
+		component.boxes = [
+			{width: 3, height: 4},
+			{width: 4, height: 5},
+			{width: 5, height: 6},
+			{width: 6, height: 7}
+		];
+
+		assert.htmlEqual(target.innerHTML, `
+			<div>12 240 140, 60+4=64</div>
+			<div>20 400 180, 80+5=85</div>
+			<div>30 600 220, 100+6=106</div>
+			<div>42 840 260, 120+7=127</div>
+		`);
+	}
+};
diff --git a/test/runtime/samples/const-tag-each-destructure-literals/main.svelte b/test/runtime/samples/const-tag-each-destructure-literals/main.svelte
new file mode 100644
index 0000000000..b0fc221ec9
--- /dev/null
+++ b/test/runtime/samples/const-tag-each-destructure-literals/main.svelte
@@ -0,0 +1,19 @@
+<script>
+	export let boxes = [
+		{width: 3, height: 4},
+		{width: 5, height: 7},
+		{width: 6, height: 8},
+	];
+	export let constant = 10;
+
+	function calculate(width, height, constant) {
+		return { 'the-area': width * height, 'the-volume': width * height * constant };
+	}
+</script>
+
+{#each boxes as { width, height }}
+	{@const { 'the-area': area, 'the-volume': volume } = calculate(width, height, constant)}
+	{@const perimeter = (width + height) * constant}
+	{@const { 2: sum, 0: _width, 1: _height } = [width * constant, height, width * constant + height]}
+	<div>{area} {volume} {perimeter}, {_width}+{_height}={sum}</div>
+{/each}
diff --git a/test/runtime/samples/each-block-destructured-array-as-object/_config.js b/test/runtime/samples/each-block-destructured-array-as-object/_config.js
new file mode 100644
index 0000000000..ff341ce033
--- /dev/null
+++ b/test/runtime/samples/each-block-destructured-array-as-object/_config.js
@@ -0,0 +1,22 @@
+export default {
+	props: {
+		array: [
+      [1, 2, 3, 4, 5],
+      [6, 7, 8],
+      [9, 10, 11, 12]
+		]
+	},
+
+	html: `
+		<p>First: 1, Third: 3, Length: 5</p>
+		<p>First: 6, Third: 8, Length: 3</p>
+		<p>First: 9, Third: 11, Length: 4</p>
+	`,
+
+	test({ assert, component, target }) {
+		component.array = [[12, 13]];
+		assert.htmlEqual( target.innerHTML, `
+			<p>First: 12, Third: undefined, Length: 2</p>
+		`);
+	}
+};
diff --git a/test/runtime/samples/each-block-destructured-array-as-object/main.svelte b/test/runtime/samples/each-block-destructured-array-as-object/main.svelte
new file mode 100644
index 0000000000..cff735555b
--- /dev/null
+++ b/test/runtime/samples/each-block-destructured-array-as-object/main.svelte
@@ -0,0 +1,7 @@
+<script>
+	export let array;
+</script>
+
+{#each array as { 0: first, '2': third, "length": length }}
+	<p>First: {first}, Third: {third}, Length: {length}</p>
+{/each}
diff --git a/test/runtime/samples/each-block-destructured-object-literal-props/_config.js b/test/runtime/samples/each-block-destructured-object-literal-props/_config.js
new file mode 100644
index 0000000000..0b29c28cd9
--- /dev/null
+++ b/test/runtime/samples/each-block-destructured-object-literal-props/_config.js
@@ -0,0 +1,22 @@
+export default {
+	props: {
+		objectsArray: [
+      { 'foo-bar': 'FooBar', 0: 'zero', prop: 'prop' },
+      { 'foo-bar': 'foobar', 0: 'null', prop: 'a prop' },
+      { 'foo-bar': 'FOO BAR', 0: 'nada', prop: 'the prop' }
+		]
+	},
+
+	html: `
+		<p>FooBar: prop zero</p>
+		<p>foobar: a prop null</p>
+		<p>FOO BAR: the prop nada</p>
+	`,
+
+	test({ assert, component, target }) {
+		component.objectsArray = [{ 'foo-bar': 'Fool Ball', 0: 'nil', prop: 'one prop' }];
+		assert.htmlEqual( target.innerHTML, `
+			<p>Fool Ball: one prop nil</p>
+		`);
+	}
+};
diff --git a/test/runtime/samples/each-block-destructured-object-literal-props/main.svelte b/test/runtime/samples/each-block-destructured-object-literal-props/main.svelte
new file mode 100644
index 0000000000..08826e80e9
--- /dev/null
+++ b/test/runtime/samples/each-block-destructured-object-literal-props/main.svelte
@@ -0,0 +1,7 @@
+<script>
+	export let objectsArray;
+</script>
+
+{#each objectsArray as { 0: prop0, "foo-bar": propFooBar, prop: varProp } }
+	<p>{propFooBar}: {varProp} {prop0}</p>
+{/each}
diff --git a/test/runtime/samples/each-block-destructured-object-literal-rest/_config.js b/test/runtime/samples/each-block-destructured-object-literal-rest/_config.js
new file mode 100644
index 0000000000..b2f29e28f5
--- /dev/null
+++ b/test/runtime/samples/each-block-destructured-object-literal-rest/_config.js
@@ -0,0 +1,22 @@
+export default {
+	props: {
+		objectsArray: [
+			{ quote: 'q1', 'wrong-quote': 'wq1', 16: '16', class: 'class' },
+			{ quote: 'q2', 'wrong-quote': 'wq2', 16: 'sixteen', class: 'glass' },
+			{ quote: 'q3', 'wrong-quote': 'wq3', 16: 'seize', class: 'mass' }
+		]
+	},
+
+	html: `
+    <p class="class">Quote: q1, Wrong Quote: wq1, 16: 16</p>
+    <p class="glass">Quote: q2, Wrong Quote: wq2, 16: sixteen</p>
+    <p class="mass">Quote: q3, Wrong Quote: wq3, 16: seize</p>
+	`,
+
+	test({ assert, component, target }) {
+		component.objectsArray = [{ quote: 'new-quote', 'wrong-quote': 'wq4', 16: 'ten+six', role: 'role' }];
+		assert.htmlEqual(target.innerHTML, `
+			<p role="role">Quote: new-quote, Wrong Quote: wq4, 16: ten+six</p>
+		`);
+	}
+};
diff --git a/test/runtime/samples/each-block-destructured-object-literal-rest/main.svelte b/test/runtime/samples/each-block-destructured-object-literal-rest/main.svelte
new file mode 100644
index 0000000000..943b3b7940
--- /dev/null
+++ b/test/runtime/samples/each-block-destructured-object-literal-rest/main.svelte
@@ -0,0 +1,7 @@
+<script>
+	export let objectsArray;
+</script>
+
+{#each objectsArray as { "quote": quotedProp, "wrong-quote": wrongQuote, 16: sixteen, ...props } }
+	<p {...props}>Quote: {quotedProp}, Wrong Quote: {wrongQuote}, 16: {sixteen}</p>
+{/each}

From 7578af3a112ba0ad5695a9f5750f81e8a9c8b8a5 Mon Sep 17 00:00:00 2001
From: gtmnayan <50981692+gtm-nayan@users.noreply.github.com>
Date: Tue, 14 Mar 2023 16:43:04 +0545
Subject: [PATCH 17/30] fix: retain style directive value after style attribute
 is updated (#7610)

fixes #7475
---
 .../render_dom/wrappers/Element/index.ts      | 61 ++++++++++++++-----
 .../_config.js                                | 24 ++++++++
 .../main.svelte                               | 15 +++++
 .../_config.js                                |  1 -
 4 files changed, 85 insertions(+), 16 deletions(-)
 create mode 100644 test/runtime-puppeteer/samples/inline-style-directive-precedence/_config.js
 create mode 100644 test/runtime-puppeteer/samples/inline-style-directive-precedence/main.svelte

diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index eaef3a3b69..0af012777a 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -160,6 +160,7 @@ export default class ElementWrapper extends Wrapper {
 	bindings: Binding[];
 	event_handlers: EventHandler[];
 	class_dependencies: string[];
+	dynamic_style_dependencies: Set<string>;
 	has_dynamic_attribute: boolean;
 
 	select_binding_dependencies?: Set<string>;
@@ -214,6 +215,8 @@ export default class ElementWrapper extends Wrapper {
 			return;
 		}
 
+		this.dynamic_style_dependencies = new Set();
+
 		if (this.node.children.length) {
 			this.node.lets.forEach(l => {
 				extract_names(l.value || l.name).forEach(name => {
@@ -801,11 +804,13 @@ export default class ElementWrapper extends Wrapper {
 	}
 
 	add_attributes(block: Block) {
-		// Get all the class dependencies first
+		// Get all the class and style dependencies first
 		this.attributes.forEach((attribute) => {
 			if (attribute.node.name === 'class') {
 				const dependencies = attribute.node.get_dependencies();
 				push_array(this.class_dependencies, dependencies);
+			} else if (attribute.node.name === 'style') {
+				add_to_set(this.dynamic_style_dependencies, attribute.node.get_dependencies());
 			}
 		});
 
@@ -1170,8 +1175,18 @@ export default class ElementWrapper extends Wrapper {
 
 	add_styles(block: Block) {
 		const has_spread = this.node.attributes.some(attr => attr.is_spread);
+
+		let style_changed_var: Identifier | undefined;
+		const maybe_create_style_changed_var = () => {
+			if (!style_changed_var && this.dynamic_style_dependencies.size) {
+				style_changed_var = block.get_unique_name('style_changed');
+				const style_attr_dirty =  block.renderer.dirty([...this.dynamic_style_dependencies]);
+				block.chunks.update.push(b`const ${style_changed_var} = ${style_attr_dirty};`);
+			}
+		};
+
 		this.node.styles.forEach((style_directive) => {
-			const { name, expression, should_cache, important } = style_directive;
+			const { name, expression, important, should_cache } = style_directive;
 
 			const snippet = expression.manipulate(block);
 			let cached_snippet: Identifier | undefined;
@@ -1184,24 +1199,40 @@ export default class ElementWrapper extends Wrapper {
 
 			block.chunks.hydrate.push(updater);
 
-			const dependencies = expression.dynamic_dependencies();
+			// Assume that style has changed through the spread attribute
 			if (has_spread) {
 				block.chunks.update.push(updater);
-			} else if (dependencies.length > 0) {
+			} else {
+				const self_deps = expression.dynamic_dependencies();
+				const all_deps = new Set([
+					...self_deps,
+					...this.dynamic_style_dependencies
+				]);
+
+				if (all_deps.size === 0) return;
+
+				let condition =  block.renderer.dirty([...all_deps]);
+
 				if (should_cache) {
-					block.chunks.update.push(b`
-							if (${block.renderer.dirty(dependencies)} && (${cached_snippet} !== (${cached_snippet} = ${snippet}))) {
-								${updater}
-							}
-					`);
-				} else {
-					block.chunks.update.push(b`
-						if (${block.renderer.dirty(dependencies)}) {
-							${updater}
-						}
-					`);
+					condition = x`${condition} && ${cached_snippet} !== (${cached_snippet} = ${snippet})`;
 				}
+
+				if (this.dynamic_style_dependencies.size > 0) {
+					maybe_create_style_changed_var();
+					// If all dependencies are same as the style attribute dependencies, then we can skip the dirty check
+					condition = 
+						all_deps.size === this.dynamic_style_dependencies.size 
+							? style_changed_var
+							: x`${style_changed_var} || ${condition}`;
+				}
+
+				block.chunks.update.push(b`
+					if (${condition}) {
+						${updater}
+					}
+				`);
 			}
+			
 		});
 	}
 
diff --git a/test/runtime-puppeteer/samples/inline-style-directive-precedence/_config.js b/test/runtime-puppeteer/samples/inline-style-directive-precedence/_config.js
new file mode 100644
index 0000000000..a684f3e0d7
--- /dev/null
+++ b/test/runtime-puppeteer/samples/inline-style-directive-precedence/_config.js
@@ -0,0 +1,24 @@
+export default {
+	html: `
+		<p style="font-size: 32px; color: red; background-color: green; border-color: green;"></p>
+	`,
+
+	test({ assert, target, window, component }) {
+		const p = target.querySelector('p');
+		const styles = window.getComputedStyle(p);
+		assert.equal(styles.color, 'rgb(255, 0, 0)');
+		assert.equal(styles.fontSize, '32px');
+		assert.equal(styles.backgroundColor, 'rgb(0, 128, 0)');
+		assert.equal(styles.borderColor, 'rgb(0, 128, 0)');
+
+		component.foo = 'font-size: 50px; color: green;'; // Update style attribute
+		{
+			const p = target.querySelector('p');
+			const styles = window.getComputedStyle(p);
+			assert.equal(styles.color, 'rgb(255, 0, 0)');
+			assert.equal(styles.fontSize, '32px');
+			assert.equal(styles.backgroundColor, 'rgb(0, 128, 0)');
+			assert.equal(styles.borderColor, 'rgb(0, 128, 0)');
+		}
+	}
+};
diff --git a/test/runtime-puppeteer/samples/inline-style-directive-precedence/main.svelte b/test/runtime-puppeteer/samples/inline-style-directive-precedence/main.svelte
new file mode 100644
index 0000000000..3e8b721a42
--- /dev/null
+++ b/test/runtime-puppeteer/samples/inline-style-directive-precedence/main.svelte
@@ -0,0 +1,15 @@
+<script>
+	export let foo = "font-size: 20px; color: blue;";
+	let baz = "red"; // static value
+	let bar = "32"; // static value interpolated
+	export let bg = "gre"; // dynamic value interpolated/cached
+	export let borderColor = "green"; // dynamic value non-cached
+</script>
+
+<p
+	style:font-size="{bar}px"
+	style:color={baz}
+	style="{foo}"
+	style:background-color="{bg}en"
+	style:border-color={borderColor}
+/>
diff --git a/test/runtime/samples/inline-style-directive-and-style-attr-merged/_config.js b/test/runtime/samples/inline-style-directive-and-style-attr-merged/_config.js
index f5780daf80..f2ab49b511 100644
--- a/test/runtime/samples/inline-style-directive-and-style-attr-merged/_config.js
+++ b/test/runtime/samples/inline-style-directive-and-style-attr-merged/_config.js
@@ -5,7 +5,6 @@ export default {
 
 	test({ assert, target, window }) {
 		const p = target.querySelector('p');
-
 		const styles = window.getComputedStyle(p);
 		assert.equal(styles.color, 'red');
 		assert.equal(styles.height, '40px');

From fb5f281e9acea119f99526ba4fea161809eee6bd Mon Sep 17 00:00:00 2001
From: Bob Fanger <bfanger@gmail.com>
Date: Tue, 14 Mar 2023 15:33:52 +0100
Subject: [PATCH 18/30] fix: Prevent intro from cancelling outro (#7300)

The issue

1. When the block.i (intro) is called it registers a callback (via add_render_callback)
2. Then the block.o (outro) is called and start the outro and adds a callback to detach on outroend
3. The render callback from the intro is executed, starts the intro and cancels the outro animation

This causes components that should've been destroyed to stay on the page.

The fix in this PR: Inside the intro render callback it checks if it is still current and if it isn't (because an outro was triggered) it won't start the intro animation.

fixes #6152
fixes #6812
---
 src/compiler/compile/render_dom/wrappers/Element/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index 0af012777a..06a7b93d0e 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -967,6 +967,7 @@ export default class ElementWrapper extends Wrapper {
 
 			const intro_block = b`
 				@add_render_callback(() => {
+					if (!#current) return;
 					if (!${name}) ${name} = @create_bidirectional_transition(${this.var}, ${fn}, ${snippet}, true);
 					${name}.run(1);
 				});
@@ -1012,6 +1013,7 @@ export default class ElementWrapper extends Wrapper {
 				if (outro) {
 					intro_block = b`
 						@add_render_callback(() => {
+							if (!#current) return;
 							if (${outro_name}) ${outro_name}.end(1);
 							${intro_name} = @create_in_transition(${this.var}, ${fn}, ${snippet});
 							${intro_name}.start();

From 8015a36770735c3118b17515cdc4ba264be703f6 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 14 Mar 2023 18:06:31 +0100
Subject: [PATCH 19/30] chore: update changelog

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbc87cdb0e..b9ef572aa7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Svelte changelog
 
+## Unreleased
+
+* Prefer style directive values over style attribute values ([#7475](https://github.com/sveltejs/svelte/issues/7475))
+* Stop intro transition from triggering wrongfully ([#6152](https://github.com/sveltejs/svelte/issues/6152), [#6812](https://github.com/sveltejs/svelte/issues/6812))
+* Select `<option>` with `selected` attribute when initial state is `undefined` ([#8361](https://github.com/sveltejs/svelte/issues/8361))
+* Add a11y `no-noninteractive-element-to-interactive-role` ([#8167](https://github.com/sveltejs/svelte/pull/8167))
+* Account for `bind:group` members being spread across multiple control flow blocks ([#8372](https://github.com/sveltejs/svelte/issues/8372))
+* Support literal properties when destructuring objects in the template ([#8357](https://github.com/sveltejs/svelte/pull/8357))
+* Prevent derived store callbacks after store is unsubscribed from ([#8364](https://github.com/sveltejs/svelte/issues/8364))
+
 ## 3.56.0
 
 * Add `|stopImmediatePropagation` event modifier ([#5085](https://github.com/sveltejs/svelte/issues/5085))

From 6aee49bad3fab1885970d4a211cb43bb6489b30a Mon Sep 17 00:00:00 2001
From: Bob Fanger <bfanger@gmail.com>
Date: Wed, 15 Mar 2023 12:40:49 +0100
Subject: [PATCH 20/30] feat: css units in fly & blur transitions (#7623)

Closes #6050

---------

Co-authored-by: Bob Fanger <b.fanger@wearetriple.com>
Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 site/content/docs/04-run-time.md |  7 ++++---
 src/runtime/internal/utils.ts    |  5 +++++
 src/runtime/transition/index.ts  | 17 +++++++++--------
 test/utils/index.ts              | 14 ++++++++++++++
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/site/content/docs/04-run-time.md b/site/content/docs/04-run-time.md
index 46d025fe3e..440d8aeccf 100644
--- a/site/content/docs/04-run-time.md
+++ b/site/content/docs/04-run-time.md
@@ -693,7 +693,7 @@ Animates a `blur` filter alongside an element's opacity.
 * `duration` (`number`, default 400) — milliseconds the transition lasts
 * `easing` (`function`, default `cubicInOut`) — an [easing function](/docs#run-time-svelte-easing)
 * `opacity` (`number`, default 0) - the opacity value to animate out to and in from
-* `amount` (`number`, default 5) - the size of the blur in pixels
+* `amount` (`number | string`, default 5) - the size of the blur. Supports css units (for example: `"4rem"`). The default unit is `px`
 
 ```sv
 <script>
@@ -728,10 +728,11 @@ Animates the x and y positions and the opacity of an element. `in` transitions a
 * `delay` (`number`, default 0) — milliseconds before starting
 * `duration` (`number`, default 400) — milliseconds the transition lasts
 * `easing` (`function`, default `cubicOut`) — an [easing function](/docs#run-time-svelte-easing)
-* `x` (`number`, default 0) - the x offset to animate out to and in from
-* `y` (`number`, default 0) - the y offset to animate out to and in from
+* `x` (`number | string`, default 0) - the x offset to animate out to and in from
+* `y` (`number | string`, default 0) - the y offset to animate out to and in from
 * `opacity` (`number`, default 0) - the opacity value to animate out to and in from
 
+x and y use `px` by default but support css units, for example `x: '100vw'` or `y: '50%'`.
 You can see the `fly` transition in action in the [transition tutorial](/tutorial/adding-parameters-to-transitions).
 
 ```sv
diff --git a/src/runtime/internal/utils.ts b/src/runtime/internal/utils.ts
index 8adb0c279b..b1c27a355d 100644
--- a/src/runtime/internal/utils.ts
+++ b/src/runtime/internal/utils.ts
@@ -189,3 +189,8 @@ export const has_prop = (obj, prop) => Object.prototype.hasOwnProperty.call(obj,
 export function action_destroyer(action_result) {
 	return action_result && is_function(action_result.destroy) ? action_result.destroy : noop;
 }
+
+export function split_css_unit(value: number | string): [number, string] {
+	const split = typeof value === 'string' && value.match(/^\s*(-?[\d.]+)([^\s]*)\s*$/);
+	return split ? [parseFloat(split[1]), split[2] || 'px'] : [value as number, 'px'];
+}
diff --git a/src/runtime/transition/index.ts b/src/runtime/transition/index.ts
index 836efc3d40..7ea08a02d2 100644
--- a/src/runtime/transition/index.ts
+++ b/src/runtime/transition/index.ts
@@ -1,5 +1,5 @@
 import { cubicOut, cubicInOut, linear } from 'svelte/easing';
-import { assign, is_function } from 'svelte/internal';
+import { assign, split_css_unit, is_function } from 'svelte/internal';
 
 export type EasingFunction = (t: number) => number;
 
@@ -15,7 +15,7 @@ export interface BlurParams {
 	delay?: number;
 	duration?: number;
 	easing?: EasingFunction;
-	amount?: number;
+	amount?: number | string;
 	opacity?: number;
 }
 
@@ -31,12 +31,12 @@ export function blur(node: Element, {
 	const f = style.filter === 'none' ? '' : style.filter;
 
 	const od = target_opacity * (1 - opacity);
-
+	const [value, unit] = split_css_unit(amount);
 	return {
 		delay,
 		duration,
 		easing,
-		css: (_t, u) => `opacity: ${target_opacity - (od * u)}; filter: ${f} blur(${u * amount}px);`
+		css: (_t, u) => `opacity: ${target_opacity - (od * u)}; filter: ${f} blur(${u * value}${unit});`
 	};
 }
 
@@ -65,8 +65,8 @@ export interface FlyParams {
 	delay?: number;
 	duration?: number;
 	easing?: EasingFunction;
-	x?: number;
-	y?: number;
+	x?: number | string;
+	y?: number | string;
 	opacity?: number;
 }
 
@@ -83,13 +83,14 @@ export function fly(node: Element, {
 	const transform = style.transform === 'none' ? '' : style.transform;
 
 	const od = target_opacity * (1 - opacity);
-
+	const [xValue, xUnit] = split_css_unit(x);
+	const [yValue, yUnit] = split_css_unit(y);
 	return {
 		delay,
 		duration,
 		easing,
 		css: (t, u) => `
-			transform: ${transform} translate(${(1 - t) * x}px, ${(1 - t) * y}px);
+			transform: ${transform} translate(${(1 - t) * xValue}${xUnit}, ${(1 - t) * yValue}${yUnit});
 			opacity: ${target_opacity - (od * u)}`
 	};
 }
diff --git a/test/utils/index.ts b/test/utils/index.ts
index a8aed9387a..37ba63b1c7 100644
--- a/test/utils/index.ts
+++ b/test/utils/index.ts
@@ -1,5 +1,6 @@
 import * as assert from 'assert';
 import { trim_start, trim_end } from '../../src/compiler/utils/trim';
+import { split_css_unit } from '../../src/runtime/internal/utils';
 
 describe('utils', () => {
 	describe('trim', () => {
@@ -13,4 +14,17 @@ describe('utils', () => {
 			assert.equal(value, '	\r\n\t svelte content');
 		});
 	});
+
+	describe('split_css_unit', () => {
+		it('should use px as default', () => {
+			assert.deepEqual(split_css_unit(10), [10, 'px']);
+			assert.deepEqual(split_css_unit('10'), [10, 'px']);
+		});
+
+		it('should split the css notation into value and unit', () => {
+			assert.deepEqual(split_css_unit('-50%'), [-50, '%']);
+			assert.deepEqual(split_css_unit('0.1rem'), [0.1, 'rem']);
+			assert.deepEqual(split_css_unit('.1rem'), [0.1, 'rem']);
+		});
+	});
 });

From c19d0889c536eff76957a3a853bdefaa823423e0 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Wed, 15 Mar 2023 08:31:25 -0700
Subject: [PATCH 21/30] chore: rename variable to follow coding style (#8385)

---
 src/compiler/utils/get_code_frame.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/utils/get_code_frame.ts b/src/compiler/utils/get_code_frame.ts
index 14ca44badb..f9a17b4f53 100644
--- a/src/compiler/utils/get_code_frame.ts
+++ b/src/compiler/utils/get_code_frame.ts
@@ -19,10 +19,10 @@ export default function get_code_frame(
 	return lines
 		.slice(frame_start, frame_end)
 		.map((str, i) => {
-			const isErrorLine = frame_start + i === line;
+			const is_error_line = frame_start + i === line;
 			const line_num = String(i + frame_start + 1).padStart(digits, ' ');
 
-			if (isErrorLine) {
+			if (is_error_line) {
 				const indicator = ' '.repeat(digits + 2 + tabs_to_spaces(str.slice(0, column)).length) + '^';
 				return `${line_num}: ${tabs_to_spaces(str)}\n${indicator}`;
 			}

From 4b0b471ee1a36d0f900677200e1eecda8c05b365 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Wed, 15 Mar 2023 16:38:03 +0100
Subject: [PATCH 22/30] feat: add back `<svelte:document>`  (#7149)

Closes #3310

---------

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 generate-type-definitions.js                  |  7 +---
 site/content/docs/03-template-syntax.md       | 23 ++++++++++-
 .../06-svelte-body/text.md                    | 14 -------
 .../06-svelte-document/app-a/App.svelte       | 10 +++++
 .../06-svelte-document/app-b/App.svelte       | 10 +++++
 .../06-svelte-document/text.md                | 13 ++++++
 .../app-a/App.svelte                          |  0
 .../app-b/App.svelte                          |  0
 .../07-svelte-body/text.md                    | 14 +++++++
 .../app-a/App.svelte                          |  0
 .../app-b/App.svelte                          |  0
 .../text.md                                   |  0
 .../app-a/App.svelte                          |  0
 .../app-a/Todo.svelte                         |  0
 .../app-a/flash.js                            |  0
 .../app-b/App.svelte                          |  0
 .../app-b/Todo.svelte                         |  0
 .../app-b/flash.js                            |  0
 .../text.md                                   |  0
 .../app-a/App.svelte                          |  0
 .../app-a/Box.svelte                          |  0
 .../app-b/App.svelte                          |  0
 .../app-b/Box.svelte                          |  0
 .../text.md                                   |  0
 src/compiler/compile/compiler_warnings.ts     |  6 ++-
 src/compiler/compile/nodes/Document.ts        | 41 +++++++++++++++++++
 src/compiler/compile/nodes/interfaces.ts      |  2 +
 .../compile/nodes/shared/map_children.ts      |  2 +
 .../compile/render_dom/wrappers/Document.ts   | 25 +++++++++++
 .../compile/render_dom/wrappers/Fragment.ts   |  2 +
 src/compiler/compile/render_ssr/Renderer.ts   |  1 +
 src/compiler/interfaces.ts                    |  2 +-
 src/compiler/parse/state/tag.ts               |  1 +
 .../error-svelte-selfdestructive/error.json   |  2 +-
 .../samples/action-document/_config.js        | 14 +++++++
 .../samples/action-document/main.svelte       | 24 +++++++++++
 36 files changed, 188 insertions(+), 25 deletions(-)
 delete mode 100644 site/content/tutorial/16-special-elements/06-svelte-body/text.md
 create mode 100644 site/content/tutorial/16-special-elements/06-svelte-document/app-a/App.svelte
 create mode 100644 site/content/tutorial/16-special-elements/06-svelte-document/app-b/App.svelte
 create mode 100644 site/content/tutorial/16-special-elements/06-svelte-document/text.md
 rename site/content/tutorial/16-special-elements/{06-svelte-body => 07-svelte-body}/app-a/App.svelte (100%)
 rename site/content/tutorial/16-special-elements/{06-svelte-body => 07-svelte-body}/app-b/App.svelte (100%)
 create mode 100644 site/content/tutorial/16-special-elements/07-svelte-body/text.md
 rename site/content/tutorial/16-special-elements/{07-svelte-head => 08-svelte-head}/app-a/App.svelte (100%)
 rename site/content/tutorial/16-special-elements/{07-svelte-head => 08-svelte-head}/app-b/App.svelte (100%)
 rename site/content/tutorial/16-special-elements/{07-svelte-head => 08-svelte-head}/text.md (100%)
 rename site/content/tutorial/16-special-elements/{08-svelte-options => 09-svelte-options}/app-a/App.svelte (100%)
 rename site/content/tutorial/16-special-elements/{08-svelte-options => 09-svelte-options}/app-a/Todo.svelte (100%)
 rename site/content/tutorial/16-special-elements/{08-svelte-options => 09-svelte-options}/app-a/flash.js (100%)
 rename site/content/tutorial/16-special-elements/{08-svelte-options => 09-svelte-options}/app-b/App.svelte (100%)
 rename site/content/tutorial/16-special-elements/{08-svelte-options => 09-svelte-options}/app-b/Todo.svelte (100%)
 rename site/content/tutorial/16-special-elements/{08-svelte-options => 09-svelte-options}/app-b/flash.js (100%)
 rename site/content/tutorial/16-special-elements/{08-svelte-options => 09-svelte-options}/text.md (100%)
 rename site/content/tutorial/16-special-elements/{09-svelte-fragment => 10-svelte-fragment}/app-a/App.svelte (100%)
 rename site/content/tutorial/16-special-elements/{09-svelte-fragment => 10-svelte-fragment}/app-a/Box.svelte (100%)
 rename site/content/tutorial/16-special-elements/{09-svelte-fragment => 10-svelte-fragment}/app-b/App.svelte (100%)
 rename site/content/tutorial/16-special-elements/{09-svelte-fragment => 10-svelte-fragment}/app-b/Box.svelte (100%)
 rename site/content/tutorial/16-special-elements/{09-svelte-fragment => 10-svelte-fragment}/text.md (100%)
 create mode 100644 src/compiler/compile/nodes/Document.ts
 create mode 100644 src/compiler/compile/render_dom/wrappers/Document.ts
 create mode 100644 test/runtime/samples/action-document/_config.js
 create mode 100644 test/runtime/samples/action-document/main.svelte

diff --git a/generate-type-definitions.js b/generate-type-definitions.js
index 6ec2f313c3..4a36330b13 100644
--- a/generate-type-definitions.js
+++ b/generate-type-definitions.js
@@ -3,12 +3,7 @@
 const { execSync } = require('child_process');
 const { readFileSync, writeFileSync } = require('fs');
 
-try {
-	execSync('tsc -p src/compiler --emitDeclarationOnly && tsc -p src/runtime --emitDeclarationOnly');
-} catch (err) {
-	console.error(err.stderr.toString());
-	throw err;
-}
+execSync('tsc -p src/compiler --emitDeclarationOnly && tsc -p src/runtime --emitDeclarationOnly', { stdio: 'inherit' });
 // We need to add these types to the .d.ts files here because if we add them before building, the build will fail,
 // because the TS->JS transformation doesn't know these exports are types and produces code that fails at runtime.
 // We can't use `export type` syntax either because the TS version we're on doesn't have this feature yet.
diff --git a/site/content/docs/03-template-syntax.md b/site/content/docs/03-template-syntax.md
index ebc4ee8ef2..95d76db5b7 100644
--- a/site/content/docs/03-template-syntax.md
+++ b/site/content/docs/03-template-syntax.md
@@ -1746,6 +1746,25 @@ All except `scrollX` and `scrollY` are readonly.
 
 > Note that the page will not be scrolled to the initial value to avoid accessibility issues. Only subsequent changes to the bound variable of `scrollX` and `scrollY` will cause scrolling. However, if the scrolling behaviour is desired, call `scrollTo()` in `onMount()`.
 
+### `<svelte:document>`
+
+```sv
+<svelte:document on:event={handler}/>
+```
+
+---
+
+Similarly to `<svelte:window>`, this element allows you to add listeners to events on `document`, such as `visibilitychange`, which don't fire on `window`. It also lets you use [actions](/docs#template-syntax-element-directives-use-action) on `document`.
+
+As with `<svelte:window>`, this element may only appear the top level of your component and must never be inside a block or element.
+
+```sv
+<svelte:document
+	on:visibilitychange={handleVisibilityChange}
+	use:someAction
+/>
+```
+
 ### `<svelte:body>`
 
 ```sv
@@ -1756,7 +1775,7 @@ All except `scrollX` and `scrollY` are readonly.
 
 Similarly to `<svelte:window>`, this element allows you to add listeners to events on `document.body`, such as `mouseenter` and `mouseleave`, which don't fire on `window`. It also lets you use [actions](/docs#template-syntax-element-directives-use-action) on the `<body>` element.
 
-As with `<svelte:window>`, this element may only appear the top level of your component and must never be inside a block or element.
+As with `<svelte:window>` and `<svelte:document>`, this element may only appear the top level of your component and must never be inside a block or element.
 
 ```sv
 <svelte:body
@@ -1777,7 +1796,7 @@ As with `<svelte:window>`, this element may only appear the top level of your co
 
 This element makes it possible to insert elements into `document.head`. During server-side rendering, `head` content is exposed separately to the main `html` content.
 
-As with `<svelte:window>` and `<svelte:body>`, this element may only appear at the top level of your component and must never be inside a block or element.
+As with `<svelte:window>`, `<svelte:document>` and `<svelte:body>`, this element may only appear at the top level of your component and must never be inside a block or element.
 
 ```sv
 <svelte:head>
diff --git a/site/content/tutorial/16-special-elements/06-svelte-body/text.md b/site/content/tutorial/16-special-elements/06-svelte-body/text.md
deleted file mode 100644
index 95da3ce608..0000000000
--- a/site/content/tutorial/16-special-elements/06-svelte-body/text.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-title: <svelte:body>
----
-
-Similar to `<svelte:window>`, the `<svelte:body>` element allows you to listen for events that fire on `document.body`. This is useful with the `mouseenter` and `mouseleave` events, which don't fire on `window`.
-
-Add the `mouseenter` and `mouseleave` handlers to the `<svelte:body>` tag:
-
-```html
-<svelte:body
-	on:mouseenter={handleMouseenter}
-	on:mouseleave={handleMouseleave}
-/>
-```
\ No newline at end of file
diff --git a/site/content/tutorial/16-special-elements/06-svelte-document/app-a/App.svelte b/site/content/tutorial/16-special-elements/06-svelte-document/app-a/App.svelte
new file mode 100644
index 0000000000..cea052ec88
--- /dev/null
+++ b/site/content/tutorial/16-special-elements/06-svelte-document/app-a/App.svelte
@@ -0,0 +1,10 @@
+<script>
+	let selection = '';
+
+	const handleSelectionChange = (e) => selection = document.getSelection();
+</script>
+
+<svelte:body />
+
+<p>Select this text to fire events</p>
+<p>Selection: {selection}</p>
diff --git a/site/content/tutorial/16-special-elements/06-svelte-document/app-b/App.svelte b/site/content/tutorial/16-special-elements/06-svelte-document/app-b/App.svelte
new file mode 100644
index 0000000000..5dd44aa389
--- /dev/null
+++ b/site/content/tutorial/16-special-elements/06-svelte-document/app-b/App.svelte
@@ -0,0 +1,10 @@
+<script>
+	let selection = '';
+
+	const handleSelectionChange = (e) => selection = document.getSelection();
+</script>
+
+<svelte:document on:selectionchange={handleSelectionChange} />
+
+<p>Select this text to fire events</p>
+<p>Selection: {selection}</p>
diff --git a/site/content/tutorial/16-special-elements/06-svelte-document/text.md b/site/content/tutorial/16-special-elements/06-svelte-document/text.md
new file mode 100644
index 0000000000..b40c83a6f2
--- /dev/null
+++ b/site/content/tutorial/16-special-elements/06-svelte-document/text.md
@@ -0,0 +1,13 @@
+---
+title: <svelte:document>
+---
+
+Similar to `<svelte:window>`, the `<svelte:document>` element allows you to listen for events that fire on `document`. This is useful with events like `selectionchange`, which doesn't fire on `window`.
+
+Add the `selectionchange` handler to the `<svelte:document>` tag:
+
+```html
+<svelte:document on:selectionchange={handleSelectionChange} />
+```
+
+> Avoid `mouseenter` and `mouseleave` handlers on this element, these events are not fired on `document` in all browsers. Use `<svelte:body>` for this instead. 
diff --git a/site/content/tutorial/16-special-elements/06-svelte-body/app-a/App.svelte b/site/content/tutorial/16-special-elements/07-svelte-body/app-a/App.svelte
similarity index 100%
rename from site/content/tutorial/16-special-elements/06-svelte-body/app-a/App.svelte
rename to site/content/tutorial/16-special-elements/07-svelte-body/app-a/App.svelte
diff --git a/site/content/tutorial/16-special-elements/06-svelte-body/app-b/App.svelte b/site/content/tutorial/16-special-elements/07-svelte-body/app-b/App.svelte
similarity index 100%
rename from site/content/tutorial/16-special-elements/06-svelte-body/app-b/App.svelte
rename to site/content/tutorial/16-special-elements/07-svelte-body/app-b/App.svelte
diff --git a/site/content/tutorial/16-special-elements/07-svelte-body/text.md b/site/content/tutorial/16-special-elements/07-svelte-body/text.md
new file mode 100644
index 0000000000..4755281d61
--- /dev/null
+++ b/site/content/tutorial/16-special-elements/07-svelte-body/text.md
@@ -0,0 +1,14 @@
+---
+title: <svelte:body>
+---
+
+Similar to `<svelte:window>` and `<svelte:document>`, the `<svelte:body>` element allows you to listen for events that fire on `document.body`. This is useful with the `mouseenter` and `mouseleave` events, which don't fire on `window`.
+
+Add the `mouseenter` and `mouseleave` handlers to the `<svelte:body>` tag:
+
+```html
+<svelte:body
+	on:mouseenter={handleMouseenter}
+	on:mouseleave={handleMouseleave}
+/>
+```
\ No newline at end of file
diff --git a/site/content/tutorial/16-special-elements/07-svelte-head/app-a/App.svelte b/site/content/tutorial/16-special-elements/08-svelte-head/app-a/App.svelte
similarity index 100%
rename from site/content/tutorial/16-special-elements/07-svelte-head/app-a/App.svelte
rename to site/content/tutorial/16-special-elements/08-svelte-head/app-a/App.svelte
diff --git a/site/content/tutorial/16-special-elements/07-svelte-head/app-b/App.svelte b/site/content/tutorial/16-special-elements/08-svelte-head/app-b/App.svelte
similarity index 100%
rename from site/content/tutorial/16-special-elements/07-svelte-head/app-b/App.svelte
rename to site/content/tutorial/16-special-elements/08-svelte-head/app-b/App.svelte
diff --git a/site/content/tutorial/16-special-elements/07-svelte-head/text.md b/site/content/tutorial/16-special-elements/08-svelte-head/text.md
similarity index 100%
rename from site/content/tutorial/16-special-elements/07-svelte-head/text.md
rename to site/content/tutorial/16-special-elements/08-svelte-head/text.md
diff --git a/site/content/tutorial/16-special-elements/08-svelte-options/app-a/App.svelte b/site/content/tutorial/16-special-elements/09-svelte-options/app-a/App.svelte
similarity index 100%
rename from site/content/tutorial/16-special-elements/08-svelte-options/app-a/App.svelte
rename to site/content/tutorial/16-special-elements/09-svelte-options/app-a/App.svelte
diff --git a/site/content/tutorial/16-special-elements/08-svelte-options/app-a/Todo.svelte b/site/content/tutorial/16-special-elements/09-svelte-options/app-a/Todo.svelte
similarity index 100%
rename from site/content/tutorial/16-special-elements/08-svelte-options/app-a/Todo.svelte
rename to site/content/tutorial/16-special-elements/09-svelte-options/app-a/Todo.svelte
diff --git a/site/content/tutorial/16-special-elements/08-svelte-options/app-a/flash.js b/site/content/tutorial/16-special-elements/09-svelte-options/app-a/flash.js
similarity index 100%
rename from site/content/tutorial/16-special-elements/08-svelte-options/app-a/flash.js
rename to site/content/tutorial/16-special-elements/09-svelte-options/app-a/flash.js
diff --git a/site/content/tutorial/16-special-elements/08-svelte-options/app-b/App.svelte b/site/content/tutorial/16-special-elements/09-svelte-options/app-b/App.svelte
similarity index 100%
rename from site/content/tutorial/16-special-elements/08-svelte-options/app-b/App.svelte
rename to site/content/tutorial/16-special-elements/09-svelte-options/app-b/App.svelte
diff --git a/site/content/tutorial/16-special-elements/08-svelte-options/app-b/Todo.svelte b/site/content/tutorial/16-special-elements/09-svelte-options/app-b/Todo.svelte
similarity index 100%
rename from site/content/tutorial/16-special-elements/08-svelte-options/app-b/Todo.svelte
rename to site/content/tutorial/16-special-elements/09-svelte-options/app-b/Todo.svelte
diff --git a/site/content/tutorial/16-special-elements/08-svelte-options/app-b/flash.js b/site/content/tutorial/16-special-elements/09-svelte-options/app-b/flash.js
similarity index 100%
rename from site/content/tutorial/16-special-elements/08-svelte-options/app-b/flash.js
rename to site/content/tutorial/16-special-elements/09-svelte-options/app-b/flash.js
diff --git a/site/content/tutorial/16-special-elements/08-svelte-options/text.md b/site/content/tutorial/16-special-elements/09-svelte-options/text.md
similarity index 100%
rename from site/content/tutorial/16-special-elements/08-svelte-options/text.md
rename to site/content/tutorial/16-special-elements/09-svelte-options/text.md
diff --git a/site/content/tutorial/16-special-elements/09-svelte-fragment/app-a/App.svelte b/site/content/tutorial/16-special-elements/10-svelte-fragment/app-a/App.svelte
similarity index 100%
rename from site/content/tutorial/16-special-elements/09-svelte-fragment/app-a/App.svelte
rename to site/content/tutorial/16-special-elements/10-svelte-fragment/app-a/App.svelte
diff --git a/site/content/tutorial/16-special-elements/09-svelte-fragment/app-a/Box.svelte b/site/content/tutorial/16-special-elements/10-svelte-fragment/app-a/Box.svelte
similarity index 100%
rename from site/content/tutorial/16-special-elements/09-svelte-fragment/app-a/Box.svelte
rename to site/content/tutorial/16-special-elements/10-svelte-fragment/app-a/Box.svelte
diff --git a/site/content/tutorial/16-special-elements/09-svelte-fragment/app-b/App.svelte b/site/content/tutorial/16-special-elements/10-svelte-fragment/app-b/App.svelte
similarity index 100%
rename from site/content/tutorial/16-special-elements/09-svelte-fragment/app-b/App.svelte
rename to site/content/tutorial/16-special-elements/10-svelte-fragment/app-b/App.svelte
diff --git a/site/content/tutorial/16-special-elements/09-svelte-fragment/app-b/Box.svelte b/site/content/tutorial/16-special-elements/10-svelte-fragment/app-b/Box.svelte
similarity index 100%
rename from site/content/tutorial/16-special-elements/09-svelte-fragment/app-b/Box.svelte
rename to site/content/tutorial/16-special-elements/10-svelte-fragment/app-b/Box.svelte
diff --git a/site/content/tutorial/16-special-elements/09-svelte-fragment/text.md b/site/content/tutorial/16-special-elements/10-svelte-fragment/text.md
similarity index 100%
rename from site/content/tutorial/16-special-elements/09-svelte-fragment/text.md
rename to site/content/tutorial/16-special-elements/10-svelte-fragment/text.md
diff --git a/src/compiler/compile/compiler_warnings.ts b/src/compiler/compile/compiler_warnings.ts
index 380ed5a6f0..710377374f 100644
--- a/src/compiler/compile/compiler_warnings.ts
+++ b/src/compiler/compile/compiler_warnings.ts
@@ -217,5 +217,9 @@ export default {
 	invalid_rest_eachblock_binding: (rest_element_name: string) => ({
 		code: 'invalid-rest-eachblock-binding',
 		message: `...${rest_element_name} operator will create a new object and binding propagation with original object will not work`
-	})
+	}),
+	avoid_mouse_events_on_document: {
+		code: 'avoid-mouse-events-on-document',
+		message: 'Mouse enter/leave events on the document are not supported in all browsers and should be avoided'
+	}
 };
diff --git a/src/compiler/compile/nodes/Document.ts b/src/compiler/compile/nodes/Document.ts
new file mode 100644
index 0000000000..653ccb627b
--- /dev/null
+++ b/src/compiler/compile/nodes/Document.ts
@@ -0,0 +1,41 @@
+import Node from './shared/Node';
+import EventHandler from './EventHandler';
+import Action from './Action';
+import Component from '../Component';
+import TemplateScope from './shared/TemplateScope';
+import { Element } from '../../interfaces';
+import compiler_warnings from '../compiler_warnings';
+
+export default class Document extends Node {
+	type: 'Document';
+	handlers: EventHandler[] = [];
+	actions: Action[] = [];
+
+	constructor(component: Component, parent: Node, scope: TemplateScope, info: Element) {
+		super(component, parent, scope, info);
+
+		info.attributes.forEach((node) => {
+			if (node.type === 'EventHandler') {
+				this.handlers.push(new EventHandler(component, this, scope, node));
+			} else if (node.type === 'Action') {
+				this.actions.push(new Action(component, this, scope, node));
+			} else {
+				// TODO there shouldn't be anything else here...
+			}
+		});
+
+		this.validate();
+	}
+
+	private validate() {
+		const handlers_map = new Set();
+
+		this.handlers.forEach(handler => (
+			handlers_map.add(handler.name)
+		));
+
+		if (handlers_map.has('mouseenter') || handlers_map.has('mouseleave')) {
+			this.component.warn(this, compiler_warnings.avoid_mouse_events_on_document);
+		}
+	}
+}
diff --git a/src/compiler/compile/nodes/interfaces.ts b/src/compiler/compile/nodes/interfaces.ts
index f023cad25c..b4740267fd 100644
--- a/src/compiler/compile/nodes/interfaces.ts
+++ b/src/compiler/compile/nodes/interfaces.ts
@@ -12,6 +12,7 @@ import StyleDirective from './StyleDirective';
 import Comment from './Comment';
 import ConstTag from './ConstTag';
 import DebugTag from './DebugTag';
+import Document from './Document';
 import EachBlock from './EachBlock';
 import Element from './Element';
 import ElseBlock from './ElseBlock';
@@ -47,6 +48,7 @@ export type INode = Action
 | Comment
 | ConstTag
 | DebugTag
+| Document
 | EachBlock
 | Element
 | ElseBlock
diff --git a/src/compiler/compile/nodes/shared/map_children.ts b/src/compiler/compile/nodes/shared/map_children.ts
index e6ad1d7f6e..7338148b63 100644
--- a/src/compiler/compile/nodes/shared/map_children.ts
+++ b/src/compiler/compile/nodes/shared/map_children.ts
@@ -3,6 +3,7 @@ import Body from '../Body';
 import ConstTag from '../ConstTag';
 import Comment from '../Comment';
 import EachBlock from '../EachBlock';
+import Document from '../Document';
 import Element from '../Element';
 import Head from '../Head';
 import IfBlock from '../IfBlock';
@@ -28,6 +29,7 @@ function get_constructor(type) {
 		case 'Body': return Body;
 		case 'Comment': return Comment;
 		case 'ConstTag': return ConstTag;
+		case 'Document': return Document;
 		case 'EachBlock': return EachBlock;
 		case 'Element': return Element;
 		case 'Head': return Head;
diff --git a/src/compiler/compile/render_dom/wrappers/Document.ts b/src/compiler/compile/render_dom/wrappers/Document.ts
new file mode 100644
index 0000000000..4f7c86c54f
--- /dev/null
+++ b/src/compiler/compile/render_dom/wrappers/Document.ts
@@ -0,0 +1,25 @@
+import Block from '../Block';
+import Wrapper from './shared/Wrapper';
+import { x } from 'code-red';
+import Document from '../../nodes/Document';
+import { Identifier } from 'estree';
+import EventHandler from './Element/EventHandler';
+import add_event_handlers from './shared/add_event_handlers';
+import { TemplateNode } from '../../../interfaces';
+import Renderer from '../Renderer';
+import add_actions from './shared/add_actions';
+
+export default class DocumentWrapper extends Wrapper {
+	node: Document;
+	handlers: EventHandler[];
+
+	constructor(renderer: Renderer, block: Block, parent: Wrapper, node: TemplateNode) {
+		super(renderer, block, parent, node);
+		this.handlers = this.node.handlers.map(handler => new EventHandler(handler, this));
+	}
+
+	render(block: Block, _parent_node: Identifier, _parent_nodes: Identifier) {
+		add_event_handlers(block, x`@_document`, this.handlers);
+		add_actions(block, x`@_document`, this.node.actions);
+	}
+}
diff --git a/src/compiler/compile/render_dom/wrappers/Fragment.ts b/src/compiler/compile/render_dom/wrappers/Fragment.ts
index e2eb519393..8c633aeb71 100644
--- a/src/compiler/compile/render_dom/wrappers/Fragment.ts
+++ b/src/compiler/compile/render_dom/wrappers/Fragment.ts
@@ -2,6 +2,7 @@ import Wrapper from './shared/Wrapper';
 import AwaitBlock from './AwaitBlock';
 import Body from './Body';
 import DebugTag from './DebugTag';
+import Document from './Document';
 import EachBlock from './EachBlock';
 import Element from './Element/index';
 import Head from './Head';
@@ -28,6 +29,7 @@ const wrappers = {
 	Body,
 	Comment: null,
 	DebugTag,
+	Document,
 	EachBlock,
 	Element,
 	Head,
diff --git a/src/compiler/compile/render_ssr/Renderer.ts b/src/compiler/compile/render_ssr/Renderer.ts
index 99a2ee3d68..ac78d032ea 100644
--- a/src/compiler/compile/render_ssr/Renderer.ts
+++ b/src/compiler/compile/render_ssr/Renderer.ts
@@ -28,6 +28,7 @@ const handlers: Record<string, Handler> = {
 	Body: noop,
 	Comment,
 	DebugTag,
+	Document: noop,
 	EachBlock,
 	Element,
 	Head,
diff --git a/src/compiler/interfaces.ts b/src/compiler/interfaces.ts
index 402f9ff5e1..afe801b0f1 100644
--- a/src/compiler/interfaces.ts
+++ b/src/compiler/interfaces.ts
@@ -63,7 +63,7 @@ interface BaseExpressionDirective extends BaseDirective {
 }
 
 export interface Element extends BaseNode {
-	type: 'InlineComponent' | 'SlotTemplate' | 'Title' | 'Slot' | 'Element' | 'Head' | 'Options' | 'Window' | 'Body';
+	type: 'InlineComponent' | 'SlotTemplate' | 'Title' | 'Slot' | 'Element' | 'Head' | 'Options' | 'Window' | 'Document' | 'Body';
 	attributes: Array<BaseDirective | Attribute | SpreadAttribute>;
 	name: string;
 }
diff --git a/src/compiler/parse/state/tag.ts b/src/compiler/parse/state/tag.ts
index cbd3213f53..90adfb8e79 100644
--- a/src/compiler/parse/state/tag.ts
+++ b/src/compiler/parse/state/tag.ts
@@ -19,6 +19,7 @@ const meta_tags = new Map([
 	['svelte:head', 'Head'],
 	['svelte:options', 'Options'],
 	['svelte:window', 'Window'],
+	['svelte:document', 'Document'],
 	['svelte:body', 'Body']
 ]);
 
diff --git a/test/parser/samples/error-svelte-selfdestructive/error.json b/test/parser/samples/error-svelte-selfdestructive/error.json
index 68aa43dec9..f7cca12740 100644
--- a/test/parser/samples/error-svelte-selfdestructive/error.json
+++ b/test/parser/samples/error-svelte-selfdestructive/error.json
@@ -1,6 +1,6 @@
 {
 	"code": "invalid-tag-name",
-	"message": "Valid <svelte:...> tag names are svelte:head, svelte:options, svelte:window, svelte:body, svelte:self, svelte:component, svelte:fragment or svelte:element",
+	"message": "Valid <svelte:...> tag names are svelte:head, svelte:options, svelte:window, svelte:document, svelte:body, svelte:self, svelte:component, svelte:fragment or svelte:element",
 	"pos": 10,
 	"start": {
 		"character": 10,
diff --git a/test/runtime/samples/action-document/_config.js b/test/runtime/samples/action-document/_config.js
new file mode 100644
index 0000000000..d33cdb3fa4
--- /dev/null
+++ b/test/runtime/samples/action-document/_config.js
@@ -0,0 +1,14 @@
+export default {
+	html: '<div></div>',
+
+	async test({ assert, target, window }) {
+		const visibility = new window.Event('visibilitychange');
+
+		await window.document.dispatchEvent(visibility);
+		assert.htmlEqual(target.innerHTML, `
+			<div>
+				<div class="tooltip">Perform an Action</div>
+			</div>
+		`);
+	}
+};
diff --git a/test/runtime/samples/action-document/main.svelte b/test/runtime/samples/action-document/main.svelte
new file mode 100644
index 0000000000..eec4b3fecd
--- /dev/null
+++ b/test/runtime/samples/action-document/main.svelte
@@ -0,0 +1,24 @@
+<script>
+	let container;
+	function tooltip(node, text) {
+		let tooltip = null;
+
+		function onVisibilityChange() {
+			tooltip = document.createElement('div');
+			tooltip.classList.add('tooltip');
+			tooltip.textContent = text;
+			container.appendChild(tooltip);
+		}
+
+		node.addEventListener('visibilitychange', onVisibilityChange);
+
+		return {
+			destroy() {
+				node.removeEventListener('visibilitychange', onVisibilityChange);
+			}
+		}
+	}
+</script>
+
+<svelte:document use:tooltip="{'Perform an Action'}" />
+<div bind:this={container} />

From a1e84213680d6716b304930d93f3133c4a49d43f Mon Sep 17 00:00:00 2001
From: Nguyen Tran <88808276+ngtr6788@users.noreply.github.com>
Date: Wed, 15 Mar 2023 12:10:40 -0400
Subject: [PATCH 23/30] fix: object destructuring picks up computed properties
 (#8386)

fixes #6609. Prior related PR: #8357
---
 src/compiler/compile/nodes/CatchBlock.ts      |  1 +
 src/compiler/compile/nodes/ConstTag.ts        |  1 +
 src/compiler/compile/nodes/EachBlock.ts       |  1 +
 src/compiler/compile/nodes/ThenBlock.ts       |  1 +
 src/compiler/compile/nodes/shared/Context.ts  | 69 ++++++++++++++-----
 .../compile/nodes/shared/Expression.ts        |  1 +
 .../compile/render_dom/wrappers/AwaitBlock.ts | 12 +++-
 .../compile/render_dom/wrappers/EachBlock.ts  | 13 +++-
 .../wrappers/shared/add_const_tags.ts         | 39 +++++++----
 .../_config.js                                | 32 +++++++++
 .../main.svelte                               | 23 +++++++
 .../_config.js                                | 20 ++++++
 .../main.svelte                               | 25 +++++++
 .../_config.js                                | 15 ++++
 .../main.svelte                               | 42 +++++++++++
 .../_config.js                                | 24 +++++++
 .../main.svelte                               |  7 ++
 .../_config.js                                | 26 +++++++
 .../main.svelte                               | 12 ++++
 19 files changed, 330 insertions(+), 34 deletions(-)
 create mode 100644 test/runtime/samples/await-then-destruct-computed-props/_config.js
 create mode 100644 test/runtime/samples/await-then-destruct-computed-props/main.svelte
 create mode 100644 test/runtime/samples/const-tag-await-then-destructuring-computed-props/_config.js
 create mode 100644 test/runtime/samples/const-tag-await-then-destructuring-computed-props/main.svelte
 create mode 100644 test/runtime/samples/const-tag-each-destructure-computed-props/_config.js
 create mode 100644 test/runtime/samples/const-tag-each-destructure-computed-props/main.svelte
 create mode 100644 test/runtime/samples/each-block-destructured-array-computed-props/_config.js
 create mode 100644 test/runtime/samples/each-block-destructured-array-computed-props/main.svelte
 create mode 100644 test/runtime/samples/each-block-destructured-object-computed-props/_config.js
 create mode 100644 test/runtime/samples/each-block-destructured-object-computed-props/main.svelte

diff --git a/src/compiler/compile/nodes/CatchBlock.ts b/src/compiler/compile/nodes/CatchBlock.ts
index ba6a4b77a6..d92b4eda56 100644
--- a/src/compiler/compile/nodes/CatchBlock.ts
+++ b/src/compiler/compile/nodes/CatchBlock.ts
@@ -17,6 +17,7 @@ export default class CatchBlock extends AbstractBlock {
 		this.scope = scope.child();
 		if (parent.catch_node) {
 			parent.catch_contexts.forEach(context => {
+				if (context.type !== 'DestructuredVariable') return;
 				this.scope.add(context.key.name, parent.expression.dependencies, this);
 			});
 		}
diff --git a/src/compiler/compile/nodes/ConstTag.ts b/src/compiler/compile/nodes/ConstTag.ts
index 44a50aa005..edcb949c15 100644
--- a/src/compiler/compile/nodes/ConstTag.ts
+++ b/src/compiler/compile/nodes/ConstTag.ts
@@ -65,6 +65,7 @@ export default class ConstTag extends Node {
 		});
 		this.expression = new Expression(this.component, this, this.scope, this.node.expression.right);
 		this.contexts.forEach(context => {
+			if (context.type !== 'DestructuredVariable') return;
 			const owner = this.scope.get_owner(context.key.name);
 			if (owner && owner.type === 'ConstTag' && owner.parent === this.parent) {
 				this.component.error(this.node, compiler_errors.invalid_const_declaration(context.key.name));
diff --git a/src/compiler/compile/nodes/EachBlock.ts b/src/compiler/compile/nodes/EachBlock.ts
index 4a5ea19e37..4659a53d73 100644
--- a/src/compiler/compile/nodes/EachBlock.ts
+++ b/src/compiler/compile/nodes/EachBlock.ts
@@ -45,6 +45,7 @@ export default class EachBlock extends AbstractBlock {
 		unpack_destructuring({ contexts: this.contexts, node: info.context, scope, component, context_rest_properties: this.context_rest_properties });
 
 		this.contexts.forEach(context => {
+			if (context.type !== 'DestructuredVariable') return;
 			this.scope.add(context.key.name, this.expression.dependencies, this);
 		});
 
diff --git a/src/compiler/compile/nodes/ThenBlock.ts b/src/compiler/compile/nodes/ThenBlock.ts
index 6aee3f916f..b394db1e47 100644
--- a/src/compiler/compile/nodes/ThenBlock.ts
+++ b/src/compiler/compile/nodes/ThenBlock.ts
@@ -17,6 +17,7 @@ export default class ThenBlock extends AbstractBlock {
 		this.scope = scope.child();
 		if (parent.then_node) {
 			parent.then_contexts.forEach(context => {
+				if (context.type !== 'DestructuredVariable') return;
 				this.scope.add(context.key.name, parent.expression.dependencies, this);
 			});
 		}
diff --git a/src/compiler/compile/nodes/shared/Context.ts b/src/compiler/compile/nodes/shared/Context.ts
index 5cef46482b..3957ed2173 100644
--- a/src/compiler/compile/nodes/shared/Context.ts
+++ b/src/compiler/compile/nodes/shared/Context.ts
@@ -1,5 +1,5 @@
 import { x } from 'code-red';
-import { Node, Identifier, Expression } from 'estree';
+import { Node, Identifier, Expression, PrivateIdentifier } from 'estree';
 import { walk } from 'estree-walker';
 import is_reference, { NodeWithPropertyDefinition } from 'is-reference';
 import { clone } from '../../../utils/clone';
@@ -7,7 +7,16 @@ import Component from '../../Component';
 import flatten_reference from '../../utils/flatten_reference';
 import TemplateScope from './TemplateScope';
 
-export interface Context {
+export type Context = DestructuredVariable | ComputedProperty;
+
+interface ComputedProperty {
+	type: 'ComputedProperty';
+  property_name: string;
+  key: Expression | PrivateIdentifier;
+}
+ 
+interface DestructuredVariable {
+	type: 'DestructuredVariable'
 	key: Identifier;
 	name?: string;
 	modifier: (node: Node) => Node;
@@ -21,26 +30,33 @@ export function unpack_destructuring({
 	default_modifier = (node) => node,
 	scope,
 	component,
-	context_rest_properties
+	context_rest_properties,
+	number_of_computed_props = { n: 0 }
 }: {
 	contexts: Context[];
 	node: Node;
-	modifier?: Context['modifier'];
-	default_modifier?: Context['default_modifier'];
+	modifier?: DestructuredVariable['modifier'];
+	default_modifier?: DestructuredVariable['default_modifier'];
 	scope: TemplateScope;
 	component: Component;
 	context_rest_properties: Map<string, Node>;
+	// we want to pass this by reference, as a sort of global variable, because 
+	// if we pass this by value, we could get computed_property_# variable collisions
+	// when we deal with nested object destructuring
+	number_of_computed_props?: { n: number }; 
 }) {
 	if (!node) return;
 
 	if (node.type === 'Identifier') {
 		contexts.push({
+			type: 'DestructuredVariable',
 			key: node as Identifier,
 			modifier,
 			default_modifier
 		});
 	} else if (node.type === 'RestElement') {
 		contexts.push({
+			type: 'DestructuredVariable',
 			key: node.argument as Identifier,
 			modifier,
 			default_modifier
@@ -56,7 +72,8 @@ export function unpack_destructuring({
 					default_modifier,
 					scope,
 					component,
-					context_rest_properties
+					context_rest_properties,
+					number_of_computed_props
 				});
 				context_rest_properties.set((element.argument as Identifier).name, element);
 			} else if (element && element.type === 'AssignmentPattern') {
@@ -76,7 +93,8 @@ export function unpack_destructuring({
 						)}` as Node,
 					scope,
 					component,
-					context_rest_properties
+					context_rest_properties,
+					number_of_computed_props
 				});
 			} else {
 				unpack_destructuring({
@@ -86,7 +104,8 @@ export function unpack_destructuring({
 					default_modifier,
 					scope,
 					component,
-					context_rest_properties
+					context_rest_properties,
+					number_of_computed_props
 				});
 			}
 		});
@@ -105,29 +124,41 @@ export function unpack_destructuring({
 					default_modifier,
 					scope,
 					component,
-					context_rest_properties
+					context_rest_properties,
+					number_of_computed_props
 				});
 				context_rest_properties.set((property.argument as Identifier).name, property);
 			} else if (property.type === 'Property') {
 				const key = property.key;
 				const value = property.value;
 
-				let property_name: any;
 				let new_modifier: (node: Node) => Node; 
 
 				if (property.computed) {
-					// TODO: If the property is computed, ie, { [computed_key]: prop }, the computed_key can be any type of expression.
+					// e.g { [computedProperty]: ... }
+					const property_name = `computed_property_${number_of_computed_props.n}`;
+					number_of_computed_props.n += 1;
+
+					contexts.push({
+						type: 'ComputedProperty',
+						property_name,
+						key
+					});
+
+					new_modifier = (node) => x`${modifier(node)}[${property_name}]`;
+					used_properties.push(x`${property_name}`);
 				} else if (key.type === 'Identifier') {
 					// e.g. { someProperty: ... }
-				  property_name = key.name;
+					const property_name = key.name;
 					new_modifier = (node) => x`${modifier(node)}.${property_name}`;
+					used_properties.push(x`"${property_name}"`);
 				} else if (key.type === 'Literal') {
 					// e.g. { "property-in-quotes": ... } or { 14: ... }
-					property_name = key.value;
+					const property_name = key.value;
 					new_modifier = (node) => x`${modifier(node)}["${property_name}"]`;
+					used_properties.push(x`"${property_name}"`);
 				}
 				
-			  used_properties.push(x`"${property_name}"`);
 				if (value.type === 'AssignmentPattern') {
 					// e.g. { property = default } or { property: newName = default }
 					const n = contexts.length;
@@ -147,7 +178,8 @@ export function unpack_destructuring({
 							)}` as Node,
 						scope,
 						component,
-						context_rest_properties
+						context_rest_properties,
+						number_of_computed_props
 					});
 				} else {
 					// e.g. { property } or { property: newName }
@@ -158,7 +190,8 @@ export function unpack_destructuring({
 						default_modifier,
 						scope,
 						component,
-						context_rest_properties
+						context_rest_properties,
+						number_of_computed_props
 					});
 				}
 			}
@@ -174,7 +207,9 @@ function update_reference(
 ): Node {
 	const find_from_context = (node: Identifier) => {
 		for (let i = n; i < contexts.length; i++) {
-			const { key } = contexts[i];
+			const cur_context = contexts[i];
+			if (cur_context.type !== 'DestructuredVariable') continue; 
+			const { key } = cur_context;
 			if (node.name === key.name) {
 				throw new Error(`Cannot access '${node.name}' before initialization`);
 			}
diff --git a/src/compiler/compile/nodes/shared/Expression.ts b/src/compiler/compile/nodes/shared/Expression.ts
index 1b1558ec17..3a85bf35c8 100644
--- a/src/compiler/compile/nodes/shared/Expression.ts
+++ b/src/compiler/compile/nodes/shared/Expression.ts
@@ -373,6 +373,7 @@ export default class Expression {
 								// add to get_xxx_context
 								// child_ctx[x] = function () { ... }
 								(template_scope.get_owner(deps[0]) as EachBlock).contexts.push({
+									type: 'DestructuredVariable',
 									key: func_id,
 									modifier: () => func_expression,
 									default_modifier: node => node
diff --git a/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts b/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
index 9c07267223..534595f4a9 100644
--- a/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
+++ b/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
@@ -11,6 +11,7 @@ import CatchBlock from '../../nodes/CatchBlock';
 import { Context } from '../../nodes/shared/Context';
 import { Identifier, Literal, Node } from 'estree';
 import { add_const_tags, add_const_tags_context } from './shared/add_const_tags';
+import Expression from '../../nodes/shared/Expression';
 
 type Status = 'pending' | 'then' | 'catch';
 
@@ -69,6 +70,7 @@ class AwaitBlockBranch extends Wrapper {
 			this.renderer.add_to_context(this.value, true);
 		} else {
 			contexts.forEach(context => {
+				if (context.type !== 'DestructuredVariable') return;
 				this.renderer.add_to_context(context.key.name, true);
 			});
 			this.value = this.block.parent.get_unique_name('value').name;
@@ -96,7 +98,15 @@ class AwaitBlockBranch extends Wrapper {
 	}
 
 	render_get_context() {
-		const props = this.is_destructured ? this.value_contexts.map(prop => b`#ctx[${this.block.renderer.context_lookup.get(prop.key.name).index}] = ${prop.default_modifier(prop.modifier(x`#ctx[${this.value_index}]`), name => this.renderer.reference(name))};`) : null;
+		const props = this.is_destructured ? this.value_contexts.map(prop => {
+			if (prop.type === 'ComputedProperty') {
+				const expression = new Expression(this.renderer.component, this.node, this.has_consts(this.node) ? this.node.scope : null, prop.key);
+				return b`const ${prop.property_name} = ${expression.manipulate(this.block, '#ctx')};`;
+			} else {
+				const to_ctx = name => this.renderer.reference(name);
+				return b`#ctx[${this.block.renderer.context_lookup.get(prop.key.name).index}] = ${prop.default_modifier(prop.modifier(x`#ctx[${this.value_index}]`), to_ctx)};`;
+			}
+		}) : null;
 
 		const const_tags_props = this.has_consts(this.node) ? add_const_tags(this.block, this.node.const_tags, '#ctx') : null;
 
diff --git a/src/compiler/compile/render_dom/wrappers/EachBlock.ts b/src/compiler/compile/render_dom/wrappers/EachBlock.ts
index 1032f4c6e3..9c1af7ce44 100644
--- a/src/compiler/compile/render_dom/wrappers/EachBlock.ts
+++ b/src/compiler/compile/render_dom/wrappers/EachBlock.ts
@@ -9,6 +9,7 @@ import ElseBlock from '../../nodes/ElseBlock';
 import { Identifier, Node } from 'estree';
 import get_object from '../../utils/get_object';
 import { add_const_tags, add_const_tags_context } from './shared/add_const_tags';
+import Expression from '../../nodes/shared/Expression';
 
 export class ElseBlockWrapper extends Wrapper {
 	node: ElseBlock;
@@ -86,6 +87,7 @@ export default class EachBlockWrapper extends Wrapper {
 		block.add_dependencies(dependencies);
 
 		this.node.contexts.forEach(context => {
+			if (context.type !== 'DestructuredVariable') return;
 			renderer.add_to_context(context.key.name, true);
 		});
 		add_const_tags_context(renderer, this.node.const_tags);
@@ -147,6 +149,7 @@ export default class EachBlockWrapper extends Wrapper {
 		const store = object.type === 'Identifier' && object.name[0] === '$' ? object.name.slice(1) : null;
 
 		node.contexts.forEach(prop => {
+			if (prop.type !== 'DestructuredVariable') return;
 			this.block.bindings.set(prop.key.name, {
 				object: this.vars.each_block_value,
 				property: this.index_name,
@@ -361,7 +364,15 @@ export default class EachBlockWrapper extends Wrapper {
 			this.else.fragment.render(this.else.block, null, x`#nodes` as Identifier);
 		}
 
-		this.context_props = this.node.contexts.map(prop => b`child_ctx[${renderer.context_lookup.get(prop.key.name).index}] = ${prop.default_modifier(prop.modifier(x`list[i]`), name => renderer.context_lookup.has(name) ? x`child_ctx[${renderer.context_lookup.get(name).index}]` : { type: 'Identifier', name })};`);
+		this.context_props = this.node.contexts.map(prop => {
+			if (prop.type === 'DestructuredVariable') {
+				const to_ctx = (name: string) => renderer.context_lookup.has(name) ? x`child_ctx[${renderer.context_lookup.get(name).index}]` : { type: 'Identifier', name } as Node;
+				return b`child_ctx[${renderer.context_lookup.get(prop.key.name).index}] = ${prop.default_modifier(prop.modifier(x`list[i]`), to_ctx)};`;
+			} else {
+				const expression = new Expression(this.renderer.component, this.node, this.node.scope, prop.key);
+				return b`const ${prop.property_name} = ${expression.manipulate(block, 'child_ctx')};`;
+			}
+		});
 
 		if (this.node.has_binding) this.context_props.push(b`child_ctx[${renderer.context_lookup.get(this.vars.each_block_value.name).index}] = list;`);
 		if (this.node.has_binding || this.node.has_index_binding || this.node.index) this.context_props.push(b`child_ctx[${renderer.context_lookup.get(this.index_name.name).index}] = i;`);
diff --git a/src/compiler/compile/render_dom/wrappers/shared/add_const_tags.ts b/src/compiler/compile/render_dom/wrappers/shared/add_const_tags.ts
index cd4dc7f033..b7c14c2c38 100644
--- a/src/compiler/compile/render_dom/wrappers/shared/add_const_tags.ts
+++ b/src/compiler/compile/render_dom/wrappers/shared/add_const_tags.ts
@@ -1,24 +1,33 @@
 import ConstTag from '../../../nodes/ConstTag';
 import Block from '../../Block';
-import { b, x } from 'code-red';
+import { b, Node, x } from 'code-red';
 import Renderer from '../../Renderer';
+import Expression from '../../../nodes/shared/Expression';
 
 export function add_const_tags(block: Block, const_tags: ConstTag[], ctx: string) {
-  const const_tags_props = [];
-  const_tags.forEach((const_tag, i) => {
-    const name = `#constants_${i}`;
-    const_tags_props.push(b`const ${name} = ${const_tag.expression.manipulate(block, ctx)}`);
-    const_tag.contexts.forEach(context => {
-      const_tags_props.push(b`${ctx}[${block.renderer.context_lookup.get(context.key.name).index}] = ${context.default_modifier(context.modifier({ type: 'Identifier', name }), name => block.renderer.context_lookup.has(name) ? x`${ctx}[${block.renderer.context_lookup.get(name).index}]` : { type: 'Identifier', name })};`);
-    });
-  });
-  return const_tags_props;
+	const const_tags_props = [];
+	const_tags.forEach((const_tag, i) => {
+		const name = `#constants_${i}`;
+		const_tags_props.push(b`const ${name} = ${const_tag.expression.manipulate(block, ctx)}`);
+		const to_ctx = (name: string) => block.renderer.context_lookup.has(name) ? x`${ctx}[${block.renderer.context_lookup.get(name).index}]` : { type: 'Identifier', name } as Node;
+
+		const_tag.contexts.forEach(context => {
+			if (context.type === 'DestructuredVariable') {
+				const_tags_props.push(b`${ctx}[${block.renderer.context_lookup.get(context.key.name).index}] = ${context.default_modifier(context.modifier({ type: 'Identifier', name }), to_ctx)}`);
+			} else {
+				const expression = new Expression(block.renderer.component, const_tag, const_tag.scope, context.key);
+				const_tags_props.push(b`const ${context.property_name} = ${expression.manipulate(block, ctx)}`);
+			}
+		});
+	});
+	return const_tags_props;
 }
 
 export function add_const_tags_context(renderer: Renderer, const_tags: ConstTag[]) {
-  const_tags.forEach(const_tag => {
-    const_tag.contexts.forEach(context => {
-      renderer.add_to_context(context.key.name, true);
-    });
-  });
+	const_tags.forEach(const_tag => {
+		const_tag.contexts.forEach(context => {
+			if (context.type !== 'DestructuredVariable') return;
+			renderer.add_to_context(context.key.name, true);
+		});
+	});
 }
diff --git a/test/runtime/samples/await-then-destruct-computed-props/_config.js b/test/runtime/samples/await-then-destruct-computed-props/_config.js
new file mode 100644
index 0000000000..6d147535e3
--- /dev/null
+++ b/test/runtime/samples/await-then-destruct-computed-props/_config.js
@@ -0,0 +1,32 @@
+export default {
+	async test({ assert, component, target }) {
+		await Promise.resolve();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<p>propA: 3</p>
+			<p>propB: 7</p>
+			<p>num: 3</p>
+			<p>rest: {"prop3":{"prop9":9,"prop10":10}}</p>
+			<p>propZ: 5</p>
+			<p>propY: 6</p>
+			<p>rest: {"propX":7,"propW":8}</p>
+			`
+		);
+
+		await (component.object = Promise.resolve({ prop1: 'one', prop2: 'two', prop3: { prop7: 'seven' }, prop4: { prop10: 'ten' }}));
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<p>propA: seven</p>
+			<p>propB: ten</p>
+			<p>num: 5</p>
+			<p>rest: {"prop1":"one","prop2":"two"}</p>
+			<p>propZ: 5</p>
+			<p>propY: 6</p>
+			<p>rest: {"propX":7,"propW":8}</p>
+			`
+		);
+	}
+};
diff --git a/test/runtime/samples/await-then-destruct-computed-props/main.svelte b/test/runtime/samples/await-then-destruct-computed-props/main.svelte
new file mode 100644
index 0000000000..71756d6cf3
--- /dev/null
+++ b/test/runtime/samples/await-then-destruct-computed-props/main.svelte
@@ -0,0 +1,23 @@
+<script>
+	export let object = Promise.resolve({ prop1: { prop4: 2, prop5: 3 }, prop2: { prop6: 5, prop7: 6, prop8: 7 }, prop3: { prop9: 9, prop10: 10 } });
+	const objectReject = Promise.reject({ propZ: 5, propY: 6, propX: 7, propW: 8 });
+
+	let num = 1;
+	const prop = 'prop';
+</script>
+
+{#await object then { [`prop${num++}`]: { [`prop${num + 3}`]: propA }, [`prop${num++}`]: { [`prop${num + 5}`]: propB }, ...rest }}
+	<p>propA: {propA}</p>
+	<p>propB: {propB}</p>
+	<p>num: {num}</p>
+	<p>rest: {JSON.stringify(rest)}</p>
+{/await}
+
+{#await objectReject then value}
+	resolved
+{:catch { [`${prop}Z`]: propZ, [`${prop}Y`]: propY, ...rest }}
+	<p>propZ: {propZ}</p>
+	<p>propY: {propY}</p>
+	<p>rest: {JSON.stringify(rest)}</p>
+{/await}
+
diff --git a/test/runtime/samples/const-tag-await-then-destructuring-computed-props/_config.js b/test/runtime/samples/const-tag-await-then-destructuring-computed-props/_config.js
new file mode 100644
index 0000000000..9ec4a3e3e6
--- /dev/null
+++ b/test/runtime/samples/const-tag-await-then-destructuring-computed-props/_config.js
@@ -0,0 +1,20 @@
+export default {
+	html: `
+		<p>4, 12, 60</p>
+	`,
+
+	async test({ component, target, assert }) {
+		component.permutation = [2, 3, 1];
+		await (component.promise1 = Promise.resolve({length: 1, width: 2, height: 3}));
+		try {
+			await (component.promise2 = Promise.reject({length: 97, width: 98, height: 99}));
+		} catch (e) {
+			// nothing
+		}
+
+		assert.htmlEqual(target.innerHTML, `
+			<p>2, 11, 2</p>
+			<p>9506, 28811, 98</p>
+		`);
+	}
+};
diff --git a/test/runtime/samples/const-tag-await-then-destructuring-computed-props/main.svelte b/test/runtime/samples/const-tag-await-then-destructuring-computed-props/main.svelte
new file mode 100644
index 0000000000..fbc54e4d0b
--- /dev/null
+++ b/test/runtime/samples/const-tag-await-then-destructuring-computed-props/main.svelte
@@ -0,0 +1,25 @@
+<script>
+	export let promise1 = {length: 5, width: 3, height: 4};
+	export let promise2 = {length: 12, width: 5, height: 13};
+	export let permutation = [1, 2, 3];
+
+	function calculate(length, width, height) {
+		return { 
+			'1-Dimensions': [length, width, height],
+			'2-Dimensions': [length * width, width * height, length * height],
+			'3-Dimensions': [length * width * height, length + width + height, length * width + width * height + length * height]
+		};
+	}
+</script>
+
+{#await promise1 then { length, width, height }}
+	{@const [a, b, c] = permutation}
+	{@const { [`${a}-Dimensions`]: { [c - 1]: first }, [`${b}-Dimensions`]: { [b - 1]: second }, [`${c}-Dimensions`]: { [a - 1]: third } } = calculate(length, width, height) }
+	<p>{first}, {second}, {third}</p>
+{/await}
+
+{#await promise2 catch { length, width, height }}
+	{@const [a, b, c] = permutation}
+	{@const { [`${a}-Dimensions`]: { [c - 1]: first }, [`${b}-Dimensions`]: { [b - 1]: second }, [`${c}-Dimensions`]: { [a - 1]: third } } = calculate(length, width, height) } 
+	<p>{first}, {second}, {third}</p>
+{/await}
diff --git a/test/runtime/samples/const-tag-each-destructure-computed-props/_config.js b/test/runtime/samples/const-tag-each-destructure-computed-props/_config.js
new file mode 100644
index 0000000000..c299f19da6
--- /dev/null
+++ b/test/runtime/samples/const-tag-each-destructure-computed-props/_config.js
@@ -0,0 +1,15 @@
+export default {
+	html: `
+		<button>6, 12, 8, 24</button>
+		<button>45, 35, 63, 315</button>
+		<button>60, 48, 80, 480</button>
+	`,
+
+	async test({ component, target, assert }) {
+		component.boxes = [{ length: 10, width: 20, height: 30 }];
+
+		assert.htmlEqual(target.innerHTML, 
+			'<button>200, 600, 300, 6000</button>'
+		);
+	}
+};
diff --git a/test/runtime/samples/const-tag-each-destructure-computed-props/main.svelte b/test/runtime/samples/const-tag-each-destructure-computed-props/main.svelte
new file mode 100644
index 0000000000..c8c7e1977a
--- /dev/null
+++ b/test/runtime/samples/const-tag-each-destructure-computed-props/main.svelte
@@ -0,0 +1,42 @@
+<script>
+	export let boxes = [
+		{length: 2, width: 3, height: 4},
+		{length: 9, width: 5, height: 7},
+		{length: 10, width: 6, height: 8}
+	];
+
+	function calculate(length, width, height) {
+		return { 
+				twoDimensions: {
+				bottomArea: length * width,
+				sideArea1: width * height,
+				sideArea2: length * height
+			},
+			threeDimensions: {
+				volume: length * width * height
+			}
+		};
+	}
+
+	export let dimension = 'Dimensions';
+	function changeDimension() {
+		dimension = 'DIMENSIONS';
+	}
+
+	let area = 'Area';
+</script>
+
+{#each boxes as { length, width, height }}
+	{@const {
+		[`two${dimension}`]: { 
+			i = 1, 
+			[`bottom${area}`]: bottom, 
+			[`side${area}${i++}`]: sideone, 
+			[`side${area}${i++}`]: sidetwo 
+		},
+		[`three${dimension}`]: {
+			volume
+		}
+	} = calculate(length, width, height)}
+	<button on:click={changeDimension}>{bottom}, {sideone}, {sidetwo}, {volume}</button>
+{/each}
diff --git a/test/runtime/samples/each-block-destructured-array-computed-props/_config.js b/test/runtime/samples/each-block-destructured-array-computed-props/_config.js
new file mode 100644
index 0000000000..e400e2f280
--- /dev/null
+++ b/test/runtime/samples/each-block-destructured-array-computed-props/_config.js
@@ -0,0 +1,24 @@
+export default {
+	props: {
+		array: [
+			[1, 2, 3, 4, 5],
+			[6, 7, 8],
+			[9, 10, 11, 12],
+			[13, 14, 15, 16, 17, 18, 19, 20, 21, 22]
+		]
+	},
+
+	html: `
+		<p>First: 1, Half: 3, Last: 5, Length: 5</p>
+		<p>First: 6, Half: 7, Last: 8, Length: 3</p>
+		<p>First: 9, Half: 11, Last: 12, Length: 4</p>
+		<p>First: 13, Half: 18, Last: 22, Length: 10</p>
+	`,
+
+	test({ assert, component, target }) {
+		component.array = [[23, 24, 25, 26, 27, 28, 29]];
+		assert.htmlEqual( target.innerHTML, `
+			<p>First: 23, Half: 26, Last: 29, Length: 7</p>
+		`);
+	}
+};
diff --git a/test/runtime/samples/each-block-destructured-array-computed-props/main.svelte b/test/runtime/samples/each-block-destructured-array-computed-props/main.svelte
new file mode 100644
index 0000000000..00a9a99a89
--- /dev/null
+++ b/test/runtime/samples/each-block-destructured-array-computed-props/main.svelte
@@ -0,0 +1,7 @@
+<script>
+	export let array;
+</script>
+
+{#each array as { 0: first, length, [length - 1]: last, [Math.floor(length / 2)]: half }}
+	<p>First: {first}, Half: {half}, Last: {last}, Length: {length}</p>
+{/each}
diff --git a/test/runtime/samples/each-block-destructured-object-computed-props/_config.js b/test/runtime/samples/each-block-destructured-object-computed-props/_config.js
new file mode 100644
index 0000000000..7e98fab913
--- /dev/null
+++ b/test/runtime/samples/each-block-destructured-object-computed-props/_config.js
@@ -0,0 +1,26 @@
+export default {
+	props: {
+		firstString: 'cats',
+		secondString: 'dogs',
+		objectsArray: [
+			{ dogs: 'woof', cats: 'meow', stac: 'stack', DOGS: 'WOOF' },
+			{ dogs: 'A German sheppard', cats: 'A tailless cat', stac: 'A jenga tower', DOGS: 'A GERMAN SHEPPARD' },
+			{ dogs: 'dogs', cats: 'cats', stac: 'stac', DOGS: 'DOGS' }
+		]
+	},
+
+	html: `
+		<p>cats: meow</p>
+		<p>dogs: woof</p>
+		<p>stac: stack</p>
+		<p>DOGS: WOOF</p> 
+		<p>cats: A tailless cat</p>
+		<p>dogs: A German sheppard</p>
+		<p>stac: A jenga tower</p>
+		<p>DOGS: A GERMAN SHEPPARD</p> 
+		<p>cats: cats</p>
+		<p>dogs: dogs</p>
+		<p>stac: stac</p>
+		<p>DOGS: DOGS</p> 
+	`
+};
diff --git a/test/runtime/samples/each-block-destructured-object-computed-props/main.svelte b/test/runtime/samples/each-block-destructured-object-computed-props/main.svelte
new file mode 100644
index 0000000000..9c2ae29617
--- /dev/null
+++ b/test/runtime/samples/each-block-destructured-object-computed-props/main.svelte
@@ -0,0 +1,12 @@
+<script>
+	export let objectsArray;
+	export let firstString;
+	export let secondString;
+</script>
+
+{#each objectsArray as { [firstString]: firstProp, [secondString]: secondProp, [firstString.split('').reverse().join('')]: reverseFirst, [secondString.toUpperCase()]: upperSecond } }
+	<p>{firstString}: {firstProp}</p>
+  <p>{secondString}: {secondProp}</p>
+	<p>{firstString.split('').reverse().join('')}: {reverseFirst}</p>
+	<p>{secondString.toUpperCase()}: {upperSecond}</p>
+{/each}

From 68e492eaff757af718022c7d221a391d5443c0ee Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Wed, 15 Mar 2023 18:05:50 +0100
Subject: [PATCH 24/30] fix: revert buggy reactive vars optimization (#8382)

Reverts #7942
Fixes #8374
---
 src/compiler/compile/Component.ts             | 19 +-----
 src/compiler/compile/render_dom/index.ts      | 17 ++----
 src/compiler/compile/render_dom/invalidate.ts |  1 -
 src/compiler/interfaces.ts                    |  1 -
 .../reactive-class-optimized/expected.js      | 11 +++-
 test/js/samples/reactive-values/expected.js   | 60 -------------------
 test/js/samples/reactive-values/input.svelte  |  7 ---
 .../reactive-statement-indirect/_config.js    | 14 +++++
 .../reactive-statement-indirect/main.svelte   | 11 ++++
 9 files changed, 40 insertions(+), 101 deletions(-)
 delete mode 100644 test/js/samples/reactive-values/expected.js
 delete mode 100644 test/js/samples/reactive-values/input.svelte
 create mode 100644 test/runtime/samples/reactive-statement-indirect/_config.js
 create mode 100644 test/runtime/samples/reactive-statement-indirect/main.svelte

diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts
index 0d6a329dcb..e87cf6218a 100644
--- a/src/compiler/compile/Component.ts
+++ b/src/compiler/compile/Component.ts
@@ -38,7 +38,6 @@ import compiler_warnings from './compiler_warnings';
 import compiler_errors from './compiler_errors';
 import { extract_ignores_above_position, extract_svelte_ignore_from_comments } from '../utils/extract_svelte_ignore';
 import check_enable_sourcemap from './utils/check_enable_sourcemap';
-import is_dynamic from './render_dom/wrappers/shared/is_dynamic';
 
 interface ComponentOptions {
 	namespace?: string;
@@ -1392,11 +1391,12 @@ export default class Component {
 										module_dependencies.add(name);
 									}
 								}
-
+								const is_writable_or_mutated =
+									variable && (variable.writable || variable.mutated);
 								if (
 									should_add_as_dependency &&
 									(!owner || owner === component.instance_scope) &&
-									(name[0] === '$' || variable)
+									(name[0] === '$' || is_writable_or_mutated)
 								) {
 									dependencies.add(name);
 								}
@@ -1420,19 +1420,6 @@ export default class Component {
 				const { expression } = node.body as ExpressionStatement;
 				const declaration = expression && (expression as AssignmentExpression).left;
 
-				const is_dependency_static = Array.from(dependencies).every(
-					dependency => dependency !== '$$props' && dependency !== '$$restProps' && !is_dynamic(this.var_lookup.get(dependency))
-				);
-
-				if (is_dependency_static) {
-					assignees.forEach(assignee => {
-						const variable = component.var_lookup.get(assignee);
-						if (variable) {
-							variable.is_reactive_static = true;
-						}
-					});
-				}
-
 				unsorted_reactive_declarations.push({
 					assignees,
 					dependencies,
diff --git a/src/compiler/compile/render_dom/index.ts b/src/compiler/compile/render_dom/index.ts
index bc56f2eb27..58b7a8317b 100644
--- a/src/compiler/compile/render_dom/index.ts
+++ b/src/compiler/compile/render_dom/index.ts
@@ -390,13 +390,13 @@ export default function dom(
 	const resubscribable_reactive_store_unsubscribers = reactive_stores
 		.filter(store => {
 			const variable = component.var_lookup.get(store.name.slice(1));
-			return variable && (variable.reassigned || variable.export_name) && !variable.is_reactive_static;
+			return variable && (variable.reassigned || variable.export_name);
 		})
 		.map(({ name }) => b`$$self.$$.on_destroy.push(() => ${`$$unsubscribe_${name.slice(1)}`}());`);
 
 	if (has_definition) {
-		const reactive_declarations: Node[] = [];
-		const fixed_reactive_declarations: Array<Node | Node[]> = []; // not really 'reactive' but whatever
+		const reactive_declarations: (Node | Node[]) = [];
+		const fixed_reactive_declarations: Node[] = []; // not really 'reactive' but whatever
 
 		component.reactive_declarations.forEach(d => {
 			const dependencies = Array.from(d.dependencies);
@@ -417,15 +417,6 @@ export default function dom(
 				reactive_declarations.push(statement);
 			} else {
 				fixed_reactive_declarations.push(statement);
-				for (const assignee of d.assignees) {
-					const variable = component.var_lookup.get(assignee);
-					if (variable && variable.subscribable) {
-						fixed_reactive_declarations.push(b`
-							${component.compile_options.dev && b`@validate_store(${assignee}, '${assignee}');`}
-							@component_subscribe($$self, ${assignee}, $$value => $$invalidate(${renderer.context_lookup.get('$' + assignee).index}, ${'$' + assignee} = $$value));
-						`);
-					}
-				}
 			}
 		});
 
@@ -439,7 +430,7 @@ export default function dom(
 			const name = $name.slice(1);
 
 			const store = component.var_lookup.get(name);
-			if (store && (store.reassigned || store.export_name) && !store.is_reactive_static) {
+			if (store && (store.reassigned || store.export_name)) {
 				const unsubscribe = `$$unsubscribe_${name}`;
 				const subscribe = `$$subscribe_${name}`;
 				const i = renderer.context_lookup.get($name).index;
diff --git a/src/compiler/compile/render_dom/invalidate.ts b/src/compiler/compile/render_dom/invalidate.ts
index d9efdb5142..ffc5b6b42e 100644
--- a/src/compiler/compile/render_dom/invalidate.ts
+++ b/src/compiler/compile/render_dom/invalidate.ts
@@ -19,7 +19,6 @@ export function invalidate(renderer: Renderer, scope: Scope, node: Node, names:
 				!variable.hoistable &&
 				!variable.global &&
 				!variable.module &&
-				!variable.is_reactive_static &&
 				(
 					variable.referenced ||
 					variable.subscribable ||
diff --git a/src/compiler/interfaces.ts b/src/compiler/interfaces.ts
index afe801b0f1..4ae53594bb 100644
--- a/src/compiler/interfaces.ts
+++ b/src/compiler/interfaces.ts
@@ -223,7 +223,6 @@ export interface Var {
 	subscribable?: boolean;
 	is_reactive_dependency?: boolean;
 	imported?: boolean;
-	is_reactive_static?: boolean;
 }
 
 export interface CssResult {
diff --git a/test/js/samples/reactive-class-optimized/expected.js b/test/js/samples/reactive-class-optimized/expected.js
index f75a4015b0..1d0606ad60 100644
--- a/test/js/samples/reactive-class-optimized/expected.js
+++ b/test/js/samples/reactive-class-optimized/expected.js
@@ -9,6 +9,7 @@ import {
 	noop,
 	safe_not_equal,
 	space,
+	subscribe,
 	toggle_class
 } from "svelte/internal";
 
@@ -132,8 +133,13 @@ let reactiveModuleVar = Math.random();
 function instance($$self, $$props, $$invalidate) {
 	let reactiveDeclaration;
 	let $reactiveStoreVal;
-	let $reactiveDeclaration;
+
+	let $reactiveDeclaration,
+		$$unsubscribe_reactiveDeclaration = noop,
+		$$subscribe_reactiveDeclaration = () => ($$unsubscribe_reactiveDeclaration(), $$unsubscribe_reactiveDeclaration = subscribe(reactiveDeclaration, $$value => $$invalidate(3, $reactiveDeclaration = $$value)), reactiveDeclaration);
+
 	component_subscribe($$self, reactiveStoreVal, $$value => $$invalidate(2, $reactiveStoreVal = $$value));
+	$$self.$$.on_destroy.push(() => $$unsubscribe_reactiveDeclaration());
 	nonReactiveGlobal = Math.random();
 	const reactiveConst = { x: Math.random() };
 	reactiveModuleVar += 1;
@@ -142,8 +148,7 @@ function instance($$self, $$props, $$invalidate) {
 		reactiveConst.x += 1;
 	}
 
-	$: reactiveDeclaration = reactiveModuleVar * 2;
-	component_subscribe($$self, reactiveDeclaration, $$value => $$invalidate(3, $reactiveDeclaration = $$value));
+	$: $$subscribe_reactiveDeclaration($$invalidate(1, reactiveDeclaration = reactiveModuleVar * 2));
 	return [reactiveConst, reactiveDeclaration, $reactiveStoreVal, $reactiveDeclaration];
 }
 
diff --git a/test/js/samples/reactive-values/expected.js b/test/js/samples/reactive-values/expected.js
deleted file mode 100644
index 7ed435d6ad..0000000000
--- a/test/js/samples/reactive-values/expected.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/* generated by Svelte vX.Y.Z */
-import {
-	SvelteComponent,
-	detach,
-	element,
-	init,
-	insert,
-	noop,
-	safe_not_equal,
-	set_data,
-	space,
-	text
-} from "svelte/internal";
-
-function create_fragment(ctx) {
-	let h1;
-	let t3;
-	let t4;
-
-	return {
-		c() {
-			h1 = element("h1");
-			h1.textContent = `Hello ${name}!`;
-			t3 = space();
-			t4 = text(/*foo*/ ctx[0]);
-		},
-		m(target, anchor) {
-			insert(target, h1, anchor);
-			insert(target, t3, anchor);
-			insert(target, t4, anchor);
-		},
-		p(ctx, [dirty]) {
-			if (dirty & /*foo*/ 1) set_data(t4, /*foo*/ ctx[0]);
-		},
-		i: noop,
-		o: noop,
-		d(detaching) {
-			if (detaching) detach(h1);
-			if (detaching) detach(t3);
-			if (detaching) detach(t4);
-		}
-	};
-}
-
-let name = 'world';
-
-function instance($$self) {
-	let foo;
-	$: foo = name + name;
-	return [foo];
-}
-
-class Component extends SvelteComponent {
-	constructor(options) {
-		super();
-		init(this, options, instance, create_fragment, safe_not_equal, {});
-	}
-}
-
-export default Component;
\ No newline at end of file
diff --git a/test/js/samples/reactive-values/input.svelte b/test/js/samples/reactive-values/input.svelte
deleted file mode 100644
index d713217771..0000000000
--- a/test/js/samples/reactive-values/input.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-<script>
-	let name = 'world';
-	$: foo = name + name;
-</script>
-
-<h1>Hello {name}!</h1>
-{foo}
\ No newline at end of file
diff --git a/test/runtime/samples/reactive-statement-indirect/_config.js b/test/runtime/samples/reactive-statement-indirect/_config.js
new file mode 100644
index 0000000000..9265ded073
--- /dev/null
+++ b/test/runtime/samples/reactive-statement-indirect/_config.js
@@ -0,0 +1,14 @@
+export default {
+	html: `
+		<h1>2</h1>
+		<button>Increment</button>
+	`,
+	async test({ assert, target }) {
+		await target.querySelector('button').dispatchEvent(new window.MouseEvent('click'));
+
+		assert.htmlEqual(target.innerHTML, `
+			<h1>4</h1>
+			<button>Increment</button>
+		`);
+	}
+};
diff --git a/test/runtime/samples/reactive-statement-indirect/main.svelte b/test/runtime/samples/reactive-statement-indirect/main.svelte
new file mode 100644
index 0000000000..ab75c19127
--- /dev/null
+++ b/test/runtime/samples/reactive-statement-indirect/main.svelte
@@ -0,0 +1,11 @@
+<script>
+	let count = 1;
+	// Could be a let or simplified, but this tests that it still works like this
+	$: indirect_double = 2;
+	$: if (count > 0) {
+		indirect_double = count * 2;
+	}
+</script>
+
+<h1>{indirect_double}</h1>
+<button on:click={() => count++}>Increment</button>

From 10399d29e2d5021da2eb2b4c979a7dbfcf06ad80 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Wed, 15 Mar 2023 18:07:57 +0100
Subject: [PATCH 25/30] chore: update changelog

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9ef572aa7..48f45eff5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,10 @@
 * Select `<option>` with `selected` attribute when initial state is `undefined` ([#8361](https://github.com/sveltejs/svelte/issues/8361))
 * Add a11y `no-noninteractive-element-to-interactive-role` ([#8167](https://github.com/sveltejs/svelte/pull/8167))
 * Account for `bind:group` members being spread across multiple control flow blocks ([#8372](https://github.com/sveltejs/svelte/issues/8372))
-* Support literal properties when destructuring objects in the template ([#8357](https://github.com/sveltejs/svelte/pull/8357))
+* Support computed and literal properties when destructuring objects in the template ([#6609](https://github.com/sveltejs/svelte/issues/6609))
 * Prevent derived store callbacks after store is unsubscribed from ([#8364](https://github.com/sveltejs/svelte/issues/8364))
+* Revert buggy reactive statement optimization ([#8374](https://github.com/sveltejs/svelte/issues/8374))
+* Reintroduce `<svelte:document>` ([#3310](https://github.com/sveltejs/svelte/issues/3310))
 
 ## 3.56.0
 

From 952f8c566f5dd7e7a6bb21b5aeae85385cd4d4ff Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Wed, 15 Mar 2023 13:38:01 -0400
Subject: [PATCH 26/30] -> v3.57.0

---
 CHANGELOG.md      | 12 ++++++------
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48f45eff5c..097cfd51ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,16 @@
 # Svelte changelog
 
-## Unreleased
+## 3.57.0
 
-* Prefer style directive values over style attribute values ([#7475](https://github.com/sveltejs/svelte/issues/7475))
-* Stop intro transition from triggering wrongfully ([#6152](https://github.com/sveltejs/svelte/issues/6152), [#6812](https://github.com/sveltejs/svelte/issues/6812))
-* Select `<option>` with `selected` attribute when initial state is `undefined` ([#8361](https://github.com/sveltejs/svelte/issues/8361))
+* Add `<svelte:document>` ([#3310](https://github.com/sveltejs/svelte/issues/3310))
 * Add a11y `no-noninteractive-element-to-interactive-role` ([#8167](https://github.com/sveltejs/svelte/pull/8167))
-* Account for `bind:group` members being spread across multiple control flow blocks ([#8372](https://github.com/sveltejs/svelte/issues/8372))
+* Stop intro transition from triggering incorrectly ([#6152](https://github.com/sveltejs/svelte/issues/6152), [#6812](https://github.com/sveltejs/svelte/issues/6812))
 * Support computed and literal properties when destructuring objects in the template ([#6609](https://github.com/sveltejs/svelte/issues/6609))
+* Give `style:` directive precedence over `style=` attribute ([#7475](https://github.com/sveltejs/svelte/issues/7475))
+* Select `<option>` with `selected` attribute when initial state is `undefined` ([#8361](https://github.com/sveltejs/svelte/issues/8361))
 * Prevent derived store callbacks after store is unsubscribed from ([#8364](https://github.com/sveltejs/svelte/issues/8364))
+* Account for `bind:group` members being spread across multiple control flow blocks ([#8372](https://github.com/sveltejs/svelte/issues/8372))
 * Revert buggy reactive statement optimization ([#8374](https://github.com/sveltejs/svelte/issues/8374))
-* Reintroduce `<svelte:document>` ([#3310](https://github.com/sveltejs/svelte/issues/3310))
 
 ## 3.56.0
 
diff --git a/package-lock.json b/package-lock.json
index ed58f94c7e..adb27b7556 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "svelte",
-  "version": "3.56.0",
+  "version": "3.57.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "svelte",
-      "version": "3.56.0",
+      "version": "3.57.0",
       "license": "MIT",
       "devDependencies": {
         "@ampproject/remapping": "^0.3.0",
diff --git a/package.json b/package.json
index 6720938b98..88375069c8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "3.56.0",
+  "version": "3.57.0",
   "description": "Cybernetically enhanced web apps",
   "module": "index.mjs",
   "main": "index",

From a45afd5393c012db67b1f8fa0d5e3572d8f5240c Mon Sep 17 00:00:00 2001
From: Kazuma Oe <oe.kazuma@a-tm.co.jp>
Date: Thu, 16 Mar 2023 17:04:26 +0900
Subject: [PATCH 27/30] docs: add `<svelte:document>` example (#8387)

---
 .../17-special-elements/05-svelte-document/App.svelte  | 10 ++++++++++
 .../17-special-elements/05-svelte-document/meta.json   |  3 +++
 .../{05-svelte-body => 06-svelte-body}/App.svelte      |  0
 .../{05-svelte-body => 06-svelte-body}/meta.json       |  0
 .../{06-svelte-head => 07-svelte-head}/App.svelte      |  0
 .../{06-svelte-head => 07-svelte-head}/meta.json       |  0
 6 files changed, 13 insertions(+)
 create mode 100644 site/content/examples/17-special-elements/05-svelte-document/App.svelte
 create mode 100644 site/content/examples/17-special-elements/05-svelte-document/meta.json
 rename site/content/examples/17-special-elements/{05-svelte-body => 06-svelte-body}/App.svelte (100%)
 rename site/content/examples/17-special-elements/{05-svelte-body => 06-svelte-body}/meta.json (100%)
 rename site/content/examples/17-special-elements/{06-svelte-head => 07-svelte-head}/App.svelte (100%)
 rename site/content/examples/17-special-elements/{06-svelte-head => 07-svelte-head}/meta.json (100%)

diff --git a/site/content/examples/17-special-elements/05-svelte-document/App.svelte b/site/content/examples/17-special-elements/05-svelte-document/App.svelte
new file mode 100644
index 0000000000..5dd44aa389
--- /dev/null
+++ b/site/content/examples/17-special-elements/05-svelte-document/App.svelte
@@ -0,0 +1,10 @@
+<script>
+	let selection = '';
+
+	const handleSelectionChange = (e) => selection = document.getSelection();
+</script>
+
+<svelte:document on:selectionchange={handleSelectionChange} />
+
+<p>Select this text to fire events</p>
+<p>Selection: {selection}</p>
diff --git a/site/content/examples/17-special-elements/05-svelte-document/meta.json b/site/content/examples/17-special-elements/05-svelte-document/meta.json
new file mode 100644
index 0000000000..c48db2e62a
--- /dev/null
+++ b/site/content/examples/17-special-elements/05-svelte-document/meta.json
@@ -0,0 +1,3 @@
+{
+	"title": "<svelte:document>"
+}
diff --git a/site/content/examples/17-special-elements/05-svelte-body/App.svelte b/site/content/examples/17-special-elements/06-svelte-body/App.svelte
similarity index 100%
rename from site/content/examples/17-special-elements/05-svelte-body/App.svelte
rename to site/content/examples/17-special-elements/06-svelte-body/App.svelte
diff --git a/site/content/examples/17-special-elements/05-svelte-body/meta.json b/site/content/examples/17-special-elements/06-svelte-body/meta.json
similarity index 100%
rename from site/content/examples/17-special-elements/05-svelte-body/meta.json
rename to site/content/examples/17-special-elements/06-svelte-body/meta.json
diff --git a/site/content/examples/17-special-elements/06-svelte-head/App.svelte b/site/content/examples/17-special-elements/07-svelte-head/App.svelte
similarity index 100%
rename from site/content/examples/17-special-elements/06-svelte-head/App.svelte
rename to site/content/examples/17-special-elements/07-svelte-head/App.svelte
diff --git a/site/content/examples/17-special-elements/06-svelte-head/meta.json b/site/content/examples/17-special-elements/07-svelte-head/meta.json
similarity index 100%
rename from site/content/examples/17-special-elements/06-svelte-head/meta.json
rename to site/content/examples/17-special-elements/07-svelte-head/meta.json

From f56fe339318d8faee57d0392b44e3079c819ca56 Mon Sep 17 00:00:00 2001
From: Dave Lunny <4298089+himynameisdave@users.noreply.github.com>
Date: Thu, 16 Mar 2023 02:58:49 -0700
Subject: [PATCH 28/30] feat: `bind:innerText` for `contenteditable` (#4291)

closes #3311

---------

Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 elements/index.d.ts                           |  8 ++-
 site/content/docs/03-template-syntax.md       |  7 +-
 .../08-contenteditable-bindings/text.md       |  9 ++-
 src/compiler/compile/compiler_errors.ts       |  2 +-
 src/compiler/compile/nodes/Element.ts         | 11 +--
 .../render_dom/wrappers/Element/Binding.ts    |  5 ++
 .../render_dom/wrappers/Element/index.ts      | 18 +++--
 .../compile/render_ssr/handlers/Element.ts    | 12 ++--
 src/compiler/compile/utils/__test__.ts        | 67 +++++++++++++++++++
 src/compiler/compile/utils/contenteditable.ts | 57 ++++++++++++++++
 .../_config.js                                | 25 +++++++
 .../main.svelte                               |  6 ++
 .../errors.json                               |  2 +-
 .../contenteditable-missing/errors.json       |  2 +-
 14 files changed, 198 insertions(+), 33 deletions(-)
 create mode 100644 src/compiler/compile/utils/contenteditable.ts
 create mode 100644 test/runtime/samples/binding-contenteditable-innertext/_config.js
 create mode 100644 test/runtime/samples/binding-contenteditable-innertext/main.svelte

diff --git a/elements/index.d.ts b/elements/index.d.ts
index 72a077a7d5..4ad2f2880f 100644
--- a/elements/index.d.ts
+++ b/elements/index.d.ts
@@ -534,13 +534,17 @@ export interface HTMLAttributes<T extends EventTarget> extends AriaAttributes, D
 	is?: string | undefined | null;
 
 	/**
-	 * Elements with the contenteditable attribute support innerHTML and textContent bindings.
+	 * Elements with the contenteditable attribute support `innerHTML`, `textContent` and `innerText` bindings.
 	 */
 	'bind:innerHTML'?: string | undefined | null;
 	/**
-	 * Elements with the contenteditable attribute support innerHTML and textContent bindings.
+	 * Elements with the contenteditable attribute support `innerHTML`, `textContent` and `innerText` bindings.
 	 */
 	'bind:textContent'?: string | undefined | null;
+	/**
+	 * Elements with the contenteditable attribute support `innerHTML`, `textContent` and `innerText` bindings.
+	 */
+	'bind:innerText'?: string | undefined | null;
 
 	// SvelteKit
 	'data-sveltekit-keepfocus'?: true | '' | 'off' | undefined | null;
diff --git a/site/content/docs/03-template-syntax.md b/site/content/docs/03-template-syntax.md
index 95d76db5b7..170c303b85 100644
--- a/site/content/docs/03-template-syntax.md
+++ b/site/content/docs/03-template-syntax.md
@@ -691,7 +691,12 @@ When the value of an `<option>` matches its text content, the attribute can be o
 
 ---
 
-Elements with the `contenteditable` attribute support `innerHTML` and `textContent` bindings.
+Elements with the `contenteditable` attribute support the following bindings:
+- [`innerHTML`](https://developer.mozilla.org/en-US/docs/Web/API/Element/innerHTML)
+- [`innerText`](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/innerText)
+- [`textContent`](https://developer.mozilla.org/en-US/docs/Web/API/Node/textContent)
+
+There are slight differences between each of these, read more about them [here](https://developer.mozilla.org/en-US/docs/Web/API/Node/textContent#Differences_from_innerText).
 
 ```sv
 <div contenteditable="true" bind:innerHTML={html}></div>
diff --git a/site/content/tutorial/06-bindings/08-contenteditable-bindings/text.md b/site/content/tutorial/06-bindings/08-contenteditable-bindings/text.md
index a73b07c0ba..4d4b52f3b8 100644
--- a/site/content/tutorial/06-bindings/08-contenteditable-bindings/text.md
+++ b/site/content/tutorial/06-bindings/08-contenteditable-bindings/text.md
@@ -2,11 +2,16 @@
 title: Contenteditable bindings
 ---
 
-Elements with a `contenteditable="true"` attribute support `textContent` and `innerHTML` bindings:
+Elements with the `contenteditable` attribute support the following bindings:
+- [`innerHTML`](https://developer.mozilla.org/en-US/docs/Web/API/Element/innerHTML)
+- [`innerText`](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/innerText)
+- [`textContent`](https://developer.mozilla.org/en-US/docs/Web/API/Node/textContent)
+
+There are slight differences between each of these, read more about them [here](https://developer.mozilla.org/en-US/docs/Web/API/Node/textContent#Differences_from_innerText).
 
 ```html
 <div
 	contenteditable="true"
 	bind:innerHTML={html}
 ></div>
-```
\ No newline at end of file
+```
diff --git a/src/compiler/compile/compiler_errors.ts b/src/compiler/compile/compiler_errors.ts
index b0ffead6e0..bad3911673 100644
--- a/src/compiler/compile/compiler_errors.ts
+++ b/src/compiler/compile/compiler_errors.ts
@@ -66,7 +66,7 @@ export default {
 	},
 	missing_contenteditable_attribute: {
 		code: 'missing-contenteditable-attribute',
-		message: '\'contenteditable\' attribute is required for textContent and innerHTML two-way bindings'
+		message: '\'contenteditable\' attribute is required for textContent, innerHTML and innerText two-way bindings'
 	},
 	dynamic_contenteditable_attribute: {
 		code: 'dynamic-contenteditable-attribute',
diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index a5dc74b256..2fd91ac495 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -11,6 +11,7 @@ import StyleDirective from './StyleDirective';
 import Text from './Text';
 import { namespaces } from '../../utils/namespaces';
 import map_children from './shared/map_children';
+import { is_name_contenteditable, get_contenteditable_attr } from '../utils/contenteditable';
 import { regex_dimensions, regex_starts_with_newline, regex_non_whitespace_character } from '../../utils/patterns';
 import fuzzymatch from '../../utils/fuzzymatch';
 import list from '../../utils/list';
@@ -1011,14 +1012,8 @@ export default class Element extends Node {
 				if (this.name !== 'img') {
 					return component.error(binding, compiler_errors.invalid_binding_element_with('<img>', name));
 				}
-			} else if (
-				name === 'textContent' ||
-				name === 'innerHTML'
-			) {
-				const contenteditable = this.attributes.find(
-					(attribute: Attribute) => attribute.name === 'contenteditable'
-				);
-
+			} else if (is_name_contenteditable(name)) {
+				const contenteditable = get_contenteditable_attr(this);
 				if (!contenteditable) {
 					return component.error(binding, compiler_errors.missing_contenteditable_attribute);
 				} else if (contenteditable && !contenteditable.is_static) {
diff --git a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
index e656d77672..642e4694b1 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
@@ -165,6 +165,11 @@ export default class BindingWrapper {
 				update_conditions.push(x`${this.snippet} !== ${parent.var}.textContent`);
 				mount_conditions.push(x`${this.snippet} !== void 0`);
 				break;
+			
+			case 'innerText':
+				update_conditions.push(x`${this.snippet} !== ${parent.var}.innerText`);
+				mount_conditions.push(x`${this.snippet} !== void 0`);
+				break;
 
 			case 'innerHTML':
 				update_conditions.push(x`${this.snippet} !== ${parent.var}.innerHTML`);
diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index 06a7b93d0e..1f80cee89c 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -26,6 +26,7 @@ import Action from '../../../nodes/Action';
 import MustacheTagWrapper from '../MustacheTag';
 import RawMustacheTagWrapper from '../RawMustacheTag';
 import is_dynamic from '../shared/is_dynamic';
+import { is_name_contenteditable, has_contenteditable_attr } from '../../../utils/contenteditable';
 import create_debugging_comment from '../shared/create_debugging_comment';
 import { push_array } from '../../../../utils/push_array';
 
@@ -48,8 +49,8 @@ const events = [
 	{
 		event_names: ['input'],
 		filter: (node: Element, name: string) =>
-			(name === 'textContent' || name === 'innerHTML') &&
-			node.attributes.some(attribute => attribute.name === 'contenteditable')
+			is_name_contenteditable(name) &&
+			has_contenteditable_attr(node)
 	},
 	{
 		event_names: ['change'],
@@ -766,14 +767,11 @@ export default class ElementWrapper extends Wrapper {
 
 		const should_initialise = (
 			this.node.name === 'select' ||
-			binding_group.bindings.find(binding => {
-				return (
-					binding.node.name === 'indeterminate' ||
-					binding.node.name === 'textContent' ||
-					binding.node.name === 'innerHTML' ||
-					binding.is_readonly_media_attribute()
-				);
-			})
+			binding_group.bindings.find(binding => (
+				binding.node.name === 'indeterminate' ||
+				is_name_contenteditable(binding.node.name) ||
+				binding.is_readonly_media_attribute()
+			))
 		);
 
 		if (should_initialise) {
diff --git a/src/compiler/compile/render_ssr/handlers/Element.ts b/src/compiler/compile/render_ssr/handlers/Element.ts
index f1dd86dd2b..d9254a7b86 100644
--- a/src/compiler/compile/render_ssr/handlers/Element.ts
+++ b/src/compiler/compile/render_ssr/handlers/Element.ts
@@ -1,7 +1,9 @@
 import { is_void } from '../../../../shared/utils/names';
 import { get_attribute_expression, get_attribute_value, get_class_attribute_value } from './shared/get_attribute_value';
 import { boolean_attributes } from '../../../../shared/boolean_attributes';
+import { is_name_contenteditable, is_contenteditable } from '../../utils/contenteditable';
 import Renderer, { RenderOptions } from '../Renderer';
+import Binding from '../../nodes/Binding';
 import Element from '../../nodes/Element';
 import { p, x } from 'code-red';
 import Expression from '../../nodes/shared/Expression';
@@ -18,11 +20,7 @@ export default function (node: Element, renderer: Renderer, options: RenderOptio
 	// awkward special case
 	let node_contents;
 
-	const contenteditable = (
-		node.name !== 'textarea' &&
-		node.name !== 'input' &&
-		node.attributes.some((attribute) => attribute.name === 'contenteditable')
-	);
+	const contenteditable = is_contenteditable(node);
 
 	if (node.is_dynamic_element) {
 		renderer.push();
@@ -128,7 +126,7 @@ export default function (node: Element, renderer: Renderer, options: RenderOptio
 		}
 	}
 
-	node.bindings.forEach(binding => {
+	node.bindings.forEach((binding: Binding) => {
 		const { name, expression } = binding;
 
 		if (binding.is_readonly) {
@@ -144,7 +142,7 @@ export default function (node: Element, renderer: Renderer, options: RenderOptio
 				const condition = type === 'checkbox' ? x`~${bound}.indexOf(${value})` : x`${value} === ${bound}`;
 				renderer.add_expression(x`${condition} ? @add_attribute("checked", true, 1) : ""`);
 			}
-		} else if (contenteditable && (name === 'textContent' || name === 'innerHTML')) {
+		} else if (contenteditable && is_name_contenteditable(name)) {
 			node_contents = expression.node;
 
 			// TODO where was this used?
diff --git a/src/compiler/compile/utils/__test__.ts b/src/compiler/compile/utils/__test__.ts
index 3ade3dca2b..cb90c0a894 100644
--- a/src/compiler/compile/utils/__test__.ts
+++ b/src/compiler/compile/utils/__test__.ts
@@ -1,5 +1,14 @@
 import * as assert from 'assert';
 import get_name_from_filename from './get_name_from_filename';
+import {
+	is_contenteditable,
+	has_contenteditable_attr,
+	is_name_contenteditable,
+	get_contenteditable_attr,
+	CONTENTEDITABLE_BINDINGS
+} from './contenteditable';
+import Element from '../nodes/Element';
+import Attribute from '../nodes/Attribute';
 
 describe('get_name_from_filename', () => {
 	it('uses the basename', () => {
@@ -20,3 +29,61 @@ describe('get_name_from_filename', () => {
 		assert.equal(get_name_from_filename('~.svelte'), '_');
 	});
 });
+
+describe('contenteditable', () => {
+	describe('is_contenteditable', () => {
+		it('returns false if node is input', () => {
+			const node = { name: 'input' } as Element;
+			assert.equal(is_contenteditable(node), false);
+		});
+		it('returns false if node is textarea', () => {
+			const node = { name: 'textarea' } as Element;
+			assert.equal(is_contenteditable(node), false);
+		});
+		it('returns false if node is not input or textarea AND it is not contenteditable', () => {
+			const attr = { name: 'href' } as Attribute;
+			const node = { name: 'a', attributes: [attr] } as Element;
+			assert.equal(is_contenteditable(node), false);
+		});
+		it('returns true if node is not input or textarea AND it is contenteditable', () => {
+			const attr = { name: 'contenteditable' } as Attribute;
+			const node = { name: 'a', attributes: [attr] } as Element;
+			assert.equal(is_contenteditable(node), true);
+		});
+	});
+
+	describe('has_contenteditable_attr', () => {
+		it('returns true if attribute is contenteditable', () => {
+			const attr = { name: 'contenteditable' } as Attribute;
+			const node = { attributes: [attr] } as Element;
+			assert.equal(has_contenteditable_attr(node), true);
+		});
+		it('returns false if attribute is not contenteditable', () => {
+			const attr = { name: 'href' } as Attribute;
+			const node = { attributes: [attr] } as Element;
+			assert.equal(has_contenteditable_attr(node), false);
+		});
+	});
+
+	describe('is_name_contenteditable', () => {
+		it('returns true if name is a contenteditable type', () => {
+			assert.equal(is_name_contenteditable(CONTENTEDITABLE_BINDINGS[0]), true);
+		});
+		it('returns false if name is not contenteditable type', () => {
+			assert.equal(is_name_contenteditable('value'), false);
+		});
+	});
+
+	describe('get_contenteditable_attr', () => {
+		it('returns the contenteditable Attribute if it exists', () => {
+			const attr = { name: 'contenteditable' } as Attribute;
+			const node = { name: 'div', attributes: [attr] } as Element;
+			assert.equal(get_contenteditable_attr(node), attr);
+		});
+		it('returns undefined if contenteditable attribute cannot be found', () => {
+			const node = { name: 'div', attributes: [] } as Element;
+			assert.equal(get_contenteditable_attr(node), undefined);
+		});
+	});
+
+});
diff --git a/src/compiler/compile/utils/contenteditable.ts b/src/compiler/compile/utils/contenteditable.ts
new file mode 100644
index 0000000000..44d695d6b0
--- /dev/null
+++ b/src/compiler/compile/utils/contenteditable.ts
@@ -0,0 +1,57 @@
+// Utilities for managing contenteditable nodes
+import Attribute from '../nodes/Attribute';
+import Element from '../nodes/Element';
+
+export const CONTENTEDITABLE_BINDINGS = [
+  'textContent',
+  'innerHTML',
+  'innerText'
+];
+
+/**
+ * Returns true if node is an 'input' or 'textarea'.
+ * @param {Element} node The element to be checked
+ */
+function is_input_or_textarea(node: Element): boolean {
+  return node.name === 'textarea' || node.name === 'input';
+}
+
+/**
+ * Check if a given attribute is 'contenteditable'.
+ * @param {Attribute} attribute A node.attribute
+ */
+function is_attr_contenteditable(attribute: Attribute): boolean {
+  return attribute.name === 'contenteditable';
+}
+
+/**
+ * Check if any of a node's attributes are 'contentenditable'.
+ * @param {Element} node The element to be checked
+ */
+export function has_contenteditable_attr(node: Element): boolean {
+  return node.attributes.some(is_attr_contenteditable);
+}
+
+/**
+ * Returns true if node is not textarea or input, but has 'contenteditable' attribute.
+ * @param {Element} node The element to be tested
+ */
+export function is_contenteditable(node: Element): boolean {
+  return !is_input_or_textarea(node) && has_contenteditable_attr(node);
+}
+
+/**
+ * Returns true if a given binding/node is contenteditable.
+ * @param {string} name A binding or node name to be checked
+ */
+export function is_name_contenteditable(name: string): boolean {
+  return CONTENTEDITABLE_BINDINGS.includes(name);
+}
+
+/**
+ * Returns the contenteditable attribute from the node (if it exists).
+ * @param {Element} node The element to get the attribute from
+ */
+export function get_contenteditable_attr(node: Element): Attribute | undefined {
+  return node.attributes.find(is_attr_contenteditable);
+}
diff --git a/test/runtime/samples/binding-contenteditable-innertext/_config.js b/test/runtime/samples/binding-contenteditable-innertext/_config.js
new file mode 100644
index 0000000000..36e762ac24
--- /dev/null
+++ b/test/runtime/samples/binding-contenteditable-innertext/_config.js
@@ -0,0 +1,25 @@
+export default {
+	props: {
+		name: 'world'
+	},
+
+	ssrHtml: `
+		<editor contenteditable="true">world</editor>
+		<p>hello world</p>
+	`,
+
+	async test({ assert, component, target, window }) {
+		// JSDom doesn't support innerText yet, so the test is not ideal
+		// https://github.com/jsdom/jsdom/issues/1245
+		const el = target.querySelector('editor');
+		assert.equal(el.innerText, 'world');
+
+		const event = new window.Event('input');
+		el.innerText = 'everybody';
+		await el.dispatchEvent(event);
+		assert.equal(component.name, 'everybody');
+
+		component.name = 'goodbye';
+		assert.equal(el.innerText, 'goodbye');
+	}
+};
diff --git a/test/runtime/samples/binding-contenteditable-innertext/main.svelte b/test/runtime/samples/binding-contenteditable-innertext/main.svelte
new file mode 100644
index 0000000000..d65350d1a8
--- /dev/null
+++ b/test/runtime/samples/binding-contenteditable-innertext/main.svelte
@@ -0,0 +1,6 @@
+<script>
+	export let name;
+</script>
+
+<editor contenteditable="true" bind:innerText={name} />
+<p>hello {name}</p>
diff --git a/test/validator/samples/a11y-contenteditable-element-without-child/errors.json b/test/validator/samples/a11y-contenteditable-element-without-child/errors.json
index b4bd522c40..2d803d755a 100644
--- a/test/validator/samples/a11y-contenteditable-element-without-child/errors.json
+++ b/test/validator/samples/a11y-contenteditable-element-without-child/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "missing-contenteditable-attribute",
-		"message": "'contenteditable' attribute is required for textContent and innerHTML two-way bindings",
+		"message": "'contenteditable' attribute is required for textContent, innerHTML and innerText two-way bindings",
 		"start": {
 			"line": 6,
 			"column": 3
diff --git a/test/validator/samples/contenteditable-missing/errors.json b/test/validator/samples/contenteditable-missing/errors.json
index 23df8e6d83..b2e07f5b6a 100644
--- a/test/validator/samples/contenteditable-missing/errors.json
+++ b/test/validator/samples/contenteditable-missing/errors.json
@@ -1,6 +1,6 @@
 [{
 	"code": "missing-contenteditable-attribute",
-	"message": "'contenteditable' attribute is required for textContent and innerHTML two-way bindings",
+	"message": "'contenteditable' attribute is required for textContent, innerHTML and innerText two-way bindings",
 	"start": {
 		"line": 4,
 		"column": 8

From 0f64e54ebba0ab7c09a271c72dcdb82a859330a3 Mon Sep 17 00:00:00 2001
From: Geoff Rich <4992896+geoffrich@users.noreply.github.com>
Date: Fri, 17 Mar 2023 08:58:51 -0700
Subject: [PATCH 29/30] chore: update changelog (#8390)

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 097cfd51ba..771adf2100 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * Prevent derived store callbacks after store is unsubscribed from ([#8364](https://github.com/sveltejs/svelte/issues/8364))
 * Account for `bind:group` members being spread across multiple control flow blocks ([#8372](https://github.com/sveltejs/svelte/issues/8372))
 * Revert buggy reactive statement optimization ([#8374](https://github.com/sveltejs/svelte/issues/8374))
+* Support CSS units in the `fly` and `blur` transitions ([#7623](https://github.com/sveltejs/svelte/pull/7623))
 
 ## 3.56.0
 

From 33065aa1e629da315942859a06f5161e3244d8f4 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Fri, 17 Mar 2023 17:55:50 +0100
Subject: [PATCH 30/30] chore: update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 771adf2100..b78413123a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Svelte changelog
 
+## Unreleased
+
+* Add `bind:innerText` for `contenteditable` elements ([#3311](https://github.com/sveltejs/svelte/issues/3311))
+
 ## 3.57.0
 
 * Add `<svelte:document>` ([#3310](https://github.com/sveltejs/svelte/issues/3310))