From e5b0b6235dbc3483a1d1feb3fe8abf12f13bebd8 Mon Sep 17 00:00:00 2001
From: Jos de Jong <wjosdejong@gmail.com>
Date: Thu, 23 Feb 2023 12:03:12 +0100
Subject: [PATCH 001/110] fix: ensure `bind:offsetHeight` updates (#8096)

fixes #4233 by calling the callback after the iframe loads, which may be asynchronous

---------

Co-authored-by: Yuichiro Yamashita <xydybaseball@gmail.com>
---
 src/runtime/internal/dom.ts                    |  4 ++++
 .../binding-width-height-initialize/_config.js |  6 ++++++
 .../main.svelte                                | 18 ++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 test/runtime-puppeteer/samples/binding-width-height-initialize/_config.js
 create mode 100644 test/runtime-puppeteer/samples/binding-width-height-initialize/main.svelte

diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index ca76b11ab3..52f1198833 100644
--- a/src/runtime/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -624,6 +624,10 @@ export function add_resize_listener(node: HTMLElement, fn: () => void) {
 		iframe.src = 'about:blank';
 		iframe.onload = () => {
 			unsubscribe = listen(iframe.contentWindow, 'resize', fn);
+
+			// make sure an initial resize event is fired _after_ the iframe is loaded (which is asynchronous)
+			// see https://github.com/sveltejs/svelte/issues/4233
+			fn();
 		};
 	}
 
diff --git a/test/runtime-puppeteer/samples/binding-width-height-initialize/_config.js b/test/runtime-puppeteer/samples/binding-width-height-initialize/_config.js
new file mode 100644
index 0000000000..d67299ad56
--- /dev/null
+++ b/test/runtime-puppeteer/samples/binding-width-height-initialize/_config.js
@@ -0,0 +1,6 @@
+export default {
+	async test({ assert, component }) {
+		assert.equal(component.toggle, true);
+		assert.equal(component.offsetHeight, 800);
+	}
+};
diff --git a/test/runtime-puppeteer/samples/binding-width-height-initialize/main.svelte b/test/runtime-puppeteer/samples/binding-width-height-initialize/main.svelte
new file mode 100644
index 0000000000..6136365a1d
--- /dev/null
+++ b/test/runtime-puppeteer/samples/binding-width-height-initialize/main.svelte
@@ -0,0 +1,18 @@
+<script>
+  export let offsetHeight;
+  export let offsetWidth;
+  export let toggle = false;
+  $: if (offsetWidth) {
+    toggle = true;
+  }
+</script>
+
+<div class:toggle>
+  <div bind:offsetHeight bind:offsetWidth>{offsetHeight}</div>
+</div>
+
+<style>
+  .toggle > div {
+    height: 800px;
+  }
+</style>

From 0bdb59c2e2b7664db0ca4bcd9bf7f3934273ae14 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Thu, 23 Feb 2023 12:03:29 +0100
Subject: [PATCH 002/110] fix: compute rect directly before crossfading (#8314)

closes #4344
fixes #4111
---
 src/runtime/transition/index.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/runtime/transition/index.ts b/src/runtime/transition/index.ts
index c6d9dbc97a..cc8ace194f 100644
--- a/src/runtime/transition/index.ts
+++ b/src/runtime/transition/index.ts
@@ -211,7 +211,7 @@ export interface CrossfadeParams {
 	easing?: EasingFunction;
 }
 
-type ClientRectMap = Map<any, { rect: ClientRect }>;
+type ClientRectMap = Map<any, Element>;
 
 export function crossfade({ fallback, ...defaults }: CrossfadeParams & {
 	fallback?: (node: Element, params: CrossfadeParams, intro: boolean) => TransitionConfig;
@@ -232,13 +232,14 @@ export function crossfade({ fallback, ...defaults }: CrossfadeParams & {
 	const to_receive: ClientRectMap = new Map();
 	const to_send: ClientRectMap = new Map();
 
-	function crossfade(from: ClientRect, node: Element, params: CrossfadeParams): TransitionConfig {
+	function crossfade(from_node: Element, node: Element, params: CrossfadeParams): TransitionConfig {
 		const {
 			delay = 0,
 			duration = d => Math.sqrt(d) * 30,
 			easing = cubicOut
 		} = assign(assign({}, defaults), params);
 
+		const from = from_node.getBoundingClientRect();
 		const to = node.getBoundingClientRect();
 		const dx = from.left - to.left;
 		const dy = from.top - to.top;
@@ -264,16 +265,14 @@ export function crossfade({ fallback, ...defaults }: CrossfadeParams & {
 
 	function transition(items: ClientRectMap, counterparts: ClientRectMap, intro: boolean) {
 		return (node: Element, params: CrossfadeParams & { key: any }) => {
-			items.set(params.key, {
-				rect: node.getBoundingClientRect()
-			});
+			items.set(params.key, node);
 
 			return () => {
 				if (counterparts.has(params.key)) {
-					const { rect } = counterparts.get(params.key);
+					const other_node = counterparts.get(params.key);
 					counterparts.delete(params.key);
 
-					return crossfade(rect, node, params);
+					return crossfade(other_node, node, params);
 				}
 
 				// if the node is disappearing altogether

From 9f89a92d31156502c0b04ec6dd53952face37ca7 Mon Sep 17 00:00:00 2001
From: Alvin Ramskogler <62756994+blaumeise20@users.noreply.github.com>
Date: Thu, 23 Feb 2023 11:17:34 +0000
Subject: [PATCH 003/110] feat: add `readonly` method to convert writable store
 to readonly (#6518)

---
 site/content/docs/04-run-time.md | 25 ++++++++++++++++++++++++-
 src/runtime/store/index.ts       | 11 +++++++++++
 test/store/index.ts              | 19 ++++++++++++++++++-
 3 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/site/content/docs/04-run-time.md b/site/content/docs/04-run-time.md
index ef21112034..72b0736ac6 100644
--- a/site/content/docs/04-run-time.md
+++ b/site/content/docs/04-run-time.md
@@ -452,6 +452,29 @@ import { get } from 'svelte/store';
 const value = get(store);
 ```
 
+#### `readonly`
+
+```js
+readableStore = readonly(writableStore);
+```
+
+---
+
+This simple helper function makes a store readonly. You can still subscribe to the changes from the original one using this new readable store.
+
+
+```js
+import { readonly } from 'svelte/store';
+
+const writableStore = writable(1);
+const readableStore = readonly(writableStore);
+
+readableStore.subscribe(console.log);
+
+writableStore.set(2); // console: 2
+readableStore.set(2); // ERROR
+```
+
 
 ### `svelte/motion`
 
@@ -853,7 +876,7 @@ The `crossfade` function creates a pair of [transitions](/docs#template-syntax-e
 * `delay` (`number`, default 0) — milliseconds before starting
 * `duration` (`number` | `function`, default 800) — milliseconds the transition lasts
 * `easing` (`function`, default `cubicOut`) — an [easing function](/docs#run-time-svelte-easing)
-* `fallback` (`function`) — A fallback [transition](/docs#template-syntax-element-directives-transition-fn) to use for send when there is no matching element being received, and for receive when there is no element being sent. 
+* `fallback` (`function`) — A fallback [transition](/docs#template-syntax-element-directives-transition-fn) to use for send when there is no matching element being received, and for receive when there is no element being sent.
 
 ```sv
 <script>
diff --git a/src/runtime/store/index.ts b/src/runtime/store/index.ts
index 16832f10d9..ee277c6216 100644
--- a/src/runtime/store/index.ts
+++ b/src/runtime/store/index.ts
@@ -207,6 +207,17 @@ export function derived<T>(stores: Stores, fn: Function, initial_value?: T): Rea
 	});
 }
 
+/**
+ * Takes a store and returns a new one derived from the old one that is readable.
+ *
+ * @param store - store to make readonly
+ */
+export function readonly<T>(store: Readable<T>): Readable<T> {
+	return {
+		subscribe: store.subscribe.bind(store)
+	};
+}
+
 /**
  * Get the current value from a store by subscribing and immediately unsubscribing.
  * @param store readable
diff --git a/test/store/index.ts b/test/store/index.ts
index 389f29244b..7e8bdb2f64 100644
--- a/test/store/index.ts
+++ b/test/store/index.ts
@@ -1,5 +1,5 @@
 import * as assert from 'assert';
-import { readable, writable, derived, get } from '../../store';
+import { readable, writable, derived, get, readonly } from '../../store';
 
 describe('store', () => {
 	describe('writable', () => {
@@ -419,4 +419,21 @@ describe('store', () => {
 			assert.equal(get(fake_observable), 42);
 		});
 	});
+
+	describe('readonly', () => {
+		it('makes a store readonly', () => {
+			const writableStore = writable(1);
+			const readableStore = readonly(writableStore);
+
+			assert.equal(get(readableStore), get(writableStore));
+
+			writableStore.set(2);
+
+			assert.equal(get(readableStore), 2);
+			assert.equal(get(readableStore), get(writableStore));
+
+			assert.throws(() => readableStore.set(3));
+		});
+
+	});
 });

From 835362af88fea76b376d31a994690fb58f12591b Mon Sep 17 00:00:00 2001
From: Hong-Kuan Wu <whk0313@gmail.com>
Date: Thu, 23 Feb 2023 19:36:27 +0800
Subject: [PATCH 004/110] fix: check url and search input field values before
 updating (#7111)

Fixes #7027
---
 src/compiler/compile/render_dom/wrappers/Element/Binding.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
index 9e2ec85f0f..ab863e9dff 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
@@ -120,7 +120,9 @@ export default class BindingWrapper {
 				type === '' ||
 				type === 'text' ||
 				type === 'email' ||
-				type === 'password'
+				type === 'password' ||
+				type === 'search' ||
+				type === 'url'
 			) {
 				update_conditions.push(
 					x`${parent.var}.${this.node.name} !== ${this.snippet}`

From 487fedce6c3c4ef817682c904a17a80989db1cd8 Mon Sep 17 00:00:00 2001
From: Mike Randazzo <slashrandazzo@gmail.com>
Date: Thu, 23 Feb 2023 04:46:08 -0800
Subject: [PATCH 005/110] docs: describe that `bind:value` creates a two-way
 binding (#8311)

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 site/content/tutorial/06-bindings/05-textarea-inputs/text.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/site/content/tutorial/06-bindings/05-textarea-inputs/text.md b/site/content/tutorial/06-bindings/05-textarea-inputs/text.md
index 42763200c7..d9a08eee91 100644
--- a/site/content/tutorial/06-bindings/05-textarea-inputs/text.md
+++ b/site/content/tutorial/06-bindings/05-textarea-inputs/text.md
@@ -1,8 +1,7 @@
 ---
 title: Textarea inputs
 ---
-
-The `<textarea>` element behaves similarly to a text input in Svelte — use `bind:value`:
+The `<textarea>` element behaves similarly to a text input in Svelte — use `bind:value` to create a two-way binding between the `<textarea>` content and the `value` variable:
 
 ```html
 <textarea bind:value={value}></textarea>
@@ -14,4 +13,4 @@ In cases like these, where the names match, we can also use a shorthand form:
 <textarea bind:value></textarea>
 ```
 
-This applies to all bindings, not just textareas.
\ No newline at end of file
+This applies to all bindings, not just textareas.

From ba8f979f03da248aa081c7208e0bfcaf63b73a06 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Thu, 23 Feb 2023 18:49:49 +0100
Subject: [PATCH 006/110] chore: update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f240db6dce..c4ea2fbe7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,10 @@
 * 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))
+* Ensure `bind:offsetHeight` updates initially ([#4233](https://github.com/sveltejs/svelte/issues/4233))
 
 ## 3.55.1
 

From d16dd5d7caa9e9d992bcd765d980ebc23d796528 Mon Sep 17 00:00:00 2001
From: Tan Li Hau <tanhauhau@users.noreply.github.com>
Date: Fri, 24 Feb 2023 21:20:44 +0800
Subject: [PATCH 007/110] feat: add naturalWidth and naturalHeight bindings
 (#7857)

Closes #7771
---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 site/content/docs/03-template-syntax.md       | 16 ++++
 src/compiler/compile/nodes/Binding.ts         |  4 +-
 src/compiler/compile/nodes/Element.ts         |  7 ++
 .../render_dom/wrappers/Element/index.ts      |  4 +
 .../natural-dimension-binding/expected.js     | 95 +++++++++++++++++++
 .../natural-dimension-binding/input.svelte    |  8 ++
 6 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 test/js/samples/natural-dimension-binding/expected.js
 create mode 100644 test/js/samples/natural-dimension-binding/input.svelte

diff --git a/site/content/docs/03-template-syntax.md b/site/content/docs/03-template-syntax.md
index 74a2069c68..f0bbf67dea 100644
--- a/site/content/docs/03-template-syntax.md
+++ b/site/content/docs/03-template-syntax.md
@@ -751,6 +751,22 @@ Videos additionally have readonly `videoWidth` and `videoHeight` bindings.
 ></video>
 ```
 
+##### Image element bindings
+
+---
+
+Image elements (`<img>`) have two readonly bindings:
+
+* `naturalWidth` (readonly) — the original width of the image, available after the image has loaded
+* `naturalHeight` (readonly) — the original height of the image, available after the image has loaded
+
+```sv
+<img
+	bind:naturalWidth
+	bind:naturalHeight
+></img>
+```
+
 ##### Block-level element bindings
 
 ---
diff --git a/src/compiler/compile/nodes/Binding.ts b/src/compiler/compile/nodes/Binding.ts
index 46112a03a3..9a62b68850 100644
--- a/src/compiler/compile/nodes/Binding.ts
+++ b/src/compiler/compile/nodes/Binding.ts
@@ -22,7 +22,9 @@ const read_only_media_attributes = new Set([
 	'seeking',
 	'ended',
 	'videoHeight',
-	'videoWidth'
+	'videoWidth',
+	'naturalWidth',
+	'naturalHeight'
 ]);
 
 export default class Binding extends Node {
diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index 4d1cb758fe..1ac75faffd 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -918,6 +918,13 @@ export default class Element extends Node {
 				} else if (is_void(this.name)) {
 					return component.error(binding, compiler_errors.invalid_binding_on(binding.name, `void elements like <${this.name}>. Use a wrapper element instead`));
 				}
+			} else if (
+				name === 'naturalWidth' ||
+				name === 'naturalHeight'
+			) {
+				if (this.name !== 'img') {
+					return component.error(binding, compiler_errors.invalid_binding_element_with('<img>', name));
+				}
 			} else if (
 				name === 'textContent' ||
 				name === 'innerHTML'
diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index 8a8f59810b..39ca782af0 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -137,6 +137,10 @@ const events = [
 		event_names: ['toggle'],
 		filter: (node: Element, _name: string) =>
 			node.name === 'details'
+	},
+	{
+		event_names: ['load'],
+		filter: (_: Element, name: string) => name === 'naturalHeight' || name === 'naturalWidth'
 	}
 ];
 
diff --git a/test/js/samples/natural-dimension-binding/expected.js b/test/js/samples/natural-dimension-binding/expected.js
new file mode 100644
index 0000000000..3920c61009
--- /dev/null
+++ b/test/js/samples/natural-dimension-binding/expected.js
@@ -0,0 +1,95 @@
+/* generated by Svelte vX.Y.Z */
+import {
+	SvelteComponent,
+	add_render_callback,
+	attr,
+	detach,
+	element,
+	init,
+	insert,
+	listen,
+	noop,
+	safe_not_equal,
+	set_data,
+	space,
+	src_url_equal,
+	text
+} from "svelte/internal";
+
+function create_fragment(ctx) {
+	let img;
+	let img_src_value;
+	let t0;
+	let t1;
+	let t2;
+	let t3;
+	let mounted;
+	let dispose;
+
+	return {
+		c() {
+			img = element("img");
+			t0 = space();
+			t1 = text(/*naturalWidth*/ ctx[0]);
+			t2 = text(" x ");
+			t3 = text(/*naturalHeight*/ ctx[1]);
+			if (!src_url_equal(img.src, img_src_value = "something.jpg")) attr(img, "src", img_src_value);
+			if (/*naturalWidth*/ ctx[0] === void 0 || /*naturalHeight*/ ctx[1] === void 0) add_render_callback(() => /*img_load_handler*/ ctx[2].call(img));
+		},
+		m(target, anchor) {
+			insert(target, img, anchor);
+			insert(target, t0, anchor);
+			insert(target, t1, anchor);
+			insert(target, t2, anchor);
+			insert(target, t3, anchor);
+
+			if (!mounted) {
+				dispose = listen(img, "load", /*img_load_handler*/ ctx[2]);
+				mounted = true;
+			}
+		},
+		p(ctx, [dirty]) {
+			if (dirty & /*naturalWidth*/ 1) set_data(t1, /*naturalWidth*/ ctx[0]);
+			if (dirty & /*naturalHeight*/ 2) set_data(t3, /*naturalHeight*/ ctx[1]);
+		},
+		i: noop,
+		o: noop,
+		d(detaching) {
+			if (detaching) detach(img);
+			if (detaching) detach(t0);
+			if (detaching) detach(t1);
+			if (detaching) detach(t2);
+			if (detaching) detach(t3);
+			mounted = false;
+			dispose();
+		}
+	};
+}
+
+function instance($$self, $$props, $$invalidate) {
+	let { naturalWidth = 0 } = $$props;
+	let { naturalHeight = 0 } = $$props;
+
+	function img_load_handler() {
+		naturalWidth = this.naturalWidth;
+		naturalHeight = this.naturalHeight;
+		$$invalidate(0, naturalWidth);
+		$$invalidate(1, naturalHeight);
+	}
+
+	$$self.$$set = $$props => {
+		if ('naturalWidth' in $$props) $$invalidate(0, naturalWidth = $$props.naturalWidth);
+		if ('naturalHeight' in $$props) $$invalidate(1, naturalHeight = $$props.naturalHeight);
+	};
+
+	return [naturalWidth, naturalHeight, img_load_handler];
+}
+
+class Component extends SvelteComponent {
+	constructor(options) {
+		super();
+		init(this, options, instance, create_fragment, safe_not_equal, { naturalWidth: 0, naturalHeight: 1 });
+	}
+}
+
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/natural-dimension-binding/input.svelte b/test/js/samples/natural-dimension-binding/input.svelte
new file mode 100644
index 0000000000..67a7a947fa
--- /dev/null
+++ b/test/js/samples/natural-dimension-binding/input.svelte
@@ -0,0 +1,8 @@
+<script>
+  export let naturalWidth = 0;
+  export let naturalHeight = 0;
+</script>
+
+<img src="something.jpg" bind:naturalWidth bind:naturalHeight>
+
+{naturalWidth} x {naturalHeight}

From ca531519a8927a8d7cc227ab56efafcf6bc9a3c8 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Fri, 24 Feb 2023 15:50:22 -0800
Subject: [PATCH 008/110] chore: switch to @jridgewell/sourcemap-codec (#8321)

---
 package-lock.json                           | 14 +++++++++++++-
 package.json                                |  2 +-
 src/compiler/preprocess/decode_sourcemap.ts |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5ab035cd2e..b8aea534af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
       "license": "MIT",
       "devDependencies": {
         "@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-node-resolve": "^11.2.1",
@@ -44,7 +45,6 @@
         "rollup": "^1.27.14",
         "source-map": "^0.7.4",
         "source-map-support": "^0.5.21",
-        "sourcemap-codec": "^1.4.8",
         "tiny-glob": "^0.2.9",
         "tslib": "^2.4.1",
         "typescript": "^3.7.5",
@@ -162,6 +162,12 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "dev": true
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -5373,6 +5379,12 @@
       "integrity": "sha512-9oLAnygRMi8Q5QkYEU4XWK04B+nuoXoxjRvRxgjuChkLZFBja0YPSgdZ7dZtwhncLBcQe/I/E+fLuk5qxcYVJA==",
       "dev": true
     },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "dev": true
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
diff --git a/package.json b/package.json
index 1efd4cb780..975f171fe6 100644
--- a/package.json
+++ b/package.json
@@ -120,6 +120,7 @@
   "homepage": "https://svelte.dev",
   "devDependencies": {
     "@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-node-resolve": "^11.2.1",
@@ -154,7 +155,6 @@
     "rollup": "^1.27.14",
     "source-map": "^0.7.4",
     "source-map-support": "^0.5.21",
-    "sourcemap-codec": "^1.4.8",
     "tiny-glob": "^0.2.9",
     "tslib": "^2.4.1",
     "typescript": "^3.7.5",
diff --git a/src/compiler/preprocess/decode_sourcemap.ts b/src/compiler/preprocess/decode_sourcemap.ts
index c7e13c2853..be4b70125f 100644
--- a/src/compiler/preprocess/decode_sourcemap.ts
+++ b/src/compiler/preprocess/decode_sourcemap.ts
@@ -1,4 +1,4 @@
-import { decode as decode_mappings } from 'sourcemap-codec';
+import { decode as decode_mappings } from '@jridgewell/sourcemap-codec';
 import { Processed } from './types';
 
 /**

From 1f3d2f7646190213e83936146e16ca2eb2f650b0 Mon Sep 17 00:00:00 2001
From: Yuichiro Yamashita <xydybaseball@gmail.com>
Date: Sun, 26 Feb 2023 23:35:00 +0900
Subject: [PATCH 009/110] fix: better handling of inert attribute (add tests)
 (#7944)

* add inert to attribute_lookup

* typed for preventing a repeat of the tragedy

* add tests

* revert unnecessary change

* add more test

---------

Co-authored-by: fcrozatier <frederic.crozatier@protonmail.com>
---
 .../compile/render_dom/wrappers/Element/Attribute.ts  |  7 +++++--
 src/shared/boolean_attributes.ts                      |  8 ++++++--
 .../attribute-boolean-indeterminate/_config.js        |  4 ----
 .../samples/attribute-boolean-inert/_config.js        | 11 +++++++++++
 .../samples/attribute-boolean-inert/main.svelte       |  5 +++++
 .../samples/attribute-boolean-itemscope/_config.js    | 11 +++++++++++
 .../samples/attribute-boolean-itemscope/main.svelte   |  5 +++++
 7 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 test/runtime/samples/attribute-boolean-inert/_config.js
 create mode 100644 test/runtime/samples/attribute-boolean-inert/main.svelte
 create mode 100644 test/runtime/samples/attribute-boolean-itemscope/_config.js
 create mode 100644 test/runtime/samples/attribute-boolean-itemscope/main.svelte

diff --git a/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts b/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
index 81a1898331..ca35ea84db 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
@@ -9,7 +9,7 @@ import Text from '../../../nodes/Text';
 import handle_select_value_binding from './handle_select_value_binding';
 import { Identifier, Node } from 'estree';
 import { namespaces } from '../../../../utils/namespaces';
-import { boolean_attributes } from '../../../../../shared/boolean_attributes';
+import { BooleanAttributes, boolean_attributes } from '../../../../../shared/boolean_attributes';
 import { regex_double_quotes } from '../../../../utils/patterns';
 
 const non_textlike_input_types = new Set([
@@ -324,7 +324,8 @@ export default class AttributeWrapper extends BaseAttributeWrapper {
 }
 
 // source: https://html.spec.whatwg.org/multipage/indices.html
-const attribute_lookup = {
+type AttributeMetadata = { property_name?: string, applies_to?: string[] };
+const attribute_lookup: { [key in BooleanAttributes]: AttributeMetadata } & { [key in string]: AttributeMetadata } = {
 	allowfullscreen: { property_name: 'allowFullscreen', applies_to: ['iframe'] },
 	allowpaymentrequest: { property_name: 'allowPaymentRequest', applies_to: ['iframe'] },
 	async: { applies_to: ['script'] },
@@ -349,7 +350,9 @@ const attribute_lookup = {
 	formnovalidate: { property_name: 'formNoValidate', applies_to: ['button', 'input'] },
 	hidden: {},
 	indeterminate: { applies_to: ['input'] },
+	inert: {},
 	ismap: { property_name: 'isMap', applies_to: ['img'] },
+	itemscope: {},
 	loop: { applies_to: ['audio', 'bgsound', 'video'] },
 	multiple: { applies_to: ['input', 'select'] },
 	muted: { applies_to: ['audio', 'video'] },
diff --git a/src/shared/boolean_attributes.ts b/src/shared/boolean_attributes.ts
index e29f921e32..f6ec25c6e5 100644
--- a/src/shared/boolean_attributes.ts
+++ b/src/shared/boolean_attributes.ts
@@ -1,5 +1,5 @@
 // source: https://html.spec.whatwg.org/multipage/indices.html
-export const boolean_attributes = new Set([
+const _boolean_attributes = [
 	'allowfullscreen',
 	'allowpaymentrequest',
 	'async',
@@ -12,6 +12,7 @@ export const boolean_attributes = new Set([
 	'disabled',
 	'formnovalidate',
 	'hidden',
+	'indeterminate',
 	'inert',
 	'ismap',
 	'itemscope',
@@ -26,4 +27,7 @@ export const boolean_attributes = new Set([
 	'required',
 	'reversed',
 	'selected'
-]);
+] as const;
+
+export type BooleanAttributes = typeof _boolean_attributes[number];
+export const boolean_attributes: Set<string> = new Set([..._boolean_attributes]);
diff --git a/test/runtime/samples/attribute-boolean-indeterminate/_config.js b/test/runtime/samples/attribute-boolean-indeterminate/_config.js
index d6e97ffc0e..aafb0ec164 100644
--- a/test/runtime/samples/attribute-boolean-indeterminate/_config.js
+++ b/test/runtime/samples/attribute-boolean-indeterminate/_config.js
@@ -1,8 +1,4 @@
 export default {
-	// This is a bit of a funny one — there's no equivalent attribute,
-	// so it can't be server-rendered
-	skip_if_ssr: true,
-
 	props: {
 		indeterminate: true
 	},
diff --git a/test/runtime/samples/attribute-boolean-inert/_config.js b/test/runtime/samples/attribute-boolean-inert/_config.js
new file mode 100644
index 0000000000..8f99b4ebd8
--- /dev/null
+++ b/test/runtime/samples/attribute-boolean-inert/_config.js
@@ -0,0 +1,11 @@
+export default {
+	props: {
+		inert: true
+	},
+	test({ assert, target, component }) {
+		const div = target.querySelector('div');
+		assert.ok(div.inert);
+		component.inert = false;
+		assert.ok(!div.inert);
+	}
+};
diff --git a/test/runtime/samples/attribute-boolean-inert/main.svelte b/test/runtime/samples/attribute-boolean-inert/main.svelte
new file mode 100644
index 0000000000..6c3df7e31e
--- /dev/null
+++ b/test/runtime/samples/attribute-boolean-inert/main.svelte
@@ -0,0 +1,5 @@
+<script>
+export let inert;
+</script>
+
+<div {inert}>some div <button>click</button></div>
diff --git a/test/runtime/samples/attribute-boolean-itemscope/_config.js b/test/runtime/samples/attribute-boolean-itemscope/_config.js
new file mode 100644
index 0000000000..b5b21cfc47
--- /dev/null
+++ b/test/runtime/samples/attribute-boolean-itemscope/_config.js
@@ -0,0 +1,11 @@
+export default {
+	props: {
+		itemscope: true
+	},
+	test({ assert, target, component }) {
+		const div = target.querySelector('div');
+		assert.ok(div.itemscope);
+		component.itemscope = false;
+		assert.ok(!div.itemscope);
+	}
+};
diff --git a/test/runtime/samples/attribute-boolean-itemscope/main.svelte b/test/runtime/samples/attribute-boolean-itemscope/main.svelte
new file mode 100644
index 0000000000..83265a983c
--- /dev/null
+++ b/test/runtime/samples/attribute-boolean-itemscope/main.svelte
@@ -0,0 +1,5 @@
+<script>
+export let itemscope;
+</script>
+
+<div {itemscope}  />

From 79c64df41bfc907d5d65aea6e0add1f3b9441c9d Mon Sep 17 00:00:00 2001
From: Tan Li Hau <tanhauhau@users.noreply.github.com>
Date: Sun, 26 Feb 2023 22:37:15 +0800
Subject: [PATCH 010/110] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4ea2fbe7c..2af04103fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 * 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))
 * 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))
 
 ## 3.55.1
 

From 3423bf6b307d11a44f6a9a71f988e32e198a360e Mon Sep 17 00:00:00 2001
From: Yuichiro Yamashita <xydybaseball@gmail.com>
Date: Sun, 26 Feb 2023 23:40:36 +0900
Subject: [PATCH 011/110] add docs (#8326)

---
 site/content/docs/03-template-syntax.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/site/content/docs/03-template-syntax.md b/site/content/docs/03-template-syntax.md
index f0bbf67dea..419489211c 100644
--- a/site/content/docs/03-template-syntax.md
+++ b/site/content/docs/03-template-syntax.md
@@ -1517,6 +1517,8 @@ The content is exposed in the child component using the `<slot>` element, which
 </Widget>
 ```
 
+Note: If you want to render regular `<slot>` element, You can use `<svelte:element this="slot" />`.
+
 #### `<slot name="`*name*`">`
 
 ---

From 636290af954a2b37a263b35c6deb69f149b59905 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 27 Feb 2023 11:33:45 +0100
Subject: [PATCH 012/110] fix: remove indeterminate from boolean attributes
 (#8334)

It's only existing as a boolean property
cleanup of #7944
---
 src/shared/boolean_attributes.ts                          | 7 +++++--
 .../samples/attribute-boolean-indeterminate/_config.js    | 8 ++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/shared/boolean_attributes.ts b/src/shared/boolean_attributes.ts
index f6ec25c6e5..668dd97975 100644
--- a/src/shared/boolean_attributes.ts
+++ b/src/shared/boolean_attributes.ts
@@ -1,4 +1,3 @@
-// source: https://html.spec.whatwg.org/multipage/indices.html
 const _boolean_attributes = [
 	'allowfullscreen',
 	'allowpaymentrequest',
@@ -12,7 +11,6 @@ const _boolean_attributes = [
 	'disabled',
 	'formnovalidate',
 	'hidden',
-	'indeterminate',
 	'inert',
 	'ismap',
 	'itemscope',
@@ -30,4 +28,9 @@ const _boolean_attributes = [
 ] as const;
 
 export type BooleanAttributes = typeof _boolean_attributes[number];
+
+/**
+ * List of HTML boolean attributes (e.g. `<input disabled>`).
+ * Source: https://html.spec.whatwg.org/multipage/indices.html
+ */
 export const boolean_attributes: Set<string> = new Set([..._boolean_attributes]);
diff --git a/test/runtime/samples/attribute-boolean-indeterminate/_config.js b/test/runtime/samples/attribute-boolean-indeterminate/_config.js
index aafb0ec164..5853e76922 100644
--- a/test/runtime/samples/attribute-boolean-indeterminate/_config.js
+++ b/test/runtime/samples/attribute-boolean-indeterminate/_config.js
@@ -1,14 +1,14 @@
 export default {
+	// This is a bit of a funny one — there's no equivalent attribute,
+	// so it can't be server-rendered
+	skip_if_ssr: true,
+
 	props: {
 		indeterminate: true
 	},
 
 	html: "<input type='checkbox'>",
 
-	// somehow ssr will render indeterminate=""
-	// the hydrated html will still contain that attribute
-	ssrHtml: "<input type='checkbox' indeterminate=''>",
-
 	test({ assert, component, target }) {
 		const input = target.querySelector('input');
 

From 5f99ae76ce4ad1b1be2a08a19a93a44178720523 Mon Sep 17 00:00:00 2001
From: Yuichiro Yamashita <xydybaseball@gmail.com>
Date: Mon, 27 Feb 2023 19:40:24 +0900
Subject: [PATCH 013/110] chore: Reduce number of lines of expected files
 (#8325)

- removes character and pos from the expected output to reduce noise
- adds a test that pos/character are correct
---
 test/validator/index.ts                       |  77 ++++++--
 .../samples/a11y-alt-text/warnings.json       |  39 ++--
 .../a11y-anchor-has-content/warnings.json     |  11 +-
 .../a11y-anchor-in-svg-is-valid/warnings.json |  27 +--
 .../a11y-anchor-is-valid/warnings.json        |  54 ++----
 .../a11y-aria-activedescendant/warnings.json  |   3 -
 .../samples/a11y-aria-props/warnings.json     |  19 +-
 .../a11y-aria-proptypes-boolean/warnings.json |  20 +-
 .../a11y-aria-proptypes-integer/warnings.json |  29 +--
 .../a11y-aria-proptypes-number/warnings.json  |  83 ++++----
 .../a11y-aria-proptypes-string/warnings.json  |  29 ++-
 .../a11y-aria-proptypes-token/warnings.json   |  38 ++--
 .../warnings.json                             |  47 ++---
 .../warnings.json                             |  20 +-
 .../samples/a11y-aria-role/warnings.json      |  18 +-
 .../warnings.json                             |  19 +-
 .../warnings.json                             |  63 +++----
 .../errors.json                               |   9 +-
 .../a11y-figcaption-wrong-place/warnings.json |  18 +-
 .../a11y-heading-has-content/warnings.json    |  19 +-
 .../samples/a11y-html-has-lang/warnings.json  |   9 +-
 .../a11y-iframe-has-title/warnings.json       |   9 +-
 .../a11y-img-redundant-alt/warnings.json      |  17 +-
 .../warnings.json                             |   6 -
 .../a11y-media-has-caption/warnings.json      |  12 --
 .../input.svelte                              |   2 +-
 .../warnings.json                             |  14 +-
 .../a11y-no-abstract-roles/warnings.json      |  36 ----
 .../samples/a11y-no-access-key/warnings.json  |  11 +-
 .../samples/a11y-no-autofocus/warnings.json   |  11 +-
 .../warnings.json                             |  19 +-
 .../warnings.json                             | 177 ------------------
 .../warnings.json                             |  12 --
 .../a11y-no-redundant-roles/warnings.json     | 126 -------------
 .../a11y-not-on-components/warnings.json      |   9 +-
 .../warnings.json                             |  32 +---
 .../samples/a11y-scope/warnings.json          |   9 +-
 .../a11y-tabindex-no-positive/warnings.json   |   9 +-
 .../samples/action-invalid/warnings.json      |   9 +-
 .../samples/action-object/input.svelte        |   4 +-
 .../samples/action-object/warnings.json       |   3 -
 .../samples/action-on-component/errors.json   |   9 +-
 .../samples/animation-duplicate/errors.json   |  11 +-
 .../samples/animation-missing/warnings.json   |  11 +-
 .../samples/animation-not-in-each/errors.json |   9 +-
 .../animation-not-in-keyed-each/errors.json   |   9 +-
 .../samples/animation-siblings/errors.json    |   9 +-
 .../samples/assignment-to-const-2/errors.json |  11 +-
 .../samples/assignment-to-const-3/errors.json |  11 +-
 .../samples/assignment-to-const-4/errors.json |  11 +-
 .../samples/assignment-to-const/errors.json   |  11 +-
 .../attribute-expected-equals/errors.json     |   9 +-
 .../attribute-invalid-name-2/errors.json      |   9 +-
 .../attribute-invalid-name-3/errors.json      |   9 +-
 .../attribute-invalid-name-4/errors.json      |   9 +-
 .../attribute-invalid-name-5/errors.json      |   9 +-
 .../attribute-invalid-name/errors.json        |   9 +-
 .../samples/binding-await-catch/errors.json   |   5 +-
 .../samples/binding-await-then-2/errors.json  |   5 +-
 .../samples/binding-await-then/errors.json    |   5 +-
 .../samples/binding-const/errors.json         |   9 +-
 .../binding-dimensions-svg-child/errors.json  |   9 +-
 .../binding-dimensions-svg/errors.json        |   9 +-
 .../binding-dimensions-void/errors.json       |   9 +-
 .../samples/binding-input-checked/errors.json |  11 +-
 .../binding-input-type-boolean/errors.json    |  11 +-
 .../binding-input-type-dynamic/errors.json    |  11 +-
 .../errors.json                               |   7 +-
 .../binding-invalid-on-element/errors.json    |   9 +-
 .../binding-invalid-value-global/errors.json  |   7 +-
 .../samples/binding-invalid-value/errors.json |   9 +-
 .../samples/binding-invalid/errors.json       |   9 +-
 .../validator/samples/binding-let/errors.json |   9 +-
 .../errors.json                               |  11 +-
 .../samples/component-dynamic/warnings.json   |   9 -
 .../errors.json                               |   9 +-
 .../errors.json                               |   5 +-
 .../component-name-lowercase/warnings.json    |   3 -
 .../errors.json                               |   5 +-
 .../errors.json                               |  11 +-
 .../errors.json                               |  11 +-
 .../component-slot-dynamic/errors.json        |  11 +-
 .../errors.json                               |   5 +-
 .../errors.json                               |   5 +-
 .../component-slotted-each-block/errors.json  |  11 +-
 .../component-slotted-if-block/errors.json    |  11 +-
 .../samples/const-tag-conflict-1/errors.json  |   5 +-
 .../samples/const-tag-conflict-2/errors.json  |   5 +-
 .../samples/const-tag-cyclical/errors.json    |   5 +-
 .../const-tag-out-of-scope/warnings.json      |   3 -
 .../samples/const-tag-placement-1/errors.json |   5 +-
 .../samples/const-tag-placement-2/errors.json |   5 +-
 .../samples/const-tag-readonly-1/errors.json  |   5 +-
 .../samples/const-tag-readonly-2/errors.json  |   5 +-
 .../contenteditable-dynamic/errors.json       |  11 +-
 .../contenteditable-missing/errors.json       |  11 +-
 .../errors.json                               |   5 +-
 .../errors.json                               |   5 +-
 .../errors.json                               |   5 +-
 .../errors.json                               |   5 +-
 .../errors.json                               |   9 +-
 .../errors.json                               |   9 +-
 .../css-invalid-global-placement/errors.json  |  11 +-
 .../css-invalid-global-selector-2/errors.json |   9 +-
 .../css-invalid-global-selector-3/errors.json |   9 +-
 .../css-invalid-global-selector-4/errors.json |   9 +-
 .../css-invalid-global-selector-5/errors.json |   9 +-
 .../css-invalid-global-selector-6/errors.json |   9 +-
 .../css-invalid-global-selector/errors.json   |   9 +-
 .../samples/debug-invalid-args/errors.json    |  11 +-
 .../errors.json                               |   7 +-
 .../errors.json                               |   7 +-
 .../samples/default-export/errors.json        |   7 +-
 .../directive-non-expression/errors.json      |   9 +-
 .../errors.json                               |   9 +-
 .../errors.json                               |   9 +-
 .../dollar-global-in-markup/errors.json       |   9 +-
 .../dollar-global-in-script/errors.json       |   9 +-
 .../dynamic-element-invalid-tag/errors.json   |   9 +-
 .../dynamic-element-missing-tag/errors.json   |   9 +-
 .../samples/dynamic-element-this/errors.json  |   9 +-
 .../errors.json                               |   7 +-
 .../errors.json                               |   9 +-
 .../errors.json                               |  11 +-
 .../each-block-invalid-context/errors.json    |  11 +-
 .../samples/empty-block/warnings.json         |  20 +-
 .../samples/error-mode-warn/warnings.json     |  15 +-
 .../errors.json                               |   9 +-
 .../errors.json                               |   9 +-
 .../event-modifiers-invalid/errors.json       |   9 +-
 .../event-modifiers-legacy/errors.json        |   9 +-
 .../event-modifiers-redundant/warnings.json   |  18 +-
 .../html-block-in-attribute/errors.json       |   5 +-
 .../html-block-in-textarea/errors.json        |   5 +-
 .../samples/ignore-warning/warnings.json      |   8 +-
 .../ignore-warnings-cumulative/warnings.json  |   5 +-
 .../ignore-warnings-newline/warnings.json     |   5 +-
 .../ignore-warnings-stacked/warnings.json     |   5 +-
 .../samples/ignore-warnings/warnings.json     |   5 +-
 .../illegal-variable-declaration/errors.json  |   9 +-
 .../invalid-empty-css-declaration/errors.json |  12 +-
 .../logic-block-in-attribute/errors.json      |   5 +-
 .../logic-block-in-textarea/errors.json       |   5 +-
 .../missing-component-global/warnings.json    |  11 +-
 .../samples/missing-component/warnings.json   |  11 +-
 .../warnings.json                             |   3 -
 .../warnings.json                             |   5 +-
 .../errors.json                               |   9 +-
 .../errors.json                               |   9 +-
 .../namespace-invalid-unguessable/errors.json |   7 +-
 .../samples/namespace-invalid/errors.json     |   7 +-
 .../samples/namespace-non-literal/errors.json |   7 +-
 .../reactive-declaration-cyclical/errors.json |   5 +-
 .../warnings.json                             |   5 +-
 .../reactive-module-variable/warnings.json    |   3 -
 .../ref-not-supported-in-css/errors.json      |   9 +-
 .../samples/ref-not-supported/errors.json     |   9 +-
 .../rest-eachblock-binding-2/warnings.json    |   5 +-
 .../rest-eachblock-binding-3/warnings.json    |   5 +-
 .../rest-eachblock-binding/warnings.json      |   5 +-
 .../script-invalid-context/errors.json        |   9 +-
 .../warnings.json                             |  54 ------
 .../slot-attribute-invalid/errors.json        |   9 +-
 .../samples/slot-warning/warnings.json        |   5 +-
 .../samples/slot-warning2/warnings.json       |   5 +-
 .../errors.json                               |   9 +-
 .../svelte-fragment-placement-2/errors.json   |   5 +-
 .../svelte-fragment-placement/errors.json     |   5 +-
 .../warnings.json                             |  27 ++-
 .../validator/samples/tag-invalid/errors.json |   9 +-
 .../samples/tag-non-string/errors.json        |   9 +-
 .../textarea-value-children/errors.json       |  11 +-
 .../samples/title-no-attributes/errors.json   |  11 +-
 .../samples/title-no-children/errors.json     |  11 +-
 .../errors.json                               |  11 +-
 .../transition-duplicate-in/errors.json       |  11 +-
 .../errors.json                               |  11 +-
 .../transition-duplicate-out/errors.json      |  11 +-
 .../errors.json                               |  11 +-
 .../errors.json                               |  11 +-
 .../errors.json                               |  11 +-
 .../samples/transition-missing/warnings.json  |  11 +-
 .../transition-on-component/errors.json       |  11 +-
 .../undefined-value-global/warnings.json      |   7 +-
 .../samples/undefined-value/warnings.json     |   9 +-
 .../unreferenced-variables-each/warnings.json |   6 -
 .../unreferenced-variables/warnings.json      |  15 --
 .../samples/use-the-platform/warnings.json    |   6 -
 .../errors.json                               |  11 +-
 .../window-binding-invalid-value/errors.json  |  11 +-
 .../window-binding-invalid-width/errors.json  |  11 +-
 .../window-binding-invalid/errors.json        |  11 +-
 192 files changed, 743 insertions(+), 1775 deletions(-)

diff --git a/test/validator/index.ts b/test/validator/index.ts
index e58be87a3a..fce5ed7065 100644
--- a/test/validator/index.ts
+++ b/test/validator/index.ts
@@ -33,13 +33,15 @@ describe('validate', () => {
 					...options
 				});
 
-				assert.deepEqual(warnings.map(w => ({
-					code: w.code,
-					message: w.message,
-					pos: w.pos,
-					start: w.start,
-					end: w.end
-				})), expected_warnings);
+				assert.deepEqual(
+					warnings.map((w) => ({
+						code: w.code,
+						message: w.message,
+						start: { line: w.start.line, column: w.start.column },
+						end: { line: w.end.line, column: w.end.column }
+					})),
+					expected_warnings
+				);
 			} catch (e) {
 				error = e;
 			}
@@ -56,13 +58,17 @@ describe('validate', () => {
 				}
 
 				try {
-					assert.equal(error.code, expected.code);
-					assert.equal(error.message, expected.message);
-					assert.deepEqual(error.start, expected.start);
-					assert.deepEqual(error.end, expected.end);
-					assert.equal(error.pos, expected.pos);
+					assert.deepEqual(
+						{
+							code: error.code,
+							message: error.message,
+							start: { line: error.start.line, column: error.start.column },
+							end: { line: error.end.line, column: error.end.column }
+						},
+						expected
+					);
 				} catch (e) {
-					console.error(error); // eslint-disable-line no-console
+					console.error(error);
 					throw e;
 				}
 			}
@@ -78,6 +84,51 @@ describe('validate', () => {
 		}, /options\.name must be a valid identifier/);
 	});
 
+	it('check warning position', () => {
+		const { warnings } = svelte.compile('\n  <img \n src="foo.jpg">\n', {
+			generate: false
+		});
+
+		assert.deepEqual(
+			warnings.map((w) => {
+				return {
+					code: w.code,
+					frame: w.frame,
+					message: w.message,
+					start: {
+						character: w.start.character,
+						column: w.start.column,
+						line: w.start.line
+					},
+					end: {
+						character: w.end.character,
+						column: w.end.column,
+						line: w.end.line
+					},
+					pos: w.pos
+				};
+			}),
+			[
+				{
+					code: 'a11y-missing-attribute',
+					frame: '1: \n2:   <img \n     ^\n3:  src="foo.jpg">\n4: ',
+					message: 'A11y: <img> element should have an alt attribute',
+					start: {
+						character: 3,
+						column: 2,
+						line: 2
+					},
+					end: {
+						character: 24,
+						column: 15,
+						line: 3
+					},
+					pos: 3
+				}
+			]
+		);
+	});
+
 	it('warns if options.name is not capitalised', () => {
 		const { warnings } = svelte.compile('<div></div>', {
 			name: 'lowercase',
diff --git a/test/validator/samples/a11y-alt-text/warnings.json b/test/validator/samples/a11y-alt-text/warnings.json
index 7ce5fb2d8f..904288c45c 100644
--- a/test/validator/samples/a11y-alt-text/warnings.json
+++ b/test/validator/samples/a11y-alt-text/warnings.json
@@ -4,62 +4,47 @@
 		"message": "A11y: <img> element should have an alt attribute",
 		"start": {
 			"line": 1,
-			"column": 0,
-			"character": 0
+			"column": 0
 		},
 		"end": {
 			"line": 1,
-			"column": 19,
-			"character": 19
-		},
-		"pos": 0
+			"column": 19
+		}
 	},
-
 	{
 		"code": "a11y-missing-attribute",
 		"message": "A11y: <area> element should have an alt, aria-label or aria-labelledby attribute",
 		"start": {
 			"line": 4,
-			"column": 1,
-			"character": 28
+			"column": 1
 		},
 		"end": {
 			"line": 4,
-			"column": 7,
-			"character": 34
-		},
-		"pos": 28
+			"column": 7
+		}
 	},
-
 	{
 		"code": "a11y-missing-attribute",
 		"message": "A11y: <object> element should have a title, aria-label or aria-labelledby attribute",
 		"start": {
 			"line": 7,
-			"column": 0,
-			"character": 43
+			"column": 0
 		},
 		"end": {
 			"line": 7,
-			"column": 17,
-			"character": 60
-		},
-		"pos": 43
+			"column": 17
+		}
 	},
-
 	{
 		"code": "a11y-missing-attribute",
 		"message": "A11y: <input type=\"image\"> element should have an alt, aria-label or aria-labelledby attribute",
 		"start": {
 			"line": 9,
-			"column": 0,
-			"character": 62
+			"column": 0
 		},
 		"end": {
 			"line": 9,
-			"column": 20,
-			"character": 82
-		},
-		"pos": 62
+			"column": 20
+		}
 	}
 ]
diff --git a/test/validator/samples/a11y-anchor-has-content/warnings.json b/test/validator/samples/a11y-anchor-has-content/warnings.json
index 8708311f3c..e5e0a5a48c 100644
--- a/test/validator/samples/a11y-anchor-has-content/warnings.json
+++ b/test/validator/samples/a11y-anchor-has-content/warnings.json
@@ -3,13 +3,10 @@
 	"message": "A11y: <a> element should have child content",
 	"start": {
 		"line": 1,
-		"column": 0,
-		"character": 0
+		"column": 0
 	},
 	"end": {
 		"line": 1,
-		"column": 19,
-		"character": 19
-	},
-	"pos": 0
-}]
\ No newline at end of file
+		"column": 19
+	}
+}]
diff --git a/test/validator/samples/a11y-anchor-in-svg-is-valid/warnings.json b/test/validator/samples/a11y-anchor-in-svg-is-valid/warnings.json
index eb62ce8db6..0ca16767d7 100644
--- a/test/validator/samples/a11y-anchor-in-svg-is-valid/warnings.json
+++ b/test/validator/samples/a11y-anchor-in-svg-is-valid/warnings.json
@@ -4,44 +4,35 @@
 		"message": "A11y: <a> element should have an href attribute",
 		"start": {
 			"line": 1,
-			"column": 11,
-			"character": 11
+			"column": 11
 		},
 		"end": {
 			"line": 1,
-			"column": 37,
-			"character": 37
-		},
-		"pos": 11
+			"column": 37
+		}
 	},
 	{
 		"code": "a11y-invalid-attribute",
 		"message": "A11y: '' is not a valid xlink:href attribute",
 		"start": {
 			"line": 2,
-			"column": 14,
-			"character": 65
+			"column": 14
 		},
 		"end": {
 			"line": 2,
-			"column": 27,
-			"character": 78
-		},
-		"pos": 65
+			"column": 27
+		}
 	},
 	{
 		"code": "a11y-invalid-attribute",
 		"message": "A11y: '#' is not a valid xlink:href attribute",
 		"start": {
 			"line": 3,
-			"column": 14,
-			"character": 130
+			"column": 14
 		},
 		"end": {
 			"line": 3,
-			"column": 28,
-			"character": 144
-		},
-		"pos": 130
+			"column": 28
+		}
 	}
 ]
diff --git a/test/validator/samples/a11y-anchor-is-valid/warnings.json b/test/validator/samples/a11y-anchor-is-valid/warnings.json
index f04c6f1593..50d19ae630 100644
--- a/test/validator/samples/a11y-anchor-is-valid/warnings.json
+++ b/test/validator/samples/a11y-anchor-is-valid/warnings.json
@@ -4,89 +4,71 @@
 		"message": "A11y: <a> element should have an href attribute",
 		"start": {
 			"line": 1,
-			"column": 0,
-			"character": 0
+			"column": 0
 		},
 		"end": {
 			"line": 1,
-			"column": 26,
-			"character": 26
-		},
-		"pos": 0
+			"column": 26
+		}
 	},
 	{
 		"code": "a11y-invalid-attribute",
 		"message": "A11y: '' is not a valid href attribute",
 		"start": {
 			"line": 2,
-			"column": 3,
-			"character": 30
+			"column": 3
 		},
 		"end": {
 			"line": 2,
-			"column": 10,
-			"character": 37
-		},
-		"pos": 30
+			"column": 10
+		}
 	},
 	{
 		"code": "a11y-invalid-attribute",
 		"message": "A11y: '#' is not a valid href attribute",
 		"start": {
 			"line": 3,
-			"column": 3,
-			"character": 53
+			"column": 3
 		},
 		"end": {
 			"line": 3,
-			"column": 11,
-			"character": 61
-		},
-		"pos": 53
+			"column": 11
+		}
 	},
 	{
 		"code": "a11y-invalid-attribute",
 		"message": "A11y: 'javascript:void(0)' is not a valid href attribute",
 		"start": {
 			"line": 4,
-			"column": 3,
-			"character": 77
+			"column": 3
 		},
 		"end": {
 			"line": 4,
-			"column": 28,
-			"character": 102
-		},
-		"pos": 77
+			"column": 28
+		}
 	},
 	{
 		"code": "a11y-missing-attribute",
 		"message": "A11y: <a> element should have an href attribute",
 		"start": {
 			"line": 5,
-			"column": 0,
-			"character": 115
+			"column": 0
 		},
 		"end": {
 			"line": 5,
-			"column": 22,
-			"character": 137
-		},
-		"pos": 115
+			"column": 22
+		}
 	},
 	{
 		"code": "a11y-missing-attribute",
 		"message": "A11y: <a> element should have an href attribute",
 		"start": {
 			"line": 6,
-			"column": 0,
-			"character": 138
+			"column": 0
 		},
 		"end": {
 			"line": 6,
-			"column": 20,
-			"character": 158
-		},
-		"pos": 138
+			"column": 20
+		}
 	}
 ]
diff --git a/test/validator/samples/a11y-aria-activedescendant/warnings.json b/test/validator/samples/a11y-aria-activedescendant/warnings.json
index 8749c1c125..57288f188f 100644
--- a/test/validator/samples/a11y-aria-activedescendant/warnings.json
+++ b/test/validator/samples/a11y-aria-activedescendant/warnings.json
@@ -2,14 +2,11 @@
   {
     "code": "a11y-aria-activedescendant-has-tabindex",
     "end": {
-      "character": 568,
       "column": 36,
       "line": 16
     },
     "message": "A11y: Elements with attribute aria-activedescendant should have tabindex value",
-    "pos": 537,
     "start": {
-      "character": 537,
       "column": 5,
       "line": 16
     }
diff --git a/test/validator/samples/a11y-aria-props/warnings.json b/test/validator/samples/a11y-aria-props/warnings.json
index 73d34fc589..f357429f62 100644
--- a/test/validator/samples/a11y-aria-props/warnings.json
+++ b/test/validator/samples/a11y-aria-props/warnings.json
@@ -4,30 +4,23 @@
 		"message": "A11y: Unknown aria attribute 'aria-labeledby' (did you mean 'labelledby'?)",
 		"start": {
 			"line": 1,
-			"column": 20,
-			"character": 20
+			"column": 20
 		},
 		"end": {
 			"line": 1,
-			"column": 40,
-			"character": 40
-		},
-		"pos": 20
+			"column": 40
+		}
 	},
-
 	{
 		"code": "a11y-missing-attribute",
 		"message": "A11y: <input type=\"image\"> element should have an alt, aria-label or aria-labelledby attribute",
 		"start": {
 			"column": 0,
-			"line": 1,
-			"character": 0
+			"line": 1
 		},
 		"end": {
 			"line": 1,
-			"column": 41,
-			"character": 41
-		},
-		"pos": 0
+			"column": 41
+		}
 	}
 ]
diff --git a/test/validator/samples/a11y-aria-proptypes-boolean/warnings.json b/test/validator/samples/a11y-aria-proptypes-boolean/warnings.json
index b43697b64d..eadd4314bb 100644
--- a/test/validator/samples/a11y-aria-proptypes-boolean/warnings.json
+++ b/test/validator/samples/a11y-aria-proptypes-boolean/warnings.json
@@ -4,29 +4,23 @@
     "message": "A11y: The value of 'aria-disabled' must be exactly one of true or false",
     "start": {
       "line": 5,
-      "column": 8,
-      "character": 51
+      "column": 8
     },
     "end": {
       "line": 5,
-      "column": 27,
-      "character": 70
-    },
-    "pos": 51
+      "column": 27
+    }
   },
   {
     "code": "a11y-incorrect-aria-attribute-type",
     "message": "A11y: The value of 'aria-disabled' must be exactly one of true or false",
     "start": {
       "line": 6,
-      "column": 8,
-      "character": 81
+      "column": 8
     },
     "end": {
       "line": 6,
-      "column": 26,
-      "character": 99
-    },
-    "pos": 81
+      "column": 26
+    }
   }
-]
\ No newline at end of file
+]
diff --git a/test/validator/samples/a11y-aria-proptypes-integer/warnings.json b/test/validator/samples/a11y-aria-proptypes-integer/warnings.json
index e4c37df493..f894174368 100644
--- a/test/validator/samples/a11y-aria-proptypes-integer/warnings.json
+++ b/test/validator/samples/a11y-aria-proptypes-integer/warnings.json
@@ -4,44 +4,35 @@
     "message": "A11y: The value of 'aria-level' must be of type integer",
     "start": {
       "line": 1,
-      "column": 5,
-      "character": 5
+      "column": 5
     },
     "end": {
       "line": 1,
-      "column": 21,
-      "character": 21
-    },
-    "pos": 5
+      "column": 21
+    }
   },
   {
     "code": "a11y-incorrect-aria-attribute-type",
     "message": "A11y: The value of 'aria-level' must be of type integer",
     "start": {
       "line": 2,
-      "column": 5,
-      "character": 30
+      "column": 5
     },
     "end": {
       "line": 2,
-      "column": 20,
-      "character": 45
-    },
-    "pos": 30
+      "column": 20
+    }
   },
   {
     "code": "a11y-incorrect-aria-attribute-type",
     "message": "A11y: The value of 'aria-level' must be of type integer",
     "start": {
       "line": 5,
-      "column": 5,
-      "character": 107
+      "column": 5
     },
     "end": {
       "line": 5,
-      "column": 15,
-      "character": 117
-    },
-    "pos": 107
+      "column": 15
+    }
   }
-]
\ No newline at end of file
+]
diff --git a/test/validator/samples/a11y-aria-proptypes-number/warnings.json b/test/validator/samples/a11y-aria-proptypes-number/warnings.json
index 93c64cb97b..e28a43df37 100644
--- a/test/validator/samples/a11y-aria-proptypes-number/warnings.json
+++ b/test/validator/samples/a11y-aria-proptypes-number/warnings.json
@@ -1,47 +1,38 @@
 [
-  {
-    "code": "a11y-incorrect-aria-attribute-type",
-    "message": "A11y: The value of 'aria-valuemax' must be of type number",
-    "start": {
-      "line": 1,
-      "column": 5,
-      "character": 5
-    },
-    "end": {
-      "line": 1,
-      "column": 24,
-      "character": 24
-    },
-    "pos": 5
-  },
-  {
-    "code": "a11y-incorrect-aria-attribute-type",
-    "message": "A11y: The value of 'aria-valuemax' must be of type number",
-    "start": {
-      "line": 2,
-      "column": 5,
-      "character": 33
-    },
-    "end": {
-      "line": 2,
-      "column": 23,
-      "character": 51
-    },
-    "pos": 33
-  },
-  {
-    "code": "a11y-incorrect-aria-attribute-type",
-    "message": "A11y: The value of 'aria-valuemax' must be of type number",
-    "start": {
-      "line": 5,
-      "column": 5,
-      "character": 119
-    },
-    "end": {
-      "line": 5,
-      "column": 18,
-      "character": 132
-    },
-    "pos": 119
-  }
-]
\ No newline at end of file
+	{
+		"code": "a11y-incorrect-aria-attribute-type",
+		"message": "A11y: The value of 'aria-valuemax' must be of type number",
+		"start": {
+			"line": 1,
+			"column": 5
+		},
+		"end": {
+			"line": 1,
+			"column": 24
+		}
+	},
+	{
+		"code": "a11y-incorrect-aria-attribute-type",
+		"message": "A11y: The value of 'aria-valuemax' must be of type number",
+		"start": {
+			"line": 2,
+			"column": 5
+		},
+		"end": {
+			"line": 2,
+			"column": 23
+		}
+	},
+	{
+		"code": "a11y-incorrect-aria-attribute-type",
+		"message": "A11y: The value of 'aria-valuemax' must be of type number",
+		"start": {
+			"line": 5,
+			"column": 5
+		},
+		"end": {
+			"line": 5,
+			"column": 18
+		}
+	}
+]
diff --git a/test/validator/samples/a11y-aria-proptypes-string/warnings.json b/test/validator/samples/a11y-aria-proptypes-string/warnings.json
index f83eb895a4..2dd8f2509f 100644
--- a/test/validator/samples/a11y-aria-proptypes-string/warnings.json
+++ b/test/validator/samples/a11y-aria-proptypes-string/warnings.json
@@ -1,17 +1,14 @@
 [
-  {
-    "code": "a11y-incorrect-aria-attribute-type",
-    "message": "A11y: The value of 'aria-label' must be of type string",
-    "start": {
-      "line": 1,
-      "column": 5,
-      "character": 5
-    },
-    "end": {
-      "line": 1,
-      "column": 15,
-      "character": 15
-    },
-    "pos": 5
-  }
-]
\ No newline at end of file
+	{
+		"code": "a11y-incorrect-aria-attribute-type",
+		"message": "A11y: The value of 'aria-label' must be of type string",
+		"start": {
+			"line": 1,
+			"column": 5
+		},
+		"end": {
+			"line": 1,
+			"column": 15
+		}
+	}
+]
diff --git a/test/validator/samples/a11y-aria-proptypes-token/warnings.json b/test/validator/samples/a11y-aria-proptypes-token/warnings.json
index 168fc70434..b07838dde4 100644
--- a/test/validator/samples/a11y-aria-proptypes-token/warnings.json
+++ b/test/validator/samples/a11y-aria-proptypes-token/warnings.json
@@ -4,59 +4,47 @@
     "message": "A11y: The value of 'aria-sort' must be exactly one of ascending, descending, none, other",
     "start": {
       "line": 1,
-      "column": 5,
-      "character": 5
+      "column": 5
     },
     "end": {
       "line": 1,
-      "column": 17,
-      "character": 17
-    },
-    "pos": 5
+      "column": 17
+    }
   },
   {
     "code": "a11y-incorrect-aria-attribute-type",
     "message": "A11y: The value of 'aria-sort' must be exactly one of ascending, descending, none, other",
     "start": {
       "line": 2,
-      "column": 5,
-      "character": 26
+      "column": 5
     },
     "end": {
       "line": 2,
-      "column": 26,
-      "character": 47
-    },
-    "pos": 26
+      "column": 26
+    }
   },
   {
     "code": "a11y-incorrect-aria-attribute-type",
     "message": "A11y: The value of 'aria-sort' must be exactly one of ascending, descending, none, other",
     "start": {
       "line": 3,
-      "column": 5,
-      "character": 56
+      "column": 5
     },
     "end": {
       "line": 3,
-      "column": 14,
-      "character": 65
-    },
-    "pos": 56
+      "column": 14
+    }
   },
   {
     "code": "a11y-incorrect-aria-attribute-type",
     "message": "A11y: The value of 'aria-sort' must be exactly one of ascending, descending, none, other",
     "start": {
       "line": 6,
-      "column": 5,
-      "character": 127
+      "column": 5
     },
     "end": {
       "line": 6,
-      "column": 37,
-      "character": 159
-    },
-    "pos": 127
+      "column": 37
+    }
   }
-]
\ No newline at end of file
+]
diff --git a/test/validator/samples/a11y-aria-proptypes-tokenlist/warnings.json b/test/validator/samples/a11y-aria-proptypes-tokenlist/warnings.json
index 959f1821a5..43159dafcd 100644
--- a/test/validator/samples/a11y-aria-proptypes-tokenlist/warnings.json
+++ b/test/validator/samples/a11y-aria-proptypes-tokenlist/warnings.json
@@ -4,74 +4,59 @@
     "message": "A11y: The value of 'aria-relevant' must be a space-separated list of one or more of additions, all, removals, text",
     "start": {
       "line": 1,
-      "column": 5,
-      "character": 5
+      "column": 5
     },
     "end": {
       "line": 1,
-      "column": 21,
-      "character": 21
-    },
-    "pos": 5
+      "column": 21
+    }
   },
   {
     "code": "a11y-incorrect-aria-attribute-type",
     "message": "A11y: The value of 'aria-relevant' must be a space-separated list of one or more of additions, all, removals, text",
     "start": {
       "line": 2,
-      "column": 5,
-      "character": 30
+      "column": 5
     },
     "end": {
       "line": 2,
-      "column": 27,
-      "character": 52
-    },
-    "pos": 30
+      "column": 27
+    }
   },
   {
     "code": "a11y-incorrect-aria-attribute-type",
     "message": "A11y: The value of 'aria-relevant' must be a space-separated list of one or more of additions, all, removals, text",
     "start": {
       "line": 3,
-      "column": 5,
-      "character": 61
+      "column": 5
     },
     "end": {
       "line": 3,
-      "column": 18,
-      "character": 74
-    },
-    "pos": 61
+      "column": 18
+    }
   },
   {
     "code": "a11y-incorrect-aria-attribute-type",
     "message": "A11y: The value of 'aria-relevant' must be a space-separated list of one or more of additions, all, removals, text",
     "start": {
       "line": 6,
-      "column": 5,
-      "character": 144
+      "column": 5
     },
     "end": {
       "line": 6,
-      "column": 40,
-      "character": 179
-    },
-    "pos": 144
+      "column": 40
+    }
   },
   {
     "code": "a11y-incorrect-aria-attribute-type",
     "message": "A11y: The value of 'aria-relevant' must be a space-separated list of one or more of additions, all, removals, text",
     "start": {
       "line": 7,
-      "column": 5,
-      "character": 188
+      "column": 5
     },
     "end": {
       "line": 7,
-      "column": 41,
-      "character": 224
-    },
-    "pos": 188
+      "column": 41
+    }
   }
-]
\ No newline at end of file
+]
diff --git a/test/validator/samples/a11y-aria-proptypes-tristate/warnings.json b/test/validator/samples/a11y-aria-proptypes-tristate/warnings.json
index a8ff8fd3a1..3711efa22b 100644
--- a/test/validator/samples/a11y-aria-proptypes-tristate/warnings.json
+++ b/test/validator/samples/a11y-aria-proptypes-tristate/warnings.json
@@ -4,29 +4,23 @@
     "message": "A11y: The value of 'aria-checked' must be exactly one of true, false, or mixed",
     "start": {
       "line": 5,
-      "column": 5,
-      "character": 48
+      "column": 5
     },
     "end": {
       "line": 5,
-      "column": 23,
-      "character": 66
-    },
-    "pos": 48
+      "column": 23
+    }
   },
   {
     "code": "a11y-incorrect-aria-attribute-type",
     "message": "A11y: The value of 'aria-checked' must be exactly one of true, false, or mixed",
     "start": {
       "line": 6,
-      "column": 5,
-      "character": 75
+      "column": 5
     },
     "end": {
       "line": 6,
-      "column": 22,
-      "character": 92
-    },
-    "pos": 75
+      "column": 22
+    }
   }
-]
\ No newline at end of file
+]
diff --git a/test/validator/samples/a11y-aria-role/warnings.json b/test/validator/samples/a11y-aria-role/warnings.json
index 2943f232f8..49581ac003 100644
--- a/test/validator/samples/a11y-aria-role/warnings.json
+++ b/test/validator/samples/a11y-aria-role/warnings.json
@@ -4,29 +4,23 @@
 		"message": "A11y: Unknown role 'toooltip' (did you mean 'tooltip'?)",
 		"start": {
 			"line": 6,
-			"column": 5,
-			"character": 101
+			"column": 5
 		},
 		"end": {
 			"line": 6,
-			"column": 20,
-			"character": 116
-		},
-		"pos": 101
+			"column": 20
+		}
 	},
 	{
 		"code": "a11y-unknown-role",
 		"message": "A11y: Unknown role 'toooltip' (did you mean 'tooltip'?)",
 		"start": {
 			"line": 7,
-			"column": 5,
-			"character": 129
+			"column": 5
 		},
 		"end": {
 			"line": 7,
-			"column": 27,
-			"character": 151
-		},
-		"pos": 129
+			"column": 27
+		}
 	}
 ]
diff --git a/test/validator/samples/a11y-aria-unsupported-element/warnings.json b/test/validator/samples/a11y-aria-unsupported-element/warnings.json
index 4597e3e868..04891378b0 100644
--- a/test/validator/samples/a11y-aria-unsupported-element/warnings.json
+++ b/test/validator/samples/a11y-aria-unsupported-element/warnings.json
@@ -4,30 +4,23 @@
 		"message": "A11y: <meta> should not have aria-* attributes",
 		"start": {
 			"line": 1,
-			"column": 6,
-			"character": 6
+			"column": 6
 		},
 		"end": {
 			"line": 1,
-			"column": 25,
-			"character": 25
-		},
-		"pos": 6
+			"column": 25
+		}
 	},
-
 	{
 		"code": "a11y-misplaced-role",
 		"message": "A11y: <meta> should not have role attribute",
 		"start": {
 			"line": 2,
-			"column": 6,
-			"character": 33
+			"column": 6
 		},
 		"end": {
 			"line": 2,
-			"column": 20,
-			"character": 47
-		},
-		"pos": 33
+			"column": 20
+		}
 	}
 ]
diff --git a/test/validator/samples/a11y-click-events-have-key-events/warnings.json b/test/validator/samples/a11y-click-events-have-key-events/warnings.json
index 220f8377a3..904c733a99 100644
--- a/test/validator/samples/a11y-click-events-have-key-events/warnings.json
+++ b/test/validator/samples/a11y-click-events-have-key-events/warnings.json
@@ -4,104 +4,83 @@
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
 			"line": 12,
-			"column": 0,
-			"character": 190
+			"column": 0
 		},
 		"end": {
 			"line": 12,
-			"column": 23,
-			"character": 213
-		},
-		"pos": 190
+			"column": 23
+		}
 	},
 	{
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
 			"line": 13,
-			"column": 0,
-			"character": 214
+			"column": 0
 		},
 		"end": {
 			"line": 13,
-			"column": 43,
-			"character": 257
-		},
-		"pos": 214
+			"column": 43
+		}
 	},
 	{
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
 			"line": 15,
-			"column": 0,
-			"character": 259
+			"column": 0
 		},
 		"end": {
 			"line": 15,
-			"column": 27,
-			"character": 286
-		},
-		"pos": 259
+			"column": 27
+		}
 	},
 	{
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
 			"line": 16,
-			"column": 0,
-			"character": 287
+			"column": 0
 		},
 		"end": {
 			"line": 16,
-			"column": 24,
-			"character": 311
-		},
-		"pos": 287
+			"column": 24
+		}
 	},
 	{
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
 			"line": 17,
-			"column": 0,
-			"character": 312
+			"column": 0
 		},
 		"end": {
 			"line": 17,
-			"column": 27,
-			"character": 339
-		},
-		"pos": 312
+			"column": 27
+		}
 	},
 	{
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
 			"line": 18,
-			"column": 0,
-			"character": 340
+			"column": 0
 		},
 		"end": {
 			"line": 18,
-			"column": 26,
-			"character": 366
-		},
-		"pos": 340
+			"column": 26
+		}
 	},
 	{
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
 			"line": 19,
-			"column": 0,
-			"character": 367
+			"column": 0
 		},
 		"end": {
 			"line": 19,
-			"column": 26,
-			"character": 393
-		},
-		"pos": 367
+			"column": 26
+		}
 	}
 ]
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 dd2a915b9d..b4bd522c40 100644
--- a/test/validator/samples/a11y-contenteditable-element-without-child/errors.json
+++ b/test/validator/samples/a11y-contenteditable-element-without-child/errors.json
@@ -4,14 +4,11 @@
 		"message": "'contenteditable' attribute is required for textContent and innerHTML two-way bindings",
 		"start": {
 			"line": 6,
-			"column": 3,
-			"character": 157
+			"column": 3
 		},
 		"end": {
 			"line": 6,
-			"column": 24,
-			"character": 178
-		},
-		"pos": 157
+			"column": 24
+		}
 	}
 ]
diff --git a/test/validator/samples/a11y-figcaption-wrong-place/warnings.json b/test/validator/samples/a11y-figcaption-wrong-place/warnings.json
index eba5b6f31e..c9cac1daf9 100644
--- a/test/validator/samples/a11y-figcaption-wrong-place/warnings.json
+++ b/test/validator/samples/a11y-figcaption-wrong-place/warnings.json
@@ -4,29 +4,23 @@
 		"message": "A11y: <figcaption> must be first or last child of <figure>",
 		"start": {
 			"line": 4,
-			"column": 1,
-			"character": 44
+			"column": 1
 		},
 		"end": {
 			"line": 6,
-			"column": 14,
-			"character": 102
-		},
-		"pos": 44
+			"column": 14
+		}
 	},
 	{
 		"code": "a11y-structure",
 		"message": "A11y: <figcaption> must be an immediate child of <figure>",
 		"start": {
 			"line": 15,
-			"column": 2,
-			"character": 226
+			"column": 2
 		},
 		"end": {
 			"line": 17,
-			"column": 15,
-			"character": 302
-		},
-		"pos": 226
+			"column": 15
+		}
 	}
 ]
diff --git a/test/validator/samples/a11y-heading-has-content/warnings.json b/test/validator/samples/a11y-heading-has-content/warnings.json
index 9cb77adc02..ad5f5d4033 100644
--- a/test/validator/samples/a11y-heading-has-content/warnings.json
+++ b/test/validator/samples/a11y-heading-has-content/warnings.json
@@ -4,30 +4,23 @@
 		"message": "A11y: <h1> element should have child content",
 		"start": {
 			"line": 1,
-			"column": 0,
-			"character": 0
+			"column": 0
 		},
 		"end": {
 			"line": 1,
-			"column": 9,
-			"character": 9
-		},
-		"pos": 0
+			"column": 9
+		}
 	},
-
 	{
 		"code": "a11y-hidden",
 		"message": "A11y: <h2> element should not be hidden",
 		"start": {
 			"line": 2,
-			"column": 4,
-			"character": 14
+			"column": 4
 		},
 		"end": {
 			"line": 2,
-			"column": 15,
-			"character": 25
-		},
-		"pos": 14
+			"column": 15
+		}
 	}
 ]
diff --git a/test/validator/samples/a11y-html-has-lang/warnings.json b/test/validator/samples/a11y-html-has-lang/warnings.json
index 2ac8a2e5e0..097e8e88bd 100644
--- a/test/validator/samples/a11y-html-has-lang/warnings.json
+++ b/test/validator/samples/a11y-html-has-lang/warnings.json
@@ -4,14 +4,11 @@
 		"message": "A11y: <html> element should have a lang attribute",
 		"start": {
 			"column": 0,
-			"line": 9,
-			"character": 124
+			"line": 9
 		},
 		"end": {
 			"line": 9,
-			"column": 13,
-			"character": 137
-		},
-		"pos": 124
+			"column": 13
+		}
 	}
 ]
diff --git a/test/validator/samples/a11y-iframe-has-title/warnings.json b/test/validator/samples/a11y-iframe-has-title/warnings.json
index cc80cceaa2..e78523931e 100644
--- a/test/validator/samples/a11y-iframe-has-title/warnings.json
+++ b/test/validator/samples/a11y-iframe-has-title/warnings.json
@@ -4,14 +4,11 @@
 		"message": "A11y: <iframe> element should have a title attribute",
 		"start": {
 			"line": 5,
-			"column": 0,
-			"character": 37
+			"column": 0
 		},
 		"end": {
 			"line": 5,
-			"column": 27,
-			"character": 64
-		},
-		"pos": 37
+			"column": 27
+		}
 	}
 ]
diff --git a/test/validator/samples/a11y-img-redundant-alt/warnings.json b/test/validator/samples/a11y-img-redundant-alt/warnings.json
index 44106c23d0..9ba5a1c96e 100644
--- a/test/validator/samples/a11y-img-redundant-alt/warnings.json
+++ b/test/validator/samples/a11y-img-redundant-alt/warnings.json
@@ -3,45 +3,36 @@
 		"code": "a11y-img-redundant-alt",
 		"message": "A11y: Screenreaders already announce <img> elements as an image.",
 		"end": {
-			"character": 173,
 			"column": 49,
 			"line": 3
 		},
 		"start": {
-			"character": 124,
 			"column": 0,
 			"line": 3
-		},
-		"pos": 124
+		}
 	},
 	{
 		"code": "a11y-img-redundant-alt",
 		"message": "A11y: Screenreaders already announce <img> elements as an image.",
 		"end": {
-			"character": 219,
 			"column": 45,
 			"line": 4
 		},
 		"start": {
-			"character": 174,
 			"column": 0,
 			"line": 4
-		},
-		"pos": 174
+		}
 	},
 	{
 		"code": "a11y-img-redundant-alt",
 		"message": "A11y: Screenreaders already announce <img> elements as an image.",
 		"end": {
-			"character": 272,
 			"column": 52,
 			"line": 5
 		},
 		"start": {
-			"character": 220,
 			"column": 0,
 			"line": 5
-		},
-		"pos": 220
+		}
 	}
-]
\ No newline at end of file
+]
diff --git a/test/validator/samples/a11y-label-has-associated-control/warnings.json b/test/validator/samples/a11y-label-has-associated-control/warnings.json
index f618e16973..4bbaf6c6c2 100644
--- a/test/validator/samples/a11y-label-has-associated-control/warnings.json
+++ b/test/validator/samples/a11y-label-has-associated-control/warnings.json
@@ -2,14 +2,11 @@
 	{
 		"code": "a11y-label-has-associated-control",
 		"end": {
-			"character": 82,
 			"column": 16,
 			"line": 5
 		},
 		"message": "A11y: A form label must be associated with a control.",
-		"pos": 66,
 		"start": {
-			"character": 66,
 			"column": 0,
 			"line": 5
 		}
@@ -17,14 +14,11 @@
 	{
 		"code": "a11y-label-has-associated-control",
 		"end": {
-			"character": 215,
 			"column": 30,
 			"line": 10
 		},
 		"message": "A11y: A form label must be associated with a control.",
-		"pos": 185,
 		"start": {
-			"character": 185,
 			"column": 0,
 			"line": 10
 		}
diff --git a/test/validator/samples/a11y-media-has-caption/warnings.json b/test/validator/samples/a11y-media-has-caption/warnings.json
index 6db618f03c..b1d705c9fb 100644
--- a/test/validator/samples/a11y-media-has-caption/warnings.json
+++ b/test/validator/samples/a11y-media-has-caption/warnings.json
@@ -2,14 +2,11 @@
   {
     "code": "a11y-media-has-caption",
     "end": {
-      "character": 55,
       "column": 15,
       "line": 2
     },
     "message": "A11y: <video> elements must have a <track kind=\"captions\">",
-    "pos": 40,
     "start": {
-      "character": 40,
       "column": 0,
       "line": 2
     }
@@ -17,14 +14,11 @@
   {
     "code": "a11y-media-has-caption",
     "end": {
-      "character": 80,
       "column": 24,
       "line": 3
     },
     "message": "A11y: <video> elements must have a <track kind=\"captions\">",
-    "pos": 56,
     "start": {
-      "character": 56,
       "column": 0,
       "line": 3
     }
@@ -32,14 +26,11 @@
   {
     "code": "a11y-media-has-caption",
     "end": {
-      "character": 124,
       "column": 27,
       "line": 5
     },
     "message": "A11y: <video> elements must have a <track kind=\"captions\">",
-    "pos": 97,
     "start": {
-      "character": 97,
       "column": 0,
       "line": 5
     }
@@ -47,14 +38,11 @@
   {
     "code": "a11y-media-has-caption",
     "end": {
-      "character": 160,
       "column": 35,
       "line": 6
     },
     "message": "A11y: <video> elements must have a <track kind=\"captions\">",
-    "pos": 125,
     "start": {
-      "character": 125,
       "column": 0,
       "line": 6
     }
diff --git a/test/validator/samples/a11y-mouse-events-have-key-events/input.svelte b/test/validator/samples/a11y-mouse-events-have-key-events/input.svelte
index 22de04f38a..ae67bcd307 100644
--- a/test/validator/samples/a11y-mouse-events-have-key-events/input.svelte
+++ b/test/validator/samples/a11y-mouse-events-have-key-events/input.svelte
@@ -3,7 +3,7 @@
 	// Props should be passed down explicitly for rule to pass.
 	const otherProps = {
 		onBlur: () => void 0,
-		onFocus: () => void 0,
+		onFocus: () => void 0
 	};
 </script>
 
diff --git a/test/validator/samples/a11y-mouse-events-have-key-events/warnings.json b/test/validator/samples/a11y-mouse-events-have-key-events/warnings.json
index b3fe15feee..e67a2a718f 100644
--- a/test/validator/samples/a11y-mouse-events-have-key-events/warnings.json
+++ b/test/validator/samples/a11y-mouse-events-have-key-events/warnings.json
@@ -2,14 +2,11 @@
     {
         "code": "a11y-mouse-events-have-key-events",
         "end": {
-            "character": 272,
             "column": 35,
             "line": 10
         },
         "message": "A11y: on:mouseover must be accompanied by on:focus",
-        "pos": 237,
         "start": {
-            "character": 237,
             "column": 0,
             "line": 10
         }
@@ -17,14 +14,11 @@
     {
         "code": "a11y-mouse-events-have-key-events",
         "end": {
-            "character": 384,
             "column": 51,
             "line": 12
         },
         "message": "A11y: on:mouseover must be accompanied by on:focus",
-        "pos": 333,
         "start": {
-            "character": 333,
             "column": 0,
             "line": 12
         }
@@ -32,14 +26,11 @@
     {
         "code": "a11y-mouse-events-have-key-events",
         "end": {
-            "character": 419,
             "column": 34,
             "line": 13
         },
         "message": "A11y: on:mouseout must be accompanied by on:blur",
-        "pos": 385,
         "start": {
-            "character": 385,
             "column": 0,
             "line": 13
         }
@@ -47,16 +38,13 @@
     {
         "code": "a11y-mouse-events-have-key-events",
         "end": {
-            "character": 528,
             "column": 50,
             "line": 15
         },
         "message": "A11y: on:mouseout must be accompanied by on:blur",
-        "pos": 478,
         "start": {
-            "character": 478,
             "column": 0,
             "line": 15
         }
     }
-]
\ No newline at end of file
+]
diff --git a/test/validator/samples/a11y-no-abstract-roles/warnings.json b/test/validator/samples/a11y-no-abstract-roles/warnings.json
index 917522d7ca..c17ae461f9 100644
--- a/test/validator/samples/a11y-no-abstract-roles/warnings.json
+++ b/test/validator/samples/a11y-no-abstract-roles/warnings.json
@@ -2,14 +2,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 19,
 			"column": 19,
 			"line": 1
 		},
 		"message": "A11y: Abstract role 'command' is forbidden",
-		"pos": 5,
 		"start": {
-			"character": 5,
 			"column": 5,
 			"line": 1
 		}
@@ -17,14 +14,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 43,
 			"column": 21,
 			"line": 2
 		},
 		"message": "A11y: Abstract role 'composite' is forbidden",
-		"pos": 27,
 		"start": {
-			"character": 27,
 			"column": 5,
 			"line": 2
 		}
@@ -32,14 +26,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 63,
 			"column": 17,
 			"line": 3
 		},
 		"message": "A11y: Abstract role 'input' is forbidden",
-		"pos": 51,
 		"start": {
-			"character": 51,
 			"column": 5,
 			"line": 3
 		}
@@ -47,14 +38,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 86,
 			"column": 20,
 			"line": 4
 		},
 		"message": "A11y: Abstract role 'landmark' is forbidden",
-		"pos": 71,
 		"start": {
-			"character": 71,
 			"column": 5,
 			"line": 4
 		}
@@ -62,14 +50,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 106,
 			"column": 17,
 			"line": 5
 		},
 		"message": "A11y: Abstract role 'range' is forbidden",
-		"pos": 94,
 		"start": {
-			"character": 94,
 			"column": 5,
 			"line": 5
 		}
@@ -77,14 +62,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 129,
 			"column": 20,
 			"line": 6
 		},
 		"message": "A11y: Abstract role 'roletype' is forbidden",
-		"pos": 114,
 		"start": {
-			"character": 114,
 			"column": 5,
 			"line": 6
 		}
@@ -92,14 +74,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 151,
 			"column": 19,
 			"line": 7
 		},
 		"message": "A11y: Abstract role 'section' is forbidden",
-		"pos": 137,
 		"start": {
-			"character": 137,
 			"column": 5,
 			"line": 7
 		}
@@ -107,14 +86,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 177,
 			"column": 23,
 			"line": 8
 		},
 		"message": "A11y: Abstract role 'sectionhead' is forbidden",
-		"pos": 159,
 		"start": {
-			"character": 159,
 			"column": 5,
 			"line": 8
 		}
@@ -122,14 +98,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 198,
 			"column": 18,
 			"line": 9
 		},
 		"message": "A11y: Abstract role 'select' is forbidden",
-		"pos": 185,
 		"start": {
-			"character": 185,
 			"column": 5,
 			"line": 9
 		}
@@ -137,14 +110,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 222,
 			"column": 21,
 			"line": 10
 		},
 		"message": "A11y: Abstract role 'structure' is forbidden",
-		"pos": 206,
 		"start": {
-			"character": 206,
 			"column": 5,
 			"line": 10
 		}
@@ -152,14 +122,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 243,
 			"column": 18,
 			"line": 11
 		},
 		"message": "A11y: Abstract role 'widget' is forbidden",
-		"pos": 230,
 		"start": {
-			"character": 230,
 			"column": 5,
 			"line": 11
 		}
@@ -167,14 +134,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 264,
 			"column": 18,
 			"line": 12
 		},
 		"message": "A11y: Abstract role 'window' is forbidden",
-		"pos": 251,
 		"start": {
-			"character": 251,
 			"column": 5,
 			"line": 12
 		}
diff --git a/test/validator/samples/a11y-no-access-key/warnings.json b/test/validator/samples/a11y-no-access-key/warnings.json
index e7593b00fd..999284c218 100644
--- a/test/validator/samples/a11y-no-access-key/warnings.json
+++ b/test/validator/samples/a11y-no-access-key/warnings.json
@@ -3,13 +3,10 @@
 	"message": "A11y: Avoid using accesskey",
 	"start": {
 		"line": 1,
-		"column": 5,
-		"character": 5
+		"column": 5
 	},
 	"end": {
 		"line": 1,
-		"column": 18,
-		"character": 18
-	},
-	"pos": 5
-}]
\ No newline at end of file
+		"column": 18
+	}
+}]
diff --git a/test/validator/samples/a11y-no-autofocus/warnings.json b/test/validator/samples/a11y-no-autofocus/warnings.json
index c4bf7d7a96..5bf924956f 100644
--- a/test/validator/samples/a11y-no-autofocus/warnings.json
+++ b/test/validator/samples/a11y-no-autofocus/warnings.json
@@ -3,13 +3,10 @@
 	"message": "A11y: Avoid using autofocus",
 	"start": {
 		"line": 1,
-		"column": 5,
-		"character": 5
+		"column": 5
 	},
 	"end": {
 		"line": 1,
-		"column": 14,
-		"character": 14
-	},
-	"pos": 5
-}]
\ No newline at end of file
+		"column": 14
+	}
+}]
diff --git a/test/validator/samples/a11y-no-distracting-elements/warnings.json b/test/validator/samples/a11y-no-distracting-elements/warnings.json
index eb78dc9140..3714e8037e 100644
--- a/test/validator/samples/a11y-no-distracting-elements/warnings.json
+++ b/test/validator/samples/a11y-no-distracting-elements/warnings.json
@@ -4,30 +4,23 @@
 		"message": "A11y: Avoid <marquee> elements",
 		"start": {
 			"line": 1,
-			"column": 0,
-			"character": 0
+			"column": 0
 		},
 		"end": {
 			"line": 1,
-			"column": 10,
-			"character": 10
-		},
-		"pos": 0
+			"column": 10
+		}
 	},
-
 	{
 		"code": "a11y-distracting-elements",
 		"message": "A11y: Avoid <blink> elements",
 		"start": {
 			"line": 2,
-			"column": 0,
-			"character": 11
+			"column": 0
 		},
 		"end": {
 			"line": 2,
-			"column": 8,
-			"character": 19
-		},
-		"pos": 11
+			"column": 8
+		}
 	}
 ]
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 f702a4a31d..7d8ef008cf 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
@@ -2,14 +2,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 49,
 			"column": 38,
 			"line": 2
 		},
 		"message": "A11y: <a> cannot have role 'article'",
-		"pos": 11,
 		"start": {
-			"character": 11,
 			"column": 0,
 			"line": 2
 		}
@@ -17,14 +14,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 87,
 			"column": 37,
 			"line": 3
 		},
 		"message": "A11y: <a> cannot have role 'banner'",
-		"pos": 50,
 		"start": {
-			"character": 50,
 			"column": 0,
 			"line": 3
 		}
@@ -32,14 +26,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 132,
 			"column": 44,
 			"line": 4
 		},
 		"message": "A11y: <a> cannot have role 'complementary'",
-		"pos": 88,
 		"start": {
-			"character": 88,
 			"column": 0,
 			"line": 4
 		}
@@ -47,14 +38,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 167,
 			"column": 34,
 			"line": 5
 		},
 		"message": "A11y: <a> cannot have role 'img'",
-		"pos": 133,
 		"start": {
-			"character": 133,
 			"column": 0,
 			"line": 5
 		}
@@ -62,14 +50,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 207,
 			"column": 39,
 			"line": 6
 		},
 		"message": "A11y: <a> cannot have role 'listitem'",
-		"pos": 168,
 		"start": {
-			"character": 168,
 			"column": 0,
 			"line": 6
 		}
@@ -77,14 +62,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 243,
 			"column": 35,
 			"line": 7
 		},
 		"message": "A11y: <a> cannot have role 'main'",
-		"pos": 208,
 		"start": {
-			"character": 208,
 			"column": 0,
 			"line": 7
 		}
@@ -92,14 +74,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 281,
 			"column": 37,
 			"line": 8
 		},
 		"message": "A11y: <a> cannot have role 'region'",
-		"pos": 244,
 		"start": {
-			"character": 244,
 			"column": 0,
 			"line": 8
 		}
@@ -107,14 +86,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 320,
 			"column": 38,
 			"line": 9
 		},
 		"message": "A11y: <a> cannot have role 'tooltip'",
-		"pos": 282,
 		"start": {
-			"character": 282,
 			"column": 0,
 			"line": 9
 		}
@@ -122,14 +98,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 414,
 			"column": 38,
 			"line": 13
 		},
 		"message": "A11y: <button> cannot have role 'article'",
-		"pos": 376,
 		"start": {
-			"character": 376,
 			"column": 0,
 			"line": 13
 		}
@@ -137,14 +110,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 452,
 			"column": 37,
 			"line": 14
 		},
 		"message": "A11y: <button> cannot have role 'banner'",
-		"pos": 415,
 		"start": {
-			"character": 415,
 			"column": 0,
 			"line": 14
 		}
@@ -152,14 +122,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 497,
 			"column": 44,
 			"line": 15
 		},
 		"message": "A11y: <button> cannot have role 'complementary'",
-		"pos": 453,
 		"start": {
-			"character": 453,
 			"column": 0,
 			"line": 15
 		}
@@ -167,14 +134,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 532,
 			"column": 34,
 			"line": 16
 		},
 		"message": "A11y: <button> cannot have role 'img'",
-		"pos": 498,
 		"start": {
-			"character": 498,
 			"column": 0,
 			"line": 16
 		}
@@ -182,14 +146,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 572,
 			"column": 39,
 			"line": 17
 		},
 		"message": "A11y: <button> cannot have role 'listitem'",
-		"pos": 533,
 		"start": {
-			"character": 533,
 			"column": 0,
 			"line": 17
 		}
@@ -197,14 +158,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 608,
 			"column": 35,
 			"line": 18
 		},
 		"message": "A11y: <button> cannot have role 'main'",
-		"pos": 573,
 		"start": {
-			"character": 573,
 			"column": 0,
 			"line": 18
 		}
@@ -212,14 +170,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 646,
 			"column": 37,
 			"line": 19
 		},
 		"message": "A11y: <button> cannot have role 'region'",
-		"pos": 609,
 		"start": {
-			"character": 609,
 			"column": 0,
 			"line": 19
 		}
@@ -227,14 +182,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 685,
 			"column": 38,
 			"line": 20
 		},
 		"message": "A11y: <button> cannot have role 'tooltip'",
-		"pos": 647,
 		"start": {
-			"character": 647,
 			"column": 0,
 			"line": 20
 		}
@@ -242,14 +194,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 707,
 			"column": 21,
 			"line": 21
 		},
 		"message": "A11y: Redundant role 'button'",
-		"pos": 694,
 		"start": {
-			"character": 694,
 			"column": 8,
 			"line": 21
 		}
@@ -257,14 +206,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 763,
 			"column": 23,
 			"line": 24
 		},
 		"message": "A11y: <input> cannot have role 'article'",
-		"pos": 740,
 		"start": {
-			"character": 740,
 			"column": 0,
 			"line": 24
 		}
@@ -272,14 +218,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 786,
 			"column": 22,
 			"line": 25
 		},
 		"message": "A11y: <input> cannot have role 'banner'",
-		"pos": 764,
 		"start": {
-			"character": 764,
 			"column": 0,
 			"line": 25
 		}
@@ -287,14 +230,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 816,
 			"column": 29,
 			"line": 26
 		},
 		"message": "A11y: <input> cannot have role 'complementary'",
-		"pos": 787,
 		"start": {
-			"character": 787,
 			"column": 0,
 			"line": 26
 		}
@@ -302,14 +242,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 836,
 			"column": 19,
 			"line": 27
 		},
 		"message": "A11y: <input> cannot have role 'img'",
-		"pos": 817,
 		"start": {
-			"character": 817,
 			"column": 0,
 			"line": 27
 		}
@@ -317,14 +254,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 861,
 			"column": 24,
 			"line": 28
 		},
 		"message": "A11y: <input> cannot have role 'listitem'",
-		"pos": 837,
 		"start": {
-			"character": 837,
 			"column": 0,
 			"line": 28
 		}
@@ -332,14 +266,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 882,
 			"column": 20,
 			"line": 29
 		},
 		"message": "A11y: <input> cannot have role 'main'",
-		"pos": 862,
 		"start": {
-			"character": 862,
 			"column": 0,
 			"line": 29
 		}
@@ -347,14 +278,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 905,
 			"column": 22,
 			"line": 30
 		},
 		"message": "A11y: <input> cannot have role 'region'",
-		"pos": 883,
 		"start": {
-			"character": 883,
 			"column": 0,
 			"line": 30
 		}
@@ -362,14 +290,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 929,
 			"column": 23,
 			"line": 31
 		},
 		"message": "A11y: <input> cannot have role 'tooltip'",
-		"pos": 906,
 		"start": {
-			"character": 906,
 			"column": 0,
 			"line": 31
 		}
@@ -377,14 +302,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 994,
 			"column": 24,
 			"line": 35
 		},
 		"message": "A11y: <select> cannot have role 'article'",
-		"pos": 970,
 		"start": {
-			"character": 970,
 			"column": 0,
 			"line": 35
 		}
@@ -392,14 +314,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 1018,
 			"column": 23,
 			"line": 36
 		},
 		"message": "A11y: <select> cannot have role 'banner'",
-		"pos": 995,
 		"start": {
-			"character": 995,
 			"column": 0,
 			"line": 36
 		}
@@ -407,14 +326,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 1049,
 			"column": 30,
 			"line": 37
 		},
 		"message": "A11y: <select> cannot have role 'complementary'",
-		"pos": 1019,
 		"start": {
-			"character": 1019,
 			"column": 0,
 			"line": 37
 		}
@@ -422,14 +338,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 1070,
 			"column": 20,
 			"line": 38
 		},
 		"message": "A11y: <select> cannot have role 'img'",
-		"pos": 1050,
 		"start": {
-			"character": 1050,
 			"column": 0,
 			"line": 38
 		}
@@ -437,14 +350,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 1096,
 			"column": 25,
 			"line": 39
 		},
 		"message": "A11y: <select> cannot have role 'listitem'",
-		"pos": 1071,
 		"start": {
-			"character": 1071,
 			"column": 0,
 			"line": 39
 		}
@@ -452,14 +362,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 1118,
 			"column": 21,
 			"line": 40
 		},
 		"message": "A11y: <select> cannot have role 'main'",
-		"pos": 1097,
 		"start": {
-			"character": 1097,
 			"column": 0,
 			"line": 40
 		}
@@ -467,14 +374,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 1142,
 			"column": 23,
 			"line": 41
 		},
 		"message": "A11y: <select> cannot have role 'region'",
-		"pos": 1119,
 		"start": {
-			"character": 1119,
 			"column": 0,
 			"line": 41
 		}
@@ -482,14 +386,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 1167,
 			"column": 24,
 			"line": 42
 		},
 		"message": "A11y: <select> cannot have role 'tooltip'",
-		"pos": 1143,
 		"start": {
-			"character": 1143,
 			"column": 0,
 			"line": 42
 		}
@@ -497,14 +398,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 1237,
 			"column": 26,
 			"line": 46
 		},
 		"message": "A11y: <textarea> cannot have role 'article'",
-		"pos": 1211,
 		"start": {
-			"character": 1211,
 			"column": 0,
 			"line": 46
 		}
@@ -512,14 +410,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 1263,
 			"column": 25,
 			"line": 47
 		},
 		"message": "A11y: <textarea> cannot have role 'banner'",
-		"pos": 1238,
 		"start": {
-			"character": 1238,
 			"column": 0,
 			"line": 47
 		}
@@ -527,14 +422,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 1296,
 			"column": 32,
 			"line": 48
 		},
 		"message": "A11y: <textarea> cannot have role 'complementary'",
-		"pos": 1264,
 		"start": {
-			"character": 1264,
 			"column": 0,
 			"line": 48
 		}
@@ -542,14 +434,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 1319,
 			"column": 22,
 			"line": 49
 		},
 		"message": "A11y: <textarea> cannot have role 'img'",
-		"pos": 1297,
 		"start": {
-			"character": 1297,
 			"column": 0,
 			"line": 49
 		}
@@ -557,14 +446,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 1347,
 			"column": 27,
 			"line": 50
 		},
 		"message": "A11y: <textarea> cannot have role 'listitem'",
-		"pos": 1320,
 		"start": {
-			"character": 1320,
 			"column": 0,
 			"line": 50
 		}
@@ -572,14 +458,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 1371,
 			"column": 23,
 			"line": 51
 		},
 		"message": "A11y: <textarea> cannot have role 'main'",
-		"pos": 1348,
 		"start": {
-			"character": 1348,
 			"column": 0,
 			"line": 51
 		}
@@ -587,14 +470,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 1397,
 			"column": 25,
 			"line": 52
 		},
 		"message": "A11y: <textarea> cannot have role 'region'",
-		"pos": 1372,
 		"start": {
-			"character": 1372,
 			"column": 0,
 			"line": 52
 		}
@@ -602,14 +482,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 1424,
 			"column": 26,
 			"line": 53
 		},
 		"message": "A11y: <textarea> cannot have role 'tooltip'",
-		"pos": 1398,
 		"start": {
-			"character": 1398,
 			"column": 0,
 			"line": 53
 		}
@@ -617,14 +494,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 1527,
 			"column": 19,
 			"line": 57
 		},
 		"message": "A11y: Abstract role 'command' is forbidden",
-		"pos": 1513,
 		"start": {
-			"character": 1513,
 			"column": 5,
 			"line": 57
 		}
@@ -632,14 +506,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 1552,
 			"column": 21,
 			"line": 58
 		},
 		"message": "A11y: Abstract role 'composite' is forbidden",
-		"pos": 1536,
 		"start": {
-			"character": 1536,
 			"column": 5,
 			"line": 58
 		}
@@ -647,14 +518,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 1573,
 			"column": 17,
 			"line": 59
 		},
 		"message": "A11y: Abstract role 'input' is forbidden",
-		"pos": 1561,
 		"start": {
-			"character": 1561,
 			"column": 5,
 			"line": 59
 		}
@@ -662,14 +530,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 1597,
 			"column": 20,
 			"line": 60
 		},
 		"message": "A11y: Abstract role 'landmark' is forbidden",
-		"pos": 1582,
 		"start": {
-			"character": 1582,
 			"column": 5,
 			"line": 60
 		}
@@ -677,14 +542,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 1618,
 			"column": 17,
 			"line": 61
 		},
 		"message": "A11y: Abstract role 'range' is forbidden",
-		"pos": 1606,
 		"start": {
-			"character": 1606,
 			"column": 5,
 			"line": 61
 		}
@@ -692,14 +554,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 1642,
 			"column": 20,
 			"line": 62
 		},
 		"message": "A11y: Abstract role 'roletype' is forbidden",
-		"pos": 1627,
 		"start": {
-			"character": 1627,
 			"column": 5,
 			"line": 62
 		}
@@ -707,14 +566,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 1665,
 			"column": 19,
 			"line": 63
 		},
 		"message": "A11y: Abstract role 'section' is forbidden",
-		"pos": 1651,
 		"start": {
-			"character": 1651,
 			"column": 5,
 			"line": 63
 		}
@@ -722,14 +578,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 1692,
 			"column": 23,
 			"line": 64
 		},
 		"message": "A11y: Abstract role 'sectionhead' is forbidden",
-		"pos": 1674,
 		"start": {
-			"character": 1674,
 			"column": 5,
 			"line": 64
 		}
@@ -737,14 +590,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 1714,
 			"column": 18,
 			"line": 65
 		},
 		"message": "A11y: Abstract role 'select' is forbidden",
-		"pos": 1701,
 		"start": {
-			"character": 1701,
 			"column": 5,
 			"line": 65
 		}
@@ -752,14 +602,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 1739,
 			"column": 21,
 			"line": 66
 		},
 		"message": "A11y: Abstract role 'structure' is forbidden",
-		"pos": 1723,
 		"start": {
-			"character": 1723,
 			"column": 5,
 			"line": 66
 		}
@@ -767,14 +614,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 1851,
 			"column": 18,
 			"line": 71
 		},
 		"message": "A11y: Abstract role 'widget' is forbidden",
-		"pos": 1838,
 		"start": {
-			"character": 1838,
 			"column": 5,
 			"line": 71
 		}
@@ -782,14 +626,11 @@
 	{
 		"code": "a11y-no-abstract-role",
 		"end": {
-			"character": 1873,
 			"column": 18,
 			"line": 72
 		},
 		"message": "A11y: Abstract role 'window' is forbidden",
-		"pos": 1860,
 		"start": {
-			"character": 1860,
 			"column": 5,
 			"line": 72
 		}
@@ -797,14 +638,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 3695,
 			"column": 28,
 			"line": 145
 		},
 		"message": "A11y: <menuitem> cannot have role 'listitem'",
-		"pos": 3667,
 		"start": {
-			"character": 3667,
 			"column": 0,
 			"line": 145
 		}
@@ -812,14 +650,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 3734,
 			"column": 38,
 			"line": 146
 		},
 		"message": "A11y: <option> cannot have role 'listitem'",
-		"pos": 3696,
 		"start": {
-			"character": 3696,
 			"column": 0,
 			"line": 146
 		}
@@ -827,14 +662,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 3773,
 			"column": 38,
 			"line": 147
 		},
 		"message": "A11y: <select> cannot have role 'listitem'",
-		"pos": 3735,
 		"start": {
-			"character": 3735,
 			"column": 0,
 			"line": 147
 		}
@@ -842,14 +674,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 3801,
 			"column": 27,
 			"line": 148
 		},
 		"message": "A11y: <summary> cannot have role 'listitem'",
-		"pos": 3774,
 		"start": {
-			"character": 3774,
 			"column": 0,
 			"line": 148
 		}
@@ -857,14 +686,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 3842,
 			"column": 40,
 			"line": 149
 		},
 		"message": "A11y: <textarea> cannot have role 'listitem'",
-		"pos": 3802,
 		"start": {
-			"character": 3802,
 			"column": 0,
 			"line": 149
 		}
@@ -872,14 +698,11 @@
 	{
 		"code": "a11y-no-interactive-element-to-noninteractive-role",
 		"end": {
-			"character": 3865,
 			"column": 22,
 			"line": 150
 		},
 		"message": "A11y: <tr> cannot have role 'listitem'",
-		"pos": 3843,
 		"start": {
-			"character": 3843,
 			"column": 0,
 			"line": 150
 		}
diff --git a/test/validator/samples/a11y-no-noninteractive-tabindex/warnings.json b/test/validator/samples/a11y-no-noninteractive-tabindex/warnings.json
index 1c643c896b..69c68c48bd 100644
--- a/test/validator/samples/a11y-no-noninteractive-tabindex/warnings.json
+++ b/test/validator/samples/a11y-no-noninteractive-tabindex/warnings.json
@@ -2,14 +2,11 @@
 	{
 		"code": "a11y-no-noninteractive-tabindex",
 		"end": {
-			"character": 278,
 			"column": 20,
 			"line": 12
 		},
 		"message": "A11y: noninteractive element cannot have nonnegative tabIndex value",
-		"pos": 258,
 		"start": {
-			"character": 258,
 			"column": 0,
 			"line": 12
 		}
@@ -17,14 +14,11 @@
 	{
 		"code": "a11y-no-noninteractive-tabindex",
 		"end": {
-			"character": 314,
 			"column": 35,
 			"line": 13
 		},
 		"message": "A11y: noninteractive element cannot have nonnegative tabIndex value",
-		"pos": 279,
 		"start": {
-			"character": 279,
 			"column": 0,
 			"line": 13
 		}
@@ -32,14 +26,11 @@
 	{
 		"code": "a11y-no-noninteractive-tabindex",
 		"end": {
-			"character": 339,
 			"column": 24,
 			"line": 14
 		},
 		"message": "A11y: noninteractive element cannot have nonnegative tabIndex value",
-		"pos": 315,
 		"start": {
-			"character": 315,
 			"column": 0,
 			"line": 14
 		}
@@ -47,14 +38,11 @@
 	{
 		"code": "a11y-no-noninteractive-tabindex",
 		"end": {
-			"character": 366,
 			"column": 26,
 			"line": 15
 		},
 		"message": "A11y: noninteractive element cannot have nonnegative tabIndex value",
-		"pos": 340,
 		"start": {
-			"character": 340,
 			"column": 0,
 			"line": 15
 		}
diff --git a/test/validator/samples/a11y-no-redundant-roles/warnings.json b/test/validator/samples/a11y-no-redundant-roles/warnings.json
index cb346f87b2..4fcd60385e 100644
--- a/test/validator/samples/a11y-no-redundant-roles/warnings.json
+++ b/test/validator/samples/a11y-no-redundant-roles/warnings.json
@@ -2,14 +2,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 23,
 			"column": 23,
 			"line": 1
 		},
 		"message": "A11y: Redundant role 'link'",
-		"pos": 12,
 		"start": {
-			"character": 12,
 			"column": 12,
 			"line": 1
 		}
@@ -17,14 +14,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 58,
 			"column": 23,
 			"line": 2
 		},
 		"message": "A11y: Redundant role 'article'",
-		"pos": 44,
 		"start": {
-			"character": 44,
 			"column": 9,
 			"line": 2
 		}
@@ -32,14 +26,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 89,
 			"column": 27,
 			"line": 3
 		},
 		"message": "A11y: Redundant role 'complementary'",
-		"pos": 69,
 		"start": {
-			"character": 69,
 			"column": 7,
 			"line": 3
 		}
@@ -47,14 +38,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 114,
 			"column": 21,
 			"line": 4
 		},
 		"message": "A11y: Redundant role 'document'",
-		"pos": 99,
 		"start": {
-			"character": 99,
 			"column": 6,
 			"line": 4
 		}
@@ -62,14 +50,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 139,
 			"column": 21,
 			"line": 5
 		},
 		"message": "A11y: Redundant role 'button'",
-		"pos": 126,
 		"start": {
-			"character": 126,
 			"column": 8,
 			"line": 5
 		}
@@ -77,14 +62,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 167,
 			"column": 24,
 			"line": 6
 		},
 		"message": "A11y: Redundant role 'listbox'",
-		"pos": 153,
 		"start": {
-			"character": 153,
 			"column": 10,
 			"line": 6
 		}
@@ -92,14 +74,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 192,
 			"column": 21,
 			"line": 7
 		},
 		"message": "A11y: Redundant role 'definition'",
-		"pos": 175,
 		"start": {
-			"character": 175,
 			"column": 4,
 			"line": 7
 		}
@@ -107,14 +86,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 212,
 			"column": 16,
 			"line": 8
 		},
 		"message": "A11y: Redundant role 'term'",
-		"pos": 201,
 		"start": {
-			"character": 201,
 			"column": 5,
 			"line": 8
 		}
@@ -122,14 +98,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 237,
 			"column": 21,
 			"line": 9
 		},
 		"message": "A11y: Redundant role 'group'",
-		"pos": 225,
 		"start": {
-			"character": 225,
 			"column": 9,
 			"line": 9
 		}
@@ -137,14 +110,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 262,
 			"column": 21,
 			"line": 10
 		},
 		"message": "A11y: Redundant role 'dialog'",
-		"pos": 249,
 		"start": {
-			"character": 249,
 			"column": 8,
 			"line": 10
 		}
@@ -152,14 +122,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 281,
 			"column": 15,
 			"line": 11
 		},
 		"message": "A11y: Redundant role 'term'",
-		"pos": 270,
 		"start": {
-			"character": 270,
 			"column": 4,
 			"line": 11
 		}
@@ -167,14 +134,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 307,
 			"column": 22,
 			"line": 12
 		},
 		"message": "A11y: Redundant role 'group'",
-		"pos": 295,
 		"start": {
-			"character": 295,
 			"column": 10,
 			"line": 12
 		}
@@ -182,14 +146,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 332,
 			"column": 21,
 			"line": 13
 		},
 		"message": "A11y: Redundant role 'figure'",
-		"pos": 319,
 		"start": {
-			"character": 319,
 			"column": 8,
 			"line": 13
 		}
@@ -197,14 +158,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 353,
 			"column": 17,
 			"line": 14
 		},
 		"message": "A11y: Redundant role 'form'",
-		"pos": 342,
 		"start": {
-			"character": 342,
 			"column": 6,
 			"line": 14
 		}
@@ -212,14 +170,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 383,
 			"column": 18,
 			"line": 15
 		},
 		"message": "A11y: Redundant role 'heading'",
-		"pos": 369,
 		"start": {
-			"character": 369,
 			"column": 4,
 			"line": 15
 		}
@@ -227,14 +182,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 415,
 			"column": 18,
 			"line": 16
 		},
 		"message": "A11y: Redundant role 'heading'",
-		"pos": 401,
 		"start": {
-			"character": 401,
 			"column": 4,
 			"line": 16
 		}
@@ -242,14 +194,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 447,
 			"column": 18,
 			"line": 17
 		},
 		"message": "A11y: Redundant role 'heading'",
-		"pos": 433,
 		"start": {
-			"character": 433,
 			"column": 4,
 			"line": 17
 		}
@@ -257,14 +206,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 479,
 			"column": 18,
 			"line": 18
 		},
 		"message": "A11y: Redundant role 'heading'",
-		"pos": 465,
 		"start": {
-			"character": 465,
 			"column": 4,
 			"line": 18
 		}
@@ -272,14 +218,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 511,
 			"column": 18,
 			"line": 19
 		},
 		"message": "A11y: Redundant role 'heading'",
-		"pos": 497,
 		"start": {
-			"character": 497,
 			"column": 4,
 			"line": 19
 		}
@@ -287,14 +230,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 543,
 			"column": 18,
 			"line": 20
 		},
 		"message": "A11y: Redundant role 'heading'",
-		"pos": 529,
 		"start": {
-			"character": 529,
 			"column": 4,
 			"line": 20
 		}
@@ -302,14 +242,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 577,
 			"column": 20,
 			"line": 21
 		},
 		"message": "A11y: Redundant role 'separator'",
-		"pos": 561,
 		"start": {
-			"character": 561,
 			"column": 4,
 			"line": 21
 		}
@@ -317,14 +254,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 600,
 			"column": 19,
 			"line": 22
 		},
 		"message": "A11y: Redundant role 'listitem'",
-		"pos": 585,
 		"start": {
-			"character": 585,
 			"column": 4,
 			"line": 22
 		}
@@ -332,14 +266,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 621,
 			"column": 17,
 			"line": 23
 		},
 		"message": "A11y: Redundant role 'link'",
-		"pos": 610,
 		"start": {
-			"character": 610,
 			"column": 6,
 			"line": 23
 		}
@@ -347,14 +278,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 642,
 			"column": 17,
 			"line": 24
 		},
 		"message": "A11y: Redundant role 'main'",
-		"pos": 631,
 		"start": {
-			"character": 631,
 			"column": 6,
 			"line": 24
 		}
@@ -362,14 +290,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 668,
 			"column": 17,
 			"line": 25
 		},
 		"message": "A11y: Redundant role 'list'",
-		"pos": 657,
 		"start": {
-			"character": 657,
 			"column": 6,
 			"line": 25
 		}
@@ -377,14 +302,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 694,
 			"column": 22,
 			"line": 26
 		},
 		"message": "A11y: Redundant role 'navigation'",
-		"pos": 677,
 		"start": {
-			"character": 677,
 			"column": 5,
 			"line": 26
 		}
@@ -392,14 +314,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 713,
 			"column": 15,
 			"line": 27
 		},
 		"message": "A11y: Redundant role 'list'",
-		"pos": 702,
 		"start": {
-			"character": 702,
 			"column": 4,
 			"line": 27
 		}
@@ -407,14 +326,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 739,
 			"column": 22,
 			"line": 28
 		},
 		"message": "A11y: Redundant role 'group'",
-		"pos": 727,
 		"start": {
-			"character": 727,
 			"column": 10,
 			"line": 28
 		}
@@ -422,14 +338,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 764,
 			"column": 21,
 			"line": 29
 		},
 		"message": "A11y: Redundant role 'option'",
-		"pos": 751,
 		"start": {
-			"character": 751,
 			"column": 8,
 			"line": 29
 		}
@@ -437,14 +350,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 789,
 			"column": 21,
 			"line": 30
 		},
 		"message": "A11y: Redundant role 'status'",
-		"pos": 776,
 		"start": {
-			"character": 776,
 			"column": 8,
 			"line": 30
 		}
@@ -452,14 +362,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 821,
 			"column": 28,
 			"line": 31
 		},
 		"message": "A11y: Redundant role 'progressbar'",
-		"pos": 803,
 		"start": {
-			"character": 803,
 			"column": 10,
 			"line": 31
 		}
@@ -467,14 +374,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 847,
 			"column": 22,
 			"line": 32
 		},
 		"message": "A11y: Redundant role 'region'",
-		"pos": 834,
 		"start": {
-			"character": 834,
 			"column": 9,
 			"line": 32
 		}
@@ -482,14 +386,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 873,
 			"column": 22,
 			"line": 33
 		},
 		"message": "A11y: Redundant role 'button'",
-		"pos": 860,
 		"start": {
-			"character": 860,
 			"column": 9,
 			"line": 33
 		}
@@ -497,14 +398,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 896,
 			"column": 19,
 			"line": 34
 		},
 		"message": "A11y: Redundant role 'table'",
-		"pos": 884,
 		"start": {
-			"character": 884,
 			"column": 7,
 			"line": 34
 		}
@@ -512,14 +410,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 922,
 			"column": 22,
 			"line": 35
 		},
 		"message": "A11y: Redundant role 'rowgroup'",
-		"pos": 907,
 		"start": {
-			"character": 907,
 			"column": 7,
 			"line": 35
 		}
@@ -527,14 +422,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 950,
 			"column": 24,
 			"line": 36
 		},
 		"message": "A11y: Redundant role 'textbox'",
-		"pos": 936,
 		"start": {
-			"character": 936,
 			"column": 10,
 			"line": 36
 		}
@@ -542,14 +434,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 976,
 			"column": 22,
 			"line": 37
 		},
 		"message": "A11y: Redundant role 'rowgroup'",
-		"pos": 961,
 		"start": {
-			"character": 961,
 			"column": 7,
 			"line": 37
 		}
@@ -557,14 +446,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 1002,
 			"column": 22,
 			"line": 38
 		},
 		"message": "A11y: Redundant role 'rowgroup'",
-		"pos": 987,
 		"start": {
-			"character": 987,
 			"column": 7,
 			"line": 38
 		}
@@ -572,14 +458,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 1020,
 			"column": 14,
 			"line": 39
 		},
 		"message": "A11y: Redundant role 'row'",
-		"pos": 1010,
 		"start": {
-			"character": 1010,
 			"column": 4,
 			"line": 39
 		}
@@ -587,14 +470,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 1039,
 			"column": 15,
 			"line": 40
 		},
 		"message": "A11y: Redundant role 'list'",
-		"pos": 1028,
 		"start": {
-			"character": 1028,
 			"column": 4,
 			"line": 40
 		}
@@ -602,14 +482,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 1125,
 			"column": 21,
 			"line": 43
 		},
 		"message": "A11y: Redundant role 'banner'",
-		"pos": 1112,
 		"start": {
-			"character": 1112,
 			"column": 8,
 			"line": 43
 		}
@@ -617,14 +494,11 @@
 	{
 		"code": "a11y-no-redundant-roles",
 		"end": {
-			"character": 1162,
 			"column": 26,
 			"line": 44
 		},
 		"message": "A11y: Redundant role 'contentinfo'",
-		"pos": 1144,
 		"start": {
-			"character": 1144,
 			"column": 8,
 			"line": 44
 		}
diff --git a/test/validator/samples/a11y-not-on-components/warnings.json b/test/validator/samples/a11y-not-on-components/warnings.json
index 4d8fb62182..d79141b22f 100644
--- a/test/validator/samples/a11y-not-on-components/warnings.json
+++ b/test/validator/samples/a11y-not-on-components/warnings.json
@@ -4,14 +4,11 @@
 		"message": "A11y: Avoid using autofocus",
 		"start": {
 			"column": 8,
-			"line": 6,
-			"character": 88
+			"line": 6
 		},
 		"end": {
 			"line": 6,
-			"column": 17,
-			"character": 97
-		},
-		"pos": 88
+			"column": 17
+		}
 	}
 ]
diff --git a/test/validator/samples/a11y-role-has-required-aria-props/warnings.json b/test/validator/samples/a11y-role-has-required-aria-props/warnings.json
index 4de7c84001..17ecda6c1c 100644
--- a/test/validator/samples/a11y-role-has-required-aria-props/warnings.json
+++ b/test/validator/samples/a11y-role-has-required-aria-props/warnings.json
@@ -4,59 +4,47 @@
 		"message": "A11y: Elements with the ARIA role \"heading\" must have the following attributes defined: \"aria-level\"",
 		"start": {
 			"line": 1,
-			"column": 5,
-			"character": 5
+			"column": 5
 		},
 		"end": {
 			"line": 1,
-			"column": 19,
-			"character": 19
-		},
-		"pos": 5
+			"column": 19
+		}
 	},
 	{
 		"code": "a11y-role-has-required-aria-props",
 		"message": "A11y: Elements with the ARIA role \"checkbox\" must have the following attributes defined: \"aria-checked\"",
 		"start": {
 			"line": 2,
-			"column": 6,
-			"character": 33
+			"column": 6
 		},
 		"end": {
 			"line": 2,
-			"column": 21,
-			"character": 48
-		},
-		"pos": 33
+			"column": 21
+		}
 	},
 	{
 		"code": "a11y-role-has-required-aria-props",
 		"message": "A11y: Elements with the ARIA role \"meter\" must have the following attributes defined: \"aria-valuenow\"",
 		"start": {
 			"line": 3,
-			"column": 5,
-			"character": 62
+			"column": 5
 		},
 		"end": {
 			"line": 3,
-			"column": 17,
-			"character": 74
-		},
-		"pos": 62
+			"column": 17
+		}
 	},
 	{
 		"code": "a11y-role-has-required-aria-props",
 		"message": "A11y: Elements with the ARIA role \"scrollbar\" must have the following attributes defined: \"aria-controls\", \"aria-valuenow\"",
 		"start": {
-			"character": 87,
 			"column": 5,
 			"line": 4
 		},
 		"end": {
-			"character": 103,
 			"column": 21,
 			"line": 4
-		},
-		"pos": 87
+		}
 	}
 ]
diff --git a/test/validator/samples/a11y-scope/warnings.json b/test/validator/samples/a11y-scope/warnings.json
index 192e0b764e..b794afcb73 100644
--- a/test/validator/samples/a11y-scope/warnings.json
+++ b/test/validator/samples/a11y-scope/warnings.json
@@ -4,14 +4,11 @@
 		"message": "A11y: The scope attribute should only be used with <th> elements",
 		"start": {
 			"line": 1,
-			"column": 5,
-			"character": 5
+			"column": 5
 		},
 		"end": {
 			"line": 1,
-			"column": 10,
-			"character": 10
-		},
-		"pos": 5
+			"column": 10
+		}
 	}
 ]
diff --git a/test/validator/samples/a11y-tabindex-no-positive/warnings.json b/test/validator/samples/a11y-tabindex-no-positive/warnings.json
index 90f9decbad..455c4998e4 100644
--- a/test/validator/samples/a11y-tabindex-no-positive/warnings.json
+++ b/test/validator/samples/a11y-tabindex-no-positive/warnings.json
@@ -4,14 +4,11 @@
 		"message": "A11y: avoid tabindex values above zero",
 		"start": {
 			"line": 7,
-			"column": 8,
-			"character": 85
+			"column": 8
 		},
 		"end": {
 			"line": 7,
-			"column": 20,
-			"character": 97
-		},
-		"pos": 85
+			"column": 20
+		}
 	}
 ]
diff --git a/test/validator/samples/action-invalid/warnings.json b/test/validator/samples/action-invalid/warnings.json
index c1c1b2b492..5e2066a114 100644
--- a/test/validator/samples/action-invalid/warnings.json
+++ b/test/validator/samples/action-invalid/warnings.json
@@ -1,15 +1,12 @@
 [{
 	"code": "missing-declaration",
 	"message": "'whatever' is not defined. Consider adding a <script> block with 'export let whatever' to declare a prop",
-	"pos": 5,
 	"start": {
 		"line": 1,
-		"column": 5,
-		"character": 5
+		"column": 5
 	},
 	"end": {
 		"line": 1,
-		"column": 17,
-		"character": 17
+		"column": 17
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/action-object/input.svelte b/test/validator/samples/action-object/input.svelte
index e0962fa594..083c63388d 100644
--- a/test/validator/samples/action-object/input.svelte
+++ b/test/validator/samples/action-object/input.svelte
@@ -3,9 +3,9 @@
 		foo : "bar",
 		action(element, { leet }) {
 			element.foo = this.foo + leet;
-		},
+		}
 	}
 </script>
 
 <button use:obj.action={{ leet: 1337 }}>action</button>
-<button use:foo.action={{ leet: 1337 }}>action</button>
\ No newline at end of file
+<button use:foo.action={{ leet: 1337 }}>action</button>
diff --git a/test/validator/samples/action-object/warnings.json b/test/validator/samples/action-object/warnings.json
index e1ccbb55a2..8f02c105de 100644
--- a/test/validator/samples/action-object/warnings.json
+++ b/test/validator/samples/action-object/warnings.json
@@ -2,14 +2,11 @@
 	{
 		"code": "missing-declaration",
 		"end": {
-			"character": 217,
 			"column": 39,
 			"line": 11
 		},
 		"message": "'foo' is not defined",
-		"pos": 186,
 		"start": {
-			"character": 186,
 			"column": 8,
 			"line": 11
 		}
diff --git a/test/validator/samples/action-on-component/errors.json b/test/validator/samples/action-on-component/errors.json
index 7ffaeb45fd..b973a4dc2c 100644
--- a/test/validator/samples/action-on-component/errors.json
+++ b/test/validator/samples/action-on-component/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "invalid-action",
 	"message": "Actions can only be applied to DOM elements, not components",
-	"pos": 86,
 	"start": {
 		"line": 7,
-		"column": 8,
-		"character": 86
+		"column": 8
 	},
 	"end": {
 		"line": 7,
-		"column": 15,
-		"character": 93
+		"column": 15
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/animation-duplicate/errors.json b/test/validator/samples/animation-duplicate/errors.json
index a09edd54c7..2f47070256 100644
--- a/test/validator/samples/animation-duplicate/errors.json
+++ b/test/validator/samples/animation-duplicate/errors.json
@@ -3,13 +3,10 @@
 	"message": "An element can only have one 'animate' directive",
 	"start": {
 		"line": 7,
-		"column": 18,
-		"character": 108
+		"column": 18
 	},
 	"end": {
 		"line": 7,
-		"column": 29,
-		"character": 119
-	},
-	"pos": 108
-}]
\ No newline at end of file
+		"column": 29
+	}
+}]
diff --git a/test/validator/samples/animation-missing/warnings.json b/test/validator/samples/animation-missing/warnings.json
index 78da5371a2..441a4a3e01 100644
--- a/test/validator/samples/animation-missing/warnings.json
+++ b/test/validator/samples/animation-missing/warnings.json
@@ -3,13 +3,10 @@
 	"message": "'foo' is not defined",
 	"start": {
 		"line": 6,
-		"column": 6,
-		"character": 71
+		"column": 6
 	},
 	"end": {
 		"line": 6,
-		"column": 17,
-		"character": 82
-	},
-	"pos": 71
-}]
\ No newline at end of file
+		"column": 17
+	}
+}]
diff --git a/test/validator/samples/animation-not-in-each/errors.json b/test/validator/samples/animation-not-in-each/errors.json
index c737617f98..c49fc36a97 100644
--- a/test/validator/samples/animation-not-in-each/errors.json
+++ b/test/validator/samples/animation-not-in-each/errors.json
@@ -3,13 +3,10 @@
 	"message": "An element that uses the animate directive must be the immediate child of a keyed each block",
 	"start": {
 		"line": 5,
-		"column": 5,
-		"character": 44
+		"column": 5
 	},
 	"end": {
 		"line": 5,
-		"column": 16,
-		"character": 55
-	},
-	"pos": 44
+		"column": 16
+	}
 }]
diff --git a/test/validator/samples/animation-not-in-keyed-each/errors.json b/test/validator/samples/animation-not-in-keyed-each/errors.json
index a21579ce4f..259106cc91 100644
--- a/test/validator/samples/animation-not-in-keyed-each/errors.json
+++ b/test/validator/samples/animation-not-in-keyed-each/errors.json
@@ -3,13 +3,10 @@
 	"message": "An element that uses the animate directive must be used inside a keyed each block. Did you forget to add a key to your each block?",
 	"start": {
 		"line": 6,
-		"column": 6,
-		"character": 69
+		"column": 6
 	},
 	"end": {
 		"line": 6,
-		"column": 17,
-		"character": 80
-	},
-	"pos": 69
+		"column": 17
+	}
 }]
diff --git a/test/validator/samples/animation-siblings/errors.json b/test/validator/samples/animation-siblings/errors.json
index 3def56f0a5..ff229abd2c 100644
--- a/test/validator/samples/animation-siblings/errors.json
+++ b/test/validator/samples/animation-siblings/errors.json
@@ -3,13 +3,10 @@
 	"message": "An element that uses the animate directive must be the sole child of a keyed each block",
 	"start": {
 		"line": 6,
-		"column": 6,
-		"character": 77
+		"column": 6
 	},
 	"end": {
 		"line": 6,
-		"column": 17,
-		"character": 88
-	},
-	"pos": 77
+		"column": 17
+	}
 }]
diff --git a/test/validator/samples/assignment-to-const-2/errors.json b/test/validator/samples/assignment-to-const-2/errors.json
index b8da2a3d8e..7bbd36b9a1 100644
--- a/test/validator/samples/assignment-to-const-2/errors.json
+++ b/test/validator/samples/assignment-to-const-2/errors.json
@@ -4,14 +4,11 @@
 		"message": "You are assigning to a const",
 		"start": {
 			"line": 13,
-			"column": 24,
-			"character": 282
+			"column": 24
 		},
 		"end": {
 			"line": 13,
-			"column": 35,
-			"character": 293
-		},
-		"pos": 282
+			"column": 35
+		}
 	}
-]
\ No newline at end of file
+]
diff --git a/test/validator/samples/assignment-to-const-3/errors.json b/test/validator/samples/assignment-to-const-3/errors.json
index 4842d55dc3..1201c10a83 100644
--- a/test/validator/samples/assignment-to-const-3/errors.json
+++ b/test/validator/samples/assignment-to-const-3/errors.json
@@ -4,14 +4,11 @@
 		"message": "You are assigning to a const",
 		"start": {
 			"line": 14,
-			"column": 3,
-			"character": 172
+			"column": 3
 		},
 		"end": {
 			"line": 14,
-			"column": 10,
-			"character": 179
-		},
-		"pos": 172
+			"column": 10
+		}
 	}
-]
\ No newline at end of file
+]
diff --git a/test/validator/samples/assignment-to-const-4/errors.json b/test/validator/samples/assignment-to-const-4/errors.json
index aa97538a60..39474b2f70 100644
--- a/test/validator/samples/assignment-to-const-4/errors.json
+++ b/test/validator/samples/assignment-to-const-4/errors.json
@@ -4,14 +4,11 @@
 		"message": "You are assigning to a const",
 		"start": {
 			"line": 17,
-			"column": 2,
-			"character": 189
+			"column": 2
 		},
 		"end": {
 			"line": 17,
-			"column": 9,
-			"character": 196
-		},
-		"pos": 189
+			"column": 9
+		}
 	}
-]
\ No newline at end of file
+]
diff --git a/test/validator/samples/assignment-to-const/errors.json b/test/validator/samples/assignment-to-const/errors.json
index 7f4f264f1d..b822452b92 100644
--- a/test/validator/samples/assignment-to-const/errors.json
+++ b/test/validator/samples/assignment-to-const/errors.json
@@ -4,14 +4,11 @@
 		"message": "You are assigning to a const",
 		"start": {
 			"line": 16,
-			"column": 2,
-			"character": 225
+			"column": 2
 		},
 		"end": {
 			"line": 16,
-			"column": 18,
-			"character": 241
-		},
-		"pos": 225
+			"column": 18
+		}
 	}
-]
\ No newline at end of file
+]
diff --git a/test/validator/samples/attribute-expected-equals/errors.json b/test/validator/samples/attribute-expected-equals/errors.json
index a3fa9d3cac..2089d78d6e 100644
--- a/test/validator/samples/attribute-expected-equals/errors.json
+++ b/test/validator/samples/attribute-expected-equals/errors.json
@@ -3,13 +3,10 @@
 	"message": "Expected =",
 	"start": {
 		"line": 5,
-		"column": 9,
-		"character": 50
+		"column": 9
 	},
 	"end": {
 		"line": 5,
-		"column": 9,
-		"character": 50
-	},
-	"pos": 50
+		"column": 9
+	}
 }]
diff --git a/test/validator/samples/attribute-invalid-name-2/errors.json b/test/validator/samples/attribute-invalid-name-2/errors.json
index 9e0c437339..cd3fac5d99 100644
--- a/test/validator/samples/attribute-invalid-name-2/errors.json
+++ b/test/validator/samples/attribute-invalid-name-2/errors.json
@@ -3,13 +3,10 @@
 	"message": "'3aa' is not a valid attribute name",
 	"start": {
 		"line": 1,
-		"column": 3,
-		"character": 3
+		"column": 3
 	},
 	"end": {
 		"line": 1,
-		"column": 12,
-		"character": 12
-	},
-	"pos": 3
+		"column": 12
+	}
 }]
diff --git a/test/validator/samples/attribute-invalid-name-3/errors.json b/test/validator/samples/attribute-invalid-name-3/errors.json
index f583226882..956e2b87db 100644
--- a/test/validator/samples/attribute-invalid-name-3/errors.json
+++ b/test/validator/samples/attribute-invalid-name-3/errors.json
@@ -3,13 +3,10 @@
 	"message": "'a*a' is not a valid attribute name",
 	"start": {
 		"line": 1,
-		"column": 3,
-		"character": 3
+		"column": 3
 	},
 	"end": {
 		"line": 1,
-		"column": 6,
-		"character": 6
-	},
-	"pos": 3
+		"column": 6
+	}
 }]
diff --git a/test/validator/samples/attribute-invalid-name-4/errors.json b/test/validator/samples/attribute-invalid-name-4/errors.json
index a8959cebf3..d4053c5655 100644
--- a/test/validator/samples/attribute-invalid-name-4/errors.json
+++ b/test/validator/samples/attribute-invalid-name-4/errors.json
@@ -3,13 +3,10 @@
 	"message": "'-a' is not a valid attribute name",
 	"start": {
 		"line": 1,
-		"column": 3,
-		"character": 3
+		"column": 3
 	},
 	"end": {
 		"line": 1,
-		"column": 5,
-		"character": 5
-	},
-	"pos": 3
+		"column": 5
+	}
 }]
diff --git a/test/validator/samples/attribute-invalid-name-5/errors.json b/test/validator/samples/attribute-invalid-name-5/errors.json
index b1e3acc5ef..f3853c4ffc 100644
--- a/test/validator/samples/attribute-invalid-name-5/errors.json
+++ b/test/validator/samples/attribute-invalid-name-5/errors.json
@@ -3,13 +3,10 @@
 	"message": "'a;' is not a valid attribute name",
 	"start": {
 		"line": 1,
-		"column": 3,
-		"character": 3
+		"column": 3
 	},
 	"end": {
 		"line": 1,
-		"column": 11,
-		"character": 11
-	},
-	"pos": 3
+		"column": 11
+	}
 }]
diff --git a/test/validator/samples/attribute-invalid-name/errors.json b/test/validator/samples/attribute-invalid-name/errors.json
index 9bdde1ee46..b9a15df8b4 100644
--- a/test/validator/samples/attribute-invalid-name/errors.json
+++ b/test/validator/samples/attribute-invalid-name/errors.json
@@ -3,13 +3,10 @@
 	"message": "'}' is not a valid attribute name",
 	"start": {
 		"line": 1,
-		"column": 3,
-		"character": 3
+		"column": 3
 	},
 	"end": {
 		"line": 1,
-		"column": 4,
-		"character": 4
-	},
-	"pos": 3
+		"column": 4
+	}
 }]
diff --git a/test/validator/samples/binding-await-catch/errors.json b/test/validator/samples/binding-await-catch/errors.json
index 00141686f3..9e54b79772 100644
--- a/test/validator/samples/binding-await-catch/errors.json
+++ b/test/validator/samples/binding-await-catch/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "invalid-binding",
 		"message": "Cannot bind to a variable declared with {#await ... then} or {:catch} blocks",
-		"pos": 79,
-		"start": { "line": 6, "column": 9, "character": 79 },
-		"end": { "line": 6, "column": 27, "character": 97 }
+		"start": { "line": 6, "column": 9 },
+		"end": { "line": 6, "column": 27 }
 	}
 ]
diff --git a/test/validator/samples/binding-await-then-2/errors.json b/test/validator/samples/binding-await-then-2/errors.json
index e734ed4717..c3240cf842 100644
--- a/test/validator/samples/binding-await-then-2/errors.json
+++ b/test/validator/samples/binding-await-then-2/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "invalid-binding",
 		"message": "Cannot bind to a variable declared with {#await ... then} or {:catch} blocks",
-		"pos": 78,
-		"start": { "line": 6, "column": 9, "character": 78 },
-		"end": { "line": 6, "column": 19, "character": 88 }
+		"start": { "line": 6, "column": 9 },
+		"end": { "line": 6, "column": 19 }
 	}
 ]
diff --git a/test/validator/samples/binding-await-then/errors.json b/test/validator/samples/binding-await-then/errors.json
index a611e7731f..4816bf6cf4 100644
--- a/test/validator/samples/binding-await-then/errors.json
+++ b/test/validator/samples/binding-await-then/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "invalid-binding",
 		"message": "Cannot bind to a variable declared with {#await ... then} or {:catch} blocks",
-		"pos": 75,
-		"start": { "line": 5, "column": 9, "character": 75 },
-		"end": { "line": 5, "column": 19, "character": 85 }
+		"start": { "line": 5, "column": 9 },
+		"end": { "line": 5, "column": 19 }
 	}
 ]
diff --git a/test/validator/samples/binding-const/errors.json b/test/validator/samples/binding-const/errors.json
index 6d48af9c4e..e830ca9a67 100644
--- a/test/validator/samples/binding-const/errors.json
+++ b/test/validator/samples/binding-const/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "invalid-binding",
 	"message": "Cannot bind to a variable which is not writable",
-	"pos": 61,
 	"start": {
 		"line": 5,
-		"column": 19,
-		"character": 61
+		"column": 19
 	},
 	"end": {
 		"line": 5,
-		"column": 24,
-		"character": 66
+		"column": 24
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/binding-dimensions-svg-child/errors.json b/test/validator/samples/binding-dimensions-svg-child/errors.json
index bd617771bb..5495572321 100644
--- a/test/validator/samples/binding-dimensions-svg-child/errors.json
+++ b/test/validator/samples/binding-dimensions-svg-child/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "invalid-binding",
 	"message": "'offsetWidth' is not a valid binding on SVG elements",
-	"pos": 51,
 	"start": {
 		"line": 6,
-		"column": 7,
-		"character": 51
+		"column": 7
 	},
 	"end": {
 		"line": 6,
-		"column": 23,
-		"character": 67
+		"column": 23
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/binding-dimensions-svg/errors.json b/test/validator/samples/binding-dimensions-svg/errors.json
index 157f2ee180..63ff7e6dba 100644
--- a/test/validator/samples/binding-dimensions-svg/errors.json
+++ b/test/validator/samples/binding-dimensions-svg/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "invalid-binding",
 	"message": "'offsetWidth' is not a valid binding on <svg>. Use 'clientWidth' instead",
-	"pos": 43,
 	"start": {
 		"line": 5,
-		"column": 5,
-		"character": 43
+		"column": 5
 	},
 	"end": {
 		"line": 5,
-		"column": 21,
-		"character": 59
+		"column": 21
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/binding-dimensions-void/errors.json b/test/validator/samples/binding-dimensions-void/errors.json
index ddd4e359c4..6c6c224d9f 100644
--- a/test/validator/samples/binding-dimensions-void/errors.json
+++ b/test/validator/samples/binding-dimensions-void/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "invalid-binding",
 	"message": "'offsetWidth' is not a valid binding on void elements like <img>. Use a wrapper element instead",
-	"pos": 60,
 	"start": {
 		"line": 5,
-		"column": 22,
-		"character": 60
+		"column": 22
 	},
 	"end": {
 		"line": 5,
-		"column": 38,
-		"character": 76
+		"column": 38
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/binding-input-checked/errors.json b/test/validator/samples/binding-input-checked/errors.json
index 596bd1b4d7..fd479b5b28 100644
--- a/test/validator/samples/binding-input-checked/errors.json
+++ b/test/validator/samples/binding-input-checked/errors.json
@@ -3,13 +3,10 @@
 	"message": "'checked' binding can only be used with <input type=\"checkbox\">",
 	"start": {
 		"line": 5,
-		"column": 7,
-		"character": 37
+		"column": 7
 	},
 	"end": {
 		"line": 5,
-		"column": 25,
-		"character": 55
-	},
-	"pos": 37
-}]
\ No newline at end of file
+		"column": 25
+	}
+}]
diff --git a/test/validator/samples/binding-input-type-boolean/errors.json b/test/validator/samples/binding-input-type-boolean/errors.json
index fcf92356ae..9fcc49f21c 100644
--- a/test/validator/samples/binding-input-type-boolean/errors.json
+++ b/test/validator/samples/binding-input-type-boolean/errors.json
@@ -3,13 +3,10 @@
 	"message": "'type' attribute must be specified",
 	"start": {
 		"line": 5,
-		"column": 24,
-		"character": 54
+		"column": 24
 	},
 	"end": {
 		"line": 5,
-		"column": 28,
-		"character": 58
-	},
-	"pos": 54
-}]
\ No newline at end of file
+		"column": 28
+	}
+}]
diff --git a/test/validator/samples/binding-input-type-dynamic/errors.json b/test/validator/samples/binding-input-type-dynamic/errors.json
index 1e886a8e98..0b7345081e 100644
--- a/test/validator/samples/binding-input-type-dynamic/errors.json
+++ b/test/validator/samples/binding-input-type-dynamic/errors.json
@@ -3,13 +3,10 @@
 	"message": "'type' attribute cannot be dynamic if input uses two-way binding",
 	"start": {
 		"line": 6,
-		"column": 24,
-		"character": 70
+		"column": 24
 	},
 	"end": {
 		"line": 6,
-		"column": 40,
-		"character": 86
-	},
-	"pos": 70
-}]
\ No newline at end of file
+		"column": 40
+	}
+}]
diff --git a/test/validator/samples/binding-invalid-foreign-namespace/errors.json b/test/validator/samples/binding-invalid-foreign-namespace/errors.json
index c726270266..ebc6f681b1 100644
--- a/test/validator/samples/binding-invalid-foreign-namespace/errors.json
+++ b/test/validator/samples/binding-invalid-foreign-namespace/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "invalid-binding",
 	"message": "'value' is not a valid binding. Foreign elements only support bind:this",
-	"pos": 81,
 	"start": {
 		"line": 6,
-		"column": 7,
-		"character": 81
+		"column": 7
 	},
 	"end": {
 		"line": 6,
-		"column": 28,
-		"character": 102
+		"column": 28
 	}
 }]
diff --git a/test/validator/samples/binding-invalid-on-element/errors.json b/test/validator/samples/binding-invalid-on-element/errors.json
index 0db88e3447..92560ae7b9 100644
--- a/test/validator/samples/binding-invalid-on-element/errors.json
+++ b/test/validator/samples/binding-invalid-on-element/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "invalid-binding",
 	"message": "'value' is not a valid binding on <div> elements",
-	"pos": 37,
 	"start": {
 		"line": 5,
-		"column": 5,
-		"character": 37
+		"column": 5
 	},
 	"end": {
 		"line": 5,
-		"column": 15,
-		"character": 47
+		"column": 15
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/binding-invalid-value-global/errors.json b/test/validator/samples/binding-invalid-value-global/errors.json
index be23a21523..10ace85651 100644
--- a/test/validator/samples/binding-invalid-value-global/errors.json
+++ b/test/validator/samples/binding-invalid-value-global/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "binding-undeclared",
 	"message": "foo is not declared",
-	"pos": 58,
 	"start": {
 		"line": 4,
-		"column": 19,
-		"character": 58
+		"column": 19
 	},
 	"end": {
 		"line": 4,
-		"column": 22,
-		"character": 61
+		"column": 22
 	}
 }]
diff --git a/test/validator/samples/binding-invalid-value/errors.json b/test/validator/samples/binding-invalid-value/errors.json
index 07eb7b0f1c..3c358e995d 100644
--- a/test/validator/samples/binding-invalid-value/errors.json
+++ b/test/validator/samples/binding-invalid-value/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "binding-undeclared",
 	"message": "foo is not declared",
-	"pos": 37,
 	"start": {
 		"line": 2,
-		"column": 19,
-		"character": 37
+		"column": 19
 	},
 	"end": {
 		"line": 2,
-		"column": 22,
-		"character": 40
+		"column": 22
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/binding-invalid/errors.json b/test/validator/samples/binding-invalid/errors.json
index 5021da41b6..9fd88e36f8 100644
--- a/test/validator/samples/binding-invalid/errors.json
+++ b/test/validator/samples/binding-invalid/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "invalid-binding",
 	"message": "'whatever' is not a valid binding",
-	"pos": 40,
 	"start": {
 		"line": 5,
-		"column": 5,
-		"character": 40
+		"column": 5
 	},
 	"end": {
 		"line": 5,
-		"column": 18,
-		"character": 53
+		"column": 18
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/binding-let/errors.json b/test/validator/samples/binding-let/errors.json
index 6195a1c3ae..40f1ae1c2d 100644
--- a/test/validator/samples/binding-let/errors.json
+++ b/test/validator/samples/binding-let/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "invalid-binding",
 	"message": "Cannot bind to a variable declared with the let: directive",
-	"pos": 52,
 	"start": {
 		"line": 6,
-		"column": 8,
-		"character": 52
+		"column": 8
 	},
 	"end": {
 		"line": 6,
-		"column": 24,
-		"character": 68
+		"column": 24
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/binding-select-multiple-dynamic/errors.json b/test/validator/samples/binding-select-multiple-dynamic/errors.json
index d7710a201a..7d5ea948c0 100644
--- a/test/validator/samples/binding-select-multiple-dynamic/errors.json
+++ b/test/validator/samples/binding-select-multiple-dynamic/errors.json
@@ -3,13 +3,10 @@
 	"message": "'multiple' attribute cannot be dynamic if select uses two-way binding",
 	"start": {
 		"line": 6,
-		"column": 19,
-		"character": 66
+		"column": 19
 	},
 	"end": {
 		"line": 6,
-		"column": 29,
-		"character": 76
-	},
-	"pos": 66
-}]
\ No newline at end of file
+		"column": 29
+	}
+}]
diff --git a/test/validator/samples/component-dynamic/warnings.json b/test/validator/samples/component-dynamic/warnings.json
index 457ef11a1e..6814a9a3e9 100644
--- a/test/validator/samples/component-dynamic/warnings.json
+++ b/test/validator/samples/component-dynamic/warnings.json
@@ -2,14 +2,11 @@
 	{
 		"code": "reactive-component",
     "message": "<Let/> will not be reactive if Let changes. Use <svelte:component this={Let}/> if you want this reactivity.",
-    "pos": 190,
 		"end": {
-			"character": 197,
 			"column": 7,
 			"line": 15
 		},
 		"start": {
-			"character": 190,
 			"column": 0,
 			"line": 15
 		}
@@ -17,14 +14,11 @@
 	{
     "message": "<ExportLet/> will not be reactive if ExportLet changes. Use <svelte:component this={ExportLet}/> if you want this reactivity.",
 		"code": "reactive-component",
-    "pos": 198,
 		"end": {
-			"character": 211,
 			"column": 13,
 			"line": 16
 		},
 		"start": {
-			"character": 198,
 			"column": 0,
 			"line": 16
 		}
@@ -32,14 +26,11 @@
 	{
     "message": "<Reactive/> will not be reactive if Reactive changes. Use <svelte:component this={Reactive}/> if you want this reactivity.",
 		"code": "reactive-component",
-    "pos": 212,
 		"end": {
-			"character": 224,
 			"column": 12,
 			"line": 17
 		},
 		"start": {
-			"character": 212,
 			"column": 0,
 			"line": 17
 		}
diff --git a/test/validator/samples/component-event-modifiers-invalid/errors.json b/test/validator/samples/component-event-modifiers-invalid/errors.json
index da608063fe..41ef136dae 100644
--- a/test/validator/samples/component-event-modifiers-invalid/errors.json
+++ b/test/validator/samples/component-event-modifiers-invalid/errors.json
@@ -3,13 +3,10 @@
 	"code": "invalid-event-modifier",
 	"start": {
 		"line": 6,
-		"column": 8,
-		"character": 93
+		"column": 8
 	},
 	"end": {
 		"line": 6,
-		"column": 40,
-		"character": 125
-	},
-	"pos": 93
+		"column": 40
+	}
 }]
diff --git a/test/validator/samples/component-invalid-style-directive/errors.json b/test/validator/samples/component-invalid-style-directive/errors.json
index 087f0db651..8c4a686766 100644
--- a/test/validator/samples/component-invalid-style-directive/errors.json
+++ b/test/validator/samples/component-invalid-style-directive/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "invalid-component-style-directive",
 		"message": "Style directives cannot be used on components",
-		"start": { "line": 7, "column": 19, "character": 97 },
-		"end": { "line": 7, "column": 36, "character": 114 },
-		"pos": 97
+		"start": { "line": 7, "column": 19 },
+		"end": { "line": 7, "column": 36 }
 	}
 ]
diff --git a/test/validator/samples/component-name-lowercase/warnings.json b/test/validator/samples/component-name-lowercase/warnings.json
index 57aac0c2a5..92f5a6f429 100644
--- a/test/validator/samples/component-name-lowercase/warnings.json
+++ b/test/validator/samples/component-name-lowercase/warnings.json
@@ -2,14 +2,11 @@
 	{
 		"code": "component-name-lowercase",
 		"message": "<thisShouldWarnMe> will be treated as an HTML element unless it begins with a capital letter",
-		"pos": 121,
 		"start": {
-			"character": 121,
 			"column": 0,
 			"line": 8
 		},
 		"end": {
-			"character": 141,
 			"column": 20,
 			"line": 8
 		}
diff --git a/test/validator/samples/component-slot-default-duplicate.skip/errors.json b/test/validator/samples/component-slot-default-duplicate.skip/errors.json
index f60ddc8524..88aa10c916 100644
--- a/test/validator/samples/component-slot-default-duplicate.skip/errors.json
+++ b/test/validator/samples/component-slot-default-duplicate.skip/errors.json
@@ -3,6 +3,5 @@
 	"start": {
 		"line": 2,
 		"column": 0
-	},
-	"pos": 14
-}]
\ No newline at end of file
+	}
+}]
diff --git a/test/validator/samples/component-slot-default-reserved/errors.json b/test/validator/samples/component-slot-default-reserved/errors.json
index cefb00da8d..e14f693966 100644
--- a/test/validator/samples/component-slot-default-reserved/errors.json
+++ b/test/validator/samples/component-slot-default-reserved/errors.json
@@ -3,13 +3,10 @@
 	"message": "default is a reserved word — it cannot be used as a slot name",
 	"start": {
 		"line": 1,
-		"column": 6,
-		"character": 6
+		"column": 6
 	},
 	"end": {
 		"line": 1,
-		"column": 20,
-		"character": 20
-	},
-	"pos": 6
-}]
\ No newline at end of file
+		"column": 20
+	}
+}]
diff --git a/test/validator/samples/component-slot-dynamic-attribute/errors.json b/test/validator/samples/component-slot-dynamic-attribute/errors.json
index 8944f9cd3e..e99ab7bd50 100644
--- a/test/validator/samples/component-slot-dynamic-attribute/errors.json
+++ b/test/validator/samples/component-slot-dynamic-attribute/errors.json
@@ -3,13 +3,10 @@
 	"message": "slot attribute cannot have a dynamic value",
 	"start": {
 		"line": 6,
-		"column": 9,
-		"character": 77
+		"column": 9
 	},
 	"end": {
 		"line": 6,
-		"column": 19,
-		"character": 87
-	},
-	"pos": 77
-}]
\ No newline at end of file
+		"column": 19
+	}
+}]
diff --git a/test/validator/samples/component-slot-dynamic/errors.json b/test/validator/samples/component-slot-dynamic/errors.json
index 959aa87fd2..a449d253ef 100644
--- a/test/validator/samples/component-slot-dynamic/errors.json
+++ b/test/validator/samples/component-slot-dynamic/errors.json
@@ -3,13 +3,10 @@
 	"message": "<slot> name cannot be dynamic",
 	"start": {
 		"line": 1,
-		"column": 6,
-		"character": 6
+		"column": 6
 	},
 	"end": {
 		"line": 1,
-		"column": 18,
-		"character": 18
-	},
-	"pos": 6
-}]
\ No newline at end of file
+		"column": 18
+	}
+}]
diff --git a/test/validator/samples/component-slot-named-duplicate.skip/errors.json b/test/validator/samples/component-slot-named-duplicate.skip/errors.json
index 8e5d995da6..cf83e4db0b 100644
--- a/test/validator/samples/component-slot-named-duplicate.skip/errors.json
+++ b/test/validator/samples/component-slot-named-duplicate.skip/errors.json
@@ -3,6 +3,5 @@
 	"start": {
 		"line": 2,
 		"column": 6
-	},
-	"pos": 31
-}]
\ No newline at end of file
+	}
+}]
diff --git a/test/validator/samples/component-slotted-custom-element-2/errors.json b/test/validator/samples/component-slotted-custom-element-2/errors.json
index 06be51d72d..a0be2a67ac 100644
--- a/test/validator/samples/component-slotted-custom-element-2/errors.json
+++ b/test/validator/samples/component-slotted-custom-element-2/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "invalid-slotted-content",
 		"message": "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element",
-		"start": { "line": 10, "column": 9, "character": 138 },
-		"end": { "line": 10, "column": 19, "character": 148 },
-		"pos": 138
+		"start": { "line": 10, "column": 9 },
+		"end": { "line": 10, "column": 19 }
 	}
 ]
diff --git a/test/validator/samples/component-slotted-each-block/errors.json b/test/validator/samples/component-slotted-each-block/errors.json
index 2944acae17..b6e46fff00 100644
--- a/test/validator/samples/component-slotted-each-block/errors.json
+++ b/test/validator/samples/component-slotted-each-block/errors.json
@@ -3,13 +3,10 @@
 	"message": "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element",
 	"start": {
 		"line": 7,
-		"column": 7,
-		"character": 100
+		"column": 7
 	},
 	"end": {
 		"line": 7,
-		"column": 17,
-		"character": 110
-	},
-	"pos": 100
-}]
\ No newline at end of file
+		"column": 17
+	}
+}]
diff --git a/test/validator/samples/component-slotted-if-block/errors.json b/test/validator/samples/component-slotted-if-block/errors.json
index 3ae07c1b3b..b6e46fff00 100644
--- a/test/validator/samples/component-slotted-if-block/errors.json
+++ b/test/validator/samples/component-slotted-if-block/errors.json
@@ -3,13 +3,10 @@
 	"message": "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element",
 	"start": {
 		"line": 7,
-		"column": 7,
-		"character": 88
+		"column": 7
 	},
 	"end": {
 		"line": 7,
-		"column": 17,
-		"character": 98
-	},
-	"pos": 88
-}]
\ No newline at end of file
+		"column": 17
+	}
+}]
diff --git a/test/validator/samples/const-tag-conflict-1/errors.json b/test/validator/samples/const-tag-conflict-1/errors.json
index 59c72eccaf..d92528566a 100644
--- a/test/validator/samples/const-tag-conflict-1/errors.json
+++ b/test/validator/samples/const-tag-conflict-1/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "invalid-const-declaration",
 		"message": "'a' has already been declared",
-		"start": { "line": 7, "column": 2, "character": 84 },
-		"end": { "line": 7, "column": 19, "character": 101 },
-		"pos": 84
+		"start": { "line": 7, "column": 2 },
+		"end": { "line": 7, "column": 19 }
 	}
 ]
diff --git a/test/validator/samples/const-tag-conflict-2/errors.json b/test/validator/samples/const-tag-conflict-2/errors.json
index 11e2535091..7636f8fcbc 100644
--- a/test/validator/samples/const-tag-conflict-2/errors.json
+++ b/test/validator/samples/const-tag-conflict-2/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "invalid-const-declaration",
 		"message": "'item' has already been declared",
-		"start": { "line": 6, "column": 2, "character": 64 },
-		"end": { "line": 6, "column": 21, "character": 83 },
-		"pos": 64
+		"start": { "line": 6, "column": 2 },
+		"end": { "line": 6, "column": 21 }
 	}
 ]
diff --git a/test/validator/samples/const-tag-cyclical/errors.json b/test/validator/samples/const-tag-cyclical/errors.json
index 1436747798..2b13e575cf 100644
--- a/test/validator/samples/const-tag-cyclical/errors.json
+++ b/test/validator/samples/const-tag-cyclical/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "cyclical-const-tags",
 		"message": "Cyclical dependency detected: b → c → b",
-		"start": { "line": 6, "column": 2, "character": 61 },
-		"end": { "line": 6, "column": 20, "character": 79 },
-		"pos": 61
+		"start": { "line": 6, "column": 2 },
+		"end": { "line": 6, "column": 20 }
 	}
 ]
diff --git a/test/validator/samples/const-tag-out-of-scope/warnings.json b/test/validator/samples/const-tag-out-of-scope/warnings.json
index c85b417fe4..37696bf417 100644
--- a/test/validator/samples/const-tag-out-of-scope/warnings.json
+++ b/test/validator/samples/const-tag-out-of-scope/warnings.json
@@ -2,14 +2,11 @@
 	{
 		"code": "missing-declaration",
 		"message": "'b' is not defined",
-		"pos": 100,
 		"start": {
-			"character": 100,
 			"column": 1,
 			"line": 10
 		},
 		"end": {
-			"character": 101,
 			"column": 2,
 			"line": 10
 		}
diff --git a/test/validator/samples/const-tag-placement-1/errors.json b/test/validator/samples/const-tag-placement-1/errors.json
index 5291b3a351..f90fcf80ab 100644
--- a/test/validator/samples/const-tag-placement-1/errors.json
+++ b/test/validator/samples/const-tag-placement-1/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "invalid-const-placement",
 		"message": "{@const} must be the immediate child of {#if}, {:else if}, {:else}, {#each}, {:then}, {:catch}, <svelte:fragment> or <Component>",
-		"start": { "line": 5, "column": 0, "character": 36 },
-		"end": { "line": 5, "column": 18, "character": 54 },
-		"pos": 36
+		"start": { "line": 5, "column": 0 },
+		"end": { "line": 5, "column": 18 }
 	}
 ]
diff --git a/test/validator/samples/const-tag-placement-2/errors.json b/test/validator/samples/const-tag-placement-2/errors.json
index 9922063a1d..1124d0b4f8 100644
--- a/test/validator/samples/const-tag-placement-2/errors.json
+++ b/test/validator/samples/const-tag-placement-2/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "invalid-const-placement",
 		"message": "{@const} must be the immediate child of {#if}, {:else if}, {:else}, {#each}, {:then}, {:catch}, <svelte:fragment> or <Component>",
-		"start": { "line": 7, "column": 4, "character": 63 },
-		"end": { "line": 7, "column": 18, "character": 77 },
-		"pos": 63
+		"start": { "line": 7, "column": 4 },
+		"end": { "line": 7, "column": 18 }
 	}
 ]
diff --git a/test/validator/samples/const-tag-readonly-1/errors.json b/test/validator/samples/const-tag-readonly-1/errors.json
index ed60c529fd..8aa10a4d80 100644
--- a/test/validator/samples/const-tag-readonly-1/errors.json
+++ b/test/validator/samples/const-tag-readonly-1/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "invalid-const-update",
 		"message": "'b' is declared using {@const ...} and is read-only",
-		"start": { "line": 7, "column": 26, "character": 106 },
-		"end": { "line": 7, "column": 30, "character": 110 },
-		"pos": 106
+		"start": { "line": 7, "column": 26 },
+		"end": { "line": 7, "column": 30 }
 	}
 ]
diff --git a/test/validator/samples/const-tag-readonly-2/errors.json b/test/validator/samples/const-tag-readonly-2/errors.json
index 746a21e86a..15307d637e 100644
--- a/test/validator/samples/const-tag-readonly-2/errors.json
+++ b/test/validator/samples/const-tag-readonly-2/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "invalid-binding",
 		"message": "Cannot bind to a variable declared with {@const ...}",
-		"start": { "line": 7, "column": 9, "character": 89 },
-		"end": { "line": 7, "column": 23, "character": 103 },
-		"pos": 89
+		"start": { "line": 7, "column": 9 },
+		"end": { "line": 7, "column": 23 }
 	}
 ]
diff --git a/test/validator/samples/contenteditable-dynamic/errors.json b/test/validator/samples/contenteditable-dynamic/errors.json
index 0c4c5585a6..b01a089809 100644
--- a/test/validator/samples/contenteditable-dynamic/errors.json
+++ b/test/validator/samples/contenteditable-dynamic/errors.json
@@ -3,13 +3,10 @@
 	"message": "'contenteditable' attribute cannot be dynamic if element uses two-way binding",
 	"start": {
 		"line": 6,
-		"column": 8,
-		"character": 73
+		"column": 8
 	},
 	"end": {
 		"line": 6,
-		"column": 32,
-		"character": 97
-	},
-	"pos": 73
-}]
\ No newline at end of file
+		"column": 32
+	}
+}]
diff --git a/test/validator/samples/contenteditable-missing/errors.json b/test/validator/samples/contenteditable-missing/errors.json
index 53d5af4928..23df8e6d83 100644
--- a/test/validator/samples/contenteditable-missing/errors.json
+++ b/test/validator/samples/contenteditable-missing/errors.json
@@ -3,13 +3,10 @@
 	"message": "'contenteditable' attribute is required for textContent and innerHTML two-way bindings",
 	"start": {
 		"line": 4,
-		"column": 8,
-		"character": 48
+		"column": 8
 	},
 	"end": {
 		"line": 4,
-		"column": 31,
-		"character": 71
-	},
-	"pos": 48
-}]
\ No newline at end of file
+		"column": 31
+	}
+}]
diff --git a/test/validator/samples/css-invalid-combinator-selector-1/errors.json b/test/validator/samples/css-invalid-combinator-selector-1/errors.json
index b50fb678f0..3bce9fbc01 100644
--- a/test/validator/samples/css-invalid-combinator-selector-1/errors.json
+++ b/test/validator/samples/css-invalid-combinator-selector-1/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "css-invalid-selector",
 		"message": "Invalid selector \"> span\"",
-		"start": { "line": 10, "column": 1, "character": 88 },
-		"end": { "line": 10, "column": 7, "character": 94 },
-		"pos": 88
+		"start": { "line": 10, "column": 1 },
+		"end": { "line": 10, "column": 7 }
 	}
 ]
diff --git a/test/validator/samples/css-invalid-combinator-selector-2/errors.json b/test/validator/samples/css-invalid-combinator-selector-2/errors.json
index 8c55da03c8..38305e106b 100644
--- a/test/validator/samples/css-invalid-combinator-selector-2/errors.json
+++ b/test/validator/samples/css-invalid-combinator-selector-2/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "css-invalid-selector",
 		"message": "Invalid selector \"+ p\"",
-		"start": { "line": 8, "column": 1, "character": 68 },
-		"end": { "line": 8, "column": 4, "character": 71 },
-		"pos": 68
+		"start": { "line": 8, "column": 1 },
+		"end": { "line": 8, "column": 4 }
 	}
 ]
diff --git a/test/validator/samples/css-invalid-combinator-selector-3/errors.json b/test/validator/samples/css-invalid-combinator-selector-3/errors.json
index 869cc09c95..ad35720249 100644
--- a/test/validator/samples/css-invalid-combinator-selector-3/errors.json
+++ b/test/validator/samples/css-invalid-combinator-selector-3/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "css-invalid-selector",
 		"message": "Invalid selector \"> span\"",
-		"start": { "line": 5, "column": 2, "character": 44 },
-		"end": { "line": 5, "column": 8, "character": 50 },
-		"pos": 44
+		"start": { "line": 5, "column": 2 },
+		"end": { "line": 5, "column": 8 }
 	}
 ]
diff --git a/test/validator/samples/css-invalid-combinator-selector-4/errors.json b/test/validator/samples/css-invalid-combinator-selector-4/errors.json
index 239704f48e..78b0815863 100644
--- a/test/validator/samples/css-invalid-combinator-selector-4/errors.json
+++ b/test/validator/samples/css-invalid-combinator-selector-4/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "css-invalid-selector",
 		"message": "Invalid selector \"p >\"",
-		"start": { "line": 4, "column": 1, "character": 26 },
-		"end": { "line": 4, "column": 4, "character": 29 },
-		"pos": 26
+		"start": { "line": 4, "column": 1 },
+		"end": { "line": 4, "column": 4 }
 	}
 ]
diff --git a/test/validator/samples/css-invalid-global-placement-2/errors.json b/test/validator/samples/css-invalid-global-placement-2/errors.json
index 4594469cc2..a5b7fdcac2 100644
--- a/test/validator/samples/css-invalid-global-placement-2/errors.json
+++ b/test/validator/samples/css-invalid-global-placement-2/errors.json
@@ -3,13 +3,10 @@
 	"message": ":global(...) can be at the start or end of a selector sequence, but not in the middle",
 	"start": {
 		"line": 2,
-		"column": 6,
-		"character": 14
+		"column": 6
 	},
 	"end": {
 		"line": 2,
-		"column": 19,
-		"character": 27
-	},
-	"pos": 14
+		"column": 19
+	}
 }]
diff --git a/test/validator/samples/css-invalid-global-placement-3/errors.json b/test/validator/samples/css-invalid-global-placement-3/errors.json
index dc9d605c2c..796604895c 100644
--- a/test/validator/samples/css-invalid-global-placement-3/errors.json
+++ b/test/validator/samples/css-invalid-global-placement-3/errors.json
@@ -3,13 +3,10 @@
 	"message": ":global(...) can be at the start or end of a selector sequence, but not in the middle",
 	"start": {
 		"line": 5,
-		"column": 6,
-		"character": 60
+		"column": 6
 	},
 	"end": {
 		"line": 5,
-		"column": 19,
-		"character": 73
-	},
-	"pos": 60
+		"column": 19
+	}
 }]
diff --git a/test/validator/samples/css-invalid-global-placement/errors.json b/test/validator/samples/css-invalid-global-placement/errors.json
index 6e7e9be0ce..a5b7fdcac2 100644
--- a/test/validator/samples/css-invalid-global-placement/errors.json
+++ b/test/validator/samples/css-invalid-global-placement/errors.json
@@ -3,13 +3,10 @@
 	"message": ":global(...) can be at the start or end of a selector sequence, but not in the middle",
 	"start": {
 		"line": 2,
-		"column": 6,
-		"character": 14
+		"column": 6
 	},
 	"end": {
 		"line": 2,
-		"column": 19,
-		"character": 27
-	},
-	"pos": 14
-}]
\ No newline at end of file
+		"column": 19
+	}
+}]
diff --git a/test/validator/samples/css-invalid-global-selector-2/errors.json b/test/validator/samples/css-invalid-global-selector-2/errors.json
index 3317925b00..3049ff71ef 100644
--- a/test/validator/samples/css-invalid-global-selector-2/errors.json
+++ b/test/validator/samples/css-invalid-global-selector-2/errors.json
@@ -4,14 +4,11 @@
 		"message": ":global(...) must contain a single selector",
 		"start": {
 			"line": 11,
-			"column": 5,
-			"character": 156
+			"column": 5
 		},
 		"end": {
 			"line": 11,
-			"column": 29,
-			"character": 180
-		},
-		"pos": 156
+			"column": 29
+		}
 	}
 ]
diff --git a/test/validator/samples/css-invalid-global-selector-3/errors.json b/test/validator/samples/css-invalid-global-selector-3/errors.json
index abc516a504..651acb3089 100644
--- a/test/validator/samples/css-invalid-global-selector-3/errors.json
+++ b/test/validator/samples/css-invalid-global-selector-3/errors.json
@@ -4,14 +4,11 @@
 		"message": ":global(...) must contain a single selector",
 		"start": {
 			"line": 5,
-			"column": 5,
-			"character": 77
+			"column": 5
 		},
 		"end": {
 			"line": 5,
-			"column": 44,
-			"character": 116
-		},
-		"pos": 77
+			"column": 44
+		}
 	}
 ]
diff --git a/test/validator/samples/css-invalid-global-selector-4/errors.json b/test/validator/samples/css-invalid-global-selector-4/errors.json
index 8d76cb63c0..c1bb229deb 100644
--- a/test/validator/samples/css-invalid-global-selector-4/errors.json
+++ b/test/validator/samples/css-invalid-global-selector-4/errors.json
@@ -4,14 +4,11 @@
 		"message": ":global(...) must contain a single selector",
 		"start": {
 			"line": 2,
-			"column": 5,
-			"character": 13
+			"column": 5
 		},
 		"end": {
 			"line": 2,
-			"column": 24,
-			"character": 32
-		},
-		"pos": 13
+			"column": 24
+		}
 	}
 ]
diff --git a/test/validator/samples/css-invalid-global-selector-5/errors.json b/test/validator/samples/css-invalid-global-selector-5/errors.json
index 8129b236e6..9efd2be5a2 100644
--- a/test/validator/samples/css-invalid-global-selector-5/errors.json
+++ b/test/validator/samples/css-invalid-global-selector-5/errors.json
@@ -4,14 +4,11 @@
 		"message": ":global(...) must contain a single selector",
 		"start": {
 			"line": 5,
-			"column": 1,
-			"character": 54
+			"column": 1
 		},
 		"end": {
 			"line": 5,
-			"column": 20,
-			"character": 73
-		},
-		"pos": 54
+			"column": 20
+		}
 	}
 ]
diff --git a/test/validator/samples/css-invalid-global-selector-6/errors.json b/test/validator/samples/css-invalid-global-selector-6/errors.json
index 8129b236e6..9efd2be5a2 100644
--- a/test/validator/samples/css-invalid-global-selector-6/errors.json
+++ b/test/validator/samples/css-invalid-global-selector-6/errors.json
@@ -4,14 +4,11 @@
 		"message": ":global(...) must contain a single selector",
 		"start": {
 			"line": 5,
-			"column": 1,
-			"character": 54
+			"column": 1
 		},
 		"end": {
 			"line": 5,
-			"column": 20,
-			"character": 73
-		},
-		"pos": 54
+			"column": 20
+		}
 	}
 ]
diff --git a/test/validator/samples/css-invalid-global-selector/errors.json b/test/validator/samples/css-invalid-global-selector/errors.json
index 7b2d5123b0..c7ef17faf9 100644
--- a/test/validator/samples/css-invalid-global-selector/errors.json
+++ b/test/validator/samples/css-invalid-global-selector/errors.json
@@ -4,14 +4,11 @@
 		"message": ":global(...) must contain a single selector",
 		"start": {
 			"line": 11,
-			"column": 5,
-			"character": 143
+			"column": 5
 		},
 		"end": {
 			"line": 11,
-			"column": 24,
-			"character": 162
-		},
-		"pos": 143
+			"column": 24
+		}
 	}
 ]
diff --git a/test/validator/samples/debug-invalid-args/errors.json b/test/validator/samples/debug-invalid-args/errors.json
index a92fb017a1..642d7e001e 100644
--- a/test/validator/samples/debug-invalid-args/errors.json
+++ b/test/validator/samples/debug-invalid-args/errors.json
@@ -3,13 +3,10 @@
 	"message": "{@debug ...} arguments must be identifiers, not arbitrary expressions",
 	"start": {
 		"line": 2,
-		"column": 9,
-		"character": 13
+		"column": 9
 	},
 	"end": {
 		"line": 2,
-		"column": 9,
-		"character": 13
-	},
-	"pos": 13
-}]
\ No newline at end of file
+		"column": 9
+	}
+}]
diff --git a/test/validator/samples/default-export-anonymous-class/errors.json b/test/validator/samples/default-export-anonymous-class/errors.json
index 0a410e5eda..66746ad84c 100644
--- a/test/validator/samples/default-export-anonymous-class/errors.json
+++ b/test/validator/samples/default-export-anonymous-class/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "default-export",
 	"message": "A component cannot have a default export",
-	"pos": 10,
 	"start": {
 		"line": 2,
-		"column": 1,
-		"character": 10
+		"column": 1
 	},
 	"end": {
 		"line": 2,
-		"column": 30,
-		"character": 39
+		"column": 30
 	}
 }]
diff --git a/test/validator/samples/default-export-anonymous-function/errors.json b/test/validator/samples/default-export-anonymous-function/errors.json
index 1f144e8392..dd80d7f77c 100644
--- a/test/validator/samples/default-export-anonymous-function/errors.json
+++ b/test/validator/samples/default-export-anonymous-function/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "default-export",
 	"message": "A component cannot have a default export",
-	"pos": 10,
 	"start": {
 		"line": 2,
-		"column": 1,
-		"character": 10
+		"column": 1
 	},
 	"end": {
 		"line": 2,
-		"column": 24,
-		"character": 33
+		"column": 24
 	}
 }]
diff --git a/test/validator/samples/default-export/errors.json b/test/validator/samples/default-export/errors.json
index 45544fe4a1..2141aabadb 100644
--- a/test/validator/samples/default-export/errors.json
+++ b/test/validator/samples/default-export/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "default-export",
 	"message": "A component cannot have a default export",
-	"pos": 10,
 	"start": {
 		"line": 2,
-		"column": 1,
-		"character": 10
+		"column": 1
 	},
 	"end": {
 		"line": 2,
-		"column": 19,
-		"character": 28
+		"column": 19
 	}
 }]
diff --git a/test/validator/samples/directive-non-expression/errors.json b/test/validator/samples/directive-non-expression/errors.json
index c606963b68..996e1a9a4d 100644
--- a/test/validator/samples/directive-non-expression/errors.json
+++ b/test/validator/samples/directive-non-expression/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "invalid-directive-value",
 	"message": "Directive value must be a JavaScript expression enclosed in curly braces",
-	"pos": 15,
 	"start": {
 		"line": 1,
-		"column": 15,
-		"character": 15
+		"column": 15
 	},
 	"end": {
 		"line": 1,
-		"column": 15,
-		"character": 15
+		"column": 15
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/dollar-dollar-global-in-markup/errors.json b/test/validator/samples/dollar-dollar-global-in-markup/errors.json
index 4730c5152e..da11fa4ecd 100644
--- a/test/validator/samples/dollar-dollar-global-in-markup/errors.json
+++ b/test/validator/samples/dollar-dollar-global-in-markup/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "illegal-global",
 	"message": "$$billsyall is an illegal variable name",
-	"pos": 1,
 	"start": {
 		"line": 1,
-		"column": 1,
-		"character": 1
+		"column": 1
 	},
 	"end": {
 		"line": 1,
-		"column": 12,
-		"character": 12
+		"column": 12
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/dollar-dollar-global-in-script/errors.json b/test/validator/samples/dollar-dollar-global-in-script/errors.json
index 5c923e35f7..515b14db1f 100644
--- a/test/validator/samples/dollar-dollar-global-in-script/errors.json
+++ b/test/validator/samples/dollar-dollar-global-in-script/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "illegal-global",
 	"message": "$$billsyall is an illegal variable name",
-	"pos": 10,
 	"start": {
 		"line": 2,
-		"column": 1,
-		"character": 10
+		"column": 1
 	},
 	"end": {
 		"line": 2,
-		"column": 12,
-		"character": 21
+		"column": 12
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/dollar-global-in-markup/errors.json b/test/validator/samples/dollar-global-in-markup/errors.json
index 6cdf67e872..90ffe78459 100644
--- a/test/validator/samples/dollar-global-in-markup/errors.json
+++ b/test/validator/samples/dollar-global-in-markup/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "illegal-global",
 	"message": "$ is an illegal variable name",
-	"pos": 1,
 	"start": {
 		"line": 1,
-		"column": 1,
-		"character": 1
+		"column": 1
 	},
 	"end": {
 		"line": 1,
-		"column": 2,
-		"character": 2
+		"column": 2
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/dollar-global-in-script/errors.json b/test/validator/samples/dollar-global-in-script/errors.json
index 2a6bd7ce7a..d1b90ac288 100644
--- a/test/validator/samples/dollar-global-in-script/errors.json
+++ b/test/validator/samples/dollar-global-in-script/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "illegal-global",
 	"message": "$ is an illegal variable name",
-	"pos": 10,
 	"start": {
 		"line": 2,
-		"column": 1,
-		"character": 10
+		"column": 1
 	},
 	"end": {
 		"line": 2,
-		"column": 2,
-		"character": 11
+		"column": 2
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/dynamic-element-invalid-tag/errors.json b/test/validator/samples/dynamic-element-invalid-tag/errors.json
index c8d3c52490..591a1ce540 100644
--- a/test/validator/samples/dynamic-element-invalid-tag/errors.json
+++ b/test/validator/samples/dynamic-element-invalid-tag/errors.json
@@ -4,14 +4,11 @@
 		"code": "invalid-element-definition",
 		"start": {
 			"line": 2,
-			"column": 17,
-			"character": 23
+			"column": 17
 		},
 		"end": {
 			"line": 2,
-			"column": 17,
-			"character": 23
-		},
-		"pos": 23
+			"column": 17
+		}
 	}
 ]
diff --git a/test/validator/samples/dynamic-element-missing-tag/errors.json b/test/validator/samples/dynamic-element-missing-tag/errors.json
index 8243deeb80..0f2cee5a2a 100644
--- a/test/validator/samples/dynamic-element-missing-tag/errors.json
+++ b/test/validator/samples/dynamic-element-missing-tag/errors.json
@@ -3,13 +3,10 @@
 	"message": "<svelte:element> must have a 'this' attribute",
 	"start": {
 		"line": 2,
-		"column": 1,
-		"character": 7
+		"column": 1
 	},
 	"end": {
 		"line": 2,
-		"column": 1,
-		"character": 7
-	},
-	"pos": 7
+		"column": 1
+	}
 }]
diff --git a/test/validator/samples/dynamic-element-this/errors.json b/test/validator/samples/dynamic-element-this/errors.json
index 7d61c20ee2..c7294a10c8 100644
--- a/test/validator/samples/dynamic-element-this/errors.json
+++ b/test/validator/samples/dynamic-element-this/errors.json
@@ -3,13 +3,10 @@
 	"message": "'this' is a reserved word in JavaScript and cannot be used here",
 	"start": {
 		"line": 2,
-		"column": 18,
-		"character": 24
+		"column": 18
 	},
 	"end": {
 		"line": 2,
-		"column": 18,
-		"character": 24
-	},
-	"pos": 24
+		"column": 18
+	}
 	}]
diff --git a/test/validator/samples/each-block-destructured-object-rest-comma-after/errors.json b/test/validator/samples/each-block-destructured-object-rest-comma-after/errors.json
index df899b7702..7d88595e4b 100644
--- a/test/validator/samples/each-block-destructured-object-rest-comma-after/errors.json
+++ b/test/validator/samples/each-block-destructured-object-rest-comma-after/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "parse-error",
 	"message": "Comma is not permitted after the rest element",
-	"pos": 100,
 	"start": {
 		"line": 5,
-		"column": 53,
-		"character": 100
+		"column": 53
 	},
 	"end": {
 		"line": 5,
-		"column": 53,
-		"character": 100
+		"column": 53
 	}
 }]
diff --git a/test/validator/samples/each-block-invalid-context-destructured-object/errors.json b/test/validator/samples/each-block-invalid-context-destructured-object/errors.json
index c96e3d2c8c..1bc273844c 100644
--- a/test/validator/samples/each-block-invalid-context-destructured-object/errors.json
+++ b/test/validator/samples/each-block-invalid-context-destructured-object/errors.json
@@ -3,13 +3,10 @@
 	"message": "Unexpected keyword 'case'",
 	"start": {
 		"line": 1,
-		"column": 18,
-		"character": 18
+		"column": 18
 	},
 	"end": {
 		"line": 1,
-		"column": 18,
-		"character": 18
-	},
-	"pos": 18
+		"column": 18
+	}
 }]
diff --git a/test/validator/samples/each-block-invalid-context-destructured/errors.json b/test/validator/samples/each-block-invalid-context-destructured/errors.json
index 62d6f62e87..51bf42e575 100644
--- a/test/validator/samples/each-block-invalid-context-destructured/errors.json
+++ b/test/validator/samples/each-block-invalid-context-destructured/errors.json
@@ -3,13 +3,10 @@
 	"message": "Unexpected token",
 	"start": {
 		"line": 1,
-		"column": 17,
-		"character": 17
+		"column": 17
 	},
 	"end": {
 		"line": 1,
-		"column": 17,
-		"character": 17
-	},
-	"pos": 17
-}]
\ No newline at end of file
+		"column": 17
+	}
+}]
diff --git a/test/validator/samples/each-block-invalid-context/errors.json b/test/validator/samples/each-block-invalid-context/errors.json
index f997aa269f..898551f1cb 100644
--- a/test/validator/samples/each-block-invalid-context/errors.json
+++ b/test/validator/samples/each-block-invalid-context/errors.json
@@ -3,13 +3,10 @@
 	"message": "'case' is a reserved word in JavaScript and cannot be used here",
 	"start": {
 		"line": 1,
-		"column": 16,
-		"character": 16
+		"column": 16
 	},
 	"end": {
 		"line": 1,
-		"column": 16,
-		"character": 16
-	},
-	"pos": 16
-}]
\ No newline at end of file
+		"column": 16
+	}
+}]
diff --git a/test/validator/samples/empty-block/warnings.json b/test/validator/samples/empty-block/warnings.json
index d563970425..11ca8e204e 100644
--- a/test/validator/samples/empty-block/warnings.json
+++ b/test/validator/samples/empty-block/warnings.json
@@ -4,29 +4,23 @@
 		"message": "Empty block",
 		"start": {
 			"line": 5,
-			"column": 0,
-			"character": 38
+			"column": 0
 		},
 		"end": {
 			"line": 7,
-			"column": 7,
-			"character": 70
-		},
-		"pos": 38
+			"column": 7
+		}
 	},
 	{
 		"code": "empty-block",
 		"message": "Empty block",
 		"start": {
 			"line": 9,
-			"column": 0,
-			"character": 72
+			"column": 0
 		},
 		"end": {
 			"line": 9,
-			"column": 30,
-			"character": 102
-		},
-		"pos": 72
+			"column": 30
+		}
 	}
-]
\ No newline at end of file
+]
diff --git a/test/validator/samples/error-mode-warn/warnings.json b/test/validator/samples/error-mode-warn/warnings.json
index cce6324df5..cf2963c959 100644
--- a/test/validator/samples/error-mode-warn/warnings.json
+++ b/test/validator/samples/error-mode-warn/warnings.json
@@ -2,29 +2,23 @@
 	{
 		"code": "invalid-binding",
 		"message": "Cannot bind to a variable which is not writable",
-		"pos": 61,
 		"start": {
 			"line": 5,
-			"column": 19,
-			"character": 61
+			"column": 19
 		},
 		"end": {
 			"line": 5,
-			"column": 24,
-			"character": 66
+			"column": 24
 		}
 	},
 	{
 		"code": "missing-declaration",
 		"message": "'undeclared' is not defined",
-		"pos": 88,
 		"start": {
-			"character": 88,
 			"column": 19,
 			"line": 6
 		},
 		"end": {
-			"character": 98,
 			"column": 29,
 			"line": 6
 		}
@@ -32,16 +26,13 @@
 	{
 		"code": "binding-undeclared",
 		"message": "undeclared is not declared",
-		"pos": 88,
 		"end": {
-			"character": 98,
 			"column": 29,
 			"line": 6
 		},
 		"start": {
-			"character": 88,
 			"column": 19,
 			"line": 6
 		}
 	}
-]
\ No newline at end of file
+]
diff --git a/test/validator/samples/event-modifiers-invalid-nonpassive/errors.json b/test/validator/samples/event-modifiers-invalid-nonpassive/errors.json
index a7e5a2a76c..3772fcef49 100644
--- a/test/validator/samples/event-modifiers-invalid-nonpassive/errors.json
+++ b/test/validator/samples/event-modifiers-invalid-nonpassive/errors.json
@@ -3,13 +3,10 @@
 	"code": "invalid-event-modifier",
 	"start": {
 		"line": 1,
-		"column": 5,
-		"character": 5
+		"column": 5
 	},
 	"end": {
 		"line": 1,
-		"column": 51,
-		"character": 51
-	},
-	"pos": 5
+		"column": 51
+	}
 }]
diff --git a/test/validator/samples/event-modifiers-invalid-passive/errors.json b/test/validator/samples/event-modifiers-invalid-passive/errors.json
index 93807d0a4e..a92927685d 100644
--- a/test/validator/samples/event-modifiers-invalid-passive/errors.json
+++ b/test/validator/samples/event-modifiers-invalid-passive/errors.json
@@ -3,13 +3,10 @@
 	"code": "invalid-event-modifier",
 	"start": {
 		"line": 1,
-		"column": 5,
-		"character": 5
+		"column": 5
 	},
 	"end": {
 		"line": 1,
-		"column": 50,
-		"character": 50
-	},
-	"pos": 5
+		"column": 50
+	}
 }]
diff --git a/test/validator/samples/event-modifiers-invalid/errors.json b/test/validator/samples/event-modifiers-invalid/errors.json
index ea6de4ce34..628bf2eaed 100644
--- a/test/validator/samples/event-modifiers-invalid/errors.json
+++ b/test/validator/samples/event-modifiers-invalid/errors.json
@@ -3,13 +3,10 @@
 	"code": "invalid-event-modifier",
 	"start": {
 		"line": 1,
-		"column": 8,
-		"character": 8
+		"column": 8
 	},
 	"end": {
 		"line": 1,
-		"column": 34,
-		"character": 34
-	},
-	"pos": 8
+		"column": 34
+	}
 }]
diff --git a/test/validator/samples/event-modifiers-legacy/errors.json b/test/validator/samples/event-modifiers-legacy/errors.json
index 2e340b7b2f..cb6c345476 100644
--- a/test/validator/samples/event-modifiers-legacy/errors.json
+++ b/test/validator/samples/event-modifiers-legacy/errors.json
@@ -3,13 +3,10 @@
 	"code": "invalid-event-modifier",
 	"start": {
 		"line": 1,
-		"column": 8,
-		"character": 8
+		"column": 8
 	},
 	"end": {
 		"line": 1,
-		"column": 37,
-		"character": 37
-	},
-	"pos": 8
+		"column": 37
+	}
 }]
diff --git a/test/validator/samples/event-modifiers-redundant/warnings.json b/test/validator/samples/event-modifiers-redundant/warnings.json
index e3b9110427..e5ff27b728 100644
--- a/test/validator/samples/event-modifiers-redundant/warnings.json
+++ b/test/validator/samples/event-modifiers-redundant/warnings.json
@@ -4,29 +4,23 @@
 		"code": "redundant-event-modifier",
 		"start": {
 			"line": 11,
-			"column": 8,
-			"character": 110
+			"column": 8
 		},
 		"end": {
 			"line": 11,
-			"column": 40,
-			"character": 142
-		},
-		"pos": 110
+			"column": 40
+		}
 	},
 	{
 		"message": "Touch event handlers that don't use the 'event' object are passive by default",
 		"code": "redundant-event-modifier",
 		"start": {
 			"line": 12,
-			"column": 5,
-			"character": 158
+			"column": 5
 		},
 		"end": {
 			"line": 12,
-			"column": 47,
-			"character": 200
-		},
-		"pos": 158
+			"column": 47
+		}
 	}
 ]
diff --git a/test/validator/samples/html-block-in-attribute/errors.json b/test/validator/samples/html-block-in-attribute/errors.json
index 7cfe43dc0b..3e73629dc0 100644
--- a/test/validator/samples/html-block-in-attribute/errors.json
+++ b/test/validator/samples/html-block-in-attribute/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "invalid-tag-placement",
 		"message": "{@html} tag cannot be in attribute value",
-		"start": { "line": 1, "column": 12, "character": 12 },
-		"end": { "line": 1, "column": 12, "character": 12 },
-		"pos": 12
+		"start": { "line": 1, "column": 12 },
+		"end": { "line": 1, "column": 12 }
 	}
 ]
diff --git a/test/validator/samples/html-block-in-textarea/errors.json b/test/validator/samples/html-block-in-textarea/errors.json
index 756fa5ad3e..ea01211d4a 100644
--- a/test/validator/samples/html-block-in-textarea/errors.json
+++ b/test/validator/samples/html-block-in-textarea/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "invalid-tag-placement",
 		"message": "{@html} tag cannot be inside <textarea>",
-		"start": { "line": 2, "column": 1, "character": 12 },
-		"end": { "line": 2, "column": 1, "character": 12 },
-		"pos": 12
+		"start": { "line": 2, "column": 1 },
+		"end": { "line": 2, "column": 1 }
 	}
 ]
diff --git a/test/validator/samples/ignore-warning/warnings.json b/test/validator/samples/ignore-warning/warnings.json
index 6123fafae8..51c940b807 100644
--- a/test/validator/samples/ignore-warning/warnings.json
+++ b/test/validator/samples/ignore-warning/warnings.json
@@ -2,14 +2,11 @@
 	{
 		"code": "a11y-distracting-elements",
 		"end": {
-			"character": 131,
 			"column": 49,
 			"line": 4
 		},
 		"message": "A11y: Avoid <marquee> elements",
-		"pos": 83,
 		"start": {
-			"character": 83,
 			"column": 1,
 			"line": 4
 		}
@@ -17,16 +14,13 @@
 	{
 		"code": "a11y-missing-attribute",
 		"end": {
-			"character": 162,
 			"column": 22,
 			"line": 7
 		},
 		"message": "A11y: <img> element should have an alt attribute",
-		"pos": 140,
 		"start": {
-			"character": 140,
 			"column": 0,
 			"line": 7
 		}
 	}
-]
\ No newline at end of file
+]
diff --git a/test/validator/samples/ignore-warnings-cumulative/warnings.json b/test/validator/samples/ignore-warnings-cumulative/warnings.json
index 3ab413824d..26add431e0 100644
--- a/test/validator/samples/ignore-warnings-cumulative/warnings.json
+++ b/test/validator/samples/ignore-warnings-cumulative/warnings.json
@@ -2,16 +2,13 @@
 	{
 		"code": "a11y-distracting-elements",
 		"end": {
-			"character": 161,
 			"column": 12,
 			"line": 7
 		},
 		"message": "A11y: Avoid <marquee> elements",
-		"pos": 104,
 		"start": {
-			"character": 104,
 			"column": 2,
 			"line": 5
 		}
 	}
-]
\ No newline at end of file
+]
diff --git a/test/validator/samples/ignore-warnings-newline/warnings.json b/test/validator/samples/ignore-warnings-newline/warnings.json
index 8247468444..03fade839a 100644
--- a/test/validator/samples/ignore-warnings-newline/warnings.json
+++ b/test/validator/samples/ignore-warnings-newline/warnings.json
@@ -2,16 +2,13 @@
 	{
 		"code": "a11y-missing-attribute",
 		"end": {
-			"character": 207,
 			"column": 22,
 			"line": 8
 		},
 		"message": "A11y: <img> element should have an alt attribute",
-		"pos": 185,
 		"start": {
-			"character": 185,
 			"column": 0,
 			"line": 8
 		}
 	}
-]
\ No newline at end of file
+]
diff --git a/test/validator/samples/ignore-warnings-stacked/warnings.json b/test/validator/samples/ignore-warnings-stacked/warnings.json
index dd647d7cb2..03fade839a 100644
--- a/test/validator/samples/ignore-warnings-stacked/warnings.json
+++ b/test/validator/samples/ignore-warnings-stacked/warnings.json
@@ -2,16 +2,13 @@
 	{
 		"code": "a11y-missing-attribute",
 		"end": {
-			"character": 211,
 			"column": 22,
 			"line": 8
 		},
 		"message": "A11y: <img> element should have an alt attribute",
-		"pos": 189,
 		"start": {
-			"character": 189,
 			"column": 0,
 			"line": 8
 		}
 	}
-]
\ No newline at end of file
+]
diff --git a/test/validator/samples/ignore-warnings/warnings.json b/test/validator/samples/ignore-warnings/warnings.json
index 576dfe76f4..9a5be15ae7 100644
--- a/test/validator/samples/ignore-warnings/warnings.json
+++ b/test/validator/samples/ignore-warnings/warnings.json
@@ -2,16 +2,13 @@
 	{
 		"code": "a11y-missing-attribute",
 		"end": {
-			"character": 188,
 			"column": 22,
 			"line": 7
 		},
 		"message": "A11y: <img> element should have an alt attribute",
-		"pos": 166,
 		"start": {
-			"character": 166,
 			"column": 0,
 			"line": 7
 		}
 	}
-]
\ No newline at end of file
+]
diff --git a/test/validator/samples/illegal-variable-declaration/errors.json b/test/validator/samples/illegal-variable-declaration/errors.json
index e3d273138e..606fa5e0a6 100644
--- a/test/validator/samples/illegal-variable-declaration/errors.json
+++ b/test/validator/samples/illegal-variable-declaration/errors.json
@@ -4,14 +4,11 @@
 		"message": "Cannot declare same variable name which is imported inside <script context=\"module\">",
 		"start": {
 			"line": 6,
-			"column": 1,
-			"character": 86
+			"column": 1
 		},
 		"end": {
 			"line": 6,
-			"column": 9,
-			"character": 94
-		},
-		"pos": 86
+			"column": 9
+		}
 	}
 ]
diff --git a/test/validator/samples/invalid-empty-css-declaration/errors.json b/test/validator/samples/invalid-empty-css-declaration/errors.json
index f141168077..1f2876ba64 100644
--- a/test/validator/samples/invalid-empty-css-declaration/errors.json
+++ b/test/validator/samples/invalid-empty-css-declaration/errors.json
@@ -2,11 +2,9 @@
 	"code": "invalid-declaration",
 	"message": "Declaration cannot be empty",
 	"start": {
-		"line": 11, "column": 0, "character": 93
+		"line": 11, "column": 0
 	},
-  	"end": {
-		"line": 11, "column": 0, "character": 93
-	},
-	"pos": 93,
-	"frame": " 9:     color: blue;\n10:   }\n11: </style>\n    ^"
-}]
\ No newline at end of file
+  "end": {
+		"line": 11, "column": 0
+	}
+}]
diff --git a/test/validator/samples/logic-block-in-attribute/errors.json b/test/validator/samples/logic-block-in-attribute/errors.json
index ebf68938e7..43c0fb9416 100644
--- a/test/validator/samples/logic-block-in-attribute/errors.json
+++ b/test/validator/samples/logic-block-in-attribute/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "invalid-logic-block-placement",
 		"message": "{#if} logic block cannot be in attribute value",
-		"start": { "line": 1, "column": 12, "character": 12 },
-		"end": { "line": 1, "column": 12, "character": 12 },
-		"pos": 12
+		"start": { "line": 1, "column": 12 },
+		"end": { "line": 1, "column": 12 }
 	}
 ]
diff --git a/test/validator/samples/logic-block-in-textarea/errors.json b/test/validator/samples/logic-block-in-textarea/errors.json
index b1d73d4903..d007089089 100644
--- a/test/validator/samples/logic-block-in-textarea/errors.json
+++ b/test/validator/samples/logic-block-in-textarea/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "invalid-logic-block-placement",
 		"message": "{#each} logic block cannot be inside <textarea>",
-		"start": { "line": 2, "column": 1, "character": 12 },
-		"end": { "line": 2, "column": 1, "character": 12 },
-		"pos": 12
+		"start": { "line": 2, "column": 1 },
+		"end": { "line": 2, "column": 1 }
 	}
 ]
diff --git a/test/validator/samples/missing-component-global/warnings.json b/test/validator/samples/missing-component-global/warnings.json
index c9de56619a..0babeadd81 100644
--- a/test/validator/samples/missing-component-global/warnings.json
+++ b/test/validator/samples/missing-component-global/warnings.json
@@ -3,13 +3,10 @@
 	"message": "'String' is not defined. Consider adding a <script> block with 'export let String' to declare a prop",
 	"start": {
 		"line": 2,
-		"column": 1,
-		"character": 7
+		"column": 1
 	},
 	"end": {
 		"line": 2,
-		"column": 10,
-		"character": 16
-	},
-	"pos": 7
-}]
\ No newline at end of file
+		"column": 10
+	}
+}]
diff --git a/test/validator/samples/missing-component/warnings.json b/test/validator/samples/missing-component/warnings.json
index 9c95cd81f1..5cd4eb6ba6 100644
--- a/test/validator/samples/missing-component/warnings.json
+++ b/test/validator/samples/missing-component/warnings.json
@@ -3,13 +3,10 @@
 	"message": "'Widget' is not defined. Consider adding a <script> block with 'export let Widget' to declare a prop",
 	"start": {
 		"line": 2,
-		"column": 1,
-		"character": 7
+		"column": 1
 	},
 	"end": {
 		"line": 2,
-		"column": 10,
-		"character": 16
-	},
-	"pos": 7
-}]
\ No newline at end of file
+		"column": 10
+	}
+}]
diff --git a/test/validator/samples/missing-custom-element-compile-options/warnings.json b/test/validator/samples/missing-custom-element-compile-options/warnings.json
index 8d6d574fb2..243623f51c 100644
--- a/test/validator/samples/missing-custom-element-compile-options/warnings.json
+++ b/test/validator/samples/missing-custom-element-compile-options/warnings.json
@@ -2,14 +2,11 @@
 	{
 		"code": "missing-custom-element-compile-options",
 		"end": {
-			"character": 36,
 			"column": 36,
 			"line": 1
 		},
 		"message": "The 'tag' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?",
-		"pos": 16,
 		"start": {
-			"character": 16,
 			"column": 16,
 			"line": 1
 		}
diff --git a/test/validator/samples/module-script-reactive-declaration/warnings.json b/test/validator/samples/module-script-reactive-declaration/warnings.json
index b1aa74dbcc..394e84d0ad 100644
--- a/test/validator/samples/module-script-reactive-declaration/warnings.json
+++ b/test/validator/samples/module-script-reactive-declaration/warnings.json
@@ -1,7 +1,6 @@
 [{
 	"message": "$: has no effect in a module script",
 	"code": "module-script-reactive-declaration",
-	"start": { "line": 4, "column": 1, "character": 54 },
-	"end": { "line": 4, "column": 23, "character": 76 },
-	"pos": 54
+	"start": { "line": 4, "column": 1 },
+	"end": { "line": 4, "column": 23 }
 }]
diff --git a/test/validator/samples/multiple-script-default-context/errors.json b/test/validator/samples/multiple-script-default-context/errors.json
index 6f0637b51b..0287a6392f 100644
--- a/test/validator/samples/multiple-script-default-context/errors.json
+++ b/test/validator/samples/multiple-script-default-context/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "invalid-script",
 	"message": "A component can only have one instance-level <script> element",
-	"pos": 30,
 	"start": {
 		"line": 5,
-		"column": 0,
-		"character": 30
+		"column": 0
 	},
 	"end": {
 		"line": 5,
-		"column": 0,
-		"character": 30
+		"column": 0
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/multiple-script-module-context/errors.json b/test/validator/samples/multiple-script-module-context/errors.json
index 7b86c61926..81f00b493a 100644
--- a/test/validator/samples/multiple-script-module-context/errors.json
+++ b/test/validator/samples/multiple-script-module-context/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "invalid-script",
 	"message": "A component can only have one <script context=\"module\"> element",
-	"pos": 47,
 	"start": {
 		"line": 5,
-		"column": 0,
-		"character": 47
+		"column": 0
 	},
 	"end": {
 		"line": 5,
-		"column": 0,
-		"character": 47
+		"column": 0
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/namespace-invalid-unguessable/errors.json b/test/validator/samples/namespace-invalid-unguessable/errors.json
index 50288aa2c6..8cf7fb29bc 100644
--- a/test/validator/samples/namespace-invalid-unguessable/errors.json
+++ b/test/validator/samples/namespace-invalid-unguessable/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "invalid-namespace-property",
 	"message": "Invalid namespace 'lol'",
-	"pos": 16,
 	"start": {
 		"line": 1,
-		"column": 16,
-		"character": 16
+		"column": 16
 	},
 	"end": {
 		"line": 1,
-		"column": 31,
-		"character": 31
+		"column": 31
 	}
 }]
diff --git a/test/validator/samples/namespace-invalid/errors.json b/test/validator/samples/namespace-invalid/errors.json
index ddb49a33e0..ae9cf640f0 100644
--- a/test/validator/samples/namespace-invalid/errors.json
+++ b/test/validator/samples/namespace-invalid/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "invalid-namespace-property",
 	"message": "Invalid namespace 'http://www.w3.org/1999/svg' (did you mean 'http://www.w3.org/2000/svg'?)",
-	"pos": 16,
 	"start": {
 		"line": 1,
-		"column": 16,
-		"character": 16
+		"column": 16
 	},
 	"end": {
 		"line": 1,
-		"column": 54,
-		"character": 54
+		"column": 54
 	}
 }]
diff --git a/test/validator/samples/namespace-non-literal/errors.json b/test/validator/samples/namespace-non-literal/errors.json
index c365065e48..850a27bd5d 100644
--- a/test/validator/samples/namespace-non-literal/errors.json
+++ b/test/validator/samples/namespace-non-literal/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "invalid-namespace-attribute",
 	"message": "The 'namespace' attribute must be a string literal representing a valid namespace",
-	"pos": 16,
 	"start": {
 		"line": 1,
-		"column": 16,
-		"character": 16
+		"column": 16
 	},
 	"end": {
 		"line": 1,
-		"column": 30,
-		"character": 30
+		"column": 30
 	}
 }]
diff --git a/test/validator/samples/reactive-declaration-cyclical/errors.json b/test/validator/samples/reactive-declaration-cyclical/errors.json
index 9a80d9fb29..bc6947a12a 100644
--- a/test/validator/samples/reactive-declaration-cyclical/errors.json
+++ b/test/validator/samples/reactive-declaration-cyclical/errors.json
@@ -1,7 +1,6 @@
 [{
 	"message": "Cyclical dependency detected: a → b → a",
 	"code": "cyclical-reactive-declaration",
-	"start": { "line": 5, "column": 1, "character": 35 },
-	"end": { "line": 5, "column": 14, "character": 48 },
-	"pos": 35
+	"start": { "line": 5, "column": 1 },
+	"end": { "line": 5, "column": 14 }
 }]
diff --git a/test/validator/samples/reactive-declaration-non-top-level/warnings.json b/test/validator/samples/reactive-declaration-non-top-level/warnings.json
index 87944642cd..11034a9077 100644
--- a/test/validator/samples/reactive-declaration-non-top-level/warnings.json
+++ b/test/validator/samples/reactive-declaration-non-top-level/warnings.json
@@ -1,7 +1,6 @@
 [{
 	"message": "$: has no effect outside of the top-level",
 	"code": "non-top-level-reactive-declaration",
-	"start": { "line": 6, "column": 2, "character": 71 },
-	"end": { "line": 6, "column": 22, "character": 91 },
-	"pos": 71
+	"start": { "line": 6, "column": 2 },
+	"end": { "line": 6, "column": 22 }
 }]
diff --git a/test/validator/samples/reactive-module-variable/warnings.json b/test/validator/samples/reactive-module-variable/warnings.json
index d08fc1309f..5fb84a8505 100644
--- a/test/validator/samples/reactive-module-variable/warnings.json
+++ b/test/validator/samples/reactive-module-variable/warnings.json
@@ -2,14 +2,11 @@
 	{
 		"code": "module-script-reactive-declaration",
 		"message": "\"foo\" is declared in a module script and will not be reactive",
-		"pos": 59,
 		"start": {
-			"character": 59,
 			"column": 4,
 			"line": 5
 		},
 		"end": {
-			"character": 69,
 			"column": 14,
 			"line": 5
 		}
diff --git a/test/validator/samples/ref-not-supported-in-css/errors.json b/test/validator/samples/ref-not-supported-in-css/errors.json
index 3227c14cf7..d5a241a724 100644
--- a/test/validator/samples/ref-not-supported-in-css/errors.json
+++ b/test/validator/samples/ref-not-supported-in-css/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "invalid-ref-selector",
 	"message": "ref selectors are no longer supported",
-	"pos": 68,
 	"start": {
 		"line": 8,
-		"column": 1,
-		"character": 68
+		"column": 1
 	},
 	"end": {
 		"line": 8,
-		"column": 1,
-		"character": 68
+		"column": 1
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/ref-not-supported/errors.json b/test/validator/samples/ref-not-supported/errors.json
index 43c8c07615..7a2ccfd78a 100644
--- a/test/validator/samples/ref-not-supported/errors.json
+++ b/test/validator/samples/ref-not-supported/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "invalid-ref-directive",
 	"message": "The ref directive is no longer supported — use `bind:this={foo}` instead",
-	"pos": 5,
 	"start": {
 		"line": 1,
-		"column": 5,
-		"character": 5
+		"column": 5
 	},
 	"end": {
 		"line": 1,
-		"column": 5,
-		"character": 5
+		"column": 5
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/rest-eachblock-binding-2/warnings.json b/test/validator/samples/rest-eachblock-binding-2/warnings.json
index 921f14c619..a471dd6a86 100644
--- a/test/validator/samples/rest-eachblock-binding-2/warnings.json
+++ b/test/validator/samples/rest-eachblock-binding-2/warnings.json
@@ -2,8 +2,7 @@
   {
     "code": "invalid-rest-eachblock-binding",
     "message": "...rest operator will create a new object and binding propagation with original object will not work",
-		"pos": 102,
-    "start": { "line": 8, "column": 24, "character": 102 },
-		"end": { "line": 8, "column": 31, "character": 109 }
+    "start": { "line": 8, "column": 24 },
+		"end": { "line": 8, "column": 31 }
   }
 ]
diff --git a/test/validator/samples/rest-eachblock-binding-3/warnings.json b/test/validator/samples/rest-eachblock-binding-3/warnings.json
index 8da9d536d1..eda7e1fc5d 100644
--- a/test/validator/samples/rest-eachblock-binding-3/warnings.json
+++ b/test/validator/samples/rest-eachblock-binding-3/warnings.json
@@ -2,8 +2,7 @@
   {
     "code": "invalid-rest-eachblock-binding",
     "message": "...rest operator will create a new object and binding propagation with original object will not work",
-		"pos": 168,
-    "start": { "line": 5, "column": 32, "character": 168 },
-		"end": { "line": 5, "column": 39, "character": 175 }
+    "start": { "line": 5, "column": 32 },
+		"end": { "line": 5, "column": 39 }
   }
 ]
diff --git a/test/validator/samples/rest-eachblock-binding/warnings.json b/test/validator/samples/rest-eachblock-binding/warnings.json
index 12942ec95a..35fb2d0b6e 100644
--- a/test/validator/samples/rest-eachblock-binding/warnings.json
+++ b/test/validator/samples/rest-eachblock-binding/warnings.json
@@ -2,8 +2,7 @@
   {
     "code": "invalid-rest-eachblock-binding",
     "message": "...rest operator will create a new object and binding propagation with original object will not work",
-		"pos": 143,
-		"start": { "line": 5, "column": 25, "character": 143 },
-    "end": { "line": 5, "column": 32, "character": 150 }
+		"start": { "line": 5, "column": 25 },
+    "end": { "line": 5, "column": 32 }
   }
 ]
diff --git a/test/validator/samples/script-invalid-context/errors.json b/test/validator/samples/script-invalid-context/errors.json
index 07ad0f1270..4847ff7cbb 100644
--- a/test/validator/samples/script-invalid-context/errors.json
+++ b/test/validator/samples/script-invalid-context/errors.json
@@ -1,15 +1,12 @@
 [{
 	"code": "invalid-script",
 	"message": "If the context attribute is supplied, its value must be \"module\"",
-	"pos": 8,
 	"start": {
 		"line": 1,
-		"column": 8,
-		"character": 8
+		"column": 8
 	},
 	"end": {
 		"line": 1,
-		"column": 8,
-		"character": 8
+		"column": 8
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/security-anchor-rel-noreferer-legacy/warnings.json b/test/validator/samples/security-anchor-rel-noreferer-legacy/warnings.json
index 24c10fb763..2986f137e7 100644
--- a/test/validator/samples/security-anchor-rel-noreferer-legacy/warnings.json
+++ b/test/validator/samples/security-anchor-rel-noreferer-legacy/warnings.json
@@ -3,13 +3,10 @@
 		"code": "security-anchor-rel-noreferrer",
 		"message": "Security: Anchor with \"target=_blank\" should have rel attribute containing the value \"noreferrer\"",
 		"end": {
-			"character": 73,
 			"column": 73,
 			"line": 1
 		},
-		"pos": 0,
 		"start": {
-			"character": 0,
 			"column": 0,
 			"line": 1
 		}
@@ -18,13 +15,10 @@
 		"code": "security-anchor-rel-noreferrer",
 		"message": "Security: Anchor with \"target=_blank\" should have rel attribute containing the value \"noreferrer\"",
 		"end": {
-			"character": 154,
 			"column": 80,
 			"line": 2
 		},
-		"pos": 74,
 		"start": {
-			"character": 74,
 			"column": 0,
 			"line": 2
 		}
@@ -33,13 +27,10 @@
 		"code": "security-anchor-rel-noreferrer",
 		"message": "Security: Anchor with \"target=_blank\" should have rel attribute containing the value \"noreferrer\"",
 		"end": {
-			"character": 243,
 			"column": 88,
 			"line": 3
 		},
-		"pos": 155,
 		"start": {
-			"character": 155,
 			"column": 0,
 			"line": 3
 		}
@@ -48,13 +39,10 @@
 		"code": "security-anchor-rel-noreferrer",
 		"message": "Security: Anchor with \"target=_blank\" should have rel attribute containing the value \"noreferrer\"",
 		"end": {
-			"character": 319,
 			"column": 75,
 			"line": 4
 		},
-		"pos": 244,
 		"start": {
-			"character": 244,
 			"column": 0,
 			"line": 4
 		}
@@ -63,13 +51,10 @@
 		"code": "security-anchor-rel-noreferrer",
 		"message": "Security: Anchor with \"target=_blank\" should have rel attribute containing the value \"noreferrer\"",
 		"end": {
-			"character": 402,
 			"column": 82,
 			"line": 5
 		},
-		"pos": 320,
 		"start": {
-			"character": 320,
 			"column": 0,
 			"line": 5
 		}
@@ -78,13 +63,10 @@
 		"code": "security-anchor-rel-noreferrer",
 		"message": "Security: Anchor with \"target=_blank\" should have rel attribute containing the value \"noreferrer\"",
 		"end": {
-			"character": 493,
 			"column": 90,
 			"line": 6
 		},
-		"pos": 403,
 		"start": {
-			"character": 403,
 			"column": 0,
 			"line": 6
 		}
@@ -93,13 +75,10 @@
 		"code": "security-anchor-rel-noreferrer",
 		"message": "Security: Anchor with \"target=_blank\" should have rel attribute containing the value \"noreferrer\"",
 		"end": {
-			"character": 561,
 			"column": 67,
 			"line": 7
 		},
-		"pos": 494,
 		"start": {
-			"character": 494,
 			"column": 0,
 			"line": 7
 		}
@@ -108,13 +87,10 @@
 		"code": "security-anchor-rel-noreferrer",
 		"message": "Security: Anchor with \"target=_blank\" should have rel attribute containing the value \"noreferrer\"",
 		"end": {
-			"character": 636,
 			"column": 74,
 			"line": 8
 		},
-		"pos": 562,
 		"start": {
-			"character": 562,
 			"column": 0,
 			"line": 8
 		}
@@ -123,13 +99,10 @@
 		"code": "security-anchor-rel-noreferrer",
 		"message": "Security: Anchor with \"target=_blank\" should have rel attribute containing the value \"noreferrer\"",
 		"end": {
-			"character": 719,
 			"column": 82,
 			"line": 9
 		},
-		"pos": 637,
 		"start": {
-			"character": 637,
 			"column": 0,
 			"line": 9
 		}
@@ -138,13 +111,10 @@
 		"code": "security-anchor-rel-noreferrer",
 		"message": "Security: Anchor with \"target=_blank\" should have rel attribute containing the value \"noreferrer\"",
 		"end": {
-			"character": 792,
 			"column": 72,
 			"line": 10
 		},
-		"pos": 720,
 		"start": {
-			"character": 720,
 			"column": 0,
 			"line": 10
 		}
@@ -153,13 +123,10 @@
 		"code": "security-anchor-rel-noreferrer",
 		"message": "Security: Anchor with \"target=_blank\" should have rel attribute containing the value \"noreferrer\"",
 		"end": {
-			"character": 872,
 			"column": 79,
 			"line": 11
 		},
-		"pos": 793,
 		"start": {
-			"character": 793,
 			"column": 0,
 			"line": 11
 		}
@@ -168,13 +135,10 @@
 		"code": "security-anchor-rel-noreferrer",
 		"message": "Security: Anchor with \"target=_blank\" should have rel attribute containing the value \"noreferrer\"",
 		"end": {
-			"character": 960,
 			"column": 87,
 			"line": 12
 		},
-		"pos": 873,
 		"start": {
-			"character": 873,
 			"column": 0,
 			"line": 12
 		}
@@ -183,13 +147,10 @@
 		"code": "security-anchor-rel-noreferrer",
 		"message": "Security: Anchor with \"target=_blank\" should have rel attribute containing the value \"noreferrer\"",
 		"end": {
-			"character": 1033,
 			"column": 72,
 			"line": 13
 		},
-		"pos": 961,
 		"start": {
-			"character": 961,
 			"column": 0,
 			"line": 13
 		}
@@ -198,13 +159,10 @@
 		"code": "security-anchor-rel-noreferrer",
 		"message": "Security: Anchor with \"target=_blank\" should have rel attribute containing the value \"noreferrer\"",
 		"end": {
-			"character": 1113,
 			"column": 79,
 			"line": 14
 		},
-		"pos": 1034,
 		"start": {
-			"character": 1034,
 			"column": 0,
 			"line": 14
 		}
@@ -213,13 +171,10 @@
 		"code": "security-anchor-rel-noreferrer",
 		"message": "Security: Anchor with \"target=_blank\" should have rel attribute containing the value \"noreferrer\"",
 		"end": {
-			"character": 1201,
 			"column": 87,
 			"line": 15
 		},
-		"pos": 1114,
 		"start": {
-			"character": 1114,
 			"column": 0,
 			"line": 15
 		}
@@ -228,13 +183,10 @@
 		"code": "security-anchor-rel-noreferrer",
 		"message": "Security: Anchor with \"target=_blank\" should have rel attribute containing the value \"noreferrer\"",
 		"end": {
-			"character": 1277,
 			"column": 75,
 			"line": 16
 		},
-		"pos": 1202,
 		"start": {
-			"character": 1202,
 			"column": 0,
 			"line": 16
 		}
@@ -243,13 +195,10 @@
 		"code": "security-anchor-rel-noreferrer",
 		"message": "Security: Anchor with \"target=_blank\" should have rel attribute containing the value \"noreferrer\"",
 		"end": {
-			"character": 1360,
 			"column": 82,
 			"line": 17
 		},
-		"pos": 1278,
 		"start": {
-			"character": 1278,
 			"column": 0,
 			"line": 17
 		}
@@ -258,13 +207,10 @@
 		"code": "security-anchor-rel-noreferrer",
 		"message": "Security: Anchor with \"target=_blank\" should have rel attribute containing the value \"noreferrer\"",
 		"end": {
-			"character": 1451,
 			"column": 90,
 			"line": 18
 		},
-		"pos": 1361,
 		"start": {
-			"character": 1361,
 			"column": 0,
 			"line": 18
 		}
diff --git a/test/validator/samples/slot-attribute-invalid/errors.json b/test/validator/samples/slot-attribute-invalid/errors.json
index a75fdc065c..a078405a30 100644
--- a/test/validator/samples/slot-attribute-invalid/errors.json
+++ b/test/validator/samples/slot-attribute-invalid/errors.json
@@ -3,13 +3,10 @@
 	"message": "Element with a slot='...' attribute must be a child of a component or a descendant of a custom element",
 	"start": {
 		"line": 1,
-		"column": 5,
-		"character": 5
+		"column": 5
 	},
 	"end": {
 		"line": 1,
-		"column": 15,
-		"character": 15
-	},
-	"pos": 5
+		"column": 15
+	}
 }]
diff --git a/test/validator/samples/slot-warning/warnings.json b/test/validator/samples/slot-warning/warnings.json
index 14691b4231..66ae0fa3a7 100644
--- a/test/validator/samples/slot-warning/warnings.json
+++ b/test/validator/samples/slot-warning/warnings.json
@@ -3,15 +3,12 @@
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
-			"character": 78,
 			"column": 1,
 			"line": 6
 		},
 		"end": {
-			"character": 112,
 			"column": 35,
 			"line": 6
-		},
-		"pos": 78
+		}
 	}
 ]
diff --git a/test/validator/samples/slot-warning2/warnings.json b/test/validator/samples/slot-warning2/warnings.json
index 5554c3f764..52157ecc45 100644
--- a/test/validator/samples/slot-warning2/warnings.json
+++ b/test/validator/samples/slot-warning2/warnings.json
@@ -3,15 +3,12 @@
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
-			"character": 120,
 			"column": 1,
 			"line": 7
 		},
 		"end": {
-			"character": 154,
 			"column": 35,
 			"line": 7
-		},
-		"pos": 120
+		}
 	}
 ]
diff --git a/test/validator/samples/style-directive-modifiers-invalid/errors.json b/test/validator/samples/style-directive-modifiers-invalid/errors.json
index 245dfc63a8..02a9f80303 100644
--- a/test/validator/samples/style-directive-modifiers-invalid/errors.json
+++ b/test/validator/samples/style-directive-modifiers-invalid/errors.json
@@ -3,13 +3,10 @@
 	"code": "invalid-style-directive-modifier",
 	"start": {
 		"line": 1,
-		"column": 8,
-		"character": 8
+		"column": 8
 	},
 	"end": {
 		"line": 1,
-		"column": 29,
-		"character": 29
-	},
-	"pos": 8
+		"column": 29
+	}
 }]
diff --git a/test/validator/samples/svelte-fragment-placement-2/errors.json b/test/validator/samples/svelte-fragment-placement-2/errors.json
index 5659b35e7d..871e5f5de0 100644
--- a/test/validator/samples/svelte-fragment-placement-2/errors.json
+++ b/test/validator/samples/svelte-fragment-placement-2/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "invalid-slotted-content",
 		"message": "<svelte:fragment> must be a child of a component",
-		"start": { "line": 5, "column": 0, "character": 59 },
-		"end": { "line": 7, "column": 18, "character": 112 },
-		"pos": 59
+		"start": { "line": 5, "column": 0 },
+		"end": { "line": 7, "column": 18 }
 	}
 ]
diff --git a/test/validator/samples/svelte-fragment-placement/errors.json b/test/validator/samples/svelte-fragment-placement/errors.json
index ce825243f0..6635953209 100644
--- a/test/validator/samples/svelte-fragment-placement/errors.json
+++ b/test/validator/samples/svelte-fragment-placement/errors.json
@@ -2,8 +2,7 @@
 	{
 		"code": "invalid-slotted-content",
 		"message": "<svelte:fragment> must be a child of a component",
-		"start": { "line": 7, "column": 2, "character": 77 },
-		"end": { "line": 9, "column": 20, "character": 134 },
-		"pos": 77
+		"start": { "line": 7, "column": 2 },
+		"end": { "line": 9, "column": 20 }
 	}
 ]
diff --git a/test/validator/samples/tag-custom-element-options-missing/warnings.json b/test/validator/samples/tag-custom-element-options-missing/warnings.json
index 185c6c3179..a1927f41df 100644
--- a/test/validator/samples/tag-custom-element-options-missing/warnings.json
+++ b/test/validator/samples/tag-custom-element-options-missing/warnings.json
@@ -1,15 +1,12 @@
-[{
-		"code": "missing-custom-element-compile-options",
-		"message": "The 'tag' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?",
-		"start": {
-				"line": 1,
-				"column": 16,
-				"character": 16
-		},
-		"end": {
-				"line": 1,
-				"column": 36,
-				"character": 36
-		},
-		"pos": 16
-}]
+[{
+		"code": "missing-custom-element-compile-options",
+		"message": "The 'tag' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?",
+		"start": {
+				"line": 1,
+				"column": 16
+		},
+		"end": {
+				"line": 1,
+				"column": 36
+		}
+}]
diff --git a/test/validator/samples/tag-invalid/errors.json b/test/validator/samples/tag-invalid/errors.json
index e6daa8433e..f3aef07fea 100644
--- a/test/validator/samples/tag-invalid/errors.json
+++ b/test/validator/samples/tag-invalid/errors.json
@@ -3,13 +3,10 @@
 	"message": "tag name must be two or more words joined by the '-' character",
 	"start": {
 		"line": 1,
-		"column": 16,
-		"character": 16
+		"column": 16
 	},
 	"end": {
 		"line": 1,
-		"column": 29,
-		"character": 29
-	},
-	"pos": 16
+		"column": 29
+	}
 }]
diff --git a/test/validator/samples/tag-non-string/errors.json b/test/validator/samples/tag-non-string/errors.json
index 5736daaac6..4180448df2 100644
--- a/test/validator/samples/tag-non-string/errors.json
+++ b/test/validator/samples/tag-non-string/errors.json
@@ -3,13 +3,10 @@
 	"message": "'tag' must be a string literal",
 	"start": {
 		"line": 1,
-		"column": 16,
-		"character": 16
+		"column": 16
 	},
 	"end": {
 		"line": 1,
-		"column": 24,
-		"character": 24
-	},
-	"pos": 16
+		"column": 24
+	}
 }]
diff --git a/test/validator/samples/textarea-value-children/errors.json b/test/validator/samples/textarea-value-children/errors.json
index 551071e6d1..a8b78afa89 100644
--- a/test/validator/samples/textarea-value-children/errors.json
+++ b/test/validator/samples/textarea-value-children/errors.json
@@ -3,13 +3,10 @@
 	"message": "A <textarea> can have either a value attribute or (equivalently) child content, but not both",
 	"start": {
 		"line": 1,
-		"column": 10,
-		"character": 10
+		"column": 10
 	},
 	"end": {
 		"line": 1,
-		"column": 23,
-		"character": 23
-	},
-	"pos": 10
-}]
\ No newline at end of file
+		"column": 23
+	}
+}]
diff --git a/test/validator/samples/title-no-attributes/errors.json b/test/validator/samples/title-no-attributes/errors.json
index 4e9f133bd4..0b05b8fa1a 100644
--- a/test/validator/samples/title-no-attributes/errors.json
+++ b/test/validator/samples/title-no-attributes/errors.json
@@ -3,13 +3,10 @@
 	"message": "<title> cannot have attributes",
 	"start": {
 		"line": 2,
-		"column": 8,
-		"character": 22
+		"column": 8
 	},
 	"end": {
 		"line": 2,
-		"column": 25,
-		"character": 39
-	},
-	"pos": 22
-}]
\ No newline at end of file
+		"column": 25
+	}
+}]
diff --git a/test/validator/samples/title-no-children/errors.json b/test/validator/samples/title-no-children/errors.json
index 37179189d2..d748b1a8f5 100644
--- a/test/validator/samples/title-no-children/errors.json
+++ b/test/validator/samples/title-no-children/errors.json
@@ -3,13 +3,10 @@
 	"message": "<title> can only contain text and {tags}",
 	"start": {
 		"line": 2,
-		"column": 11,
-		"character": 25
+		"column": 11
 	},
 	"end": {
 		"line": 2,
-		"column": 35,
-		"character": 49
-	},
-	"pos": 25
-}]
\ No newline at end of file
+		"column": 35
+	}
+}]
diff --git a/test/validator/samples/transition-duplicate-in-transition/errors.json b/test/validator/samples/transition-duplicate-in-transition/errors.json
index 955411d2ad..ea727044d7 100644
--- a/test/validator/samples/transition-duplicate-in-transition/errors.json
+++ b/test/validator/samples/transition-duplicate-in-transition/errors.json
@@ -3,13 +3,10 @@
 	"message": "An element cannot have both an 'in' directive and a 'transition' directive",
 	"start": {
 		"line": 6,
-		"column": 12,
-		"character": 70
+		"column": 12
 	},
 	"end": {
 		"line": 6,
-		"column": 26,
-		"character": 84
-	},
-	"pos": 70
-}]
\ No newline at end of file
+		"column": 26
+	}
+}]
diff --git a/test/validator/samples/transition-duplicate-in/errors.json b/test/validator/samples/transition-duplicate-in/errors.json
index 9a030a9ca2..87476382c7 100644
--- a/test/validator/samples/transition-duplicate-in/errors.json
+++ b/test/validator/samples/transition-duplicate-in/errors.json
@@ -3,13 +3,10 @@
 	"message": "An element can only have one 'in' directive",
 	"start": {
 		"line": 6,
-		"column": 12,
-		"character": 70
+		"column": 12
 	},
 	"end": {
 		"line": 6,
-		"column": 18,
-		"character": 76
-	},
-	"pos": 70
-}]
\ No newline at end of file
+		"column": 18
+	}
+}]
diff --git a/test/validator/samples/transition-duplicate-out-transition/errors.json b/test/validator/samples/transition-duplicate-out-transition/errors.json
index ec96e2804c..8aa0d28e35 100644
--- a/test/validator/samples/transition-duplicate-out-transition/errors.json
+++ b/test/validator/samples/transition-duplicate-out-transition/errors.json
@@ -3,13 +3,10 @@
 	"message": "An element cannot have both an 'out' directive and a 'transition' directive",
 	"start": {
 		"line": 6,
-		"column": 13,
-		"character": 71
+		"column": 13
 	},
 	"end": {
 		"line": 6,
-		"column": 27,
-		"character": 85
-	},
-	"pos": 71
-}]
\ No newline at end of file
+		"column": 27
+	}
+}]
diff --git a/test/validator/samples/transition-duplicate-out/errors.json b/test/validator/samples/transition-duplicate-out/errors.json
index 8465cca2b3..4b82a9accf 100644
--- a/test/validator/samples/transition-duplicate-out/errors.json
+++ b/test/validator/samples/transition-duplicate-out/errors.json
@@ -3,13 +3,10 @@
 	"message": "An element can only have one 'out' directive",
 	"start": {
 		"line": 6,
-		"column": 13,
-		"character": 71
+		"column": 13
 	},
 	"end": {
 		"line": 6,
-		"column": 20,
-		"character": 78
-	},
-	"pos": 71
-}]
\ No newline at end of file
+		"column": 20
+	}
+}]
diff --git a/test/validator/samples/transition-duplicate-transition-in/errors.json b/test/validator/samples/transition-duplicate-transition-in/errors.json
index eb441184bd..93dd9ed1be 100644
--- a/test/validator/samples/transition-duplicate-transition-in/errors.json
+++ b/test/validator/samples/transition-duplicate-transition-in/errors.json
@@ -3,13 +3,10 @@
 	"message": "An element cannot have both a 'transition' directive and an 'in' directive",
 	"start": {
 		"line": 6,
-		"column": 20,
-		"character": 78
+		"column": 20
 	},
 	"end": {
 		"line": 6,
-		"column": 26,
-		"character": 84
-	},
-	"pos": 78
-}]
\ No newline at end of file
+		"column": 26
+	}
+}]
diff --git a/test/validator/samples/transition-duplicate-transition-out/errors.json b/test/validator/samples/transition-duplicate-transition-out/errors.json
index e8886067c6..0b6404e80e 100644
--- a/test/validator/samples/transition-duplicate-transition-out/errors.json
+++ b/test/validator/samples/transition-duplicate-transition-out/errors.json
@@ -3,13 +3,10 @@
 	"message": "An element cannot have both a 'transition' directive and an 'out' directive",
 	"start": {
 		"line": 6,
-		"column": 20,
-		"character": 78
+		"column": 20
 	},
 	"end": {
 		"line": 6,
-		"column": 27,
-		"character": 85
-	},
-	"pos": 78
-}]
\ No newline at end of file
+		"column": 27
+	}
+}]
diff --git a/test/validator/samples/transition-duplicate-transition/errors.json b/test/validator/samples/transition-duplicate-transition/errors.json
index 2b265d3a72..7f3d9425eb 100644
--- a/test/validator/samples/transition-duplicate-transition/errors.json
+++ b/test/validator/samples/transition-duplicate-transition/errors.json
@@ -3,13 +3,10 @@
 	"message": "An element can only have one 'transition' directive",
 	"start": {
 		"line": 6,
-		"column": 20,
-		"character": 78
+		"column": 20
 	},
 	"end": {
 		"line": 6,
-		"column": 34,
-		"character": 92
-	},
-	"pos": 78
-}]
\ No newline at end of file
+		"column": 34
+	}
+}]
diff --git a/test/validator/samples/transition-missing/warnings.json b/test/validator/samples/transition-missing/warnings.json
index 19520a6729..3fdf48856c 100644
--- a/test/validator/samples/transition-missing/warnings.json
+++ b/test/validator/samples/transition-missing/warnings.json
@@ -3,13 +3,10 @@
 	"message": "'foo' is not defined. Consider adding a <script> block with 'export let foo' to declare a prop",
 	"start": {
 		"line": 1,
-		"column": 5,
-		"character": 5
+		"column": 5
 	},
 	"end": {
 		"line": 1,
-		"column": 11,
-		"character": 11
-	},
-	"pos": 5
-}]
\ No newline at end of file
+		"column": 11
+	}
+}]
diff --git a/test/validator/samples/transition-on-component/errors.json b/test/validator/samples/transition-on-component/errors.json
index 400539f8e6..c83d3e41ae 100644
--- a/test/validator/samples/transition-on-component/errors.json
+++ b/test/validator/samples/transition-on-component/errors.json
@@ -3,13 +3,10 @@
 	"message": "Transitions can only be applied to DOM elements, not components",
 	"start": {
 		"line": 7,
-		"column": 8,
-		"character": 87
+		"column": 8
 	},
 	"end": {
 		"line": 7,
-		"column": 14,
-		"character": 93
-	},
-	"pos": 87
-}]
\ No newline at end of file
+		"column": 14
+	}
+}]
diff --git a/test/validator/samples/undefined-value-global/warnings.json b/test/validator/samples/undefined-value-global/warnings.json
index ee9e3d6c90..b52a2aeb83 100644
--- a/test/validator/samples/undefined-value-global/warnings.json
+++ b/test/validator/samples/undefined-value-global/warnings.json
@@ -1,15 +1,12 @@
 [{
 	"code": "missing-declaration",
 	"message": "'potato' is not defined",
-	"pos": 46,
 	"start": {
 		"line": 5,
-		"column": 4,
-		"character": 46
+		"column": 4
 	},
 	"end": {
 		"line": 5,
-		"column": 10,
-		"character": 52
+		"column": 10
 	}
 }]
diff --git a/test/validator/samples/undefined-value/warnings.json b/test/validator/samples/undefined-value/warnings.json
index 790f83acfd..f3af7f96e0 100644
--- a/test/validator/samples/undefined-value/warnings.json
+++ b/test/validator/samples/undefined-value/warnings.json
@@ -1,15 +1,12 @@
 [{
 	"code": "missing-declaration",
 	"message": "'potato' is not defined. Consider adding a <script> block with 'export let potato' to declare a prop",
-	"pos": 4,
 	"start": {
 		"line": 1,
-		"column": 4,
-		"character": 4
+		"column": 4
 	},
 	"end": {
 		"line": 1,
-		"column": 10,
-		"character": 10
+		"column": 10
 	}
-}]
\ No newline at end of file
+}]
diff --git a/test/validator/samples/unreferenced-variables-each/warnings.json b/test/validator/samples/unreferenced-variables-each/warnings.json
index fa89da0e68..d66d0dc978 100644
--- a/test/validator/samples/unreferenced-variables-each/warnings.json
+++ b/test/validator/samples/unreferenced-variables-each/warnings.json
@@ -2,14 +2,11 @@
 	{
 		"code": "unused-export-let",
 		"message": "Component_1 has unused export property 'default_value_5'. If it is for external reference only, please consider using `export const default_value_5`",
-		"pos": 172,
 		"start": {
-			"character": 172,
 			"column": 12,
 			"line": 8
 		},
 		"end": {
-			"character": 187,
 			"column": 27,
 			"line": 8
 		}
@@ -17,14 +14,11 @@
 	{
 		"code": "unused-export-let",
 		"message": "Component_1 has unused export property 'default_value_6'. If it is for external reference only, please consider using `export const default_value_6`",
-		"pos": 201,
 		"start": {
-			"character": 201,
 			"column": 12,
 			"line": 9
 		},
 		"end": {
-			"character": 216,
 			"column": 27,
 			"line": 9
 		}
diff --git a/test/validator/samples/unreferenced-variables/warnings.json b/test/validator/samples/unreferenced-variables/warnings.json
index 4097ba023b..e96a81e0dc 100644
--- a/test/validator/samples/unreferenced-variables/warnings.json
+++ b/test/validator/samples/unreferenced-variables/warnings.json
@@ -2,14 +2,11 @@
 	{
 		"code": "unused-export-let",
 		"end": {
-			"character": 519,
 			"column": 13,
 			"line": 31
 		},
 		"message": "Component has unused export property 'd2'. If it is for external reference only, please consider using `export const d2`",
-		"pos": 517,
 		"start": {
-			"character": 517,
 			"column": 11,
 			"line": 31
 		}
@@ -17,14 +14,11 @@
 	{
 		"code": "unused-export-let",
 		"end": {
-			"character": 523,
 			"column": 17,
 			"line": 31
 		},
 		"message": "Component has unused export property 'e2'. If it is for external reference only, please consider using `export const e2`",
-		"pos": 521,
 		"start": {
-			"character": 521,
 			"column": 15,
 			"line": 31
 		}
@@ -32,14 +26,11 @@
 	{
 		"code": "unused-export-let",
 		"end": {
-			"character": 549,
 			"column": 19,
 			"line": 32
 		},
 		"message": "Component has unused export property 'g2'. If it is for external reference only, please consider using `export const g2`",
-		"pos": 543,
 		"start": {
-			"character": 543,
 			"column": 13,
 			"line": 32
 		}
@@ -47,14 +38,11 @@
 	{
 		"code": "unused-export-let",
 		"end": {
-			"character": 570,
 			"column": 19,
 			"line": 33
 		},
 		"message": "Component has unused export property 'h2'. If it is for external reference only, please consider using `export const h2`",
-		"pos": 564,
 		"start": {
-			"character": 564,
 			"column": 13,
 			"line": 33
 		}
@@ -62,14 +50,11 @@
 	{
 		"code": "unused-export-let",
 		"end": {
-			"character": 621,
 			"column": 26,
 			"line": 35
 		},
 		"message": "Component has unused export property 'j2'. If it is for external reference only, please consider using `export const j2`",
-		"pos": 608,
 		"start": {
-			"character": 608,
 			"column": 13,
 			"line": 35
 		}
diff --git a/test/validator/samples/use-the-platform/warnings.json b/test/validator/samples/use-the-platform/warnings.json
index bbc37c5e91..2dfe6b5c8e 100644
--- a/test/validator/samples/use-the-platform/warnings.json
+++ b/test/validator/samples/use-the-platform/warnings.json
@@ -2,14 +2,11 @@
 	{
 		"code": "invalid-html-attribute",
 		"message": "'className' is not a valid HTML attribute. Did you mean 'class'?",
-		"pos": 5,
 		"start": {
-			"character": 5,
 			"column": 5,
 			"line": 1
 		},
 		"end": {
-			"character": 20,
 			"column": 20,
 			"line": 1
 		}
@@ -17,14 +14,11 @@
 	{
 		"code": "invalid-html-attribute",
 		"message": "'htmlFor' is not a valid HTML attribute. Did you mean 'for'?",
-		"pos": 35,
 		"start": {
-			"character": 35,
 			"column": 7,
 			"line": 2
 		},
 		"end": {
-			"character": 46,
 			"column": 18,
 			"line": 2
 		}
diff --git a/test/validator/samples/window-binding-invalid-innerwidth/errors.json b/test/validator/samples/window-binding-invalid-innerwidth/errors.json
index c348a48811..6147ad1bba 100644
--- a/test/validator/samples/window-binding-invalid-innerwidth/errors.json
+++ b/test/validator/samples/window-binding-invalid-innerwidth/errors.json
@@ -3,13 +3,10 @@
 	"message": "'innerwidth' is not a valid binding on <svelte:window> (did you mean 'innerWidth'?)",
 	"start": {
 		"line": 1,
-		"column": 15,
-		"character": 15
+		"column": 15
 	},
 	"end": {
 		"line": 1,
-		"column": 34,
-		"character": 34
-	},
-	"pos": 15
-}]
\ No newline at end of file
+		"column": 34
+	}
+}]
diff --git a/test/validator/samples/window-binding-invalid-value/errors.json b/test/validator/samples/window-binding-invalid-value/errors.json
index 7a42e62b9a..d37aadd333 100644
--- a/test/validator/samples/window-binding-invalid-value/errors.json
+++ b/test/validator/samples/window-binding-invalid-value/errors.json
@@ -3,13 +3,10 @@
 	"message": "Bindings on <svelte:window> must be to top-level properties, e.g. 'baz' rather than 'foo.bar.baz'",
 	"start": {
 		"line": 1,
-		"column": 32,
-		"character": 32
+		"column": 32
 	},
 	"end": {
 		"line": 1,
-		"column": 43,
-		"character": 43
-	},
-	"pos": 32
-}]
\ No newline at end of file
+		"column": 43
+	}
+}]
diff --git a/test/validator/samples/window-binding-invalid-width/errors.json b/test/validator/samples/window-binding-invalid-width/errors.json
index 3274188662..e35bea2d9d 100644
--- a/test/validator/samples/window-binding-invalid-width/errors.json
+++ b/test/validator/samples/window-binding-invalid-width/errors.json
@@ -3,13 +3,10 @@
 	"message": "'width' is not a valid binding on <svelte:window> (did you mean 'innerWidth'?)",
 	"start": {
 		"line": 1,
-		"column": 15,
-		"character": 15
+		"column": 15
 	},
 	"end": {
 		"line": 1,
-		"column": 29,
-		"character": 29
-	},
-	"pos": 15
-}]
\ No newline at end of file
+		"column": 29
+	}
+}]
diff --git a/test/validator/samples/window-binding-invalid/errors.json b/test/validator/samples/window-binding-invalid/errors.json
index b8cae81bf3..1277984258 100644
--- a/test/validator/samples/window-binding-invalid/errors.json
+++ b/test/validator/samples/window-binding-invalid/errors.json
@@ -3,13 +3,10 @@
 	"message": "'potato' is not a valid binding on <svelte:window> — valid bindings are innerWidth, innerHeight, outerWidth, outerHeight, scrollX, scrollY or online",
 	"start": {
 		"line": 1,
-		"column": 15,
-		"character": 15
+		"column": 15
 	},
 	"end": {
 		"line": 1,
-		"column": 32,
-		"character": 32
-	},
-	"pos": 15
-}]
\ No newline at end of file
+		"column": 32
+	}
+}]

From b56dfe51a8a9e753a456ba152e9f71c8d4eb5bed Mon Sep 17 00:00:00 2001
From: Nguyen Tran <88808276+ngtr6788@users.noreply.github.com>
Date: Mon, 27 Feb 2023 06:28:59 -0500
Subject: [PATCH 014/110] feat: add a11y `role-supports-aria-props` (#8195)

#820

---------

Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 .../content/docs/06-accessibility-warnings.md |   14 +
 src/compiler/compile/compiler_warnings.ts     |   11 +
 src/compiler/compile/nodes/Element.ts         |   84 +-
 .../input.svelte                              |    1 -
 .../input.svelte                              |  371 +++
 .../warnings.json                             | 2150 +++++++++++++++++
 6 files changed, 2628 insertions(+), 3 deletions(-)
 create mode 100644 test/validator/samples/a11y-role-supports-aria-props/input.svelte
 create mode 100644 test/validator/samples/a11y-role-supports-aria-props/warnings.json

diff --git a/site/content/docs/06-accessibility-warnings.md b/site/content/docs/06-accessibility-warnings.md
index 7aa3873cce..ee52aab405 100644
--- a/site/content/docs/06-accessibility-warnings.md
+++ b/site/content/docs/06-accessibility-warnings.md
@@ -308,6 +308,20 @@ Elements with ARIA roles must have all required attributes for that role.
 
 ---
 
+### `a11y-role-supports-aria-props`
+
+Elements with explicit or implicit roles defined contain only `aria-*` properties supported by that role.
+
+```sv
+<!-- A11y: The attribute 'aria-multiline' is not supported by the role 'link'. -->
+<div role="link" aria-multiline />
+
+<!-- A11y: The attribute 'aria-required' is not supported by the role 'listitem'. This role is implicit on the element <li>. -->
+<li aria-required />
+```
+
+---
+
 ### `a11y-structure`
 
 Enforce that certain DOM elements have the correct structure.
diff --git a/src/compiler/compile/compiler_warnings.ts b/src/compiler/compile/compiler_warnings.ts
index a10fe6155c..817aabea02 100644
--- a/src/compiler/compile/compiler_warnings.ts
+++ b/src/compiler/compile/compiler_warnings.ts
@@ -123,6 +123,17 @@ export default {
 		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(', ')}`
 	}),
+  a11y_role_supports_aria_props: (attribute: string, role: string, is_implicit: boolean, name: string) => {
+    let message = `The attribute '${attribute}' is not supported by the role '${role}'.`;
+    if (is_implicit) {
+      message += ` This role is implicit on the element <${name}>.`;
+    }
+
+    return {
+      code: 'a11y-role-supports-aria-props',
+      message: `A11y: ${message}`
+    };
+  },
 	a11y_accesskey: {
 		code: 'a11y-accesskey',
 		message: 'A11y: Avoid using accesskey'
diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index 1ac75faffd..ed1b9d64bf 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -82,11 +82,15 @@ const a11y_nested_implicit_semantics = new Map([
 
 const a11y_implicit_semantics = new Map([
 	['a', 'link'],
+	['area', 'link'],
+	['article', 'article'],
 	['aside', 'complementary'],
 	['body', 'document'],
+	['button', 'button'],
 	['datalist', 'listbox'],
 	['dd', 'definition'],
 	['dfn', 'term'],
+	['dialog', 'dialog'],
 	['details', 'group'],
 	['dt', 'term'],
 	['fieldset', 'group'],
@@ -98,10 +102,14 @@ const a11y_implicit_semantics = new Map([
 	['h5', 'heading'],
 	['h6', 'heading'],
 	['hr', 'separator'],
+	['img', 'img'],
 	['li', 'listitem'],
+	['link', 'link'],
 	['menu', 'list'],
+	['meter', 'progressbar'],
 	['nav', 'navigation'],
 	['ol', 'list'],
+	['option', 'option'],
 	['optgroup', 'group'],
 	['output', 'status'],
 	['progress', 'progressbar'],
@@ -115,6 +123,61 @@ const a11y_implicit_semantics = new Map([
 	['ul', 'list']
 ]);
 
+const menuitem_type_to_implicit_role = new Map([
+  ['command', 'menuitem'],
+  ['checkbox', 'menuitemcheckbox'],
+  ['radio', 'menuitemradio']
+]);
+
+const input_type_to_implicit_role = new Map([
+  ['button', 'button'],
+  ['image', 'button'],
+  ['reset', 'button'],
+  ['submit', 'button'],
+  ['checkbox', 'checkbox'],
+  ['radio', 'radio'],
+  ['range', 'slider'],
+  ['number', 'spinbutton'],
+  ['email', 'textbox'],
+  ['search', 'searchbox'],
+  ['tel', 'textbox'],
+  ['text', 'textbox'],
+  ['url', 'textbox']
+]);
+
+const combobox_if_list = new Set(['email', 'search', 'tel', 'text', 'url']);
+
+function input_implicit_role(attribute_map: Map<string, Attribute>) {
+  const type_attribute = attribute_map.get('type');
+  if (!type_attribute || !type_attribute.is_static) return;
+  const type = type_attribute.get_static_value() as string;
+
+  const list_attribute_exists = attribute_map.has('list');
+
+  if (list_attribute_exists && combobox_if_list.has(type)) {
+	return 'combobox';
+  }
+
+  return input_type_to_implicit_role.get(type);
+}
+
+function menuitem_implicit_role(attribute_map: Map<string, Attribute>) {
+  const type_attribute = attribute_map.get('type');
+  if (!type_attribute || !type_attribute.is_static) return;
+  const type = type_attribute.get_static_value() as string;
+  return menuitem_type_to_implicit_role.get(type);
+}
+
+function get_implicit_role(name: string, attribute_map: Map<string, Attribute>) : (string | undefined) {
+  if (name === 'menuitem') {
+	return menuitem_implicit_role(attribute_map);
+  } else if (name === 'input') {
+	return input_implicit_role(attribute_map);
+  } else {
+	return a11y_implicit_semantics.get(name);
+  }
+}
+
 const invisible_elements = new Set(['meta', 'html', 'script', 'style']);
 
 const valid_modifiers = new Set([
@@ -488,7 +551,7 @@ export default class Element extends Node {
 
 				// aria-activedescendant-has-tabindex
 				if (name === 'aria-activedescendant' && !is_interactive_element(this.name, attribute_map) && !attribute_map.has('tabindex')) {
-			    component.warn(attribute, compiler_warnings.a11y_aria_activedescendant_has_tabindex);
+					component.warn(attribute, compiler_warnings.a11y_aria_activedescendant_has_tabindex);
 				}
 			}
 
@@ -511,7 +574,7 @@ export default class Element extends Node {
 						}
 
 						// no-redundant-roles
-						const has_redundant_role = current_role === a11y_implicit_semantics.get(this.name);
+						const has_redundant_role = current_role === get_implicit_role(this.name, attribute_map);
 
 						if (this.name === current_role || has_redundant_role) {
 							component.warn(attribute, compiler_warnings.a11y_no_redundant_roles(current_role));
@@ -605,6 +668,23 @@ export default class Element extends Node {
 				component.warn(this, compiler_warnings.a11y_no_noninteractive_tabindex);
 			}
 		}
+
+		// 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;
+		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)));
+			const is_implicit = role_value && role === undefined;
+
+			attributes
+				.filter(prop => prop.type !== 'Spread')
+				.forEach(prop => {
+					if (invalid_aria_props.has(prop.name as ARIAProperty)) {
+						component.warn(prop, compiler_warnings.a11y_role_supports_aria_props(prop.name, role_value, is_implicit, this.name));
+					}
+				});
+		}
 	}
 
 	validate_special_cases() {
diff --git a/test/validator/samples/a11y-role-has-required-aria-props/input.svelte b/test/validator/samples/a11y-role-has-required-aria-props/input.svelte
index 113ed65316..8f72ff04bf 100644
--- a/test/validator/samples/a11y-role-has-required-aria-props/input.svelte
+++ b/test/validator/samples/a11y-role-has-required-aria-props/input.svelte
@@ -8,4 +8,3 @@
 <div role="meter" aria-valuenow="50" aria-valuemin="0" aria-valuemax="100"></div>
 <div role="scrollbar" aria-controls="panel" aria-valuenow="50"></div>
 <input role="switch" type="checkbox" />
-<input role="radio" type="radio" />
\ No newline at end of file
diff --git a/test/validator/samples/a11y-role-supports-aria-props/input.svelte b/test/validator/samples/a11y-role-supports-aria-props/input.svelte
new file mode 100644
index 0000000000..353069dc06
--- /dev/null
+++ b/test/validator/samples/a11y-role-supports-aria-props/input.svelte
@@ -0,0 +1,371 @@
+<!-- INVALID -->
+<a aria-setsize="0" href="/">Link</a>
+<area aria-pressed alt="" />
+<article aria-autocomplete="inline" />
+<aside aria-modal />
+<body aria-invalid />
+<button aria-valuemax="0" />
+<datalist aria-valuenow="0" />
+<dd aria-rowindex="0" />
+<dfn aria-colcount="0" />
+<dialog aria-posinset="0" />
+<details aria-orientation="undefined" />
+<dt aria-valuemin="0" />
+<fieldset aria-orientation="undefined" />
+<form aria-disabled />
+<h1 aria-selected>H1</h1>
+<h2 aria-selected>H2</h2>
+<h3 aria-expanded>H3</h3>
+<h4 aria-valuemin="0">H4</h4>
+<h5 aria-readonly>H5</h5>
+<h6 aria-valuemin="0">H6</h6>
+<hr aria-required />
+<img aria-level="0" alt="invalid aria" />
+<li aria-required />
+<link aria-rowcount="0" />
+<menu aria-valuemin="0" />
+<meter aria-colspan="0" />
+<nav aria-valuetext="" />
+<ol aria-sort="none" />
+<option aria-invalid />
+<optgroup aria-sort="none" />
+<output aria-multiline />
+<progress aria-rowcount="0" />
+<section aria-invalid />
+<summary aria-rowcount="0" />
+<tbody aria-colspan="0" />
+<textarea aria-valuenow="0" />
+<tfoot aria-required />
+<thead aria-valuemin="0" />
+<tr aria-pressed />
+<ul aria-multiselectable />
+
+<div role="alert" aria-colspan="0" />
+<div role="alertdialog" aria-autocomplete="inline" />
+<div role="application" aria-required />
+<div role="article" aria-multiline />
+<div role="banner" aria-autocomplete="inline" />
+<div role="blockquote" aria-valuetext="" />
+<div role="button" aria-colspan="0" />
+<div role="caption" aria-setsize="0" />
+<div role="cell" aria-multiline />
+<div role="checkbox" aria-multiline aria-checked />
+<div role="code" aria-invalid />
+<div role="columnheader" aria-colcount="0" />
+<div role="combobox" aria-multiselectable aria-controls={[]} aria-expanded />
+<div role="complementary" aria-readonly />
+<div role="contentinfo" aria-valuetext="" />
+<div role="definition" aria-multiline />
+<div role="deletion" aria-expanded />
+<div role="dialog" aria-multiline />
+<div role="directory" aria-rowcount="0" />
+<div role="document" aria-valuemin="0" />
+<div role="emphasis" aria-rowindex="0" />
+<div role="feed" aria-colindex="0" />
+<div role="figure" aria-valuemax="0" />
+<div role="form" aria-readonly />
+<div role="generic" aria-valuemax="0" />
+<div role="grid" aria-checked />
+<div role="gridcell" aria-level="0" />
+<div role="group" aria-colspan="0" />
+<div role="heading" aria-activedescendant="id" tabindex="-1" aria-level="0" />
+<div role="insertion" aria-errormessage="error" />
+<div role="link" aria-multiline />
+<div role="list" aria-selected />
+<div role="listbox" aria-haspopup />
+<div role="listitem" aria-activedescendant="id" tabindex="-1" />
+<div role="log" aria-required />
+<div role="main" aria-sort="none" />
+<div role="marquee" aria-autocomplete="inline" />
+<div role="math" aria-multiline />
+<div role="menu" aria-checked />
+<div role="menubar" aria-errormessage="error" />
+<div role="menuitem" aria-checked />
+<div role="menuitemcheckbox" aria-pressed aria-checked="false" />
+<div role="menuitemradio" aria-rowspan="0" aria-checked="false" />
+<div role="meter" aria-valuenow="0" aria-haspopup />
+<div role="navigation" aria-expanded />
+<div role="none" aria-placeholder="" />
+<div role="note" aria-modal />
+<div role="option" aria-selected aria-valuemax="0" />
+<div role="paragraph" aria-level="0" />
+<div role="presentation" aria-disabled />
+<div role="progressbar" aria-expanded />
+<div role="radio" aria-checked aria-rowindex="0" />
+<div role="radiogroup" aria-valuenow="0" />
+<div role="region" aria-rowspan="0" />
+<div role="row" aria-required />
+<div role="rowgroup" aria-expanded />
+<div role="rowheader" aria-activedescendant="id" tabindex="0" />
+<div role="scrollbar" aria-controls={[]} aria-valuenow="0" aria-rowspan="0" />
+<div role="search" aria-autocomplete="inline" />
+<div role="searchbox" aria-colindex="0" />
+<div role="separator" aria-sort="none" />
+<div role="slider" aria-valuenow="0" aria-placeholder="" />
+<div role="spinbutton" aria-posinset="0" />
+<div role="status" aria-valuemin="0" />
+<div role="strong" aria-valuemin="0" />
+<div role="subscript" aria-colcount="0" />
+<div role="superscript" aria-level="0" />
+<div role="switch" aria-checked aria-valuenow="0" />
+<div role="tab" aria-required />
+<div role="table" aria-modal />
+<div role="tablist" aria-setsize="0" />
+<div role="tabpanel" aria-multiselectable />
+<div role="term" aria-posinset="0" />
+<div role="textbox" aria-colspan="0" />
+<div role="time" aria-selected />
+<div role="timer" aria-sort="none" />
+<div role="toolbar" aria-valuetext="" />
+<div role="tooltip" aria-multiline />
+<div role="tree" aria-expanded />
+<div role="treegrid" aria-level="0" />
+<div role="treeitem" aria-selected aria-activedescendant="id" tabindex="-1" />
+<div role="doc-abstract" aria-colindex="0" />
+<div role="doc-acknowledgments" aria-setsize="0" />
+<div role="doc-afterword" aria-modal />
+<div role="doc-appendix" aria-activedescendant="id" tabindex="-1" />
+<div role="doc-backlink" aria-colspan="0" />
+<div role="doc-biblioentry" aria-valuemax="0" />
+<div role="doc-bibliography" aria-level="0" />
+<div role="doc-biblioref" aria-checked />
+<div role="doc-chapter" aria-required />
+<div role="doc-colophon" aria-setsize="0" />
+<div role="doc-conclusion" aria-colindex="0" />
+<div role="doc-cover" aria-modal />
+<div role="doc-credit" aria-selected />
+<div role="doc-credits" aria-orientation="undefined" />
+<div role="doc-dedication" aria-level="0" />
+<div role="doc-endnote" aria-checked />
+<div role="doc-endnotes" aria-colcount="0" />
+<div role="doc-epigraph" aria-multiline />
+<div role="doc-epilogue" aria-colcount="0" />
+<div role="doc-errata" aria-sort="none" />
+<div role="doc-example" aria-multiselectable />
+<div role="doc-footnote" aria-rowcount="0" />
+<div role="doc-foreword" aria-valuenow="0" />
+<div role="doc-glossary" aria-valuetext="" />
+<div role="doc-glossref" aria-placeholder="" />
+<div role="doc-index" aria-rowcount="0" />
+<div role="doc-introduction" aria-pressed />
+<div role="doc-noteref" aria-valuenow="0" />
+<div role="doc-notice" aria-selected />
+<div role="doc-pagebreak" aria-rowcount="0" />
+<div role="doc-pagelist" aria-modal />
+<div role="doc-part" aria-setsize="0" />
+<div role="doc-preface" aria-orientation="undefined" />
+<div role="doc-prologue" aria-required />
+<div role="doc-pullquote" aria-rowcount="0" />
+<div role="doc-qna" aria-setsize="0" />
+<div role="doc-subtitle" aria-rowindex="0" />
+<div role="doc-tip" aria-valuenow="0" />
+<div role="doc-toc" aria-posinset="0" />
+
+<!-- input and menuitem have different implicit roles based on different type attributes, and thus different valid and invalid props -->
+<!-- INVALID -->
+<input type="text" aria-rowspan="0" /> <!-- implicit role: textbox -->
+<input type="tel" aria-pressed /> <!-- implicit role: textbox -->
+<input type="url" aria-level="0" /> <!-- implicit role: textbox -->
+<input type="email" aria-pressed /> <!-- implicit role: textbox -->
+<input type="search" aria-valuetext="text" /> <!-- implicit role: searchbox -->
+<input type="text" list={['id']} aria-valuemin="0" /> <!-- implicit role: combobox -->
+<input type="tel" list={['id']} aria-colspan="0" /> <!-- implicit role: combobox -->
+<input type="url" list={['id']} aria-posinset="0" /> <!-- implicit role: combobox -->
+<input type="email" list={['id']} aria-modal /> <!-- implicit role: combobox -->
+<input type="search" list={['id']} aria-rowindex="0" /> <!-- implicit role: combobox -->
+<input type="image" alt="some text" aria-valuemax="0" /> <!-- implicit role: button -->
+<input type="reset" aria-modal /> <!-- implicit role: button -->
+<input type="submit" aria-placeholder="placeholder" /> <!-- implicit role: button -->
+<input type="checkbox" aria-rowindex="0" /> <!-- implicit role: checkbox -->
+<input type="radio" aria-valuetext="text" /> <!-- implicit role: radio -->
+<input type="range" aria-checked /> <!-- implicit role: slider -->
+<menuitem type="command" aria-colindex="0" /> <!-- implicit role: menuitem -->
+<menuitem type="checkbox" aria-colcount="0" /> <!-- implicit role: menuitemcheckbox -->
+<menuitem type="radio" aria-placeholder="placeholder" /> <!-- implicit role: menuitemradio -->
+
+<!-- VALID -->
+<a aria-keyshortcuts="" href="/">Link</a>
+<area aria-expanded alt="" />
+<article aria-dropeffect="none" />
+<aside aria-keyshortcuts="" />
+<body aria-labelledby="id" />
+<button aria-hidden />
+<datalist aria-activedescendant="id" tabindex="0" />
+<dd aria-labelledby="id" />
+<dfn aria-details="id" />
+<dialog aria-keyshortcuts="" />
+<details aria-keyshortcuts="" />
+<dt aria-hidden />
+<fieldset aria-owns="id" />
+<form aria-keyshortcuts="" />
+<h1 aria-keyshortcuts="">H1</h1>
+<h2 aria-controls={[]}>H2</h2>
+<h3 aria-controls={[]}>H3</h3>
+<h4 aria-details="id">H4</h4>
+<h5 aria-grabbed>H5</h5>
+<h6 aria-grabbed>H6</h6>
+<hr aria-relevant="all" />
+<img aria-flowto="id" alt="Valid aria role" />
+<li aria-label="" />
+<link aria-hidden />
+<menu aria-roledescription="" />
+<meter aria-valuemin="0" />
+<nav aria-labelledby="id" />
+<ol aria-grabbed />
+<option aria-selected />
+<optgroup aria-hidden />
+<output aria-dropeffect="none" />
+<progress aria-hidden />
+<section aria-details="id" />
+<summary aria-controls={[]} />
+<tbody aria-controls={[]} />
+<textarea aria-busy />
+<tfoot aria-labelledby="id" />
+<thead aria-flowto="id" />
+<tr aria-describedby="id" />
+<ul aria-dropeffect="none" />
+
+<div role="alert" aria-owns="id" />
+<div role="alertdialog" aria-busy />
+<div role="application" aria-invalid />
+<div role="article" aria-atomic />
+<div role="banner" aria-grabbed />
+<div role="blockquote" aria-busy />
+<div role="button" aria-busy />
+<div role="caption" aria-grabbed />
+<div role="cell" aria-rowindex="0" />
+<div role="checkbox" aria-checked aria-details="id" />
+<div role="code" aria-keyshortcuts="" />
+<div role="columnheader" aria-rowspan="0" />
+<div role="combobox" aria-invalid aria-controls={[]} aria-expanded />
+<div role="complementary" aria-label="" />
+<div role="contentinfo" aria-dropeffect="none" />
+<div role="definition" aria-grabbed />
+<div role="deletion" aria-busy />
+<div role="dialog" aria-flowto="id" />
+<div role="directory" aria-controls={[]} />
+<div role="document" aria-grabbed />
+<div role="emphasis" aria-atomic />
+<div role="feed" aria-atomic />
+<div role="figure" aria-busy />
+<div role="form" aria-roledescription="" />
+<div role="generic" aria-current />
+<div role="grid" aria-busy />
+<div role="gridcell" aria-relevant="all" />
+<div role="group" aria-busy />
+<div role="heading" aria-level="" aria-flowto="id" />
+<div role="img" aria-grabbed />
+<div role="insertion" aria-roledescription="" />
+<div role="link" aria-owns="id" />
+<div role="list" aria-labelledby="id" />
+<div role="listbox" aria-current />
+<div role="listitem" aria-controls={[]} />
+<div role="log" aria-controls={[]} />
+<div role="main" aria-keyshortcuts="" />
+<div role="marquee" aria-labelledby="id" />
+<div role="math" aria-labelledby="id" />
+<div role="menu" aria-atomic />
+<div role="menubar" aria-grabbed />
+<div role="menuitem" aria-grabbed />
+<div role="menuitemcheckbox" aria-checked aria-controls={[]} />
+<div role="menuitemradio" aria-checked aria-grabbed />
+<div role="meter" aria-valuenow="0" aria-valuetext="" />
+<div role="navigation" aria-controls={[]} />
+<div role="none" undefined />
+<div role="note" aria-hidden />
+<div role="option" aria-selected aria-describedby="id" />
+<div role="paragraph" aria-grabbed />
+<div role="presentation" aria-relevant="all" />
+<div role="progressbar" aria-valuemin="0" />
+<div role="radio" aria-checked aria-roledescription="" />
+<div role="radiogroup" aria-required />
+<div role="region" aria-roledescription="" />
+<div role="row" aria-posinset="0" />
+<div role="rowgroup" aria-busy />
+<div role="rowheader" aria-label="" />
+<div role="scrollbar" aria-controls={[]} aria-valuenow="0" aria-relevant="all" />
+<div role="search" aria-grabbed />
+<div role="searchbox" aria-dropeffect="none" />
+<div role="separator" aria-roledescription="" />
+<div role="slider" aria-valuenow="0" aria-relevant="all" />
+<div role="spinbutton" aria-required />
+<div role="status" aria-label="" />
+<div role="strong" aria-keyshortcuts="" />
+<div role="subscript" aria-keyshortcuts="" />
+<div role="superscript" aria-live="off" />
+<div role="switch" aria-checked aria-roledescription="" />
+<div role="tab" aria-flowto="id" />
+<div role="table" aria-rowcount="0" />
+<div role="tablist" aria-atomic />
+<div role="tabpanel" aria-labelledby="id" />
+<div role="term" aria-details="id" />
+<div role="textbox" aria-hidden />
+<div role="time" aria-label="" />
+<div role="timer" aria-hidden />
+<div role="toolbar" aria-roledescription="" />
+<div role="tooltip" aria-owns="id" />
+<div role="tree" aria-errormessage="error" />
+<div role="treegrid" aria-details="id" />
+<div role="treeitem" aria-selected="true" aria-dropeffect="none" />
+<div role="doc-abstract" aria-label="" />
+<div role="doc-acknowledgments" aria-controls={[]} />
+<div role="doc-afterword" aria-flowto="id" />
+<div role="doc-appendix" aria-describedby="id" />
+<div role="doc-backlink" aria-dropeffect="none" />
+<div role="doc-biblioentry" aria-roledescription="" />
+<div role="doc-bibliography" aria-labelledby="id" />
+<div role="doc-biblioref" aria-haspopup />
+<div role="doc-chapter" aria-controls={[]} />
+<div role="doc-colophon" aria-expanded />
+<div role="doc-conclusion" aria-dropeffect="none" />
+<div role="doc-cover" aria-controls={[]} />
+<div role="doc-credit" aria-haspopup />
+<div role="doc-credits" aria-describedby="id" />
+<div role="doc-dedication" aria-roledescription="" />
+<div role="doc-endnote" aria-errormessage="error" />
+<div role="doc-endnotes" aria-owns="id" />
+<div role="doc-epigraph" aria-controls={[]} />
+<div role="doc-epilogue" aria-relevant="all" />
+<div role="doc-errata" aria-keyshortcuts="" />
+<div role="doc-example" aria-invalid />
+<div role="doc-footnote" aria-labelledby="id" />
+<div role="doc-foreword" aria-expanded />
+<div role="doc-glossary" aria-grabbed />
+<div role="doc-glossref" aria-haspopup />
+<div role="doc-index" aria-controls={[]} />
+<div role="doc-introduction" aria-labelledby="id" />
+<div role="doc-noteref" aria-details="id" />
+<div role="doc-notice" aria-owns="id" />
+<div role="doc-pagebreak" aria-owns="id" />
+<div role="doc-pagelist" aria-disabled />
+<div role="doc-part" aria-relevant="all" />
+<div role="doc-preface" aria-label="" />
+<div role="doc-prologue" aria-invalid />
+<div role="doc-pullquote" undefined />
+<div role="doc-qna" aria-errormessage="error" />
+<div role="doc-subtitle" aria-errormessage="error" />
+<div role="doc-tip" aria-owns="id" />
+<div role="doc-toc" aria-expanded />
+
+<!-- input and menuitem have different implicit roles based on different type attributes, and thus different valid and invalid props -->
+<!-- VALID -->
+<input type="text" aria-labelledby="id" /> <!-- implicit role: textbox -->
+<input type="tel" aria-readonly /> <!-- implicit role: textbox -->
+<input type="url" aria-errormessage="id" /> <!-- implicit role: textbox -->
+<input type="email" aria-details="id" /> <!-- implicit role: textbox -->
+<input type="searchbox" aria-owns="id" /> <!-- implicit role: searchbox -->
+<input type="text" list={['id']} aria-keyshortcuts="key" /> <!-- implicit role: combobox -->
+<input type="tel" list={['id']} aria-readonly /> <!-- implicit role: combobox -->
+<input type="url" list={['id']} aria-label="label" /> <!-- implicit role: combobox -->
+<input type="email" list={['id']} aria-activedescendant="id" /> <!-- implicit role: combobox -->
+<input type="search" list={['id']} aria-dropeffect="none" /> <!-- implicit role: combobox -->
+<input type="image" alt="some text" aria-pressed /> <!-- implicit role: button -->
+<input type="reset" aria-expanded /> <!-- implicit role: button -->
+<input type="submit" aria-disabled /> <!-- implicit role: button -->
+<input type="checkbox" aria-controls="id" /> <!-- implicit role: checkbox -->
+<input type="radio" aria-atomic /> <!-- implicit role: radio -->
+<input type="range" aria-hidden /> <!-- implicit role: slider -->
+<menuitem type="command" aria-live="off" /> <!-- implicit role: menuitem -->
+<menuitem type="checkbox" aria-relevant="all" /> <!-- implicit role: menuitemcheckbox -->
+<menuitem type="radio" aria-required /> <!-- implicit role: menuitemradio -->
+
diff --git a/test/validator/samples/a11y-role-supports-aria-props/warnings.json b/test/validator/samples/a11y-role-supports-aria-props/warnings.json
new file mode 100644
index 0000000000..eb9e7d6bfb
--- /dev/null
+++ b/test/validator/samples/a11y-role-supports-aria-props/warnings.json
@@ -0,0 +1,2150 @@
+[
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":19,
+      "line":2
+    },
+    "message":"A11y: The attribute 'aria-setsize' is not supported by the role 'link'. This role is implicit on the element <a>.",
+    "start":{
+      "column":3,
+      "line":2
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":18,
+      "line":3
+    },
+    "message":"A11y: The attribute 'aria-pressed' is not supported by the role 'link'. This role is implicit on the element <area>.",
+    "start":{
+      "column":6,
+      "line":3
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":35,
+      "line":4
+    },
+    "message":"A11y: The attribute 'aria-autocomplete' is not supported by the role 'article'. This role is implicit on the element <article>.",
+    "start":{
+      "column":9,
+      "line":4
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":17,
+      "line":5
+    },
+    "message":"A11y: The attribute 'aria-modal' is not supported by the role 'complementary'. This role is implicit on the element <aside>.",
+    "start":{
+      "column":7,
+      "line":5
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":18,
+      "line":6
+    },
+    "message":"A11y: The attribute 'aria-invalid' is not supported by the role 'document'. This role is implicit on the element <body>.",
+    "start":{
+      "column":6,
+      "line":6
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":25,
+      "line":7
+    },
+    "message":"A11y: The attribute 'aria-valuemax' is not supported by the role 'button'. This role is implicit on the element <button>.",
+    "start":{
+      "column":8,
+      "line":7
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":27,
+      "line":8
+    },
+    "message":"A11y: The attribute 'aria-valuenow' is not supported by the role 'listbox'. This role is implicit on the element <datalist>.",
+    "start":{
+      "column":10,
+      "line":8
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":21,
+      "line":9
+    },
+    "message":"A11y: The attribute 'aria-rowindex' is not supported by the role 'definition'. This role is implicit on the element <dd>.",
+    "start":{
+      "column":4,
+      "line":9
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":22,
+      "line":10
+    },
+    "message":"A11y: The attribute 'aria-colcount' is not supported by the role 'term'. This role is implicit on the element <dfn>.",
+    "start":{
+      "column":5,
+      "line":10
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":25,
+      "line":11
+    },
+    "message":"A11y: The attribute 'aria-posinset' is not supported by the role 'dialog'. This role is implicit on the element <dialog>.",
+    "start":{
+      "column":8,
+      "line":11
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":37,
+      "line":12
+    },
+    "message":"A11y: The attribute 'aria-orientation' is not supported by the role 'group'. This role is implicit on the element <details>.",
+    "start":{
+      "column":9,
+      "line":12
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":21,
+      "line":13
+    },
+    "message":"A11y: The attribute 'aria-valuemin' is not supported by the role 'term'. This role is implicit on the element <dt>.",
+    "start":{
+      "column":4,
+      "line":13
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":38,
+      "line":14
+    },
+    "message":"A11y: The attribute 'aria-orientation' is not supported by the role 'group'. This role is implicit on the element <fieldset>.",
+    "start":{
+      "column":10,
+      "line":14
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":19,
+      "line":15
+    },
+    "message":"A11y: The attribute 'aria-disabled' is not supported by the role 'form'. This role is implicit on the element <form>.",
+    "start":{
+      "column":6,
+      "line":15
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":17,
+      "line":16
+    },
+    "message":"A11y: The attribute 'aria-selected' is not supported by the role 'heading'. This role is implicit on the element <h1>.",
+    "start":{
+      "column":4,
+      "line":16
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":17,
+      "line":17
+    },
+    "message":"A11y: The attribute 'aria-selected' is not supported by the role 'heading'. This role is implicit on the element <h2>.",
+    "start":{
+      "column":4,
+      "line":17
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":17,
+      "line":18
+    },
+    "message":"A11y: The attribute 'aria-expanded' is not supported by the role 'heading'. This role is implicit on the element <h3>.",
+    "start":{
+      "column":4,
+      "line":18
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":21,
+      "line":19
+    },
+    "message":"A11y: The attribute 'aria-valuemin' is not supported by the role 'heading'. This role is implicit on the element <h4>.",
+    "start":{
+      "column":4,
+      "line":19
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":17,
+      "line":20
+    },
+    "message":"A11y: The attribute 'aria-readonly' is not supported by the role 'heading'. This role is implicit on the element <h5>.",
+    "start":{
+      "column":4,
+      "line":20
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":21,
+      "line":21
+    },
+    "message":"A11y: The attribute 'aria-valuemin' is not supported by the role 'heading'. This role is implicit on the element <h6>.",
+    "start":{
+      "column":4,
+      "line":21
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":17,
+      "line":22
+    },
+    "message":"A11y: The attribute 'aria-required' is not supported by the role 'separator'. This role is implicit on the element <hr>.",
+    "start":{
+      "column":4,
+      "line":22
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":19,
+      "line":23
+    },
+    "message":"A11y: The attribute 'aria-level' is not supported by the role 'img'. This role is implicit on the element <img>.",
+    "start":{
+      "column":5,
+      "line":23
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":17,
+      "line":24
+    },
+    "message":"A11y: The attribute 'aria-required' is not supported by the role 'listitem'. This role is implicit on the element <li>.",
+    "start":{
+      "column":4,
+      "line":24
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":23,
+      "line":25
+    },
+    "message":"A11y: The attribute 'aria-rowcount' is not supported by the role 'link'. This role is implicit on the element <link>.",
+    "start":{
+      "column":6,
+      "line":25
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":23,
+      "line":26
+    },
+    "message":"A11y: The attribute 'aria-valuemin' is not supported by the role 'list'. This role is implicit on the element <menu>.",
+    "start":{
+      "column":6,
+      "line":26
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":23,
+      "line":27
+    },
+    "message":"A11y: The attribute 'aria-colspan' is not supported by the role 'progressbar'. This role is implicit on the element <meter>.",
+    "start":{
+      "column":7,
+      "line":27
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":22,
+      "line":28
+    },
+    "message":"A11y: The attribute 'aria-valuetext' is not supported by the role 'navigation'. This role is implicit on the element <nav>.",
+    "start":{
+      "column":5,
+      "line":28
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":20,
+      "line":29
+    },
+    "message":"A11y: The attribute 'aria-sort' is not supported by the role 'list'. This role is implicit on the element <ol>.",
+    "start":{
+      "column":4,
+      "line":29
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":20,
+      "line":30
+    },
+    "message":"A11y: The attribute 'aria-invalid' is not supported by the role 'option'. This role is implicit on the element <option>.",
+    "start":{
+      "column":8,
+      "line":30
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":26,
+      "line":31
+    },
+    "message":"A11y: The attribute 'aria-sort' is not supported by the role 'group'. This role is implicit on the element <optgroup>.",
+    "start":{
+      "column":10,
+      "line":31
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":22,
+      "line":32
+    },
+    "message":"A11y: The attribute 'aria-multiline' is not supported by the role 'status'. This role is implicit on the element <output>.",
+    "start":{
+      "column":8,
+      "line":32
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":27,
+      "line":33
+    },
+    "message":"A11y: The attribute 'aria-rowcount' is not supported by the role 'progressbar'. This role is implicit on the element <progress>.",
+    "start":{
+      "column":10,
+      "line":33
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":21,
+      "line":34
+    },
+    "message":"A11y: The attribute 'aria-invalid' is not supported by the role 'region'. This role is implicit on the element <section>.",
+    "start":{
+      "column":9,
+      "line":34
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":26,
+      "line":35
+    },
+    "message":"A11y: The attribute 'aria-rowcount' is not supported by the role 'button'. This role is implicit on the element <summary>.",
+    "start":{
+      "column":9,
+      "line":35
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":23,
+      "line":36
+    },
+    "message":"A11y: The attribute 'aria-colspan' is not supported by the role 'rowgroup'. This role is implicit on the element <tbody>.",
+    "start":{
+      "column":7,
+      "line":36
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":27,
+      "line":37
+    },
+    "message":"A11y: The attribute 'aria-valuenow' is not supported by the role 'textbox'. This role is implicit on the element <textarea>.",
+    "start":{
+      "column":10,
+      "line":37
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":20,
+      "line":38
+    },
+    "message":"A11y: The attribute 'aria-required' is not supported by the role 'rowgroup'. This role is implicit on the element <tfoot>.",
+    "start":{
+      "column":7,
+      "line":38
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":24,
+      "line":39
+    },
+    "message":"A11y: The attribute 'aria-valuemin' is not supported by the role 'rowgroup'. This role is implicit on the element <thead>.",
+    "start":{
+      "column":7,
+      "line":39
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":16,
+      "line":40
+    },
+    "message":"A11y: The attribute 'aria-pressed' is not supported by the role 'row'. This role is implicit on the element <tr>.",
+    "start":{
+      "column":4,
+      "line":40
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":24,
+      "line":41
+    },
+    "message":"A11y: The attribute 'aria-multiselectable' is not supported by the role 'list'. This role is implicit on the element <ul>.",
+    "start":{
+      "column":4,
+      "line":41
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":34,
+      "line":43
+    },
+    "message":"A11y: The attribute 'aria-colspan' is not supported by the role 'alert'.",
+    "start":{
+      "column":18,
+      "line":43
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":50,
+      "line":44
+    },
+    "message":"A11y: The attribute 'aria-autocomplete' is not supported by the role 'alertdialog'.",
+    "start":{
+      "column":24,
+      "line":44
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":37,
+      "line":45
+    },
+    "message":"A11y: The attribute 'aria-required' is not supported by the role 'application'.",
+    "start":{
+      "column":24,
+      "line":45
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":34,
+      "line":46
+    },
+    "message":"A11y: The attribute 'aria-multiline' is not supported by the role 'article'.",
+    "start":{
+      "column":20,
+      "line":46
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":45,
+      "line":47
+    },
+    "message":"A11y: The attribute 'aria-autocomplete' is not supported by the role 'banner'.",
+    "start":{
+      "column":19,
+      "line":47
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":40,
+      "line":48
+    },
+    "message":"A11y: The attribute 'aria-valuetext' is not supported by the role 'blockquote'.",
+    "start":{
+      "column":23,
+      "line":48
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":35,
+      "line":49
+    },
+    "message":"A11y: The attribute 'aria-colspan' is not supported by the role 'button'.",
+    "start":{
+      "column":19,
+      "line":49
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":36,
+      "line":50
+    },
+    "message":"A11y: The attribute 'aria-setsize' is not supported by the role 'caption'.",
+    "start":{
+      "column":20,
+      "line":50
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":31,
+      "line":51
+    },
+    "message":"A11y: The attribute 'aria-multiline' is not supported by the role 'cell'.",
+    "start":{
+      "column":17,
+      "line":51
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":35,
+      "line":52
+    },
+    "message":"A11y: The attribute 'aria-multiline' is not supported by the role 'checkbox'.",
+    "start":{
+      "column":21,
+      "line":52
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":29,
+      "line":53
+    },
+    "message":"A11y: The attribute 'aria-invalid' is not supported by the role 'code'.",
+    "start":{
+      "column":17,
+      "line":53
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":42,
+      "line":54
+    },
+    "message":"A11y: The attribute 'aria-colcount' is not supported by the role 'columnheader'.",
+    "start":{
+      "column":25,
+      "line":54
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":41,
+      "line":55
+    },
+    "message":"A11y: The attribute 'aria-multiselectable' is not supported by the role 'combobox'.",
+    "start":{
+      "column":21,
+      "line":55
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":39,
+      "line":56
+    },
+    "message":"A11y: The attribute 'aria-readonly' is not supported by the role 'complementary'.",
+    "start":{
+      "column":26,
+      "line":56
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":41,
+      "line":57
+    },
+    "message":"A11y: The attribute 'aria-valuetext' is not supported by the role 'contentinfo'.",
+    "start":{
+      "column":24,
+      "line":57
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":37,
+      "line":58
+    },
+    "message":"A11y: The attribute 'aria-multiline' is not supported by the role 'definition'.",
+    "start":{
+      "column":23,
+      "line":58
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":34,
+      "line":59
+    },
+    "message":"A11y: The attribute 'aria-expanded' is not supported by the role 'deletion'.",
+    "start":{
+      "column":21,
+      "line":59
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":33,
+      "line":60
+    },
+    "message":"A11y: The attribute 'aria-multiline' is not supported by the role 'dialog'.",
+    "start":{
+      "column":19,
+      "line":60
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":39,
+      "line":61
+    },
+    "message":"A11y: The attribute 'aria-rowcount' is not supported by the role 'directory'.",
+    "start":{
+      "column":22,
+      "line":61
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":38,
+      "line":62
+    },
+    "message":"A11y: The attribute 'aria-valuemin' is not supported by the role 'document'.",
+    "start":{
+      "column":21,
+      "line":62
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":38,
+      "line":63
+    },
+    "message":"A11y: The attribute 'aria-rowindex' is not supported by the role 'emphasis'.",
+    "start":{
+      "column":21,
+      "line":63
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":34,
+      "line":64
+    },
+    "message":"A11y: The attribute 'aria-colindex' is not supported by the role 'feed'.",
+    "start":{
+      "column":17,
+      "line":64
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":36,
+      "line":65
+    },
+    "message":"A11y: The attribute 'aria-valuemax' is not supported by the role 'figure'.",
+    "start":{
+      "column":19,
+      "line":65
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":30,
+      "line":66
+    },
+    "message":"A11y: The attribute 'aria-readonly' is not supported by the role 'form'.",
+    "start":{
+      "column":17,
+      "line":66
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":37,
+      "line":67
+    },
+    "message":"A11y: The attribute 'aria-valuemax' is not supported by the role 'generic'.",
+    "start":{
+      "column":20,
+      "line":67
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":29,
+      "line":68
+    },
+    "message":"A11y: The attribute 'aria-checked' is not supported by the role 'grid'.",
+    "start":{
+      "column":17,
+      "line":68
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":35,
+      "line":69
+    },
+    "message":"A11y: The attribute 'aria-level' is not supported by the role 'gridcell'.",
+    "start":{
+      "column":21,
+      "line":69
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":34,
+      "line":70
+    },
+    "message":"A11y: The attribute 'aria-colspan' is not supported by the role 'group'.",
+    "start":{
+      "column":18,
+      "line":70
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":46,
+      "line":71
+    },
+    "message":"A11y: The attribute 'aria-activedescendant' is not supported by the role 'heading'.",
+    "start":{
+      "column":20,
+      "line":71
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":47,
+      "line":72
+    },
+    "message":"A11y: The attribute 'aria-errormessage' is not supported by the role 'insertion'.",
+    "start":{
+      "column":22,
+      "line":72
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":31,
+      "line":73
+    },
+    "message":"A11y: The attribute 'aria-multiline' is not supported by the role 'link'.",
+    "start":{
+      "column":17,
+      "line":73
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":30,
+      "line":74
+    },
+    "message":"A11y: The attribute 'aria-selected' is not supported by the role 'list'.",
+    "start":{
+      "column":17,
+      "line":74
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":33,
+      "line":75
+    },
+    "message":"A11y: The attribute 'aria-haspopup' is not supported by the role 'listbox'.",
+    "start":{
+      "column":20,
+      "line":75
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":47,
+      "line":76
+    },
+    "message":"A11y: The attribute 'aria-activedescendant' is not supported by the role 'listitem'.",
+    "start":{
+      "column":21,
+      "line":76
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":29,
+      "line":77
+    },
+    "message":"A11y: The attribute 'aria-required' is not supported by the role 'log'.",
+    "start":{
+      "column":16,
+      "line":77
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":33,
+      "line":78
+    },
+    "message":"A11y: The attribute 'aria-sort' is not supported by the role 'main'.",
+    "start":{
+      "column":17,
+      "line":78
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":46,
+      "line":79
+    },
+    "message":"A11y: The attribute 'aria-autocomplete' is not supported by the role 'marquee'.",
+    "start":{
+      "column":20,
+      "line":79
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":31,
+      "line":80
+    },
+    "message":"A11y: The attribute 'aria-multiline' is not supported by the role 'math'.",
+    "start":{
+      "column":17,
+      "line":80
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":29,
+      "line":81
+    },
+    "message":"A11y: The attribute 'aria-checked' is not supported by the role 'menu'.",
+    "start":{
+      "column":17,
+      "line":81
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":45,
+      "line":82
+    },
+    "message":"A11y: The attribute 'aria-errormessage' is not supported by the role 'menubar'.",
+    "start":{
+      "column":20,
+      "line":82
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":33,
+      "line":83
+    },
+    "message":"A11y: The attribute 'aria-checked' is not supported by the role 'menuitem'.",
+    "start":{
+      "column":21,
+      "line":83
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":41,
+      "line":84
+    },
+    "message":"A11y: The attribute 'aria-pressed' is not supported by the role 'menuitemcheckbox'.",
+    "start":{
+      "column":29,
+      "line":84
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":42,
+      "line":85
+    },
+    "message":"A11y: The attribute 'aria-rowspan' is not supported by the role 'menuitemradio'.",
+    "start":{
+      "column":26,
+      "line":85
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":49,
+      "line":86
+    },
+    "message":"A11y: The attribute 'aria-haspopup' is not supported by the role 'meter'.",
+    "start":{
+      "column":36,
+      "line":86
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":36,
+      "line":87
+    },
+    "message":"A11y: The attribute 'aria-expanded' is not supported by the role 'navigation'.",
+    "start":{
+      "column":23,
+      "line":87
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":36,
+      "line":88
+    },
+    "message":"A11y: The attribute 'aria-placeholder' is not supported by the role 'none'.",
+    "start":{
+      "column":17,
+      "line":88
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":27,
+      "line":89
+    },
+    "message":"A11y: The attribute 'aria-modal' is not supported by the role 'note'.",
+    "start":{
+      "column":17,
+      "line":89
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":50,
+      "line":90
+    },
+    "message":"A11y: The attribute 'aria-valuemax' is not supported by the role 'option'.",
+    "start":{
+      "column":33,
+      "line":90
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":36,
+      "line":91
+    },
+    "message":"A11y: The attribute 'aria-level' is not supported by the role 'paragraph'.",
+    "start":{
+      "column":22,
+      "line":91
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":38,
+      "line":92
+    },
+    "message":"A11y: The attribute 'aria-disabled' is not supported by the role 'presentation'.",
+    "start":{
+      "column":25,
+      "line":92
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":37,
+      "line":93
+    },
+    "message":"A11y: The attribute 'aria-expanded' is not supported by the role 'progressbar'.",
+    "start":{
+      "column":24,
+      "line":93
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":48,
+      "line":94
+    },
+    "message":"A11y: The attribute 'aria-rowindex' is not supported by the role 'radio'.",
+    "start":{
+      "column":31,
+      "line":94
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":40,
+      "line":95
+    },
+    "message":"A11y: The attribute 'aria-valuenow' is not supported by the role 'radiogroup'.",
+    "start":{
+      "column":23,
+      "line":95
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":35,
+      "line":96
+    },
+    "message":"A11y: The attribute 'aria-rowspan' is not supported by the role 'region'.",
+    "start":{
+      "column":19,
+      "line":96
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":29,
+      "line":97
+    },
+    "message":"A11y: The attribute 'aria-required' is not supported by the role 'row'.",
+    "start":{
+      "column":16,
+      "line":97
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":34,
+      "line":98
+    },
+    "message":"A11y: The attribute 'aria-expanded' is not supported by the role 'rowgroup'.",
+    "start":{
+      "column":21,
+      "line":98
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":48,
+      "line":99
+    },
+    "message":"A11y: The attribute 'aria-activedescendant' is not supported by the role 'rowheader'.",
+    "start":{
+      "column":22,
+      "line":99
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":75,
+      "line":100
+    },
+    "message":"A11y: The attribute 'aria-rowspan' is not supported by the role 'scrollbar'.",
+    "start":{
+      "column":59,
+      "line":100
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":45,
+      "line":101
+    },
+    "message":"A11y: The attribute 'aria-autocomplete' is not supported by the role 'search'.",
+    "start":{
+      "column":19,
+      "line":101
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":39,
+      "line":102
+    },
+    "message":"A11y: The attribute 'aria-colindex' is not supported by the role 'searchbox'.",
+    "start":{
+      "column":22,
+      "line":102
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":38,
+      "line":103
+    },
+    "message":"A11y: The attribute 'aria-sort' is not supported by the role 'separator'.",
+    "start":{
+      "column":22,
+      "line":103
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":56,
+      "line":104
+    },
+    "message":"A11y: The attribute 'aria-placeholder' is not supported by the role 'slider'.",
+    "start":{
+      "column":37,
+      "line":104
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":40,
+      "line":105
+    },
+    "message":"A11y: The attribute 'aria-posinset' is not supported by the role 'spinbutton'.",
+    "start":{
+      "column":23,
+      "line":105
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":36,
+      "line":106
+    },
+    "message":"A11y: The attribute 'aria-valuemin' is not supported by the role 'status'.",
+    "start":{
+      "column":19,
+      "line":106
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":36,
+      "line":107
+    },
+    "message":"A11y: The attribute 'aria-valuemin' is not supported by the role 'strong'.",
+    "start":{
+      "column":19,
+      "line":107
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":39,
+      "line":108
+    },
+    "message":"A11y: The attribute 'aria-colcount' is not supported by the role 'subscript'.",
+    "start":{
+      "column":22,
+      "line":108
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":38,
+      "line":109
+    },
+    "message":"A11y: The attribute 'aria-level' is not supported by the role 'superscript'.",
+    "start":{
+      "column":24,
+      "line":109
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":49,
+      "line":110
+    },
+    "message":"A11y: The attribute 'aria-valuenow' is not supported by the role 'switch'.",
+    "start":{
+      "column":32,
+      "line":110
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":29,
+      "line":111
+    },
+    "message":"A11y: The attribute 'aria-required' is not supported by the role 'tab'.",
+    "start":{
+      "column":16,
+      "line":111
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":28,
+      "line":112
+    },
+    "message":"A11y: The attribute 'aria-modal' is not supported by the role 'table'.",
+    "start":{
+      "column":18,
+      "line":112
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":36,
+      "line":113
+    },
+    "message":"A11y: The attribute 'aria-setsize' is not supported by the role 'tablist'.",
+    "start":{
+      "column":20,
+      "line":113
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":41,
+      "line":114
+    },
+    "message":"A11y: The attribute 'aria-multiselectable' is not supported by the role 'tabpanel'.",
+    "start":{
+      "column":21,
+      "line":114
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":34,
+      "line":115
+    },
+    "message":"A11y: The attribute 'aria-posinset' is not supported by the role 'term'.",
+    "start":{
+      "column":17,
+      "line":115
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":36,
+      "line":116
+    },
+    "message":"A11y: The attribute 'aria-colspan' is not supported by the role 'textbox'.",
+    "start":{
+      "column":20,
+      "line":116
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":30,
+      "line":117
+    },
+    "message":"A11y: The attribute 'aria-selected' is not supported by the role 'time'.",
+    "start":{
+      "column":17,
+      "line":117
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":34,
+      "line":118
+    },
+    "message":"A11y: The attribute 'aria-sort' is not supported by the role 'timer'.",
+    "start":{
+      "column":18,
+      "line":118
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":37,
+      "line":119
+    },
+    "message":"A11y: The attribute 'aria-valuetext' is not supported by the role 'toolbar'.",
+    "start":{
+      "column":20,
+      "line":119
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":34,
+      "line":120
+    },
+    "message":"A11y: The attribute 'aria-multiline' is not supported by the role 'tooltip'.",
+    "start":{
+      "column":20,
+      "line":120
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":30,
+      "line":121
+    },
+    "message":"A11y: The attribute 'aria-expanded' is not supported by the role 'tree'.",
+    "start":{
+      "column":17,
+      "line":121
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":35,
+      "line":122
+    },
+    "message":"A11y: The attribute 'aria-level' is not supported by the role 'treegrid'.",
+    "start":{
+      "column":21,
+      "line":122
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":61,
+      "line":123
+    },
+    "message":"A11y: The attribute 'aria-activedescendant' is not supported by the role 'treeitem'.",
+    "start":{
+      "column":35,
+      "line":123
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":42,
+      "line":124
+    },
+    "message":"A11y: The attribute 'aria-colindex' is not supported by the role 'doc-abstract'.",
+    "start":{
+      "column":25,
+      "line":124
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":48,
+      "line":125
+    },
+    "message":"A11y: The attribute 'aria-setsize' is not supported by the role 'doc-acknowledgments'.",
+    "start":{
+      "column":32,
+      "line":125
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":36,
+      "line":126
+    },
+    "message":"A11y: The attribute 'aria-modal' is not supported by the role 'doc-afterword'.",
+    "start":{
+      "column":26,
+      "line":126
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":51,
+      "line":127
+    },
+    "message":"A11y: The attribute 'aria-activedescendant' is not supported by the role 'doc-appendix'.",
+    "start":{
+      "column":25,
+      "line":127
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":41,
+      "line":128
+    },
+    "message":"A11y: The attribute 'aria-colspan' is not supported by the role 'doc-backlink'.",
+    "start":{
+      "column":25,
+      "line":128
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":45,
+      "line":129
+    },
+    "message":"A11y: The attribute 'aria-valuemax' is not supported by the role 'doc-biblioentry'.",
+    "start":{
+      "column":28,
+      "line":129
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":43,
+      "line":130
+    },
+    "message":"A11y: The attribute 'aria-level' is not supported by the role 'doc-bibliography'.",
+    "start":{
+      "column":29,
+      "line":130
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":38,
+      "line":131
+    },
+    "message":"A11y: The attribute 'aria-checked' is not supported by the role 'doc-biblioref'.",
+    "start":{
+      "column":26,
+      "line":131
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":37,
+      "line":132
+    },
+    "message":"A11y: The attribute 'aria-required' is not supported by the role 'doc-chapter'.",
+    "start":{
+      "column":24,
+      "line":132
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":41,
+      "line":133
+    },
+    "message":"A11y: The attribute 'aria-setsize' is not supported by the role 'doc-colophon'.",
+    "start":{
+      "column":25,
+      "line":133
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":44,
+      "line":134
+    },
+    "message":"A11y: The attribute 'aria-colindex' is not supported by the role 'doc-conclusion'.",
+    "start":{
+      "column":27,
+      "line":134
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":32,
+      "line":135
+    },
+    "message":"A11y: The attribute 'aria-modal' is not supported by the role 'doc-cover'.",
+    "start":{
+      "column":22,
+      "line":135
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":36,
+      "line":136
+    },
+    "message":"A11y: The attribute 'aria-selected' is not supported by the role 'doc-credit'.",
+    "start":{
+      "column":23,
+      "line":136
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":52,
+      "line":137
+    },
+    "message":"A11y: The attribute 'aria-orientation' is not supported by the role 'doc-credits'.",
+    "start":{
+      "column":24,
+      "line":137
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":41,
+      "line":138
+    },
+    "message":"A11y: The attribute 'aria-level' is not supported by the role 'doc-dedication'.",
+    "start":{
+      "column":27,
+      "line":138
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":36,
+      "line":139
+    },
+    "message":"A11y: The attribute 'aria-checked' is not supported by the role 'doc-endnote'.",
+    "start":{
+      "column":24,
+      "line":139
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":42,
+      "line":140
+    },
+    "message":"A11y: The attribute 'aria-colcount' is not supported by the role 'doc-endnotes'.",
+    "start":{
+      "column":25,
+      "line":140
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":39,
+      "line":141
+    },
+    "message":"A11y: The attribute 'aria-multiline' is not supported by the role 'doc-epigraph'.",
+    "start":{
+      "column":25,
+      "line":141
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":42,
+      "line":142
+    },
+    "message":"A11y: The attribute 'aria-colcount' is not supported by the role 'doc-epilogue'.",
+    "start":{
+      "column":25,
+      "line":142
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":39,
+      "line":143
+    },
+    "message":"A11y: The attribute 'aria-sort' is not supported by the role 'doc-errata'.",
+    "start":{
+      "column":23,
+      "line":143
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":44,
+      "line":144
+    },
+    "message":"A11y: The attribute 'aria-multiselectable' is not supported by the role 'doc-example'.",
+    "start":{
+      "column":24,
+      "line":144
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":42,
+      "line":145
+    },
+    "message":"A11y: The attribute 'aria-rowcount' is not supported by the role 'doc-footnote'.",
+    "start":{
+      "column":25,
+      "line":145
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":42,
+      "line":146
+    },
+    "message":"A11y: The attribute 'aria-valuenow' is not supported by the role 'doc-foreword'.",
+    "start":{
+      "column":25,
+      "line":146
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":42,
+      "line":147
+    },
+    "message":"A11y: The attribute 'aria-valuetext' is not supported by the role 'doc-glossary'.",
+    "start":{
+      "column":25,
+      "line":147
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":44,
+      "line":148
+    },
+    "message":"A11y: The attribute 'aria-placeholder' is not supported by the role 'doc-glossref'.",
+    "start":{
+      "column":25,
+      "line":148
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":39,
+      "line":149
+    },
+    "message":"A11y: The attribute 'aria-rowcount' is not supported by the role 'doc-index'.",
+    "start":{
+      "column":22,
+      "line":149
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":41,
+      "line":150
+    },
+    "message":"A11y: The attribute 'aria-pressed' is not supported by the role 'doc-introduction'.",
+    "start":{
+      "column":29,
+      "line":150
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":41,
+      "line":151
+    },
+    "message":"A11y: The attribute 'aria-valuenow' is not supported by the role 'doc-noteref'.",
+    "start":{
+      "column":24,
+      "line":151
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":36,
+      "line":152
+    },
+    "message":"A11y: The attribute 'aria-selected' is not supported by the role 'doc-notice'.",
+    "start":{
+      "column":23,
+      "line":152
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":43,
+      "line":153
+    },
+    "message":"A11y: The attribute 'aria-rowcount' is not supported by the role 'doc-pagebreak'.",
+    "start":{
+      "column":26,
+      "line":153
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":35,
+      "line":154
+    },
+    "message":"A11y: The attribute 'aria-modal' is not supported by the role 'doc-pagelist'.",
+    "start":{
+      "column":25,
+      "line":154
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":37,
+      "line":155
+    },
+    "message":"A11y: The attribute 'aria-setsize' is not supported by the role 'doc-part'.",
+    "start":{
+      "column":21,
+      "line":155
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":52,
+      "line":156
+    },
+    "message":"A11y: The attribute 'aria-orientation' is not supported by the role 'doc-preface'.",
+    "start":{
+      "column":24,
+      "line":156
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":38,
+      "line":157
+    },
+    "message":"A11y: The attribute 'aria-required' is not supported by the role 'doc-prologue'.",
+    "start":{
+      "column":25,
+      "line":157
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":43,
+      "line":158
+    },
+    "message":"A11y: The attribute 'aria-rowcount' is not supported by the role 'doc-pullquote'.",
+    "start":{
+      "column":26,
+      "line":158
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":36,
+      "line":159
+    },
+    "message":"A11y: The attribute 'aria-setsize' is not supported by the role 'doc-qna'.",
+    "start":{
+      "column":20,
+      "line":159
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":42,
+      "line":160
+    },
+    "message":"A11y: The attribute 'aria-rowindex' is not supported by the role 'doc-subtitle'.",
+    "start":{
+      "column":25,
+      "line":160
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":37,
+      "line":161
+    },
+    "message":"A11y: The attribute 'aria-valuenow' is not supported by the role 'doc-tip'.",
+    "start":{
+      "column":20,
+      "line":161
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":37,
+      "line":162
+    },
+    "message":"A11y: The attribute 'aria-posinset' is not supported by the role 'doc-toc'.",
+    "start":{
+      "column":20,
+      "line":162
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":35,
+      "line":166
+    },
+    "message":"A11y: The attribute 'aria-rowspan' is not supported by the role 'textbox'. This role is implicit on the element <input>.",
+    "start":{
+      "column":19,
+      "line":166
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":30,
+      "line":167
+    },
+    "message":"A11y: The attribute 'aria-pressed' is not supported by the role 'textbox'. This role is implicit on the element <input>.",
+    "start":{
+      "column":18,
+      "line":167
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":32,
+      "line":168
+    },
+    "message":"A11y: The attribute 'aria-level' is not supported by the role 'textbox'. This role is implicit on the element <input>.",
+    "start":{
+      "column":18,
+      "line":168
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":32,
+      "line":169
+    },
+    "message":"A11y: The attribute 'aria-pressed' is not supported by the role 'textbox'. This role is implicit on the element <input>.",
+    "start":{
+      "column":20,
+      "line":169
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":42,
+      "line":170
+    },
+    "message":"A11y: The attribute 'aria-valuetext' is not supported by the role 'searchbox'. This role is implicit on the element <input>.",
+    "start":{
+      "column":21,
+      "line":170
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":50,
+      "line":171
+    },
+    "message":"A11y: The attribute 'aria-valuemin' is not supported by the role 'combobox'. This role is implicit on the element <input>.",
+    "start":{
+      "column":33,
+      "line":171
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":48,
+      "line":172
+    },
+    "message":"A11y: The attribute 'aria-colspan' is not supported by the role 'combobox'. This role is implicit on the element <input>.",
+    "start":{
+      "column":32,
+      "line":172
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":49,
+      "line":173
+    },
+    "message":"A11y: The attribute 'aria-posinset' is not supported by the role 'combobox'. This role is implicit on the element <input>.",
+    "start":{
+      "column":32,
+      "line":173
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":44,
+      "line":174
+    },
+    "message":"A11y: The attribute 'aria-modal' is not supported by the role 'combobox'. This role is implicit on the element <input>.",
+    "start":{
+      "column":34,
+      "line":174
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":52,
+      "line":175
+    },
+    "message":"A11y: The attribute 'aria-rowindex' is not supported by the role 'combobox'. This role is implicit on the element <input>.",
+    "start":{
+      "column":35,
+      "line":175
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":53,
+      "line":176
+    },
+    "message":"A11y: The attribute 'aria-valuemax' is not supported by the role 'button'. This role is implicit on the element <input>.",
+    "start":{
+      "column":36,
+      "line":176
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":30,
+      "line":177
+    },
+    "message":"A11y: The attribute 'aria-modal' is not supported by the role 'button'. This role is implicit on the element <input>.",
+    "start":{
+      "column":20,
+      "line":177
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":51,
+      "line":178
+    },
+    "message":"A11y: The attribute 'aria-placeholder' is not supported by the role 'button'. This role is implicit on the element <input>.",
+    "start":{
+      "column":21,
+      "line":178
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":40,
+      "line":179
+    },
+    "message":"A11y: The attribute 'aria-rowindex' is not supported by the role 'checkbox'. This role is implicit on the element <input>.",
+    "start":{
+      "column":23,
+      "line":179
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":41,
+      "line":180
+    },
+    "message":"A11y: The attribute 'aria-valuetext' is not supported by the role 'radio'. This role is implicit on the element <input>.",
+    "start":{
+      "column":20,
+      "line":180
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":32,
+      "line":181
+    },
+    "message":"A11y: The attribute 'aria-checked' is not supported by the role 'slider'. This role is implicit on the element <input>.",
+    "start":{
+      "column":20,
+      "line":181
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":42,
+      "line":182
+    },
+    "message":"A11y: The attribute 'aria-colindex' is not supported by the role 'menuitem'. This role is implicit on the element <menuitem>.",
+    "start":{
+      "column":25,
+      "line":182
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":43,
+      "line":183
+    },
+    "message":"A11y: The attribute 'aria-colcount' is not supported by the role 'menuitemcheckbox'. This role is implicit on the element <menuitem>.",
+    "start":{
+      "column":26,
+      "line":183
+    }
+  },
+  {
+    "code":"a11y-role-supports-aria-props",
+    "end":{
+      "column":53,
+      "line":184
+    },
+    "message":"A11y: The attribute 'aria-placeholder' is not supported by the role 'menuitemradio'. This role is implicit on the element <menuitem>.",
+    "start":{
+      "column":23,
+      "line":184
+    }
+  }
+]
\ No newline at end of file

From 60a205edb8ac8ee6022eae968b5f53893445b137 Mon Sep 17 00:00:00 2001
From: Yuichiro Yamashita <xydybaseball@gmail.com>
Date: Mon, 27 Feb 2023 21:00:35 +0900
Subject: [PATCH 015/110] fix: don't set selected option(s) if value is unbound
 or not passed (#8329)

fix: #5644

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 .../compile/render_dom/wrappers/Element/index.ts    |  3 ++-
 .../select-multiple-spread-and-bind/_config.js      | 12 ++++++++++++
 .../select-multiple-spread-and-bind/main.svelte     |  8 ++++++++
 .../select-multiple-spread-and-bind/select.svelte   |  9 +++++++++
 .../samples/select-multiple-spread/_config.js       | 13 +++++++++++++
 .../samples/select-multiple-spread/main.svelte      |  7 +++++++
 .../samples/select-multiple-spread/select.svelte    |  8 ++++++++
 7 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 test/runtime/samples/select-multiple-spread-and-bind/_config.js
 create mode 100644 test/runtime/samples/select-multiple-spread-and-bind/main.svelte
 create mode 100644 test/runtime/samples/select-multiple-spread-and-bind/select.svelte
 create mode 100644 test/runtime/samples/select-multiple-spread/_config.js
 create mode 100644 test/runtime/samples/select-multiple-spread/main.svelte
 create mode 100644 test/runtime/samples/select-multiple-spread/select.svelte

diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index 39ca782af0..73addaed13 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -858,8 +858,9 @@ export default class ElementWrapper extends Wrapper {
 			}
 
 			block.chunks.mount.push(b`
-				(${data}.multiple ? @select_options : @select_option)(${this.var}, ${data}.value);
+				'value' in ${data} && (${data}.multiple ? @select_options : @select_option)(${this.var}, ${data}.value);
 			`);
+
 			block.chunks.update.push(b`
 				if (${block.renderer.dirty(Array.from(dependencies))} && 'value' in ${data}) (${data}.multiple ? @select_options : @select_option)(${this.var}, ${data}.value);
 			`);
diff --git a/test/runtime/samples/select-multiple-spread-and-bind/_config.js b/test/runtime/samples/select-multiple-spread-and-bind/_config.js
new file mode 100644
index 0000000000..78dab273a2
--- /dev/null
+++ b/test/runtime/samples/select-multiple-spread-and-bind/_config.js
@@ -0,0 +1,12 @@
+export default {
+	test({ assert, component, target }) {
+		const options = target.querySelectorAll('option');
+
+		assert.equal(options[0].selected, true);
+		assert.equal(options[1].selected, false);
+
+		component.value = ['2'];
+		assert.equal(options[0].selected, false);
+		assert.equal(options[1].selected, true);
+	}
+};
diff --git a/test/runtime/samples/select-multiple-spread-and-bind/main.svelte b/test/runtime/samples/select-multiple-spread-and-bind/main.svelte
new file mode 100644
index 0000000000..45ef4d2f05
--- /dev/null
+++ b/test/runtime/samples/select-multiple-spread-and-bind/main.svelte
@@ -0,0 +1,8 @@
+<script>
+	import Select from './select.svelte';
+
+	export let value = ['1'];
+	export let other = {};
+</script>
+
+<Select {value} {other} />
diff --git a/test/runtime/samples/select-multiple-spread-and-bind/select.svelte b/test/runtime/samples/select-multiple-spread-and-bind/select.svelte
new file mode 100644
index 0000000000..ecfc754cb9
--- /dev/null
+++ b/test/runtime/samples/select-multiple-spread-and-bind/select.svelte
@@ -0,0 +1,9 @@
+<script>
+	export let value;
+	export let other;
+</script>
+
+<select multiple bind:value {...other}>
+	<option value="1">option 1</option>
+	<option value="2">option 2</option>
+</select>
diff --git a/test/runtime/samples/select-multiple-spread/_config.js b/test/runtime/samples/select-multiple-spread/_config.js
new file mode 100644
index 0000000000..29e76b2450
--- /dev/null
+++ b/test/runtime/samples/select-multiple-spread/_config.js
@@ -0,0 +1,13 @@
+export default {
+	test({ assert, component, target }) {
+		const options = target.querySelectorAll('option');
+
+		assert.equal(options[0].selected, true);
+		assert.equal(options[1].selected, false);
+
+		// Shouldn't change the value because the value is not bound.
+		component.value = ['2'];
+		assert.equal(options[0].selected, true);
+		assert.equal(options[1].selected, false);
+	}
+};
diff --git a/test/runtime/samples/select-multiple-spread/main.svelte b/test/runtime/samples/select-multiple-spread/main.svelte
new file mode 100644
index 0000000000..306f6f9a24
--- /dev/null
+++ b/test/runtime/samples/select-multiple-spread/main.svelte
@@ -0,0 +1,7 @@
+<script>
+	import Select from './select.svelte';
+
+	export let attrs = { value: ['1'] };
+</script>
+
+<Select {attrs} />
diff --git a/test/runtime/samples/select-multiple-spread/select.svelte b/test/runtime/samples/select-multiple-spread/select.svelte
new file mode 100644
index 0000000000..d37667a8de
--- /dev/null
+++ b/test/runtime/samples/select-multiple-spread/select.svelte
@@ -0,0 +1,8 @@
+<script>
+	export let attrs;
+</script>
+
+<select multiple  {...attrs}>
+	<option value="1">option 1</option>
+	<option value="2">option 2</option>
+</select>

From 69c199feac727e8f647dff220b17df5422401711 Mon Sep 17 00:00:00 2001
From: adiGuba <frederic.martini@gmail.com>
Date: Mon, 27 Feb 2023 13:10:22 +0100
Subject: [PATCH 016/110] fix: race condition in `svelte:element` with
 transition #7948 (#7949)

fixes #7948
- The assignment of the variable "previous_tag" was incorrectly positioned and could cause race condition when used with transitions.
- We need another variable to detect when we are in a transition to remove a node

---------

Co-authored-by: Yuichiro Yamashita <xydybaseball@gmail.com>
---
 .../render_dom/wrappers/Element/index.ts      | 20 ++++++++++++++++++-
 .../svelte-element-event-handlers/expected.js |  7 ++++---
 .../js/samples/svelte-element-svg/expected.js |  7 ++++---
 .../samples/component-transition/_config.js   | 19 ++++++++++++++++++
 .../samples/component-transition/main.svelte  | 13 ++++++++++++
 5 files changed, 59 insertions(+), 7 deletions(-)
 create mode 100644 test/runtime/samples/component-transition/_config.js
 create mode 100644 test/runtime/samples/component-transition/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 73addaed13..fc7da2e97f 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -319,10 +319,16 @@ export default class ElementWrapper extends Wrapper {
 		const has_transitions = !!(this.node.intro || this.node.outro);
 		const not_equal = this.renderer.component.component_options.immutable ? x`@not_equal` : x`@safe_not_equal`;
 
+		const tag_will_be_removed = block.get_unique_name('tag_will_be_removed');
+		if (has_transitions) {
+			block.add_variable(tag_will_be_removed, x`false`);
+		}
+
 		block.chunks.update.push(b`
 			if (${tag}) {
 				if (!${previous_tag}) {
 					${this.var} = ${this.child_dynamic_element_block.name}(#ctx);
+					${previous_tag} = ${tag};
 					${this.var}.c();
 					${has_transitions && b`@transition_in(${this.var})`}
 					${this.var}.m(${this.get_update_mount_node(anchor)}, ${anchor});
@@ -331,27 +337,39 @@ export default class ElementWrapper extends Wrapper {
 					${this.renderer.options.dev && b`@validate_dynamic_element(${tag});`}
 					${this.renderer.options.dev && this.node.children.length > 0 && b`@validate_void_dynamic_element(${tag});`}
 					${this.var} = ${this.child_dynamic_element_block.name}(#ctx);
+					${previous_tag} = ${tag};
 					${this.var}.c();
+					${has_transitions && b`if (${tag_will_be_removed}) {
+						${tag_will_be_removed} = false;
+						@transition_in(${this.var})
+					}`}
 					${this.var}.m(${this.get_update_mount_node(anchor)}, ${anchor});
 				} else {
+					${has_transitions && b`if (${tag_will_be_removed}) {
+						${tag_will_be_removed} = false;
+						@transition_in(${this.var})
+					}`}
 					${this.var}.p(#ctx, #dirty);
 				}
 			} else if (${previous_tag}) {
 				${has_transitions
 				? b`
+							${tag_will_be_removed} = true;
 							@group_outros();
 							@transition_out(${this.var}, 1, 1, () => {
 								${this.var} = null;
+								${previous_tag} = ${tag};
+								${tag_will_be_removed} = false;
 							});
 							@check_outros();
 						`
 				: b`
 							${this.var}.d(1);
 							${this.var} = null;
+							${previous_tag} = ${tag};
 						`
 			}
 			}
-			${previous_tag} = ${tag};
 		`);
 
 		if (this.child_dynamic_element_block.has_intros) {
diff --git a/test/js/samples/svelte-element-event-handlers/expected.js b/test/js/samples/svelte-element-event-handlers/expected.js
index ab24f2e924..2368c1bc2f 100644
--- a/test/js/samples/svelte-element-event-handlers/expected.js
+++ b/test/js/samples/svelte-element-event-handlers/expected.js
@@ -112,11 +112,13 @@ function create_fragment(ctx) {
 			if (a) {
 				if (!previous_tag) {
 					svelte_element = create_dynamic_element(ctx);
+					previous_tag = a;
 					svelte_element.c();
 					svelte_element.m(svelte_element_anchor.parentNode, svelte_element_anchor);
 				} else if (safe_not_equal(previous_tag, a)) {
 					svelte_element.d(1);
 					svelte_element = create_dynamic_element(ctx);
+					previous_tag = a;
 					svelte_element.c();
 					svelte_element.m(svelte_element_anchor.parentNode, svelte_element_anchor);
 				} else {
@@ -125,9 +127,8 @@ function create_fragment(ctx) {
 			} else if (previous_tag) {
 				svelte_element.d(1);
 				svelte_element = null;
+				previous_tag = a;
 			}
-
-			previous_tag = a;
 		},
 		i: noop,
 		o: noop,
@@ -168,4 +169,4 @@ class Component extends SvelteComponent {
 	}
 }
 
-export default Component;
\ No newline at end of file
+export default Component;
diff --git a/test/js/samples/svelte-element-svg/expected.js b/test/js/samples/svelte-element-svg/expected.js
index 7db210219b..9f93cc1234 100644
--- a/test/js/samples/svelte-element-svg/expected.js
+++ b/test/js/samples/svelte-element-svg/expected.js
@@ -72,11 +72,13 @@ function create_fragment(ctx) {
 			if (/*tag*/ ctx[0].svg) {
 				if (!previous_tag) {
 					svelte_element = create_dynamic_element(ctx);
+					previous_tag = /*tag*/ ctx[0].svg;
 					svelte_element.c();
 					svelte_element.m(svelte_element_anchor.parentNode, svelte_element_anchor);
 				} else if (safe_not_equal(previous_tag, /*tag*/ ctx[0].svg)) {
 					svelte_element.d(1);
 					svelte_element = create_dynamic_element(ctx);
+					previous_tag = /*tag*/ ctx[0].svg;
 					svelte_element.c();
 					svelte_element.m(svelte_element_anchor.parentNode, svelte_element_anchor);
 				} else {
@@ -85,9 +87,8 @@ function create_fragment(ctx) {
 			} else if (previous_tag) {
 				svelte_element.d(1);
 				svelte_element = null;
+				previous_tag = /*tag*/ ctx[0].svg;
 			}
-
-			previous_tag = /*tag*/ ctx[0].svg;
 		},
 		i: noop,
 		o: noop,
@@ -110,4 +111,4 @@ class Component extends SvelteComponent {
 	}
 }
 
-export default Component;
\ No newline at end of file
+export default Component;
diff --git a/test/runtime/samples/component-transition/_config.js b/test/runtime/samples/component-transition/_config.js
new file mode 100644
index 0000000000..ea25a14086
--- /dev/null
+++ b/test/runtime/samples/component-transition/_config.js
@@ -0,0 +1,19 @@
+export default {
+	async test({ assert, target, raf }) {
+		const button = target.querySelector('#button');
+		const container = target.querySelector('#container');
+
+		// Multiple click on button
+		await button.dispatchEvent(new window.MouseEvent('click'));
+		await button.dispatchEvent(new window.MouseEvent('click'));
+		await button.dispatchEvent(new window.MouseEvent('click'));
+		await button.dispatchEvent(new window.MouseEvent('click'));
+		await button.dispatchEvent(new window.MouseEvent('click'));
+		await button.dispatchEvent(new window.MouseEvent('click'));
+		await button.dispatchEvent(new window.MouseEvent('click'));
+
+		assert.equal(container.children.length, 1);
+		raf.tick(501);
+		assert.equal(container.children.length, 0);
+	}
+};
diff --git a/test/runtime/samples/component-transition/main.svelte b/test/runtime/samples/component-transition/main.svelte
new file mode 100644
index 0000000000..218b303b21
--- /dev/null
+++ b/test/runtime/samples/component-transition/main.svelte
@@ -0,0 +1,13 @@
+<script>
+	import { slide } from 'svelte/transition';
+	let tag = 'div';
+	function toggle() {
+		tag = (tag) ? null : 'div';
+	}
+</script>
+
+<button id="button" on:click={toggle}>toggle</button> TAG={tag}
+
+<div id="container">
+	<svelte:element this={tag} transition:slide={{duration:500}}>CONTENT</svelte:element>	
+</div>

From 8cf037c90461c5ce2fb0f0c552868d045d5c9b3f Mon Sep 17 00:00:00 2001
From: Theodore Brown <theodorejb@outlook.com>
Date: Mon, 27 Feb 2023 06:11:06 -0600
Subject: [PATCH 017/110] fix: select first enabled option by default when
 initial value is undefined (#8331)

Fixes an unintended regression introduced in #6170.

Fixes #7041
---
 src/runtime/internal/dom.ts                   | 10 +++++-
 .../_config.js                                |  4 ++-
 .../main.svelte                               |  1 +
 .../binding-select-unmatched/_config.js       | 35 +++++++++++++++++++
 4 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index 52f1198833..23c0fdac51 100644
--- a/src/runtime/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -567,8 +567,16 @@ 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') || select.options[0];
+	const selected_option = select.querySelector(':checked') || first_enabled_option(select);
 	return selected_option && selected_option.__value;
 }
 
diff --git a/test/runtime/samples/binding-select-initial-value-undefined/_config.js b/test/runtime/samples/binding-select-initial-value-undefined/_config.js
index 27bac7ef77..c95cd44046 100644
--- a/test/runtime/samples/binding-select-initial-value-undefined/_config.js
+++ b/test/runtime/samples/binding-select-initial-value-undefined/_config.js
@@ -5,6 +5,7 @@ export default {
 		<p>selected: a</p>
 
 		<select>
+			<option disabled='' value='x'>x</option>
 			<option value='a'>a</option>
 			<option value='b'>b</option>
 			<option value='c'>c</option>
@@ -18,7 +19,8 @@ export default {
 		const select = target.querySelector('select');
 		const options = [...target.querySelectorAll('option')];
 
+		// first enabled option should be selected
 		assert.equal(select.value, 'a');
-		assert.ok(options[0].selected);
+		assert.ok(options[1].selected);
 	}
 };
diff --git a/test/runtime/samples/binding-select-initial-value-undefined/main.svelte b/test/runtime/samples/binding-select-initial-value-undefined/main.svelte
index 5cb1e9fae7..8c3bd0258f 100644
--- a/test/runtime/samples/binding-select-initial-value-undefined/main.svelte
+++ b/test/runtime/samples/binding-select-initial-value-undefined/main.svelte
@@ -5,6 +5,7 @@
 <p>selected: {selected}</p>
 
 <select bind:value={selected}>
+	<option disabled>x</option>
 	<option>a</option>
 	<option>b</option>
 	<option>c</option>
diff --git a/test/runtime/samples/binding-select-unmatched/_config.js b/test/runtime/samples/binding-select-unmatched/_config.js
index 99e7d23927..45594407b3 100644
--- a/test/runtime/samples/binding-select-unmatched/_config.js
+++ b/test/runtime/samples/binding-select-unmatched/_config.js
@@ -56,5 +56,40 @@ export default {
 
 			<p>selected: d</p>
 		`);
+
+		component.selected = 'b'; // second option should now be selected
+		assert.equal(select.value, 'b');
+		assert.ok(options[1].selected);
+
+		assert.htmlEqual(target.innerHTML, `
+			<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>
+		`);
+
+		component.selected = undefined; // also doesn't match an option
+
+		// now no option should be selected again
+		assert.equal(select.value, '');
+		assert.equal(select.selectedIndex, -1);
+		assert.ok(!options[0].selected);
+
+		assert.htmlEqual(target.innerHTML, `
+			<p>selected: undefined</p>
+
+			<select>
+				<option value='a'>a</option>
+				<option value='b'>b</option>
+				<option value='c'>c</option>
+			</select>
+
+			<p>selected: undefined</p>
+		`);
 	}
 };

From 474a13ad90460ea5a9073fa7198c09229f029129 Mon Sep 17 00:00:00 2001
From: Nico Beierle <nico.beierle@gmail.com>
Date: Mon, 27 Feb 2023 13:25:24 +0100
Subject: [PATCH 018/110] fix: prevent undefined value when remount keyed input
 element with spread props (#7699)

Fixes: #7578

When remounting a keyed input element (e.g. because the element order has changed) with spread properties, the input value gets undefined. This has happened because data_value is updated before remounting and it won't contain a value for input-value (because the value hasn't changed). When calling mount() an undefined value was assigned because of a missing check.
---
 .../compile/render_dom/wrappers/Element/index.ts      |  4 +++-
 .../spread-element-input-each-block-keyed/_config.js  | 11 +++++++++++
 .../spread-element-input-each-block-keyed/main.svelte |  7 +++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 test/runtime/samples/spread-element-input-each-block-keyed/_config.js
 create mode 100644 test/runtime/samples/spread-element-input-each-block-keyed/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 fc7da2e97f..4c2dd059cc 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -886,7 +886,9 @@ export default class ElementWrapper extends Wrapper {
 			const type = this.node.get_static_attribute_value('type');
 			if (type === null || type === '' || type === 'text' || type === 'email' || type === 'password') {
 				block.chunks.mount.push(b`
-					${this.var}.value = ${data}.value;
+					if ('value' in ${data}) {
+						${this.var}.value = ${data}.value;
+					}
 				`);
 				block.chunks.update.push(b`
 					if ('value' in ${data}) {
diff --git a/test/runtime/samples/spread-element-input-each-block-keyed/_config.js b/test/runtime/samples/spread-element-input-each-block-keyed/_config.js
new file mode 100644
index 0000000000..2f38ddc384
--- /dev/null
+++ b/test/runtime/samples/spread-element-input-each-block-keyed/_config.js
@@ -0,0 +1,11 @@
+export default {
+	test({ assert, component, target }) {
+		const [input1, input2] = target.querySelectorAll('input');
+		assert.equal(input1.value, 'value1');
+		assert.equal(input2.value, 'value2');
+
+		component.items = component.items.reverse();
+		assert.equal(input1.value, 'value1');
+		assert.equal(input2.value, 'value2');
+	}
+};
diff --git a/test/runtime/samples/spread-element-input-each-block-keyed/main.svelte b/test/runtime/samples/spread-element-input-each-block-keyed/main.svelte
new file mode 100644
index 0000000000..b89a400495
--- /dev/null
+++ b/test/runtime/samples/spread-element-input-each-block-keyed/main.svelte
@@ -0,0 +1,7 @@
+<script>
+	export let items = ['value1', 'value2'];
+</script>
+
+{#each items as item (item)}
+	<input value={item} {...{}} />
+{/each}

From 9edd2df0d36c302feec36ba2851268def850389c Mon Sep 17 00:00:00 2001
From: 4eb0da <4eb0da@users.noreply.github.com>
Date: Mon, 27 Feb 2023 15:36:57 +0300
Subject: [PATCH 019/110] fix: check each_blocks is empty on mount (#7505)

fixes #8282
---
 .../compile/render_dom/wrappers/EachBlock.ts  |  8 ++-
 .../debug-foo-bar-baz-things/expected.js      |  4 +-
 test/js/samples/debug-foo/expected.js         |  4 +-
 .../samples/debug-no-dependencies/expected.js |  4 +-
 .../samples/deconflict-builtins/expected.js   |  4 +-
 .../each-block-array-literal/expected.js      |  4 +-
 .../each-block-changed-check/expected.js      |  6 ++-
 .../each-block-keyed-animated/expected.js     |  4 +-
 test/js/samples/each-block-keyed/expected.js  |  4 +-
 .../Child.svelte                              | 21 ++++++++
 .../InnerChild.svelte                         | 14 +++++
 .../_config.js                                | 53 +++++++++++++++++++
 .../main.svelte                               | 35 ++++++++++++
 .../Child.svelte                              | 21 ++++++++
 .../InnerChild.svelte                         | 14 +++++
 .../_config.js                                | 53 +++++++++++++++++++
 .../main.svelte                               | 35 ++++++++++++
 17 files changed, 277 insertions(+), 11 deletions(-)
 create mode 100644 test/runtime/samples/component-binding-each-remount-keyed/Child.svelte
 create mode 100644 test/runtime/samples/component-binding-each-remount-keyed/InnerChild.svelte
 create mode 100644 test/runtime/samples/component-binding-each-remount-keyed/_config.js
 create mode 100644 test/runtime/samples/component-binding-each-remount-keyed/main.svelte
 create mode 100644 test/runtime/samples/component-binding-each-remount-unkeyed/Child.svelte
 create mode 100644 test/runtime/samples/component-binding-each-remount-unkeyed/InnerChild.svelte
 create mode 100644 test/runtime/samples/component-binding-each-remount-unkeyed/_config.js
 create mode 100644 test/runtime/samples/component-binding-each-remount-unkeyed/main.svelte

diff --git a/src/compiler/compile/render_dom/wrappers/EachBlock.ts b/src/compiler/compile/render_dom/wrappers/EachBlock.ts
index 0c49c38028..1032f4c6e3 100644
--- a/src/compiler/compile/render_dom/wrappers/EachBlock.ts
+++ b/src/compiler/compile/render_dom/wrappers/EachBlock.ts
@@ -448,7 +448,9 @@ export default class EachBlockWrapper extends Wrapper {
 
 		block.chunks.mount.push(b`
 			for (let #i = 0; #i < ${view_length}; #i += 1) {
-				${iterations}[#i].m(${initial_mount_node}, ${initial_anchor_node});
+				if (${iterations}[#i]) {
+					${iterations}[#i].m(${initial_mount_node}, ${initial_anchor_node});
+				}
 			}
 		`);
 
@@ -542,7 +544,9 @@ export default class EachBlockWrapper extends Wrapper {
 
 		block.chunks.mount.push(b`
 			for (let #i = 0; #i < ${view_length}; #i += 1) {
-				${iterations}[#i].m(${initial_mount_node}, ${initial_anchor_node});
+				if (${iterations}[#i]) {
+					${iterations}[#i].m(${initial_mount_node}, ${initial_anchor_node});
+				}
 			}
 		`);
 
diff --git a/test/js/samples/debug-foo-bar-baz-things/expected.js b/test/js/samples/debug-foo-bar-baz-things/expected.js
index 02be04c26e..0b0a41abe2 100644
--- a/test/js/samples/debug-foo-bar-baz-things/expected.js
+++ b/test/js/samples/debug-foo-bar-baz-things/expected.js
@@ -114,7 +114,9 @@ function create_fragment(ctx) {
 		},
 		m: function mount(target, anchor) {
 			for (let i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].m(target, anchor);
+				if (each_blocks[i]) {
+					each_blocks[i].m(target, anchor);
+				}
 			}
 
 			insert_dev(target, t0, anchor);
diff --git a/test/js/samples/debug-foo/expected.js b/test/js/samples/debug-foo/expected.js
index 84dedb0a91..637a229a97 100644
--- a/test/js/samples/debug-foo/expected.js
+++ b/test/js/samples/debug-foo/expected.js
@@ -108,7 +108,9 @@ function create_fragment(ctx) {
 		},
 		m: function mount(target, anchor) {
 			for (let i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].m(target, anchor);
+				if (each_blocks[i]) {
+					each_blocks[i].m(target, anchor);
+				}
 			}
 
 			insert_dev(target, t0, anchor);
diff --git a/test/js/samples/debug-no-dependencies/expected.js b/test/js/samples/debug-no-dependencies/expected.js
index 8107b890a6..e9e4d34a11 100644
--- a/test/js/samples/debug-no-dependencies/expected.js
+++ b/test/js/samples/debug-no-dependencies/expected.js
@@ -86,7 +86,9 @@ function create_fragment(ctx) {
 		},
 		m: function mount(target, anchor) {
 			for (let i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].m(target, anchor);
+				if (each_blocks[i]) {
+					each_blocks[i].m(target, anchor);
+				}
 			}
 
 			insert_dev(target, each_1_anchor, anchor);
diff --git a/test/js/samples/deconflict-builtins/expected.js b/test/js/samples/deconflict-builtins/expected.js
index 8c9bb83b5b..7e5263e8b3 100644
--- a/test/js/samples/deconflict-builtins/expected.js
+++ b/test/js/samples/deconflict-builtins/expected.js
@@ -63,7 +63,9 @@ function create_fragment(ctx) {
 		},
 		m(target, anchor) {
 			for (let i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].m(target, anchor);
+				if (each_blocks[i]) {
+					each_blocks[i].m(target, anchor);
+				}
 			}
 
 			insert(target, each_1_anchor, anchor);
diff --git a/test/js/samples/each-block-array-literal/expected.js b/test/js/samples/each-block-array-literal/expected.js
index bb5a04e952..575cf1bba7 100644
--- a/test/js/samples/each-block-array-literal/expected.js
+++ b/test/js/samples/each-block-array-literal/expected.js
@@ -63,7 +63,9 @@ function create_fragment(ctx) {
 		},
 		m(target, anchor) {
 			for (let i = 0; i < 5; i += 1) {
-				each_blocks[i].m(target, anchor);
+				if (each_blocks[i]) {
+					each_blocks[i].m(target, anchor);
+				}
 			}
 
 			insert(target, each_1_anchor, anchor);
diff --git a/test/js/samples/each-block-changed-check/expected.js b/test/js/samples/each-block-changed-check/expected.js
index e91f77ecd8..9e69dffd54 100644
--- a/test/js/samples/each-block-changed-check/expected.js
+++ b/test/js/samples/each-block-changed-check/expected.js
@@ -104,7 +104,9 @@ function create_fragment(ctx) {
 		},
 		m(target, anchor) {
 			for (let i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].m(target, anchor);
+				if (each_blocks[i]) {
+					each_blocks[i].m(target, anchor);
+				}
 			}
 
 			insert(target, t0, anchor);
@@ -170,4 +172,4 @@ class Component extends SvelteComponent {
 	}
 }
 
-export default Component;
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/each-block-keyed-animated/expected.js b/test/js/samples/each-block-keyed-animated/expected.js
index 6f7c22a086..7edfa77b18 100644
--- a/test/js/samples/each-block-keyed-animated/expected.js
+++ b/test/js/samples/each-block-keyed-animated/expected.js
@@ -87,7 +87,9 @@ function create_fragment(ctx) {
 		},
 		m(target, anchor) {
 			for (let i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].m(target, anchor);
+				if (each_blocks[i]) {
+					each_blocks[i].m(target, anchor);
+				}
 			}
 
 			insert(target, each_1_anchor, anchor);
diff --git a/test/js/samples/each-block-keyed/expected.js b/test/js/samples/each-block-keyed/expected.js
index a275697d8e..a6357cbf77 100644
--- a/test/js/samples/each-block-keyed/expected.js
+++ b/test/js/samples/each-block-keyed/expected.js
@@ -72,7 +72,9 @@ function create_fragment(ctx) {
 		},
 		m(target, anchor) {
 			for (let i = 0; i < each_blocks.length; i += 1) {
-				each_blocks[i].m(target, anchor);
+				if (each_blocks[i]) {
+					each_blocks[i].m(target, anchor);
+				}
 			}
 
 			insert(target, each_1_anchor, anchor);
diff --git a/test/runtime/samples/component-binding-each-remount-keyed/Child.svelte b/test/runtime/samples/component-binding-each-remount-keyed/Child.svelte
new file mode 100644
index 0000000000..e6cbf9d1d0
--- /dev/null
+++ b/test/runtime/samples/component-binding-each-remount-keyed/Child.svelte
@@ -0,0 +1,21 @@
+<script>
+	import InnerChild from './InnerChild.svelte';
+
+	export let id = 1;
+	export let count;
+	export let increment;
+
+	let list;
+	$: {
+		list = [];
+		for (let i = 0; i < count; ++i) {
+			list.push(i);
+		}
+	}
+</script>
+
+<div data-id={id}>
+	{#each list as item (item)}
+		<InnerChild val={item} {increment} />
+	{/each}
+</div>
diff --git a/test/runtime/samples/component-binding-each-remount-keyed/InnerChild.svelte b/test/runtime/samples/component-binding-each-remount-keyed/InnerChild.svelte
new file mode 100644
index 0000000000..f0b5d57a82
--- /dev/null
+++ b/test/runtime/samples/component-binding-each-remount-keyed/InnerChild.svelte
@@ -0,0 +1,14 @@
+<script>
+	import { afterUpdate } from 'svelte';
+
+	export let val = 1;
+	export let increment;
+
+	afterUpdate(() => {
+		increment();
+	});
+</script>
+
+<inner>
+	{val}
+</inner>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-each-remount-keyed/_config.js b/test/runtime/samples/component-binding-each-remount-keyed/_config.js
new file mode 100644
index 0000000000..181c1bce8b
--- /dev/null
+++ b/test/runtime/samples/component-binding-each-remount-keyed/_config.js
@@ -0,0 +1,53 @@
+export default {
+	html: `
+		<div data-id="1">
+			<inner>0</inner>
+			<inner>1</inner>
+		</div>
+		<div data-id="2">
+			<inner>0</inner>
+			<inner>1</inner>
+		</div>
+		<div data-id="3">
+			<inner>0</inner>
+			<inner>1</inner>
+		</div>
+	`,
+
+	ssrHtml: `
+		<div data-id="1">
+			<inner>0</inner>
+			<inner>1</inner>
+			<inner>2</inner>
+		</div>
+		<div data-id="2">
+			<inner>0</inner>
+			<inner>1</inner>
+			<inner>2</inner>
+		</div>
+		<div data-id="3">
+			<inner>0</inner>
+			<inner>1</inner>
+			<inner>2</inner>
+		</div>
+	`,
+
+	async test({ assert, component, target }) {
+		await component.done;
+		assert.equal(component.getCounter(), 13);
+		assert.htmlEqual(target.innerHTML, `
+			<div data-id="3">
+				<inner>0</inner>
+				<inner>1</inner>
+			</div>
+			<div data-id="2">
+				<inner>0</inner>
+				<inner>1</inner>
+			</div>
+			<div data-id="1">
+				<inner>0</inner>
+				<inner>1</inner>
+			</div>
+		`);
+	}
+};
diff --git a/test/runtime/samples/component-binding-each-remount-keyed/main.svelte b/test/runtime/samples/component-binding-each-remount-keyed/main.svelte
new file mode 100644
index 0000000000..7f4c448d8f
--- /dev/null
+++ b/test/runtime/samples/component-binding-each-remount-keyed/main.svelte
@@ -0,0 +1,35 @@
+<script>
+	import { onMount } from 'svelte';
+	import Child from './Child.svelte';
+
+	let updateCounter = 0;
+	let promiseResolve;
+	export const done = new Promise(resolve => {
+		promiseResolve = resolve;
+	});
+	export const getCounter = () => {
+		return updateCounter;
+	};
+
+	let vals = [1, 2, 3];
+	const instances = [];
+	let count = 3;
+
+	const increment = () => {
+		++updateCounter;
+	};
+
+	onMount(() => {
+		count = 2;
+
+		setTimeout(() => {
+			vals = vals.reverse();
+
+			setTimeout(promiseResolve);
+		});
+	});
+</script>
+
+{#each vals as val, index (val)}
+	<Child bind:this={instances[index]} id={val} {count} {increment} />
+{/each}
diff --git a/test/runtime/samples/component-binding-each-remount-unkeyed/Child.svelte b/test/runtime/samples/component-binding-each-remount-unkeyed/Child.svelte
new file mode 100644
index 0000000000..8b7edc10f4
--- /dev/null
+++ b/test/runtime/samples/component-binding-each-remount-unkeyed/Child.svelte
@@ -0,0 +1,21 @@
+<script>
+	import InnerChild from './InnerChild.svelte';
+
+	export let id = 1;
+	export let count;
+	export let increment;
+
+	let list;
+	$: {
+		list = [];
+		for (let i = 0; i < count; ++i) {
+			list.push(i);
+		}
+	}
+</script>
+
+<div data-id={id}>
+	{#each list as item}
+		<InnerChild val={item} {increment} />
+	{/each}
+</div>
diff --git a/test/runtime/samples/component-binding-each-remount-unkeyed/InnerChild.svelte b/test/runtime/samples/component-binding-each-remount-unkeyed/InnerChild.svelte
new file mode 100644
index 0000000000..f0b5d57a82
--- /dev/null
+++ b/test/runtime/samples/component-binding-each-remount-unkeyed/InnerChild.svelte
@@ -0,0 +1,14 @@
+<script>
+	import { afterUpdate } from 'svelte';
+
+	export let val = 1;
+	export let increment;
+
+	afterUpdate(() => {
+		increment();
+	});
+</script>
+
+<inner>
+	{val}
+</inner>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-each-remount-unkeyed/_config.js b/test/runtime/samples/component-binding-each-remount-unkeyed/_config.js
new file mode 100644
index 0000000000..181c1bce8b
--- /dev/null
+++ b/test/runtime/samples/component-binding-each-remount-unkeyed/_config.js
@@ -0,0 +1,53 @@
+export default {
+	html: `
+		<div data-id="1">
+			<inner>0</inner>
+			<inner>1</inner>
+		</div>
+		<div data-id="2">
+			<inner>0</inner>
+			<inner>1</inner>
+		</div>
+		<div data-id="3">
+			<inner>0</inner>
+			<inner>1</inner>
+		</div>
+	`,
+
+	ssrHtml: `
+		<div data-id="1">
+			<inner>0</inner>
+			<inner>1</inner>
+			<inner>2</inner>
+		</div>
+		<div data-id="2">
+			<inner>0</inner>
+			<inner>1</inner>
+			<inner>2</inner>
+		</div>
+		<div data-id="3">
+			<inner>0</inner>
+			<inner>1</inner>
+			<inner>2</inner>
+		</div>
+	`,
+
+	async test({ assert, component, target }) {
+		await component.done;
+		assert.equal(component.getCounter(), 13);
+		assert.htmlEqual(target.innerHTML, `
+			<div data-id="3">
+				<inner>0</inner>
+				<inner>1</inner>
+			</div>
+			<div data-id="2">
+				<inner>0</inner>
+				<inner>1</inner>
+			</div>
+			<div data-id="1">
+				<inner>0</inner>
+				<inner>1</inner>
+			</div>
+		`);
+	}
+};
diff --git a/test/runtime/samples/component-binding-each-remount-unkeyed/main.svelte b/test/runtime/samples/component-binding-each-remount-unkeyed/main.svelte
new file mode 100644
index 0000000000..7f4c448d8f
--- /dev/null
+++ b/test/runtime/samples/component-binding-each-remount-unkeyed/main.svelte
@@ -0,0 +1,35 @@
+<script>
+	import { onMount } from 'svelte';
+	import Child from './Child.svelte';
+
+	let updateCounter = 0;
+	let promiseResolve;
+	export const done = new Promise(resolve => {
+		promiseResolve = resolve;
+	});
+	export const getCounter = () => {
+		return updateCounter;
+	};
+
+	let vals = [1, 2, 3];
+	const instances = [];
+	let count = 3;
+
+	const increment = () => {
+		++updateCounter;
+	};
+
+	onMount(() => {
+		count = 2;
+
+		setTimeout(() => {
+			vals = vals.reverse();
+
+			setTimeout(promiseResolve);
+		});
+	});
+</script>
+
+{#each vals as val, index (val)}
+	<Child bind:this={instances[index]} id={val} {count} {increment} />
+{/each}

From 26104eaaba38ad1e14221870c2c97d00f51ef868 Mon Sep 17 00:00:00 2001
From: Vaibhav Rai <raivaibhav08@gmail.com>
Date: Mon, 27 Feb 2023 18:15:14 +0530
Subject: [PATCH 020/110] fix: no error assigning to a `const` property (#7966)

Fixes #7964
currently for a case where the parent type is ArrayPattern code needs to check if the elements are of direct type MemberExpression or Identifier, in the case of MemberExpression there will be an Identifier check for the Object of the MemberExpression.

---------

Co-authored-by: Yuichiro Yamashita <xydybaseball@gmail.com>
---
 src/compiler/compile/Component.ts             | 27 +++++++++++++------
 .../samples/assignment-to-const1/_config.js   |  3 +++
 .../samples/assignment-to-const1/main.svelte  |  6 +++++
 .../samples/assignment-to-const2/_config.js   |  3 +++
 .../samples/assignment-to-const2/main.svelte  |  7 +++++
 .../samples/assignment-to-const-5/errors.json | 17 ++++++++++++
 .../assignment-to-const-5/input.svelte        |  6 +++++
 .../samples/assignment-to-const-6/errors.json |  1 +
 .../assignment-to-const-6/input.svelte        |  6 +++++
 .../samples/assignment-to-const-7/errors.json | 17 ++++++++++++
 .../assignment-to-const-7/input.svelte        |  6 +++++
 .../samples/assignment-to-const-8/errors.json |  1 +
 .../assignment-to-const-8/input.svelte        |  6 +++++
 13 files changed, 98 insertions(+), 8 deletions(-)
 create mode 100644 test/runtime/samples/assignment-to-const1/_config.js
 create mode 100644 test/runtime/samples/assignment-to-const1/main.svelte
 create mode 100644 test/runtime/samples/assignment-to-const2/_config.js
 create mode 100644 test/runtime/samples/assignment-to-const2/main.svelte
 create mode 100644 test/validator/samples/assignment-to-const-5/errors.json
 create mode 100644 test/validator/samples/assignment-to-const-5/input.svelte
 create mode 100644 test/validator/samples/assignment-to-const-6/errors.json
 create mode 100644 test/validator/samples/assignment-to-const-6/input.svelte
 create mode 100644 test/validator/samples/assignment-to-const-7/errors.json
 create mode 100644 test/validator/samples/assignment-to-const-7/input.svelte
 create mode 100644 test/validator/samples/assignment-to-const-8/errors.json
 create mode 100644 test/validator/samples/assignment-to-const-8/input.svelte

diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts
index ffac6e1f07..f7d8e8f568 100644
--- a/src/compiler/compile/Component.ts
+++ b/src/compiler/compile/Component.ts
@@ -794,20 +794,31 @@ export default class Component {
 				}
 
 				let deep = false;
-				let names: string[] | undefined; 
+				let names: string[] = [];
 
 				if (node.type === 'AssignmentExpression') {
-					deep = node.left.type === 'MemberExpression';
-					names = deep
-						? [get_object(node.left).name]
-						: extract_names(node.left);
+					if (node.left.type === 'ArrayPattern') {
+						walk(node.left, {
+							enter(node: Node, parent: Node) {
+								if (node.type === 'Identifier' &&
+									parent.type !== 'MemberExpression' &&
+									(parent.type !== 'AssignmentPattern' || parent.right !== node)) {
+										names.push(node.name);
+								}
+							}
+						});
+					} else {
+						deep = node.left.type === 'MemberExpression';
+						names = deep
+							? [get_object(node.left).name]
+							: extract_names(node.left);
+					}
 				} else if (node.type === 'UpdateExpression') {
 					deep = node.argument.type === 'MemberExpression';
 					const { name } = get_object(node.argument);
-					names = [name];
+					names.push(name);
 				}
-
-				if (names) {
+				if (names.length > 0) {
 					names.forEach(name => {
 						let current_scope = scope;
 						let declaration;
diff --git a/test/runtime/samples/assignment-to-const1/_config.js b/test/runtime/samples/assignment-to-const1/_config.js
new file mode 100644
index 0000000000..2fd0447458
--- /dev/null
+++ b/test/runtime/samples/assignment-to-const1/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: '<p>2, 1</p>'
+};
diff --git a/test/runtime/samples/assignment-to-const1/main.svelte b/test/runtime/samples/assignment-to-const1/main.svelte
new file mode 100644
index 0000000000..f221249193
--- /dev/null
+++ b/test/runtime/samples/assignment-to-const1/main.svelte
@@ -0,0 +1,6 @@
+<script>
+	const arr = [1, 2];
+	[arr[0], arr[1]] = [arr[1], arr[0]];
+</script>
+
+<p>{arr[0]}, {arr[1]}</p>
diff --git a/test/runtime/samples/assignment-to-const2/_config.js b/test/runtime/samples/assignment-to-const2/_config.js
new file mode 100644
index 0000000000..9802ca2c44
--- /dev/null
+++ b/test/runtime/samples/assignment-to-const2/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: '<p>[{"a":2},100]</p>'
+};
diff --git a/test/runtime/samples/assignment-to-const2/main.svelte b/test/runtime/samples/assignment-to-const2/main.svelte
new file mode 100644
index 0000000000..c805e4b589
--- /dev/null
+++ b/test/runtime/samples/assignment-to-const2/main.svelte
@@ -0,0 +1,7 @@
+<script>
+	const a = 100;
+	const arr = [{ a: 1 }, 2];
+	[arr[0].a, arr[1] = a] = [arr[1]];
+</script>
+
+<p>{JSON.stringify(arr)}</p>
diff --git a/test/validator/samples/assignment-to-const-5/errors.json b/test/validator/samples/assignment-to-const-5/errors.json
new file mode 100644
index 0000000000..21de70863c
--- /dev/null
+++ b/test/validator/samples/assignment-to-const-5/errors.json
@@ -0,0 +1,17 @@
+[
+	{
+		"code": "assignment-to-const",
+		"message": "You are assigning to a const",
+		"start": {
+			"line": 3,
+			"column": 1,
+			"character": 31
+		},
+		"end": {
+			"line": 3,
+			"column": 33,
+			"character": 63
+		},
+		"pos": 31
+	}
+]
\ No newline at end of file
diff --git a/test/validator/samples/assignment-to-const-5/input.svelte b/test/validator/samples/assignment-to-const-5/input.svelte
new file mode 100644
index 0000000000..76907b94be
--- /dev/null
+++ b/test/validator/samples/assignment-to-const-5/input.svelte
@@ -0,0 +1,6 @@
+<script>
+	const arr = [1, 2];
+	[arr, arr[1]] = [arr[1], arr[0]];
+</script>
+
+{arr}
\ No newline at end of file
diff --git a/test/validator/samples/assignment-to-const-6/errors.json b/test/validator/samples/assignment-to-const-6/errors.json
new file mode 100644
index 0000000000..0637a088a0
--- /dev/null
+++ b/test/validator/samples/assignment-to-const-6/errors.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/test/validator/samples/assignment-to-const-6/input.svelte b/test/validator/samples/assignment-to-const-6/input.svelte
new file mode 100644
index 0000000000..8da59b261e
--- /dev/null
+++ b/test/validator/samples/assignment-to-const-6/input.svelte
@@ -0,0 +1,6 @@
+<script>
+	const arr = [1, 2];
+	[arr[0], arr[1]] = [arr[1], arr[0]];
+</script>
+
+{arr}
\ No newline at end of file
diff --git a/test/validator/samples/assignment-to-const-7/errors.json b/test/validator/samples/assignment-to-const-7/errors.json
new file mode 100644
index 0000000000..34c88bebf6
--- /dev/null
+++ b/test/validator/samples/assignment-to-const-7/errors.json
@@ -0,0 +1,17 @@
+[
+	{
+		"code": "assignment-to-const",
+		"message": "You are assigning to a const",
+		"start": {
+			"line": 3,
+			"column": 1,
+			"character": 43
+		},
+		"end": {
+			"line": 3,
+			"column": 42,
+			"character": 84
+		},
+		"pos": 43
+	}
+]
\ No newline at end of file
diff --git a/test/validator/samples/assignment-to-const-7/input.svelte b/test/validator/samples/assignment-to-const-7/input.svelte
new file mode 100644
index 0000000000..ed7b37ae26
--- /dev/null
+++ b/test/validator/samples/assignment-to-const-7/input.svelte
@@ -0,0 +1,6 @@
+<script>
+	const arr = [{1: {arr: 2}}, 2];
+	[{1: { arr }}, arr[1]] = [arr[1], arr[0]];
+</script>
+
+{arr}
\ No newline at end of file
diff --git a/test/validator/samples/assignment-to-const-8/errors.json b/test/validator/samples/assignment-to-const-8/errors.json
new file mode 100644
index 0000000000..fe51488c70
--- /dev/null
+++ b/test/validator/samples/assignment-to-const-8/errors.json
@@ -0,0 +1 @@
+[]
diff --git a/test/validator/samples/assignment-to-const-8/input.svelte b/test/validator/samples/assignment-to-const-8/input.svelte
new file mode 100644
index 0000000000..8af787f4f0
--- /dev/null
+++ b/test/validator/samples/assignment-to-const-8/input.svelte
@@ -0,0 +1,6 @@
+<script>
+	const arr = [1, 2];
+	[arr[0], arr[1] = arr] = [arr[1], arr[0]];
+</script>
+
+{arr}

From 4e8efd3c1e3002a894910cfad6a3389257cb7434 Mon Sep 17 00:00:00 2001
From: David Hunt <davidhuntatwork@gmail.com>
Date: Mon, 27 Feb 2023 06:02:34 -0800
Subject: [PATCH 021/110] fix: fixes sveltejs/svelte#8214 `bind:group` to
 `undefined` (#8215)

* fixes sveltejs/svelte#8214 bind:group to undefined

* fix code and add test

---------

Co-authored-by: Yuichiro Yamashita <xydybaseball@gmail.com>
---
 .../render_dom/wrappers/Element/Binding.ts    |  2 +-
 .../binding-input-group-undefined/_config.js  | 25 +++++++++++++++++++
 .../binding-input-group-undefined/main.svelte | 15 +++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 test/runtime/samples/binding-input-group-undefined/_config.js
 create mode 100644 test/runtime/samples/binding-input-group-undefined/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 ab863e9dff..47e3795ec2 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
@@ -266,7 +266,7 @@ function get_dom_updater(
 		const type = node.get_static_attribute_value('type');
 
 		const condition = type === 'checkbox'
-			? x`~${binding.snippet}.indexOf(${element.var}.__value)`
+			? x`~(${binding.snippet} || []).indexOf(${element.var}.__value)`
 			: x`${element.var}.__value === ${binding.snippet}`;
 
 		return b`${element.var}.checked = ${condition};`;
diff --git a/test/runtime/samples/binding-input-group-undefined/_config.js b/test/runtime/samples/binding-input-group-undefined/_config.js
new file mode 100644
index 0000000000..501e37813c
--- /dev/null
+++ b/test/runtime/samples/binding-input-group-undefined/_config.js
@@ -0,0 +1,25 @@
+export default {
+
+	async test({ assert, target, component, window }) {
+		const [input1, input2, input3] = target.querySelectorAll('input');
+		const event = new window.Event('change');
+
+		function validate_inputs(v1, v2, v3) {
+			assert.equal(input1.checked, v1);
+			assert.equal(input2.checked, v2);
+			assert.equal(input3.checked, v3);
+		}
+
+		assert.deepEqual(component.values.inner, []);
+		validate_inputs(false, false, false);
+
+		component.values = { inner: undefined };
+		assert.deepEqual(component.values.inner, undefined);
+		validate_inputs(false, false, false);
+
+		input1.checked = true;
+		await input1.dispatchEvent(event);
+		assert.deepEqual(component.values.inner, ['first']);
+		validate_inputs(true, false, false);
+	}
+};
diff --git a/test/runtime/samples/binding-input-group-undefined/main.svelte b/test/runtime/samples/binding-input-group-undefined/main.svelte
new file mode 100644
index 0000000000..4dadc84a31
--- /dev/null
+++ b/test/runtime/samples/binding-input-group-undefined/main.svelte
@@ -0,0 +1,15 @@
+<script>
+	export let values = {
+		inner: []
+	};
+</script>
+
+<input type='checkbox' value='first' bind:group={values.inner} />
+<input type='checkbox' value='second' bind:group={values.inner} />
+<input type='checkbox' value='third' bind:group={values.inner} />
+
+<div>
+	{#each ['first', 'second', 'third'] as k}
+		<span>{k}</span>
+	{/each}
+</div>

From fc5f6298129c04214110abb9e5d9046d32691c07 Mon Sep 17 00:00:00 2001
From: Tan Li Hau <tanhauhau@users.noreply.github.com>
Date: Mon, 27 Feb 2023 22:04:20 +0800
Subject: [PATCH 022/110] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2af04103fb..603c80cbbf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,6 @@
 
 * Add a11y warnings:
 	* `aria-activedescendant-has-tabindex`: elements with `aria-activedescendant` need to have a `tabindex` ([#8172](https://github.com/sveltejs/svelte/pull/8172))
-	* 
 * 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))
 * Make `noreferrer` warning less zealous ([#6289](https://github.com/sveltejs/svelte/issues/6289))
@@ -19,6 +18,7 @@
 * Add `readonly` method to convert `writable` store to readonly ([#6518](https://github.com/sveltejs/svelte/pull/6518))
 * 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))
 
 ## 3.55.1
 

From 32a94fcfc5b119d8cc142d6489e308381f26ccc2 Mon Sep 17 00:00:00 2001
From: Cory Virok <coryvirok@users.noreply.github.com>
Date: Mon, 27 Feb 2023 07:32:45 -0800
Subject: [PATCH 023/110] chore: implemented a small runtime optimization for
 SSR (#7539)

Prior to this change, the compiler would generate a template literal that had many purely static
string variables nested within it. This change collapses these static strings into the surrounding
template literal which should result in (minor) size and performance improvements for the SSR
generated code.

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 src/compiler/compile/render_ssr/Renderer.ts   |  4 +++
 .../utils/collapse_template_literal.ts        | 34 +++++++++++++++++++
 .../samples/collapse-literal-ssr/_config.js   |  6 ++++
 .../samples/collapse-literal-ssr/expected.js  | 25 ++++++++++++++
 .../samples/collapse-literal-ssr/input.svelte | 20 +++++++++++
 .../samples/assignment-to-const-5/errors.json |  9 ++---
 .../samples/assignment-to-const-7/errors.json |  9 ++---
 7 files changed, 95 insertions(+), 12 deletions(-)
 create mode 100644 src/compiler/compile/utils/collapse_template_literal.ts
 create mode 100644 test/js/samples/collapse-literal-ssr/_config.js
 create mode 100644 test/js/samples/collapse-literal-ssr/expected.js
 create mode 100644 test/js/samples/collapse-literal-ssr/input.svelte

diff --git a/src/compiler/compile/render_ssr/Renderer.ts b/src/compiler/compile/render_ssr/Renderer.ts
index 64e9ee1f4e..99a2ee3d68 100644
--- a/src/compiler/compile/render_ssr/Renderer.ts
+++ b/src/compiler/compile/render_ssr/Renderer.ts
@@ -16,6 +16,7 @@ import Title from './handlers/Title';
 import { AppendTarget, CompileOptions } from '../../interfaces';
 import { INode } from '../nodes/interfaces';
 import { Expression, TemplateLiteral, Identifier } from 'estree';
+import { collapse_template_literal } from '../utils/collapse_template_literal';
 import { escape_template } from '../utils/stringify';
 
 type Handler = (node: any, renderer: Renderer, options: CompileOptions) => void;
@@ -106,6 +107,9 @@ export default class Renderer {
 			this.current = last.current;
 		}
 
+		// Optimize the TemplateLiteral to remove unnecessary nodes
+		collapse_template_literal(popped.literal);
+
 		return popped.literal;
 	}
 
diff --git a/src/compiler/compile/utils/collapse_template_literal.ts b/src/compiler/compile/utils/collapse_template_literal.ts
new file mode 100644
index 0000000000..5c5f78b8a3
--- /dev/null
+++ b/src/compiler/compile/utils/collapse_template_literal.ts
@@ -0,0 +1,34 @@
+import { TemplateLiteral } from 'estree';
+import { escape_template } from './stringify';
+
+/**
+ * Collapse string literals together
+ */ 
+export function collapse_template_literal(literal: TemplateLiteral) {
+	if (!literal.quasis.length) return;
+
+	const collapsed_quasis = [];
+	const collapsed_expressions = [];
+
+	let cur_quasi = literal.quasis[0];
+
+	// An expression always follows a quasi and vice versa, ending with a quasi
+	for (let i = 0; i < literal.quasis.length; i++) {
+		const expr = literal.expressions[i];
+		const next_quasi = literal.quasis[i + 1];
+		// If an expression is a simple string literal, combine it with its preceding
+		// and following quasi
+		if (next_quasi && expr && expr.type === 'Literal' && typeof expr.value === 'string') {
+			cur_quasi.value.raw += escape_template(expr.value) + next_quasi.value.raw;
+		} else {
+			if (expr) {
+				collapsed_expressions.push(expr);
+			}
+			collapsed_quasis.push(cur_quasi);
+			cur_quasi = next_quasi;
+		}
+	}
+
+	literal.quasis = collapsed_quasis;
+	literal.expressions = collapsed_expressions;
+}
diff --git a/test/js/samples/collapse-literal-ssr/_config.js b/test/js/samples/collapse-literal-ssr/_config.js
new file mode 100644
index 0000000000..c4070b9a3b
--- /dev/null
+++ b/test/js/samples/collapse-literal-ssr/_config.js
@@ -0,0 +1,6 @@
+export default {
+	options: {
+		generate: 'ssr',
+		dev: true
+	}
+};
diff --git a/test/js/samples/collapse-literal-ssr/expected.js b/test/js/samples/collapse-literal-ssr/expected.js
new file mode 100644
index 0000000000..8440a10082
--- /dev/null
+++ b/test/js/samples/collapse-literal-ssr/expected.js
@@ -0,0 +1,25 @@
+/* generated by Svelte vX.Y.Z */
+import { add_attribute, create_ssr_component, escape } from "svelte/internal";
+
+const const1 = 1;
+const const2 = 'const2';
+
+function foo() {
+	return '';
+}
+
+const Component = create_ssr_component(($$result, $$props, $$bindings, slots) => {
+	return `
+<div class="class1 class2" style="color:red;">-</div>
+
+
+<div${add_attribute("class", const1, 0)}>-</div>
+<div${add_attribute("class", const1, 0)}>-</div>
+
+
+<div class="${"class1 " + escape('class2', true)}">-</div>
+<div class="${"class1 " + escape(const2, true)}">-</div>
+<div class="${"class1 " + escape(const2, true)}"${add_attribute("style", foo(), 0)}>-</div>`;
+});
+
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/collapse-literal-ssr/input.svelte b/test/js/samples/collapse-literal-ssr/input.svelte
new file mode 100644
index 0000000000..83a7be9bda
--- /dev/null
+++ b/test/js/samples/collapse-literal-ssr/input.svelte
@@ -0,0 +1,20 @@
+<script>
+	const const1 = 1;
+	const const2 = 'const2';
+
+	function foo() {
+		return '';
+	}
+</script>
+
+<!-- canonical case - only markup -->
+<div class="class1 class2" style="color:red;">-</div>
+
+<!-- various forms of variable syntax -->
+<div class="{const1}">-</div>
+<div class={const1}>-</div>
+
+<!-- mixed static string + expressions -->
+<div class="class1 {'class2'}">-</div>
+<div class="class1 {const2}">-</div>
+<div class="class1 {const2}" style={foo()}>-</div>
diff --git a/test/validator/samples/assignment-to-const-5/errors.json b/test/validator/samples/assignment-to-const-5/errors.json
index 21de70863c..bca92bf266 100644
--- a/test/validator/samples/assignment-to-const-5/errors.json
+++ b/test/validator/samples/assignment-to-const-5/errors.json
@@ -4,14 +4,11 @@
 		"message": "You are assigning to a const",
 		"start": {
 			"line": 3,
-			"column": 1,
-			"character": 31
+			"column": 1
 		},
 		"end": {
 			"line": 3,
-			"column": 33,
-			"character": 63
-		},
-		"pos": 31
+			"column": 33
+		}
 	}
 ]
\ No newline at end of file
diff --git a/test/validator/samples/assignment-to-const-7/errors.json b/test/validator/samples/assignment-to-const-7/errors.json
index 34c88bebf6..5304a61c4b 100644
--- a/test/validator/samples/assignment-to-const-7/errors.json
+++ b/test/validator/samples/assignment-to-const-7/errors.json
@@ -4,14 +4,11 @@
 		"message": "You are assigning to a const",
 		"start": {
 			"line": 3,
-			"column": 1,
-			"character": 43
+			"column": 1
 		},
 		"end": {
 			"line": 3,
-			"column": 42,
-			"character": 84
-		},
-		"pos": 43
+			"column": 42
+		}
 	}
 ]
\ No newline at end of file

From b5ec863a0ea4ed7334b46850f68d9942cdaa333a Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 27 Feb 2023 17:13:50 +0100
Subject: [PATCH 024/110] chore: update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 603c80cbbf..3fb3d751d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 * Add a11y warnings:
 	* `aria-activedescendant-has-tabindex`: elements with `aria-activedescendant` need to 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))
 * Make `noreferrer` warning less zealous ([#6289](https://github.com/sveltejs/svelte/issues/6289))
@@ -19,6 +20,13 @@
 * 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)) 
 
 ## 3.55.1
 

From c7bbe55b9f6edda0fb8e1974c47d6260489dbdad Mon Sep 17 00:00:00 2001
From: Theodor Steiner <40017636+Theo-Steiner@users.noreply.github.com>
Date: Tue, 28 Feb 2023 01:58:23 +0900
Subject: [PATCH 025/110] feat: introduce axis parameter to allow for
 horizontal slide transition (#6183)

---------

Co-authored-by: Tan Li Hau <tanhauhau@users.noreply.github.com>
---
 site/content/docs/04-run-time.md |  5 +++--
 src/runtime/transition/index.ts  | 36 ++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/site/content/docs/04-run-time.md b/site/content/docs/04-run-time.md
index 72b0736ac6..46d025fe3e 100644
--- a/site/content/docs/04-run-time.md
+++ b/site/content/docs/04-run-time.md
@@ -768,6 +768,7 @@ Slides an element in and out.
 * `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)
+- `axis` (`x` | `y`, default `y`) — the axis of motion along which the transition occurs
 
 ```sv
 <script>
@@ -776,8 +777,8 @@ Slides an element in and out.
 </script>
 
 {#if condition}
-	<div transition:slide="{{delay: 250, duration: 300, easing: quintOut }}">
-		slides in and out
+	<div transition:slide="{{delay: 250, duration: 300, easing: quintOut, axis: 'x'}}">
+		slides in and out horizontally
 	</div>
 {/if}
 ```
diff --git a/src/runtime/transition/index.ts b/src/runtime/transition/index.ts
index cc8ace194f..836efc3d40 100644
--- a/src/runtime/transition/index.ts
+++ b/src/runtime/transition/index.ts
@@ -98,23 +98,27 @@ export interface SlideParams {
 	delay?: number;
 	duration?: number;
 	easing?: EasingFunction;
+	axis?: 'x' | 'y';
 }
 
 export function slide(node: Element, {
 	delay = 0,
 	duration = 400,
-	easing = cubicOut
+	easing = cubicOut,
+	axis = 'y'
 }: SlideParams = {}): TransitionConfig {
 	const style = getComputedStyle(node);
 	const opacity = +style.opacity;
-	const height = parseFloat(style.height);
-	const padding_top = parseFloat(style.paddingTop);
-	const padding_bottom = parseFloat(style.paddingBottom);
-	const margin_top = parseFloat(style.marginTop);
-	const margin_bottom = parseFloat(style.marginBottom);
-	const border_top_width = parseFloat(style.borderTopWidth);
-	const border_bottom_width = parseFloat(style.borderBottomWidth);
-
+	const primary_property = axis === 'y' ? 'height' : 'width';
+	const primary_property_value = parseFloat(style[primary_property]);
+	const secondary_properties = axis === 'y' ? ['top', 'bottom'] : ['left', 'right'];
+	const capitalized_secondary_properties = secondary_properties.map((e) => `${e[0].toUpperCase()}${e.slice(1)}`);
+	const padding_start_value = parseFloat(style[`padding${capitalized_secondary_properties[0]}`]);
+	const padding_end_value = parseFloat(style[`padding${capitalized_secondary_properties[1]}`]);
+	const margin_start_value = parseFloat(style[`margin${capitalized_secondary_properties[0]}`]);
+	const margin_end_value = parseFloat(style[`margin${capitalized_secondary_properties[1]}`]);
+	const border_width_start_value = parseFloat(style[`border${capitalized_secondary_properties[0]}Width`]);
+	const border_width_end_value = parseFloat(style[`border${capitalized_secondary_properties[1]}Width`]);
 	return {
 		delay,
 		duration,
@@ -122,13 +126,13 @@ export function slide(node: Element, {
 		css: t =>
 			'overflow: hidden;' +
 			`opacity: ${Math.min(t * 20, 1) * opacity};` +
-			`height: ${t * height}px;` +
-			`padding-top: ${t * padding_top}px;` +
-			`padding-bottom: ${t * padding_bottom}px;` +
-			`margin-top: ${t * margin_top}px;` +
-			`margin-bottom: ${t * margin_bottom}px;` +
-			`border-top-width: ${t * border_top_width}px;` +
-			`border-bottom-width: ${t * border_bottom_width}px;`
+			`${primary_property}: ${t * primary_property_value}px;` +
+			`padding-${secondary_properties[0]}: ${t * padding_start_value}px;` +
+			`padding-${secondary_properties[1]}: ${t * padding_end_value}px;` +
+			`margin-${secondary_properties[0]}: ${t * margin_start_value}px;` +
+			`margin-${secondary_properties[1]}: ${t * margin_end_value}px;` +
+			`border-${secondary_properties[0]}-width: ${t * border_width_start_value}px;` +
+			`border-${secondary_properties[1]}-width: ${t * border_width_end_value}px;`
 	};
 }
 

From d4363510fc3752f5e49b7ac1757713488990b72b Mon Sep 17 00:00:00 2001
From: Invader Zim <85027668+zim0369@users.noreply.github.com>
Date: Tue, 28 Feb 2023 14:14:39 +0530
Subject: [PATCH 026/110] docs: add console output instruction to tutorial
 (#8336)

---
 site/content/tutorial/04-logic/05-keyed-each-blocks/text.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/content/tutorial/04-logic/05-keyed-each-blocks/text.md b/site/content/tutorial/04-logic/05-keyed-each-blocks/text.md
index 76d8322fb0..63821de5ec 100644
--- a/site/content/tutorial/04-logic/05-keyed-each-blocks/text.md
+++ b/site/content/tutorial/04-logic/05-keyed-each-blocks/text.md
@@ -4,7 +4,7 @@ title: Keyed each blocks
 
 By default, when you modify the value of an `each` block, it will add and remove items at the *end* of the block, and update any values that have changed. That might not be what you want.
 
-It's easier to show why than to explain. Click the 'Remove first thing' button a few times, and notice what happens: it does not remove the first `<Thing>` component, but rather the *last* DOM node. Then it updates the `name` value in the remaining DOM nodes, but not the emoji. 
+It's easier to show why than to explain. Click to expand the `Console`, then click the 'Remove first thing' button a few times, and notice what happens: it does not remove the first `<Thing>` component, but rather the *last* DOM node. Then it updates the `name` value in the remaining DOM nodes, but not the emoji. 
 
 Instead, we'd like to remove only the first `<Thing>` component and its DOM node, and leave the others unaffected.
 

From f6dc86f02c782174071fa77493a3058c681b8f8b Mon Sep 17 00:00:00 2001
From: Tan Li Hau <tanhauhau@users.noreply.github.com>
Date: Tue, 28 Feb 2023 23:57:45 +0800
Subject: [PATCH 027/110] feat: optimise svelte-element output code for static
 tag and static attribute (#8161)

* feat: optimise svelte-element output code for static tag and static attribute

* Update src/compiler/compile/render_dom/wrappers/Element/index.ts

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>

* Update src/runtime/internal/dom.ts

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>

* Update src/compiler/compile/render_dom/wrappers/Element/index.ts

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>

* fix logic

* fix pipeline errors

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 .../render_dom/wrappers/Element/index.ts      | 189 ++++++++------
 src/runtime/internal/dom.ts                   |   4 +
 .../svelte-element-event-handlers/expected.js |  77 +-----
 .../js/samples/svelte-element-svg/expected.js |  53 +---
 test/js/samples/svelte-element/expected.js    | 244 ++++++++++++++++++
 test/js/samples/svelte-element/input.svelte   |  14 +
 .../class-with-spread-and-bind/main.svelte    |   2 +-
 7 files changed, 385 insertions(+), 198 deletions(-)
 create mode 100644 test/js/samples/svelte-element/expected.js
 create mode 100644 test/js/samples/svelte-element/input.svelte

diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index 4c2dd059cc..7642aff711 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -155,6 +155,7 @@ export default class ElementWrapper extends Wrapper {
 	bindings: Binding[];
 	event_handlers: EventHandler[];
 	class_dependencies: string[];
+	has_dynamic_attribute: boolean;
 
 	select_binding_dependencies?: Set<string>;
 
@@ -223,6 +224,7 @@ export default class ElementWrapper extends Wrapper {
 			}
 			return new AttributeWrapper(this, block, attribute);
 		});
+		this.has_dynamic_attribute = !!this.attributes.find(attr => attr.node.get_dependencies().length > 0);
 
 		// ordinarily, there'll only be one... but we need to handle
 		// the rare case where an element can have multiple bindings,
@@ -291,9 +293,8 @@ export default class ElementWrapper extends Wrapper {
 			(x`#nodes` as unknown) as Identifier
 		);
 
-		const previous_tag = block.get_unique_name('previous_tag');
+		const is_tag_dynamic = this.node.tag_expr.dynamic_dependencies().length > 0;
 		const tag = this.node.tag_expr.manipulate(block);
-		block.add_variable(previous_tag, tag);
 
 		block.chunks.init.push(b`
 			${this.renderer.options.dev && b`@validate_dynamic_element(${tag});`}
@@ -315,62 +316,72 @@ export default class ElementWrapper extends Wrapper {
 			if (${this.var}) ${this.var}.m(${parent_node || '#target'}, ${parent_node ? 'null' : '#anchor'});
 		`);
 
-		const anchor = this.get_or_create_anchor(block, parent_node, parent_nodes);
-		const has_transitions = !!(this.node.intro || this.node.outro);
-		const not_equal = this.renderer.component.component_options.immutable ? x`@not_equal` : x`@safe_not_equal`;
+		if (is_tag_dynamic) {
+			const previous_tag = block.get_unique_name('previous_tag');
+			block.add_variable(previous_tag, tag);
+			const anchor = this.get_or_create_anchor(block, parent_node, parent_nodes);
+			const has_transitions = !!(this.node.intro || this.node.outro);
+			const not_equal = this.renderer.component.component_options.immutable ? x`@not_equal` : x`@safe_not_equal`;
 
-		const tag_will_be_removed = block.get_unique_name('tag_will_be_removed');
-		if (has_transitions) {
-			block.add_variable(tag_will_be_removed, x`false`);
-		}
+			const tag_will_be_removed = block.get_unique_name('tag_will_be_removed');
+			if (has_transitions) {
+				block.add_variable(tag_will_be_removed, x`false`);
+			}
 
-		block.chunks.update.push(b`
-			if (${tag}) {
-				if (!${previous_tag}) {
-					${this.var} = ${this.child_dynamic_element_block.name}(#ctx);
-					${previous_tag} = ${tag};
-					${this.var}.c();
-					${has_transitions && b`@transition_in(${this.var})`}
-					${this.var}.m(${this.get_update_mount_node(anchor)}, ${anchor});
-				} else if (${not_equal}(${previous_tag}, ${tag})) {
-					${this.var}.d(1);
-					${this.renderer.options.dev && b`@validate_dynamic_element(${tag});`}
-					${this.renderer.options.dev && this.node.children.length > 0 && b`@validate_void_dynamic_element(${tag});`}
-					${this.var} = ${this.child_dynamic_element_block.name}(#ctx);
-					${previous_tag} = ${tag};
-					${this.var}.c();
-					${has_transitions && b`if (${tag_will_be_removed}) {
-						${tag_will_be_removed} = false;
-						@transition_in(${this.var})
-					}`}
-					${this.var}.m(${this.get_update_mount_node(anchor)}, ${anchor});
-				} else {
-					${has_transitions && b`if (${tag_will_be_removed}) {
-						${tag_will_be_removed} = false;
-						@transition_in(${this.var})
-					}`}
-					${this.var}.p(#ctx, #dirty);
-				}
-			} else if (${previous_tag}) {
-				${has_transitions
-				? b`
-							${tag_will_be_removed} = true;
-							@group_outros();
-							@transition_out(${this.var}, 1, 1, () => {
+			block.chunks.update.push(b`
+				if (${tag}) {
+					if (!${previous_tag}) {
+						${this.var} = ${this.child_dynamic_element_block.name}(#ctx);
+						${previous_tag} = ${tag};
+						${this.var}.c();
+						${has_transitions && b`@transition_in(${this.var})`}
+						${this.var}.m(${this.get_update_mount_node(anchor)}, ${anchor});
+					} else if (${not_equal}(${previous_tag}, ${tag})) {
+						${this.var}.d(1);
+						${this.renderer.options.dev && b`@validate_dynamic_element(${tag});`}
+						${this.renderer.options.dev && this.node.children.length > 0 && b`@validate_void_dynamic_element(${tag});`}
+						${this.var} = ${this.child_dynamic_element_block.name}(#ctx);
+						${previous_tag} = ${tag};
+						${this.var}.c();
+						${has_transitions && b`if (${tag_will_be_removed}) {
+							${tag_will_be_removed} = false;
+							@transition_in(${this.var})
+						}`}
+						${this.var}.m(${this.get_update_mount_node(anchor)}, ${anchor});
+					} else {
+						${has_transitions && b`if (${tag_will_be_removed}) {
+							${tag_will_be_removed} = false;
+							@transition_in(${this.var})
+						}`}
+						${this.var}.p(#ctx, #dirty);
+					}
+				} else if (${previous_tag}) {
+					${has_transitions
+					? b`
+								${tag_will_be_removed} = true;
+								@group_outros();
+								@transition_out(${this.var}, 1, 1, () => {
+									${this.var} = null;
+									${previous_tag} = ${tag};
+									${tag_will_be_removed} = false;
+								});
+								@check_outros();
+							`
+					: b`
+								${this.var}.d(1);
 								${this.var} = null;
 								${previous_tag} = ${tag};
-								${tag_will_be_removed} = false;
-							});
-							@check_outros();
-						`
-				: b`
-							${this.var}.d(1);
-							${this.var} = null;
-							${previous_tag} = ${tag};
-						`
-			}
-			}
-		`);
+							`
+				}
+				}
+			`);
+		} else {
+			block.chunks.update.push(b`
+				if (${tag}) {
+					${this.var}.p(#ctx, #dirty);
+				}
+			`);
+		}
 
 		if (this.child_dynamic_element_block.has_intros) {
 			block.chunks.intro.push(b`@transition_in(${this.var});`);
@@ -509,7 +520,11 @@ export default class ElementWrapper extends Wrapper {
 			block.maintain_context = true;
 		}
 
-		this.add_attributes(block);
+		if (this.node.is_dynamic_element) {
+			this.add_dynamic_element_attributes(block);
+		} else {
+			this.add_attributes(block);
+		}
 		this.add_directives_in_order(block);
 		this.add_transitions(block);
 		this.add_animation(block);
@@ -787,7 +802,7 @@ export default class ElementWrapper extends Wrapper {
 			}
 		});
 
-		if (this.node.attributes.some(attr => attr.is_spread) || this.node.is_dynamic_element) {
+		if (this.node.attributes.some(attr => attr.is_spread)) {
 			this.add_spread_attributes(block);
 			return;
 		}
@@ -836,29 +851,18 @@ export default class ElementWrapper extends Wrapper {
 			}
 		`);
 
-		const fn = this.node.namespace === namespaces.svg ? x`@set_svg_attributes` : x`@set_attributes`;
+		const fn =
+			this.node.namespace === namespaces.svg
+				? x`@set_svg_attributes`
+				: this.node.is_dynamic_element
+					? x`@set_dynamic_element_data(${this.node.tag_expr.manipulate(block)})`
+					: x`@set_attributes`;
 
-		if (this.node.is_dynamic_element) {
-			// call attribute bindings for custom element if tag is custom element
-			const tag = this.node.tag_expr.manipulate(block);
-			const attr_update = this.node.namespace === namespaces.svg
-				? b`${fn}(${this.var}, ${data});`
-				: b`
-					if (/-/.test(${tag})) {
-						@set_custom_element_data_map(${this.var}, ${data});
-					} else {
-						${fn}(${this.var}, ${data});
-					}`;
-			block.chunks.hydrate.push(attr_update);
-			block.chunks.update.push(b`
-				${data} = @get_spread_update(${levels}, [${updates}]);
-				${attr_update}`
-			);
-		} else {
-			block.chunks.hydrate.push(
-				b`${fn}(${this.var}, ${data});`
-			);
+		block.chunks.hydrate.push(
+			b`${fn}(${this.var}, ${data});`
+		);
 
+		if (this.has_dynamic_attribute) {
 			block.chunks.update.push(b`
 				${fn}(${this.var}, ${data} = @get_spread_update(${levels}, [
 					${updates}
@@ -905,6 +909,35 @@ export default class ElementWrapper extends Wrapper {
 		}
 	}
 
+	add_dynamic_element_attributes(block: Block) {
+		if (this.attributes.length === 0) return;
+
+		if (this.has_dynamic_attribute) {
+			this.add_spread_attributes(block);
+			return;
+		}
+
+		const static_attributes = [];
+		this.attributes.forEach((attr) => {
+			if (attr instanceof SpreadAttributeWrapper) {
+				static_attributes.push({ type: 'SpreadElement', argument: attr.node.expression.node });
+			} else {
+				const name = attr.property_name || attr.name;
+				static_attributes.push(p`${name}: ${attr.get_value(block)}`);
+			}
+		});
+		const fn =
+			this.node.namespace === namespaces.svg
+				? x`@set_svg_attributes`
+				: this.node.is_dynamic_element
+					? x`@set_dynamic_element_data(${this.node.tag_expr.manipulate(block)})`
+					: x`@set_attributes`;
+
+		block.chunks.hydrate.push(
+			b`${fn}(${this.var}, {${static_attributes}});`
+		);
+	}
+
 	add_transitions(block: Block) {
 		const { intro, outro } = this.node;
 		if (!intro && !outro) return;
@@ -1102,7 +1135,7 @@ export default class ElementWrapper extends Wrapper {
 
 			block.chunks.hydrate.push(updater);
 
-			if (has_spread || this.node.is_dynamic_element) {
+			if ((this.node.is_dynamic_element || has_spread) && this.has_dynamic_attribute) {
 				block.chunks.update.push(updater);
 			} else if ((dependencies && dependencies.size > 0) || this.class_dependencies.length) {
 				const all_dependencies = this.class_dependencies.concat(...dependencies);
diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index 23c0fdac51..e40df19c38 100644
--- a/src/runtime/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -332,6 +332,10 @@ export function set_custom_element_data(node, prop, value) {
 	}
 }
 
+export function set_dynamic_element_data(tag: string) {
+	return (/-/.test(tag)) ? set_custom_element_data_map : set_attributes;
+}
+
 export function xlink_attr(node, attribute, value) {
 	node.setAttributeNS('http://www.w3.org/1999/xlink', attribute, value);
 }
diff --git a/test/js/samples/svelte-element-event-handlers/expected.js b/test/js/samples/svelte-element-event-handlers/expected.js
index 2368c1bc2f..944a04f180 100644
--- a/test/js/samples/svelte-element-event-handlers/expected.js
+++ b/test/js/samples/svelte-element-event-handlers/expected.js
@@ -2,20 +2,16 @@
 import {
 	SvelteComponent,
 	append,
-	assign,
 	bubble,
 	detach,
 	element,
-	empty,
-	get_spread_update,
 	init,
 	insert,
 	listen,
 	noop,
 	run_all,
 	safe_not_equal,
-	set_attributes,
-	set_custom_element_data_map
+	set_dynamic_element_data
 } from "svelte/internal";
 
 function create_dynamic_element(ctx) {
@@ -23,36 +19,13 @@ function create_dynamic_element(ctx) {
 	let svelte_element0;
 	let mounted;
 	let dispose;
-	let svelte_element0_levels = [{ class: "inner" }];
-	let svelte_element0_data = {};
-
-	for (let i = 0; i < svelte_element0_levels.length; i += 1) {
-		svelte_element0_data = assign(svelte_element0_data, svelte_element0_levels[i]);
-	}
-
-	let svelte_element1_levels = [{ class: "outer" }];
-	let svelte_element1_data = {};
-
-	for (let i = 0; i < svelte_element1_levels.length; i += 1) {
-		svelte_element1_data = assign(svelte_element1_data, svelte_element1_levels[i]);
-	}
 
 	return {
 		c() {
 			svelte_element1 = element(a);
 			svelte_element0 = element(span);
-
-			if ((/-/).test(span)) {
-				set_custom_element_data_map(svelte_element0, svelte_element0_data);
-			} else {
-				set_attributes(svelte_element0, svelte_element0_data);
-			}
-
-			if ((/-/).test(a)) {
-				set_custom_element_data_map(svelte_element1, svelte_element1_data);
-			} else {
-				set_attributes(svelte_element1, svelte_element1_data);
-			}
+			set_dynamic_element_data(span)(svelte_element0, { class: "inner" });
+			set_dynamic_element_data(a)(svelte_element1, { class: "outer" });
 		},
 		m(target, anchor) {
 			insert(target, svelte_element1, anchor);
@@ -69,23 +42,7 @@ function create_dynamic_element(ctx) {
 				mounted = true;
 			}
 		},
-		p(ctx, dirty) {
-			svelte_element0_data = get_spread_update(svelte_element0_levels, [{ class: "inner" }]);
-
-			if ((/-/).test(span)) {
-				set_custom_element_data_map(svelte_element0, svelte_element0_data);
-			} else {
-				set_attributes(svelte_element0, svelte_element0_data);
-			}
-
-			svelte_element1_data = get_spread_update(svelte_element1_levels, [{ class: "outer" }]);
-
-			if ((/-/).test(a)) {
-				set_custom_element_data_map(svelte_element1, svelte_element1_data);
-			} else {
-				set_attributes(svelte_element1, svelte_element1_data);
-			}
-		},
+		p: noop,
 		d(detaching) {
 			if (detaching) detach(svelte_element1);
 			mounted = false;
@@ -95,45 +52,23 @@ function create_dynamic_element(ctx) {
 }
 
 function create_fragment(ctx) {
-	let previous_tag = a;
-	let svelte_element_anchor;
 	let svelte_element = a && create_dynamic_element(ctx);
 
 	return {
 		c() {
 			if (svelte_element) svelte_element.c();
-			svelte_element_anchor = empty();
 		},
 		m(target, anchor) {
 			if (svelte_element) svelte_element.m(target, anchor);
-			insert(target, svelte_element_anchor, anchor);
 		},
 		p(ctx, [dirty]) {
 			if (a) {
-				if (!previous_tag) {
-					svelte_element = create_dynamic_element(ctx);
-					previous_tag = a;
-					svelte_element.c();
-					svelte_element.m(svelte_element_anchor.parentNode, svelte_element_anchor);
-				} else if (safe_not_equal(previous_tag, a)) {
-					svelte_element.d(1);
-					svelte_element = create_dynamic_element(ctx);
-					previous_tag = a;
-					svelte_element.c();
-					svelte_element.m(svelte_element_anchor.parentNode, svelte_element_anchor);
-				} else {
-					svelte_element.p(ctx, dirty);
-				}
-			} else if (previous_tag) {
-				svelte_element.d(1);
-				svelte_element = null;
-				previous_tag = a;
+				svelte_element.p(ctx, dirty);
 			}
 		},
 		i: noop,
 		o: noop,
 		d(detaching) {
-			if (detaching) detach(svelte_element_anchor);
 			if (svelte_element) svelte_element.d(detaching);
 		}
 	};
@@ -169,4 +104,4 @@ class Component extends SvelteComponent {
 	}
 }
 
-export default Component;
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/svelte-element-svg/expected.js b/test/js/samples/svelte-element-svg/expected.js
index 9f93cc1234..550b55592d 100644
--- a/test/js/samples/svelte-element-svg/expected.js
+++ b/test/js/samples/svelte-element-svg/expected.js
@@ -2,10 +2,7 @@
 import {
 	SvelteComponent,
 	append,
-	assign,
 	detach,
-	empty,
-	get_spread_update,
 	init,
 	insert,
 	noop,
@@ -17,37 +14,19 @@ import {
 function create_dynamic_element(ctx) {
 	let svelte_element1;
 	let svelte_element0;
-	let svelte_element0_levels = [{ xmlns: "http://www.w3.org/2000/svg" }];
-	let svelte_element0_data = {};
-
-	for (let i = 0; i < svelte_element0_levels.length; i += 1) {
-		svelte_element0_data = assign(svelte_element0_data, svelte_element0_levels[i]);
-	}
-
-	let svelte_element1_levels = [{ xmlns: "http://www.w3.org/2000/svg" }];
-	let svelte_element1_data = {};
-
-	for (let i = 0; i < svelte_element1_levels.length; i += 1) {
-		svelte_element1_data = assign(svelte_element1_data, svelte_element1_levels[i]);
-	}
 
 	return {
 		c() {
 			svelte_element1 = svg_element(/*tag*/ ctx[0].svg);
 			svelte_element0 = svg_element(/*tag*/ ctx[0].path);
-			set_svg_attributes(svelte_element0, svelte_element0_data);
-			set_svg_attributes(svelte_element1, svelte_element1_data);
+			set_svg_attributes(svelte_element0, { xmlns: "http://www.w3.org/2000/svg" });
+			set_svg_attributes(svelte_element1, { xmlns: "http://www.w3.org/2000/svg" });
 		},
 		m(target, anchor) {
 			insert(target, svelte_element1, anchor);
 			append(svelte_element1, svelte_element0);
 		},
-		p(ctx, dirty) {
-			svelte_element0_data = get_spread_update(svelte_element0_levels, [{ xmlns: "http://www.w3.org/2000/svg" }]);
-			set_svg_attributes(svelte_element0, svelte_element0_data);
-			svelte_element1_data = get_spread_update(svelte_element1_levels, [{ xmlns: "http://www.w3.org/2000/svg" }]);
-			set_svg_attributes(svelte_element1, svelte_element1_data);
-		},
+		p: noop,
 		d(detaching) {
 			if (detaching) detach(svelte_element1);
 		}
@@ -55,45 +34,23 @@ function create_dynamic_element(ctx) {
 }
 
 function create_fragment(ctx) {
-	let previous_tag = /*tag*/ ctx[0].svg;
-	let svelte_element_anchor;
 	let svelte_element = /*tag*/ ctx[0].svg && create_dynamic_element(ctx);
 
 	return {
 		c() {
 			if (svelte_element) svelte_element.c();
-			svelte_element_anchor = empty();
 		},
 		m(target, anchor) {
 			if (svelte_element) svelte_element.m(target, anchor);
-			insert(target, svelte_element_anchor, anchor);
 		},
 		p(ctx, [dirty]) {
 			if (/*tag*/ ctx[0].svg) {
-				if (!previous_tag) {
-					svelte_element = create_dynamic_element(ctx);
-					previous_tag = /*tag*/ ctx[0].svg;
-					svelte_element.c();
-					svelte_element.m(svelte_element_anchor.parentNode, svelte_element_anchor);
-				} else if (safe_not_equal(previous_tag, /*tag*/ ctx[0].svg)) {
-					svelte_element.d(1);
-					svelte_element = create_dynamic_element(ctx);
-					previous_tag = /*tag*/ ctx[0].svg;
-					svelte_element.c();
-					svelte_element.m(svelte_element_anchor.parentNode, svelte_element_anchor);
-				} else {
-					svelte_element.p(ctx, dirty);
-				}
-			} else if (previous_tag) {
-				svelte_element.d(1);
-				svelte_element = null;
-				previous_tag = /*tag*/ ctx[0].svg;
+				svelte_element.p(ctx, dirty);
 			}
 		},
 		i: noop,
 		o: noop,
 		d(detaching) {
-			if (detaching) detach(svelte_element_anchor);
 			if (svelte_element) svelte_element.d(detaching);
 		}
 	};
@@ -111,4 +68,4 @@ class Component extends SvelteComponent {
 	}
 }
 
-export default Component;
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/svelte-element/expected.js b/test/js/samples/svelte-element/expected.js
new file mode 100644
index 0000000000..ae26744a3a
--- /dev/null
+++ b/test/js/samples/svelte-element/expected.js
@@ -0,0 +1,244 @@
+/* generated by Svelte vX.Y.Z */
+import {
+	SvelteComponent,
+	assign,
+	detach,
+	element,
+	empty,
+	get_spread_update,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	set_dynamic_element_data,
+	space,
+	toggle_class
+} from "svelte/internal";
+
+function create_dynamic_element_3(ctx) {
+	let svelte_element;
+
+	return {
+		c() {
+			svelte_element = element(static_value);
+			set_dynamic_element_data(static_value)(svelte_element, { static_value, ...static_obj });
+			toggle_class(svelte_element, "foo", static_value);
+		},
+		m(target, anchor) {
+			insert(target, svelte_element, anchor);
+		},
+		p: noop,
+		d(detaching) {
+			if (detaching) detach(svelte_element);
+		}
+	};
+}
+
+// (10:0) <svelte:element this={dynamic_value} {static_value} {...static_obj} class:foo={static_value} />
+function create_dynamic_element_2(ctx) {
+	let svelte_element;
+
+	return {
+		c() {
+			svelte_element = element(/*dynamic_value*/ ctx[0]);
+			set_dynamic_element_data(/*dynamic_value*/ ctx[0])(svelte_element, { static_value, ...static_obj });
+			toggle_class(svelte_element, "foo", static_value);
+		},
+		m(target, anchor) {
+			insert(target, svelte_element, anchor);
+		},
+		p: noop,
+		d(detaching) {
+			if (detaching) detach(svelte_element);
+		}
+	};
+}
+
+// (12:0) <svelte:element this={static_value} {dynamic_value} {...dynamic_obj} class:foo={dynamic_value} />
+function create_dynamic_element_1(ctx) {
+	let svelte_element;
+	let svelte_element_levels = [{ dynamic_value: /*dynamic_value*/ ctx[0] }, /*dynamic_obj*/ ctx[1]];
+	let svelte_element_data = {};
+
+	for (let i = 0; i < svelte_element_levels.length; i += 1) {
+		svelte_element_data = assign(svelte_element_data, svelte_element_levels[i]);
+	}
+
+	return {
+		c() {
+			svelte_element = element(static_value);
+			set_dynamic_element_data(static_value)(svelte_element, svelte_element_data);
+			toggle_class(svelte_element, "foo", /*dynamic_value*/ ctx[0]);
+		},
+		m(target, anchor) {
+			insert(target, svelte_element, anchor);
+		},
+		p(ctx, dirty) {
+			set_dynamic_element_data(static_value)(svelte_element, svelte_element_data = get_spread_update(svelte_element_levels, [
+				dirty & /*dynamic_value*/ 1 && { dynamic_value: /*dynamic_value*/ ctx[0] },
+				dirty & /*dynamic_obj*/ 2 && /*dynamic_obj*/ ctx[1]
+			]));
+
+			toggle_class(svelte_element, "foo", /*dynamic_value*/ ctx[0]);
+		},
+		d(detaching) {
+			if (detaching) detach(svelte_element);
+		}
+	};
+}
+
+// (14:0) <svelte:element this={dynamic_value} {dynamic_value} {...dynamic_obj} class:foo={dynamic_value} />
+function create_dynamic_element(ctx) {
+	let svelte_element;
+	let svelte_element_levels = [{ dynamic_value: /*dynamic_value*/ ctx[0] }, /*dynamic_obj*/ ctx[1]];
+	let svelte_element_data = {};
+
+	for (let i = 0; i < svelte_element_levels.length; i += 1) {
+		svelte_element_data = assign(svelte_element_data, svelte_element_levels[i]);
+	}
+
+	return {
+		c() {
+			svelte_element = element(/*dynamic_value*/ ctx[0]);
+			set_dynamic_element_data(/*dynamic_value*/ ctx[0])(svelte_element, svelte_element_data);
+			toggle_class(svelte_element, "foo", /*dynamic_value*/ ctx[0]);
+		},
+		m(target, anchor) {
+			insert(target, svelte_element, anchor);
+		},
+		p(ctx, dirty) {
+			set_dynamic_element_data(/*dynamic_value*/ ctx[0])(svelte_element, svelte_element_data = get_spread_update(svelte_element_levels, [
+				dirty & /*dynamic_value*/ 1 && { dynamic_value: /*dynamic_value*/ ctx[0] },
+				dirty & /*dynamic_obj*/ 2 && /*dynamic_obj*/ ctx[1]
+			]));
+
+			toggle_class(svelte_element, "foo", /*dynamic_value*/ ctx[0]);
+		},
+		d(detaching) {
+			if (detaching) detach(svelte_element);
+		}
+	};
+}
+
+function create_fragment(ctx) {
+	let t0;
+	let previous_tag = /*dynamic_value*/ ctx[0];
+	let t1;
+	let t2;
+	let previous_tag_1 = /*dynamic_value*/ ctx[0];
+	let svelte_element3_anchor;
+	let svelte_element0 = static_value && create_dynamic_element_3(ctx);
+	let svelte_element1 = /*dynamic_value*/ ctx[0] && create_dynamic_element_2(ctx);
+	let svelte_element2 = static_value && create_dynamic_element_1(ctx);
+	let svelte_element3 = /*dynamic_value*/ ctx[0] && create_dynamic_element(ctx);
+
+	return {
+		c() {
+			if (svelte_element0) svelte_element0.c();
+			t0 = space();
+			if (svelte_element1) svelte_element1.c();
+			t1 = space();
+			if (svelte_element2) svelte_element2.c();
+			t2 = space();
+			if (svelte_element3) svelte_element3.c();
+			svelte_element3_anchor = empty();
+		},
+		m(target, anchor) {
+			if (svelte_element0) svelte_element0.m(target, anchor);
+			insert(target, t0, anchor);
+			if (svelte_element1) svelte_element1.m(target, anchor);
+			insert(target, t1, anchor);
+			if (svelte_element2) svelte_element2.m(target, anchor);
+			insert(target, t2, anchor);
+			if (svelte_element3) svelte_element3.m(target, anchor);
+			insert(target, svelte_element3_anchor, anchor);
+		},
+		p(ctx, [dirty]) {
+			if (static_value) {
+				svelte_element0.p(ctx, dirty);
+			}
+
+			if (/*dynamic_value*/ ctx[0]) {
+				if (!previous_tag) {
+					svelte_element1 = create_dynamic_element_2(ctx);
+					previous_tag = /*dynamic_value*/ ctx[0];
+					svelte_element1.c();
+					svelte_element1.m(t1.parentNode, t1);
+				} else if (safe_not_equal(previous_tag, /*dynamic_value*/ ctx[0])) {
+					svelte_element1.d(1);
+					svelte_element1 = create_dynamic_element_2(ctx);
+					previous_tag = /*dynamic_value*/ ctx[0];
+					svelte_element1.c();
+					svelte_element1.m(t1.parentNode, t1);
+				} else {
+					svelte_element1.p(ctx, dirty);
+				}
+			} else if (previous_tag) {
+				svelte_element1.d(1);
+				svelte_element1 = null;
+				previous_tag = /*dynamic_value*/ ctx[0];
+			}
+
+			if (static_value) {
+				svelte_element2.p(ctx, dirty);
+			}
+
+			if (/*dynamic_value*/ ctx[0]) {
+				if (!previous_tag_1) {
+					svelte_element3 = create_dynamic_element(ctx);
+					previous_tag_1 = /*dynamic_value*/ ctx[0];
+					svelte_element3.c();
+					svelte_element3.m(svelte_element3_anchor.parentNode, svelte_element3_anchor);
+				} else if (safe_not_equal(previous_tag_1, /*dynamic_value*/ ctx[0])) {
+					svelte_element3.d(1);
+					svelte_element3 = create_dynamic_element(ctx);
+					previous_tag_1 = /*dynamic_value*/ ctx[0];
+					svelte_element3.c();
+					svelte_element3.m(svelte_element3_anchor.parentNode, svelte_element3_anchor);
+				} else {
+					svelte_element3.p(ctx, dirty);
+				}
+			} else if (previous_tag_1) {
+				svelte_element3.d(1);
+				svelte_element3 = null;
+				previous_tag_1 = /*dynamic_value*/ ctx[0];
+			}
+		},
+		i: noop,
+		o: noop,
+		d(detaching) {
+			if (svelte_element0) svelte_element0.d(detaching);
+			if (detaching) detach(t0);
+			if (svelte_element1) svelte_element1.d(detaching);
+			if (detaching) detach(t1);
+			if (svelte_element2) svelte_element2.d(detaching);
+			if (detaching) detach(t2);
+			if (detaching) detach(svelte_element3_anchor);
+			if (svelte_element3) svelte_element3.d(detaching);
+		}
+	};
+}
+
+let static_value = 'a';
+
+function instance($$self, $$props, $$invalidate) {
+	let { dynamic_value } = $$props;
+	let { dynamic_obj } = $$props;
+	let static_obj = {};
+
+	$$self.$$set = $$props => {
+		if ('dynamic_value' in $$props) $$invalidate(0, dynamic_value = $$props.dynamic_value);
+		if ('dynamic_obj' in $$props) $$invalidate(1, dynamic_obj = $$props.dynamic_obj);
+	};
+
+	return [dynamic_value, dynamic_obj, static_obj];
+}
+
+class Component extends SvelteComponent {
+	constructor(options) {
+		super();
+		init(this, options, instance, create_fragment, safe_not_equal, { dynamic_value: 0, dynamic_obj: 1 });
+	}
+}
+
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/svelte-element/input.svelte b/test/js/samples/svelte-element/input.svelte
new file mode 100644
index 0000000000..6fa0c65ebc
--- /dev/null
+++ b/test/js/samples/svelte-element/input.svelte
@@ -0,0 +1,14 @@
+<script>
+	export let dynamic_value;
+	export let dynamic_obj;
+	let static_value = 'a';
+	let static_obj = {};
+</script>
+
+<svelte:element this={static_value} {static_value} {...static_obj} class:foo={static_value} />
+
+<svelte:element this={dynamic_value} {static_value} {...static_obj} class:foo={static_value} />
+
+<svelte:element this={static_value} {dynamic_value} {...dynamic_obj} class:foo={dynamic_value} />
+
+<svelte:element this={dynamic_value} {dynamic_value} {...dynamic_obj} class:foo={dynamic_value} />
diff --git a/test/runtime/samples/class-with-spread-and-bind/main.svelte b/test/runtime/samples/class-with-spread-and-bind/main.svelte
index c7c24a2e7b..6efedef079 100644
--- a/test/runtime/samples/class-with-spread-and-bind/main.svelte
+++ b/test/runtime/samples/class-with-spread-and-bind/main.svelte
@@ -1,5 +1,5 @@
 <script>	
-	let primary = true;	
+	export let primary = true;
 	let elem;
 </script>
 

From f1c9168aefcd46501f99359b880ded1f81b007ed Mon Sep 17 00:00:00 2001
From: Tan Li Hau <tanhauhau@users.noreply.github.com>
Date: Tue, 28 Feb 2023 23:59:11 +0800
Subject: [PATCH 028/110] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fb3d751d6..5764be9f61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,7 +26,9 @@
 * 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)) 
+* 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))
+
 
 ## 3.55.1
 

From 60db05da86bf65e9b8e710b72b2d81c9efac2441 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 28 Feb 2023 17:01:40 +0100
Subject: [PATCH 029/110] fix: hide some a11y warnings for `<svelte:element>`
 tags (#8335)

Some a11y warnings only work on specific tags, which results in potential false positives for `<svelte:element>` tags - silence those
closes #7939
---
 src/compiler/compile/compiler_warnings.ts        |  4 ++--
 src/compiler/compile/nodes/Element.ts            | 11 ++++++-----
 .../a11y-aria-activedescendant/input.svelte      |  3 +--
 .../input.svelte                                 |  2 ++
 .../a11y-no-noninteractive-tabindex/input.svelte |  1 +
 .../warnings.json                                | 16 ++++++++--------
 .../input.svelte                                 |  1 +
 test/validator/samples/a11y-scope/input.svelte   |  7 ++++++-
 test/validator/samples/a11y-scope/warnings.json  |  4 ++--
 9 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/compiler/compile/compiler_warnings.ts b/src/compiler/compile/compiler_warnings.ts
index 817aabea02..d6b2dbc5aa 100644
--- a/src/compiler/compile/compiler_warnings.ts
+++ b/src/compiler/compile/compiler_warnings.ts
@@ -186,10 +186,10 @@ export default {
 		code: 'a11y-mouse-events-have-key-events',
 		message: `A11y: on:${event} must be accompanied by on:${accompanied_by}`
 	}),
-	a11y_click_events_have_key_events: () => ({
+	a11y_click_events_have_key_events: {
 		code: 'a11y-click-events-have-key-events',
 		message: 'A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.'
-	}),
+	},
 	a11y_missing_content: (name: string) => ({
 		code: 'a11y-missing-content',
 		message: `A11y: <${name}> element should have child content`
diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index ed1b9d64bf..4e43fe1824 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -550,7 +550,7 @@ export default class Element extends Node {
 				}
 
 				// aria-activedescendant-has-tabindex
-				if (name === 'aria-activedescendant' && !is_interactive_element(this.name, attribute_map) && !attribute_map.has('tabindex')) {
+				if (name === 'aria-activedescendant' && !this.is_dynamic_element && !is_interactive_element(this.name, attribute_map) && !attribute_map.has('tabindex')) {
 					component.warn(attribute, compiler_warnings.a11y_aria_activedescendant_has_tabindex);
 				}
 			}
@@ -590,7 +590,7 @@ export default class Element extends Node {
 						}
 
 						// role-has-required-aria-props
-						if (!is_semantic_role_element(current_role, this.name, attribute_map)) {
+						if (!this.is_dynamic_element && !is_semantic_role_element(current_role, this.name, attribute_map)) {
 							const role = roles.get(current_role);
 							if (role) {
 								const required_role_props = Object.keys(role.requiredProps);
@@ -622,7 +622,7 @@ export default class Element extends Node {
 			}
 
 			// scope
-			if (name === 'scope' && this.name !== 'th') {
+			if (name === 'scope' && !this.is_dynamic_element && this.name !== 'th') {
 				component.warn(attribute, compiler_warnings.a11y_misplaced_scope);
 			}
 
@@ -642,6 +642,7 @@ export default class Element extends Node {
 			const is_non_presentation_role = role?.is_static && !is_presentation_role(role.get_static_value() as ARIARoleDefintionKey);
 
 			if (
+				!this.is_dynamic_element && 
 				!is_hidden_from_screen_reader(this.name, attribute_map) &&
 				(!role || is_non_presentation_role) &&
 				!is_interactive_element(this.name, attribute_map) &&
@@ -655,14 +656,14 @@ export default class Element extends Node {
 				if (!has_key_event) {
 					component.warn(
 						this,
-						compiler_warnings.a11y_click_events_have_key_events()
+						compiler_warnings.a11y_click_events_have_key_events
 					);
 				}
 			}
 		}
 
 		// no-noninteractive-tabindex
-		if (!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 ARIARoleDefintionKey)) {
 			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);
diff --git a/test/validator/samples/a11y-aria-activedescendant/input.svelte b/test/validator/samples/a11y-aria-activedescendant/input.svelte
index 22570e8c50..24a2d59ac1 100644
--- a/test/validator/samples/a11y-aria-activedescendant/input.svelte
+++ b/test/validator/samples/a11y-aria-activedescendant/input.svelte
@@ -7,11 +7,10 @@
 <input aria-activedescendant="some-id" tabindex="0" />
 <input aria-activedescendant="some-id" tabindex={-1} />
 <input aria-activedescendant="some-id" tabindex="-1" />
-
+<svelte:element this={Math.random() ? 'input' : 'button'} aria-activedescendant="some-id" />
 <div />
 <div aria-activedescendant="some-id" role="tablist" tabindex={-1} />
 <div aria-activedescendant="some-id" role="tablist" tabindex="-1" />
 
 <!-- INVALID -->
 <div aria-activedescendant="some-id" />
-
diff --git a/test/validator/samples/a11y-click-events-have-key-events/input.svelte b/test/validator/samples/a11y-click-events-have-key-events/input.svelte
index a63ea92fbc..8737f04ec5 100644
--- a/test/validator/samples/a11y-click-events-have-key-events/input.svelte
+++ b/test/validator/samples/a11y-click-events-have-key-events/input.svelte
@@ -47,3 +47,5 @@
 <div on:click={noop} role="presentation" />
 <div on:click={noop} role="none" />
 <div on:click={noop} role={dynamicRole} />
+
+<svelte:element this={Math.random() ? 'button' : 'div'} on:click={noop} />
diff --git a/test/validator/samples/a11y-no-noninteractive-tabindex/input.svelte b/test/validator/samples/a11y-no-noninteractive-tabindex/input.svelte
index 9efed4d879..3b1fd14120 100644
--- a/test/validator/samples/a11y-no-noninteractive-tabindex/input.svelte
+++ b/test/validator/samples/a11y-no-noninteractive-tabindex/input.svelte
@@ -8,6 +8,7 @@
 <div role='article' tabindex='-1' />
 <article tabindex='-1' />
 <div role="tabpanel" tabindex='0' />
+<svelte:element this={Math.random() ? 'button' : 'div'} tabindex="0" />
 <!-- invalid -->
 <div tabindex='0' />
 <div role='article' tabindex='0' />
diff --git a/test/validator/samples/a11y-no-noninteractive-tabindex/warnings.json b/test/validator/samples/a11y-no-noninteractive-tabindex/warnings.json
index 69c68c48bd..73f00429df 100644
--- a/test/validator/samples/a11y-no-noninteractive-tabindex/warnings.json
+++ b/test/validator/samples/a11y-no-noninteractive-tabindex/warnings.json
@@ -3,48 +3,48 @@
 		"code": "a11y-no-noninteractive-tabindex",
 		"end": {
 			"column": 20,
-			"line": 12
+			"line": 13
 		},
 		"message": "A11y: noninteractive element cannot have nonnegative tabIndex value",
 		"start": {
 			"column": 0,
-			"line": 12
+			"line": 13
 		}
 	},
 	{
 		"code": "a11y-no-noninteractive-tabindex",
 		"end": {
 			"column": 35,
-			"line": 13
+			"line": 14
 		},
 		"message": "A11y: noninteractive element cannot have nonnegative tabIndex value",
 		"start": {
 			"column": 0,
-			"line": 13
+			"line": 14
 		}
 	},
 	{
 		"code": "a11y-no-noninteractive-tabindex",
 		"end": {
 			"column": 24,
-			"line": 14
+			"line": 15
 		},
 		"message": "A11y: noninteractive element cannot have nonnegative tabIndex value",
 		"start": {
 			"column": 0,
-			"line": 14
+			"line": 15
 		}
 	},
 	{
 		"code": "a11y-no-noninteractive-tabindex",
 		"end": {
 			"column": 26,
-			"line": 15
+			"line": 16
 		},
 		"message": "A11y: noninteractive element cannot have nonnegative tabIndex value",
 		"start": {
 			"column": 0,
-			"line": 15
+			"line": 16
 		}
 	}
 ]
diff --git a/test/validator/samples/a11y-role-has-required-aria-props/input.svelte b/test/validator/samples/a11y-role-has-required-aria-props/input.svelte
index 8f72ff04bf..e2afc62029 100644
--- a/test/validator/samples/a11y-role-has-required-aria-props/input.svelte
+++ b/test/validator/samples/a11y-role-has-required-aria-props/input.svelte
@@ -8,3 +8,4 @@
 <div role="meter" aria-valuenow="50" aria-valuemin="0" aria-valuemax="100"></div>
 <div role="scrollbar" aria-controls="panel" aria-valuenow="50"></div>
 <input role="switch" type="checkbox" />
+<svelte:element this={Math.random() ? 'input' : 'div'} role="checkbox" />
diff --git a/test/validator/samples/a11y-scope/input.svelte b/test/validator/samples/a11y-scope/input.svelte
index b7738ba7da..bcc496d9b3 100644
--- a/test/validator/samples/a11y-scope/input.svelte
+++ b/test/validator/samples/a11y-scope/input.svelte
@@ -1 +1,6 @@
-<div scope/>
\ No newline at end of file
+<!-- valid -->
+<th scope />
+<svelte:element this={Math.random() ? 'th' : 'td'} scope />
+
+<!-- invalid -->
+<div scope/>
diff --git a/test/validator/samples/a11y-scope/warnings.json b/test/validator/samples/a11y-scope/warnings.json
index b794afcb73..b8e36cef5d 100644
--- a/test/validator/samples/a11y-scope/warnings.json
+++ b/test/validator/samples/a11y-scope/warnings.json
@@ -3,11 +3,11 @@
 		"code": "a11y-misplaced-scope",
 		"message": "A11y: The scope attribute should only be used with <th> elements",
 		"start": {
-			"line": 1,
+			"line": 6,
 			"column": 5
 		},
 		"end": {
-			"line": 1,
+			"line": 6,
 			"column": 10
 		}
 	}

From dc7fd76e53986238228ddad20fbc536de17568e3 Mon Sep 17 00:00:00 2001
From: Tan Li Hau <tanhauhau@users.noreply.github.com>
Date: Wed, 1 Mar 2023 00:03:06 +0800
Subject: [PATCH 030/110] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5764be9f61..05ed4d9cfc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 	* `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))

From aa15a64cbefff009073fc298b5df679bf385f9c8 Mon Sep 17 00:00:00 2001
From: lidlanca <8693091+lidlanca@users.noreply.github.com>
Date: Tue, 28 Feb 2023 12:16:55 -0500
Subject: [PATCH 031/110] fix: account for `<template>` tag in `{@html}`
 (#7364)

Ensure innerHTML for template is done on template element
fixes #7315
fixes #7319

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 src/runtime/internal/dom.ts               |  9 +++++----
 test/runtime/samples/template/_config.js  | 12 ++++++++++++
 test/runtime/samples/template/main.svelte |  3 ++-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index e40df19c38..1f87e91910 100644
--- a/src/runtime/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -698,7 +698,7 @@ export class HtmlTag {
 	// html tag nodes
 	n: ChildNode[];
 	// target
-	t: HTMLElement | SVGElement;
+	t: HTMLElement | SVGElement | DocumentFragment;
 	// anchor
 	a: HTMLElement | SVGElement;
 
@@ -718,8 +718,9 @@ export class HtmlTag {
 	) {
 		if (!this.e) {
 			if (this.is_svg) this.e = svg_element(target.nodeName as keyof SVGElementTagNameMap);
-			else this.e = element(target.nodeName as keyof HTMLElementTagNameMap);
-			this.t = target;
+			/** #7364  target for <template> may be provided as #document-fragment(11) */
+			else this.e = element((target.nodeType === 11 ? 'TEMPLATE' :  target.nodeName) as keyof HTMLElementTagNameMap);
+			this.t = target.tagName !== 'TEMPLATE' ? target : (target as HTMLTemplateElement).content;
 			this.c(html);
 		}
 
@@ -728,7 +729,7 @@ export class HtmlTag {
 
 	h(html: string) {
 		this.e.innerHTML = html;
-		this.n = Array.from(this.e.childNodes);
+		this.n = Array.from(this.e.nodeName === 'TEMPLATE' ? (this.e as HTMLTemplateElement).content.childNodes : this.e.childNodes);
 	}
 
 	i(anchor) {
diff --git a/test/runtime/samples/template/_config.js b/test/runtime/samples/template/_config.js
index 6e92d771bd..2a65b78716 100644
--- a/test/runtime/samples/template/_config.js
+++ b/test/runtime/samples/template/_config.js
@@ -6,6 +6,7 @@ export default {
 	    <div>foo</div>
 	</template>
 	<template id="t2">123</template>
+	<template id="t3">1<b>B</b>1</template>
 	`,
 
 	test({ assert, target }) {
@@ -27,5 +28,16 @@ export default {
 		assert.equal(template2.content.firstChild.textContent, '123');
 		assert.htmlEqual(template2.innerHTML, '123');
 
+		const template3 = target.querySelector('#t3');
+		assert.equal(template3.childNodes.length, 0); 
+		assert.equal(template3.content.childNodes.length, 3);
+		// test: (with hydration from ssr rendered html)
+		// out of order render.
+		// <template>1{@html '2'}3</template>  may render as <template>321</template> for ssr+hydration case.
+		// we bypass it by using symmetric siblings. hence <template> is not fully stable for this edge case.
+		assert.equal(template3.content.childNodes[0].textContent, '1');
+		assert.equal(template3.content.childNodes[1].outerHTML, '<b>B</b>');
+		assert.equal(template3.content.childNodes[2].textContent, '1');
+
 	}
 };
diff --git a/test/runtime/samples/template/main.svelte b/test/runtime/samples/template/main.svelte
index 2e2f5b6c29..1fb0d65f47 100644
--- a/test/runtime/samples/template/main.svelte
+++ b/test/runtime/samples/template/main.svelte
@@ -1,4 +1,5 @@
 <template id="t1">
 	<div>foo</div>
 </template>
-<template id="t2">123</template>
\ No newline at end of file
+<template id="t2">123</template>
+<template id="t3">1{@html '<b>B</b>'}1</template>
\ No newline at end of file

From f34abc568920265b848228c32d67eae10f1b589f Mon Sep 17 00:00:00 2001
From: xxkl1 <84455605+xxkl1@users.noreply.github.com>
Date: Wed, 1 Mar 2023 01:21:39 +0800
Subject: [PATCH 032/110] fix: decode html entities correctly (#8047)

fixes #8026

1. replace the big entities list with entities that have a ; at the end where valid (there are some exceptions)
2. construct two regexes from that entities list: one for HTML where it's strictly matched, one for attributes where it tries to match browser behavior by also allowing = / digit / character afterwards
3. decode character references with one of these regexes depending on this is an attribute value or not

---------

Co-authored-by: Yuichiro Yamashita <xydybaseball@gmail.com>
---
 src/compiler/parse/state/tag.ts               |    2 +-
 src/compiler/parse/state/text.ts              |    2 +-
 src/compiler/parse/utils/entities.ts          | 4054 +++++++++--------
 src/compiler/parse/utils/html.ts              |   30 +-
 .../_config.js                                |   19 +
 .../main.svelte                               |   15 +
 test/runtime/samples/html-entities/_config.js |   16 +-
 .../runtime/samples/html-entities/main.svelte |   16 +-
 8 files changed, 2218 insertions(+), 1936 deletions(-)
 create mode 100644 test/runtime/samples/html-entities-inside-attributes/_config.js
 create mode 100644 test/runtime/samples/html-entities-inside-attributes/main.svelte

diff --git a/src/compiler/parse/state/tag.ts b/src/compiler/parse/state/tag.ts
index efcff645a7..cbd3213f53 100644
--- a/src/compiler/parse/state/tag.ts
+++ b/src/compiler/parse/state/tag.ts
@@ -519,7 +519,7 @@ function read_sequence(parser: Parser, done: () => boolean, location: string): T
 
 	function flush(end: number) {
 		if (current_chunk.raw) {
-			current_chunk.data = decode_character_references(current_chunk.raw);
+			current_chunk.data = decode_character_references(current_chunk.raw, true);
 			current_chunk.end = end;
 			chunks.push(current_chunk);
 		}
diff --git a/src/compiler/parse/state/text.ts b/src/compiler/parse/state/text.ts
index a2275c9653..dc99d9ed03 100644
--- a/src/compiler/parse/state/text.ts
+++ b/src/compiler/parse/state/text.ts
@@ -19,7 +19,7 @@ export default function text(parser: Parser) {
 		end: parser.index,
 		type: 'Text',
 		raw: data,
-		data: decode_character_references(data)
+		data: decode_character_references(data, false)
 	};
 
 	parser.current().children.push(node);
diff --git a/src/compiler/parse/utils/entities.ts b/src/compiler/parse/utils/entities.ts
index 7b43ced2c1..df496cda4d 100644
--- a/src/compiler/parse/utils/entities.ts
+++ b/src/compiler/parse/utils/entities.ts
@@ -1,2034 +1,2234 @@
-// https://dev.w3.org/html5/html-author/charref
+// https://html.spec.whatwg.org/entities.json from https://dev.w3.org/html5/html-author/charref
 export default {
-	CounterClockwiseContourIntegral: 8755,
-	ClockwiseContourIntegral: 8754,
-	DoubleLongLeftRightArrow: 10234,
-	DiacriticalDoubleAcute: 733,
-	NotSquareSupersetEqual: 8931,
-	CloseCurlyDoubleQuote: 8221,
-	DoubleContourIntegral: 8751,
-	FilledVerySmallSquare: 9642,
-	NegativeVeryThinSpace: 8203,
-	NotPrecedesSlantEqual: 8928,
-	NotRightTriangleEqual: 8941,
-	NotSucceedsSlantEqual: 8929,
-	CapitalDifferentialD: 8517,
-	DoubleLeftRightArrow: 8660,
-	DoubleLongRightArrow: 10233,
-	EmptyVerySmallSquare: 9643,
-	NestedGreaterGreater: 8811,
-	NotDoubleVerticalBar: 8742,
-	NotLeftTriangleEqual: 8940,
-	NotSquareSubsetEqual: 8930,
-	OpenCurlyDoubleQuote: 8220,
-	ReverseUpEquilibrium: 10607,
-	DoubleLongLeftArrow: 10232,
-	DownLeftRightVector: 10576,
-	LeftArrowRightArrow: 8646,
-	NegativeMediumSpace: 8203,
-	RightArrowLeftArrow: 8644,
-	SquareSupersetEqual: 8850,
-	leftrightsquigarrow: 8621,
-	DownRightTeeVector: 10591,
-	DownRightVectorBar: 10583,
-	LongLeftRightArrow: 10231,
-	Longleftrightarrow: 10234,
-	NegativeThickSpace: 8203,
-	PrecedesSlantEqual: 8828,
-	ReverseEquilibrium: 8651,
-	RightDoubleBracket: 10215,
-	RightDownTeeVector: 10589,
-	RightDownVectorBar: 10581,
-	RightTriangleEqual: 8885,
-	SquareIntersection: 8851,
-	SucceedsSlantEqual: 8829,
-	blacktriangleright: 9656,
-	longleftrightarrow: 10231,
-	DoubleUpDownArrow: 8661,
-	DoubleVerticalBar: 8741,
-	DownLeftTeeVector: 10590,
-	DownLeftVectorBar: 10582,
-	FilledSmallSquare: 9724,
-	GreaterSlantEqual: 10878,
-	LeftDoubleBracket: 10214,
-	LeftDownTeeVector: 10593,
-	LeftDownVectorBar: 10585,
-	LeftTriangleEqual: 8884,
-	NegativeThinSpace: 8203,
-	NotReverseElement: 8716,
-	NotTildeFullEqual: 8775,
-	RightAngleBracket: 10217,
-	RightUpDownVector: 10575,
-	SquareSubsetEqual: 8849,
-	VerticalSeparator: 10072,
-	blacktriangledown: 9662,
-	blacktriangleleft: 9666,
-	leftrightharpoons: 8651,
-	rightleftharpoons: 8652,
-	twoheadrightarrow: 8608,
-	DiacriticalAcute: 180,
-	DiacriticalGrave: 96,
-	DiacriticalTilde: 732,
-	DoubleRightArrow: 8658,
-	DownArrowUpArrow: 8693,
-	EmptySmallSquare: 9723,
-	GreaterEqualLess: 8923,
-	GreaterFullEqual: 8807,
-	LeftAngleBracket: 10216,
-	LeftUpDownVector: 10577,
-	LessEqualGreater: 8922,
-	NonBreakingSpace: 160,
-	NotRightTriangle: 8939,
-	NotSupersetEqual: 8841,
-	RightTriangleBar: 10704,
-	RightUpTeeVector: 10588,
-	RightUpVectorBar: 10580,
-	UnderParenthesis: 9181,
-	UpArrowDownArrow: 8645,
-	circlearrowright: 8635,
-	downharpoonright: 8642,
-	ntrianglerighteq: 8941,
-	rightharpoondown: 8641,
-	rightrightarrows: 8649,
-	twoheadleftarrow: 8606,
-	vartriangleright: 8883,
-	CloseCurlyQuote: 8217,
-	ContourIntegral: 8750,
-	DoubleDownArrow: 8659,
-	DoubleLeftArrow: 8656,
-	DownRightVector: 8641,
-	LeftRightVector: 10574,
-	LeftTriangleBar: 10703,
-	LeftUpTeeVector: 10592,
-	LeftUpVectorBar: 10584,
-	LowerRightArrow: 8600,
-	NotGreaterEqual: 8817,
-	NotGreaterTilde: 8821,
-	NotLeftTriangle: 8938,
-	OverParenthesis: 9180,
-	RightDownVector: 8642,
-	ShortRightArrow: 8594,
-	UpperRightArrow: 8599,
-	bigtriangledown: 9661,
-	circlearrowleft: 8634,
-	curvearrowright: 8631,
-	downharpoonleft: 8643,
-	leftharpoondown: 8637,
-	leftrightarrows: 8646,
-	nLeftrightarrow: 8654,
-	nleftrightarrow: 8622,
-	ntrianglelefteq: 8940,
-	rightleftarrows: 8644,
-	rightsquigarrow: 8605,
-	rightthreetimes: 8908,
-	straightepsilon: 1013,
-	trianglerighteq: 8885,
-	vartriangleleft: 8882,
-	DiacriticalDot: 729,
-	DoubleRightTee: 8872,
-	DownLeftVector: 8637,
-	GreaterGreater: 10914,
-	HorizontalLine: 9472,
-	InvisibleComma: 8291,
-	InvisibleTimes: 8290,
-	LeftDownVector: 8643,
-	LeftRightArrow: 8596,
-	Leftrightarrow: 8660,
-	LessSlantEqual: 10877,
-	LongRightArrow: 10230,
-	Longrightarrow: 10233,
-	LowerLeftArrow: 8601,
-	NestedLessLess: 8810,
-	NotGreaterLess: 8825,
-	NotLessGreater: 8824,
-	NotSubsetEqual: 8840,
-	NotVerticalBar: 8740,
-	OpenCurlyQuote: 8216,
-	ReverseElement: 8715,
-	RightTeeVector: 10587,
-	RightVectorBar: 10579,
-	ShortDownArrow: 8595,
-	ShortLeftArrow: 8592,
-	SquareSuperset: 8848,
-	TildeFullEqual: 8773,
-	UpperLeftArrow: 8598,
-	ZeroWidthSpace: 8203,
-	curvearrowleft: 8630,
-	doublebarwedge: 8966,
-	downdownarrows: 8650,
-	hookrightarrow: 8618,
-	leftleftarrows: 8647,
-	leftrightarrow: 8596,
-	leftthreetimes: 8907,
-	longrightarrow: 10230,
-	looparrowright: 8620,
-	nshortparallel: 8742,
-	ntriangleright: 8939,
-	rightarrowtail: 8611,
-	rightharpoonup: 8640,
-	trianglelefteq: 8884,
-	upharpoonright: 8638,
-	ApplyFunction: 8289,
-	DifferentialD: 8518,
-	DoubleLeftTee: 10980,
-	DoubleUpArrow: 8657,
-	LeftTeeVector: 10586,
-	LeftVectorBar: 10578,
-	LessFullEqual: 8806,
-	LongLeftArrow: 10229,
-	Longleftarrow: 10232,
-	NotTildeEqual: 8772,
-	NotTildeTilde: 8777,
-	Poincareplane: 8460,
-	PrecedesEqual: 10927,
-	PrecedesTilde: 8830,
-	RightArrowBar: 8677,
-	RightTeeArrow: 8614,
-	RightTriangle: 8883,
-	RightUpVector: 8638,
-	SucceedsEqual: 10928,
-	SucceedsTilde: 8831,
-	SupersetEqual: 8839,
-	UpEquilibrium: 10606,
-	VerticalTilde: 8768,
-	VeryThinSpace: 8202,
-	bigtriangleup: 9651,
-	blacktriangle: 9652,
-	divideontimes: 8903,
-	fallingdotseq: 8786,
-	hookleftarrow: 8617,
-	leftarrowtail: 8610,
-	leftharpoonup: 8636,
-	longleftarrow: 10229,
-	looparrowleft: 8619,
-	measuredangle: 8737,
-	ntriangleleft: 8938,
-	shortparallel: 8741,
-	smallsetminus: 8726,
-	triangleright: 9657,
-	upharpoonleft: 8639,
-	DownArrowBar: 10515,
-	DownTeeArrow: 8615,
-	ExponentialE: 8519,
-	GreaterEqual: 8805,
-	GreaterTilde: 8819,
-	HilbertSpace: 8459,
-	HumpDownHump: 8782,
-	Intersection: 8898,
-	LeftArrowBar: 8676,
-	LeftTeeArrow: 8612,
-	LeftTriangle: 8882,
-	LeftUpVector: 8639,
-	NotCongruent: 8802,
-	NotLessEqual: 8816,
-	NotLessTilde: 8820,
-	Proportional: 8733,
-	RightCeiling: 8969,
-	RoundImplies: 10608,
-	ShortUpArrow: 8593,
-	SquareSubset: 8847,
-	UnderBracket: 9141,
-	VerticalLine: 124,
-	blacklozenge: 10731,
-	exponentiale: 8519,
-	risingdotseq: 8787,
-	triangledown: 9663,
-	triangleleft: 9667,
-	CircleMinus: 8854,
-	CircleTimes: 8855,
-	Equilibrium: 8652,
-	GreaterLess: 8823,
-	LeftCeiling: 8968,
-	LessGreater: 8822,
-	MediumSpace: 8287,
-	NotPrecedes: 8832,
-	NotSucceeds: 8833,
-	OverBracket: 9140,
-	RightVector: 8640,
-	Rrightarrow: 8667,
-	RuleDelayed: 10740,
-	SmallCircle: 8728,
-	SquareUnion: 8852,
-	SubsetEqual: 8838,
-	UpDownArrow: 8597,
-	Updownarrow: 8661,
-	VerticalBar: 8739,
-	backepsilon: 1014,
-	blacksquare: 9642,
-	circledcirc: 8858,
-	circleddash: 8861,
-	curlyeqprec: 8926,
-	curlyeqsucc: 8927,
-	diamondsuit: 9830,
-	eqslantless: 10901,
-	expectation: 8496,
-	nRightarrow: 8655,
-	nrightarrow: 8603,
-	preccurlyeq: 8828,
-	precnapprox: 10937,
-	quaternions: 8461,
-	straightphi: 981,
-	succcurlyeq: 8829,
-	succnapprox: 10938,
-	thickapprox: 8776,
-	updownarrow: 8597,
-	Bernoullis: 8492,
-	CirclePlus: 8853,
-	EqualTilde: 8770,
-	Fouriertrf: 8497,
-	ImaginaryI: 8520,
-	Laplacetrf: 8466,
-	LeftVector: 8636,
-	Lleftarrow: 8666,
-	NotElement: 8713,
-	NotGreater: 8815,
-	Proportion: 8759,
-	RightArrow: 8594,
-	RightFloor: 8971,
-	Rightarrow: 8658,
-	TildeEqual: 8771,
-	TildeTilde: 8776,
-	UnderBrace: 9183,
-	UpArrowBar: 10514,
-	UpTeeArrow: 8613,
-	circledast: 8859,
-	complement: 8705,
-	curlywedge: 8911,
-	eqslantgtr: 10902,
-	gtreqqless: 10892,
-	lessapprox: 10885,
-	lesseqqgtr: 10891,
-	lmoustache: 9136,
-	longmapsto: 10236,
-	mapstodown: 8615,
-	mapstoleft: 8612,
-	nLeftarrow: 8653,
-	nleftarrow: 8602,
-	precapprox: 10935,
-	rightarrow: 8594,
-	rmoustache: 9137,
-	sqsubseteq: 8849,
-	sqsupseteq: 8850,
-	subsetneqq: 10955,
-	succapprox: 10936,
-	supsetneqq: 10956,
-	upuparrows: 8648,
-	varepsilon: 949,
-	varnothing: 8709,
-	Backslash: 8726,
-	CenterDot: 183,
-	CircleDot: 8857,
-	Congruent: 8801,
-	Coproduct: 8720,
-	DoubleDot: 168,
-	DownArrow: 8595,
-	DownBreve: 785,
-	Downarrow: 8659,
-	HumpEqual: 8783,
-	LeftArrow: 8592,
-	LeftFloor: 8970,
-	Leftarrow: 8656,
-	LessTilde: 8818,
-	Mellintrf: 8499,
-	MinusPlus: 8723,
-	NotCupCap: 8813,
-	NotExists: 8708,
-	OverBrace: 9182,
-	PlusMinus: 177,
-	Therefore: 8756,
-	ThinSpace: 8201,
-	TripleDot: 8411,
-	UnionPlus: 8846,
-	backprime: 8245,
-	backsimeq: 8909,
-	bigotimes: 10754,
-	centerdot: 183,
-	checkmark: 10003,
-	complexes: 8450,
-	dotsquare: 8865,
-	downarrow: 8595,
-	gtrapprox: 10886,
-	gtreqless: 8923,
-	heartsuit: 9829,
-	leftarrow: 8592,
-	lesseqgtr: 8922,
-	nparallel: 8742,
-	nshortmid: 8740,
-	nsubseteq: 8840,
-	nsupseteq: 8841,
-	pitchfork: 8916,
-	rationals: 8474,
-	spadesuit: 9824,
-	subseteqq: 10949,
-	subsetneq: 8842,
-	supseteqq: 10950,
-	supsetneq: 8843,
-	therefore: 8756,
-	triangleq: 8796,
-	varpropto: 8733,
-	DDotrahd: 10513,
-	DotEqual: 8784,
-	Integral: 8747,
-	LessLess: 10913,
-	NotEqual: 8800,
-	NotTilde: 8769,
-	PartialD: 8706,
-	Precedes: 8826,
-	RightTee: 8866,
-	Succeeds: 8827,
-	SuchThat: 8715,
-	Superset: 8835,
-	Uarrocir: 10569,
-	UnderBar: 818,
-	andslope: 10840,
-	angmsdaa: 10664,
-	angmsdab: 10665,
-	angmsdac: 10666,
-	angmsdad: 10667,
-	angmsdae: 10668,
-	angmsdaf: 10669,
-	angmsdag: 10670,
-	angmsdah: 10671,
-	angrtvbd: 10653,
-	approxeq: 8778,
-	awconint: 8755,
-	backcong: 8780,
-	barwedge: 8965,
-	bbrktbrk: 9142,
-	bigoplus: 10753,
-	bigsqcup: 10758,
-	biguplus: 10756,
-	bigwedge: 8896,
-	boxminus: 8863,
-	boxtimes: 8864,
-	capbrcup: 10825,
-	circledR: 174,
-	circledS: 9416,
-	cirfnint: 10768,
-	clubsuit: 9827,
-	cupbrcap: 10824,
-	curlyvee: 8910,
-	cwconint: 8754,
-	doteqdot: 8785,
-	dotminus: 8760,
-	drbkarow: 10512,
-	dzigrarr: 10239,
-	elinters: 9191,
-	emptyset: 8709,
-	eqvparsl: 10725,
-	fpartint: 10765,
-	geqslant: 10878,
-	gesdotol: 10884,
-	gnapprox: 10890,
-	hksearow: 10533,
-	hkswarow: 10534,
-	imagline: 8464,
-	imagpart: 8465,
-	infintie: 10717,
-	integers: 8484,
-	intercal: 8890,
-	intlarhk: 10775,
-	laemptyv: 10676,
-	ldrushar: 10571,
-	leqslant: 10877,
-	lesdotor: 10883,
-	llcorner: 8990,
-	lnapprox: 10889,
-	lrcorner: 8991,
-	lurdshar: 10570,
-	mapstoup: 8613,
-	multimap: 8888,
-	naturals: 8469,
-	otimesas: 10806,
-	parallel: 8741,
-	plusacir: 10787,
-	pointint: 10773,
-	precneqq: 10933,
-	precnsim: 8936,
-	profalar: 9006,
-	profline: 8978,
-	profsurf: 8979,
-	raemptyv: 10675,
-	realpart: 8476,
-	rppolint: 10770,
-	rtriltri: 10702,
-	scpolint: 10771,
-	setminus: 8726,
-	shortmid: 8739,
-	smeparsl: 10724,
-	sqsubset: 8847,
-	sqsupset: 8848,
-	subseteq: 8838,
-	succneqq: 10934,
-	succnsim: 8937,
-	supseteq: 8839,
-	thetasym: 977,
-	thicksim: 8764,
-	timesbar: 10801,
-	triangle: 9653,
-	triminus: 10810,
-	trpezium: 9186,
-	ulcorner: 8988,
-	urcorner: 8989,
-	varkappa: 1008,
-	varsigma: 962,
-	vartheta: 977,
-	Because: 8757,
-	Cayleys: 8493,
-	Cconint: 8752,
-	Cedilla: 184,
-	Diamond: 8900,
-	DownTee: 8868,
-	Element: 8712,
-	Epsilon: 917,
-	Implies: 8658,
-	LeftTee: 8867,
-	NewLine: 10,
-	NoBreak: 8288,
-	NotLess: 8814,
-	Omicron: 927,
-	OverBar: 175,
-	Product: 8719,
-	UpArrow: 8593,
-	Uparrow: 8657,
-	Upsilon: 933,
-	alefsym: 8501,
-	angrtvb: 8894,
-	angzarr: 9084,
-	asympeq: 8781,
-	backsim: 8765,
-	because: 8757,
-	bemptyv: 10672,
-	between: 8812,
-	bigcirc: 9711,
-	bigodot: 10752,
-	bigstar: 9733,
-	boxplus: 8862,
-	ccupssm: 10832,
-	cemptyv: 10674,
-	cirscir: 10690,
-	coloneq: 8788,
-	congdot: 10861,
-	cudarrl: 10552,
-	cudarrr: 10549,
-	cularrp: 10557,
-	curarrm: 10556,
-	dbkarow: 10511,
-	ddagger: 8225,
-	ddotseq: 10871,
-	demptyv: 10673,
-	diamond: 8900,
-	digamma: 989,
-	dotplus: 8724,
-	dwangle: 10662,
-	epsilon: 949,
-	eqcolon: 8789,
-	equivDD: 10872,
-	gesdoto: 10882,
-	gtquest: 10876,
-	gtrless: 8823,
-	harrcir: 10568,
-	intprod: 10812,
-	isindot: 8949,
-	larrbfs: 10527,
-	larrsim: 10611,
-	lbrksld: 10639,
-	lbrkslu: 10637,
-	ldrdhar: 10599,
-	lesdoto: 10881,
-	lessdot: 8918,
-	lessgtr: 8822,
-	lesssim: 8818,
-	lotimes: 10804,
-	lozenge: 9674,
-	ltquest: 10875,
-	luruhar: 10598,
-	maltese: 10016,
-	minusdu: 10794,
-	napprox: 8777,
-	natural: 9838,
-	nearrow: 8599,
-	nexists: 8708,
-	notinva: 8713,
-	notinvb: 8951,
-	notinvc: 8950,
-	notniva: 8716,
-	notnivb: 8958,
-	notnivc: 8957,
-	npolint: 10772,
-	nsqsube: 8930,
-	nsqsupe: 8931,
-	nvinfin: 10718,
-	nwarrow: 8598,
-	olcross: 10683,
-	omicron: 959,
-	orderof: 8500,
-	orslope: 10839,
-	pertenk: 8241,
-	planckh: 8462,
-	pluscir: 10786,
-	plussim: 10790,
-	plustwo: 10791,
-	precsim: 8830,
-	quatint: 10774,
-	questeq: 8799,
-	rarrbfs: 10528,
-	rarrsim: 10612,
-	rbrksld: 10638,
-	rbrkslu: 10640,
-	rdldhar: 10601,
-	realine: 8475,
-	rotimes: 10805,
-	ruluhar: 10600,
-	searrow: 8600,
-	simplus: 10788,
-	simrarr: 10610,
-	subedot: 10947,
-	submult: 10945,
-	subplus: 10943,
-	subrarr: 10617,
-	succsim: 8831,
-	supdsub: 10968,
-	supedot: 10948,
-	suphsub: 10967,
-	suplarr: 10619,
-	supmult: 10946,
-	supplus: 10944,
-	swarrow: 8601,
-	topfork: 10970,
-	triplus: 10809,
-	tritime: 10811,
-	uparrow: 8593,
-	upsilon: 965,
-	uwangle: 10663,
-	vzigzag: 10650,
-	zigrarr: 8669,
+	'CounterClockwiseContourIntegral;': 8755,
+	'ClockwiseContourIntegral;': 8754,
+	'DoubleLongLeftRightArrow;': 10234,
+	'NotNestedGreaterGreater;': 10914,
+	'DiacriticalDoubleAcute;': 733,
+	'NotSquareSupersetEqual;': 8931,
+	'CloseCurlyDoubleQuote;': 8221,
+	'DoubleContourIntegral;': 8751,
+	'FilledVerySmallSquare;': 9642,
+	'NegativeVeryThinSpace;': 8203,
+	'NotPrecedesSlantEqual;': 8928,
+	'NotRightTriangleEqual;': 8941,
+	'NotSucceedsSlantEqual;': 8929,
+	'CapitalDifferentialD;': 8517,
+	'DoubleLeftRightArrow;': 8660,
+	'DoubleLongRightArrow;': 10233,
+	'EmptyVerySmallSquare;': 9643,
+	'NestedGreaterGreater;': 8811,
+	'NotDoubleVerticalBar;': 8742,
+	'NotGreaterSlantEqual;': 10878,
+	'NotLeftTriangleEqual;': 8940,
+	'NotSquareSubsetEqual;': 8930,
+	'OpenCurlyDoubleQuote;': 8220,
+	'ReverseUpEquilibrium;': 10607,
+	'DoubleLongLeftArrow;': 10232,
+	'DownLeftRightVector;': 10576,
+	'LeftArrowRightArrow;': 8646,
+	'NegativeMediumSpace;': 8203,
+	'NotGreaterFullEqual;': 8807,
+	'NotRightTriangleBar;': 10704,
+	'RightArrowLeftArrow;': 8644,
+	'SquareSupersetEqual;': 8850,
+	'leftrightsquigarrow;': 8621,
+	'DownRightTeeVector;': 10591,
+	'DownRightVectorBar;': 10583,
+	'LongLeftRightArrow;': 10231,
+	'Longleftrightarrow;': 10234,
+	'NegativeThickSpace;': 8203,
+	'NotLeftTriangleBar;': 10703,
+	'PrecedesSlantEqual;': 8828,
+	'ReverseEquilibrium;': 8651,
+	'RightDoubleBracket;': 10215,
+	'RightDownTeeVector;': 10589,
+	'RightDownVectorBar;': 10581,
+	'RightTriangleEqual;': 8885,
+	'SquareIntersection;': 8851,
+	'SucceedsSlantEqual;': 8829,
+	'blacktriangleright;': 9656,
+	'longleftrightarrow;': 10231,
+	'DoubleUpDownArrow;': 8661,
+	'DoubleVerticalBar;': 8741,
+	'DownLeftTeeVector;': 10590,
+	'DownLeftVectorBar;': 10582,
+	'FilledSmallSquare;': 9724,
+	'GreaterSlantEqual;': 10878,
+	'LeftDoubleBracket;': 10214,
+	'LeftDownTeeVector;': 10593,
+	'LeftDownVectorBar;': 10585,
+	'LeftTriangleEqual;': 8884,
+	'NegativeThinSpace;': 8203,
+	'NotGreaterGreater;': 8811,
+	'NotLessSlantEqual;': 10877,
+	'NotNestedLessLess;': 10913,
+	'NotReverseElement;': 8716,
+	'NotSquareSuperset;': 8848,
+	'NotTildeFullEqual;': 8775,
+	'RightAngleBracket;': 10217,
+	'RightUpDownVector;': 10575,
+	'SquareSubsetEqual;': 8849,
+	'VerticalSeparator;': 10072,
+	'blacktriangledown;': 9662,
+	'blacktriangleleft;': 9666,
+	'leftrightharpoons;': 8651,
+	'rightleftharpoons;': 8652,
+	'twoheadrightarrow;': 8608,
+	'DiacriticalAcute;': 180,
+	'DiacriticalGrave;': 96,
+	'DiacriticalTilde;': 732,
+	'DoubleRightArrow;': 8658,
+	'DownArrowUpArrow;': 8693,
+	'EmptySmallSquare;': 9723,
+	'GreaterEqualLess;': 8923,
+	'GreaterFullEqual;': 8807,
+	'LeftAngleBracket;': 10216,
+	'LeftUpDownVector;': 10577,
+	'LessEqualGreater;': 8922,
+	'NonBreakingSpace;': 160,
+	'NotPrecedesEqual;': 10927,
+	'NotRightTriangle;': 8939,
+	'NotSucceedsEqual;': 10928,
+	'NotSucceedsTilde;': 8831,
+	'NotSupersetEqual;': 8841,
+	'RightTriangleBar;': 10704,
+	'RightUpTeeVector;': 10588,
+	'RightUpVectorBar;': 10580,
+	'UnderParenthesis;': 9181,
+	'UpArrowDownArrow;': 8645,
+	'circlearrowright;': 8635,
+	'downharpoonright;': 8642,
+	'ntrianglerighteq;': 8941,
+	'rightharpoondown;': 8641,
+	'rightrightarrows;': 8649,
+	'twoheadleftarrow;': 8606,
+	'vartriangleright;': 8883,
+	'CloseCurlyQuote;': 8217,
+	'ContourIntegral;': 8750,
+	'DoubleDownArrow;': 8659,
+	'DoubleLeftArrow;': 8656,
+	'DownRightVector;': 8641,
+	'LeftRightVector;': 10574,
+	'LeftTriangleBar;': 10703,
+	'LeftUpTeeVector;': 10592,
+	'LeftUpVectorBar;': 10584,
+	'LowerRightArrow;': 8600,
+	'NotGreaterEqual;': 8817,
+	'NotGreaterTilde;': 8821,
+	'NotHumpDownHump;': 8782,
+	'NotLeftTriangle;': 8938,
+	'NotSquareSubset;': 8847,
+	'OverParenthesis;': 9180,
+	'RightDownVector;': 8642,
+	'ShortRightArrow;': 8594,
+	'UpperRightArrow;': 8599,
+	'bigtriangledown;': 9661,
+	'circlearrowleft;': 8634,
+	'curvearrowright;': 8631,
+	'downharpoonleft;': 8643,
+	'leftharpoondown;': 8637,
+	'leftrightarrows;': 8646,
+	'nLeftrightarrow;': 8654,
+	'nleftrightarrow;': 8622,
+	'ntrianglelefteq;': 8940,
+	'rightleftarrows;': 8644,
+	'rightsquigarrow;': 8605,
+	'rightthreetimes;': 8908,
+	'straightepsilon;': 1013,
+	'trianglerighteq;': 8885,
+	'vartriangleleft;': 8882,
+	'DiacriticalDot;': 729,
+	'DoubleRightTee;': 8872,
+	'DownLeftVector;': 8637,
+	'GreaterGreater;': 10914,
+	'HorizontalLine;': 9472,
+	'InvisibleComma;': 8291,
+	'InvisibleTimes;': 8290,
+	'LeftDownVector;': 8643,
+	'LeftRightArrow;': 8596,
+	'Leftrightarrow;': 8660,
+	'LessSlantEqual;': 10877,
+	'LongRightArrow;': 10230,
+	'Longrightarrow;': 10233,
+	'LowerLeftArrow;': 8601,
+	'NestedLessLess;': 8810,
+	'NotGreaterLess;': 8825,
+	'NotLessGreater;': 8824,
+	'NotSubsetEqual;': 8840,
+	'NotVerticalBar;': 8740,
+	'OpenCurlyQuote;': 8216,
+	'ReverseElement;': 8715,
+	'RightTeeVector;': 10587,
+	'RightVectorBar;': 10579,
+	'ShortDownArrow;': 8595,
+	'ShortLeftArrow;': 8592,
+	'SquareSuperset;': 8848,
+	'TildeFullEqual;': 8773,
+	'UpperLeftArrow;': 8598,
+	'ZeroWidthSpace;': 8203,
+	'curvearrowleft;': 8630,
+	'doublebarwedge;': 8966,
+	'downdownarrows;': 8650,
+	'hookrightarrow;': 8618,
+	'leftleftarrows;': 8647,
+	'leftrightarrow;': 8596,
+	'leftthreetimes;': 8907,
+	'longrightarrow;': 10230,
+	'looparrowright;': 8620,
+	'nshortparallel;': 8742,
+	'ntriangleright;': 8939,
+	'rightarrowtail;': 8611,
+	'rightharpoonup;': 8640,
+	'trianglelefteq;': 8884,
+	'upharpoonright;': 8638,
+	'ApplyFunction;': 8289,
+	'DifferentialD;': 8518,
+	'DoubleLeftTee;': 10980,
+	'DoubleUpArrow;': 8657,
+	'LeftTeeVector;': 10586,
+	'LeftVectorBar;': 10578,
+	'LessFullEqual;': 8806,
+	'LongLeftArrow;': 10229,
+	'Longleftarrow;': 10232,
+	'NotEqualTilde;': 8770,
+	'NotTildeEqual;': 8772,
+	'NotTildeTilde;': 8777,
+	'Poincareplane;': 8460,
+	'PrecedesEqual;': 10927,
+	'PrecedesTilde;': 8830,
+	'RightArrowBar;': 8677,
+	'RightTeeArrow;': 8614,
+	'RightTriangle;': 8883,
+	'RightUpVector;': 8638,
+	'SucceedsEqual;': 10928,
+	'SucceedsTilde;': 8831,
+	'SupersetEqual;': 8839,
+	'UpEquilibrium;': 10606,
+	'VerticalTilde;': 8768,
+	'VeryThinSpace;': 8202,
+	'bigtriangleup;': 9651,
+	'blacktriangle;': 9652,
+	'divideontimes;': 8903,
+	'fallingdotseq;': 8786,
+	'hookleftarrow;': 8617,
+	'leftarrowtail;': 8610,
+	'leftharpoonup;': 8636,
+	'longleftarrow;': 10229,
+	'looparrowleft;': 8619,
+	'measuredangle;': 8737,
+	'ntriangleleft;': 8938,
+	'shortparallel;': 8741,
+	'smallsetminus;': 8726,
+	'triangleright;': 9657,
+	'upharpoonleft;': 8639,
+	'varsubsetneqq;': 10955,
+	'varsupsetneqq;': 10956,
+	'DownArrowBar;': 10515,
+	'DownTeeArrow;': 8615,
+	'ExponentialE;': 8519,
+	'GreaterEqual;': 8805,
+	'GreaterTilde;': 8819,
+	'HilbertSpace;': 8459,
+	'HumpDownHump;': 8782,
+	'Intersection;': 8898,
+	'LeftArrowBar;': 8676,
+	'LeftTeeArrow;': 8612,
+	'LeftTriangle;': 8882,
+	'LeftUpVector;': 8639,
+	'NotCongruent;': 8802,
+	'NotHumpEqual;': 8783,
+	'NotLessEqual;': 8816,
+	'NotLessTilde;': 8820,
+	'Proportional;': 8733,
+	'RightCeiling;': 8969,
+	'RoundImplies;': 10608,
+	'ShortUpArrow;': 8593,
+	'SquareSubset;': 8847,
+	'UnderBracket;': 9141,
+	'VerticalLine;': 124,
+	'blacklozenge;': 10731,
+	'exponentiale;': 8519,
+	'risingdotseq;': 8787,
+	'triangledown;': 9663,
+	'triangleleft;': 9667,
+	'varsubsetneq;': 8842,
+	'varsupsetneq;': 8843,
+	'CircleMinus;': 8854,
+	'CircleTimes;': 8855,
+	'Equilibrium;': 8652,
+	'GreaterLess;': 8823,
+	'LeftCeiling;': 8968,
+	'LessGreater;': 8822,
+	'MediumSpace;': 8287,
+	'NotLessLess;': 8810,
+	'NotPrecedes;': 8832,
+	'NotSucceeds;': 8833,
+	'NotSuperset;': 8835,
+	'OverBracket;': 9140,
+	'RightVector;': 8640,
+	'Rrightarrow;': 8667,
+	'RuleDelayed;': 10740,
+	'SmallCircle;': 8728,
+	'SquareUnion;': 8852,
+	'SubsetEqual;': 8838,
+	'UpDownArrow;': 8597,
+	'Updownarrow;': 8661,
+	'VerticalBar;': 8739,
+	'backepsilon;': 1014,
+	'blacksquare;': 9642,
+	'circledcirc;': 8858,
+	'circleddash;': 8861,
+	'curlyeqprec;': 8926,
+	'curlyeqsucc;': 8927,
+	'diamondsuit;': 9830,
+	'eqslantless;': 10901,
+	'expectation;': 8496,
+	'nRightarrow;': 8655,
+	'nrightarrow;': 8603,
+	'preccurlyeq;': 8828,
+	'precnapprox;': 10937,
+	'quaternions;': 8461,
+	'straightphi;': 981,
+	'succcurlyeq;': 8829,
+	'succnapprox;': 10938,
+	'thickapprox;': 8776,
+	'updownarrow;': 8597,
+	'Bernoullis;': 8492,
+	'CirclePlus;': 8853,
+	'EqualTilde;': 8770,
+	'Fouriertrf;': 8497,
+	'ImaginaryI;': 8520,
+	'Laplacetrf;': 8466,
+	'LeftVector;': 8636,
+	'Lleftarrow;': 8666,
+	'NotElement;': 8713,
+	'NotGreater;': 8815,
+	'Proportion;': 8759,
+	'RightArrow;': 8594,
+	'RightFloor;': 8971,
+	'Rightarrow;': 8658,
+	'ThickSpace;': 8287,
+	'TildeEqual;': 8771,
+	'TildeTilde;': 8776,
+	'UnderBrace;': 9183,
+	'UpArrowBar;': 10514,
+	'UpTeeArrow;': 8613,
+	'circledast;': 8859,
+	'complement;': 8705,
+	'curlywedge;': 8911,
+	'eqslantgtr;': 10902,
+	'gtreqqless;': 10892,
+	'lessapprox;': 10885,
+	'lesseqqgtr;': 10891,
+	'lmoustache;': 9136,
+	'longmapsto;': 10236,
+	'mapstodown;': 8615,
+	'mapstoleft;': 8612,
+	'nLeftarrow;': 8653,
+	'nleftarrow;': 8602,
+	'nsubseteqq;': 10949,
+	'nsupseteqq;': 10950,
+	'precapprox;': 10935,
+	'rightarrow;': 8594,
+	'rmoustache;': 9137,
+	'sqsubseteq;': 8849,
+	'sqsupseteq;': 8850,
+	'subsetneqq;': 10955,
+	'succapprox;': 10936,
+	'supsetneqq;': 10956,
+	'upuparrows;': 8648,
+	'varepsilon;': 1013,
+	'varnothing;': 8709,
+	'Backslash;': 8726,
+	'CenterDot;': 183,
+	'CircleDot;': 8857,
+	'Congruent;': 8801,
+	'Coproduct;': 8720,
+	'DoubleDot;': 168,
+	'DownArrow;': 8595,
+	'DownBreve;': 785,
+	'Downarrow;': 8659,
+	'HumpEqual;': 8783,
+	'LeftArrow;': 8592,
+	'LeftFloor;': 8970,
+	'Leftarrow;': 8656,
+	'LessTilde;': 8818,
+	'Mellintrf;': 8499,
+	'MinusPlus;': 8723,
+	'NotCupCap;': 8813,
+	'NotExists;': 8708,
+	'NotSubset;': 8834,
+	'OverBrace;': 9182,
+	'PlusMinus;': 177,
+	'Therefore;': 8756,
+	'ThinSpace;': 8201,
+	'TripleDot;': 8411,
+	'UnionPlus;': 8846,
+	'backprime;': 8245,
+	'backsimeq;': 8909,
+	'bigotimes;': 10754,
+	'centerdot;': 183,
+	'checkmark;': 10003,
+	'complexes;': 8450,
+	'dotsquare;': 8865,
+	'downarrow;': 8595,
+	'gtrapprox;': 10886,
+	'gtreqless;': 8923,
+	'gvertneqq;': 8809,
+	'heartsuit;': 9829,
+	'leftarrow;': 8592,
+	'lesseqgtr;': 8922,
+	'lvertneqq;': 8808,
+	'ngeqslant;': 10878,
+	'nleqslant;': 10877,
+	'nparallel;': 8742,
+	'nshortmid;': 8740,
+	'nsubseteq;': 8840,
+	'nsupseteq;': 8841,
+	'pitchfork;': 8916,
+	'rationals;': 8474,
+	'spadesuit;': 9824,
+	'subseteqq;': 10949,
+	'subsetneq;': 8842,
+	'supseteqq;': 10950,
+	'supsetneq;': 8843,
+	'therefore;': 8756,
+	'triangleq;': 8796,
+	'varpropto;': 8733,
+	'DDotrahd;': 10513,
+	'DotEqual;': 8784,
+	'Integral;': 8747,
+	'LessLess;': 10913,
+	'NotEqual;': 8800,
+	'NotTilde;': 8769,
+	'PartialD;': 8706,
+	'Precedes;': 8826,
+	'RightTee;': 8866,
+	'Succeeds;': 8827,
+	'SuchThat;': 8715,
+	'Superset;': 8835,
+	'Uarrocir;': 10569,
+	'UnderBar;': 95,
+	'andslope;': 10840,
+	'angmsdaa;': 10664,
+	'angmsdab;': 10665,
+	'angmsdac;': 10666,
+	'angmsdad;': 10667,
+	'angmsdae;': 10668,
+	'angmsdaf;': 10669,
+	'angmsdag;': 10670,
+	'angmsdah;': 10671,
+	'angrtvbd;': 10653,
+	'approxeq;': 8778,
+	'awconint;': 8755,
+	'backcong;': 8780,
+	'barwedge;': 8965,
+	'bbrktbrk;': 9142,
+	'bigoplus;': 10753,
+	'bigsqcup;': 10758,
+	'biguplus;': 10756,
+	'bigwedge;': 8896,
+	'boxminus;': 8863,
+	'boxtimes;': 8864,
+	'bsolhsub;': 10184,
+	'capbrcup;': 10825,
+	'circledR;': 174,
+	'circledS;': 9416,
+	'cirfnint;': 10768,
+	'clubsuit;': 9827,
+	'cupbrcap;': 10824,
+	'curlyvee;': 8910,
+	'cwconint;': 8754,
+	'doteqdot;': 8785,
+	'dotminus;': 8760,
+	'drbkarow;': 10512,
+	'dzigrarr;': 10239,
+	'elinters;': 9191,
+	'emptyset;': 8709,
+	'eqvparsl;': 10725,
+	'fpartint;': 10765,
+	'geqslant;': 10878,
+	'gesdotol;': 10884,
+	'gnapprox;': 10890,
+	'hksearow;': 10533,
+	'hkswarow;': 10534,
+	'imagline;': 8464,
+	'imagpart;': 8465,
+	'infintie;': 10717,
+	'integers;': 8484,
+	'intercal;': 8890,
+	'intlarhk;': 10775,
+	'laemptyv;': 10676,
+	'ldrushar;': 10571,
+	'leqslant;': 10877,
+	'lesdotor;': 10883,
+	'llcorner;': 8990,
+	'lnapprox;': 10889,
+	'lrcorner;': 8991,
+	'lurdshar;': 10570,
+	'mapstoup;': 8613,
+	'multimap;': 8888,
+	'naturals;': 8469,
+	'ncongdot;': 10861,
+	'notindot;': 8949,
+	'otimesas;': 10806,
+	'parallel;': 8741,
+	'plusacir;': 10787,
+	'pointint;': 10773,
+	'precneqq;': 10933,
+	'precnsim;': 8936,
+	'profalar;': 9006,
+	'profline;': 8978,
+	'profsurf;': 8979,
+	'raemptyv;': 10675,
+	'realpart;': 8476,
+	'rppolint;': 10770,
+	'rtriltri;': 10702,
+	'scpolint;': 10771,
+	'setminus;': 8726,
+	'shortmid;': 8739,
+	'smeparsl;': 10724,
+	'sqsubset;': 8847,
+	'sqsupset;': 8848,
+	'subseteq;': 8838,
+	'succneqq;': 10934,
+	'succnsim;': 8937,
+	'supseteq;': 8839,
+	'thetasym;': 977,
+	'thicksim;': 8764,
+	'timesbar;': 10801,
+	'triangle;': 9653,
+	'triminus;': 10810,
+	'trpezium;': 9186,
+	'ulcorner;': 8988,
+	'urcorner;': 8989,
+	'varkappa;': 1008,
+	'varsigma;': 962,
+	'vartheta;': 977,
+	'Because;': 8757,
+	'Cayleys;': 8493,
+	'Cconint;': 8752,
+	'Cedilla;': 184,
+	'Diamond;': 8900,
+	'DownTee;': 8868,
+	'Element;': 8712,
+	'Epsilon;': 917,
+	'Implies;': 8658,
+	'LeftTee;': 8867,
+	'NewLine;': 10,
+	'NoBreak;': 8288,
+	'NotLess;': 8814,
+	'Omicron;': 927,
+	'OverBar;': 8254,
+	'Product;': 8719,
+	'UpArrow;': 8593,
+	'Uparrow;': 8657,
+	'Upsilon;': 933,
+	'alefsym;': 8501,
+	'angrtvb;': 8894,
+	'angzarr;': 9084,
+	'asympeq;': 8781,
+	'backsim;': 8765,
+	'because;': 8757,
+	'bemptyv;': 10672,
+	'between;': 8812,
+	'bigcirc;': 9711,
+	'bigodot;': 10752,
+	'bigstar;': 9733,
+	'bnequiv;': 8801,
+	'boxplus;': 8862,
+	'ccupssm;': 10832,
+	'cemptyv;': 10674,
+	'cirscir;': 10690,
+	'coloneq;': 8788,
+	'congdot;': 10861,
+	'cudarrl;': 10552,
+	'cudarrr;': 10549,
+	'cularrp;': 10557,
+	'curarrm;': 10556,
+	'dbkarow;': 10511,
+	'ddagger;': 8225,
+	'ddotseq;': 10871,
+	'demptyv;': 10673,
+	'diamond;': 8900,
+	'digamma;': 989,
+	'dotplus;': 8724,
+	'dwangle;': 10662,
+	'epsilon;': 949,
+	'eqcolon;': 8789,
+	'equivDD;': 10872,
+	'gesdoto;': 10882,
+	'gtquest;': 10876,
+	'gtrless;': 8823,
+	'harrcir;': 10568,
+	'intprod;': 10812,
+	'isindot;': 8949,
+	'larrbfs;': 10527,
+	'larrsim;': 10611,
+	'lbrksld;': 10639,
+	'lbrkslu;': 10637,
+	'ldrdhar;': 10599,
+	'lesdoto;': 10881,
+	'lessdot;': 8918,
+	'lessgtr;': 8822,
+	'lesssim;': 8818,
+	'lotimes;': 10804,
+	'lozenge;': 9674,
+	'ltquest;': 10875,
+	'luruhar;': 10598,
+	'maltese;': 10016,
+	'minusdu;': 10794,
+	'napprox;': 8777,
+	'natural;': 9838,
+	'nearrow;': 8599,
+	'nexists;': 8708,
+	'notinva;': 8713,
+	'notinvb;': 8951,
+	'notinvc;': 8950,
+	'notniva;': 8716,
+	'notnivb;': 8958,
+	'notnivc;': 8957,
+	'npolint;': 10772,
+	'npreceq;': 10927,
+	'nsqsube;': 8930,
+	'nsqsupe;': 8931,
+	'nsubset;': 8834,
+	'nsucceq;': 10928,
+	'nsupset;': 8835,
+	'nvinfin;': 10718,
+	'nvltrie;': 8884,
+	'nvrtrie;': 8885,
+	'nwarrow;': 8598,
+	'olcross;': 10683,
+	'omicron;': 959,
+	'orderof;': 8500,
+	'orslope;': 10839,
+	'pertenk;': 8241,
+	'planckh;': 8462,
+	'pluscir;': 10786,
+	'plussim;': 10790,
+	'plustwo;': 10791,
+	'precsim;': 8830,
+	'quatint;': 10774,
+	'questeq;': 8799,
+	'rarrbfs;': 10528,
+	'rarrsim;': 10612,
+	'rbrksld;': 10638,
+	'rbrkslu;': 10640,
+	'rdldhar;': 10601,
+	'realine;': 8475,
+	'rotimes;': 10805,
+	'ruluhar;': 10600,
+	'searrow;': 8600,
+	'simplus;': 10788,
+	'simrarr;': 10610,
+	'subedot;': 10947,
+	'submult;': 10945,
+	'subplus;': 10943,
+	'subrarr;': 10617,
+	'succsim;': 8831,
+	'supdsub;': 10968,
+	'supedot;': 10948,
+	'suphsol;': 10185,
+	'suphsub;': 10967,
+	'suplarr;': 10619,
+	'supmult;': 10946,
+	'supplus;': 10944,
+	'swarrow;': 8601,
+	'topfork;': 10970,
+	'triplus;': 10809,
+	'tritime;': 10811,
+	'uparrow;': 8593,
+	'upsilon;': 965,
+	'uwangle;': 10663,
+	'vzigzag;': 10650,
+	'zigrarr;': 8669,
+	'Aacute;': 193,
+	'Abreve;': 258,
+	'Agrave;': 192,
+	'Assign;': 8788,
+	'Atilde;': 195,
+	'Barwed;': 8966,
+	'Bumpeq;': 8782,
+	'Cacute;': 262,
+	'Ccaron;': 268,
+	'Ccedil;': 199,
+	'Colone;': 10868,
+	'Conint;': 8751,
+	'CupCap;': 8781,
+	'Dagger;': 8225,
+	'Dcaron;': 270,
+	'DotDot;': 8412,
+	'Dstrok;': 272,
+	'Eacute;': 201,
+	'Ecaron;': 282,
+	'Egrave;': 200,
+	'Exists;': 8707,
+	'ForAll;': 8704,
+	'Gammad;': 988,
+	'Gbreve;': 286,
+	'Gcedil;': 290,
+	'HARDcy;': 1066,
+	'Hstrok;': 294,
+	'Iacute;': 205,
+	'Igrave;': 204,
+	'Itilde;': 296,
+	'Jsercy;': 1032,
+	'Kcedil;': 310,
+	'Lacute;': 313,
+	'Lambda;': 923,
+	'Lcaron;': 317,
+	'Lcedil;': 315,
+	'Lmidot;': 319,
+	'Lstrok;': 321,
+	'Nacute;': 323,
+	'Ncaron;': 327,
+	'Ncedil;': 325,
+	'Ntilde;': 209,
+	'Oacute;': 211,
+	'Odblac;': 336,
+	'Ograve;': 210,
+	'Oslash;': 216,
+	'Otilde;': 213,
+	'Otimes;': 10807,
+	'Racute;': 340,
+	'Rarrtl;': 10518,
+	'Rcaron;': 344,
+	'Rcedil;': 342,
+	'SHCHcy;': 1065,
+	'SOFTcy;': 1068,
+	'Sacute;': 346,
+	'Scaron;': 352,
+	'Scedil;': 350,
+	'Square;': 9633,
+	'Subset;': 8912,
+	'Supset;': 8913,
+	'Tcaron;': 356,
+	'Tcedil;': 354,
+	'Tstrok;': 358,
+	'Uacute;': 218,
+	'Ubreve;': 364,
+	'Udblac;': 368,
+	'Ugrave;': 217,
+	'Utilde;': 360,
+	'Vdashl;': 10982,
+	'Verbar;': 8214,
+	'Vvdash;': 8874,
+	'Yacute;': 221,
+	'Zacute;': 377,
+	'Zcaron;': 381,
+	'aacute;': 225,
+	'abreve;': 259,
+	'agrave;': 224,
+	'andand;': 10837,
+	'angmsd;': 8737,
+	'angsph;': 8738,
+	'apacir;': 10863,
+	'approx;': 8776,
+	'atilde;': 227,
+	'barvee;': 8893,
+	'barwed;': 8965,
+	'becaus;': 8757,
+	'bernou;': 8492,
+	'bigcap;': 8898,
+	'bigcup;': 8899,
+	'bigvee;': 8897,
+	'bkarow;': 10509,
+	'bottom;': 8869,
+	'bowtie;': 8904,
+	'boxbox;': 10697,
+	'bprime;': 8245,
+	'brvbar;': 166,
+	'bullet;': 8226,
+	'bumpeq;': 8783,
+	'cacute;': 263,
+	'capand;': 10820,
+	'capcap;': 10827,
+	'capcup;': 10823,
+	'capdot;': 10816,
+	'ccaron;': 269,
+	'ccedil;': 231,
+	'circeq;': 8791,
+	'cirmid;': 10991,
+	'colone;': 8788,
+	'commat;': 64,
+	'compfn;': 8728,
+	'conint;': 8750,
+	'coprod;': 8720,
+	'copysr;': 8471,
+	'cularr;': 8630,
+	'cupcap;': 10822,
+	'cupcup;': 10826,
+	'cupdot;': 8845,
+	'curarr;': 8631,
+	'curren;': 164,
+	'cylcty;': 9005,
+	'dagger;': 8224,
+	'daleth;': 8504,
+	'dcaron;': 271,
+	'dfisht;': 10623,
+	'divide;': 247,
+	'divonx;': 8903,
+	'dlcorn;': 8990,
+	'dlcrop;': 8973,
+	'dollar;': 36,
+	'drcorn;': 8991,
+	'drcrop;': 8972,
+	'dstrok;': 273,
+	'eacute;': 233,
+	'easter;': 10862,
+	'ecaron;': 283,
+	'ecolon;': 8789,
+	'egrave;': 232,
+	'egsdot;': 10904,
+	'elsdot;': 10903,
+	'emptyv;': 8709,
+	'emsp13;': 8196,
+	'emsp14;': 8197,
+	'eparsl;': 10723,
+	'eqcirc;': 8790,
+	'equals;': 61,
+	'equest;': 8799,
+	'female;': 9792,
+	'ffilig;': 64259,
+	'ffllig;': 64260,
+	'forall;': 8704,
+	'frac12;': 189,
+	'frac13;': 8531,
+	'frac14;': 188,
+	'frac15;': 8533,
+	'frac16;': 8537,
+	'frac18;': 8539,
+	'frac23;': 8532,
+	'frac25;': 8534,
+	'frac34;': 190,
+	'frac35;': 8535,
+	'frac38;': 8540,
+	'frac45;': 8536,
+	'frac56;': 8538,
+	'frac58;': 8541,
+	'frac78;': 8542,
+	'gacute;': 501,
+	'gammad;': 989,
+	'gbreve;': 287,
+	'gesdot;': 10880,
+	'gesles;': 10900,
+	'gtlPar;': 10645,
+	'gtrarr;': 10616,
+	'gtrdot;': 8919,
+	'gtrsim;': 8819,
+	'hairsp;': 8202,
+	'hamilt;': 8459,
+	'hardcy;': 1098,
+	'hearts;': 9829,
+	'hellip;': 8230,
+	'hercon;': 8889,
+	'homtht;': 8763,
+	'horbar;': 8213,
+	'hslash;': 8463,
+	'hstrok;': 295,
+	'hybull;': 8259,
+	'hyphen;': 8208,
+	'iacute;': 237,
+	'igrave;': 236,
+	'iiiint;': 10764,
+	'iinfin;': 10716,
+	'incare;': 8453,
+	'inodot;': 305,
+	'intcal;': 8890,
+	'iquest;': 191,
+	'isinsv;': 8947,
+	'itilde;': 297,
+	'jsercy;': 1112,
+	'kappav;': 1008,
+	'kcedil;': 311,
+	'kgreen;': 312,
+	'lAtail;': 10523,
+	'lacute;': 314,
+	'lagran;': 8466,
+	'lambda;': 955,
+	'langle;': 10216,
+	'larrfs;': 10525,
+	'larrhk;': 8617,
+	'larrlp;': 8619,
+	'larrpl;': 10553,
+	'larrtl;': 8610,
+	'latail;': 10521,
+	'lbrace;': 123,
+	'lbrack;': 91,
+	'lcaron;': 318,
+	'lcedil;': 316,
+	'ldquor;': 8222,
+	'lesdot;': 10879,
+	'lesges;': 10899,
+	'lfisht;': 10620,
+	'lfloor;': 8970,
+	'lharul;': 10602,
+	'llhard;': 10603,
+	'lmidot;': 320,
+	'lmoust;': 9136,
+	'loplus;': 10797,
+	'lowast;': 8727,
+	'lowbar;': 95,
+	'lparlt;': 10643,
+	'lrhard;': 10605,
+	'lsaquo;': 8249,
+	'lsquor;': 8218,
+	'lstrok;': 322,
+	'lthree;': 8907,
+	'ltimes;': 8905,
+	'ltlarr;': 10614,
+	'ltrPar;': 10646,
+	'mapsto;': 8614,
+	'marker;': 9646,
+	'mcomma;': 10793,
+	'midast;': 42,
+	'midcir;': 10992,
+	'middot;': 183,
+	'minusb;': 8863,
+	'minusd;': 8760,
+	'mnplus;': 8723,
+	'models;': 8871,
+	'mstpos;': 8766,
+	'nVDash;': 8879,
+	'nVdash;': 8878,
+	'nacute;': 324,
+	'nbumpe;': 8783,
+	'ncaron;': 328,
+	'ncedil;': 326,
+	'nearhk;': 10532,
+	'nequiv;': 8802,
+	'nesear;': 10536,
+	'nexist;': 8708,
+	'nltrie;': 8940,
+	'notinE;': 8953,
+	'nparsl;': 11005,
+	'nprcue;': 8928,
+	'nrarrc;': 10547,
+	'nrarrw;': 8605,
+	'nrtrie;': 8941,
+	'nsccue;': 8929,
+	'nsimeq;': 8772,
+	'ntilde;': 241,
+	'numero;': 8470,
+	'nvDash;': 8877,
+	'nvHarr;': 10500,
+	'nvdash;': 8876,
+	'nvlArr;': 10498,
+	'nvrArr;': 10499,
+	'nwarhk;': 10531,
+	'nwnear;': 10535,
+	'oacute;': 243,
+	'odblac;': 337,
+	'odsold;': 10684,
+	'ograve;': 242,
+	'ominus;': 8854,
+	'origof;': 8886,
+	'oslash;': 248,
+	'otilde;': 245,
+	'otimes;': 8855,
+	'parsim;': 10995,
+	'percnt;': 37,
+	'period;': 46,
+	'permil;': 8240,
+	'phmmat;': 8499,
+	'planck;': 8463,
+	'plankv;': 8463,
+	'plusdo;': 8724,
+	'plusdu;': 10789,
+	'plusmn;': 177,
+	'preceq;': 10927,
+	'primes;': 8473,
+	'prnsim;': 8936,
+	'propto;': 8733,
+	'prurel;': 8880,
+	'puncsp;': 8200,
+	'qprime;': 8279,
+	'rAtail;': 10524,
+	'racute;': 341,
+	'rangle;': 10217,
+	'rarrap;': 10613,
+	'rarrfs;': 10526,
+	'rarrhk;': 8618,
+	'rarrlp;': 8620,
+	'rarrpl;': 10565,
+	'rarrtl;': 8611,
+	'ratail;': 10522,
+	'rbrace;': 125,
+	'rbrack;': 93,
+	'rcaron;': 345,
+	'rcedil;': 343,
+	'rdquor;': 8221,
+	'rfisht;': 10621,
+	'rfloor;': 8971,
+	'rharul;': 10604,
+	'rmoust;': 9137,
+	'roplus;': 10798,
+	'rpargt;': 10644,
+	'rsaquo;': 8250,
+	'rsquor;': 8217,
+	'rthree;': 8908,
+	'rtimes;': 8906,
+	'sacute;': 347,
+	'scaron;': 353,
+	'scedil;': 351,
+	'scnsim;': 8937,
+	'searhk;': 10533,
+	'seswar;': 10537,
+	'sfrown;': 8994,
+	'shchcy;': 1097,
+	'sigmaf;': 962,
+	'sigmav;': 962,
+	'simdot;': 10858,
+	'smashp;': 10803,
+	'softcy;': 1100,
+	'solbar;': 9023,
+	'spades;': 9824,
+	'sqcaps;': 8851,
+	'sqcups;': 8852,
+	'sqsube;': 8849,
+	'sqsupe;': 8850,
+	'square;': 9633,
+	'squarf;': 9642,
+	'ssetmn;': 8726,
+	'ssmile;': 8995,
+	'sstarf;': 8902,
+	'subdot;': 10941,
+	'subset;': 8834,
+	'subsim;': 10951,
+	'subsub;': 10965,
+	'subsup;': 10963,
+	'succeq;': 10928,
+	'supdot;': 10942,
+	'supset;': 8835,
+	'supsim;': 10952,
+	'supsub;': 10964,
+	'supsup;': 10966,
+	'swarhk;': 10534,
+	'swnwar;': 10538,
+	'target;': 8982,
+	'tcaron;': 357,
+	'tcedil;': 355,
+	'telrec;': 8981,
+	'there4;': 8756,
+	'thetav;': 977,
+	'thinsp;': 8201,
+	'thksim;': 8764,
+	'timesb;': 8864,
+	'timesd;': 10800,
+	'topbot;': 9014,
+	'topcir;': 10993,
+	'tprime;': 8244,
+	'tridot;': 9708,
+	'tstrok;': 359,
+	'uacute;': 250,
+	'ubreve;': 365,
+	'udblac;': 369,
+	'ufisht;': 10622,
+	'ugrave;': 249,
+	'ulcorn;': 8988,
+	'ulcrop;': 8975,
+	'urcorn;': 8989,
+	'urcrop;': 8974,
+	'utilde;': 361,
+	'vangrt;': 10652,
+	'varphi;': 981,
+	'varrho;': 1009,
+	'veebar;': 8891,
+	'vellip;': 8942,
+	'verbar;': 124,
+	'vsubnE;': 10955,
+	'vsubne;': 8842,
+	'vsupnE;': 10956,
+	'vsupne;': 8843,
+	'wedbar;': 10847,
+	'wedgeq;': 8793,
+	'weierp;': 8472,
+	'wreath;': 8768,
+	'xoplus;': 10753,
+	'xotime;': 10754,
+	'xsqcup;': 10758,
+	'xuplus;': 10756,
+	'xwedge;': 8896,
+	'yacute;': 253,
+	'zacute;': 378,
+	'zcaron;': 382,
+	'zeetrf;': 8488,
+	'AElig;': 198,
 	Aacute: 193,
-	Abreve: 258,
+	'Acirc;': 194,
 	Agrave: 192,
-	Assign: 8788,
+	'Alpha;': 913,
+	'Amacr;': 256,
+	'Aogon;': 260,
+	'Aring;': 197,
 	Atilde: 195,
-	Barwed: 8966,
-	Bumpeq: 8782,
-	Cacute: 262,
-	Ccaron: 268,
+	'Breve;': 728,
 	Ccedil: 199,
-	Colone: 10868,
-	Conint: 8751,
-	CupCap: 8781,
-	Dagger: 8225,
-	Dcaron: 270,
-	DotDot: 8412,
-	Dstrok: 272,
+	'Ccirc;': 264,
+	'Colon;': 8759,
+	'Cross;': 10799,
+	'Dashv;': 10980,
+	'Delta;': 916,
 	Eacute: 201,
-	Ecaron: 282,
+	'Ecirc;': 202,
 	Egrave: 200,
-	Exists: 8707,
-	ForAll: 8704,
-	Gammad: 988,
-	Gbreve: 286,
-	Gcedil: 290,
-	HARDcy: 1066,
-	Hstrok: 294,
+	'Emacr;': 274,
+	'Eogon;': 280,
+	'Equal;': 10869,
+	'Gamma;': 915,
+	'Gcirc;': 284,
+	'Hacek;': 711,
+	'Hcirc;': 292,
+	'IJlig;': 306,
 	Iacute: 205,
+	'Icirc;': 206,
 	Igrave: 204,
-	Itilde: 296,
-	Jsercy: 1032,
-	Kcedil: 310,
-	Lacute: 313,
-	Lambda: 923,
-	Lcaron: 317,
-	Lcedil: 315,
-	Lmidot: 319,
-	Lstrok: 321,
-	Nacute: 323,
-	Ncaron: 327,
-	Ncedil: 325,
+	'Imacr;': 298,
+	'Iogon;': 302,
+	'Iukcy;': 1030,
+	'Jcirc;': 308,
+	'Jukcy;': 1028,
+	'Kappa;': 922,
 	Ntilde: 209,
+	'OElig;': 338,
 	Oacute: 211,
-	Odblac: 336,
+	'Ocirc;': 212,
 	Ograve: 210,
+	'Omacr;': 332,
+	'Omega;': 937,
 	Oslash: 216,
 	Otilde: 213,
-	Otimes: 10807,
-	Racute: 340,
-	Rarrtl: 10518,
-	Rcaron: 344,
-	Rcedil: 342,
-	SHCHcy: 1065,
-	SOFTcy: 1068,
-	Sacute: 346,
-	Scaron: 352,
-	Scedil: 350,
-	Square: 9633,
-	Subset: 8912,
-	Supset: 8913,
-	Tcaron: 356,
-	Tcedil: 354,
-	Tstrok: 358,
+	'Prime;': 8243,
+	'RBarr;': 10512,
+	'Scirc;': 348,
+	'Sigma;': 931,
+	'THORN;': 222,
+	'TRADE;': 8482,
+	'TSHcy;': 1035,
+	'Theta;': 920,
+	'Tilde;': 8764,
 	Uacute: 218,
-	Ubreve: 364,
-	Udblac: 368,
+	'Ubrcy;': 1038,
+	'Ucirc;': 219,
 	Ugrave: 217,
-	Utilde: 360,
-	Vdashl: 10982,
-	Verbar: 8214,
-	Vvdash: 8874,
+	'Umacr;': 362,
+	'Union;': 8899,
+	'Uogon;': 370,
+	'UpTee;': 8869,
+	'Uring;': 366,
+	'VDash;': 8875,
+	'Vdash;': 8873,
+	'Wcirc;': 372,
+	'Wedge;': 8896,
 	Yacute: 221,
-	Zacute: 377,
-	Zcaron: 381,
+	'Ycirc;': 374,
 	aacute: 225,
-	abreve: 259,
+	'acirc;': 226,
+	'acute;': 180,
+	'aelig;': 230,
 	agrave: 224,
-	andand: 10837,
-	angmsd: 8737,
-	angsph: 8738,
-	apacir: 10863,
-	approx: 8776,
+	'aleph;': 8501,
+	'alpha;': 945,
+	'amacr;': 257,
+	'amalg;': 10815,
+	'angle;': 8736,
+	'angrt;': 8735,
+	'angst;': 197,
+	'aogon;': 261,
+	'aring;': 229,
+	'asymp;': 8776,
 	atilde: 227,
-	barvee: 8893,
-	barwed: 8965,
-	becaus: 8757,
-	bernou: 8492,
-	bigcap: 8898,
-	bigcup: 8899,
-	bigvee: 8897,
-	bkarow: 10509,
-	bottom: 8869,
-	bowtie: 8904,
-	boxbox: 10697,
-	bprime: 8245,
+	'awint;': 10769,
+	'bcong;': 8780,
+	'bdquo;': 8222,
+	'bepsi;': 1014,
+	'blank;': 9251,
+	'blk12;': 9618,
+	'blk14;': 9617,
+	'blk34;': 9619,
+	'block;': 9608,
+	'boxDL;': 9559,
+	'boxDR;': 9556,
+	'boxDl;': 9558,
+	'boxDr;': 9555,
+	'boxHD;': 9574,
+	'boxHU;': 9577,
+	'boxHd;': 9572,
+	'boxHu;': 9575,
+	'boxUL;': 9565,
+	'boxUR;': 9562,
+	'boxUl;': 9564,
+	'boxUr;': 9561,
+	'boxVH;': 9580,
+	'boxVL;': 9571,
+	'boxVR;': 9568,
+	'boxVh;': 9579,
+	'boxVl;': 9570,
+	'boxVr;': 9567,
+	'boxdL;': 9557,
+	'boxdR;': 9554,
+	'boxdl;': 9488,
+	'boxdr;': 9484,
+	'boxhD;': 9573,
+	'boxhU;': 9576,
+	'boxhd;': 9516,
+	'boxhu;': 9524,
+	'boxuL;': 9563,
+	'boxuR;': 9560,
+	'boxul;': 9496,
+	'boxur;': 9492,
+	'boxvH;': 9578,
+	'boxvL;': 9569,
+	'boxvR;': 9566,
+	'boxvh;': 9532,
+	'boxvl;': 9508,
+	'boxvr;': 9500,
+	'breve;': 728,
 	brvbar: 166,
-	bullet: 8226,
-	bumpeq: 8783,
-	cacute: 263,
-	capand: 10820,
-	capcap: 10827,
-	capcup: 10823,
-	capdot: 10816,
-	ccaron: 269,
+	'bsemi;': 8271,
+	'bsime;': 8909,
+	'bsolb;': 10693,
+	'bumpE;': 10926,
+	'bumpe;': 8783,
+	'caret;': 8257,
+	'caron;': 711,
+	'ccaps;': 10829,
 	ccedil: 231,
-	circeq: 8791,
-	cirmid: 10991,
-	colone: 8788,
-	commat: 64,
-	compfn: 8728,
-	conint: 8750,
-	coprod: 8720,
-	copysr: 8471,
-	cularr: 8630,
-	cupcap: 10822,
-	cupcup: 10826,
-	cupdot: 8845,
-	curarr: 8631,
+	'ccirc;': 265,
+	'ccups;': 10828,
+	'cedil;': 184,
+	'check;': 10003,
+	'clubs;': 9827,
+	'colon;': 58,
+	'comma;': 44,
+	'crarr;': 8629,
+	'cross;': 10007,
+	'csube;': 10961,
+	'csupe;': 10962,
+	'ctdot;': 8943,
+	'cuepr;': 8926,
+	'cuesc;': 8927,
+	'cupor;': 10821,
 	curren: 164,
-	cylcty: 9005,
-	dagger: 8224,
-	daleth: 8504,
-	dcaron: 271,
-	dfisht: 10623,
+	'cuvee;': 8910,
+	'cuwed;': 8911,
+	'cwint;': 8753,
+	'dashv;': 8867,
+	'dblac;': 733,
+	'ddarr;': 8650,
+	'delta;': 948,
+	'dharl;': 8643,
+	'dharr;': 8642,
+	'diams;': 9830,
+	'disin;': 8946,
 	divide: 247,
-	divonx: 8903,
-	dlcorn: 8990,
-	dlcrop: 8973,
-	dollar: 36,
-	drcorn: 8991,
-	drcrop: 8972,
-	dstrok: 273,
+	'doteq;': 8784,
+	'dtdot;': 8945,
+	'dtrif;': 9662,
+	'duarr;': 8693,
+	'duhar;': 10607,
+	'eDDot;': 10871,
 	eacute: 233,
-	easter: 10862,
-	ecaron: 283,
-	ecolon: 8789,
+	'ecirc;': 234,
+	'efDot;': 8786,
 	egrave: 232,
-	egsdot: 10904,
-	elsdot: 10903,
-	emptyv: 8709,
-	emsp13: 8196,
-	emsp14: 8197,
-	eparsl: 10723,
-	eqcirc: 8790,
-	equals: 61,
-	equest: 8799,
-	female: 9792,
-	ffilig: 64259,
-	ffllig: 64260,
-	forall: 8704,
+	'emacr;': 275,
+	'empty;': 8709,
+	'eogon;': 281,
+	'eplus;': 10865,
+	'epsiv;': 1013,
+	'eqsim;': 8770,
+	'equiv;': 8801,
+	'erDot;': 8787,
+	'erarr;': 10609,
+	'esdot;': 8784,
+	'exist;': 8707,
+	'fflig;': 64256,
+	'filig;': 64257,
+	'fjlig;': 102,
+	'fllig;': 64258,
+	'fltns;': 9649,
+	'forkv;': 10969,
 	frac12: 189,
-	frac13: 8531,
 	frac14: 188,
-	frac15: 8533,
-	frac16: 8537,
-	frac18: 8539,
-	frac23: 8532,
-	frac25: 8534,
 	frac34: 190,
-	frac35: 8535,
-	frac38: 8540,
-	frac45: 8536,
-	frac56: 8538,
-	frac58: 8541,
-	frac78: 8542,
-	gacute: 501,
-	gammad: 989,
-	gbreve: 287,
-	gesdot: 10880,
-	gesles: 10900,
-	gtlPar: 10645,
-	gtrarr: 10616,
-	gtrdot: 8919,
-	gtrsim: 8819,
-	hairsp: 8202,
-	hamilt: 8459,
-	hardcy: 1098,
-	hearts: 9829,
-	hellip: 8230,
-	hercon: 8889,
-	homtht: 8763,
-	horbar: 8213,
-	hslash: 8463,
-	hstrok: 295,
-	hybull: 8259,
-	hyphen: 8208,
+	'frasl;': 8260,
+	'frown;': 8994,
+	'gamma;': 947,
+	'gcirc;': 285,
+	'gescc;': 10921,
+	'gimel;': 8503,
+	'gneqq;': 8809,
+	'gnsim;': 8935,
+	'grave;': 96,
+	'gsime;': 10894,
+	'gsiml;': 10896,
+	'gtcir;': 10874,
+	'gtdot;': 8919,
+	'harrw;': 8621,
+	'hcirc;': 293,
+	'hoarr;': 8703,
 	iacute: 237,
+	'icirc;': 238,
+	'iexcl;': 161,
 	igrave: 236,
-	iiiint: 10764,
-	iinfin: 10716,
-	incare: 8453,
-	inodot: 305,
-	intcal: 8890,
+	'iiint;': 8749,
+	'iiota;': 8489,
+	'ijlig;': 307,
+	'imacr;': 299,
+	'image;': 8465,
+	'imath;': 305,
+	'imped;': 437,
+	'infin;': 8734,
+	'iogon;': 303,
+	'iprod;': 10812,
 	iquest: 191,
-	isinsv: 8947,
-	itilde: 297,
-	jsercy: 1112,
-	kappav: 1008,
-	kcedil: 311,
-	kgreen: 312,
-	lAtail: 10523,
-	lacute: 314,
-	lagran: 8466,
-	lambda: 955,
-	langle: 10216,
-	larrfs: 10525,
-	larrhk: 8617,
-	larrlp: 8619,
-	larrpl: 10553,
-	larrtl: 8610,
-	latail: 10521,
-	lbrace: 123,
-	lbrack: 91,
-	lcaron: 318,
-	lcedil: 316,
-	ldquor: 8222,
-	lesdot: 10879,
-	lesges: 10899,
-	lfisht: 10620,
-	lfloor: 8970,
-	lharul: 10602,
-	llhard: 10603,
-	lmidot: 320,
-	lmoust: 9136,
-	loplus: 10797,
-	lowast: 8727,
-	lowbar: 95,
-	lparlt: 10643,
-	lrhard: 10605,
-	lsaquo: 8249,
-	lsquor: 8218,
-	lstrok: 322,
-	lthree: 8907,
-	ltimes: 8905,
-	ltlarr: 10614,
-	ltrPar: 10646,
-	mapsto: 8614,
-	marker: 9646,
-	mcomma: 10793,
-	midast: 42,
-	midcir: 10992,
+	'isinE;': 8953,
+	'isins;': 8948,
+	'isinv;': 8712,
+	'iukcy;': 1110,
+	'jcirc;': 309,
+	'jmath;': 567,
+	'jukcy;': 1108,
+	'kappa;': 954,
+	'lAarr;': 8666,
+	'lBarr;': 10510,
+	'langd;': 10641,
+	'laquo;': 171,
+	'larrb;': 8676,
+	'lates;': 10925,
+	'lbarr;': 10508,
+	'lbbrk;': 10098,
+	'lbrke;': 10635,
+	'lceil;': 8968,
+	'ldquo;': 8220,
+	'lescc;': 10920,
+	'lhard;': 8637,
+	'lharu;': 8636,
+	'lhblk;': 9604,
+	'llarr;': 8647,
+	'lltri;': 9722,
+	'lneqq;': 8808,
+	'lnsim;': 8934,
+	'loang;': 10220,
+	'loarr;': 8701,
+	'lobrk;': 10214,
+	'lopar;': 10629,
+	'lrarr;': 8646,
+	'lrhar;': 8651,
+	'lrtri;': 8895,
+	'lsime;': 10893,
+	'lsimg;': 10895,
+	'lsquo;': 8216,
+	'ltcir;': 10873,
+	'ltdot;': 8918,
+	'ltrie;': 8884,
+	'ltrif;': 9666,
+	'mDDot;': 8762,
+	'mdash;': 8212,
+	'micro;': 181,
 	middot: 183,
-	minusb: 8863,
-	minusd: 8760,
-	mnplus: 8723,
-	models: 8871,
-	mstpos: 8766,
-	nVDash: 8879,
-	nVdash: 8878,
-	nacute: 324,
-	ncaron: 328,
-	ncedil: 326,
-	nearhk: 10532,
-	nequiv: 8802,
-	nesear: 10536,
-	nexist: 8708,
-	nltrie: 8940,
-	nprcue: 8928,
-	nrtrie: 8941,
-	nsccue: 8929,
-	nsimeq: 8772,
+	'minus;': 8722,
+	'mumap;': 8888,
+	'nabla;': 8711,
+	'napid;': 8779,
+	'napos;': 329,
+	'natur;': 9838,
+	'nbump;': 8782,
+	'ncong;': 8775,
+	'ndash;': 8211,
+	'neArr;': 8663,
+	'nearr;': 8599,
+	'nedot;': 8784,
+	'nesim;': 8770,
+	'ngeqq;': 8807,
+	'ngsim;': 8821,
+	'nhArr;': 8654,
+	'nharr;': 8622,
+	'nhpar;': 10994,
+	'nlArr;': 8653,
+	'nlarr;': 8602,
+	'nleqq;': 8806,
+	'nless;': 8814,
+	'nlsim;': 8820,
+	'nltri;': 8938,
+	'notin;': 8713,
+	'notni;': 8716,
+	'npart;': 8706,
+	'nprec;': 8832,
+	'nrArr;': 8655,
+	'nrarr;': 8603,
+	'nrtri;': 8939,
+	'nsime;': 8772,
+	'nsmid;': 8740,
+	'nspar;': 8742,
+	'nsubE;': 10949,
+	'nsube;': 8840,
+	'nsucc;': 8833,
+	'nsupE;': 10950,
+	'nsupe;': 8841,
 	ntilde: 241,
-	numero: 8470,
-	nvDash: 8877,
-	nvHarr: 10500,
-	nvdash: 8876,
-	nvlArr: 10498,
-	nvrArr: 10499,
-	nwarhk: 10531,
-	nwnear: 10535,
+	'numsp;': 8199,
+	'nvsim;': 8764,
+	'nwArr;': 8662,
+	'nwarr;': 8598,
 	oacute: 243,
-	odblac: 337,
-	odsold: 10684,
+	'ocirc;': 244,
+	'odash;': 8861,
+	'oelig;': 339,
+	'ofcir;': 10687,
 	ograve: 242,
-	ominus: 8854,
-	origof: 8886,
+	'ohbar;': 10677,
+	'olarr;': 8634,
+	'olcir;': 10686,
+	'oline;': 8254,
+	'omacr;': 333,
+	'omega;': 969,
+	'operp;': 10681,
+	'oplus;': 8853,
+	'orarr;': 8635,
+	'order;': 8500,
 	oslash: 248,
 	otilde: 245,
-	otimes: 8855,
-	parsim: 10995,
-	percnt: 37,
-	period: 46,
-	permil: 8240,
-	phmmat: 8499,
-	planck: 8463,
-	plankv: 8463,
-	plusdo: 8724,
-	plusdu: 10789,
+	'ovbar;': 9021,
+	'parsl;': 11005,
+	'phone;': 9742,
+	'plusb;': 8862,
+	'pluse;': 10866,
 	plusmn: 177,
-	preceq: 10927,
-	primes: 8473,
-	prnsim: 8936,
-	propto: 8733,
-	prurel: 8880,
-	puncsp: 8200,
-	qprime: 8279,
-	rAtail: 10524,
-	racute: 341,
-	rangle: 10217,
-	rarrap: 10613,
-	rarrfs: 10526,
-	rarrhk: 8618,
-	rarrlp: 8620,
-	rarrpl: 10565,
-	rarrtl: 8611,
-	ratail: 10522,
-	rbrace: 125,
-	rbrack: 93,
-	rcaron: 345,
-	rcedil: 343,
-	rdquor: 8221,
-	rfisht: 10621,
-	rfloor: 8971,
-	rharul: 10604,
-	rmoust: 9137,
-	roplus: 10798,
-	rpargt: 10644,
-	rsaquo: 8250,
-	rsquor: 8217,
-	rthree: 8908,
-	rtimes: 8906,
-	sacute: 347,
-	scaron: 353,
-	scedil: 351,
-	scnsim: 8937,
-	searhk: 10533,
-	seswar: 10537,
-	sfrown: 8994,
-	shchcy: 1097,
-	sigmaf: 962,
-	sigmav: 962,
-	simdot: 10858,
-	smashp: 10803,
-	softcy: 1100,
-	solbar: 9023,
-	spades: 9824,
-	sqsube: 8849,
-	sqsupe: 8850,
-	square: 9633,
-	squarf: 9642,
-	ssetmn: 8726,
-	ssmile: 8995,
-	sstarf: 8902,
-	subdot: 10941,
-	subset: 8834,
-	subsim: 10951,
-	subsub: 10965,
-	subsup: 10963,
-	succeq: 10928,
-	supdot: 10942,
-	supset: 8835,
-	supsim: 10952,
-	supsub: 10964,
-	supsup: 10966,
-	swarhk: 10534,
-	swnwar: 10538,
-	target: 8982,
-	tcaron: 357,
-	tcedil: 355,
-	telrec: 8981,
-	there4: 8756,
-	thetav: 977,
-	thinsp: 8201,
-	thksim: 8764,
-	timesb: 8864,
-	timesd: 10800,
-	topbot: 9014,
-	topcir: 10993,
-	tprime: 8244,
-	tridot: 9708,
-	tstrok: 359,
+	'pound;': 163,
+	'prcue;': 8828,
+	'prime;': 8242,
+	'prnap;': 10937,
+	'prsim;': 8830,
+	'quest;': 63,
+	'rAarr;': 8667,
+	'rBarr;': 10511,
+	'radic;': 8730,
+	'rangd;': 10642,
+	'range;': 10661,
+	'raquo;': 187,
+	'rarrb;': 8677,
+	'rarrc;': 10547,
+	'rarrw;': 8605,
+	'ratio;': 8758,
+	'rbarr;': 10509,
+	'rbbrk;': 10099,
+	'rbrke;': 10636,
+	'rceil;': 8969,
+	'rdquo;': 8221,
+	'reals;': 8477,
+	'rhard;': 8641,
+	'rharu;': 8640,
+	'rlarr;': 8644,
+	'rlhar;': 8652,
+	'rnmid;': 10990,
+	'roang;': 10221,
+	'roarr;': 8702,
+	'robrk;': 10215,
+	'ropar;': 10630,
+	'rrarr;': 8649,
+	'rsquo;': 8217,
+	'rtrie;': 8885,
+	'rtrif;': 9656,
+	'sbquo;': 8218,
+	'sccue;': 8829,
+	'scirc;': 349,
+	'scnap;': 10938,
+	'scsim;': 8831,
+	'sdotb;': 8865,
+	'sdote;': 10854,
+	'seArr;': 8664,
+	'searr;': 8600,
+	'setmn;': 8726,
+	'sharp;': 9839,
+	'sigma;': 963,
+	'simeq;': 8771,
+	'simgE;': 10912,
+	'simlE;': 10911,
+	'simne;': 8774,
+	'slarr;': 8592,
+	'smile;': 8995,
+	'smtes;': 10924,
+	'sqcap;': 8851,
+	'sqcup;': 8852,
+	'sqsub;': 8847,
+	'sqsup;': 8848,
+	'srarr;': 8594,
+	'starf;': 9733,
+	'strns;': 175,
+	'subnE;': 10955,
+	'subne;': 8842,
+	'supnE;': 10956,
+	'supne;': 8843,
+	'swArr;': 8665,
+	'swarr;': 8601,
+	'szlig;': 223,
+	'theta;': 952,
+	'thkap;': 8776,
+	'thorn;': 254,
+	'tilde;': 732,
+	'times;': 215,
+	'trade;': 8482,
+	'trisb;': 10701,
+	'tshcy;': 1115,
+	'twixt;': 8812,
 	uacute: 250,
-	ubreve: 365,
-	udblac: 369,
-	ufisht: 10622,
+	'ubrcy;': 1118,
+	'ucirc;': 251,
+	'udarr;': 8645,
+	'udhar;': 10606,
 	ugrave: 249,
-	ulcorn: 8988,
-	ulcrop: 8975,
-	urcorn: 8989,
-	urcrop: 8974,
-	utilde: 361,
-	vangrt: 10652,
-	varphi: 966,
-	varrho: 1009,
-	veebar: 8891,
-	vellip: 8942,
-	verbar: 124,
-	wedbar: 10847,
-	wedgeq: 8793,
-	weierp: 8472,
-	wreath: 8768,
-	xoplus: 10753,
-	xotime: 10754,
-	xsqcup: 10758,
-	xuplus: 10756,
-	xwedge: 8896,
+	'uharl;': 8639,
+	'uharr;': 8638,
+	'uhblk;': 9600,
+	'ultri;': 9720,
+	'umacr;': 363,
+	'uogon;': 371,
+	'uplus;': 8846,
+	'upsih;': 978,
+	'uring;': 367,
+	'urtri;': 9721,
+	'utdot;': 8944,
+	'utrif;': 9652,
+	'uuarr;': 8648,
+	'vBarv;': 10985,
+	'vDash;': 8872,
+	'varpi;': 982,
+	'vdash;': 8866,
+	'veeeq;': 8794,
+	'vltri;': 8882,
+	'vnsub;': 8834,
+	'vnsup;': 8835,
+	'vprop;': 8733,
+	'vrtri;': 8883,
+	'wcirc;': 373,
+	'wedge;': 8743,
+	'xcirc;': 9711,
+	'xdtri;': 9661,
+	'xhArr;': 10234,
+	'xharr;': 10231,
+	'xlArr;': 10232,
+	'xlarr;': 10229,
+	'xodot;': 10752,
+	'xrArr;': 10233,
+	'xrarr;': 10230,
+	'xutri;': 9651,
 	yacute: 253,
-	zacute: 378,
-	zcaron: 382,
-	zeetrf: 8488,
+	'ycirc;': 375,
 	AElig: 198,
 	Acirc: 194,
-	Alpha: 913,
-	Amacr: 256,
-	Aogon: 260,
+	'Aopf;': 120120,
 	Aring: 197,
-	Breve: 728,
-	Ccirc: 264,
-	Colon: 8759,
-	Cross: 10799,
-	Dashv: 10980,
-	Delta: 916,
+	'Ascr;': 119964,
+	'Auml;': 196,
+	'Barv;': 10983,
+	'Beta;': 914,
+	'Bopf;': 120121,
+	'Bscr;': 8492,
+	'CHcy;': 1063,
+	'COPY;': 169,
+	'Cdot;': 266,
+	'Copf;': 8450,
+	'Cscr;': 119966,
+	'DJcy;': 1026,
+	'DScy;': 1029,
+	'DZcy;': 1039,
+	'Darr;': 8609,
+	'Dopf;': 120123,
+	'Dscr;': 119967,
 	Ecirc: 202,
-	Emacr: 274,
-	Eogon: 280,
-	Equal: 10869,
-	Gamma: 915,
-	Gcirc: 284,
-	Hacek: 711,
-	Hcirc: 292,
-	IJlig: 306,
+	'Edot;': 278,
+	'Eopf;': 120124,
+	'Escr;': 8496,
+	'Esim;': 10867,
+	'Euml;': 203,
+	'Fopf;': 120125,
+	'Fscr;': 8497,
+	'GJcy;': 1027,
+	'Gdot;': 288,
+	'Gopf;': 120126,
+	'Gscr;': 119970,
+	'Hopf;': 8461,
+	'Hscr;': 8459,
+	'IEcy;': 1045,
+	'IOcy;': 1025,
 	Icirc: 206,
-	Imacr: 298,
-	Iogon: 302,
-	Iukcy: 1030,
-	Jcirc: 308,
-	Jukcy: 1028,
-	Kappa: 922,
-	OElig: 338,
+	'Idot;': 304,
+	'Iopf;': 120128,
+	'Iota;': 921,
+	'Iscr;': 8464,
+	'Iuml;': 207,
+	'Jopf;': 120129,
+	'Jscr;': 119973,
+	'KHcy;': 1061,
+	'KJcy;': 1036,
+	'Kopf;': 120130,
+	'Kscr;': 119974,
+	'LJcy;': 1033,
+	'Lang;': 10218,
+	'Larr;': 8606,
+	'Lopf;': 120131,
+	'Lscr;': 8466,
+	'Mopf;': 120132,
+	'Mscr;': 8499,
+	'NJcy;': 1034,
+	'Nopf;': 8469,
+	'Nscr;': 119977,
 	Ocirc: 212,
-	Omacr: 332,
-	Omega: 937,
-	Prime: 8243,
-	RBarr: 10512,
-	Scirc: 348,
-	Sigma: 931,
+	'Oopf;': 120134,
+	'Oscr;': 119978,
+	'Ouml;': 214,
+	'Popf;': 8473,
+	'Pscr;': 119979,
+	'QUOT;': 34,
+	'Qopf;': 8474,
+	'Qscr;': 119980,
+	'Rang;': 10219,
+	'Rarr;': 8608,
+	'Ropf;': 8477,
+	'Rscr;': 8475,
+	'SHcy;': 1064,
+	'Sopf;': 120138,
+	'Sqrt;': 8730,
+	'Sscr;': 119982,
+	'Star;': 8902,
 	THORN: 222,
-	TRADE: 8482,
-	TSHcy: 1035,
-	Theta: 920,
-	Tilde: 8764,
-	Ubrcy: 1038,
+	'TScy;': 1062,
+	'Topf;': 120139,
+	'Tscr;': 119983,
+	'Uarr;': 8607,
 	Ucirc: 219,
-	Umacr: 362,
-	Union: 8899,
-	Uogon: 370,
-	UpTee: 8869,
-	Uring: 366,
-	VDash: 8875,
-	Vdash: 8873,
-	Wcirc: 372,
-	Wedge: 8896,
-	Ycirc: 374,
+	'Uopf;': 120140,
+	'Upsi;': 978,
+	'Uscr;': 119984,
+	'Uuml;': 220,
+	'Vbar;': 10987,
+	'Vert;': 8214,
+	'Vopf;': 120141,
+	'Vscr;': 119985,
+	'Wopf;': 120142,
+	'Wscr;': 119986,
+	'Xopf;': 120143,
+	'Xscr;': 119987,
+	'YAcy;': 1071,
+	'YIcy;': 1031,
+	'YUcy;': 1070,
+	'Yopf;': 120144,
+	'Yscr;': 119988,
+	'Yuml;': 376,
+	'ZHcy;': 1046,
+	'Zdot;': 379,
+	'Zeta;': 918,
+	'Zopf;': 8484,
+	'Zscr;': 119989,
 	acirc: 226,
 	acute: 180,
 	aelig: 230,
-	aleph: 8501,
-	alpha: 945,
-	amacr: 257,
-	amalg: 10815,
-	angle: 8736,
-	angrt: 8735,
-	angst: 8491,
-	aogon: 261,
+	'andd;': 10844,
+	'andv;': 10842,
+	'ange;': 10660,
+	'aopf;': 120146,
+	'apid;': 8779,
+	'apos;': 39,
 	aring: 229,
-	asymp: 8776,
-	awint: 10769,
-	bcong: 8780,
-	bdquo: 8222,
-	bepsi: 1014,
-	blank: 9251,
-	blk12: 9618,
-	blk14: 9617,
-	blk34: 9619,
-	block: 9608,
-	boxDL: 9559,
-	boxDR: 9556,
-	boxDl: 9558,
-	boxDr: 9555,
-	boxHD: 9574,
-	boxHU: 9577,
-	boxHd: 9572,
-	boxHu: 9575,
-	boxUL: 9565,
-	boxUR: 9562,
-	boxUl: 9564,
-	boxUr: 9561,
-	boxVH: 9580,
-	boxVL: 9571,
-	boxVR: 9568,
-	boxVh: 9579,
-	boxVl: 9570,
-	boxVr: 9567,
-	boxdL: 9557,
-	boxdR: 9554,
-	boxdl: 9488,
-	boxdr: 9484,
-	boxhD: 9573,
-	boxhU: 9576,
-	boxhd: 9516,
-	boxhu: 9524,
-	boxuL: 9563,
-	boxuR: 9560,
-	boxul: 9496,
-	boxur: 9492,
-	boxvH: 9578,
-	boxvL: 9569,
-	boxvR: 9566,
-	boxvh: 9532,
-	boxvl: 9508,
-	boxvr: 9500,
-	breve: 728,
-	bsemi: 8271,
-	bsime: 8909,
-	bsolb: 10693,
-	bumpE: 10926,
-	bumpe: 8783,
-	caret: 8257,
-	caron: 711,
-	ccaps: 10829,
-	ccirc: 265,
-	ccups: 10828,
+	'ascr;': 119990,
+	'auml;': 228,
+	'bNot;': 10989,
+	'bbrk;': 9141,
+	'beta;': 946,
+	'beth;': 8502,
+	'bnot;': 8976,
+	'bopf;': 120147,
+	'boxH;': 9552,
+	'boxV;': 9553,
+	'boxh;': 9472,
+	'boxv;': 9474,
+	'bscr;': 119991,
+	'bsim;': 8765,
+	'bsol;': 92,
+	'bull;': 8226,
+	'bump;': 8782,
+	'caps;': 8745,
+	'cdot;': 267,
 	cedil: 184,
-	check: 10003,
-	clubs: 9827,
-	colon: 58,
-	comma: 44,
-	crarr: 8629,
-	cross: 10007,
-	csube: 10961,
-	csupe: 10962,
-	ctdot: 8943,
-	cuepr: 8926,
-	cuesc: 8927,
-	cupor: 10821,
-	cuvee: 8910,
-	cuwed: 8911,
-	cwint: 8753,
-	dashv: 8867,
-	dblac: 733,
-	ddarr: 8650,
-	delta: 948,
-	dharl: 8643,
-	dharr: 8642,
-	diams: 9830,
-	disin: 8946,
-	doteq: 8784,
-	dtdot: 8945,
-	dtrif: 9662,
-	duarr: 8693,
-	duhar: 10607,
-	eDDot: 10871,
+	'cent;': 162,
+	'chcy;': 1095,
+	'cirE;': 10691,
+	'circ;': 710,
+	'cire;': 8791,
+	'comp;': 8705,
+	'cong;': 8773,
+	'copf;': 120148,
+	'copy;': 169,
+	'cscr;': 119992,
+	'csub;': 10959,
+	'csup;': 10960,
+	'cups;': 8746,
+	'dArr;': 8659,
+	'dHar;': 10597,
+	'darr;': 8595,
+	'dash;': 8208,
+	'diam;': 8900,
+	'djcy;': 1106,
+	'dopf;': 120149,
+	'dscr;': 119993,
+	'dscy;': 1109,
+	'dsol;': 10742,
+	'dtri;': 9663,
+	'dzcy;': 1119,
+	'eDot;': 8785,
+	'ecir;': 8790,
 	ecirc: 234,
-	efDot: 8786,
-	emacr: 275,
-	empty: 8709,
-	eogon: 281,
-	eplus: 10865,
-	epsiv: 949,
-	eqsim: 8770,
-	equiv: 8801,
-	erDot: 8787,
-	erarr: 10609,
-	esdot: 8784,
-	exist: 8707,
-	fflig: 64256,
-	filig: 64257,
-	fllig: 64258,
-	fltns: 9649,
-	forkv: 10969,
-	frasl: 8260,
-	frown: 8994,
-	gamma: 947,
-	gcirc: 285,
-	gescc: 10921,
-	gimel: 8503,
-	gneqq: 8809,
-	gnsim: 8935,
-	grave: 96,
-	gsime: 10894,
-	gsiml: 10896,
-	gtcir: 10874,
-	gtdot: 8919,
-	harrw: 8621,
-	hcirc: 293,
-	hoarr: 8703,
+	'edot;': 279,
+	'emsp;': 8195,
+	'ensp;': 8194,
+	'eopf;': 120150,
+	'epar;': 8917,
+	'epsi;': 949,
+	'escr;': 8495,
+	'esim;': 8770,
+	'euml;': 235,
+	'euro;': 8364,
+	'excl;': 33,
+	'flat;': 9837,
+	'fnof;': 402,
+	'fopf;': 120151,
+	'fork;': 8916,
+	'fscr;': 119995,
+	'gdot;': 289,
+	'geqq;': 8807,
+	'gesl;': 8923,
+	'gjcy;': 1107,
+	'gnap;': 10890,
+	'gneq;': 10888,
+	'gopf;': 120152,
+	'gscr;': 8458,
+	'gsim;': 8819,
+	'gtcc;': 10919,
+	'gvnE;': 8809,
+	'hArr;': 8660,
+	'half;': 189,
+	'harr;': 8596,
+	'hbar;': 8463,
+	'hopf;': 120153,
+	'hscr;': 119997,
 	icirc: 238,
+	'iecy;': 1077,
 	iexcl: 161,
-	iiint: 8749,
-	iiota: 8489,
-	ijlig: 307,
-	imacr: 299,
-	image: 8465,
-	imath: 305,
-	imped: 437,
-	infin: 8734,
-	iogon: 303,
-	iprod: 10812,
-	isinE: 8953,
-	isins: 8948,
-	isinv: 8712,
-	iukcy: 1110,
-	jcirc: 309,
-	jmath: 567,
-	jukcy: 1108,
-	kappa: 954,
-	lAarr: 8666,
-	lBarr: 10510,
-	langd: 10641,
+	'imof;': 8887,
+	'iocy;': 1105,
+	'iopf;': 120154,
+	'iota;': 953,
+	'iscr;': 119998,
+	'isin;': 8712,
+	'iuml;': 239,
+	'jopf;': 120155,
+	'jscr;': 119999,
+	'khcy;': 1093,
+	'kjcy;': 1116,
+	'kopf;': 120156,
+	'kscr;': 120000,
+	'lArr;': 8656,
+	'lHar;': 10594,
+	'lang;': 10216,
 	laquo: 171,
-	larrb: 8676,
-	lbarr: 10508,
-	lbbrk: 10098,
-	lbrke: 10635,
-	lceil: 8968,
-	ldquo: 8220,
-	lescc: 10920,
-	lhard: 8637,
-	lharu: 8636,
-	lhblk: 9604,
-	llarr: 8647,
-	lltri: 9722,
-	lneqq: 8808,
-	lnsim: 8934,
-	loang: 10220,
-	loarr: 8701,
-	lobrk: 10214,
-	lopar: 10629,
-	lrarr: 8646,
-	lrhar: 8651,
-	lrtri: 8895,
-	lsime: 10893,
-	lsimg: 10895,
-	lsquo: 8216,
-	ltcir: 10873,
-	ltdot: 8918,
-	ltrie: 8884,
-	ltrif: 9666,
-	mDDot: 8762,
-	mdash: 8212,
+	'larr;': 8592,
+	'late;': 10925,
+	'lcub;': 123,
+	'ldca;': 10550,
+	'ldsh;': 8626,
+	'leqq;': 8806,
+	'lesg;': 8922,
+	'ljcy;': 1113,
+	'lnap;': 10889,
+	'lneq;': 10887,
+	'lopf;': 120157,
+	'lozf;': 10731,
+	'lpar;': 40,
+	'lscr;': 120001,
+	'lsim;': 8818,
+	'lsqb;': 91,
+	'ltcc;': 10918,
+	'ltri;': 9667,
+	'lvnE;': 8808,
+	'macr;': 175,
+	'male;': 9794,
+	'malt;': 10016,
 	micro: 181,
-	minus: 8722,
-	mumap: 8888,
-	nabla: 8711,
-	napos: 329,
-	natur: 9838,
-	ncong: 8775,
-	ndash: 8211,
-	neArr: 8663,
-	nearr: 8599,
-	ngsim: 8821,
-	nhArr: 8654,
-	nharr: 8622,
-	nhpar: 10994,
-	nlArr: 8653,
-	nlarr: 8602,
-	nless: 8814,
-	nlsim: 8820,
-	nltri: 8938,
-	notin: 8713,
-	notni: 8716,
-	nprec: 8832,
-	nrArr: 8655,
-	nrarr: 8603,
-	nrtri: 8939,
-	nsime: 8772,
-	nsmid: 8740,
-	nspar: 8742,
-	nsube: 8840,
-	nsucc: 8833,
-	nsupe: 8841,
-	numsp: 8199,
-	nwArr: 8662,
-	nwarr: 8598,
+	'mlcp;': 10971,
+	'mldr;': 8230,
+	'mopf;': 120158,
+	'mscr;': 120002,
+	'nGtv;': 8811,
+	'nLtv;': 8810,
+	'nang;': 8736,
+	'napE;': 10864,
+	'nbsp;': 160,
+	'ncap;': 10819,
+	'ncup;': 10818,
+	'ngeq;': 8817,
+	'nges;': 10878,
+	'ngtr;': 8815,
+	'nisd;': 8954,
+	'njcy;': 1114,
+	'nldr;': 8229,
+	'nleq;': 8816,
+	'nles;': 10877,
+	'nmid;': 8740,
+	'nopf;': 120159,
+	'npar;': 8742,
+	'npre;': 10927,
+	'nsce;': 10928,
+	'nscr;': 120003,
+	'nsim;': 8769,
+	'nsub;': 8836,
+	'nsup;': 8837,
+	'ntgl;': 8825,
+	'ntlg;': 8824,
+	'nvap;': 8781,
+	'nvge;': 8805,
+	'nvgt;': 62,
+	'nvle;': 8804,
+	'nvlt;': 60,
+	'oast;': 8859,
+	'ocir;': 8858,
 	ocirc: 244,
-	odash: 8861,
-	oelig: 339,
-	ofcir: 10687,
-	ohbar: 10677,
-	olarr: 8634,
-	olcir: 10686,
-	oline: 8254,
-	omacr: 333,
-	omega: 969,
-	operp: 10681,
-	oplus: 8853,
-	orarr: 8635,
-	order: 8500,
-	ovbar: 9021,
-	parsl: 11005,
-	phone: 9742,
-	plusb: 8862,
-	pluse: 10866,
+	'odiv;': 10808,
+	'odot;': 8857,
+	'ogon;': 731,
+	'oint;': 8750,
+	'omid;': 10678,
+	'oopf;': 120160,
+	'opar;': 10679,
+	'ordf;': 170,
+	'ordm;': 186,
+	'oror;': 10838,
+	'oscr;': 8500,
+	'osol;': 8856,
+	'ouml;': 246,
+	'para;': 182,
+	'part;': 8706,
+	'perp;': 8869,
+	'phiv;': 981,
+	'plus;': 43,
+	'popf;': 120161,
 	pound: 163,
-	prcue: 8828,
-	prime: 8242,
-	prnap: 10937,
-	prsim: 8830,
-	quest: 63,
-	rAarr: 8667,
-	rBarr: 10511,
-	radic: 8730,
-	rangd: 10642,
-	range: 10661,
+	'prap;': 10935,
+	'prec;': 8826,
+	'prnE;': 10933,
+	'prod;': 8719,
+	'prop;': 8733,
+	'pscr;': 120005,
+	'qint;': 10764,
+	'qopf;': 120162,
+	'qscr;': 120006,
+	'quot;': 34,
+	'rArr;': 8658,
+	'rHar;': 10596,
+	'race;': 8765,
+	'rang;': 10217,
 	raquo: 187,
-	rarrb: 8677,
-	rarrc: 10547,
-	rarrw: 8605,
-	ratio: 8758,
-	rbarr: 10509,
-	rbbrk: 10099,
-	rbrke: 10636,
-	rceil: 8969,
-	rdquo: 8221,
-	reals: 8477,
-	rhard: 8641,
-	rharu: 8640,
-	rlarr: 8644,
-	rlhar: 8652,
-	rnmid: 10990,
-	roang: 10221,
-	roarr: 8702,
-	robrk: 10215,
-	ropar: 10630,
-	rrarr: 8649,
-	rsquo: 8217,
-	rtrie: 8885,
-	rtrif: 9656,
-	sbquo: 8218,
-	sccue: 8829,
-	scirc: 349,
-	scnap: 10938,
-	scsim: 8831,
-	sdotb: 8865,
-	sdote: 10854,
-	seArr: 8664,
-	searr: 8600,
-	setmn: 8726,
-	sharp: 9839,
-	sigma: 963,
-	simeq: 8771,
-	simgE: 10912,
-	simlE: 10911,
-	simne: 8774,
-	slarr: 8592,
-	smile: 8995,
-	sqcap: 8851,
-	sqcup: 8852,
-	sqsub: 8847,
-	sqsup: 8848,
-	srarr: 8594,
-	starf: 9733,
-	strns: 175,
-	subnE: 10955,
-	subne: 8842,
-	supnE: 10956,
-	supne: 8843,
-	swArr: 8665,
-	swarr: 8601,
+	'rarr;': 8594,
+	'rcub;': 125,
+	'rdca;': 10551,
+	'rdsh;': 8627,
+	'real;': 8476,
+	'rect;': 9645,
+	'rhov;': 1009,
+	'ring;': 730,
+	'ropf;': 120163,
+	'rpar;': 41,
+	'rscr;': 120007,
+	'rsqb;': 93,
+	'rtri;': 9657,
+	'scap;': 10936,
+	'scnE;': 10934,
+	'sdot;': 8901,
+	'sect;': 167,
+	'semi;': 59,
+	'sext;': 10038,
+	'shcy;': 1096,
+	'sime;': 8771,
+	'simg;': 10910,
+	'siml;': 10909,
+	'smid;': 8739,
+	'smte;': 10924,
+	'solb;': 10692,
+	'sopf;': 120164,
+	'spar;': 8741,
+	'squf;': 9642,
+	'sscr;': 120008,
+	'star;': 9734,
+	'subE;': 10949,
+	'sube;': 8838,
+	'succ;': 8827,
+	'sung;': 9834,
+	'sup1;': 185,
+	'sup2;': 178,
+	'sup3;': 179,
+	'supE;': 10950,
+	'supe;': 8839,
 	szlig: 223,
-	theta: 952,
-	thkap: 8776,
+	'tbrk;': 9140,
+	'tdot;': 8411,
 	thorn: 254,
-	tilde: 732,
 	times: 215,
-	trade: 8482,
-	trisb: 10701,
-	tshcy: 1115,
-	twixt: 8812,
-	ubrcy: 1118,
+	'tint;': 8749,
+	'toea;': 10536,
+	'topf;': 120165,
+	'tosa;': 10537,
+	'trie;': 8796,
+	'tscr;': 120009,
+	'tscy;': 1094,
+	'uArr;': 8657,
+	'uHar;': 10595,
+	'uarr;': 8593,
 	ucirc: 251,
-	udarr: 8645,
-	udhar: 10606,
-	uharl: 8639,
-	uharr: 8638,
-	uhblk: 9600,
-	ultri: 9720,
-	umacr: 363,
-	uogon: 371,
-	uplus: 8846,
-	upsih: 978,
-	uring: 367,
-	urtri: 9721,
-	utdot: 8944,
-	utrif: 9652,
-	uuarr: 8648,
-	vBarv: 10985,
-	vDash: 8872,
-	varpi: 982,
-	vdash: 8866,
-	veeeq: 8794,
-	vltri: 8882,
-	vprop: 8733,
-	vrtri: 8883,
-	wcirc: 373,
-	wedge: 8743,
-	xcirc: 9711,
-	xdtri: 9661,
-	xhArr: 10234,
-	xharr: 10231,
-	xlArr: 10232,
-	xlarr: 10229,
-	xodot: 10752,
-	xrArr: 10233,
-	xrarr: 10230,
-	xutri: 9651,
-	ycirc: 375,
-	Aopf: 120120,
-	Ascr: 119964,
+	'uopf;': 120166,
+	'upsi;': 965,
+	'uscr;': 120010,
+	'utri;': 9653,
+	'uuml;': 252,
+	'vArr;': 8661,
+	'vBar;': 10984,
+	'varr;': 8597,
+	'vert;': 124,
+	'vopf;': 120167,
+	'vscr;': 120011,
+	'wopf;': 120168,
+	'wscr;': 120012,
+	'xcap;': 8898,
+	'xcup;': 8899,
+	'xmap;': 10236,
+	'xnis;': 8955,
+	'xopf;': 120169,
+	'xscr;': 120013,
+	'xvee;': 8897,
+	'yacy;': 1103,
+	'yicy;': 1111,
+	'yopf;': 120170,
+	'yscr;': 120014,
+	'yucy;': 1102,
+	'yuml;': 255,
+	'zdot;': 380,
+	'zeta;': 950,
+	'zhcy;': 1078,
+	'zopf;': 120171,
+	'zscr;': 120015,
+	'zwnj;': 8204,
+	'AMP;': 38,
+	'Acy;': 1040,
+	'Afr;': 120068,
+	'And;': 10835,
 	Auml: 196,
-	Barv: 10983,
-	Beta: 914,
-	Bopf: 120121,
-	Bscr: 8492,
-	CHcy: 1063,
+	'Bcy;': 1041,
+	'Bfr;': 120069,
 	COPY: 169,
-	Cdot: 266,
-	Copf: 8450,
-	Cscr: 119966,
-	DJcy: 1026,
-	DScy: 1029,
-	DZcy: 1039,
-	Darr: 8609,
-	Dopf: 120123,
-	Dscr: 119967,
-	Edot: 278,
-	Eopf: 120124,
-	Escr: 8496,
-	Esim: 10867,
+	'Cap;': 8914,
+	'Cfr;': 8493,
+	'Chi;': 935,
+	'Cup;': 8915,
+	'Dcy;': 1044,
+	'Del;': 8711,
+	'Dfr;': 120071,
+	'Dot;': 168,
+	'ENG;': 330,
+	'ETH;': 208,
+	'Ecy;': 1069,
+	'Efr;': 120072,
+	'Eta;': 919,
 	Euml: 203,
-	Fopf: 120125,
-	Fscr: 8497,
-	GJcy: 1027,
-	Gdot: 288,
-	Gopf: 120126,
-	Gscr: 119970,
-	Hopf: 8461,
-	Hscr: 8459,
-	IEcy: 1045,
-	IOcy: 1025,
-	Idot: 304,
-	Iopf: 120128,
-	Iota: 921,
-	Iscr: 8464,
+	'Fcy;': 1060,
+	'Ffr;': 120073,
+	'Gcy;': 1043,
+	'Gfr;': 120074,
+	'Hat;': 94,
+	'Hfr;': 8460,
+	'Icy;': 1048,
+	'Ifr;': 8465,
+	'Int;': 8748,
 	Iuml: 207,
-	Jopf: 120129,
-	Jscr: 119973,
-	KHcy: 1061,
-	KJcy: 1036,
-	Kopf: 120130,
-	Kscr: 119974,
-	LJcy: 1033,
-	Lang: 10218,
-	Larr: 8606,
-	Lopf: 120131,
-	Lscr: 8466,
-	Mopf: 120132,
-	Mscr: 8499,
-	NJcy: 1034,
-	Nopf: 8469,
-	Nscr: 119977,
-	Oopf: 120134,
-	Oscr: 119978,
+	'Jcy;': 1049,
+	'Jfr;': 120077,
+	'Kcy;': 1050,
+	'Kfr;': 120078,
+	'Lcy;': 1051,
+	'Lfr;': 120079,
+	'Lsh;': 8624,
+	'Map;': 10501,
+	'Mcy;': 1052,
+	'Mfr;': 120080,
+	'Ncy;': 1053,
+	'Nfr;': 120081,
+	'Not;': 10988,
+	'Ocy;': 1054,
+	'Ofr;': 120082,
 	Ouml: 214,
-	Popf: 8473,
-	Pscr: 119979,
+	'Pcy;': 1055,
+	'Pfr;': 120083,
+	'Phi;': 934,
+	'Psi;': 936,
 	QUOT: 34,
-	Qopf: 8474,
-	Qscr: 119980,
-	Rang: 10219,
-	Rarr: 8608,
-	Ropf: 8477,
-	Rscr: 8475,
-	SHcy: 1064,
-	Sopf: 120138,
-	Sqrt: 8730,
-	Sscr: 119982,
-	Star: 8902,
-	TScy: 1062,
-	Topf: 120139,
-	Tscr: 119983,
-	Uarr: 8607,
-	Uopf: 120140,
-	Upsi: 978,
-	Uscr: 119984,
+	'Qfr;': 120084,
+	'REG;': 174,
+	'Rcy;': 1056,
+	'Rfr;': 8476,
+	'Rho;': 929,
+	'Rsh;': 8625,
+	'Scy;': 1057,
+	'Sfr;': 120086,
+	'Sub;': 8912,
+	'Sum;': 8721,
+	'Sup;': 8913,
+	'Tab;': 9,
+	'Tau;': 932,
+	'Tcy;': 1058,
+	'Tfr;': 120087,
+	'Ucy;': 1059,
+	'Ufr;': 120088,
 	Uuml: 220,
-	Vbar: 10987,
-	Vert: 8214,
-	Vopf: 120141,
-	Vscr: 119985,
-	Wopf: 120142,
-	Wscr: 119986,
-	Xopf: 120143,
-	Xscr: 119987,
-	YAcy: 1071,
-	YIcy: 1031,
-	YUcy: 1070,
-	Yopf: 120144,
-	Yscr: 119988,
-	Yuml: 376,
-	ZHcy: 1046,
-	Zdot: 379,
-	Zeta: 918,
-	Zopf: 8484,
-	Zscr: 119989,
-	andd: 10844,
-	andv: 10842,
-	ange: 10660,
-	aopf: 120146,
-	apid: 8779,
-	apos: 39,
-	ascr: 119990,
+	'Vcy;': 1042,
+	'Vee;': 8897,
+	'Vfr;': 120089,
+	'Wfr;': 120090,
+	'Xfr;': 120091,
+	'Ycy;': 1067,
+	'Yfr;': 120092,
+	'Zcy;': 1047,
+	'Zfr;': 8488,
+	'acE;': 8766,
+	'acd;': 8767,
+	'acy;': 1072,
+	'afr;': 120094,
+	'amp;': 38,
+	'and;': 8743,
+	'ang;': 8736,
+	'apE;': 10864,
+	'ape;': 8778,
+	'ast;': 42,
 	auml: 228,
-	bNot: 10989,
-	bbrk: 9141,
-	beta: 946,
-	beth: 8502,
-	bnot: 8976,
-	bopf: 120147,
-	boxH: 9552,
-	boxV: 9553,
-	boxh: 9472,
-	boxv: 9474,
-	bscr: 119991,
-	bsim: 8765,
-	bsol: 92,
-	bull: 8226,
-	bump: 8782,
-	cdot: 267,
+	'bcy;': 1073,
+	'bfr;': 120095,
+	'bne;': 61,
+	'bot;': 8869,
+	'cap;': 8745,
 	cent: 162,
-	chcy: 1095,
-	cirE: 10691,
-	circ: 710,
-	cire: 8791,
-	comp: 8705,
-	cong: 8773,
-	copf: 120148,
+	'cfr;': 120096,
+	'chi;': 967,
+	'cir;': 9675,
 	copy: 169,
-	cscr: 119992,
-	csub: 10959,
-	csup: 10960,
-	dArr: 8659,
-	dHar: 10597,
-	darr: 8595,
-	dash: 8208,
-	diam: 8900,
-	djcy: 1106,
-	dopf: 120149,
-	dscr: 119993,
-	dscy: 1109,
-	dsol: 10742,
-	dtri: 9663,
-	dzcy: 1119,
-	eDot: 8785,
-	ecir: 8790,
-	edot: 279,
-	emsp: 8195,
-	ensp: 8194,
-	eopf: 120150,
-	epar: 8917,
-	epsi: 1013,
-	escr: 8495,
-	esim: 8770,
+	'cup;': 8746,
+	'dcy;': 1076,
+	'deg;': 176,
+	'dfr;': 120097,
+	'die;': 168,
+	'div;': 247,
+	'dot;': 729,
+	'ecy;': 1101,
+	'efr;': 120098,
+	'egs;': 10902,
+	'ell;': 8467,
+	'els;': 10901,
+	'eng;': 331,
+	'eta;': 951,
+	'eth;': 240,
 	euml: 235,
-	euro: 8364,
-	excl: 33,
-	flat: 9837,
-	fnof: 402,
-	fopf: 120151,
-	fork: 8916,
-	fscr: 119995,
-	gdot: 289,
-	geqq: 8807,
-	gjcy: 1107,
-	gnap: 10890,
-	gneq: 10888,
-	gopf: 120152,
-	gscr: 8458,
-	gsim: 8819,
-	gtcc: 10919,
-	hArr: 8660,
-	half: 189,
-	harr: 8596,
-	hbar: 8463,
-	hopf: 120153,
-	hscr: 119997,
-	iecy: 1077,
-	imof: 8887,
-	iocy: 1105,
-	iopf: 120154,
-	iota: 953,
-	iscr: 119998,
-	isin: 8712,
+	'fcy;': 1092,
+	'ffr;': 120099,
+	'gEl;': 10892,
+	'gap;': 10886,
+	'gcy;': 1075,
+	'gel;': 8923,
+	'geq;': 8805,
+	'ges;': 10878,
+	'gfr;': 120100,
+	'ggg;': 8921,
+	'glE;': 10898,
+	'gla;': 10917,
+	'glj;': 10916,
+	'gnE;': 8809,
+	'gne;': 10888,
+	'hfr;': 120101,
+	'icy;': 1080,
+	'iff;': 8660,
+	'ifr;': 120102,
+	'int;': 8747,
 	iuml: 239,
-	jopf: 120155,
-	jscr: 119999,
-	khcy: 1093,
-	kjcy: 1116,
-	kopf: 120156,
-	kscr: 120000,
-	lArr: 8656,
-	lHar: 10594,
-	lang: 10216,
-	larr: 8592,
-	late: 10925,
-	lcub: 123,
-	ldca: 10550,
-	ldsh: 8626,
-	leqq: 8806,
-	ljcy: 1113,
-	lnap: 10889,
-	lneq: 10887,
-	lopf: 120157,
-	lozf: 10731,
-	lpar: 40,
-	lscr: 120001,
-	lsim: 8818,
-	lsqb: 91,
-	ltcc: 10918,
-	ltri: 9667,
+	'jcy;': 1081,
+	'jfr;': 120103,
+	'kcy;': 1082,
+	'kfr;': 120104,
+	'lEg;': 10891,
+	'lap;': 10885,
+	'lat;': 10923,
+	'lcy;': 1083,
+	'leg;': 8922,
+	'leq;': 8804,
+	'les;': 10877,
+	'lfr;': 120105,
+	'lgE;': 10897,
+	'lnE;': 8808,
+	'lne;': 10887,
+	'loz;': 9674,
+	'lrm;': 8206,
+	'lsh;': 8624,
 	macr: 175,
-	male: 9794,
-	malt: 10016,
-	mlcp: 10971,
-	mldr: 8230,
-	mopf: 120158,
-	mscr: 120002,
+	'map;': 8614,
+	'mcy;': 1084,
+	'mfr;': 120106,
+	'mho;': 8487,
+	'mid;': 8739,
+	'nGg;': 8921,
+	'nGt;': 8811,
+	'nLl;': 8920,
+	'nLt;': 8810,
+	'nap;': 8777,
 	nbsp: 160,
-	ncap: 10819,
-	ncup: 10818,
-	ngeq: 8817,
-	ngtr: 8815,
-	nisd: 8954,
-	njcy: 1114,
-	nldr: 8229,
-	nleq: 8816,
-	nmid: 8740,
-	nopf: 120159,
-	npar: 8742,
-	nscr: 120003,
-	nsim: 8769,
-	nsub: 8836,
-	nsup: 8837,
-	ntgl: 8825,
-	ntlg: 8824,
-	oast: 8859,
-	ocir: 8858,
-	odiv: 10808,
-	odot: 8857,
-	ogon: 731,
-	oint: 8750,
-	omid: 10678,
-	oopf: 120160,
-	opar: 10679,
+	'ncy;': 1085,
+	'nfr;': 120107,
+	'ngE;': 8807,
+	'nge;': 8817,
+	'ngt;': 8815,
+	'nis;': 8956,
+	'niv;': 8715,
+	'nlE;': 8806,
+	'nle;': 8816,
+	'nlt;': 8814,
+	'not;': 172,
+	'npr;': 8832,
+	'nsc;': 8833,
+	'num;': 35,
+	'ocy;': 1086,
+	'ofr;': 120108,
+	'ogt;': 10689,
+	'ohm;': 937,
+	'olt;': 10688,
+	'ord;': 10845,
 	ordf: 170,
 	ordm: 186,
-	oror: 10838,
-	oscr: 8500,
-	osol: 8856,
+	'orv;': 10843,
 	ouml: 246,
+	'par;': 8741,
 	para: 182,
-	part: 8706,
-	perp: 8869,
-	phiv: 966,
-	plus: 43,
-	popf: 120161,
-	prap: 10935,
-	prec: 8826,
-	prnE: 10933,
-	prod: 8719,
-	prop: 8733,
-	pscr: 120005,
-	qint: 10764,
-	qopf: 120162,
-	qscr: 120006,
+	'pcy;': 1087,
+	'pfr;': 120109,
+	'phi;': 966,
+	'piv;': 982,
+	'prE;': 10931,
+	'pre;': 10927,
+	'psi;': 968,
+	'qfr;': 120110,
 	quot: 34,
-	rArr: 8658,
-	rHar: 10596,
-	race: 10714,
-	rang: 10217,
-	rarr: 8594,
-	rcub: 125,
-	rdca: 10551,
-	rdsh: 8627,
-	real: 8476,
-	rect: 9645,
-	rhov: 1009,
-	ring: 730,
-	ropf: 120163,
-	rpar: 41,
-	rscr: 120007,
-	rsqb: 93,
-	rtri: 9657,
-	scap: 10936,
-	scnE: 10934,
-	sdot: 8901,
+	'rcy;': 1088,
+	'reg;': 174,
+	'rfr;': 120111,
+	'rho;': 961,
+	'rlm;': 8207,
+	'rsh;': 8625,
+	'scE;': 10932,
+	'sce;': 10928,
+	'scy;': 1089,
 	sect: 167,
-	semi: 59,
-	sext: 10038,
-	shcy: 1096,
-	sime: 8771,
-	simg: 10910,
-	siml: 10909,
-	smid: 8739,
-	smte: 10924,
-	solb: 10692,
-	sopf: 120164,
-	spar: 8741,
-	squf: 9642,
-	sscr: 120008,
-	star: 9734,
-	subE: 10949,
-	sube: 8838,
-	succ: 8827,
-	sung: 9834,
+	'sfr;': 120112,
+	'shy;': 173,
+	'sim;': 8764,
+	'smt;': 10922,
+	'sol;': 47,
+	'squ;': 9633,
+	'sub;': 8834,
+	'sum;': 8721,
 	sup1: 185,
 	sup2: 178,
 	sup3: 179,
-	supE: 10950,
-	supe: 8839,
-	tbrk: 9140,
-	tdot: 8411,
-	tint: 8749,
-	toea: 10536,
-	topf: 120165,
-	tosa: 10537,
-	trie: 8796,
-	tscr: 120009,
-	tscy: 1094,
-	uArr: 8657,
-	uHar: 10595,
-	uarr: 8593,
-	uopf: 120166,
-	upsi: 965,
-	uscr: 120010,
-	utri: 9653,
+	'sup;': 8835,
+	'tau;': 964,
+	'tcy;': 1090,
+	'tfr;': 120113,
+	'top;': 8868,
+	'ucy;': 1091,
+	'ufr;': 120114,
+	'uml;': 168,
 	uuml: 252,
-	vArr: 8661,
-	vBar: 10984,
-	varr: 8597,
-	vert: 124,
-	vopf: 120167,
-	vscr: 120011,
-	wopf: 120168,
-	wscr: 120012,
-	xcap: 8898,
-	xcup: 8899,
-	xmap: 10236,
-	xnis: 8955,
-	xopf: 120169,
-	xscr: 120013,
-	xvee: 8897,
-	yacy: 1103,
-	yicy: 1111,
-	yopf: 120170,
-	yscr: 120014,
-	yucy: 1102,
+	'vcy;': 1074,
+	'vee;': 8744,
+	'vfr;': 120115,
+	'wfr;': 120116,
+	'xfr;': 120117,
+	'ycy;': 1099,
+	'yen;': 165,
+	'yfr;': 120118,
 	yuml: 255,
-	zdot: 380,
-	zeta: 950,
-	zhcy: 1078,
-	zopf: 120171,
-	zscr: 120015,
-	zwnj: 8204,
+	'zcy;': 1079,
+	'zfr;': 120119,
+	'zwj;': 8205,
 	AMP: 38,
-	Acy: 1040,
-	Afr: 120068,
-	And: 10835,
-	Bcy: 1041,
-	Bfr: 120069,
-	Cap: 8914,
-	Cfr: 8493,
-	Chi: 935,
-	Cup: 8915,
-	Dcy: 1044,
-	Del: 8711,
-	Dfr: 120071,
-	Dot: 168,
-	ENG: 330,
+	'DD;': 8517,
 	ETH: 208,
-	Ecy: 1069,
-	Efr: 120072,
-	Eta: 919,
-	Fcy: 1060,
-	Ffr: 120073,
-	Gcy: 1043,
-	Gfr: 120074,
-	Hat: 94,
-	Hfr: 8460,
-	Icy: 1048,
-	Ifr: 8465,
-	Int: 8748,
-	Jcy: 1049,
-	Jfr: 120077,
-	Kcy: 1050,
-	Kfr: 120078,
-	Lcy: 1051,
-	Lfr: 120079,
-	Lsh: 8624,
-	Map: 10501,
-	Mcy: 1052,
-	Mfr: 120080,
-	Ncy: 1053,
-	Nfr: 120081,
-	Not: 10988,
-	Ocy: 1054,
-	Ofr: 120082,
-	Pcy: 1055,
-	Pfr: 120083,
-	Phi: 934,
-	Psi: 936,
-	Qfr: 120084,
+	'GT;': 62,
+	'Gg;': 8921,
+	'Gt;': 8811,
+	'Im;': 8465,
+	'LT;': 60,
+	'Ll;': 8920,
+	'Lt;': 8810,
+	'Mu;': 924,
+	'Nu;': 925,
+	'Or;': 10836,
+	'Pi;': 928,
+	'Pr;': 10939,
 	REG: 174,
-	Rcy: 1056,
-	Rfr: 8476,
-	Rho: 929,
-	Rsh: 8625,
-	Scy: 1057,
-	Sfr: 120086,
-	Sub: 8912,
-	Sum: 8721,
-	Sup: 8913,
-	Tab: 9,
-	Tau: 932,
-	Tcy: 1058,
-	Tfr: 120087,
-	Ucy: 1059,
-	Ufr: 120088,
-	Vcy: 1042,
-	Vee: 8897,
-	Vfr: 120089,
-	Wfr: 120090,
-	Xfr: 120091,
-	Ycy: 1067,
-	Yfr: 120092,
-	Zcy: 1047,
-	Zfr: 8488,
-	acd: 8767,
-	acy: 1072,
-	afr: 120094,
+	'Re;': 8476,
+	'Sc;': 10940,
+	'Xi;': 926,
+	'ac;': 8766,
+	'af;': 8289,
 	amp: 38,
-	and: 8743,
-	ang: 8736,
-	apE: 10864,
-	ape: 8778,
-	ast: 42,
-	bcy: 1073,
-	bfr: 120095,
-	bot: 8869,
-	cap: 8745,
-	cfr: 120096,
-	chi: 967,
-	cir: 9675,
-	cup: 8746,
-	dcy: 1076,
+	'ap;': 8776,
+	'dd;': 8518,
 	deg: 176,
-	dfr: 120097,
-	die: 168,
-	div: 247,
-	dot: 729,
-	ecy: 1101,
-	efr: 120098,
-	egs: 10902,
-	ell: 8467,
-	els: 10901,
-	eng: 331,
-	eta: 951,
+	'ee;': 8519,
+	'eg;': 10906,
+	'el;': 10905,
 	eth: 240,
-	fcy: 1092,
-	ffr: 120099,
-	gEl: 10892,
-	gap: 10886,
-	gcy: 1075,
-	gel: 8923,
-	geq: 8805,
-	ges: 10878,
-	gfr: 120100,
-	ggg: 8921,
-	glE: 10898,
-	gla: 10917,
-	glj: 10916,
-	gnE: 8809,
-	gne: 10888,
-	hfr: 120101,
-	icy: 1080,
-	iff: 8660,
-	ifr: 120102,
-	int: 8747,
-	jcy: 1081,
-	jfr: 120103,
-	kcy: 1082,
-	kfr: 120104,
-	lEg: 10891,
-	lap: 10885,
-	lat: 10923,
-	lcy: 1083,
-	leg: 8922,
-	leq: 8804,
-	les: 10877,
-	lfr: 120105,
-	lgE: 10897,
-	lnE: 8808,
-	lne: 10887,
-	loz: 9674,
-	lrm: 8206,
-	lsh: 8624,
-	map: 8614,
-	mcy: 1084,
-	mfr: 120106,
-	mho: 8487,
-	mid: 8739,
-	nap: 8777,
-	ncy: 1085,
-	nfr: 120107,
-	nge: 8817,
-	ngt: 8815,
-	nis: 8956,
-	niv: 8715,
-	nle: 8816,
-	nlt: 8814,
+	'gE;': 8807,
+	'ge;': 8805,
+	'gg;': 8811,
+	'gl;': 8823,
+	'gt;': 62,
+	'ic;': 8291,
+	'ii;': 8520,
+	'in;': 8712,
+	'it;': 8290,
+	'lE;': 8806,
+	'le;': 8804,
+	'lg;': 8822,
+	'll;': 8810,
+	'lt;': 60,
+	'mp;': 8723,
+	'mu;': 956,
+	'ne;': 8800,
+	'ni;': 8715,
 	not: 172,
-	npr: 8832,
-	nsc: 8833,
-	num: 35,
-	ocy: 1086,
-	ofr: 120108,
-	ogt: 10689,
-	ohm: 8486,
-	olt: 10688,
-	ord: 10845,
-	orv: 10843,
-	par: 8741,
-	pcy: 1087,
-	pfr: 120109,
-	phi: 966,
-	piv: 982,
-	prE: 10931,
-	pre: 10927,
-	psi: 968,
-	qfr: 120110,
-	rcy: 1088,
+	'nu;': 957,
+	'oS;': 9416,
+	'or;': 8744,
+	'pi;': 960,
+	'pm;': 177,
+	'pr;': 8826,
 	reg: 174,
-	rfr: 120111,
-	rho: 961,
-	rlm: 8207,
-	rsh: 8625,
-	scE: 10932,
-	sce: 10928,
-	scy: 1089,
-	sfr: 120112,
+	'rx;': 8478,
+	'sc;': 8827,
 	shy: 173,
-	sim: 8764,
-	smt: 10922,
-	sol: 47,
-	squ: 9633,
-	sub: 8834,
-	sum: 8721,
-	sup: 8835,
-	tau: 964,
-	tcy: 1090,
-	tfr: 120113,
-	top: 8868,
-	ucy: 1091,
-	ufr: 120114,
 	uml: 168,
-	vcy: 1074,
-	vee: 8744,
-	vfr: 120115,
-	wfr: 120116,
-	xfr: 120117,
-	ycy: 1099,
+	'wp;': 8472,
+	'wr;': 8768,
+	'xi;': 958,
 	yen: 165,
-	yfr: 120118,
-	zcy: 1079,
-	zfr: 120119,
-	zwj: 8205,
-	DD: 8517,
 	GT: 62,
-	Gg: 8921,
-	Gt: 8811,
-	Im: 8465,
 	LT: 60,
-	Ll: 8920,
-	Lt: 8810,
-	Mu: 924,
-	Nu: 925,
-	Or: 10836,
-	Pi: 928,
-	Pr: 10939,
-	Re: 8476,
-	Sc: 10940,
-	Xi: 926,
-	ac: 8766,
-	af: 8289,
-	ap: 8776,
-	dd: 8518,
-	ee: 8519,
-	eg: 10906,
-	el: 10905,
-	gE: 8807,
-	ge: 8805,
-	gg: 8811,
-	gl: 8823,
 	gt: 62,
-	ic: 8291,
-	ii: 8520,
-	in: 8712,
-	it: 8290,
-	lE: 8806,
-	le: 8804,
-	lg: 8822,
-	ll: 8810,
-	lt: 60,
-	mp: 8723,
-	mu: 956,
-	ne: 8800,
-	ni: 8715,
-	nu: 957,
-	oS: 9416,
-	or: 8744,
-	pi: 960,
-	pm: 177,
-	pr: 8826,
-	rx: 8478,
-	sc: 8827,
-	wp: 8472,
-	wr: 8768,
-	xi: 958
+	lt: 60
 };
diff --git a/src/compiler/parse/utils/html.ts b/src/compiler/parse/utils/html.ts
index 0148361929..65797b7a09 100644
--- a/src/compiler/parse/utils/html.ts
+++ b/src/compiler/parse/utils/html.ts
@@ -35,12 +35,32 @@ const windows_1252 = [
 	376
 ];
 
-const entity_pattern = new RegExp(
-	`&(#?(?:x[\\w\\d]+|\\d+|${Object.keys(entities).join('|')}))(?:;|\\b)`,
-	'g'
-);
+function reg_exp_entity(entity_name: string, is_attribute_value: boolean) {
+	// https://html.spec.whatwg.org/multipage/parsing.html#named-character-reference-state
+	// doesn't decode the html entity which not ends with ; and next character is =, number or alphabet in attribute value.
+	if (is_attribute_value && !entity_name.endsWith(';')) {
+		return `${entity_name}\\b(?!=)`;
+	}
+	return entity_name;
+}
+
+function get_entity_pattern(is_attribute_value: boolean) {
+	const reg_exp_num = '#(?:x[a-fA-F\\d]+|\\d+)(?:;)?';
+	const reg_exp_entities = Object.keys(entities).map(entity_name => reg_exp_entity(entity_name, is_attribute_value));
+
+	const entity_pattern = new RegExp(
+		`&(${reg_exp_num}|${reg_exp_entities.join('|')})`,
+		'g'
+	);
+
+	return entity_pattern;
+}
+
+const entity_pattern_content = get_entity_pattern(false);
+const entity_pattern_attr_value = get_entity_pattern(true);
 
-export function decode_character_references(html: string) {
+export function decode_character_references(html: string, is_attribute_value: boolean) {
+	const entity_pattern = is_attribute_value ? entity_pattern_attr_value : entity_pattern_content;
 	return html.replace(entity_pattern, (match, entity) => {
 		let code;
 
diff --git a/test/runtime/samples/html-entities-inside-attributes/_config.js b/test/runtime/samples/html-entities-inside-attributes/_config.js
new file mode 100644
index 0000000000..d2e3496bca
--- /dev/null
+++ b/test/runtime/samples/html-entities-inside-attributes/_config.js
@@ -0,0 +1,19 @@
+export default {
+	html: `
+		<span data-xxx="&amp;copy=value" style="&amp;copy=value"></span>
+
+		<span data-xxx="&amp;copy=value" style="&amp;copy=value"></span>
+
+		<span data-xxx="©" style="©"></span>
+
+		<span data-xxx="©=value" style="©=value"></span>
+
+		<span data-xxx="&amp;copyotherstring=value" style="&amp;copyotherstring=value"></span>
+
+		<span data-xxx="&amp;copy123=value" style="&amp;copy123=value"></span>
+
+		<span data-xxx="&amp;rect=value" style="&amp;rect=value"></span>
+
+		<span data-xxx="▭=value" style="▭=value"></span>
+	`
+};
diff --git a/test/runtime/samples/html-entities-inside-attributes/main.svelte b/test/runtime/samples/html-entities-inside-attributes/main.svelte
new file mode 100644
index 0000000000..21d56a2f69
--- /dev/null
+++ b/test/runtime/samples/html-entities-inside-attributes/main.svelte
@@ -0,0 +1,15 @@
+<span data-xxx="&copy=value" style="&copy=value"></span>
+
+<span data-xxx="&copy=value" style="&copy=value"></span>
+
+<span data-xxx="&copy" style="&copy"></span>
+
+<span data-xxx="&copy;=value" style="&copy;=value"></span>
+
+<span data-xxx="&copyotherstring=value" style="&copyotherstring=value"></span>
+
+<span data-xxx="&copy123=value" style="&copy123=value"></span>
+
+<span data-xxx="&rect=value" style="&rect=value"></span>
+
+<span data-xxx="&rect;=value" style="&rect;=value"></span>
diff --git a/test/runtime/samples/html-entities/_config.js b/test/runtime/samples/html-entities/_config.js
index ddcc318e28..29d53eb772 100644
--- a/test/runtime/samples/html-entities/_config.js
+++ b/test/runtime/samples/html-entities/_config.js
@@ -4,11 +4,25 @@ export default {
 		<span>*</span>
 		<span>*</span>
 		<span>*</span>
+		<span>*</span>
 
 		<span></span>
 		<span>A</span>
 		<span>€</span>
+		<span>€</span>
+
+		<span>&amp;stringnotanentity;</span>
+
+		<span>different &amp;rect and ▭</span>
+
+		<span>©otherstring</span>
+
+		<span>©=otherstring</span>
+
+		<span>©=otherstring</span>
+
+		<span>©123</span>
 
-		<span>&amp;notanentity;</span>
+		<span>Ÿotherstring</span>
 	`
 };
diff --git a/test/runtime/samples/html-entities/main.svelte b/test/runtime/samples/html-entities/main.svelte
index 04d9846e78..2d0d66c939 100644
--- a/test/runtime/samples/html-entities/main.svelte
+++ b/test/runtime/samples/html-entities/main.svelte
@@ -1,10 +1,24 @@
 <span>&ast;</span>
 <span>&midast;</span>
 <span>&#x0002A;</span>
+<span>&#x0002A</span>
 <span>&#42;</span>
 
 <span>&#10;</span>
 <span>&#65;</span>
 <span>&#128;</span>
+<span>&#128</span>
 
-<span>&notanentity;</span>
+<span>&stringnotanentity;</span>
+
+<span>different &rect and &rect;</span>
+
+<span>&copyotherstring</span>
+
+<span>&copy=otherstring</span>
+
+<span>&copy;=otherstring</span>
+
+<span>&copy123</span>
+
+<span>&#x9fotherstring</span>

From 6ec5a0ed2450db94d1873b09841f2092f15d79a2 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 28 Feb 2023 18:40:23 +0100
Subject: [PATCH 033/110] chore: update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05ed4d9cfc..ad787ec972 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,9 @@
 * 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))
+* 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))
 
 
 ## 3.55.1

From b5b0d1f2d4eeb2c5b0fc22ed3f38a22eff06e1bb Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 28 Feb 2023 22:39:23 +0100
Subject: [PATCH 034/110] chore: update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad787ec972..4153a6e525 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 * Decode html entities correctly ([#8026](https://github.com/sveltejs/svelte/issues/8026))
 * 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))
 
 
 ## 3.55.1

From dc36d0c9afc352587a0e512aac7704c734390e92 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 28 Feb 2023 22:42:59 +0100
Subject: [PATCH 035/110] fix: typings for naturalWidth/Height bindings

follow-up to #7857
---
 elements/index.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/elements/index.d.ts b/elements/index.d.ts
index 9a4284af22..775970aea3 100644
--- a/elements/index.d.ts
+++ b/elements/index.d.ts
@@ -707,6 +707,9 @@ export interface HTMLImgAttributes extends HTMLAttributes<HTMLImageElement> {
 	srcset?: string | undefined | null;
 	usemap?: string | undefined | null;
 	width?: number | string | undefined | null;
+
+	readonly 'bind:naturalWidth'?: number | undefined | null;
+	readonly 'bind:naturalHeight'?: number | undefined | null;
 }
 
 export interface HTMLInsAttributes extends HTMLAttributes<HTMLModElement> {

From ed575cc9270b92564d8e0bec86aa88d0412af9ac Mon Sep 17 00:00:00 2001
From: Nguyen Tran <88808276+ngtr6788@users.noreply.github.com>
Date: Wed, 1 Mar 2023 05:06:15 -0500
Subject: [PATCH 036/110] fix: make svelte-ignore work above components 
 (#8338)

Fixes #8082, where svelte-ignore somehow does not pick up the reactive-component warning.

The issue on this problem is that the map_children function suppresses warnings and errors while traversing AST nodes as src/compiler/compile/nodes classes. However, the reactive-component warning is called in src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts, and its warnings are not suppressed in map_children. Thus, we need to extract ignores and suppress here separately.
---
 .../wrappers/InlineComponent/index.ts         |  4 ++++
 src/compiler/utils/extract_svelte_ignore.ts   | 23 +++++++++++++++++++
 .../samples/component-dynamic/input.svelte    | 14 ++++++++++-
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts b/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
index bca01fdb4c..5053e8c5d2 100644
--- a/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
@@ -21,6 +21,7 @@ import SlotTemplate from '../../../nodes/SlotTemplate';
 import { is_head } from '../shared/is_head';
 import compiler_warnings from '../../../compiler_warnings';
 import { namespaces } from '../../../../utils/namespaces';
+import { extract_ignores_above_node } from '../../../../utils/extract_svelte_ignore';
 
 type SlotDefinition = { block: Block; scope: TemplateScope; get_context?: Node; get_changes?: Node };
 
@@ -111,9 +112,12 @@ export default class InlineComponentWrapper extends Wrapper {
 			return;
 		}
 
+    const ignores = extract_ignores_above_node(this.node);  
+    this.renderer.component.push_ignores(ignores);
 		if (variable.reassigned || variable.export_name || variable.is_reactive_dependency) {
 			this.renderer.component.warn(this.node, compiler_warnings.reactive_component(name));
 		}
+    this.renderer.component.pop_ignores();
 	}
 
 	render(
diff --git a/src/compiler/utils/extract_svelte_ignore.ts b/src/compiler/utils/extract_svelte_ignore.ts
index 30be2893a4..d4a8369a16 100644
--- a/src/compiler/utils/extract_svelte_ignore.ts
+++ b/src/compiler/utils/extract_svelte_ignore.ts
@@ -1,6 +1,7 @@
 import { TemplateNode } from '../interfaces';
 import { flatten } from './flatten';
 import { regex_whitespace } from './patterns';
+import { INode } from '../compile/nodes/interfaces';
 
 const regex_svelte_ignore = /^\s*svelte-ignore\s+([\s\S]+)\s*$/m;
 
@@ -33,3 +34,25 @@ export function extract_ignores_above_position(position: number, template_nodes:
 
 	return [];
 }
+
+export function extract_ignores_above_node(node: INode): string[] {
+  /**
+    * This utilizes the fact that node has a prev and a next attribute
+    * which means that it can find svelte-ignores along
+    * the nodes on the same level as itself who share the same parent. 
+    */
+  let cur_node = node.prev;
+  while (cur_node) {
+    if (cur_node.type !== 'Comment' && cur_node.type !== 'Text') {
+      return [];
+	  }
+
+	  if (cur_node.type === 'Comment' && cur_node.ignores.length) {
+      return cur_node.ignores;
+	  }
+
+    cur_node = cur_node.prev;
+  }
+
+  return [];
+}
diff --git a/test/validator/samples/component-dynamic/input.svelte b/test/validator/samples/component-dynamic/input.svelte
index f591a84fe1..241a33c5ea 100644
--- a/test/validator/samples/component-dynamic/input.svelte
+++ b/test/validator/samples/component-dynamic/input.svelte
@@ -15,4 +15,16 @@
 <Let />
 <ExportLet />
 <Reactive />
-<svelte:component this={Let} />
\ No newline at end of file
+<svelte:component this={Let} />
+
+<!-- Here, we test to see if svelte-ignore works with reactive-component -->
+<!-- svelte-ignore reactive-component -->
+<Let />
+<div>
+  <!-- svelte-ignore reactive-component -->
+  <ExportLet />
+  <div>
+    <!-- svelte-ignore reactive-component -->
+    <Reactive />
+  </div>
+</div>

From acbf8135a8a905bc84078cd2145b83d52b325410 Mon Sep 17 00:00:00 2001
From: Roy Choo <roychoo@hotmail.com>
Date: Wed, 1 Mar 2023 18:28:59 +0800
Subject: [PATCH 037/110] fix: add global compound selector validation (#6322)

fixes #6272
prevents invalid CSS output

---------

Co-authored-by: Roy Choo <roy.choo@bytedance.com>
Co-authored-by: tanhauhau <lhtan93@gmail.com>
Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 src/compiler/compile/compiler_errors.ts        |  4 ++++
 src/compiler/compile/css/Selector.ts           | 18 ++++++++++++++++++
 .../css-invalid-global-placement-4/errors.json | 12 ++++++++++++
 .../input.svelte                               |  5 +++++
 4 files changed, 39 insertions(+)
 create mode 100644 test/validator/samples/css-invalid-global-placement-4/errors.json
 create mode 100644 test/validator/samples/css-invalid-global-placement-4/input.svelte

diff --git a/src/compiler/compile/compiler_errors.ts b/src/compiler/compile/compiler_errors.ts
index b0c836681c..b0ffead6e0 100644
--- a/src/compiler/compile/compiler_errors.ts
+++ b/src/compiler/compile/compiler_errors.ts
@@ -234,6 +234,10 @@ export default {
 		code: 'css-invalid-global-selector',
 		message: ':global(...) must contain a single selector'
 	},
+	css_invalid_global_selector_position: {
+		code: 'css-invalid-global-selector-position',
+		message: ':global(...) not at the start of a selector sequence should not contain type or universal selectors'
+	},
 	css_invalid_selector: (selector: string) => ({
 		code: 'css-invalid-selector',
 		message: `Invalid selector "${selector}"`
diff --git a/src/compiler/compile/css/Selector.ts b/src/compiler/compile/css/Selector.ts
index 5feb59ec0c..c0819a233f 100644
--- a/src/compiler/compile/css/Selector.ts
+++ b/src/compiler/compile/css/Selector.ts
@@ -148,6 +148,7 @@ export default class Selector {
 		}
 
 		this.validate_global_with_multiple_selectors(component);
+		this.validate_global_compound_selector(component);
 		this.validate_invalid_combinator_without_selector(component);
 	}
 
@@ -179,6 +180,23 @@ export default class Selector {
 		}
 	}
 
+	validate_global_compound_selector(component: Component) {
+		for (const block of this.blocks) {
+			for (let index = 0; index < block.selectors.length; index++) {
+				const selector = block.selectors[index];
+				if (selector.type === 'PseudoClassSelector' &&
+					selector.name === 'global' &&
+					index !== 0 &&
+					selector.children &&
+					selector.children.length > 0 &&
+					!/[.:#\s]/.test(selector.children[0].value)
+				) {
+					component.error(selector, compiler_errors.css_invalid_global_selector_position);
+				}
+			}
+		}
+	}
+
 	get_amount_class_specificity_increased() {
 		let count = 0;
 		for (const block of this.blocks) {
diff --git a/test/validator/samples/css-invalid-global-placement-4/errors.json b/test/validator/samples/css-invalid-global-placement-4/errors.json
new file mode 100644
index 0000000000..216dcea05e
--- /dev/null
+++ b/test/validator/samples/css-invalid-global-placement-4/errors.json
@@ -0,0 +1,12 @@
+[{
+	"code": "css-invalid-global-selector-position",
+	"message": ":global(...) not at the start of a selector sequence should not contain type or universal selectors",
+	"start": {
+		"line": 2,
+		"column": 5
+	},
+	"end": {
+		"line": 2,
+		"column": 17
+	}
+}]
\ No newline at end of file
diff --git a/test/validator/samples/css-invalid-global-placement-4/input.svelte b/test/validator/samples/css-invalid-global-placement-4/input.svelte
new file mode 100644
index 0000000000..641e91cab0
--- /dev/null
+++ b/test/validator/samples/css-invalid-global-placement-4/input.svelte
@@ -0,0 +1,5 @@
+<style>
+	.foo:global(div) {
+		color: red;
+	}
+</style>

From c611f318d2fcc951f05df3cb17db95d60e34609b Mon Sep 17 00:00:00 2001
From: Tan Li Hau <tanhauhau@users.noreply.github.com>
Date: Wed, 1 Mar 2023 18:51:40 +0800
Subject: [PATCH 038/110] feat: add stopImmediatePropagation event modifier
 (#8341)

Closes #5085

---------

Co-authored-by: Marcin Wicha <23581770+marcin-wicha@users.noreply.github.com>
Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 site/content/docs/03-template-syntax.md       |  1 +
 src/compiler/compile/nodes/Element.ts         |  1 +
 .../wrappers/Element/EventHandler.ts          |  2 ++
 src/runtime/internal/dev.ts                   |  3 ++-
 src/runtime/internal/dom.ts                   |  8 +++++++
 test/js/samples/event-modifiers/expected.js   | 10 +++++++++
 test/js/samples/event-modifiers/input.svelte  |  5 +++++
 .../_config.js                                | 17 ++++++++++++++
 .../main.svelte                               | 22 +++++++++++++++++++
 .../event-modifiers-invalid/errors.json       |  2 +-
 10 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 test/runtime/samples/event-handler-modifier-stop-immediate-propagation/_config.js
 create mode 100644 test/runtime/samples/event-handler-modifier-stop-immediate-propagation/main.svelte

diff --git a/site/content/docs/03-template-syntax.md b/site/content/docs/03-template-syntax.md
index 419489211c..f0ea8af0c7 100644
--- a/site/content/docs/03-template-syntax.md
+++ b/site/content/docs/03-template-syntax.md
@@ -539,6 +539,7 @@ The following modifiers are available:
 
 * `preventDefault` — calls `event.preventDefault()` before running the handler
 * `stopPropagation` — calls `event.stopPropagation()`, preventing the event reaching the next element
+* `stopImmediatePropagation` - calls `event.stopImmediatePropagation()`, preventing other listeners of the same event from being fired.
 * `passive` — improves scrolling performance on touch/wheel events (Svelte will add it automatically where it's safe to do so)
 * `nonpassive` — explicitly set `passive: false`
 * `capture` — fires the handler during the *capture* phase instead of the *bubbling* phase
diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index 4e43fe1824..b90d08ffbc 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -183,6 +183,7 @@ const invisible_elements = new Set(['meta', 'html', 'script', 'style']);
 const valid_modifiers = new Set([
 	'preventDefault',
 	'stopPropagation',
+	'stopImmediatePropagation',
 	'capture',
 	'once',
 	'passive',
diff --git a/src/compiler/compile/render_dom/wrappers/Element/EventHandler.ts b/src/compiler/compile/render_dom/wrappers/Element/EventHandler.ts
index b0ed4a73d6..b8c9f70c0f 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/EventHandler.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/EventHandler.ts
@@ -41,6 +41,7 @@ export default class EventHandlerWrapper {
 
 		if (this.node.modifiers.has('preventDefault')) snippet = x`@prevent_default(${snippet})`;
 		if (this.node.modifiers.has('stopPropagation')) snippet = x`@stop_propagation(${snippet})`;
+		if (this.node.modifiers.has('stopImmediatePropagation')) snippet = x`@stop_immediate_propagation(${snippet})`;
 		if (this.node.modifiers.has('self')) snippet = x`@self(${snippet})`;
 		if (this.node.modifiers.has('trusted')) snippet = x`@trusted(${snippet})`;
 
@@ -64,6 +65,7 @@ export default class EventHandlerWrapper {
 		if (block.renderer.options.dev) {
 			args.push(this.node.modifiers.has('preventDefault') ? TRUE : FALSE);
 			args.push(this.node.modifiers.has('stopPropagation') ? TRUE : FALSE);
+			args.push(this.node.modifiers.has('stopImmediatePropagation') ? TRUE : FALSE);
 		}
 
 		block.event_listeners.push(
diff --git a/src/runtime/internal/dev.ts b/src/runtime/internal/dev.ts
index 9d24ad2a07..be81a11514 100644
--- a/src/runtime/internal/dev.ts
+++ b/src/runtime/internal/dev.ts
@@ -49,10 +49,11 @@ export function detach_after_dev(before: Node) {
 	}
 }
 
-export function listen_dev(node: Node, event: string, handler: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions | EventListenerOptions, has_prevent_default?: boolean, has_stop_propagation?: boolean) {
+export function listen_dev(node: Node, event: string, handler: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions | EventListenerOptions, has_prevent_default?: boolean, has_stop_propagation?: boolean, has_stop_immediate_propagation?: boolean) {
 	const modifiers = options === true ? [ 'capture' ] : options ? Array.from(Object.keys(options)) : [];
 	if (has_prevent_default) modifiers.push('preventDefault');
 	if (has_stop_propagation) modifiers.push('stopPropagation');
+	if (has_stop_immediate_propagation) modifiers.push('stopImmediatePropagation');
 
 	dispatch_dev('SvelteDOMAddEventListener', { node, event, handler, modifiers });
 
diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index 1f87e91910..942e742e34 100644
--- a/src/runtime/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -275,6 +275,14 @@ export function stop_propagation(fn) {
 	};
 }
 
+export function stop_immediate_propagation(fn) {
+	return function (event) {
+		event.stopImmediatePropagation();
+		// @ts-ignore
+		return fn.call(this, event);
+	};
+}
+
 export function self(fn) {
 	return function(event) {
 		// @ts-ignore
diff --git a/test/js/samples/event-modifiers/expected.js b/test/js/samples/event-modifiers/expected.js
index 3901753661..5b75ff1192 100644
--- a/test/js/samples/event-modifiers/expected.js
+++ b/test/js/samples/event-modifiers/expected.js
@@ -12,6 +12,7 @@ import {
 	run_all,
 	safe_not_equal,
 	space,
+	stop_immediate_propagation,
 	stop_propagation
 } from "svelte/internal";
 
@@ -24,6 +25,8 @@ function create_fragment(ctx) {
 	let button1;
 	let t5;
 	let button2;
+	let t7;
+	let button3;
 	let mounted;
 	let dispose;
 
@@ -41,6 +44,9 @@ function create_fragment(ctx) {
 			t5 = space();
 			button2 = element("button");
 			button2.textContent = "or me!";
+			t7 = space();
+			button3 = element("button");
+			button3.textContent = "or me!";
 		},
 		m(target, anchor) {
 			insert(target, div1, anchor);
@@ -51,6 +57,8 @@ function create_fragment(ctx) {
 			append(div1, button1);
 			append(div1, t5);
 			append(div1, button2);
+			append(div1, t7);
+			append(div1, button3);
 
 			if (!mounted) {
 				dispose = [
@@ -58,6 +66,8 @@ function create_fragment(ctx) {
 					listen(button0, "click", stop_propagation(prevent_default(handleClick))),
 					listen(button1, "click", handleClick, { once: true, capture: true }),
 					listen(button2, "click", handleClick, true),
+					listen(button3, "click", stop_immediate_propagation(handleClick)),
+					listen(button3, "click", handleTouchstart),
 					listen(div1, "touchstart", handleTouchstart, { passive: true })
 				];
 
diff --git a/test/js/samples/event-modifiers/input.svelte b/test/js/samples/event-modifiers/input.svelte
index c72d58dabb..f36ebd90ef 100644
--- a/test/js/samples/event-modifiers/input.svelte
+++ b/test/js/samples/event-modifiers/input.svelte
@@ -13,4 +13,9 @@
 	<button on:click|stopPropagation|preventDefault={handleClick}>click me</button>
 	<button on:click|once|capture={handleClick}>or me</button>
 	<button on:click|capture={handleClick}>or me!</button>
+	<button
+		on:click|stopImmediatePropagation={handleClick}
+		on:click={handleTouchstart}>
+		or me!
+	</button>
 </div>
\ No newline at end of file
diff --git a/test/runtime/samples/event-handler-modifier-stop-immediate-propagation/_config.js b/test/runtime/samples/event-handler-modifier-stop-immediate-propagation/_config.js
new file mode 100644
index 0000000000..3ea00c8493
--- /dev/null
+++ b/test/runtime/samples/event-handler-modifier-stop-immediate-propagation/_config.js
@@ -0,0 +1,17 @@
+export default {
+	async test({ assert, component, target, window }) {
+		const button = target.querySelector('button');
+		const event = new window.MouseEvent('click');
+
+		await button.dispatchEvent(event);
+		assert.deepEqual(component.logs, ['click_1', 'click_2']);
+		
+		component.click_2 = () => component.logs.push('22');
+		await button.dispatchEvent(event);
+		assert.deepEqual(component.logs, ['click_1', 'click_2', 'click_1', '22']);
+		
+		component.click_1 = () => component.logs.push('11');
+		await button.dispatchEvent(event);
+		assert.deepEqual(component.logs, ['click_1', 'click_2', 'click_1', '22', '11', '22']);
+	}
+};
diff --git a/test/runtime/samples/event-handler-modifier-stop-immediate-propagation/main.svelte b/test/runtime/samples/event-handler-modifier-stop-immediate-propagation/main.svelte
new file mode 100644
index 0000000000..c038c213c4
--- /dev/null
+++ b/test/runtime/samples/event-handler-modifier-stop-immediate-propagation/main.svelte
@@ -0,0 +1,22 @@
+<script>
+	export let logs = [];
+
+	export let click_1 = () => {
+		logs.push('click_1');
+	}
+
+	export let click_2 = () => {
+		logs.push('click_2');
+	}
+
+	export let click_3 = () => {
+		logs.push('click_3');
+	}
+</script>
+
+<button
+	on:click={click_1}
+	on:click|stopImmediatePropagation={click_2}
+	on:click={click_3}>
+	click me
+</button>
diff --git a/test/validator/samples/event-modifiers-invalid/errors.json b/test/validator/samples/event-modifiers-invalid/errors.json
index 628bf2eaed..b3a2c0017c 100644
--- a/test/validator/samples/event-modifiers-invalid/errors.json
+++ b/test/validator/samples/event-modifiers-invalid/errors.json
@@ -1,5 +1,5 @@
 [{
-	"message": "Valid event modifiers are preventDefault, stopPropagation, capture, once, passive, nonpassive, self or trusted",
+	"message": "Valid event modifiers are preventDefault, stopPropagation, stopImmediatePropagation, capture, once, passive, nonpassive, self or trusted",
 	"code": "invalid-event-modifier",
 	"start": {
 		"line": 1,

From dd371f58fe4c472ebce9c33c942f572fc58415c8 Mon Sep 17 00:00:00 2001
From: Brad Dougherty <me@brad.is>
Date: Wed, 1 Mar 2023 05:54:00 -0500
Subject: [PATCH 039/110] feat: add readyState binding for media elements
 (#6843)

Closes #6666

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 elements/index.d.ts                           |  1 +
 site/content/docs/03-template-syntax.md       |  4 +-
 src/compiler/compile/nodes/Binding.ts         |  3 +-
 src/compiler/compile/nodes/Element.ts         |  3 +-
 .../render_dom/wrappers/Element/index.ts      | 11 +++-
 test/js/samples/media-bindings/expected.js    | 56 ++++++++++++-------
 test/js/samples/media-bindings/input.svelte   |  3 +-
 test/js/samples/video-bindings/expected.js    | 34 ++++++++---
 test/js/samples/video-bindings/input.svelte   |  3 +-
 9 files changed, 83 insertions(+), 35 deletions(-)

diff --git a/elements/index.d.ts b/elements/index.d.ts
index 775970aea3..99476593da 100644
--- a/elements/index.d.ts
+++ b/elements/index.d.ts
@@ -845,6 +845,7 @@ export interface HTMLMediaAttributes<T extends HTMLMediaElement> extends HTMLAtt
 	 */
 	volume?: number | undefined | null;
 
+	readonly 'bind:readyState'?: 0 | 1 | 2 | 3 | 4 | undefined | null;
 	readonly 'bind:duration'?: number | undefined | null;
 	readonly 'bind:buffered'?: SvelteMediaTimeRange[] | undefined | null;
 	readonly 'bind:played'?: SvelteMediaTimeRange[] | undefined | null;
diff --git a/site/content/docs/03-template-syntax.md b/site/content/docs/03-template-syntax.md
index f0ea8af0c7..ebc4ee8ef2 100644
--- a/site/content/docs/03-template-syntax.md
+++ b/site/content/docs/03-template-syntax.md
@@ -714,7 +714,7 @@ Elements with the `contenteditable` attribute support `innerHTML` and `textConte
 
 ---
 
-Media elements (`<audio>` and `<video>`) have their own set of bindings — six *readonly* ones...
+Media elements (`<audio>` and `<video>`) have their own set of bindings — seven *readonly* ones...
 
 * `duration` (readonly) — the total duration of the video, in seconds
 * `buffered` (readonly) — an array of `{start, end}` objects
@@ -722,6 +722,7 @@ Media elements (`<audio>` and `<video>`) have their own set of bindings — six
 * `seekable` (readonly) — ditto
 * `seeking` (readonly) — boolean
 * `ended` (readonly) — boolean
+* `readyState` (readonly) — number between (and including) 0 and 4
 
 ...and five *two-way* bindings:
 
@@ -742,6 +743,7 @@ Videos additionally have readonly `videoWidth` and `videoHeight` bindings.
 	bind:seekable
 	bind:seeking
 	bind:ended
+	bind:readyState
 	bind:currentTime
 	bind:playbackRate
 	bind:paused
diff --git a/src/compiler/compile/nodes/Binding.ts b/src/compiler/compile/nodes/Binding.ts
index 9a62b68850..0c29f7ec67 100644
--- a/src/compiler/compile/nodes/Binding.ts
+++ b/src/compiler/compile/nodes/Binding.ts
@@ -24,7 +24,8 @@ const read_only_media_attributes = new Set([
 	'videoHeight',
 	'videoWidth',
 	'naturalWidth',
-	'naturalHeight'
+	'naturalHeight',
+	'readyState'
 ]);
 
 export default class Binding extends Node {
diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index b90d08ffbc..416f1d7b31 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -980,7 +980,8 @@ export default class Element extends Node {
 				name === 'muted' ||
 				name === 'playbackRate' ||
 				name === 'seeking' ||
-				name === 'ended'
+				name === 'ended' ||
+				name === 'readyState'
 			) {
 				if (this.name !== 'audio' && this.name !== 'video') {
 					return component.error(binding, compiler_errors.invalid_binding_element_with('audio> or <video>', name));
diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index 7642aff711..3472b0612c 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -63,13 +63,11 @@ const events = [
 		filter: (node: Element, _name: string) =>
 			node.name === 'input' && node.get_static_attribute_value('type') === 'range'
 	},
-
 	{
 		event_names: ['elementresize'],
 		filter: (_node: Element, name: string) =>
 			regex_dimensions.test(name)
 	},
-
 	// media events
 	{
 		event_names: ['timeupdate'],
@@ -131,7 +129,14 @@ const events = [
 			node.is_media_node() &&
 			(name === 'videoHeight' || name === 'videoWidth')
 	},
-
+	{
+		// from https://html.spec.whatwg.org/multipage/media.html#ready-states
+		// and https://html.spec.whatwg.org/multipage/media.html#loading-the-media-resource
+		event_names: ['loadedmetadata', 'loadeddata', 'canplay', 'canplaythrough', 'playing', 'waiting', 'emptied'],
+		filter: (node: Element, name: string) =>
+			node.is_media_node() &&
+			name === 'readyState'
+	},
 	// details event
 	{
 		event_names: ['toggle'],
diff --git a/test/js/samples/media-bindings/expected.js b/test/js/samples/media-bindings/expected.js
index 5005eb47d1..8320d92b2a 100644
--- a/test/js/samples/media-bindings/expected.js
+++ b/test/js/samples/media-bindings/expected.js
@@ -30,18 +30,19 @@ function create_fragment(ctx) {
 			audio_updating = true;
 		}
 
-		/*audio_timeupdate_handler*/ ctx[13].call(audio);
+		/*audio_timeupdate_handler*/ ctx[14].call(audio);
 	}
 
 	return {
 		c() {
 			audio = element("audio");
-			if (/*buffered*/ ctx[0] === void 0) add_render_callback(() => /*audio_progress_handler*/ ctx[11].call(audio));
-			if (/*buffered*/ ctx[0] === void 0 || /*seekable*/ ctx[1] === void 0) add_render_callback(() => /*audio_loadedmetadata_handler*/ ctx[12].call(audio));
+			if (/*buffered*/ ctx[0] === void 0) add_render_callback(() => /*audio_progress_handler*/ ctx[12].call(audio));
+			if (/*buffered*/ ctx[0] === void 0 || /*seekable*/ ctx[1] === void 0) add_render_callback(() => /*audio_loadedmetadata_handler*/ ctx[13].call(audio));
 			if (/*played*/ ctx[2] === void 0 || /*currentTime*/ ctx[3] === void 0 || /*ended*/ ctx[10] === void 0) add_render_callback(audio_timeupdate_handler);
-			if (/*duration*/ ctx[4] === void 0) add_render_callback(() => /*audio_durationchange_handler*/ ctx[14].call(audio));
-			if (/*seeking*/ ctx[9] === void 0) add_render_callback(() => /*audio_seeking_seeked_handler*/ ctx[18].call(audio));
-			if (/*ended*/ ctx[10] === void 0) add_render_callback(() => /*audio_ended_handler*/ ctx[19].call(audio));
+			if (/*duration*/ ctx[4] === void 0) add_render_callback(() => /*audio_durationchange_handler*/ ctx[15].call(audio));
+			if (/*seeking*/ ctx[9] === void 0) add_render_callback(() => /*audio_seeking_seeked_handler*/ ctx[19].call(audio));
+			if (/*ended*/ ctx[10] === void 0) add_render_callback(() => /*audio_ended_handler*/ ctx[20].call(audio));
+			if (/*readyState*/ ctx[11] === void 0) add_render_callback(() => /*audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[21].call(audio));
 		},
 		m(target, anchor) {
 			insert(target, audio, anchor);
@@ -58,17 +59,24 @@ function create_fragment(ctx) {
 
 			if (!mounted) {
 				dispose = [
-					listen(audio, "progress", /*audio_progress_handler*/ ctx[11]),
-					listen(audio, "loadedmetadata", /*audio_loadedmetadata_handler*/ ctx[12]),
+					listen(audio, "progress", /*audio_progress_handler*/ ctx[12]),
+					listen(audio, "loadedmetadata", /*audio_loadedmetadata_handler*/ ctx[13]),
 					listen(audio, "timeupdate", audio_timeupdate_handler),
-					listen(audio, "durationchange", /*audio_durationchange_handler*/ ctx[14]),
-					listen(audio, "play", /*audio_play_pause_handler*/ ctx[15]),
-					listen(audio, "pause", /*audio_play_pause_handler*/ ctx[15]),
-					listen(audio, "volumechange", /*audio_volumechange_handler*/ ctx[16]),
-					listen(audio, "ratechange", /*audio_ratechange_handler*/ ctx[17]),
-					listen(audio, "seeking", /*audio_seeking_seeked_handler*/ ctx[18]),
-					listen(audio, "seeked", /*audio_seeking_seeked_handler*/ ctx[18]),
-					listen(audio, "ended", /*audio_ended_handler*/ ctx[19])
+					listen(audio, "durationchange", /*audio_durationchange_handler*/ ctx[15]),
+					listen(audio, "play", /*audio_play_pause_handler*/ ctx[16]),
+					listen(audio, "pause", /*audio_play_pause_handler*/ ctx[16]),
+					listen(audio, "volumechange", /*audio_volumechange_handler*/ ctx[17]),
+					listen(audio, "ratechange", /*audio_ratechange_handler*/ ctx[18]),
+					listen(audio, "seeking", /*audio_seeking_seeked_handler*/ ctx[19]),
+					listen(audio, "seeked", /*audio_seeking_seeked_handler*/ ctx[19]),
+					listen(audio, "ended", /*audio_ended_handler*/ ctx[20]),
+					listen(audio, "loadedmetadata", /*audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[21]),
+					listen(audio, "loadeddata", /*audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[21]),
+					listen(audio, "canplay", /*audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[21]),
+					listen(audio, "canplaythrough", /*audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[21]),
+					listen(audio, "playing", /*audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[21]),
+					listen(audio, "waiting", /*audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[21]),
+					listen(audio, "emptied", /*audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[21])
 				];
 
 				mounted = true;
@@ -119,6 +127,7 @@ function instance($$self, $$props, $$invalidate) {
 	let { playbackRate } = $$props;
 	let { seeking } = $$props;
 	let { ended } = $$props;
+	let { readyState } = $$props;
 
 	function audio_progress_handler() {
 		buffered = time_ranges_to_array(this.buffered);
@@ -173,6 +182,11 @@ function instance($$self, $$props, $$invalidate) {
 		$$invalidate(10, ended);
 	}
 
+	function audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler() {
+		readyState = this.readyState;
+		$$invalidate(11, readyState);
+	}
+
 	$$self.$$set = $$props => {
 		if ('buffered' in $$props) $$invalidate(0, buffered = $$props.buffered);
 		if ('seekable' in $$props) $$invalidate(1, seekable = $$props.seekable);
@@ -185,6 +199,7 @@ function instance($$self, $$props, $$invalidate) {
 		if ('playbackRate' in $$props) $$invalidate(8, playbackRate = $$props.playbackRate);
 		if ('seeking' in $$props) $$invalidate(9, seeking = $$props.seeking);
 		if ('ended' in $$props) $$invalidate(10, ended = $$props.ended);
+		if ('readyState' in $$props) $$invalidate(11, readyState = $$props.readyState);
 	};
 
 	return [
@@ -199,6 +214,7 @@ function instance($$self, $$props, $$invalidate) {
 		playbackRate,
 		seeking,
 		ended,
+		readyState,
 		audio_progress_handler,
 		audio_loadedmetadata_handler,
 		audio_timeupdate_handler,
@@ -207,7 +223,8 @@ function instance($$self, $$props, $$invalidate) {
 		audio_volumechange_handler,
 		audio_ratechange_handler,
 		audio_seeking_seeked_handler,
-		audio_ended_handler
+		audio_ended_handler,
+		audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler
 	];
 }
 
@@ -226,9 +243,10 @@ class Component extends SvelteComponent {
 			muted: 7,
 			playbackRate: 8,
 			seeking: 9,
-			ended: 10
+			ended: 10,
+			readyState: 11
 		});
 	}
 }
 
-export default Component;
\ No newline at end of file
+export default Component;
diff --git a/test/js/samples/media-bindings/input.svelte b/test/js/samples/media-bindings/input.svelte
index 7c1afcf614..a1dd10dcae 100644
--- a/test/js/samples/media-bindings/input.svelte
+++ b/test/js/samples/media-bindings/input.svelte
@@ -10,6 +10,7 @@
 	export let playbackRate;
 	export let seeking;
 	export let ended;
+	export let readyState;
 </script>
 
-<audio bind:buffered bind:seekable bind:played bind:currentTime bind:duration bind:paused bind:volume bind:muted bind:playbackRate bind:seeking bind:ended/>
+<audio bind:buffered bind:seekable bind:played bind:currentTime bind:duration bind:paused bind:volume bind:muted bind:playbackRate bind:seeking bind:ended bind:readyState/>
diff --git a/test/js/samples/video-bindings/expected.js b/test/js/samples/video-bindings/expected.js
index 020bab574c..fe30240bfc 100644
--- a/test/js/samples/video-bindings/expected.js
+++ b/test/js/samples/video-bindings/expected.js
@@ -30,23 +30,31 @@ function create_fragment(ctx) {
 			video_updating = true;
 		}
 
-		/*video_timeupdate_handler*/ ctx[4].call(video);
+		/*video_timeupdate_handler*/ ctx[5].call(video);
 	}
 
 	return {
 		c() {
 			video = element("video");
-			if (/*videoHeight*/ ctx[1] === void 0 || /*videoWidth*/ ctx[2] === void 0) add_render_callback(() => /*video_resize_handler*/ ctx[5].call(video));
-			add_render_callback(() => /*video_elementresize_handler*/ ctx[6].call(video));
+			if (/*videoHeight*/ ctx[1] === void 0 || /*videoWidth*/ ctx[2] === void 0) add_render_callback(() => /*video_resize_handler*/ ctx[6].call(video));
+			add_render_callback(() => /*video_elementresize_handler*/ ctx[7].call(video));
+			if (/*readyState*/ ctx[4] === void 0) add_render_callback(() => /*video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[8].call(video));
 		},
 		m(target, anchor) {
 			insert(target, video, anchor);
-			video_resize_listener = add_resize_listener(video, /*video_elementresize_handler*/ ctx[6].bind(video));
+			video_resize_listener = add_resize_listener(video, /*video_elementresize_handler*/ ctx[7].bind(video));
 
 			if (!mounted) {
 				dispose = [
 					listen(video, "timeupdate", video_timeupdate_handler),
-					listen(video, "resize", /*video_resize_handler*/ ctx[5])
+					listen(video, "resize", /*video_resize_handler*/ ctx[6]),
+					listen(video, "loadedmetadata", /*video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[8]),
+					listen(video, "loadeddata", /*video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[8]),
+					listen(video, "canplay", /*video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[8]),
+					listen(video, "canplaythrough", /*video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[8]),
+					listen(video, "playing", /*video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[8]),
+					listen(video, "waiting", /*video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[8]),
+					listen(video, "emptied", /*video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[8])
 				];
 
 				mounted = true;
@@ -75,6 +83,7 @@ function instance($$self, $$props, $$invalidate) {
 	let { videoHeight } = $$props;
 	let { videoWidth } = $$props;
 	let { offsetWidth } = $$props;
+	let { readyState } = $$props;
 
 	function video_timeupdate_handler() {
 		currentTime = this.currentTime;
@@ -93,11 +102,17 @@ function instance($$self, $$props, $$invalidate) {
 		$$invalidate(3, offsetWidth);
 	}
 
+	function video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler() {
+		readyState = this.readyState;
+		$$invalidate(4, readyState);
+	}
+
 	$$self.$$set = $$props => {
 		if ('currentTime' in $$props) $$invalidate(0, currentTime = $$props.currentTime);
 		if ('videoHeight' in $$props) $$invalidate(1, videoHeight = $$props.videoHeight);
 		if ('videoWidth' in $$props) $$invalidate(2, videoWidth = $$props.videoWidth);
 		if ('offsetWidth' in $$props) $$invalidate(3, offsetWidth = $$props.offsetWidth);
+		if ('readyState' in $$props) $$invalidate(4, readyState = $$props.readyState);
 	};
 
 	return [
@@ -105,9 +120,11 @@ function instance($$self, $$props, $$invalidate) {
 		videoHeight,
 		videoWidth,
 		offsetWidth,
+		readyState,
 		video_timeupdate_handler,
 		video_resize_handler,
-		video_elementresize_handler
+		video_elementresize_handler,
+		video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler
 	];
 }
 
@@ -119,9 +136,10 @@ class Component extends SvelteComponent {
 			currentTime: 0,
 			videoHeight: 1,
 			videoWidth: 2,
-			offsetWidth: 3
+			offsetWidth: 3,
+			readyState: 4
 		});
 	}
 }
 
-export default Component;
\ No newline at end of file
+export default Component;
diff --git a/test/js/samples/video-bindings/input.svelte b/test/js/samples/video-bindings/input.svelte
index e61a2bb919..dcb4356dbc 100644
--- a/test/js/samples/video-bindings/input.svelte
+++ b/test/js/samples/video-bindings/input.svelte
@@ -3,6 +3,7 @@
 	export let videoHeight;
 	export let videoWidth;
 	export let offsetWidth;
+	export let readyState;
 </script>
 
-<video bind:currentTime bind:videoHeight bind:videoWidth bind:offsetWidth/>
+<video bind:currentTime bind:videoHeight bind:videoWidth bind:offsetWidth bind:readyState/>

From c0bc86e214ca0130b78bd714f5495e945b1a6c53 Mon Sep 17 00:00:00 2001
From: Dane David <dndavid102@gmail.com>
Date: Wed, 1 Mar 2023 14:45:50 +0100
Subject: [PATCH 040/110] feat: support exclusively special characters in
 component filenames (#7664)

Fixes #7143

---------

Co-authored-by: Tan Li Hau <tanhauhau@users.noreply.github.com>
Co-authored-by: Yuichiro Yamashita <xydybaseball@gmail.com>
---
 src/compiler/compile/utils/__test__.ts               | 6 ++++++
 src/compiler/compile/utils/get_name_from_filename.ts | 9 ++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/compiler/compile/utils/__test__.ts b/src/compiler/compile/utils/__test__.ts
index 7777bc6afb..3ade3dca2b 100644
--- a/src/compiler/compile/utils/__test__.ts
+++ b/src/compiler/compile/utils/__test__.ts
@@ -13,4 +13,10 @@ describe('get_name_from_filename', () => {
 	it('handles Windows filenames', () => {
 		assert.equal(get_name_from_filename('path\\to\\Widget.svelte'), 'Widget');
 	});
+
+	it('handles special characters in filenames', () => {
+		assert.equal(get_name_from_filename('@.svelte'), '_');
+		assert.equal(get_name_from_filename('&.svelte'), '_');
+		assert.equal(get_name_from_filename('~.svelte'), '_');
+	});
 });
diff --git a/src/compiler/compile/utils/get_name_from_filename.ts b/src/compiler/compile/utils/get_name_from_filename.ts
index 7c0f805b76..dd28190d80 100644
--- a/src/compiler/compile/utils/get_name_from_filename.ts
+++ b/src/compiler/compile/utils/get_name_from_filename.ts
@@ -1,9 +1,8 @@
-import { regex_starts_with_underscore, regex_ends_with_underscore } from '../../utils/patterns';
-
 const regex_percentage_characters = /%/g;
 const regex_file_ending = /\.[^.]+$/;
 const regex_repeated_invalid_variable_identifier_characters = /[^a-zA-Z_$0-9]+/g;
 const regex_starts_with_digit = /^(\d)/;
+const regex_may_starts_or_ends_with_underscore = /^_?(.+?)_?$/;
 
 export default function get_name_from_filename(filename: string) {
 	if (!filename) return null;
@@ -18,12 +17,12 @@ export default function get_name_from_filename(filename: string) {
 		}
 	}
 
-	const base = parts.pop()
+	const base = parts
+		.pop()
 		.replace(regex_percentage_characters, 'u')
 		.replace(regex_file_ending, '')
 		.replace(regex_repeated_invalid_variable_identifier_characters, '_')
-		.replace(regex_starts_with_underscore, '')
-		.replace(regex_ends_with_underscore, '')
+		.replace(regex_may_starts_or_ends_with_underscore, '$1')
 		.replace(regex_starts_with_digit, '_$1');
 
 	if (!base) {

From 311193f1d7dd7f04904567660b997f38c7b32e5b Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Wed, 1 Mar 2023 15:49:18 +0100
Subject: [PATCH 041/110] chore: update changelog

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4153a6e525..ede7feaf22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,12 @@
 * 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))
 
 ## 3.55.1
 

From fbaf3cfc1249645e7f0cc49fa3caab0a4ed6433e Mon Sep 17 00:00:00 2001
From: Tan Li Hau <tanhauhau@users.noreply.github.com>
Date: Thu, 2 Mar 2023 00:28:37 +0800
Subject: [PATCH 042/110] fix: call `<svelte:component>` update to `this` only
 when it's dirty (#4192)

Closes #4129

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 .../wrappers/InlineComponent/index.ts         |  8 ++++++-
 .../dynamic-component-dirty/_config.js        | 24 +++++++++++++++++++
 .../dynamic-component-dirty/main.svelte       | 16 +++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 test/runtime/samples/dynamic-component-dirty/_config.js
 create mode 100644 test/runtime/samples/dynamic-component-dirty/main.svelte

diff --git a/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts b/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
index 5053e8c5d2..ab140a75c5 100644
--- a/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
@@ -418,6 +418,7 @@ export default class InlineComponentWrapper extends Wrapper {
 			const switch_props = block.get_unique_name('switch_props');
 
 			const snippet = this.node.expression.manipulate(block);
+			const dependencies = this.node.expression.dynamic_dependencies();
 
 			if (has_css_custom_properties) {
 				this.set_css_custom_properties(block, css_custom_properties_wrapper, css_custom_properties_wrapper_element, is_svg_namespace);
@@ -468,8 +469,13 @@ export default class InlineComponentWrapper extends Wrapper {
 					? b`@insert(${tmp_anchor}.parentNode, ${css_custom_properties_wrapper}, ${tmp_anchor});`
 					: b`@insert(${parent_node}, ${css_custom_properties_wrapper}, ${tmp_anchor});`);
 
+			let update_condition = x`${switch_value} !== (${switch_value} = ${snippet})`;
+			if (dependencies.length > 0) {
+				update_condition = x`${block.renderer.dirty(dependencies)} && ${update_condition}`;
+			}
+
 			block.chunks.update.push(b`
-				if (${switch_value} !== (${switch_value} = ${snippet})) {
+				if (${update_condition}) {
 					if (${name}) {
 						@group_outros();
 						const old_component = ${name};
diff --git a/test/runtime/samples/dynamic-component-dirty/_config.js b/test/runtime/samples/dynamic-component-dirty/_config.js
new file mode 100644
index 0000000000..bace92f21b
--- /dev/null
+++ b/test/runtime/samples/dynamic-component-dirty/_config.js
@@ -0,0 +1,24 @@
+const calls = [];
+export default {
+	props: {
+		calls
+	},
+
+	before_test() {
+		calls.length = 0;
+	},
+
+	async test({ assert, component, target, window }) {
+		const buttons = target.querySelector('button');
+
+		assert.deepEqual(calls.length, 1);
+
+		const event = new window.MouseEvent('click');
+		await buttons.dispatchEvent(event);
+
+		assert.deepEqual(calls.length, 1);
+
+		component.current_path = 'bar';
+		assert.deepEqual(calls.length, 2);
+	}
+};
diff --git a/test/runtime/samples/dynamic-component-dirty/main.svelte b/test/runtime/samples/dynamic-component-dirty/main.svelte
new file mode 100644
index 0000000000..37317e98aa
--- /dev/null
+++ b/test/runtime/samples/dynamic-component-dirty/main.svelte
@@ -0,0 +1,16 @@
+<script>
+	export let current_path = 'foo';
+	export let calls;
+	let i = 0;
+	function getComponent(path) {
+		calls.push(path);
+		return null;
+	}
+	function onClick() {
+		i = i + 1;
+	}
+</script>
+
+<svelte:component this={getComponent(current_path)} />
+<button on:click={onClick}>click me</button>
+{i}

From d525901556bfc5575150ccd6b198a413dfff1bb3 Mon Sep 17 00:00:00 2001
From: Tan Li Hau <tanhauhau@users.noreply.github.com>
Date: Thu, 2 Mar 2023 16:24:33 +0800
Subject: [PATCH 043/110] fix validation for global compound selector (#8344)

---
 src/compiler/compile/css/Selector.ts                 |  2 +-
 .../css-invalid-global-placement-5/errors.json       | 12 ++++++++++++
 .../css-invalid-global-placement-5/input.svelte      |  7 +++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 test/validator/samples/css-invalid-global-placement-5/errors.json
 create mode 100644 test/validator/samples/css-invalid-global-placement-5/input.svelte

diff --git a/src/compiler/compile/css/Selector.ts b/src/compiler/compile/css/Selector.ts
index c0819a233f..c7a1d8c3b1 100644
--- a/src/compiler/compile/css/Selector.ts
+++ b/src/compiler/compile/css/Selector.ts
@@ -189,7 +189,7 @@ export default class Selector {
 					index !== 0 &&
 					selector.children &&
 					selector.children.length > 0 &&
-					!/[.:#\s]/.test(selector.children[0].value)
+					!/[.:#\s]/.test(selector.children[0].value[0])
 				) {
 					component.error(selector, compiler_errors.css_invalid_global_selector_position);
 				}
diff --git a/test/validator/samples/css-invalid-global-placement-5/errors.json b/test/validator/samples/css-invalid-global-placement-5/errors.json
new file mode 100644
index 0000000000..de4e3f79e9
--- /dev/null
+++ b/test/validator/samples/css-invalid-global-placement-5/errors.json
@@ -0,0 +1,12 @@
+[{
+	"code": "css-invalid-global-selector-position",
+	"message": ":global(...) not at the start of a selector sequence should not contain type or universal selectors",
+	"start": {
+		"line": 2,
+		"column": 5
+	},
+	"end": {
+		"line": 2,
+		"column": 21
+	}
+}]
\ No newline at end of file
diff --git a/test/validator/samples/css-invalid-global-placement-5/input.svelte b/test/validator/samples/css-invalid-global-placement-5/input.svelte
new file mode 100644
index 0000000000..cbd4f3a4fc
--- /dev/null
+++ b/test/validator/samples/css-invalid-global-placement-5/input.svelte
@@ -0,0 +1,7 @@
+<style>
+	.foo:global(div.bar) {
+		color: red;
+	}
+</style>
+
+<div class="foo" />
\ No newline at end of file

From e2b9df1888775bd5d7349fb81c1e7038942c038c Mon Sep 17 00:00:00 2001
From: Brandon McConnell <brandon@dreamthinkbuild.com>
Date: Thu, 2 Mar 2023 06:38:43 -0500
Subject: [PATCH 044/110] docs: update 06-accessibility-warnings.md (#8342)

Convert recommended events to use Svelte syntax, and include deprecation warning re https://developer.mozilla.org/en-US/docs/Web/API/Element/keypress_event
---
 site/content/docs/06-accessibility-warnings.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/site/content/docs/06-accessibility-warnings.md b/site/content/docs/06-accessibility-warnings.md
index ee52aab405..4324ed7b75 100644
--- a/site/content/docs/06-accessibility-warnings.md
+++ b/site/content/docs/06-accessibility-warnings.md
@@ -55,7 +55,7 @@ Enforce that `autofocus` is not used on elements. Autofocusing elements can caus
 
 ### `a11y-click-events-have-key-events`
 
-Enforce `on:click` is accompanied by at least one of the following: `onKeyUp`, `onKeyDown`, `onKeyPress`. Coding for the keyboard is important for users with physical disabilities who cannot use a mouse, AT compatibility, and screenreader users. 
+Enforce `on:click` is accompanied by at least one of the following: `on:keyup`, `on:keydown`, `on:keypress`. Coding for the keyboard is important for users with physical disabilities who cannot use a mouse, AT compatibility, and screenreader users.
 
 This does not apply for interactive or hidden elements.
 
@@ -64,6 +64,8 @@ This does not apply for interactive or hidden elements.
 <div on:click={() => {}} />
 ```
 
+Note that the `keypress` event is now deprecated, so it is officially recommended to use either the `keyup` or `keydown` event instead, accordingly.
+
 ---
 
 ### `a11y-distracting-elements`

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 045/110] 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 046/110] 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 047/110] 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 048/110] 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 049/110] 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 050/110] 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 051/110] 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 052/110] 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 053/110] 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 054/110] -> 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 055/110] 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 056/110] 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 057/110] 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 058/110] 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 059/110] 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 060/110] 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 061/110] 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 062/110] 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 063/110] 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 064/110] 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 065/110] 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 066/110] 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 067/110] 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 068/110] 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 069/110] 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 070/110] -> 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 071/110] 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 072/110] 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 073/110] 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 074/110] 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))

From 7e9e78b37c0c57a02c015196984e18cc47827345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cavit=20Ertu=C4=9Frul=20S=C4=B1rt?=
 <100495175+ertucode@users.noreply.github.com>
Date: Sun, 19 Mar 2023 09:20:20 +0300
Subject: [PATCH 075/110] docs: Tutorial body had <svelte:body /> even though
 <svelte:document /> was the subject (#8396)

---
 .../16-special-elements/06-svelte-document/app-a/App.svelte     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index cea052ec88..09cc596e8c 100644
--- 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
@@ -4,7 +4,7 @@
 	const handleSelectionChange = (e) => selection = document.getSelection();
 </script>
 
-<svelte:body />
+<svelte:document />
 
 <p>Select this text to fire events</p>
 <p>Selection: {selection}</p>

From fed93ab9e1da9b54852c17ebe1dc721e52bbb27b Mon Sep 17 00:00:00 2001
From: Nguyen Tran <88808276+ngtr6788@users.noreply.github.com>
Date: Mon, 20 Mar 2023 08:18:54 -0400
Subject: [PATCH 076/110] feat: add a11y `interactive-supports-focus` (#8392)

#820
---
 .../content/docs/06-accessibility-warnings.md |  11 +
 src/compiler/compile/compiler_warnings.ts     |   4 +
 src/compiler/compile/nodes/Element.ts         |  44 ++-
 src/compiler/compile/utils/a11y.ts            |  18 ++
 .../input.svelte                              |  32 ++
 .../warnings.json                             | 278 ++++++++++++++++++
 6 files changed, 386 insertions(+), 1 deletion(-)
 create mode 100644 test/validator/samples/a11y-interactive-supports-focus/input.svelte
 create mode 100644 test/validator/samples/a11y-interactive-supports-focus/warnings.json

diff --git a/site/content/docs/06-accessibility-warnings.md b/site/content/docs/06-accessibility-warnings.md
index bc793d80e7..0d025d797d 100644
--- a/site/content/docs/06-accessibility-warnings.md
+++ b/site/content/docs/06-accessibility-warnings.md
@@ -137,6 +137,17 @@ Enforce that attributes important for accessibility have a valid value. For exam
 
 ---
 
+### `a11y-interactive-supports-focus`
+
+Enforce that elements with an interactive role and interactive handlers (mouse or key press) must be focusable or tabbable.
+
+```sv
+<!-- A11y: Elements with the 'button' interactive role must have a tabindex value. -->
+<div role="button" on:keypress={() => {}} />
+```
+
+---
+
 ### `a11y-label-has-associated-control`
 
 Enforce that a label tag has a text label and an associated control.
diff --git a/src/compiler/compile/compiler_warnings.ts b/src/compiler/compile/compiler_warnings.ts
index 710377374f..a851bc24c2 100644
--- a/src/compiler/compile/compiler_warnings.ts
+++ b/src/compiler/compile/compiler_warnings.ts
@@ -166,6 +166,10 @@ export default {
 		code: 'a11y-img-redundant-alt',
 		message: 'A11y: Screenreaders already announce <img> elements as an image.'
 	},
+	a11y_interactive_supports_focus: (role: string) => ({
+		code: 'a11y-interactive-supports-focus',
+		message: `A11y: Elements with the '${role}' interactive role must have a tabindex value.`
+	}),
 	a11y_label_has_associated_control: {
 		code: 'a11y-label-has-associated-control',
 		message: 'A11y: A form label must be associated with a control.'
diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index 2fd91ac495..7fcb586b6a 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -25,7 +25,7 @@ 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_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';
+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, is_static_element, has_disabled_attribute } 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);
@@ -75,6 +75,33 @@ const a11y_labelable = new Set([
 	'textarea'
 ]);
 
+const a11y_interactive_handlers = new Set([
+	// Keyboard events
+	'keypress',
+	'keydown',
+	'keyup',
+
+	// Click events
+	'click',
+	'contextmenu',
+	'dblclick',
+	'drag',
+	'dragend',
+	'dragenter',
+	'dragexit',
+	'dragleave',
+	'dragover',
+	'dragstart',
+	'drop',
+	'mousedown',
+	'mouseenter',
+	'mouseleave',
+	'mousemove',
+	'mouseout',
+	'mouseover',
+	'mouseup'
+]);
+
 const a11y_nested_implicit_semantics = new Map([
 	['header', 'banner'],
 	['footer', 'contentinfo']
@@ -603,6 +630,21 @@ export default class Element extends Node {
 							}
 						}
 
+						// interactive-supports-focus
+						if (
+							!has_disabled_attribute(attribute_map) &&
+							!is_hidden_from_screen_reader(this.name, attribute_map) &&
+							!is_presentation_role(current_role) &&
+							is_interactive_roles(current_role) &&
+							is_static_element(this.name, attribute_map) &&
+							!attribute_map.get('tabindex')
+						) {
+							const has_interactive_handlers = handlers.some((handler) => a11y_interactive_handlers.has(handler.name));
+							if (has_interactive_handlers) {
+								component.warn(this, compiler_warnings.a11y_interactive_supports_focus(current_role));
+							}
+						}
+
 						// no-interactive-element-to-noninteractive-role
 						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));
diff --git a/src/compiler/compile/utils/a11y.ts b/src/compiler/compile/utils/a11y.ts
index d0564b419e..4409f80262 100644
--- a/src/compiler/compile/utils/a11y.ts
+++ b/src/compiler/compile/utils/a11y.ts
@@ -68,6 +68,24 @@ export function is_hidden_from_screen_reader(tag_name: string, attribute_map: Ma
 	return aria_hidden_value === true || aria_hidden_value === 'true';
 }
 
+export function has_disabled_attribute(attribute_map: Map<string, Attribute>) {
+	const disabled_attr = attribute_map.get('disabled');
+	const disabled_attr_value = disabled_attr && disabled_attr.get_static_value();
+	if (disabled_attr_value) {
+		return true;
+	}
+
+	const aria_disabled_attr = attribute_map.get('aria-disabled');
+	if (aria_disabled_attr) {
+		const aria_disabled_attr_value = aria_disabled_attr.get_static_value();
+		if (aria_disabled_attr_value === true) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
 const non_interactive_element_role_schemas: ARIARoleRelationConcept[] = [];
 
 elementRoles.entries().forEach(([schema, roles]) => {
diff --git a/test/validator/samples/a11y-interactive-supports-focus/input.svelte b/test/validator/samples/a11y-interactive-supports-focus/input.svelte
new file mode 100644
index 0000000000..9caa9ccfaf
--- /dev/null
+++ b/test/validator/samples/a11y-interactive-supports-focus/input.svelte
@@ -0,0 +1,32 @@
+<!-- VALID -->
+<div aria-hidden role="button" on:keypress={() => {}} />
+<div aria-disabled role="button" on:keypress={() => {}} />
+<div disabled role="button" on:keypress={() => {}} />
+<div role="presentation" on:keypress={() => {}} />
+<button on:click={() => {}} />
+<div role="menuitem" tabindex="0" on:click={() => {}} on:keypress={() => {}} />
+<div role="button" tabindex="-1" on:click={() => {}} on:keypress={() => {}} />
+
+<!-- INVALID -->
+<div role="button" on:keypress={() => {}} />
+<span role="menuitem" on:keydown={() => {}} />
+<div role="button" on:keyup={() => {}} />
+<span role="menuitem" on:click={() => {}} on:keypress={() => {}} />
+<div role="button" on:contextmenu={() => {}} />
+<span role="menuitem" on:dblclick={() => {}} />
+<div role="button" on:drag={() => {}} />
+<span role="menuitem" on:dragend={() => {}} />
+<div role="button" on:dragenter={() => {}} />
+<span role="menuitem" on:dragexit={() => {}} />
+<div role="button" on:dragleave={() => {}} />
+<span role="menuitem" on:dragover={() => {}} />
+<div role="button" on:dragstart={() => {}} />
+<span role="menuitem" on:drop={() => {}} />
+<div role="button" on:mousedown={() => {}} />
+<span role="menuitem" on:mouseenter={() => {}} />
+<div role="button" on:mouseleave={() => {}} />
+<span role="menuitem" on:mousemove={() => {}} />
+<div role="button" on:mouseout={() => {}} />
+<span role="menuitem" on:mouseover={() => {}} />
+<div role="button" on:mouseup={() => {}} />
+
diff --git a/test/validator/samples/a11y-interactive-supports-focus/warnings.json b/test/validator/samples/a11y-interactive-supports-focus/warnings.json
new file mode 100644
index 0000000000..41586b064b
--- /dev/null
+++ b/test/validator/samples/a11y-interactive-supports-focus/warnings.json
@@ -0,0 +1,278 @@
+[
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 44,
+			"line": 11
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 11
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 46,
+			"line": 12
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 12
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 41,
+			"line": 13
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 13
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 67,
+			"line": 14
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 14
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 47,
+			"line": 15
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 15
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 47,
+			"line": 16
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 16
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 40,
+			"line": 17
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 17
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 46,
+			"line": 18
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 18
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 45,
+			"line": 19
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 19
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 47,
+			"line": 20
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 20
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 45,
+			"line": 21
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 21
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 47,
+			"line": 22
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 22
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 45,
+			"line": 23
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 23
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 43,
+			"line": 24
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 24
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 45,
+			"line": 25
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 25
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 49,
+			"line": 26
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 26
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 46,
+			"line": 27
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 27
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 48,
+			"line": 28
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 28
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 44,
+			"line": 29
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 29
+		}
+	},
+	{
+		"code": "a11y-mouse-events-have-key-events",
+		"end": {
+			"column": 44,
+			"line": 29
+		},
+		"message": "A11y: on:mouseout must be accompanied by on:blur",
+		"start": {
+			"column": 0,
+			"line": 29
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 48,
+			"line": 30
+		},
+		"message": "A11y: Elements with the 'menuitem' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 30
+		}
+	},
+	{
+		"code": "a11y-mouse-events-have-key-events",
+		"end": {
+			"column": 48,
+			"line": 30
+		},
+		"message": "A11y: on:mouseover must be accompanied by on:focus",
+		"start": {
+			"column": 0,
+			"line": 30
+		}
+	},
+	{
+		"code": "a11y-interactive-supports-focus",
+		"end": {
+			"column": 43,
+			"line": 31
+		},
+		"message": "A11y: Elements with the 'button' interactive role must have a tabindex value.",
+		"start": {
+			"column": 0,
+			"line": 31
+		}
+	}
+]

From 0700abe41d32d72cef53f0191d7eb4197c5e9fdf Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 20 Mar 2023 14:12:19 +0100
Subject: [PATCH 077/110] fix: typings for `svelte:document`

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

diff --git a/elements/index.d.ts b/elements/index.d.ts
index 4ad2f2880f..7595d767bf 100644
--- a/elements/index.d.ts
+++ b/elements/index.d.ts
@@ -1586,6 +1586,7 @@ export interface SvelteHTMLElements {
 
 	// Svelte specific
 	'svelte:window': SvelteWindowAttributes;
+	'svelte:document': HTMLAttributes<Document>;
 	'svelte:body': HTMLAttributes<HTMLElement>;
 	'svelte:fragment': { slot?: string };
 	'svelte:options': { [name: string]: any };

From 6ce6f14755c466ad9239e5fcb27d2f13fccc419b Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 21 Mar 2023 10:51:05 +0100
Subject: [PATCH 078/110] fix: relax
 `a11y-no-noninteractive-element-to-interactive-role` warning (#8402)

#8167 introduced the strict version of it - until this is configurable, we should use the relaxed version instead, since many a11y docs actually advise using ul/ol etc
---
 src/compiler/compile/nodes/Element.ts         |  31 ++-
 .../warnings.json                             | 192 ------------------
 2 files changed, 30 insertions(+), 193 deletions(-)

diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index 7fcb586b6a..1678ea1caa 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -172,6 +172,35 @@ const input_type_to_implicit_role = new Map([
   ['url', 'textbox']
 ]);
 
+/** 
+ * Exceptions to the rule which follows common A11y conventions
+ * TODO make this configurable by the user
+ */
+const a11y_non_interactive_element_to_interactive_role_exceptions = {
+	ul: [
+		'listbox',
+		'menu',
+		'menubar',
+		'radiogroup',
+		'tablist',
+		'tree',
+		'treegrid'
+	],
+	ol: [
+		'listbox',
+		'menu',
+		'menubar',
+		'radiogroup',
+		'tablist',
+		'tree',
+		'treegrid'
+	],
+	li: ['menuitem', 'option', 'row', 'tab', 'treeitem'],
+	table: ['grid'],
+	td: ['gridcell'],
+	fieldset: ['radiogroup', 'presentation']
+};
+
 const combobox_if_list = new Set(['email', 'search', 'tel', 'text', 'url']);
 
 function input_implicit_role(attribute_map: Map<string, Attribute>) {
@@ -651,7 +680,7 @@ export default class Element extends Node {
 						}
 
 						// no-noninteractive-element-to-interactive-role
-						if (is_non_interactive_element(this.name, attribute_map) && is_interactive_roles(current_role)) {
+						if (is_non_interactive_element(this.name, attribute_map) && is_interactive_roles(current_role) && !a11y_non_interactive_element_to_interactive_role_exceptions[this.name]?.includes(current_role)) {
 							component.warn(this, compiler_warnings.a11y_no_noninteractive_element_to_interactive_role(current_role, this.name));
 						}
 					});
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
index 4b4c9c3d97..0835f9f07f 100644
--- 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
@@ -622,197 +622,5 @@
       "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 a2170f5bd5312ed6a63cc1a465826705dc295cd9 Mon Sep 17 00:00:00 2001
From: Yuichiro Yamashita <xydybaseball@gmail.com>
Date: Tue, 21 Mar 2023 22:30:25 +0900
Subject: [PATCH 079/110] fix: use `wholeText` for only `contenteditable` for
 `set_data` (#8394)

- split logic up into "is this a contenteditable element" and depending on the outcome use either .wholeText or .data to check if an update is necessary
- add to puppeteer because jsdom does not support contenteditable
- one test is skipped it because it fails right now but helps test #5018

---------

Co-authored-by: suxin2017 <1107178482@qq.com>
Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 .../render_dom/wrappers/Element/index.ts      | 33 ++++++++--------
 .../compile/render_dom/wrappers/Fragment.ts   |  2 +-
 .../render_dom/wrappers/MustacheTag.ts        | 38 +++++++++++++++++--
 .../render_dom/wrappers/shared/Wrapper.ts     |  2 +-
 src/runtime/internal/dev.ts                   | 21 ++++++++--
 src/runtime/internal/dom.ts                   | 21 ++++++++--
 src/runtime/internal/utils.ts                 |  2 +
 .../_config.js                                | 13 +++++++
 .../main.svelte                               |  6 +++
 .../_config.js                                | 24 ++++++++++++
 .../main.svelte                               | 11 ++++++
 .../_config.js                                | 33 ++++++++++++++++
 .../main.svelte                               |  0
 .../_config.js                                | 15 --------
 .../reactive-values-text-node/_config.js      |  9 +++++
 .../reactive-values-text-node/main.svelte     |  8 ++++
 16 files changed, 197 insertions(+), 41 deletions(-)
 create mode 100644 test/runtime-puppeteer/samples/component-event-handler-contenteditable-false/_config.js
 create mode 100644 test/runtime-puppeteer/samples/component-event-handler-contenteditable-false/main.svelte
 create mode 100644 test/runtime-puppeteer/samples/component-event-handler-contenteditable-spread/_config.js
 create mode 100644 test/runtime-puppeteer/samples/component-event-handler-contenteditable-spread/main.svelte
 create mode 100644 test/runtime-puppeteer/samples/component-event-handler-contenteditable/_config.js
 rename test/{runtime => runtime-puppeteer}/samples/component-event-handler-contenteditable/main.svelte (100%)
 delete mode 100644 test/runtime/samples/component-event-handler-contenteditable/_config.js
 create mode 100644 test/runtime/samples/reactive-values-text-node/_config.js
 create mode 100644 test/runtime/samples/reactive-values-text-node/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 1f80cee89c..7a0bdbaa06 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -174,6 +174,8 @@ export default class ElementWrapper extends Wrapper {
 	child_dynamic_element_block?: Block = null;
 	child_dynamic_element?: ElementWrapper = null;
 
+	element_data_name = null;
+
 	constructor(
 		renderer: Renderer,
 		block: Block,
@@ -287,6 +289,8 @@ export default class ElementWrapper extends Wrapper {
 		}
 
 		this.fragment = new FragmentWrapper(renderer, block, node.children, this, strip_whitespace, next_sibling);
+
+		this.element_data_name = block.get_unique_name(`${this.var.name}_data`);
 	}
 
 	render(block: Block, parent_node: Identifier, parent_nodes: Identifier) {
@@ -516,7 +520,8 @@ export default class ElementWrapper extends Wrapper {
 				child.render(
 					block,
 					is_template ? x`${node}.content` : node,
-					nodes
+					nodes,
+					{ element_data_name: this.element_data_name }
 				);
 			});
 		}
@@ -824,7 +829,6 @@ export default class ElementWrapper extends Wrapper {
 
 	add_spread_attributes(block: Block) {
 		const levels = block.get_unique_name(`${this.var.name}_levels`);
-		const data = block.get_unique_name(`${this.var.name}_data`);
 
 		const initial_props = [];
 		const updates = [];
@@ -855,9 +859,9 @@ export default class ElementWrapper extends Wrapper {
 		block.chunks.init.push(b`
 			let ${levels} = [${initial_props}];
 
-			let ${data} = {};
+			let ${this.element_data_name} = {};
 			for (let #i = 0; #i < ${levels}.length; #i += 1) {
-				${data} = @assign(${data}, ${levels}[#i]);
+				${this.element_data_name} = @assign(${this.element_data_name}, ${levels}[#i]);
 			}
 		`);
 
@@ -869,12 +873,12 @@ export default class ElementWrapper extends Wrapper {
 					: x`@set_attributes`;
 
 		block.chunks.hydrate.push(
-			b`${fn}(${this.var}, ${data});`
+			b`${fn}(${this.var}, ${this.element_data_name});`
 		);
 
 		if (this.has_dynamic_attribute) {
 			block.chunks.update.push(b`
-				${fn}(${this.var}, ${data} = @get_spread_update(${levels}, [
+				${fn}(${this.var}, ${this.element_data_name} = @get_spread_update(${levels}, [
 					${updates}
 				]));
 			`);
@@ -890,23 +894,23 @@ export default class ElementWrapper extends Wrapper {
 			}
 
 			block.chunks.mount.push(b`
-				'value' in ${data} && (${data}.multiple ? @select_options : @select_option)(${this.var}, ${data}.value);
+				'value' in ${this.element_data_name} && (${this.element_data_name}.multiple ? @select_options : @select_option)(${this.var}, ${this.element_data_name}.value);
 			`);
 
 			block.chunks.update.push(b`
-				if (${block.renderer.dirty(Array.from(dependencies))} && 'value' in ${data}) (${data}.multiple ? @select_options : @select_option)(${this.var}, ${data}.value);
+				if (${block.renderer.dirty(Array.from(dependencies))} && 'value' in ${this.element_data_name}) (${this.element_data_name}.multiple ? @select_options : @select_option)(${this.var}, ${this.element_data_name}.value);
 			`);
 		} else if (this.node.name === 'input' && this.attributes.find(attr => attr.node.name === 'value')) {
 			const type = this.node.get_static_attribute_value('type');
 			if (type === null || type === '' || type === 'text' || type === 'email' || type === 'password') {
 				block.chunks.mount.push(b`
-					if ('value' in ${data}) {
-						${this.var}.value = ${data}.value;
+					if ('value' in ${this.element_data_name}) {
+						${this.var}.value = ${this.element_data_name}.value;
 					}
 				`);
 				block.chunks.update.push(b`
-					if ('value' in ${data}) {
-						${this.var}.value = ${data}.value;
+					if ('value' in ${this.element_data_name}) {
+						${this.var}.value = ${this.element_data_name}.value;
 					}
 				`);
 			}
@@ -1220,8 +1224,8 @@ export default class ElementWrapper extends Wrapper {
 				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 
+					condition =
+						all_deps.size === this.dynamic_style_dependencies.size
 							? style_changed_var
 							: x`${style_changed_var} || ${condition}`;
 				}
@@ -1232,7 +1236,6 @@ export default class ElementWrapper extends Wrapper {
 					}
 				`);
 			}
-			
 		});
 	}
 
diff --git a/src/compiler/compile/render_dom/wrappers/Fragment.ts b/src/compiler/compile/render_dom/wrappers/Fragment.ts
index 8c633aeb71..463c8db24a 100644
--- a/src/compiler/compile/render_dom/wrappers/Fragment.ts
+++ b/src/compiler/compile/render_dom/wrappers/Fragment.ts
@@ -4,7 +4,7 @@ import Body from './Body';
 import DebugTag from './DebugTag';
 import Document from './Document';
 import EachBlock from './EachBlock';
-import Element from './Element/index';
+import Element from './Element';
 import Head from './Head';
 import IfBlock from './IfBlock';
 import KeyBlock from './KeyBlock';
diff --git a/src/compiler/compile/render_dom/wrappers/MustacheTag.ts b/src/compiler/compile/render_dom/wrappers/MustacheTag.ts
index ea6634ec80..0bfa0198ae 100644
--- a/src/compiler/compile/render_dom/wrappers/MustacheTag.ts
+++ b/src/compiler/compile/render_dom/wrappers/MustacheTag.ts
@@ -5,7 +5,9 @@ import Wrapper from './shared/Wrapper';
 import MustacheTag from '../../nodes/MustacheTag';
 import RawMustacheTag from '../../nodes/RawMustacheTag';
 import { x } from 'code-red';
-import { Identifier } from 'estree';
+import { Identifier, Expression } from 'estree';
+import ElementWrapper from './Element';
+import AttributeWrapper from './Element/Attribute';
 
 export default class MustacheTagWrapper extends Tag {
 	var: Identifier = { type: 'Identifier', name: 't' };
@@ -14,10 +16,40 @@ export default class MustacheTagWrapper extends Tag {
 		super(renderer, block, parent, node);
 	}
 
-	render(block: Block, parent_node: Identifier, parent_nodes: Identifier) {
+	render(block: Block, parent_node: Identifier, parent_nodes: Identifier, data: Record<string, unknown> | undefined) {
+		const contenteditable_attributes =
+			this.parent instanceof ElementWrapper &&
+			this.parent.attributes.filter((a) => a.node.name === 'contenteditable');
+
+		const spread_attributes =
+			this.parent instanceof ElementWrapper &&
+			this.parent.attributes.filter((a) => a.node.is_spread);
+
+		let contenteditable_attr_value: Expression | true | undefined = undefined;
+		if (contenteditable_attributes.length > 0) {
+			const attribute = contenteditable_attributes[0] as AttributeWrapper;
+			if ([true, 'true', ''].includes(attribute.node.get_static_value())) {
+				contenteditable_attr_value = true;
+			} else {
+				contenteditable_attr_value = x`${attribute.get_value(block)}`;
+			}
+		}	else if (spread_attributes.length > 0 && data.element_data_name) {
+			contenteditable_attr_value = x`${data.element_data_name}['contenteditable']`;
+		}
+
 		const { init } = this.rename_this_method(
 			block,
-			value => x`@set_data(${this.var}, ${value})`
+			value => {
+				if (contenteditable_attr_value) {
+					if (contenteditable_attr_value === true) {
+						return x`@set_data_contenteditable(${this.var}, ${value})`;
+					} else {
+						return x`@set_data_maybe_contenteditable(${this.var}, ${value}, ${contenteditable_attr_value})`;
+					}
+				} else {
+					return x`@set_data(${this.var}, ${value})`;
+				}
+			}
 		);
 
 		block.add_element(
diff --git a/src/compiler/compile/render_dom/wrappers/shared/Wrapper.ts b/src/compiler/compile/render_dom/wrappers/shared/Wrapper.ts
index 4bf8c20bd8..53847d8870 100644
--- a/src/compiler/compile/render_dom/wrappers/shared/Wrapper.ts
+++ b/src/compiler/compile/render_dom/wrappers/shared/Wrapper.ts
@@ -85,7 +85,7 @@ export default class Wrapper {
 		);
 	}
 
-	render(_block: Block, _parent_node: Identifier, _parent_nodes: Identifier) {
+	render(_block: Block, _parent_node: Identifier, _parent_nodes: Identifier, _data: Record<string, any> = undefined) {
 		throw Error('Wrapper class is not renderable');
 	}
 }
diff --git a/src/runtime/internal/dev.ts b/src/runtime/internal/dev.ts
index be81a11514..cd47138fef 100644
--- a/src/runtime/internal/dev.ts
+++ b/src/runtime/internal/dev.ts
@@ -1,6 +1,7 @@
 import { custom_event, append, append_hydration, insert, insert_hydration, detach, listen, attr } from './dom';
 import { SvelteComponent } from './Component';
 import { is_void } from '../../shared/utils/names';
+import { contenteditable_truthy_values } from './utils';
 
 export function dispatch_dev<T=any>(type: string, detail?: T) {
 	document.dispatchEvent(custom_event(type, { version: '__VERSION__', ...detail }, { bubbles: true }));
@@ -83,12 +84,26 @@ export function dataset_dev(node: HTMLElement, property: string, value?: any) {
 	dispatch_dev('SvelteDOMSetDataset', { node, property, value });
 }
 
-export function set_data_dev(text, data) {
+export function set_data_dev(text: Text, data: unknown) {
 	data = '' + data;
-	if (text.wholeText === data) return;
+	if (text.data === data) return;
+	dispatch_dev('SvelteDOMSetData', { node: text, data });
+	text.data = (data as string);
+}
 
+export function set_data_contenteditable_dev(text: Text, data: unknown) {
+	data = '' + data;
+	if (text.wholeText === data) return;
 	dispatch_dev('SvelteDOMSetData', { node: text, data });
-	text.data = data;
+	text.data = (data as string);
+}
+
+export function set_data_maybe_contenteditable_dev(text: Text, data: unknown, attr_value: string) {
+	if (~contenteditable_truthy_values.indexOf(attr_value)) {
+		set_data_contenteditable_dev(text, data);
+	} else {
+		set_data_dev(text, data);
+	}
 }
 
 export function validate_each_argument(arg) {
diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index 1f786d51b5..a746613170 100644
--- a/src/runtime/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -1,4 +1,4 @@
-import { has_prop } from './utils';
+import { contenteditable_truthy_values, has_prop } from './utils';
 
 // Track which nodes are claimed during hydration. Unclaimed nodes can then be removed from the DOM
 // at the end of hydration without touching the remaining nodes.
@@ -581,9 +581,24 @@ export function claim_html_tag(nodes, is_svg: boolean) {
 	return new HtmlTagHydration(claimed_nodes, is_svg);
 }
 
-export function set_data(text, data) {
+export function set_data(text: Text, data: unknown) {
 	data = '' + data;
-	if (text.wholeText !== data) text.data = data;
+	if (text.data === data) return;
+	text.data = (data as string);
+}
+
+export function set_data_contenteditable(text: Text, data: unknown) {
+	data = '' + data;
+	if (text.wholeText === data) return;
+	text.data = (data as string);
+}
+
+export function set_data_maybe_contenteditable(text: Text, data: unknown, attr_value: string) {
+	if (~contenteditable_truthy_values.indexOf(attr_value)) {
+		set_data_contenteditable(text, data);
+	} else {
+		set_data(text, data);
+	}
 }
 
 export function set_input_value(input, value) {
diff --git a/src/runtime/internal/utils.ts b/src/runtime/internal/utils.ts
index b1c27a355d..192f40140e 100644
--- a/src/runtime/internal/utils.ts
+++ b/src/runtime/internal/utils.ts
@@ -194,3 +194,5 @@ 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'];
 }
+
+export const contenteditable_truthy_values = ['', true, 1, 'true', 'contenteditable'];
diff --git a/test/runtime-puppeteer/samples/component-event-handler-contenteditable-false/_config.js b/test/runtime-puppeteer/samples/component-event-handler-contenteditable-false/_config.js
new file mode 100644
index 0000000000..3763360fd8
--- /dev/null
+++ b/test/runtime-puppeteer/samples/component-event-handler-contenteditable-false/_config.js
@@ -0,0 +1,13 @@
+// A puppeteer test because JSDOM doesn't support contenteditable
+export default {
+	html: '<div contenteditable="false"></div>',
+
+	async test({ assert, target, component, window }) {
+		const div = target.querySelector('div');
+		const text =  window.document.createTextNode('a');
+		div.insertBefore(text, null);
+		assert.equal(div.textContent, 'a');
+		component.text = 'bcde';
+		assert.equal(div.textContent, 'bcdea');
+	}
+};
diff --git a/test/runtime-puppeteer/samples/component-event-handler-contenteditable-false/main.svelte b/test/runtime-puppeteer/samples/component-event-handler-contenteditable-false/main.svelte
new file mode 100644
index 0000000000..9555925487
--- /dev/null
+++ b/test/runtime-puppeteer/samples/component-event-handler-contenteditable-false/main.svelte
@@ -0,0 +1,6 @@
+<script>
+	export let text = '';
+	const updater = (event) => {text = event.target.textContent}
+</script>
+
+<div contenteditable="false" on:input={updater}>{text}</div>
diff --git a/test/runtime-puppeteer/samples/component-event-handler-contenteditable-spread/_config.js b/test/runtime-puppeteer/samples/component-event-handler-contenteditable-spread/_config.js
new file mode 100644
index 0000000000..de65bd6627
--- /dev/null
+++ b/test/runtime-puppeteer/samples/component-event-handler-contenteditable-spread/_config.js
@@ -0,0 +1,24 @@
+// A puppeteer test because JSDOM doesn't support contenteditable
+export default {
+	html: '<div contenteditable="true"></div>',
+	ssrHtml: '<div contenteditable=""></div>',
+
+	async test({ assert, target, window }) {
+		// this tests that by going from contenteditable=true to false, the
+		// content is correctly updated before that. This relies on the order
+		// of the updates: first updating the content, then setting contenteditable
+		// to false, which means that `set_data_maybe_contenteditable` is used and not `set_data`.
+		// If the order is reversed, https://github.com/sveltejs/svelte/issues/5018
+		// would be happening. The caveat is that if we go from contenteditable=false to true
+		// then we will have the same issue. To fix this reliably we probably need to
+		// overhaul the way we handle text updates in general.
+		// If due to some refactoring this test fails, it's probably fine to ignore it since
+		// this is a very specific edge case and the behavior is unstable anyway.
+		const div = target.querySelector('div');
+		const text =  window.document.createTextNode('a');
+		div.insertBefore(text, null);
+		const event = new window.InputEvent('input');
+		await div.dispatchEvent(event);
+		assert.equal(div.textContent, 'a');
+	}
+};
diff --git a/test/runtime-puppeteer/samples/component-event-handler-contenteditable-spread/main.svelte b/test/runtime-puppeteer/samples/component-event-handler-contenteditable-spread/main.svelte
new file mode 100644
index 0000000000..ed301e8d20
--- /dev/null
+++ b/test/runtime-puppeteer/samples/component-event-handler-contenteditable-spread/main.svelte
@@ -0,0 +1,11 @@
+<script>
+	let text = "";
+	const updater = (event) => {
+		text = event.target.textContent;
+	};
+	$: spread = {
+		contenteditable: text !== "a",
+	};
+</script>
+
+<div {...spread} on:input={updater}>{text}</div>
diff --git a/test/runtime-puppeteer/samples/component-event-handler-contenteditable/_config.js b/test/runtime-puppeteer/samples/component-event-handler-contenteditable/_config.js
new file mode 100644
index 0000000000..1b4b3b0271
--- /dev/null
+++ b/test/runtime-puppeteer/samples/component-event-handler-contenteditable/_config.js
@@ -0,0 +1,33 @@
+// A puppeteer test because JSDOM doesn't support contenteditable
+export default {
+	html: '<div contenteditable=""></div>',
+
+	// Failing test for https://github.com/sveltejs/svelte/issues/5018, fix pending
+	// It's hard to fix this because in order to do that, we would need to change the
+	// way the value is compared completely. Right now it compares the value of the
+	// first text node, but it should compare the value of the whole content
+	skip: true,
+
+	async test({ assert, target, window }) {
+		const div = target.querySelector('div');
+
+		let text = window.document.createTextNode('a');
+		div.insertBefore(text, null);
+		let event = new window.InputEvent('input');
+		await div.dispatchEvent(event);
+		assert.equal(div.textContent, 'a');
+		
+		// When a user types a newline, the browser inserts a <div> element
+		const inner_div = window.document.createElement('div');
+		div.insertBefore(inner_div, null);
+		event = new window.InputEvent('input');
+		await div.dispatchEvent(event);
+		assert.equal(div.textContent, 'a');
+		
+		text = window.document.createTextNode('b');
+		inner_div.insertBefore(text, null);
+		event = new window.InputEvent('input');
+		await div.dispatchEvent(event);
+		assert.equal(div.textContent, 'ab');
+	}
+};
diff --git a/test/runtime/samples/component-event-handler-contenteditable/main.svelte b/test/runtime-puppeteer/samples/component-event-handler-contenteditable/main.svelte
similarity index 100%
rename from test/runtime/samples/component-event-handler-contenteditable/main.svelte
rename to test/runtime-puppeteer/samples/component-event-handler-contenteditable/main.svelte
diff --git a/test/runtime/samples/component-event-handler-contenteditable/_config.js b/test/runtime/samples/component-event-handler-contenteditable/_config.js
deleted file mode 100644
index 1628e22d01..0000000000
--- a/test/runtime/samples/component-event-handler-contenteditable/_config.js
+++ /dev/null
@@ -1,15 +0,0 @@
-export default {
-	html: `
-		<div contenteditable=""></div>
-	`,
-
-	async test({ assert, target, window }) {
-		const div = target.querySelector('div');
-		const text =  window.document.createTextNode('a');
-		div.insertBefore(text, null);
-		const event = new window.InputEvent('input');
-		await div.dispatchEvent(event);
-
-		assert.equal(div.textContent, 'a');
-	}
-};
diff --git a/test/runtime/samples/reactive-values-text-node/_config.js b/test/runtime/samples/reactive-values-text-node/_config.js
new file mode 100644
index 0000000000..fb859285dd
--- /dev/null
+++ b/test/runtime/samples/reactive-values-text-node/_config.js
@@ -0,0 +1,9 @@
+export default {
+	html:'<div>same text</div>',
+	async test({ assert, target }) {
+		await new Promise(f => setTimeout(f, 10));
+		assert.htmlEqual(target.innerHTML, `
+			<div>same text text</div>
+		`);
+	}
+};
diff --git a/test/runtime/samples/reactive-values-text-node/main.svelte b/test/runtime/samples/reactive-values-text-node/main.svelte
new file mode 100644
index 0000000000..0982622b1a
--- /dev/null
+++ b/test/runtime/samples/reactive-values-text-node/main.svelte
@@ -0,0 +1,8 @@
+<script>
+	let text = 'same';
+	setTimeout(() => {
+		text = 'same text';
+	}, 5);
+</script>
+
+<div>{text} text</div>

From aa4d0fc2643bdf968dbd72bceda1cce8bdfb5306 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 21 Mar 2023 18:13:03 +0100
Subject: [PATCH 080/110] chore: update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b78413123a..e886996a80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 ## Unreleased
 
 * Add `bind:innerText` for `contenteditable` elements ([#3311](https://github.com/sveltejs/svelte/issues/3311))
+* Relax `a11y-no-noninteractive-element-to-interactive-role` warning ([#8402](https://github.com/sveltejs/svelte/pull/8402))
+* Add `a11y-interactive-supports-focus` warning ([#8392](https://github.com/sveltejs/svelte/pull/8392))
+* Fix equality check when updating dynamic text ([#5931](https://github.com/sveltejs/svelte/issues/5931))
 
 ## 3.57.0
 

From d49b568019fbd6578ceba72de68d0790db909bee Mon Sep 17 00:00:00 2001
From: Snaipe <me@snai.pe>
Date: Mon, 27 Mar 2023 10:05:04 +0200
Subject: [PATCH 081/110] fix: allow use of document root as target in
 typescript (#7554)

It is not possible to use typescript when using `target: document`
during component initialization, because target can only be of type
Element or ShadowRoot. This means that it is not possible to hydrate
the entire document when managing the <html> element as a Svelte
component.

This commit fixes this by allowing documents to be targets.
---
 src/runtime/internal/dev.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/runtime/internal/dev.ts b/src/runtime/internal/dev.ts
index cd47138fef..323312437b 100644
--- a/src/runtime/internal/dev.ts
+++ b/src/runtime/internal/dev.ts
@@ -164,8 +164,9 @@ export interface SvelteComponentDev {
 	$destroy(): void;
 	[accessor: string]: any;
 }
+
 export interface ComponentConstructorOptions<Props extends Record<string, any> = Record<string, any>> {
-	target: Element | ShadowRoot;
+	target: Element | Document | ShadowRoot;
 	anchor?: Element;
 	props?: Props;
 	context?: Map<any, any>;

From 91e8dfcd6d4be0e5b0f3eea46b0ab21023d8fb60 Mon Sep 17 00:00:00 2001
From: Michael Leahy <support@typhonrt.org>
Date: Mon, 27 Mar 2023 01:07:39 -0700
Subject: [PATCH 082/110] feat: `container` query support via `css-tree`
 extension (#8275)

Closes #6969

As discussed there, container query support is quite useful to add to Svelte as it is now broadly available with Firefox releasing support imminently w/ FF v110 this upcoming week (~Feb 14th). Chrome has had support since ~Aug '22. The central issue is that css-tree which is a dependency for CSS AST parsing is significantly lagging behind on adding more recent features such as container query support. Ample time has been given to the maintainer to update css-tree and I do have every confidence that in time css-tree will receive a new major version with all sorts of modern CSS syntax supported including container queries. This PR provides an interim solution for what Svelte needs to support container queries now.
---
 src/compiler/compile/css/Stylesheet.ts        |   2 +-
 .../parse/read/css-tree-cq/css_tree_parse.ts  |  43 ++++++
 .../parse/read/css-tree-cq/node/comparison.ts |  48 +++++++
 .../css-tree-cq/node/container_feature.ts     |  82 +++++++++++
 .../node/container_feature_range.ts           |  86 ++++++++++++
 .../node/container_feature_style.ts           |  85 ++++++++++++
 .../read/css-tree-cq/node/container_query.ts  | 130 ++++++++++++++++++
 .../css-tree-cq/node/query_css_function.ts    |  41 ++++++
 src/compiler/parse/read/style.ts              |   5 +-
 test/css/samples/container-query/expected.css |   1 +
 test/css/samples/container-query/input.svelte |  87 ++++++++++++
 11 files changed, 607 insertions(+), 3 deletions(-)
 create mode 100644 src/compiler/parse/read/css-tree-cq/css_tree_parse.ts
 create mode 100644 src/compiler/parse/read/css-tree-cq/node/comparison.ts
 create mode 100644 src/compiler/parse/read/css-tree-cq/node/container_feature.ts
 create mode 100644 src/compiler/parse/read/css-tree-cq/node/container_feature_range.ts
 create mode 100644 src/compiler/parse/read/css-tree-cq/node/container_feature_style.ts
 create mode 100644 src/compiler/parse/read/css-tree-cq/node/container_query.ts
 create mode 100644 src/compiler/parse/read/css-tree-cq/node/query_css_function.ts
 create mode 100644 test/css/samples/container-query/expected.css
 create mode 100644 test/css/samples/container-query/input.svelte

diff --git a/src/compiler/compile/css/Stylesheet.ts b/src/compiler/compile/css/Stylesheet.ts
index 8f54830e6a..7cb1af3635 100644
--- a/src/compiler/compile/css/Stylesheet.ts
+++ b/src/compiler/compile/css/Stylesheet.ts
@@ -173,7 +173,7 @@ class Atrule {
 	}
 
 	apply(node: Element) {
-		if (this.node.name === 'media' || this.node.name === 'supports' || this.node.name === 'layer') {
+		if (this.node.name === 'container' || this.node.name === 'media' || this.node.name === 'supports' || this.node.name === 'layer') {
 			this.children.forEach(child => {
 				child.apply(node);
 			});
diff --git a/src/compiler/parse/read/css-tree-cq/css_tree_parse.ts b/src/compiler/parse/read/css-tree-cq/css_tree_parse.ts
new file mode 100644
index 0000000000..d56e6d72ed
--- /dev/null
+++ b/src/compiler/parse/read/css-tree-cq/css_tree_parse.ts
@@ -0,0 +1,43 @@
+// @ts-nocheck
+// Note: Must import from the `css-tree` browser bundled distribution due to `createRequire` usage if importing from
+// `css-tree` Node module directly. This allows the production build of Svelte to work correctly.
+import { fork } from '../../../../../node_modules/css-tree/dist/csstree.esm.js';
+
+import * as Comparison from './node/comparison';
+import * as ContainerFeature from './node/container_feature';
+import * as ContainerFeatureRange from './node/container_feature_range';
+import * as ContainerFeatureStyle from './node/container_feature_style';
+import * as ContainerQuery from './node/container_query';
+import * as QueryCSSFunction from './node/query_css_function';
+
+/**
+ * Extends `css-tree` for container query support by forking and adding new nodes and at-rule support for `@container`.
+ *
+ * The new nodes are located in `./node`.
+ */
+const cqSyntax = fork({
+	atrule: { // extend or override at-rule dictionary
+		container: {
+			parse: {
+				prelude() {
+					return this.createSingleNodeList(
+						this.ContainerQuery()
+					);
+				},
+				block(isStyleBlock = false) {
+					return this.Block(isStyleBlock);
+				}
+			}
+		}
+	},
+	node: { // extend node types
+		Comparison,
+		ContainerFeature,
+		ContainerFeatureRange,
+		ContainerFeatureStyle,
+		ContainerQuery,
+		QueryCSSFunction
+	}
+});
+
+export const parse = cqSyntax.parse;
diff --git a/src/compiler/parse/read/css-tree-cq/node/comparison.ts b/src/compiler/parse/read/css-tree-cq/node/comparison.ts
new file mode 100644
index 0000000000..4f40f59c24
--- /dev/null
+++ b/src/compiler/parse/read/css-tree-cq/node/comparison.ts
@@ -0,0 +1,48 @@
+// @ts-nocheck
+import { Delim } from 'css-tree/tokenizer';
+
+export const name = 'Comparison';
+export const structure = {
+	value: String
+};
+
+export function parse() {
+	const start = this.tokenStart;
+
+	const char1 = this.consume(Delim);
+
+	// The first character in the comparison operator must match '<', '=', or '>'.
+	if (char1 !== '<' && char1 !== '>' && char1 !== '=') {
+		this.error('Malformed comparison operator');
+	}
+
+	let char2;
+
+	if (this.tokenType === Delim) {
+		char2 = this.consume(Delim);
+
+		// The second character in the comparison operator must match '='.
+		if (char2 !== '=') {
+			this.error('Malformed comparison operator');
+		}
+	}
+
+	// If the next token is also 'Delim' then it is malformed.
+	if (this.tokenType === Delim) {
+		this.error('Malformed comparison operator');
+	}
+
+	const value = char2 ? `${char1}${char2}` : char1;
+
+	return {
+		type: 'Comparison',
+		loc: this.getLocation(start, this.tokenStart),
+		value
+	};
+}
+
+export function generate(node) {
+	for (let index = 0; index < node.value.length; index++) {
+		this.token(Delim, node.value.charAt(index));
+	}
+}
diff --git a/src/compiler/parse/read/css-tree-cq/node/container_feature.ts b/src/compiler/parse/read/css-tree-cq/node/container_feature.ts
new file mode 100644
index 0000000000..d84d5f5afd
--- /dev/null
+++ b/src/compiler/parse/read/css-tree-cq/node/container_feature.ts
@@ -0,0 +1,82 @@
+// @ts-nocheck
+import {
+	Ident,
+	Number,
+	Dimension,
+	Function,
+	LeftParenthesis,
+	RightParenthesis,
+	Colon,
+	Delim
+} from 'css-tree/tokenizer';
+
+export const name = 'ContainerFeature';
+export const structure = {
+	name: String,
+	value: ['Identifier', 'Number', 'Dimension', 'QueryCSSFunction', 'Ratio', null]
+};
+
+export function parse() {
+	const start = this.tokenStart;
+	let value = null;
+
+	this.eat(LeftParenthesis);
+	this.skipSC();
+
+	const name = this.consume(Ident);
+	this.skipSC();
+
+	if (this.tokenType !== RightParenthesis) {
+		this.eat(Colon);
+		this.skipSC();
+
+		switch (this.tokenType) {
+			case Number:
+				if (this.lookupNonWSType(1) === Delim) {
+					value = this.Ratio();
+				} else {
+					value = this.Number();
+				}
+				break;
+
+			case Dimension:
+				value = this.Dimension();
+				break;
+
+			case Function:
+				value = this.QueryCSSFunction();
+				break;
+
+			case Ident:
+				value = this.Identifier();
+				break;
+
+			default:
+				this.error('Number, dimension, ratio, function, or identifier is expected');
+				break;
+		}
+
+		this.skipSC();
+	}
+
+	this.eat(RightParenthesis);
+
+	return {
+		type: 'ContainerFeature',
+		loc: this.getLocation(start, this.tokenStart),
+		name,
+		value
+	};
+}
+
+export function generate(node) {
+	this.token(LeftParenthesis, '(');
+	this.token(Ident, node.name);
+
+	if (node.value !== null) {
+		this.token(Colon, ':');
+		this.node(node.value);
+	}
+
+	this.token(RightParenthesis, ')');
+}
diff --git a/src/compiler/parse/read/css-tree-cq/node/container_feature_range.ts b/src/compiler/parse/read/css-tree-cq/node/container_feature_range.ts
new file mode 100644
index 0000000000..747fbe8da0
--- /dev/null
+++ b/src/compiler/parse/read/css-tree-cq/node/container_feature_range.ts
@@ -0,0 +1,86 @@
+// @ts-nocheck
+import {
+	Ident,
+	Number,
+	Delim,
+	Dimension,
+	Function,
+	LeftParenthesis,
+	RightParenthesis,
+	WhiteSpace
+} from 'css-tree/tokenizer';
+
+export const name = 'ContainerFeatureRange';
+export const structure = {
+	name: String,
+	value: ['Identifier', 'Number', 'Comparison', 'Dimension', 'QueryCSSFunction', 'Ratio', null]
+};
+
+function lookup_non_WS_type_and_value(offset, type, referenceStr) {
+	let current_type;
+
+	do {
+		current_type = this.lookupType(offset++);
+		if (current_type !== WhiteSpace) {
+			break;
+		}
+	} while (current_type !== 0); // NULL -> 0
+
+	return current_type === type ? this.lookupValue(offset - 1, referenceStr) : false;
+}
+
+export function parse() {
+	const children = this.createList();
+	let child = null;
+
+	this.eat(LeftParenthesis);
+	this.skipSC();
+
+	while (!this.eof && this.tokenType !== RightParenthesis) {
+		switch (this.tokenType) {
+			case Number:
+				if (lookup_non_WS_type_and_value.call(this, 1, Delim, '/')) {
+					child = this.Ratio();
+				} else {
+					child = this.Number();
+				}
+				break;
+
+			case Delim:
+				child = this.Comparison();
+				break;
+
+			case Dimension:
+				child = this.Dimension();
+				break;
+
+			case Function:
+				child = this.QueryCSSFunction();
+				break;
+
+			case Ident:
+				child = this.Identifier();
+				break;
+
+			default:
+				this.error('Number, dimension, comparison, ratio, function, or identifier is expected');
+				break;
+		}
+
+		children.push(child);
+
+		this.skipSC();
+	}
+
+	this.eat(RightParenthesis);
+
+	return {
+		type: 'ContainerFeatureRange',
+		loc: this.getLocationFromList(children),
+		children
+	};
+}
+
+export function generate(node) {
+	this.children(node);
+}
diff --git a/src/compiler/parse/read/css-tree-cq/node/container_feature_style.ts b/src/compiler/parse/read/css-tree-cq/node/container_feature_style.ts
new file mode 100644
index 0000000000..343b5d47ca
--- /dev/null
+++ b/src/compiler/parse/read/css-tree-cq/node/container_feature_style.ts
@@ -0,0 +1,85 @@
+// @ts-nocheck
+import {
+	Function,
+	Ident,
+	Number,
+	Dimension,
+	RightParenthesis,
+	Colon,
+	Delim
+} from 'css-tree/tokenizer';
+
+export const name = 'ContainerFeatureStyle';
+export const structure = {
+	name: String,
+	value: ['Function', 'Identifier', 'Number', 'Dimension', 'QueryCSSFunction', 'Ratio', null]
+};
+
+export function parse() {
+	const start = this.tokenStart;
+	let value = null;
+
+	const function_name = this.consumeFunctionName();
+	if (function_name !== 'style') {
+		this.error('Unknown container style query identifier; "style" is expected');
+	}
+
+	this.skipSC();
+
+	const name = this.consume(Ident);
+	this.skipSC();
+
+	if (this.tokenType !== RightParenthesis) {
+		this.eat(Colon);
+		this.skipSC();
+
+		switch (this.tokenType) {
+			case Number:
+				if (this.lookupNonWSType(1) === Delim) {
+					value = this.Ratio();
+				} else {
+					value = this.Number();
+				}
+				break;
+
+			case Dimension:
+				value = this.Dimension();
+				break;
+
+			case Function:
+				value = this.QueryCSSFunction();
+				break;
+
+			case Ident:
+				value = this.Identifier();
+				break;
+
+			default:
+				this.error('Number, dimension, ratio, function or identifier is expected');
+				break;
+		}
+
+		this.skipSC();
+	}
+
+	this.eat(RightParenthesis);
+
+	return {
+		type: 'ContainerFeatureStyle',
+		loc: this.getLocation(start, this.tokenStart),
+		name,
+		value
+	};
+}
+
+export function generate(node) {
+	this.token(Function, 'style(');
+	this.token(Ident, node.name);
+
+	if (node.value !== null) {
+		this.token(Colon, ':');
+		this.node(node.value);
+	}
+
+	this.token(RightParenthesis, ')');
+}
diff --git a/src/compiler/parse/read/css-tree-cq/node/container_query.ts b/src/compiler/parse/read/css-tree-cq/node/container_query.ts
new file mode 100644
index 0000000000..c88b91f12d
--- /dev/null
+++ b/src/compiler/parse/read/css-tree-cq/node/container_query.ts
@@ -0,0 +1,130 @@
+// @ts-nocheck
+import {
+	EOF,
+	WhiteSpace,
+	Comment,
+	Delim,
+	Function,
+	Ident,
+	LeftParenthesis,
+	RightParenthesis,
+	LeftCurlyBracket,
+	Colon
+} from 'css-tree/tokenizer';
+
+const CONTAINER_QUERY_KEYWORDS = new Set(['none', 'and', 'not', 'or']);
+
+export const name = 'ContainerQuery';
+export const structure = {
+	name: 'Identifier',
+	children: [[
+		'Identifier',
+		'ContainerFeature',
+		'ContainerFeatureRange',
+		'ContainerFeatureStyle',
+		'WhiteSpace'
+	]]
+};
+
+/**
+ * Looks ahead to determine if query feature is a range query. This involves locating at least one delimiter and no
+ * colon tokens.
+ *
+ * @returns {boolean} Is potential range query.
+ */
+function lookahead_is_range() {
+	let type;
+	let offset = 0;
+
+	let count = 0;
+	let delim_found = false;
+	let no_colon = true;
+
+	// A range query has maximum 5 tokens when formatted as 'mf-range' /
+	// '<mf-value> <mf-lt> <mf-name> <mf-lt> <mf-value>'. So only look ahead maximum of 6 non-whitespace tokens.
+	do {
+		type = this.lookupNonWSType(offset++);
+		if (type !== WhiteSpace) {
+			count++;
+		}
+		if (type === Delim) {
+			delim_found = true;
+		}
+		if (type === Colon) {
+			no_colon = false;
+		}
+		if (type === LeftCurlyBracket || type === RightParenthesis) {
+			break;
+		}
+	} while (type !== EOF && count <= 6);
+
+	return delim_found && no_colon;
+}
+
+export function parse() {
+	const start = this.tokenStart;
+	const children = this.createList();
+	let child = null;
+	let name = null;
+
+	// Parse potential container name.
+	if (this.tokenType === Ident) {
+		const container_name = this.substring(this.tokenStart, this.tokenEnd);
+
+		// Container name doesn't match a query keyword, so assign it as container name.
+		if (!CONTAINER_QUERY_KEYWORDS.has(container_name.toLowerCase())) {
+			name = container_name;
+			this.eatIdent(container_name);
+		}
+	}
+
+	this.skipSC();
+
+	scan:
+		while (!this.eof) {
+			switch (this.tokenType) {
+				case Comment:
+				case WhiteSpace:
+					this.next();
+					continue;
+
+				case Ident:
+					child = this.Identifier();
+					break;
+
+				case Function:
+					child = this.ContainerFeatureStyle();
+					break;
+
+				case LeftParenthesis:
+					// Lookahead to determine if range feature.
+					child = lookahead_is_range.call(this) ? this.ContainerFeatureRange() : this.ContainerFeature();
+					break;
+
+				default:
+					break scan;
+			}
+
+			children.push(child);
+		}
+
+	if (child === null) {
+		this.error('Identifier or parenthesis is expected');
+	}
+
+	return {
+		type: 'ContainerQuery',
+		loc: this.getLocation(start, this.tokenStart - 1),
+		name,
+		children
+	};
+}
+
+export function generate(node) {
+	if (typeof node.name === 'string') {
+		this.token(Ident, node.name);
+	}
+
+	this.children(node);
+}
+
diff --git a/src/compiler/parse/read/css-tree-cq/node/query_css_function.ts b/src/compiler/parse/read/css-tree-cq/node/query_css_function.ts
new file mode 100644
index 0000000000..792aeabd35
--- /dev/null
+++ b/src/compiler/parse/read/css-tree-cq/node/query_css_function.ts
@@ -0,0 +1,41 @@
+// @ts-nocheck
+import {
+	RightParenthesis
+} from 'css-tree/tokenizer';
+
+const QUERY_CSS_FUNCTIONS = new Set(['calc', 'clamp', 'min', 'max']);
+
+export const name = 'QueryCSSFunction';
+export const structure = {
+	name: String,
+	expression: String
+};
+
+export function parse() {
+	const start = this.tokenStart;
+
+	const name = this.consumeFunctionName();
+
+	if (!QUERY_CSS_FUNCTIONS.has(name)) {
+		this.error('Unknown query single value function; expected: "calc", "clamp", "max", min"');
+	}
+
+	const body = this.Raw(this.tokenIndex, null, false);
+
+	this.eat(RightParenthesis);
+
+	return {
+		type: 'QueryCSSFunction',
+		loc: this.getLocation(start, this.tokenStart),
+		name,
+		expression: body.value
+	};
+}
+
+export function generate(node) {
+	this.token(Function, `${node.name}(`);
+
+	this.node(node.expression);
+
+	this.token(RightParenthesis, ')');
+}
diff --git a/src/compiler/parse/read/style.ts b/src/compiler/parse/read/style.ts
index 3ed510c3d0..eba86d22de 100644
--- a/src/compiler/parse/read/style.ts
+++ b/src/compiler/parse/read/style.ts
@@ -1,5 +1,6 @@
 // @ts-ignore
-import parse from 'css-tree/parser';
+// import parse from 'css-tree/parser'; // When css-tree supports container queries uncomment.
+import { parse } from './css-tree-cq/css_tree_parse'; // Use extended css-tree for container query support.
 import { walk } from 'estree-walker';
 import { Parser } from '../index';
 import { Node } from 'estree';
@@ -78,7 +79,7 @@ export default function read_style(parser: Parser, start: number, attributes: No
 	});
 
 	parser.read(regex_starts_with_closing_style_tag);
-  
+
 	const end = parser.index;
 
 	return {
diff --git a/test/css/samples/container-query/expected.css b/test/css/samples/container-query/expected.css
new file mode 100644
index 0000000000..5002ed9c83
--- /dev/null
+++ b/test/css/samples/container-query/expected.css
@@ -0,0 +1 @@
+div.svelte-xyz{container:test-container / inline-size}@container (min-width: 400px){div.svelte-xyz{color:red}}@container test-container (min-width: 410px){div.svelte-xyz{color:green}}@container test-container (width < 400px){div.svelte-xyz{color:blue}}@container test-container (0 <= width < 300px){div.svelte-xyz{color:purple}}@container not (width < 400px){div.svelte-xyz{color:pink}}@container (width > 400px) and (height > 400px){div.svelte-xyz{color:lightgreen}}@container (width > 400px) or (height > 400px){div.svelte-xyz{color:lightblue}}@container (width > 400px) and (width > 800px) or (orientation: portrait){div.svelte-xyz{color:salmon}}@container style(color: blue){div.svelte-xyz{color:tan}}@container test-container (min-width: calc(400px + 1px)){div.svelte-xyz{color:green}}@container test-container (width < clamp(200px, 40%, 400px)){div.svelte-xyz{color:blue}}@container test-container (calc(400px + 1px) <= width < calc(500px + 1px)){div.svelte-xyz{color:purple}}@container style(--var: calc(400px + 1px)){div.svelte-xyz{color:sandybrown}}
\ No newline at end of file
diff --git a/test/css/samples/container-query/input.svelte b/test/css/samples/container-query/input.svelte
new file mode 100644
index 0000000000..bb6de73618
--- /dev/null
+++ b/test/css/samples/container-query/input.svelte
@@ -0,0 +1,87 @@
+<div>container query</div>
+
+<style>
+	div {
+		container: test-container / inline-size;
+	}
+
+  /* Most common container query statements. */
+
+	@container (min-width: 400px) {
+		div {
+			color: red;
+		}
+	}
+
+	@container test-container (min-width: 410px) {
+		div {
+			color: green;
+		}
+	}
+
+	@container test-container (width < 400px) {
+		div {
+			color: blue;
+		}
+	}
+
+	@container test-container (0 <= width < 300px) {
+		div {
+			color: purple;
+		}
+	}
+
+	@container not (width < 400px) {
+		div {
+			color: pink;
+		}
+	}
+
+	@container (width > 400px) and (height > 400px) {
+		div {
+			color: lightgreen;
+		}
+	}
+
+	@container (width > 400px) or (height > 400px) {
+		div {
+			color: lightblue;
+		}
+	}
+
+	@container (width > 400px) and (width > 800px) or (orientation: portrait) {
+		div {
+			color: salmon;
+		}
+	}
+
+	@container style(color: blue) {
+		div {
+			color: tan;
+		}
+	}
+
+	@container test-container (min-width: calc(400px + 1px)) {
+		div {
+			color: green;
+		}
+	}
+
+	@container test-container (width < clamp(200px, 40%, 400px)) {
+		div {
+			color: blue;
+		}
+	}
+
+	@container test-container (calc(400px + 1px) <= width < calc(500px + 1px)) {
+		div {
+			color: purple;
+		}
+	}
+
+	@container style(--var: calc(400px + 1px)) {
+		div {
+			color: sandybrown;
+		}
+	}
+</style>

From 95c46552fe076fa33c2ef38072b4604a98708e60 Mon Sep 17 00:00:00 2001
From: esthe <57283066+esthedebeste@users.noreply.github.com>
Date: Mon, 27 Mar 2023 10:12:44 +0200
Subject: [PATCH 083/110] feat: make `preserveComments` effective in DOM
 renderer (#7182)

---
 .../compile/render_dom/wrappers/Comment.ts    | 41 +++++++++++++
 .../compile/render_dom/wrappers/Fragment.ts   |  5 +-
 src/runtime/internal/dom.ts                   | 17 ++++++
 .../samples/claim-comment/_after.html         |  1 +
 .../samples/claim-comment/_before.html        |  1 +
 .../samples/claim-comment/_config.js          | 20 +++++++
 .../samples/claim-comment/main.svelte         |  1 +
 .../samples/dom-preserve-comments/_config.js  |  5 ++
 .../samples/dom-preserve-comments/expected.js | 58 +++++++++++++++++++
 .../dom-preserve-comments/input.svelte        |  3 +
 10 files changed, 150 insertions(+), 2 deletions(-)
 create mode 100644 src/compiler/compile/render_dom/wrappers/Comment.ts
 create mode 100644 test/hydration/samples/claim-comment/_after.html
 create mode 100644 test/hydration/samples/claim-comment/_before.html
 create mode 100644 test/hydration/samples/claim-comment/_config.js
 create mode 100644 test/hydration/samples/claim-comment/main.svelte
 create mode 100644 test/js/samples/dom-preserve-comments/_config.js
 create mode 100644 test/js/samples/dom-preserve-comments/expected.js
 create mode 100644 test/js/samples/dom-preserve-comments/input.svelte

diff --git a/src/compiler/compile/render_dom/wrappers/Comment.ts b/src/compiler/compile/render_dom/wrappers/Comment.ts
new file mode 100644
index 0000000000..a8c63b4227
--- /dev/null
+++ b/src/compiler/compile/render_dom/wrappers/Comment.ts
@@ -0,0 +1,41 @@
+import Renderer from '../Renderer';
+import Block from '../Block';
+import Comment from '../../nodes/Comment';
+import Wrapper from './shared/Wrapper';
+import { x } from 'code-red';
+import { Identifier } from 'estree';
+
+export default class CommentWrapper extends Wrapper {
+	node: Comment;
+	var: Identifier;
+
+	constructor(
+		renderer: Renderer,
+		block: Block,
+		parent: Wrapper,
+		node: Comment
+	) {
+		super(renderer, block, parent, node);
+		this.var = x`c` as Identifier;
+	}
+
+	render(block: Block, parent_node: Identifier, parent_nodes: Identifier) {
+	    if (!this.renderer.options.preserveComments) return;
+
+		const string_literal = {
+			type: 'Literal',
+			value: this.node.data,
+			loc: {
+				start: this.renderer.locate(this.node.start),
+				end: this.renderer.locate(this.node.end)
+			}
+		};
+
+		block.add_element(
+			this.var,
+			x`@comment(${string_literal})`,
+			parent_nodes && x`@claim_comment(${parent_nodes}, ${string_literal})`,
+			parent_node
+		);
+	}
+}
diff --git a/src/compiler/compile/render_dom/wrappers/Fragment.ts b/src/compiler/compile/render_dom/wrappers/Fragment.ts
index 463c8db24a..736cd4e1ef 100644
--- a/src/compiler/compile/render_dom/wrappers/Fragment.ts
+++ b/src/compiler/compile/render_dom/wrappers/Fragment.ts
@@ -14,6 +14,7 @@ import RawMustacheTag from './RawMustacheTag';
 import Slot from './Slot';
 import SlotTemplate from './SlotTemplate';
 import Text from './Text';
+import Comment from './Comment';
 import Title from './Title';
 import Window from './Window';
 import { INode } from '../../nodes/interfaces';
@@ -27,7 +28,7 @@ import { regex_starts_with_whitespace } from '../../../utils/patterns';
 const wrappers = {
 	AwaitBlock,
 	Body,
-	Comment: null,
+	Comment,
 	DebugTag,
 	Document,
 	EachBlock,
@@ -118,7 +119,7 @@ export default class FragmentWrapper {
 				link(last_child, last_child = wrapper);
 			} else {
 				const Wrapper = wrappers[child.type];
-				if (!Wrapper) continue;
+				if (!Wrapper || (child.type === 'Comment' && !renderer.options.preserveComments)) continue;
 
 				const wrapper = new Wrapper(renderer, block, parent, child, strip_whitespace, last_child || next_sibling);
 				this.nodes.unshift(wrapper);
diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index a746613170..34049b3580 100644
--- a/src/runtime/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -254,6 +254,10 @@ export function empty() {
 	return text('');
 }
 
+export function comment(content: string) {
+	return document.createComment(content);
+}
+
 export function listen(node: EventTarget, event: string, handler: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions | EventListenerOptions) {
 	node.addEventListener(event, handler, options);
 	return () => node.removeEventListener(event, handler, options);
@@ -550,6 +554,19 @@ export function claim_space(nodes) {
 	return claim_text(nodes, ' ');
 }
 
+export function claim_comment(nodes:ChildNodeArray, data) {
+	return claim_node<Comment>(
+		nodes,
+		(node: ChildNode): node is Comment => node.nodeType === 8,
+		(node: Comment) => {
+			node.data =  '' + data;
+			return undefined;
+		},
+		() => comment(data),
+		true
+	);
+}
+
 function find_comment(nodes, text, start) {
 	for (let i = start; i < nodes.length; i += 1) {
 		const node = nodes[i];
diff --git a/test/hydration/samples/claim-comment/_after.html b/test/hydration/samples/claim-comment/_after.html
new file mode 100644
index 0000000000..3029a9dd64
--- /dev/null
+++ b/test/hydration/samples/claim-comment/_after.html
@@ -0,0 +1 @@
+<div><!-- test1 --><!-- test2 --></div>
diff --git a/test/hydration/samples/claim-comment/_before.html b/test/hydration/samples/claim-comment/_before.html
new file mode 100644
index 0000000000..736fb4602d
--- /dev/null
+++ b/test/hydration/samples/claim-comment/_before.html
@@ -0,0 +1 @@
+<div><!-- test1 --></div>
diff --git a/test/hydration/samples/claim-comment/_config.js b/test/hydration/samples/claim-comment/_config.js
new file mode 100644
index 0000000000..0f69bd48f6
--- /dev/null
+++ b/test/hydration/samples/claim-comment/_config.js
@@ -0,0 +1,20 @@
+export default {
+	compileOptions: {
+		preserveComments:true
+	},
+	snapshot(target) {
+		const div = target.querySelector('div');
+
+		return {
+			div,
+			comment: div.childNodes[0]
+		};
+	},
+
+	test(assert, target, snapshot) {
+		const div = target.querySelector('div');
+		assert.equal(div, snapshot.div);
+		assert.equal(div.childNodes[0], snapshot.comment);
+		assert.equal(div.childNodes[1].nodeType, 8);
+	}
+};
diff --git a/test/hydration/samples/claim-comment/main.svelte b/test/hydration/samples/claim-comment/main.svelte
new file mode 100644
index 0000000000..3029a9dd64
--- /dev/null
+++ b/test/hydration/samples/claim-comment/main.svelte
@@ -0,0 +1 @@
+<div><!-- test1 --><!-- test2 --></div>
diff --git a/test/js/samples/dom-preserve-comments/_config.js b/test/js/samples/dom-preserve-comments/_config.js
new file mode 100644
index 0000000000..76af4bb39a
--- /dev/null
+++ b/test/js/samples/dom-preserve-comments/_config.js
@@ -0,0 +1,5 @@
+export default {
+	options: {
+		preserveComments: true
+	}
+};
diff --git a/test/js/samples/dom-preserve-comments/expected.js b/test/js/samples/dom-preserve-comments/expected.js
new file mode 100644
index 0000000000..aa9f509263
--- /dev/null
+++ b/test/js/samples/dom-preserve-comments/expected.js
@@ -0,0 +1,58 @@
+/* generated by Svelte vX.Y.Z */
+import {
+	SvelteComponent,
+	comment,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	space
+} from "svelte/internal";
+
+function create_fragment(ctx) {
+	let div0;
+	let t1;
+	let c;
+	let t2;
+	let div1;
+
+	return {
+		c() {
+			div0 = element("div");
+			div0.textContent = "content";
+			t1 = space();
+			c = comment(" comment ");
+			t2 = space();
+			div1 = element("div");
+			div1.textContent = "more content";
+		},
+		m(target, anchor) {
+			insert(target, div0, anchor);
+			insert(target, t1, anchor);
+			insert(target, c, anchor);
+			insert(target, t2, anchor);
+			insert(target, div1, anchor);
+		},
+		p: noop,
+		i: noop,
+		o: noop,
+		d(detaching) {
+			if (detaching) detach(div0);
+			if (detaching) detach(t1);
+			if (detaching) detach(c);
+			if (detaching) detach(t2);
+			if (detaching) detach(div1);
+		}
+	};
+}
+
+class Component extends SvelteComponent {
+	constructor(options) {
+		super();
+		init(this, options, null, create_fragment, safe_not_equal, {});
+	}
+}
+
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/dom-preserve-comments/input.svelte b/test/js/samples/dom-preserve-comments/input.svelte
new file mode 100644
index 0000000000..7f7e291caa
--- /dev/null
+++ b/test/js/samples/dom-preserve-comments/input.svelte
@@ -0,0 +1,3 @@
+<div>content</div>
+<!-- comment -->
+<div>more content</div>

From dadd6fe9455f0f2e7a7d1dce365e50d64953bc3e Mon Sep 17 00:00:00 2001
From: Nguyen Tran <88808276+ngtr6788@users.noreply.github.com>
Date: Mon, 27 Mar 2023 04:15:39 -0400
Subject: [PATCH 084/110] fix: resolve computed_prop_# collision (#8418)

Fixes #8417

The issue is that unpack_destructuring in each blocks, await blocks, and @const tags were making computed_props independently. This causes computed_props_# to conflict when each blocks were used with @const tags, or await blocks and @const tags, or consecutive @const tags together. Therefore, one solution is to use component.get_unique_name to, well, make unique names and never get conflicts.
---
 src/compiler/compile/nodes/shared/Context.ts  | 30 ++++---------
 .../_config.js                                | 20 +++++++++
 .../main.svelte                               | 27 ++++++++++++
 .../_config.js                                | 15 +++++++
 .../main.svelte                               | 44 +++++++++++++++++++
 5 files changed, 115 insertions(+), 21 deletions(-)
 create mode 100644 test/runtime/samples/const-tag-await-then-destructuring-computed-in-computed/_config.js
 create mode 100644 test/runtime/samples/const-tag-await-then-destructuring-computed-in-computed/main.svelte
 create mode 100644 test/runtime/samples/const-tag-each-destructure-computed-in-computed/_config.js
 create mode 100644 test/runtime/samples/const-tag-each-destructure-computed-in-computed/main.svelte

diff --git a/src/compiler/compile/nodes/shared/Context.ts b/src/compiler/compile/nodes/shared/Context.ts
index 3957ed2173..76ac895681 100644
--- a/src/compiler/compile/nodes/shared/Context.ts
+++ b/src/compiler/compile/nodes/shared/Context.ts
@@ -11,7 +11,7 @@ export type Context = DestructuredVariable | ComputedProperty;
 
 interface ComputedProperty {
 	type: 'ComputedProperty';
-  property_name: string;
+  property_name: Identifier;
   key: Expression | PrivateIdentifier;
 }
  
@@ -30,8 +30,7 @@ export function unpack_destructuring({
 	default_modifier = (node) => node,
 	scope,
 	component,
-	context_rest_properties,
-	number_of_computed_props = { n: 0 }
+	context_rest_properties
 }: {
 	contexts: Context[];
 	node: Node;
@@ -40,10 +39,6 @@ export function unpack_destructuring({
 	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;
 
@@ -72,8 +67,7 @@ export function unpack_destructuring({
 					default_modifier,
 					scope,
 					component,
-					context_rest_properties,
-					number_of_computed_props
+					context_rest_properties
 				});
 				context_rest_properties.set((element.argument as Identifier).name, element);
 			} else if (element && element.type === 'AssignmentPattern') {
@@ -93,8 +87,7 @@ export function unpack_destructuring({
 						)}` as Node,
 					scope,
 					component,
-					context_rest_properties,
-					number_of_computed_props
+					context_rest_properties
 				});
 			} else {
 				unpack_destructuring({
@@ -104,8 +97,7 @@ export function unpack_destructuring({
 					default_modifier,
 					scope,
 					component,
-					context_rest_properties,
-					number_of_computed_props
+					context_rest_properties
 				});
 			}
 		});
@@ -124,8 +116,7 @@ export function unpack_destructuring({
 					default_modifier,
 					scope,
 					component,
-					context_rest_properties,
-					number_of_computed_props
+					context_rest_properties
 				});
 				context_rest_properties.set((property.argument as Identifier).name, property);
 			} else if (property.type === 'Property') {
@@ -136,8 +127,7 @@ export function unpack_destructuring({
 
 				if (property.computed) {
 					// e.g { [computedProperty]: ... }
-					const property_name = `computed_property_${number_of_computed_props.n}`;
-					number_of_computed_props.n += 1;
+					const property_name = component.get_unique_name('computed_property');
 
 					contexts.push({
 						type: 'ComputedProperty',
@@ -178,8 +168,7 @@ export function unpack_destructuring({
 							)}` as Node,
 						scope,
 						component,
-						context_rest_properties,
-						number_of_computed_props
+						context_rest_properties
 					});
 				} else {
 					// e.g. { property } or { property: newName }
@@ -190,8 +179,7 @@ export function unpack_destructuring({
 						default_modifier,
 						scope,
 						component,
-						context_rest_properties,
-						number_of_computed_props
+						context_rest_properties
 					});
 				}
 			}
diff --git a/test/runtime/samples/const-tag-await-then-destructuring-computed-in-computed/_config.js b/test/runtime/samples/const-tag-await-then-destructuring-computed-in-computed/_config.js
new file mode 100644
index 0000000000..9ec4a3e3e6
--- /dev/null
+++ b/test/runtime/samples/const-tag-await-then-destructuring-computed-in-computed/_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-in-computed/main.svelte b/test/runtime/samples/const-tag-await-then-destructuring-computed-in-computed/main.svelte
new file mode 100644
index 0000000000..285fc44348
--- /dev/null
+++ b/test/runtime/samples/const-tag-await-then-destructuring-computed-in-computed/main.svelte
@@ -0,0 +1,27 @@
+<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]
+		};
+	}
+
+  const th = 'th';
+</script>
+
+{#await promise1 then { length, width, height }}
+	{@const { [0]: a, [1]: b, [2]: 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 { [`leng${th}`]: l, [`wid${th}`]: w, height: h }}
+	{@const [a, b, c] = permutation}
+	{@const { [`${a}-Dimensions`]: { [c - 1]: first }, [`${b}-Dimensions`]: { [b - 1]: second }, [`${c}-Dimensions`]: { [a - 1]: third } } = calculate(l, w, h) } 
+	<p>{first}, {second}, {third}</p>
+{/await}
diff --git a/test/runtime/samples/const-tag-each-destructure-computed-in-computed/_config.js b/test/runtime/samples/const-tag-each-destructure-computed-in-computed/_config.js
new file mode 100644
index 0000000000..c299f19da6
--- /dev/null
+++ b/test/runtime/samples/const-tag-each-destructure-computed-in-computed/_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-in-computed/main.svelte b/test/runtime/samples/const-tag-each-destructure-computed-in-computed/main.svelte
new file mode 100644
index 0000000000..26dc5557ed
--- /dev/null
+++ b/test/runtime/samples/const-tag-each-destructure-computed-in-computed/main.svelte
@@ -0,0 +1,44 @@
+<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';
+  let th = 'th';
+</script>
+
+{#each boxes as { [`leng${th}`]: length, [`wid${th}`]: width, height }}
+	{@const {
+		[`two${dimension}`]: areas,
+		[`three${dimension}`]: {
+			volume
+		}
+	} = calculate(length, width, height)}
+  {@const {
+		i = 1, 
+		[`bottom${area}`]: bottom, 
+		[`side${area}${i++}`]: sideone, 
+		[`side${area}${i++}`]: sidetwo 
+	} = areas}
+	<button on:click={changeDimension}>{bottom}, {sideone}, {sidetwo}, {volume}</button>
+{/each}

From b8959ac09ec78a0c0aad3d1d846d2eda569bcbba Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 27 Mar 2023 10:32:41 +0200
Subject: [PATCH 085/110] chore: update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e886996a80..0c375e75ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@
 * Relax `a11y-no-noninteractive-element-to-interactive-role` warning ([#8402](https://github.com/sveltejs/svelte/pull/8402))
 * Add `a11y-interactive-supports-focus` warning ([#8392](https://github.com/sveltejs/svelte/pull/8392))
 * Fix equality check when updating dynamic text ([#5931](https://github.com/sveltejs/svelte/issues/5931))
+* Make `preserveComments` effective in DOM renderer ([#7182](https://github.com/sveltejs/svelte/pull/7182))
+* Add CSS container queries support ([#6969](https://github.com/sveltejs/svelte/issues/6969))
+* Properly handle microdata attributes ([#8414](https://github.com/sveltejs/svelte/pull/8414))
+* Prevent name collision when using computed destructuring variables ([#8417](https://github.com/sveltejs/svelte/issues/8417))
+* Allow use of `document` for `target` in typings ([#7554](https://github.com/sveltejs/svelte/pull/7554))
 
 ## 3.57.0
 

From 1333be0c6ad22fc49792a76478fcb231314bb765 Mon Sep 17 00:00:00 2001
From: Filip Ambrosius <amediocredad@outlook.com>
Date: Mon, 27 Mar 2023 11:02:12 +0200
Subject: [PATCH 086/110] fix: Regression `itemscope` as `boolean_attribute`
 (#8414)

Microdata are a strange set of attributes which are ONLY defined in markup, and have no relationship to the underlying Document Object Model node. As such programmatically defining an element and setting a property on it with a given Microdata attribute will not work:
https://codepen.io/iambrosius/full/jOvXBBG

One can read more about microdata here: https://developer.mozilla.org/en-US/docs/Web/HTML/Microdata

The fix is to remove itemscope being a boolean attribute, because that opts into a transformation as a DOM property, which is wrong.
---
 .../render_dom/wrappers/Element/Attribute.ts  |  1 -
 src/shared/boolean_attributes.ts              |  1 -
 .../attribute-boolean-hidden/_config.js       | 10 ++++++
 .../attribute-boolean-hidden/main.svelte      |  5 +++
 .../attribute-boolean-itemscope/_config.js    | 11 -------
 .../attribute-boolean-itemscope/main.svelte   |  5 ---
 .../samples/attribute-microdata/_config.js    | 25 +++++++++++++++
 .../samples/attribute-microdata/main.svelte   | 31 +++++++++++++++++++
 8 files changed, 71 insertions(+), 18 deletions(-)
 create mode 100644 test/runtime/samples/attribute-boolean-hidden/_config.js
 create mode 100644 test/runtime/samples/attribute-boolean-hidden/main.svelte
 delete mode 100644 test/runtime/samples/attribute-boolean-itemscope/_config.js
 delete mode 100644 test/runtime/samples/attribute-boolean-itemscope/main.svelte
 create mode 100644 test/runtime/samples/attribute-microdata/_config.js
 create mode 100644 test/runtime/samples/attribute-microdata/main.svelte

diff --git a/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts b/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
index 6cb3a00218..64178030f6 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
@@ -364,7 +364,6 @@ const attribute_lookup: { [key in BooleanAttributes]: AttributeMetadata } & { [k
 	indeterminate: { applies_to: ['input'] },
 	inert: {},
 	ismap: { property_name: 'isMap', applies_to: ['img'] },
-	itemscope: {},
 	loop: { applies_to: ['audio', 'bgsound', 'video'] },
 	multiple: { applies_to: ['input', 'select'] },
 	muted: { applies_to: ['audio', 'video'] },
diff --git a/src/shared/boolean_attributes.ts b/src/shared/boolean_attributes.ts
index 668dd97975..10513ec712 100644
--- a/src/shared/boolean_attributes.ts
+++ b/src/shared/boolean_attributes.ts
@@ -13,7 +13,6 @@ const _boolean_attributes = [
 	'hidden',
 	'inert',
 	'ismap',
-	'itemscope',
 	'loop',
 	'multiple',
 	'muted',
diff --git a/test/runtime/samples/attribute-boolean-hidden/_config.js b/test/runtime/samples/attribute-boolean-hidden/_config.js
new file mode 100644
index 0000000000..cb38feb93d
--- /dev/null
+++ b/test/runtime/samples/attribute-boolean-hidden/_config.js
@@ -0,0 +1,10 @@
+export default {
+	props: {
+		hidden: true
+	},
+	html: '<div hidden />',
+	test({ assert, component, target }) {
+		component.hidden = false;
+		assert.htmlEqual(target.innerHTML, '<div />');
+	}
+};
diff --git a/test/runtime/samples/attribute-boolean-hidden/main.svelte b/test/runtime/samples/attribute-boolean-hidden/main.svelte
new file mode 100644
index 0000000000..f8d7a26910
--- /dev/null
+++ b/test/runtime/samples/attribute-boolean-hidden/main.svelte
@@ -0,0 +1,5 @@
+<script>
+	export let hidden = false;
+</script>
+
+<div {hidden} />
diff --git a/test/runtime/samples/attribute-boolean-itemscope/_config.js b/test/runtime/samples/attribute-boolean-itemscope/_config.js
deleted file mode 100644
index b5b21cfc47..0000000000
--- a/test/runtime/samples/attribute-boolean-itemscope/_config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export default {
-	props: {
-		itemscope: true
-	},
-	test({ assert, target, component }) {
-		const div = target.querySelector('div');
-		assert.ok(div.itemscope);
-		component.itemscope = false;
-		assert.ok(!div.itemscope);
-	}
-};
diff --git a/test/runtime/samples/attribute-boolean-itemscope/main.svelte b/test/runtime/samples/attribute-boolean-itemscope/main.svelte
deleted file mode 100644
index 83265a983c..0000000000
--- a/test/runtime/samples/attribute-boolean-itemscope/main.svelte
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-export let itemscope;
-</script>
-
-<div {itemscope}  />
diff --git a/test/runtime/samples/attribute-microdata/_config.js b/test/runtime/samples/attribute-microdata/_config.js
new file mode 100644
index 0000000000..8c6a7765ea
--- /dev/null
+++ b/test/runtime/samples/attribute-microdata/_config.js
@@ -0,0 +1,25 @@
+// There is no relationship between the attribute and the dom node with regards to microdata attributes https://developer.mozilla.org/en-US/docs/Web/HTML/Microdata
+export default {
+	html: `<div itemscope itemtype="https://schema.org/SoftwareApplication">
+	<span itemprop="name">Game</span> - REQUIRES
+	<span itemprop="operatingSystem">OS</span><br/>
+	<link itemprop="applicationCategory" href="https://schema.org/GameApplication"/>
+
+	<div itemprop="aggregateRating" itemscope="" itemtype="https://schema.org/AggregateRating">RATING:
+		<span itemprop="ratingValue">4.6</span> (
+		<span itemprop="ratingCount">8864</span> ratings )</div>
+	<div itemref="offers"></div>
+</div>
+
+<div
+	itemprop="offers"
+	itemid="offers"
+	id="offers"
+	itemscope
+	itemtype="https://schema.org/Offer"
+>
+	Price: $<span itemprop="price">1.00</span>
+<meta itemprop="priceCurrency" content="USD"/>
+</div>
+	`
+};
diff --git a/test/runtime/samples/attribute-microdata/main.svelte b/test/runtime/samples/attribute-microdata/main.svelte
new file mode 100644
index 0000000000..f03a6943d9
--- /dev/null
+++ b/test/runtime/samples/attribute-microdata/main.svelte
@@ -0,0 +1,31 @@
+<!-- Example from https://developer.mozilla.org/en-US/docs/Web/HTML/Microdata -->
+<div itemscope itemtype="https://schema.org/SoftwareApplication">
+	<span itemprop="name">Game</span> - REQUIRES
+	<span itemprop="operatingSystem">OS</span><br />
+	<link
+		itemprop="applicationCategory"
+		href="https://schema.org/GameApplication"
+	/>
+
+	<div
+		itemprop="aggregateRating"
+		itemscope
+		itemtype="https://schema.org/AggregateRating"
+	>
+		RATING:
+		<span itemprop="ratingValue">4.6</span> (
+		<span itemprop="ratingCount">8864</span> ratings )
+	</div>
+	<div itemref="offers" />
+</div>
+
+<div
+	itemprop="offers"
+	itemid="offers"
+	id="offers"
+	itemscope
+	itemtype="https://schema.org/Offer"
+>
+	Price: $<span itemprop="price">1.00</span>
+	<meta itemprop="priceCurrency" content="USD" />
+</div>

From 38069776789bf62edc7786532f2a32c7c7a084d4 Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Thu, 30 Mar 2023 13:02:43 -0400
Subject: [PATCH 087/110] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c375e75ee..0916d7be24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,14 +3,14 @@
 ## Unreleased
 
 * Add `bind:innerText` for `contenteditable` elements ([#3311](https://github.com/sveltejs/svelte/issues/3311))
-* Relax `a11y-no-noninteractive-element-to-interactive-role` warning ([#8402](https://github.com/sveltejs/svelte/pull/8402))
+* Add support for CSS `@container` queries ([#6969](https://github.com/sveltejs/svelte/issues/6969))
+* Respect `preserveComments` in DOM output ([#7182](https://github.com/sveltejs/svelte/pull/7182))
+* Allow use of `document` for `target` in typings ([#7554](https://github.com/sveltejs/svelte/pull/7554))
 * Add `a11y-interactive-supports-focus` warning ([#8392](https://github.com/sveltejs/svelte/pull/8392))
 * Fix equality check when updating dynamic text ([#5931](https://github.com/sveltejs/svelte/issues/5931))
-* Make `preserveComments` effective in DOM renderer ([#7182](https://github.com/sveltejs/svelte/pull/7182))
-* Add CSS container queries support ([#6969](https://github.com/sveltejs/svelte/issues/6969))
-* Properly handle microdata attributes ([#8414](https://github.com/sveltejs/svelte/pull/8414))
+* Relax `a11y-no-noninteractive-element-to-interactive-role` warning ([#8402](https://github.com/sveltejs/svelte/pull/8402))
+* Properly handle microdata attributes ([#8413](https://github.com/sveltejs/svelte/issues/8413))
 * Prevent name collision when using computed destructuring variables ([#8417](https://github.com/sveltejs/svelte/issues/8417))
-* Allow use of `document` for `target` in typings ([#7554](https://github.com/sveltejs/svelte/pull/7554))
 
 ## 3.57.0
 

From 5a934e9f43237440617371ccaf65cb67dbcec69e Mon Sep 17 00:00:00 2001
From: Yuichiro Yamashita <xydybaseball@gmail.com>
Date: Fri, 31 Mar 2023 02:03:00 +0900
Subject: [PATCH 088/110] fix: escape <textarea value={...}> attribute properly
 (#8434)

---
 .../render_ssr/handlers/shared/get_attribute_value.ts     | 8 +++++++-
 test/runtime/samples/attribute-escape/_config.js          | 4 ++++
 test/runtime/samples/attribute-escape/main.svelte         | 1 +
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 test/runtime/samples/attribute-escape/_config.js
 create mode 100644 test/runtime/samples/attribute-escape/main.svelte

diff --git a/src/compiler/compile/render_ssr/handlers/shared/get_attribute_value.ts b/src/compiler/compile/render_ssr/handlers/shared/get_attribute_value.ts
index f431ea01db..1d365da673 100644
--- a/src/compiler/compile/render_ssr/handlers/shared/get_attribute_value.ts
+++ b/src/compiler/compile/render_ssr/handlers/shared/get_attribute_value.ts
@@ -19,11 +19,17 @@ export function get_class_attribute_value(attribute: Attribute): ESTreeExpressio
 export function get_attribute_value(attribute: Attribute): ESTreeExpression {
 	if (attribute.chunks.length === 0) return x`""`;
 
+	/**
+	 * For value attribute of textarea, it will render as child node of `<textarea>` element.
+	 * Therefore, we need to escape as content (not attribute).
+	 */
+	const is_textarea_value = attribute.parent.name.toLowerCase() === 'textarea' && attribute.name.toLowerCase() === 'value';
+
 	return attribute.chunks
 		.map((chunk) => {
 			return chunk.type === 'Text'
 				? string_literal(chunk.data.replace(regex_double_quotes, '&quot;')) as ESTreeExpression
-				: x`@escape(${chunk.node}, true)`;
+				: x`@escape(${chunk.node}, ${is_textarea_value ? 'false' : 'true'})`;
 		})
 		.reduce((lhs, rhs) => x`${lhs} + ${rhs}`);
 }
diff --git a/test/runtime/samples/attribute-escape/_config.js b/test/runtime/samples/attribute-escape/_config.js
new file mode 100644
index 0000000000..25313f01dc
--- /dev/null
+++ b/test/runtime/samples/attribute-escape/_config.js
@@ -0,0 +1,4 @@
+export default {
+	html: '<textarea></textarea>',
+	ssrHtml: '<textarea>test\'"&gt;&lt;/textarea&gt;&lt;script&gt;alert(\'BIM\');&lt;/script&gt;</textarea>'
+};
diff --git a/test/runtime/samples/attribute-escape/main.svelte b/test/runtime/samples/attribute-escape/main.svelte
new file mode 100644
index 0000000000..1b1fdf62a0
--- /dev/null
+++ b/test/runtime/samples/attribute-escape/main.svelte
@@ -0,0 +1 @@
+<textarea value={`test'"></textarea><script>alert('BIM');</script>`} />

From 5d0e049a94de326e5a35199ab3768159a1568f07 Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Thu, 30 Mar 2023 13:04:01 -0400
Subject: [PATCH 089/110] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0916d7be24..dedb734911 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * Relax `a11y-no-noninteractive-element-to-interactive-role` warning ([#8402](https://github.com/sveltejs/svelte/pull/8402))
 * Properly handle microdata attributes ([#8413](https://github.com/sveltejs/svelte/issues/8413))
 * Prevent name collision when using computed destructuring variables ([#8417](https://github.com/sveltejs/svelte/issues/8417))
+* Fix escaping `<textarea value={...}>` values in SSR ([#8429](https://github.com/sveltejs/svelte/issues/8429))
 
 ## 3.57.0
 

From cfe26d8d6c3e31471bf9a0b520e30afe422f09f6 Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Thu, 30 Mar 2023 13:04:33 -0400
Subject: [PATCH 090/110] -> v3.58.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dedb734911..d5568dce50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Svelte changelog
 
-## Unreleased
+## 3.58.0
 
 * Add `bind:innerText` for `contenteditable` elements ([#3311](https://github.com/sveltejs/svelte/issues/3311))
 * Add support for CSS `@container` queries ([#6969](https://github.com/sveltejs/svelte/issues/6969))
diff --git a/package-lock.json b/package-lock.json
index adb27b7556..2c894b1605 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "svelte",
-  "version": "3.57.0",
+  "version": "3.58.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "svelte",
-      "version": "3.57.0",
+      "version": "3.58.0",
       "license": "MIT",
       "devDependencies": {
         "@ampproject/remapping": "^0.3.0",
diff --git a/package.json b/package.json
index 88375069c8..dc44115e39 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "3.57.0",
+  "version": "3.58.0",
   "description": "Cybernetically enhanced web apps",
   "module": "index.mjs",
   "main": "index",

From d42ca041dd7817ae772a9da2d0aea56f557088d1 Mon Sep 17 00:00:00 2001
From: Michael Leahy <support@typhonrt.org>
Date: Thu, 30 Mar 2023 14:48:10 -0700
Subject: [PATCH 091/110] Closes #5876. Adds single value function support to
 media queries and media query range syntax / MQ level 4 support. (#8430)

---
 .../parse/read/css-tree-cq/css_tree_parse.ts  | 16 +----
 .../read/css-tree-cq/node/container_query.ts  | 50 ++-------------
 .../parse/read/css-tree-cq/node/index.ts      |  7 ++
 .../css-tree-cq/node/lookahead_is_range.ts    | 44 +++++++++++++
 .../read/css-tree-cq/node/media_query.ts      | 64 +++++++++++++++++++
 ...{container_feature.ts => query_feature.ts} |  4 +-
 ...eature_range.ts => query_feature_range.ts} |  7 +-
 test/css/samples/media-query/expected.css     |  2 +-
 test/css/samples/media-query/input.svelte     | 32 +++++++++-
 9 files changed, 161 insertions(+), 65 deletions(-)
 create mode 100644 src/compiler/parse/read/css-tree-cq/node/index.ts
 create mode 100644 src/compiler/parse/read/css-tree-cq/node/lookahead_is_range.ts
 create mode 100644 src/compiler/parse/read/css-tree-cq/node/media_query.ts
 rename src/compiler/parse/read/css-tree-cq/node/{container_feature.ts => query_feature.ts} (95%)
 rename src/compiler/parse/read/css-tree-cq/node/{container_feature_range.ts => query_feature_range.ts} (90%)

diff --git a/src/compiler/parse/read/css-tree-cq/css_tree_parse.ts b/src/compiler/parse/read/css-tree-cq/css_tree_parse.ts
index d56e6d72ed..bd519530c2 100644
--- a/src/compiler/parse/read/css-tree-cq/css_tree_parse.ts
+++ b/src/compiler/parse/read/css-tree-cq/css_tree_parse.ts
@@ -3,12 +3,7 @@
 // `css-tree` Node module directly. This allows the production build of Svelte to work correctly.
 import { fork } from '../../../../../node_modules/css-tree/dist/csstree.esm.js';
 
-import * as Comparison from './node/comparison';
-import * as ContainerFeature from './node/container_feature';
-import * as ContainerFeatureRange from './node/container_feature_range';
-import * as ContainerFeatureStyle from './node/container_feature_style';
-import * as ContainerQuery from './node/container_query';
-import * as QueryCSSFunction from './node/query_css_function';
+import * as node from './node';
 
 /**
  * Extends `css-tree` for container query support by forking and adding new nodes and at-rule support for `@container`.
@@ -30,14 +25,7 @@ const cqSyntax = fork({
 			}
 		}
 	},
-	node: { // extend node types
-		Comparison,
-		ContainerFeature,
-		ContainerFeatureRange,
-		ContainerFeatureStyle,
-		ContainerQuery,
-		QueryCSSFunction
-	}
+	node
 });
 
 export const parse = cqSyntax.parse;
diff --git a/src/compiler/parse/read/css-tree-cq/node/container_query.ts b/src/compiler/parse/read/css-tree-cq/node/container_query.ts
index c88b91f12d..2a5369feda 100644
--- a/src/compiler/parse/read/css-tree-cq/node/container_query.ts
+++ b/src/compiler/parse/read/css-tree-cq/node/container_query.ts
@@ -1,17 +1,14 @@
 // @ts-nocheck
 import {
-	EOF,
 	WhiteSpace,
 	Comment,
-	Delim,
 	Function,
 	Ident,
-	LeftParenthesis,
-	RightParenthesis,
-	LeftCurlyBracket,
-	Colon
+	LeftParenthesis
 } from 'css-tree/tokenizer';
 
+import { lookahead_is_range } from './lookahead_is_range';
+
 const CONTAINER_QUERY_KEYWORDS = new Set(['none', 'and', 'not', 'or']);
 
 export const name = 'ContainerQuery';
@@ -19,48 +16,13 @@ export const structure = {
 	name: 'Identifier',
 	children: [[
 		'Identifier',
-		'ContainerFeature',
-		'ContainerFeatureRange',
+		'QueryFeature',
+		'QueryFeatureRange',
 		'ContainerFeatureStyle',
 		'WhiteSpace'
 	]]
 };
 
-/**
- * Looks ahead to determine if query feature is a range query. This involves locating at least one delimiter and no
- * colon tokens.
- *
- * @returns {boolean} Is potential range query.
- */
-function lookahead_is_range() {
-	let type;
-	let offset = 0;
-
-	let count = 0;
-	let delim_found = false;
-	let no_colon = true;
-
-	// A range query has maximum 5 tokens when formatted as 'mf-range' /
-	// '<mf-value> <mf-lt> <mf-name> <mf-lt> <mf-value>'. So only look ahead maximum of 6 non-whitespace tokens.
-	do {
-		type = this.lookupNonWSType(offset++);
-		if (type !== WhiteSpace) {
-			count++;
-		}
-		if (type === Delim) {
-			delim_found = true;
-		}
-		if (type === Colon) {
-			no_colon = false;
-		}
-		if (type === LeftCurlyBracket || type === RightParenthesis) {
-			break;
-		}
-	} while (type !== EOF && count <= 6);
-
-	return delim_found && no_colon;
-}
-
 export function parse() {
 	const start = this.tokenStart;
 	const children = this.createList();
@@ -98,7 +60,7 @@ export function parse() {
 
 				case LeftParenthesis:
 					// Lookahead to determine if range feature.
-					child = lookahead_is_range.call(this) ? this.ContainerFeatureRange() : this.ContainerFeature();
+					child = lookahead_is_range.call(this) ? this.QueryFeatureRange() : this.QueryFeature();
 					break;
 
 				default:
diff --git a/src/compiler/parse/read/css-tree-cq/node/index.ts b/src/compiler/parse/read/css-tree-cq/node/index.ts
new file mode 100644
index 0000000000..cab88925f9
--- /dev/null
+++ b/src/compiler/parse/read/css-tree-cq/node/index.ts
@@ -0,0 +1,7 @@
+export * as Comparison from './comparison';
+export * as ContainerFeatureStyle from './container_feature_style';
+export * as ContainerQuery from './container_query';
+export * as MediaQuery from './media_query';
+export * as QueryFeature from './query_feature';
+export * as QueryFeatureRange from './query_feature_range';
+export * as QueryCSSFunction from './query_css_function';
diff --git a/src/compiler/parse/read/css-tree-cq/node/lookahead_is_range.ts b/src/compiler/parse/read/css-tree-cq/node/lookahead_is_range.ts
new file mode 100644
index 0000000000..d78196cb4b
--- /dev/null
+++ b/src/compiler/parse/read/css-tree-cq/node/lookahead_is_range.ts
@@ -0,0 +1,44 @@
+// @ts-nocheck
+import {
+	EOF,
+	WhiteSpace,
+	Delim,
+	RightParenthesis,
+	LeftCurlyBracket,
+	Colon
+} from 'css-tree/tokenizer';
+
+/**
+ * Looks ahead to determine if query feature is a range query. This involves locating at least one delimiter and no
+ * colon tokens.
+ *
+ * @returns {boolean} Is potential range query.
+ */
+export function lookahead_is_range() {
+	let type;
+	let offset = 0;
+
+	let count = 0;
+	let delim_found = false;
+	let no_colon = true;
+
+	// A range query has maximum 5 tokens when formatted as 'mf-range' /
+	// '<mf-value> <mf-lt> <mf-name> <mf-lt> <mf-value>'. So only look ahead maximum of 6 non-whitespace tokens.
+	do {
+		type = this.lookupNonWSType(offset++);
+		if (type !== WhiteSpace) {
+			count++;
+		}
+		if (type === Delim) {
+			delim_found = true;
+		}
+		if (type === Colon) {
+			no_colon = false;
+		}
+		if (type === LeftCurlyBracket || type === RightParenthesis) {
+			break;
+		}
+	} while (type !== EOF && count <= 6);
+
+	return delim_found && no_colon;
+}
diff --git a/src/compiler/parse/read/css-tree-cq/node/media_query.ts b/src/compiler/parse/read/css-tree-cq/node/media_query.ts
new file mode 100644
index 0000000000..11235e29d9
--- /dev/null
+++ b/src/compiler/parse/read/css-tree-cq/node/media_query.ts
@@ -0,0 +1,64 @@
+// @ts-nocheck
+import {
+	WhiteSpace,
+	Comment,
+	Ident,
+	LeftParenthesis
+} from 'css-tree/tokenizer';
+
+import { lookahead_is_range } from './lookahead_is_range';
+
+export const name = 'MediaQuery';
+export const structure = {
+	children: [[
+		'Identifier',
+		'QueryFeature',
+		'QueryFeatureRange',
+		'WhiteSpace'
+	]]
+};
+
+export function parse() {
+	const children = this.createList();
+	let child = null;
+
+	this.skipSC();
+
+	scan:
+		while (!this.eof) {
+			switch (this.tokenType) {
+				case Comment:
+				case WhiteSpace:
+					this.next();
+					continue;
+
+				case Ident:
+					child = this.Identifier();
+					break;
+
+				case LeftParenthesis:
+					// Lookahead to determine if range feature.
+					child = lookahead_is_range.call(this) ? this.QueryFeatureRange() : this.QueryFeature();
+					break;
+
+				default:
+					break scan;
+			}
+
+			children.push(child);
+		}
+
+	if (child === null) {
+		this.error('Identifier or parenthesis is expected');
+	}
+
+	return {
+		type: 'MediaQuery',
+		loc: this.getLocationFromList(children),
+		children
+	};
+}
+
+export function generate(node) {
+	this.children(node);
+}
diff --git a/src/compiler/parse/read/css-tree-cq/node/container_feature.ts b/src/compiler/parse/read/css-tree-cq/node/query_feature.ts
similarity index 95%
rename from src/compiler/parse/read/css-tree-cq/node/container_feature.ts
rename to src/compiler/parse/read/css-tree-cq/node/query_feature.ts
index d84d5f5afd..e019f050bb 100644
--- a/src/compiler/parse/read/css-tree-cq/node/container_feature.ts
+++ b/src/compiler/parse/read/css-tree-cq/node/query_feature.ts
@@ -10,7 +10,7 @@ import {
 	Delim
 } from 'css-tree/tokenizer';
 
-export const name = 'ContainerFeature';
+export const name = 'QueryFeature';
 export const structure = {
 	name: String,
 	value: ['Identifier', 'Number', 'Dimension', 'QueryCSSFunction', 'Ratio', null]
@@ -62,7 +62,7 @@ export function parse() {
 	this.eat(RightParenthesis);
 
 	return {
-		type: 'ContainerFeature',
+		type: 'QueryFeature',
 		loc: this.getLocation(start, this.tokenStart),
 		name,
 		value
diff --git a/src/compiler/parse/read/css-tree-cq/node/container_feature_range.ts b/src/compiler/parse/read/css-tree-cq/node/query_feature_range.ts
similarity index 90%
rename from src/compiler/parse/read/css-tree-cq/node/container_feature_range.ts
rename to src/compiler/parse/read/css-tree-cq/node/query_feature_range.ts
index 747fbe8da0..ee8f14abea 100644
--- a/src/compiler/parse/read/css-tree-cq/node/container_feature_range.ts
+++ b/src/compiler/parse/read/css-tree-cq/node/query_feature_range.ts
@@ -10,7 +10,7 @@ import {
 	WhiteSpace
 } from 'css-tree/tokenizer';
 
-export const name = 'ContainerFeatureRange';
+export const name = 'QueryFeatureRange';
 export const structure = {
 	name: String,
 	value: ['Identifier', 'Number', 'Comparison', 'Dimension', 'QueryCSSFunction', 'Ratio', null]
@@ -30,6 +30,7 @@ function lookup_non_WS_type_and_value(offset, type, referenceStr) {
 }
 
 export function parse() {
+	const start = this.tokenStart;
 	const children = this.createList();
 	let child = null;
 
@@ -75,8 +76,8 @@ export function parse() {
 	this.eat(RightParenthesis);
 
 	return {
-		type: 'ContainerFeatureRange',
-		loc: this.getLocationFromList(children),
+		type: 'QueryFeatureRange',
+		loc: this.getLocation(start, this.tokenStart),
 		children
 	};
 }
diff --git a/test/css/samples/media-query/expected.css b/test/css/samples/media-query/expected.css
index 8ea74bf3b1..ca5de85cfc 100644
--- a/test/css/samples/media-query/expected.css
+++ b/test/css/samples/media-query/expected.css
@@ -1 +1 @@
-@media(min-width: 400px){.large-screen.svelte-xyz{display:block}}
\ No newline at end of file
+@media(min-width: 400px){.large-screen.svelte-xyz{display:block}}@media(min-width: calc(400px + 1px)){.large-screen.svelte-xyz{display:block}}@media(width >= 600px){.large-screen.svelte-xyz{display:block}}@media(400px <= width <= 1000px){.large-screen.svelte-xyz{display:block}}@media(width < clamp(200px, 40%, 400px)){.large-screen.svelte-xyz{display:block}}@media(calc(400px + 1px) <= width <= calc(1000px + 1px)){.large-screen.svelte-xyz{display:block}}
\ No newline at end of file
diff --git a/test/css/samples/media-query/input.svelte b/test/css/samples/media-query/input.svelte
index d5465ab4f9..d634d7a61d 100644
--- a/test/css/samples/media-query/input.svelte
+++ b/test/css/samples/media-query/input.svelte
@@ -6,4 +6,34 @@
 			display: block;
 		}
 	}
-</style>
\ No newline at end of file
+
+	@media (min-width: calc(400px + 1px)) {
+		.large-screen {
+			display: block;
+		}
+	}
+
+	@media (width >= 600px) {
+		.large-screen {
+			display: block;
+		}
+	}
+
+	@media (400px <= width <= 1000px) {
+		.large-screen {
+			display: block;
+		}
+	}
+
+	@media (width < clamp(200px, 40%, 400px)) {
+		.large-screen {
+			display: block;
+		}
+	}
+
+	@media (calc(400px + 1px) <= width <= calc(1000px + 1px)) {
+		.large-screen {
+			display: block;
+		}
+	}
+</style>

From def1890f4ff0cccb9573bfc79984fbe1258ed318 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Tue, 11 Apr 2023 02:25:53 -0700
Subject: [PATCH 092/110] chore: bump @jridgewell/sourcemap-codec (#8458)

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2c894b1605..3f32f9633f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "devDependencies": {
         "@ampproject/remapping": "^0.3.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14",
+        "@jridgewell/sourcemap-codec": "^1.4.15",
         "@rollup/plugin-commonjs": "^11.0.0",
         "@rollup/plugin-json": "^6.0.0",
         "@rollup/plugin-node-resolve": "^11.2.1",
@@ -184,9 +184,9 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
       "dev": true
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -5499,9 +5499,9 @@
       "dev": true
     },
     "@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
       "dev": true
     },
     "@nodelib/fs.scandir": {
diff --git a/package.json b/package.json
index dc44115e39..25aafb817a 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
   "homepage": "https://svelte.dev",
   "devDependencies": {
     "@ampproject/remapping": "^0.3.0",
-    "@jridgewell/sourcemap-codec": "^1.4.14",
+    "@jridgewell/sourcemap-codec": "^1.4.15",
     "@rollup/plugin-commonjs": "^11.0.0",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^11.2.1",

From 3a7685fef554f0ae2480146eb7c2d0ec944b28ac Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 11 Apr 2023 11:44:19 +0200
Subject: [PATCH 093/110] fix: special-case width/height attribute during
 spread (#8412)

fixes #6752

---------

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
Co-authored-by: Tan Li Hau <tanhauhau@users.noreply.github.com>
---
 src/runtime/internal/dom.ts                           | 11 ++++++++++-
 .../samples/spread-width-height-attributes/_config.js |  4 ++++
 .../spread-width-height-attributes/main.svelte        |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 test/runtime/samples/spread-width-height-attributes/_config.js
 create mode 100644 test/runtime/samples/spread-width-height-attributes/main.svelte

diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index 34049b3580..8a78accb50 100644
--- a/src/runtime/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -306,6 +306,15 @@ export function attr(node: Element, attribute: string, value?: string) {
 	else if (node.getAttribute(attribute) !== value) node.setAttribute(attribute, value);
 }
 
+/** 
+ * List of attributes that should always be set through the attr method,
+ * because updating them through the property setter doesn't work reliably.
+ * In the example of `width`/`height`, the problem is that the setter only
+ * accepts numeric values, but the attribute can also be set to a string like `50%`.
+ * If this list becomes too big, rethink this approach.
+ */
+const always_set_through_set_attribute = ['width', 'height'];
+
 export function set_attributes(node: Element & ElementCSSInlineStyle, attributes: { [x: string]: string }) {
 	// @ts-ignore
 	const descriptors = Object.getOwnPropertyDescriptors(node.__proto__);
@@ -316,7 +325,7 @@ export function set_attributes(node: Element & ElementCSSInlineStyle, attributes
 			node.style.cssText = attributes[key];
 		} else if (key === '__value') {
 			(node as any).value = node[key] = attributes[key];
-		} else if (descriptors[key] && descriptors[key].set) {
+		} else if (descriptors[key] && descriptors[key].set && always_set_through_set_attribute.indexOf(key) === -1) {
 			node[key] = attributes[key];
 		} else {
 			attr(node, key, attributes[key]);
diff --git a/test/runtime/samples/spread-width-height-attributes/_config.js b/test/runtime/samples/spread-width-height-attributes/_config.js
new file mode 100644
index 0000000000..cf2dc7efde
--- /dev/null
+++ b/test/runtime/samples/spread-width-height-attributes/_config.js
@@ -0,0 +1,4 @@
+export default {
+	// https://github.com/sveltejs/svelte/issues/6752
+	html: '<img height="100%" width="100%" alt="" />'
+};
diff --git a/test/runtime/samples/spread-width-height-attributes/main.svelte b/test/runtime/samples/spread-width-height-attributes/main.svelte
new file mode 100644
index 0000000000..b91b008457
--- /dev/null
+++ b/test/runtime/samples/spread-width-height-attributes/main.svelte
@@ -0,0 +1 @@
+<img height="100%" width="100%" alt="" {...$$restProps} />

From 0adc09da9714bb0fcc7fafdbee569ea7cad4fae5 Mon Sep 17 00:00:00 2001
From: Cymaera <69355340+TheCymaera@users.noreply.github.com>
Date: Tue, 11 Apr 2023 18:17:58 +0800
Subject: [PATCH 094/110] feat: add support for resize observer bindings
 (#8022)

Implements ResizeObserver bindings: #5524 (comment)
Continuation of: #5963
Related to #7583

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 elements/index.d.ts                           |  5 ++
 src/compiler/compile/nodes/Binding.ts         |  3 +-
 src/compiler/compile/nodes/Element.ts         |  7 +-
 .../render_dom/wrappers/Element/Binding.ts    |  8 ++-
 .../render_dom/wrappers/Element/index.ts      | 32 +++++++--
 src/compiler/utils/patterns.ts                |  6 ++
 .../internal/ResizeObserverSingleton.ts       | 67 +++++++++++++++++++
 src/runtime/internal/dom.ts                   |  8 ++-
 8 files changed, 127 insertions(+), 9 deletions(-)
 create mode 100644 src/runtime/internal/ResizeObserverSingleton.ts

diff --git a/elements/index.d.ts b/elements/index.d.ts
index 7595d767bf..ac32ae94c3 100644
--- a/elements/index.d.ts
+++ b/elements/index.d.ts
@@ -546,6 +546,11 @@ export interface HTMLAttributes<T extends EventTarget> extends AriaAttributes, D
 	 */
 	'bind:innerText'?: string | undefined | null;
 
+	readonly 'bind:contentRect'?: DOMRectReadOnly | undefined | null;
+	readonly 'bind:contentBoxSize'?: Array<{ blockSize: number; inlineSize: number }> | undefined | null; // TODO make this ResizeObserverSize once we require TS>=4.4
+	readonly 'bind:borderBoxSize'?: Array<{ blockSize: number; inlineSize: number }> | undefined | null; // TODO make this ResizeObserverSize once we require TS>=4.4
+	readonly 'bind:devicePixelContentBoxSize'?: Array<{ blockSize: number; inlineSize: number }> | undefined | null; // TODO make this ResizeObserverSize once we require TS>=4.4
+
 	// SvelteKit
 	'data-sveltekit-keepfocus'?: true | '' | 'off' | undefined | null;
 	'data-sveltekit-noscroll'?: true | '' | 'off' | undefined | null;
diff --git a/src/compiler/compile/nodes/Binding.ts b/src/compiler/compile/nodes/Binding.ts
index 0c29f7ec67..303506222f 100644
--- a/src/compiler/compile/nodes/Binding.ts
+++ b/src/compiler/compile/nodes/Binding.ts
@@ -3,7 +3,7 @@ import get_object from '../utils/get_object';
 import Expression from './shared/Expression';
 import Component from '../Component';
 import TemplateScope from './shared/TemplateScope';
-import { regex_dimensions } from '../../utils/patterns';
+import { regex_dimensions, regex_box_size } from '../../utils/patterns';
 import { Node as ESTreeNode } from 'estree';
 import { TemplateNode } from '../../interfaces';
 import Element from './Element';
@@ -92,6 +92,7 @@ export default class Binding extends Node {
 
 		this.is_readonly =
 			regex_dimensions.test(this.name) ||
+			regex_box_size.test(this.name) ||
 			(isElement(parent) &&
 				((parent.is_media_node() && read_only_media_attributes.has(this.name)) ||
 					(parent.name === 'input' && type === 'file')) /* TODO others? */);
diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index 1678ea1caa..2410904d63 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -12,7 +12,7 @@ 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 { regex_dimensions, regex_starts_with_newline, regex_non_whitespace_character, regex_box_size } from '../../utils/patterns';
 import fuzzymatch from '../../utils/fuzzymatch';
 import list from '../../utils/list';
 import Let from './Let';
@@ -1090,7 +1090,10 @@ export default class Element extends Node {
 				} else if (contenteditable && !contenteditable.is_static) {
 					return component.error(contenteditable, compiler_errors.dynamic_contenteditable_attribute);
 				}
-			} else if (name !== 'this') {
+			} else if (
+				name !== 'this' &&
+				!regex_box_size.test(name)
+			) {
 				return component.error(binding, compiler_errors.invalid_binding(binding.name));
 			}
 		});
diff --git a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
index 642e4694b1..01da1f0e12 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
@@ -11,6 +11,7 @@ import { Node, Identifier } from 'estree';
 import add_to_set from '../../../utils/add_to_set';
 import mark_each_block_bindings from '../shared/mark_each_block_bindings';
 import handle_select_value_binding from './handle_select_value_binding';
+import { regex_box_size } from '../../../../utils/patterns';
 
 export default class BindingWrapper {
 	node: Binding;
@@ -455,7 +456,12 @@ function get_value_from_dom(
 		return x`$$value`;
 	}
 
-	// <select bind:value='selected'>
+	// <div bind:contentRect|contentBoxSize|borderBoxSize|devicePixelContentBoxSize>
+	if (regex_box_size.test(name)) {
+		return x`@ResizeObserverSingleton.entries.get(this)?.${name}`;
+	}
+
+	// <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/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index 7a0bdbaa06..0f1faa8f5e 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -12,7 +12,7 @@ import { namespaces } from '../../../../utils/namespaces';
 import AttributeWrapper from './Attribute';
 import StyleAttributeWrapper from './StyleAttribute';
 import SpreadAttributeWrapper from './SpreadAttribute';
-import { regex_dimensions, regex_starts_with_newline, regex_backslashes } from '../../../../utils/patterns';
+import { regex_dimensions, regex_starts_with_newline, regex_backslashes, regex_border_box_size, regex_content_box_size, regex_device_pixel_content_box_size, regex_content_rect } from '../../../../utils/patterns';
 import Binding from './Binding';
 import add_to_set from '../../../utils/add_to_set';
 import { add_event_handler } from '../shared/add_event_handlers';
@@ -64,11 +64,29 @@ const events = [
 		filter: (node: Element, _name: string) =>
 			node.name === 'input' && node.get_static_attribute_value('type') === 'range'
 	},
+	// resize events
 	{
 		event_names: ['elementresize'],
 		filter: (_node: Element, name: string) =>
 			regex_dimensions.test(name)
 	},
+	{
+		event_names: ['elementresizecontentbox'],
+		filter: (_node: Element, name: string) =>
+			regex_content_rect.test(name) ?? regex_content_box_size.test(name)
+	},
+
+	{
+		event_names: ['elementresizeborderbox'],
+		filter: (_node: Element, name: string) => 
+			regex_border_box_size.test(name)
+	},
+
+	{
+		event_names: ['elementresizedevicepixelcontentbox'],
+		filter: (_node: Element, name: string) =>
+			regex_device_pixel_content_box_size.test(name)
+	},
 	// media events
 	{
 		event_names: ['timeupdate'],
@@ -747,13 +765,19 @@ export default class ElementWrapper extends Wrapper {
 		`);
 
 		binding_group.events.forEach(name => {
-			if (name === 'elementresize') {
-				// special case
+			const resizeListenerFunctions = {
+				elementresize: 'add_iframe_resize_listener',
+				elementresizecontentbox: 'resize_observer_content_box.observe',
+				elementresizeborderbox: 'resize_observer_border_box.observe',
+				elementresizedevicepixelcontentbox: 'resize_observer_device_pixel_content_box.observe'
+			};
+
+			if (name in resizeListenerFunctions) {
 				const resize_listener = block.get_unique_name(`${this.var.name}_resize_listener`);
 				block.add_variable(resize_listener);
 
 				block.chunks.mount.push(
-					b`${resize_listener} = @add_resize_listener(${this.var}, ${callee}.bind(${this.var}));`
+					b`${resize_listener} = @${resizeListenerFunctions[name]}(${this.var}, ${callee}.bind(${this.var}));`
 				);
 
 				block.chunks.destroy.push(
diff --git a/src/compiler/utils/patterns.ts b/src/compiler/utils/patterns.ts
index 9429d47227..f0fb08c7c9 100644
--- a/src/compiler/utils/patterns.ts
+++ b/src/compiler/utils/patterns.ts
@@ -22,3 +22,9 @@ export const regex_ends_with_underscore = /_$/;
 export const regex_invalid_variable_identifier_characters = /[^a-zA-Z0-9_$]/g;
 
 export const regex_dimensions = /^(?:offset|client)(?:Width|Height)$/;
+
+export const regex_content_rect = /^(?:contentRect)$/;
+export const regex_content_box_size = /^(?:contentBoxSize)$/;
+export const regex_border_box_size = /^(?:borderBoxSize)$/;
+export const regex_device_pixel_content_box_size = /^(?:devicePixelContentBoxSize)$/;
+export const regex_box_size = /^(?:contentRect|contentBoxSize|borderBoxSize|devicePixelContentBoxSize)$/;
diff --git a/src/runtime/internal/ResizeObserverSingleton.ts b/src/runtime/internal/ResizeObserverSingleton.ts
new file mode 100644
index 0000000000..6d1e5b567b
--- /dev/null
+++ b/src/runtime/internal/ResizeObserverSingleton.ts
@@ -0,0 +1,67 @@
+/**
+ * Resize observer singleton.
+ * One listener per element only!
+ * https://groups.google.com/a/chromium.org/g/blink-dev/c/z6ienONUb5A/m/F5-VcUZtBAAJ
+ */
+export class ResizeObserverSingleton {
+	constructor(readonly options?: ResizeObserverOptions) {}
+
+	observe(element: Element, listener: Listener) {
+		this._listeners.set(element, listener);
+		this._getObserver().observe(element, this.options);
+		return () => {
+			this._listeners.delete(element);
+			this._observer.unobserve(element); // this line can probably be removed
+		};
+	}
+
+	static readonly entries: WeakMap<Element, ResizeObserverEntry> = 'WeakMap' in globalThis ? new WeakMap() : undefined;
+
+	private readonly _listeners: WeakMap<Element, Listener> = 'WeakMap' in globalThis ? new WeakMap() : undefined;
+	private _observer?: ResizeObserver;
+	private _getObserver() {
+		return this._observer ?? (this._observer = new ResizeObserver((entries) => {
+			for (const entry of entries) {
+				ResizeObserverSingleton.entries.set(entry.target, entry);
+				this._listeners.get(entry.target)?.(entry);
+			}
+		}));
+	}
+}
+
+type Listener = (entry: ResizeObserverEntry)=>any;
+
+// TODO: Remove this
+interface ResizeObserverSize {
+    readonly blockSize: number;
+    readonly inlineSize: number;
+}
+
+interface ResizeObserverEntry {
+    readonly borderBoxSize: readonly ResizeObserverSize[];
+    readonly contentBoxSize: readonly ResizeObserverSize[];
+    readonly contentRect: DOMRectReadOnly;
+    readonly devicePixelContentBoxSize: readonly ResizeObserverSize[];
+    readonly target: Element;
+}
+
+type ResizeObserverBoxOptions = 'border-box' | 'content-box' | 'device-pixel-content-box';
+
+interface ResizeObserverOptions {
+    box?: ResizeObserverBoxOptions;
+}
+
+interface ResizeObserver {
+    disconnect(): void;
+    observe(target: Element, options?: ResizeObserverOptions): void;
+    unobserve(target: Element): void;
+}
+
+interface ResizeObserverCallback {
+    (entries: ResizeObserverEntry[], observer: ResizeObserver): void;
+}
+
+declare let ResizeObserver: {
+    prototype: ResizeObserver;
+    new(callback: ResizeObserverCallback): ResizeObserver;
+};
diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index 8a78accb50..4ffa9e4742 100644
--- a/src/runtime/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -1,3 +1,4 @@
+import { ResizeObserverSingleton } from './ResizeObserverSingleton';
 import { contenteditable_truthy_values, has_prop } from './utils';
 
 // Track which nodes are claimed during hydration. Unclaimed nodes can then be removed from the DOM
@@ -698,7 +699,7 @@ export function is_crossorigin() {
 	return crossorigin;
 }
 
-export function add_resize_listener(node: HTMLElement, fn: () => void) {
+export function add_iframe_resize_listener(node: HTMLElement, fn: () => void) {
 	const computed_style = getComputedStyle(node);
 
 	if (computed_style.position === 'static') {
@@ -746,6 +747,11 @@ export function add_resize_listener(node: HTMLElement, fn: () => void) {
 	};
 }
 
+export const resize_observer_content_box = new ResizeObserverSingleton({ box: 'content-box' });
+export const resize_observer_border_box = new ResizeObserverSingleton({ box: 'border-box' });
+export const resize_observer_device_pixel_content_box = new ResizeObserverSingleton({ box: 'device-pixel-content-box' });
+export { ResizeObserverSingleton };
+
 export function toggle_class(element, name, toggle) {
 	element.classList[toggle ? 'add' : 'remove'](name);
 }

From 56351a3fabbc8ebd44723aa724b8050ab19a6dcd Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 11 Apr 2023 12:19:30 +0200
Subject: [PATCH 095/110] chore: update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5568dce50..ea9545aa65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Svelte changelog
 
+## Unreleased
+
+* Handle `width`/`height` attributes when spreading ([#6752](https://github.com/sveltejs/svelte/issues/6752))
+* Add support for resize observer bindings (`<div bind:contentRect|contentBoxSize|borderBoxSize|devicePixelContentBoxSize>`) ([#8022](https://github.com/sveltejs/svelte/pull/8022))
+
 ## 3.58.0
 
 * Add `bind:innerText` for `contenteditable` elements ([#3311](https://github.com/sveltejs/svelte/issues/3311))

From cd690e025bb2ad2e50cfc417d4b58408c779f080 Mon Sep 17 00:00:00 2001
From: James Scott-Brown <james@jamesscottbrown.com>
Date: Tue, 11 Apr 2023 13:05:22 +0100
Subject: [PATCH 096/110] docs: clarify meaning of "this" in a comment (#8478)

---
 site/content/docs/02-component-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/content/docs/02-component-format.md b/site/content/docs/02-component-format.md
index d9f7a35662..f1563a62c6 100644
--- a/site/content/docs/02-component-format.md
+++ b/site/content/docs/02-component-format.md
@@ -286,7 +286,7 @@ You cannot `export default`, since the default export is the component itself.
 <script context="module">
 	let totalComponents = 0;
 
-	// this allows an importer to do e.g.
+	// the export keyword allows this function to imported with e.g.
 	// `import Example, { alertTotal } from './Example.svelte'`
 	export function alertTotal() {
 		alert(totalComponents);

From 765023d6e76f65db8712ffd58e97c21ef8bea515 Mon Sep 17 00:00:00 2001
From: xxkl1 <84455605+xxkl1@users.noreply.github.com>
Date: Tue, 11 Apr 2023 21:20:30 +0800
Subject: [PATCH 097/110] fix: html space entities lost in component slot
 (#8464)

fixes #8359
---
 src/compiler/utils/patterns.ts                     |  2 +-
 test/helpers.ts                                    | 14 +++++++-------
 .../Component.svelte                               |  3 +++
 .../html-entities-inside-component-slot/_config.js | 11 +++++++++++
 .../main.svelte                                    | 13 +++++++++++++
 5 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 test/runtime/samples/html-entities-inside-component-slot/Component.svelte
 create mode 100644 test/runtime/samples/html-entities-inside-component-slot/_config.js
 create mode 100644 test/runtime/samples/html-entities-inside-component-slot/main.svelte

diff --git a/src/compiler/utils/patterns.ts b/src/compiler/utils/patterns.ts
index f0fb08c7c9..311e406f07 100644
--- a/src/compiler/utils/patterns.ts
+++ b/src/compiler/utils/patterns.ts
@@ -4,7 +4,7 @@ export const regex_starts_with_whitespace = /^\s/;
 export const regex_starts_with_whitespaces = /^[ \t\r\n]*/;
 export const regex_ends_with_whitespace = /\s$/;
 export const regex_ends_with_whitespaces = /[ \t\r\n]*$/;
-export const regex_only_whitespaces = /^\s+$/;
+export const regex_only_whitespaces = /^[ \t\n\r\f]+$/;
 
 export const regex_whitespace_characters = /\s/g;
 export const regex_non_whitespace_character = /\S/;
diff --git a/test/helpers.ts b/test/helpers.ts
index 1ea0b19880..bc9138326f 100644
--- a/test/helpers.ts
+++ b/test/helpers.ts
@@ -109,11 +109,11 @@ function cleanChildren(node) {
 				node.removeChild(child);
 			}
 
-			child.data = child.data.replace(/\s+/g, '\n');
+			child.data = child.data.replace(/[ \t\n\r\f]+/g, '\n');
 
 			if (previous && previous.nodeType === 3) {
 				previous.data += child.data;
-				previous.data = previous.data.replace(/\s+/g, '\n');
+				previous.data = previous.data.replace(/[ \t\n\r\f]+/g, '\n');
 
 				node.removeChild(child);
 				child = previous;
@@ -130,13 +130,13 @@ function cleanChildren(node) {
 
 	// collapse whitespace
 	if (node.firstChild && node.firstChild.nodeType === 3) {
-		node.firstChild.data = node.firstChild.data.replace(/^\s+/, '');
-		if (!node.firstChild.data) node.removeChild(node.firstChild);
+		node.firstChild.data = node.firstChild.data.replace(/^[ \t\n\r\f]+/, '');
+		if (!node.firstChild.data.length) node.removeChild(node.firstChild);
 	}
 
 	if (node.lastChild && node.lastChild.nodeType === 3) {
-		node.lastChild.data = node.lastChild.data.replace(/\s+$/, '');
-		if (!node.lastChild.data) node.removeChild(node.lastChild);
+		node.lastChild.data = node.lastChild.data.replace(/[ \t\n\r\f]+$/, '');
+		if (!node.lastChild.data.length) node.removeChild(node.lastChild);
 	}
 }
 
@@ -145,7 +145,7 @@ export function normalizeHtml(window, html, preserveComments = false) {
 		const node = window.document.createElement('div');
 		node.innerHTML = html
 			.replace(/(<!--.*?-->)/g, preserveComments ? '$1' : '')
-			.replace(/>[\s\r\n]+</g, '><')
+			.replace(/>[ \t\n\r\f]+</g, '><')
 			.trim();
 		cleanChildren(node);
 		return node.innerHTML.replace(/<\/?noscript\/?>/g, '');
diff --git a/test/runtime/samples/html-entities-inside-component-slot/Component.svelte b/test/runtime/samples/html-entities-inside-component-slot/Component.svelte
new file mode 100644
index 0000000000..8063609738
--- /dev/null
+++ b/test/runtime/samples/html-entities-inside-component-slot/Component.svelte
@@ -0,0 +1,3 @@
+<div>
+	<slot />
+</div>
diff --git a/test/runtime/samples/html-entities-inside-component-slot/_config.js b/test/runtime/samples/html-entities-inside-component-slot/_config.js
new file mode 100644
index 0000000000..33777a4919
--- /dev/null
+++ b/test/runtime/samples/html-entities-inside-component-slot/_config.js
@@ -0,0 +1,11 @@
+export default {
+	html: `
+		<div>&nbsp;</div>
+
+		<div>
+			<span>&nbsp;</span>
+		</div>
+
+		<div>&nbsp;</div>
+	`
+};
diff --git a/test/runtime/samples/html-entities-inside-component-slot/main.svelte b/test/runtime/samples/html-entities-inside-component-slot/main.svelte
new file mode 100644
index 0000000000..8baecfedcc
--- /dev/null
+++ b/test/runtime/samples/html-entities-inside-component-slot/main.svelte
@@ -0,0 +1,13 @@
+<script>
+	import Component from './Component.svelte'
+</script>
+
+<Component>&nbsp;</Component>
+
+<Component>
+	<span>&nbsp;</span>
+</Component>
+
+<Component>
+	{@html "&nbsp;"}
+</Component>

From 75aec4183de7ec481b5ba6667bc7df2b5aea2568 Mon Sep 17 00:00:00 2001
From: Pat Cavit <github@patcavit.com>
Date: Tue, 11 Apr 2023 06:35:34 -0700
Subject: [PATCH 098/110] breaking: send in/out to transition fn (#8318)

Instead of "both", which doesn't make sense at that point.
---
 src/runtime/internal/transitions.ts             |  4 +++-
 .../_config.js                                  | 17 ++++++++++-------
 .../main.svelte                                 | 11 ++++++-----
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/runtime/internal/transitions.ts b/src/runtime/internal/transitions.ts
index 4705c0ac9a..777b4aec1a 100644
--- a/src/runtime/internal/transitions.ts
+++ b/src/runtime/internal/transitions.ts
@@ -376,8 +376,10 @@ export function create_bidirectional_transition(node: Element & ElementCSSInline
 		run(b: INTRO | OUTRO) {
 			if (is_function(config)) {
 				wait().then(() => {
+					const opts: TransitionOptions = { direction: b ? 'in' : 'out' };
+					
 					// @ts-ignore
-					config = config(options);
+					config = config(opts);
 					go(b);
 				});
 			} else {
diff --git a/test/runtime/samples/transition-js-deferred-option-direction/_config.js b/test/runtime/samples/transition-js-deferred-option-direction/_config.js
index 2bf448d9c7..71adc5539f 100644
--- a/test/runtime/samples/transition-js-deferred-option-direction/_config.js
+++ b/test/runtime/samples/transition-js-deferred-option-direction/_config.js
@@ -4,16 +4,19 @@ export default {
 
 		const div_in = target.querySelector('#in');
 		const div_out = target.querySelector('#out');
-		const div_both = target.querySelector('#both');
+		const div_bothin = target.querySelector('#both-in');
+		const div_bothout = target.querySelector('#both-out');
 
-		assert.equal(div_in.initial, 'in');
-		assert.equal(div_out.initial, 'out');
-		assert.equal(div_both.initial, 'both');
+		assert.equal(div_in.directions, 'in,in');
+		assert.equal(div_out.directions, 'out');
+		assert.equal(div_bothin.directions, 'both');
+		assert.equal(div_bothout.directions, 'both');
 
 		return Promise.resolve().then(() => {
-			assert.equal(div_in.later, 'in');
-			assert.equal(div_out.later, 'out');
-			assert.equal(div_both.later, 'both');
+			assert.equal(div_in.directions, 'in,in');
+			assert.equal(div_out.directions, 'out,out');
+			assert.equal(div_bothin.directions, 'both,in');
+			assert.equal(div_bothout.directions, 'both,out');
 		});
 	}
 };
diff --git a/test/runtime/samples/transition-js-deferred-option-direction/main.svelte b/test/runtime/samples/transition-js-deferred-option-direction/main.svelte
index 9ac816ce75..76bca2b5e2 100644
--- a/test/runtime/samples/transition-js-deferred-option-direction/main.svelte
+++ b/test/runtime/samples/transition-js-deferred-option-direction/main.svelte
@@ -2,10 +2,10 @@
 	export let visible;
 
 	function foo(node, _params, options) {
-		node.initial = options.direction;
+		node.directions = options.direction;
 
 		return (opts) => {
-			node.later = opts.direction;
+			node.directions += "," + opts.direction;
 
 			return {
 				duration: 10
@@ -15,10 +15,11 @@
 </script>
 
 {#if visible}
-	<div id="both" transition:foo></div>
-	<div id="in" in:foo></div>
+	<div id="both-in" transition:foo />
+	<div id="in" in:foo />
 {/if}
 
 {#if !visible}
-	<div id="out" out:foo></div>
+	<div id="out" out:foo />
+	<div id="both-out" transition:foo={{ duration: 500 }} />
 {/if}

From c72982947dd02e3f0f501fd2b31a79d69366964d Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 11 Apr 2023 21:11:43 +0200
Subject: [PATCH 099/110] chore: remove node<14 tests (#8482)

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 .github/workflows/ci.yml                      |   12 +-
 package-lock.json                             | 1458 ++++++++++++++---
 package.json                                  |    2 +-
 .../render_dom/wrappers/Element/index.ts      |   35 +-
 .../internal/ResizeObserverSingleton.ts       |   10 +-
 src/runtime/internal/dom.ts                   |    6 +-
 test/js/samples/bind-width-height/expected.js |    4 +-
 test/js/samples/video-bindings/expected.js    |    4 +-
 8 files changed, 1225 insertions(+), 306 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1e0ce53864..e2d708fd51 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
     timeout-minutes: 15
     strategy:
       matrix:
-        node-version: [8, 10, 12, 14, 16, 18]
+        node-version: [14, 16, 18]
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - uses: actions/checkout@v3
@@ -59,16 +59,6 @@ jobs:
         id: download-artifact
         with:
           name: build-assets
-      - name: Get Node version ${{ runner.os }}
-        run: echo "NODE_VERSION=`node --version`" >> $GITHUB_ENV
-        if: runner.os != 'Windows'
-      - name: Get Node version ${{ runner.os }}
-        run: |
-          chcp 65001
-          echo ("NODE_VERSION=$(node --version)") >> $env:GITHUB_ENV
-        if: runner.os == 'Windows'
-      - run: npm install --save-dev puppeteer@13
-        if: ${{ runner.os == 'Linux' && (!startsWith(env.NODE_VERSION, 'v8.') && !startsWith(env.NODE_VERSION, 'v10.')) }}
       - run: npm install
         env:
           SKIP_PREPARE: true
diff --git a/package-lock.json b/package-lock.json
index 3f32f9633f..25a17760c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,7 +41,7 @@
         "magic-string": "^0.30.0",
         "mocha": "^7.0.0",
         "periscopic": "^3.1.0",
-        "puppeteer": "^2.0.0",
+        "puppeteer": "^19.8.5",
         "rollup": "^1.27.14",
         "source-map": "^0.7.4",
         "source-map-support": "^0.5.21",
@@ -67,6 +67,41 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@babel/code-frame": {
+      "version": "7.21.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz",
+      "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz",
@@ -528,12 +563,6 @@
       "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
       "dev": true
     },
-    "node_modules/@types/mime-types": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz",
-      "integrity": "sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==",
-      "dev": true
-    },
     "node_modules/@types/mocha": {
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz",
@@ -555,6 +584,16 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "5.29.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.29.0.tgz",
@@ -881,10 +920,13 @@
       }
     },
     "node_modules/agent-base": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
-      "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
       "engines": {
         "node": ">= 6.0.0"
       }
@@ -1051,12 +1093,6 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
-      "dev": true
-    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -1105,6 +1141,26 @@
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
       "dev": true
     },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -1123,6 +1179,17 @@
         "node": ">=8"
       }
     },
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -1157,10 +1224,34 @@
       "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
       "dev": true
     },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
     "node_modules/buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
       "dev": true,
       "engines": {
         "node": "*"
@@ -1265,6 +1356,24 @@
         "fsevents": "~2.1.1"
       }
     },
+    "node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "node_modules/chromium-bidi": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.6.tgz",
+      "integrity": "sha512-TQOkWRaLI/IWvoP8XC+7jO4uHTIiAUiklXU1T0qszlUFEai9LgKXIBXy3pOS3EnQZ3bQtMbKUPkug0fTAEHCSw==",
+      "dev": true,
+      "dependencies": {
+        "mitt": "3.0.0"
+      },
+      "peerDependencies": {
+        "devtools-protocol": "*"
+      }
+    },
     "node_modules/cliui": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@@ -1331,27 +1440,57 @@
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
-    "node_modules/concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "engines": [
-        "node >= 0.8"
-      ],
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
     "node_modules/core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
       "dev": true
     },
+    "node_modules/cosmiconfig": {
+      "version": "8.1.3",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
+      "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==",
+      "dev": true,
+      "dependencies": {
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      }
+    },
+    "node_modules/cosmiconfig/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/cosmiconfig/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/cross-fetch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
+      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+      "dev": true,
+      "dependencies": {
+        "node-fetch": "2.6.7"
+      }
+    },
     "node_modules/css-tree": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
@@ -1528,6 +1667,12 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/devtools-protocol": {
+      "version": "0.0.1107588",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1107588.tgz",
+      "integrity": "sha512-yIR+pG9x65Xko7bErCUSQaDLrO/P1p3JUzEk7JCU4DowPcGHkTGUGQapcfcLc4qj0UaALwZ+cr0riFgiqpixcg==",
+      "dev": true
+    },
     "node_modules/diff": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
@@ -1586,6 +1731,24 @@
       "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
       "dev": true
     },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
     "node_modules/es-abstract": {
       "version": "1.20.4",
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
@@ -1690,6 +1853,15 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -2433,35 +2605,25 @@
       "dev": true
     },
     "node_modules/extract-zip": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
-      "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
       "dev": true,
       "dependencies": {
-        "concat-stream": "^1.6.2",
-        "debug": "^2.6.9",
-        "mkdirp": "^0.5.4",
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
         "yauzl": "^2.10.0"
       },
       "bin": {
         "extract-zip": "cli.js"
+      },
+      "engines": {
+        "node": ">= 10.17.0"
+      },
+      "optionalDependencies": {
+        "@types/yauzl": "^2.9.1"
       }
     },
-    "node_modules/extract-zip/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/extract-zip/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/extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -2517,7 +2679,7 @@
     "node_modules/fd-slicer": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
       "dev": true,
       "dependencies": {
         "pend": "~1.2.0"
@@ -2637,6 +2799,12 @@
         "node": ">= 0.12"
       }
     },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true
+    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -2720,6 +2888,21 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/get-symbol-description": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
@@ -2964,16 +3147,16 @@
       }
     },
     "node_modules/https-proxy-agent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
-      "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dev": true,
       "dependencies": {
-        "agent-base": "5",
+        "agent-base": "6",
         "debug": "4"
       },
       "engines": {
-        "node": ">= 6.0.0"
+        "node": ">= 6"
       }
     },
     "node_modules/iconv-lite": {
@@ -2988,6 +3171,26 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/ignore": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
@@ -3077,6 +3280,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
     "node_modules/is-bigint": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
@@ -3419,12 +3628,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -3443,6 +3646,12 @@
       "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==",
       "dev": true
     },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
     "node_modules/js-yaml": {
       "version": "3.13.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
@@ -3511,6 +3720,12 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
     "node_modules/json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
@@ -3691,18 +3906,6 @@
         "node": ">=8.6"
       }
     },
-    "node_modules/mime": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
-      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
-      "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
     "node_modules/mime-db": {
       "version": "1.50.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz",
@@ -3742,6 +3945,12 @@
       "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
+    "node_modules/mitt": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz",
+      "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==",
+      "dev": true
+    },
     "node_modules/mkdirp": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
@@ -3754,6 +3963,12 @@
         "mkdirp": "bin/cmd.js"
       }
     },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "dev": true
+    },
     "node_modules/mocha": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz",
@@ -3903,6 +4118,48 @@
         "semver": "^5.7.0"
       }
     },
+    "node_modules/node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dev": true,
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/node-fetch/node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "dev": true
+    },
+    "node_modules/node-fetch/node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "dev": true
+    },
+    "node_modules/node-fetch/node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dev": true,
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "node_modules/node-modules-regexp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
@@ -4099,6 +4356,24 @@
         "node": ">=6"
       }
     },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/parse5": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
@@ -4141,7 +4416,7 @@
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
       "dev": true
     },
     "node_modules/performance-now": {
@@ -4200,12 +4475,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
     "node_modules/progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -4227,6 +4496,16 @@
       "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==",
       "dev": true
     },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
     "node_modules/punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -4237,36 +4516,257 @@
       }
     },
     "node_modules/puppeteer": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-2.1.1.tgz",
-      "integrity": "sha512-LWzaDVQkk1EPiuYeTOj+CZRIjda4k2s5w4MK4xoH2+kgWV/SDlkYHmxatDdtYrciHUKSXTsGgPgPP8ILVdBsxg==",
+      "version": "19.8.5",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-19.8.5.tgz",
+      "integrity": "sha512-WSjouU7eux6cwBMEz4A7mDRVZWTQQTDXrb1R6AhKDdeEgpiBBkAzcAusPhILxiJOKj60rULZpWuCZ7HZIO6GTA==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@types/mime-types": "^2.1.0",
-        "debug": "^4.1.0",
-        "extract-zip": "^1.6.6",
-        "https-proxy-agent": "^4.0.0",
-        "mime": "^2.0.3",
-        "mime-types": "^2.1.25",
-        "progress": "^2.0.1",
-        "proxy-from-env": "^1.0.0",
-        "rimraf": "^2.6.1",
-        "ws": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=8.16.0"
+        "@puppeteer/browsers": "0.4.0",
+        "cosmiconfig": "8.1.3",
+        "https-proxy-agent": "5.0.1",
+        "progress": "2.0.3",
+        "proxy-from-env": "1.1.0",
+        "puppeteer-core": "19.8.5"
       }
     },
-    "node_modules/puppeteer/node_modules/ws": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-      "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
+    "node_modules/puppeteer/node_modules/@puppeteer/browsers": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-0.4.0.tgz",
+      "integrity": "sha512-3iB5pWn9Sr55PKKwqFWSWjLsTKCOEhKNI+uV3BZesgXuA3IhsX8I3hW0HI+3ksMIPkh2mVYzKSpvgq3oicjG2Q==",
       "dev": true,
       "dependencies": {
-        "async-limiter": "~1.0.0"
-      }
-    },
+        "debug": "4.3.4",
+        "extract-zip": "2.0.1",
+        "https-proxy-agent": "5.0.1",
+        "progress": "2.0.3",
+        "proxy-from-env": "1.1.0",
+        "tar-fs": "2.1.1",
+        "unbzip2-stream": "1.4.3",
+        "yargs": "17.7.1"
+      },
+      "bin": {
+        "browsers": "lib/cjs/main-cli.js"
+      },
+      "engines": {
+        "node": ">=14.1.0"
+      },
+      "peerDependencies": {
+        "typescript": ">= 4.7.4"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/puppeteer/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/puppeteer/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/puppeteer/node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/puppeteer/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/puppeteer/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/puppeteer/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/puppeteer/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/puppeteer/node_modules/puppeteer-core": {
+      "version": "19.8.5",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.8.5.tgz",
+      "integrity": "sha512-zoGhim/oBQbkND6h4Xz4X7l5DkWVH9wH7z0mVty5qa/c0P1Yad47t/npVtt2xS10BiQwzztWKx7Pa2nJ5yykdw==",
+      "dev": true,
+      "dependencies": {
+        "@puppeteer/browsers": "0.4.0",
+        "chromium-bidi": "0.4.6",
+        "cross-fetch": "3.1.5",
+        "debug": "4.3.4",
+        "devtools-protocol": "0.0.1107588",
+        "extract-zip": "2.0.1",
+        "https-proxy-agent": "5.0.1",
+        "proxy-from-env": "1.1.0",
+        "tar-fs": "2.1.1",
+        "unbzip2-stream": "1.4.3",
+        "ws": "8.13.0"
+      },
+      "engines": {
+        "node": ">=14.14.0"
+      },
+      "peerDependencies": {
+        "typescript": ">= 4.7.4"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/puppeteer/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/puppeteer/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/puppeteer/node_modules/typescript": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
+      "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=12.20"
+      }
+    },
+    "node_modules/puppeteer/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/puppeteer/node_modules/ws": {
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/puppeteer/node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/puppeteer/node_modules/yargs": {
+      "version": "17.7.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
+      "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/qs": {
       "version": "6.5.3",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
@@ -4297,18 +4797,17 @@
       ]
     },
     "node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dev": true,
       "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
       }
     },
     "node_modules/readdirp": {
@@ -4492,18 +4991,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
     "node_modules/rollup": {
       "version": "1.27.14",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.27.14.tgz",
@@ -4554,10 +5041,24 @@
       }
     },
     "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
     },
     "node_modules/safe-regex-test": {
       "version": "1.0.0",
@@ -4708,12 +5209,12 @@
       }
     },
     "node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "dev": true,
       "dependencies": {
-        "safe-buffer": "~5.1.0"
+        "safe-buffer": "~5.2.0"
       }
     },
     "node_modules/string-width": {
@@ -4857,6 +5358,34 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
       "dev": true
     },
+    "node_modules/tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "node_modules/tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dev": true,
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -4884,6 +5413,12 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "dev": true
+    },
     "node_modules/tiny-glob": {
       "version": "0.2.9",
       "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz",
@@ -5016,12 +5551,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
     "node_modules/typescript": {
       "version": "3.9.10",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
@@ -5050,6 +5579,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/unbzip2-stream": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.2.1",
+        "through": "^2.3.8"
+      }
+    },
     "node_modules/uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -5075,7 +5614,7 @@
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
     "node_modules/uuid": {
@@ -5351,6 +5890,15 @@
         "yargs-parser": "^13.1.2"
       }
     },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/yargs-unparser": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
@@ -5378,7 +5926,7 @@
     "node_modules/yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
       "dev": true,
       "dependencies": {
         "buffer-crc32": "~0.2.3",
@@ -5409,6 +5957,32 @@
         "sourcemap-codec": "1.4.8"
       }
     },
+    "@babel/code-frame": {
+      "version": "7.21.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz",
+      "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.18.6"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "dev": true
+    },
+    "@babel/highlight": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
     "@eslint/eslintrc": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz",
@@ -5759,12 +6333,6 @@
       "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
       "dev": true
     },
-    "@types/mime-types": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz",
-      "integrity": "sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==",
-      "dev": true
-    },
     "@types/mocha": {
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz",
@@ -5786,6 +6354,16 @@
         "@types/node": "*"
       }
     },
+    "@types/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@typescript-eslint/eslint-plugin": {
       "version": "5.29.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.29.0.tgz",
@@ -5984,10 +6562,13 @@
       }
     },
     "agent-base": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
-      "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==",
-      "dev": true
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "requires": {
+        "debug": "4"
+      }
     },
     "ajv": {
       "version": "6.12.6",
@@ -6114,12 +6695,6 @@
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
       "dev": true
     },
-    "async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
-      "dev": true
-    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -6159,6 +6734,12 @@
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
       "dev": true
     },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -6174,6 +6755,17 @@
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true
     },
+    "bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dev": true,
+      "requires": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -6205,10 +6797,20 @@
       "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
       "dev": true
     },
+    "buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
     "buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
       "dev": true
     },
     "buffer-from": {
@@ -6289,6 +6891,21 @@
         "readdirp": "~3.2.0"
       }
     },
+    "chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "chromium-bidi": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.6.tgz",
+      "integrity": "sha512-TQOkWRaLI/IWvoP8XC+7jO4uHTIiAUiklXU1T0qszlUFEai9LgKXIBXy3pOS3EnQZ3bQtMbKUPkug0fTAEHCSw==",
+      "dev": true,
+      "requires": {
+        "mitt": "3.0.0"
+      }
+    },
     "cliui": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@@ -6349,24 +6966,50 @@
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
       "dev": true
     },
+    "cosmiconfig": {
+      "version": "8.1.3",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
+      "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==",
+      "dev": true,
+      "requires": {
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "dev": true
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "dev": true,
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        }
+      }
+    },
+    "cross-fetch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
+      "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+      "dev": true,
+      "requires": {
+        "node-fetch": "2.6.7"
+      }
+    },
     "css-tree": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
@@ -6506,6 +7149,12 @@
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
       "dev": true
     },
+    "devtools-protocol": {
+      "version": "0.0.1107588",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1107588.tgz",
+      "integrity": "sha512-yIR+pG9x65Xko7bErCUSQaDLrO/P1p3JUzEk7JCU4DowPcGHkTGUGQapcfcLc4qj0UaALwZ+cr0riFgiqpixcg==",
+      "dev": true
+    },
     "diff": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
@@ -6555,6 +7204,24 @@
       "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
       "dev": true
     },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
     "es-abstract": {
       "version": "1.20.4",
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
@@ -6645,6 +7312,12 @@
         "is-symbol": "^1.0.2"
       }
     },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
+    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -7196,32 +7869,15 @@
       "dev": true
     },
     "extract-zip": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
-      "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
       "dev": true,
       "requires": {
-        "concat-stream": "^1.6.2",
-        "debug": "^2.6.9",
-        "mkdirp": "^0.5.4",
+        "@types/yauzl": "^2.9.1",
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
         "yauzl": "^2.10.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
       }
     },
     "extsprintf": {
@@ -7273,7 +7929,7 @@
     "fd-slicer": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
       "dev": true,
       "requires": {
         "pend": "~1.2.0"
@@ -7368,6 +8024,12 @@
         "mime-types": "^2.1.12"
       }
     },
+    "fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -7428,6 +8090,15 @@
         "has-symbols": "^1.0.3"
       }
     },
+    "get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
     "get-symbol-description": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
@@ -7605,12 +8276,12 @@
       }
     },
     "https-proxy-agent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
-      "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dev": true,
       "requires": {
-        "agent-base": "5",
+        "agent-base": "6",
         "debug": "4"
       }
     },
@@ -7623,6 +8294,12 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true
+    },
     "ignore": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
@@ -7688,6 +8365,12 @@
         "has-tostringtag": "^1.0.0"
       }
     },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
     "is-bigint": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
@@ -7911,12 +8594,6 @@
         "get-intrinsic": "^1.1.1"
       }
     },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -7935,6 +8612,12 @@
       "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==",
       "dev": true
     },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
     "js-yaml": {
       "version": "3.13.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
@@ -7993,6 +8676,12 @@
         }
       }
     },
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
     "json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
@@ -8143,12 +8832,6 @@
         "picomatch": "^2.3.1"
       }
     },
-    "mime": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
-      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
-      "dev": true
-    },
     "mime-db": {
       "version": "1.50.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz",
@@ -8179,6 +8862,12 @@
       "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
+    "mitt": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz",
+      "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==",
+      "dev": true
+    },
     "mkdirp": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
@@ -8188,6 +8877,12 @@
         "minimist": "^1.2.5"
       }
     },
+    "mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "dev": true
+    },
     "mocha": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz",
@@ -8315,6 +9010,39 @@
         "semver": "^5.7.0"
       }
     },
+    "node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dev": true,
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      },
+      "dependencies": {
+        "tr46": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+          "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+          "dev": true
+        },
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+          "dev": true
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+          "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+          "dev": true,
+          "requires": {
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
+          }
+        }
+      }
+    },
     "node-modules-regexp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
@@ -8457,6 +9185,18 @@
         "callsites": "^3.0.0"
       }
     },
+    "parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      }
+    },
     "parse5": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
@@ -8490,7 +9230,7 @@
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
       "dev": true
     },
     "performance-now": {
@@ -8537,12 +9277,6 @@
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
       "dev": true
     },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
     "progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -8561,6 +9295,16 @@
       "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==",
       "dev": true
     },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -8568,30 +9312,172 @@
       "dev": true
     },
     "puppeteer": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-2.1.1.tgz",
-      "integrity": "sha512-LWzaDVQkk1EPiuYeTOj+CZRIjda4k2s5w4MK4xoH2+kgWV/SDlkYHmxatDdtYrciHUKSXTsGgPgPP8ILVdBsxg==",
+      "version": "19.8.5",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-19.8.5.tgz",
+      "integrity": "sha512-WSjouU7eux6cwBMEz4A7mDRVZWTQQTDXrb1R6AhKDdeEgpiBBkAzcAusPhILxiJOKj60rULZpWuCZ7HZIO6GTA==",
       "dev": true,
       "requires": {
-        "@types/mime-types": "^2.1.0",
-        "debug": "^4.1.0",
-        "extract-zip": "^1.6.6",
-        "https-proxy-agent": "^4.0.0",
-        "mime": "^2.0.3",
-        "mime-types": "^2.1.25",
-        "progress": "^2.0.1",
-        "proxy-from-env": "^1.0.0",
-        "rimraf": "^2.6.1",
-        "ws": "^6.1.0"
+        "@puppeteer/browsers": "0.4.0",
+        "cosmiconfig": "8.1.3",
+        "https-proxy-agent": "5.0.1",
+        "progress": "2.0.3",
+        "proxy-from-env": "1.1.0",
+        "puppeteer-core": "19.8.5"
       },
       "dependencies": {
+        "@puppeteer/browsers": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-0.4.0.tgz",
+          "integrity": "sha512-3iB5pWn9Sr55PKKwqFWSWjLsTKCOEhKNI+uV3BZesgXuA3IhsX8I3hW0HI+3ksMIPkh2mVYzKSpvgq3oicjG2Q==",
+          "dev": true,
+          "requires": {
+            "debug": "4.3.4",
+            "extract-zip": "2.0.1",
+            "https-proxy-agent": "5.0.1",
+            "progress": "2.0.3",
+            "proxy-from-env": "1.1.0",
+            "tar-fs": "2.1.1",
+            "unbzip2-stream": "1.4.3",
+            "yargs": "17.7.1"
+          }
+        },
+        "ansi-regex": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "cliui": {
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+          "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.1",
+            "wrap-ansi": "^7.0.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "puppeteer-core": {
+          "version": "19.8.5",
+          "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.8.5.tgz",
+          "integrity": "sha512-zoGhim/oBQbkND6h4Xz4X7l5DkWVH9wH7z0mVty5qa/c0P1Yad47t/npVtt2xS10BiQwzztWKx7Pa2nJ5yykdw==",
+          "dev": true,
+          "requires": {
+            "@puppeteer/browsers": "0.4.0",
+            "chromium-bidi": "0.4.6",
+            "cross-fetch": "3.1.5",
+            "debug": "4.3.4",
+            "devtools-protocol": "0.0.1107588",
+            "extract-zip": "2.0.1",
+            "https-proxy-agent": "5.0.1",
+            "proxy-from-env": "1.1.0",
+            "tar-fs": "2.1.1",
+            "unbzip2-stream": "1.4.3",
+            "ws": "8.13.0"
+          }
+        },
+        "string-width": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
+        },
+        "typescript": {
+          "version": "5.0.4",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
+          "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
+          "dev": true,
+          "optional": true,
+          "peer": true
+        },
+        "wrap-ansi": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
         "ws": {
-          "version": "6.2.2",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
-          "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
+          "version": "8.13.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+          "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+          "dev": true,
+          "requires": {}
+        },
+        "y18n": {
+          "version": "5.0.8",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+          "dev": true
+        },
+        "yargs": {
+          "version": "17.7.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
+          "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
           "dev": true,
           "requires": {
-            "async-limiter": "~1.0.0"
+            "cliui": "^8.0.1",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.3",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^21.1.1"
           }
         }
       }
@@ -8609,18 +9495,14 @@
       "dev": true
     },
     "readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dev": true,
       "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
       }
     },
     "readdirp": {
@@ -8762,15 +9644,6 @@
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "dev": true
     },
-    "rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
     "rollup": {
       "version": "1.27.14",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.27.14.tgz",
@@ -8800,9 +9673,9 @@
       }
     },
     "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
       "dev": true
     },
     "safe-regex-test": {
@@ -8926,12 +9799,12 @@
       "dev": true
     },
     "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "dev": true,
       "requires": {
-        "safe-buffer": "~5.1.0"
+        "safe-buffer": "~5.2.0"
       }
     },
     "string-width": {
@@ -9037,6 +9910,31 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
       "dev": true
     },
+    "tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "dev": true,
+      "requires": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dev": true,
+      "requires": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      }
+    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -9061,6 +9959,12 @@
         "thenify": ">= 3.1.0 < 4"
       }
     },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "dev": true
+    },
     "tiny-glob": {
       "version": "0.2.9",
       "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz",
@@ -9171,12 +10075,6 @@
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true
     },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
     "typescript": {
       "version": "3.9.10",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
@@ -9195,6 +10093,16 @@
         "which-boxed-primitive": "^1.0.2"
       }
     },
+    "unbzip2-stream": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
+      "dev": true,
+      "requires": {
+        "buffer": "^5.2.1",
+        "through": "^2.3.8"
+      }
+    },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -9220,7 +10128,7 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
     "uuid": {
@@ -9471,6 +10379,12 @@
         }
       }
     },
+    "yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true
+    },
     "yargs-unparser": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
@@ -9485,7 +10399,7 @@
     "yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
       "dev": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
diff --git a/package.json b/package.json
index 25aafb817a..80a6be1276 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "magic-string": "^0.30.0",
     "mocha": "^7.0.0",
     "periscopic": "^3.1.0",
-    "puppeteer": "^2.0.0",
+    "puppeteer": "^19.8.5",
     "rollup": "^1.27.14",
     "source-map": "^0.7.4",
     "source-map-support": "^0.5.21",
diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index 0f1faa8f5e..cefebfcff3 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -765,20 +765,33 @@ export default class ElementWrapper extends Wrapper {
 		`);
 
 		binding_group.events.forEach(name => {
-			const resizeListenerFunctions = {
-				elementresize: 'add_iframe_resize_listener',
-				elementresizecontentbox: 'resize_observer_content_box.observe',
-				elementresizeborderbox: 'resize_observer_border_box.observe',
-				elementresizedevicepixelcontentbox: 'resize_observer_device_pixel_content_box.observe'
-			};
-
-			if (name in resizeListenerFunctions) {
+			if (['elementresize', 'elementresizecontentbox', 'elementresizeborderbox', 'elementresizedevicepixelcontentbox'].indexOf(name) !== -1) {
 				const resize_listener = block.get_unique_name(`${this.var.name}_resize_listener`);
 				block.add_variable(resize_listener);
 
-				block.chunks.mount.push(
-					b`${resize_listener} = @${resizeListenerFunctions[name]}(${this.var}, ${callee}.bind(${this.var}));`
-				);
+				// Can't dynamically do `@fn[name]`, code-red doesn't know how to resolve it
+				switch (name) {
+					case 'elementresize':
+						block.chunks.mount.push(
+							b`${resize_listener} = @add_iframe_resize_listener(${this.var}, ${callee}.bind(${this.var}));`
+						);
+						break;
+					case 'elementresizecontentbox':
+						block.chunks.mount.push(
+							b`${resize_listener} = @resize_observer_content_box.observe(${this.var}, ${callee}.bind(${this.var}));`
+						);
+						break;
+					case 'elementresizeborderbox':
+						block.chunks.mount.push(
+							b`${resize_listener} = @resize_observer_border_box.observe(${this.var}, ${callee}.bind(${this.var}));`
+						);
+						break;
+					case 'elementresizedevicepixelcontentbox':
+						block.chunks.mount.push(
+							b`${resize_listener} = @resize_observer_device_pixel_content_box.observe(${this.var}, ${callee}.bind(${this.var}));`
+						);
+						break;
+				}
 
 				block.chunks.destroy.push(
 					b`${resize_listener}();`
diff --git a/src/runtime/internal/ResizeObserverSingleton.ts b/src/runtime/internal/ResizeObserverSingleton.ts
index 6d1e5b567b..773f68e4ff 100644
--- a/src/runtime/internal/ResizeObserverSingleton.ts
+++ b/src/runtime/internal/ResizeObserverSingleton.ts
@@ -1,3 +1,5 @@
+import { globals } from './globals';
+
 /**
  * Resize observer singleton.
  * One listener per element only!
@@ -15,19 +17,19 @@ export class ResizeObserverSingleton {
 		};
 	}
 
-	static readonly entries: WeakMap<Element, ResizeObserverEntry> = 'WeakMap' in globalThis ? new WeakMap() : undefined;
-
-	private readonly _listeners: WeakMap<Element, Listener> = 'WeakMap' in globalThis ? new WeakMap() : undefined;
+	private readonly _listeners: WeakMap<Element, Listener> = 'WeakMap' in globals ? new WeakMap() : undefined;
 	private _observer?: ResizeObserver;
 	private _getObserver() {
 		return this._observer ?? (this._observer = new ResizeObserver((entries) => {
 			for (const entry of entries) {
-				ResizeObserverSingleton.entries.set(entry.target, entry);
+				(ResizeObserverSingleton as any).entries.set(entry.target, entry);
 				this._listeners.get(entry.target)?.(entry);
 			}
 		}));
 	}
 }
+// Needs to be written like this to pass the tree-shake-test
+(ResizeObserverSingleton as any).entries = 'WeakMap' in globals ? new WeakMap() : undefined;
 
 type Listener = (entry: ResizeObserverEntry)=>any;
 
diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index 4ffa9e4742..c025313c15 100644
--- a/src/runtime/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -747,9 +747,9 @@ export function add_iframe_resize_listener(node: HTMLElement, fn: () => void) {
 	};
 }
 
-export const resize_observer_content_box = new ResizeObserverSingleton({ box: 'content-box' });
-export const resize_observer_border_box = new ResizeObserverSingleton({ box: 'border-box' });
-export const resize_observer_device_pixel_content_box = new ResizeObserverSingleton({ box: 'device-pixel-content-box' });
+export const resize_observer_content_box = /* @__PURE__ */ new ResizeObserverSingleton({ box: 'content-box' });
+export const resize_observer_border_box = /* @__PURE__ */ new ResizeObserverSingleton({ box: 'border-box' });
+export const resize_observer_device_pixel_content_box = /* @__PURE__ */ new ResizeObserverSingleton({ box: 'device-pixel-content-box' });
 export { ResizeObserverSingleton };
 
 export function toggle_class(element, name, toggle) {
diff --git a/test/js/samples/bind-width-height/expected.js b/test/js/samples/bind-width-height/expected.js
index 8966e57c9c..287c1b95b8 100644
--- a/test/js/samples/bind-width-height/expected.js
+++ b/test/js/samples/bind-width-height/expected.js
@@ -1,8 +1,8 @@
 /* generated by Svelte vX.Y.Z */
 import {
 	SvelteComponent,
+	add_iframe_resize_listener,
 	add_render_callback,
-	add_resize_listener,
 	detach,
 	element,
 	init,
@@ -23,7 +23,7 @@ function create_fragment(ctx) {
 		},
 		m(target, anchor) {
 			insert(target, div, anchor);
-			div_resize_listener = add_resize_listener(div, /*div_elementresize_handler*/ ctx[2].bind(div));
+			div_resize_listener = add_iframe_resize_listener(div, /*div_elementresize_handler*/ ctx[2].bind(div));
 		},
 		p: noop,
 		i: noop,
diff --git a/test/js/samples/video-bindings/expected.js b/test/js/samples/video-bindings/expected.js
index fe30240bfc..4ef1c2f7d8 100644
--- a/test/js/samples/video-bindings/expected.js
+++ b/test/js/samples/video-bindings/expected.js
@@ -1,8 +1,8 @@
 /* generated by Svelte vX.Y.Z */
 import {
 	SvelteComponent,
+	add_iframe_resize_listener,
 	add_render_callback,
-	add_resize_listener,
 	detach,
 	element,
 	init,
@@ -42,7 +42,7 @@ function create_fragment(ctx) {
 		},
 		m(target, anchor) {
 			insert(target, video, anchor);
-			video_resize_listener = add_resize_listener(video, /*video_elementresize_handler*/ ctx[7].bind(video));
+			video_resize_listener = add_iframe_resize_listener(video, /*video_elementresize_handler*/ ctx[7].bind(video));
 
 			if (!mounted) {
 				dispose = [

From eedacc9ac156b208a8adfe5206a440a43bdc0410 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Wed, 12 Apr 2023 00:00:19 -0700
Subject: [PATCH 100/110] chore: simplify Svelte 4 CI (#8487)

---
 .github/workflows/ci.yml | 42 ----------------------------------------
 package.json             |  2 +-
 scripts/skip_in_ci.js    |  7 -------
 3 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 scripts/skip_in_ci.js

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e2d708fd51..0a4d83558f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,42 +6,7 @@ on:
 permissions:
   contents: read # to fetch code (actions/checkout)
 jobs:
-  Setup:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: npm
-      - run: npm install
-        env:
-          SKIP_PREPARE: true
-      - run: npm run build
-        env:
-          PUBLISH: true
-      - name: Upload build assets
-        id: upload-artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: build-assets
-          path: |
-            index.*
-            compiler.*
-            ssr.*
-            action/
-            animate/
-            easing/
-            internal/
-            motion/
-            store/
-            transition/
-            types/
   Tests:
-    needs: Setup
     runs-on: ${{ matrix.os }}
     timeout-minutes: 15
     strategy:
@@ -54,14 +19,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
           cache: npm
-      - name: Download build assets
-        uses: actions/download-artifact@v3
-        id: download-artifact
-        with:
-          name: build-assets
       - run: npm install
-        env:
-          SKIP_PREPARE: true
       - run: npm run test:integration
         env:
           CI: true
diff --git a/package.json b/package.json
index 80a6be1276..79f0f7c784 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
     "test:unit": "mocha --config .mocharc.unit.js --exit",
     "quicktest": "mocha --exit",
     "build": "rollup -c && npm run tsd",
-    "prepare": "node scripts/skip_in_ci.js npm run build",
+    "prepare": "npm run build",
     "dev": "rollup -cw",
     "posttest": "agadoo internal/index.mjs",
     "prepublishOnly": "node check_publish_env.js && npm run lint && npm run build && npm test",
diff --git a/scripts/skip_in_ci.js b/scripts/skip_in_ci.js
deleted file mode 100644
index d845d000ab..0000000000
--- a/scripts/skip_in_ci.js
+++ /dev/null
@@ -1,7 +0,0 @@
-if (process.env.SKIP_PREPARE) {
-  console.log('Skipped "prepare" script');
-} else {
-	const { execSync } = require("child_process");
-	const command = process.argv.slice(2).join(" ");
-	execSync(command, { stdio: "inherit" });
-}

From abd760ddacc32b2d1de6790d50db511b4b2b0b06 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Wed, 12 Apr 2023 00:01:01 -0700
Subject: [PATCH 101/110] chore: bump engines field (#8489)

---
 CHANGELOG.md | 6 +++++-
 package.json | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea9545aa65..44b50c6951 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Svelte changelog
 
-## Unreleased
+## Unreleased (4.0)
+
+* Minimum supported Node version is now Node 14
+
+## Unreleased (3.0)
 
 * Handle `width`/`height` attributes when spreading ([#6752](https://github.com/sveltejs/svelte/issues/6752))
 * Add support for resize observer bindings (`<div bind:contentRect|contentBoxSize|borderBoxSize|devicePixelContentBoxSize>`) ([#8022](https://github.com/sveltejs/svelte/pull/8022))
diff --git a/package.json b/package.json
index 79f0f7c784..814320d091 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     }
   },
   "engines": {
-    "node": ">= 8"
+    "node": ">= 14"
   },
   "types": "types/runtime/index.d.ts",
   "scripts": {

From 1e2cfa47d6046d3b883dcc598f3272624e3efe8b Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Wed, 12 Apr 2023 00:26:50 -0700
Subject: [PATCH 102/110] chore: upgrade to TypeScript 5 (#8488)

- upgrade to TypeScript 5
- upgrade @ampproject/remapping
- remove obsolete workarounds

---------

Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 generate-type-definitions.js             |  23 ----
 package-lock.json                        | 147 +++++++++++++++--------
 package.json                             |   6 +-
 src/compiler/compile/Component.ts        |   2 +-
 src/compiler/compile/render_dom/index.ts |   2 +-
 src/compiler/index.ts                    |   2 +-
 src/compiler/preprocess/index.ts         |   4 +-
 src/compiler/utils/mapped_code.ts        |   6 +-
 src/runtime/index.ts                     |   2 +-
 src/runtime/motion/tweened.ts            |   2 +-
 tsconfig.json                            |   2 +-
 11 files changed, 113 insertions(+), 85 deletions(-)
 delete mode 100644 generate-type-definitions.js

diff --git a/generate-type-definitions.js b/generate-type-definitions.js
deleted file mode 100644
index 4a36330b13..0000000000
--- a/generate-type-definitions.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// This script generates the TypeScript definitions
-
-const { execSync } = require('child_process');
-const { readFileSync, writeFileSync } = require('fs');
-
-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.
-
-function modify(path, modifyFn) {
-    const content = readFileSync(path, 'utf8');
-    writeFileSync(path, modifyFn(content));
-}
-
-modify(
-    'types/runtime/index.d.ts',
-    content => content.replace('SvelteComponentTyped', 'SvelteComponentTyped, ComponentType, ComponentConstructorOptions, ComponentProps, ComponentEvents')
-);
-modify(
-    'types/compiler/index.d.ts',
-    content => content + '\nexport { CompileOptions, ModuleFormat, EnableSourcemap, CssHashGetter } from "./interfaces"'
-);
diff --git a/package-lock.json b/package-lock.json
index 25a17760c1..b42190d19d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "3.58.0",
       "license": "MIT",
       "devDependencies": {
-        "@ampproject/remapping": "^0.3.0",
+        "@ampproject/remapping": "^2.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.15",
         "@rollup/plugin-commonjs": "^11.0.0",
         "@rollup/plugin-json": "^6.0.0",
@@ -47,7 +47,7 @@
         "source-map-support": "^0.5.21",
         "tiny-glob": "^0.2.9",
         "tslib": "^2.5.0",
-        "typescript": "^3.7.5",
+        "typescript": "^5.0.4",
         "util": "^0.12.5"
       },
       "engines": {
@@ -55,13 +55,13 @@
       }
     },
     "node_modules/@ampproject/remapping": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-0.3.0.tgz",
-      "integrity": "sha512-dqmASpaTCavldZqwdEpokgG4yOXmEiEGPP3ATTsBbdXXSKf6kx8jt2fPcKhodABdZlYe82OehR2oFK1y9gwZxw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
+      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/resolve-uri": "1.0.0",
-        "sourcemap-codec": "1.4.8"
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
       },
       "engines": {
         "node": ">=6.0.0"
@@ -209,10 +209,33 @@
       "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
       "dev": true
     },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-1.0.0.tgz",
-      "integrity": "sha512-9oLAnygRMi8Q5QkYEU4XWK04B+nuoXoxjRvRxgjuChkLZFBja0YPSgdZ7dZtwhncLBcQe/I/E+fLuk5qxcYVJA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
       "dev": true,
       "engines": {
         "node": ">=6.0.0"
@@ -224,6 +247,22 @@
       "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
       "dev": true
     },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.18",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
+      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
+      }
+    },
+    "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "dev": true
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -4687,21 +4726,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/puppeteer/node_modules/typescript": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
-      "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=12.20"
-      }
-    },
     "node_modules/puppeteer/node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -5552,16 +5576,16 @@
       }
     },
     "node_modules/typescript": {
-      "version": "3.9.10",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
-      "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
+      "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=4.2.0"
+        "node": ">=12.20"
       }
     },
     "node_modules/unbox-primitive": {
@@ -5948,13 +5972,13 @@
   },
   "dependencies": {
     "@ampproject/remapping": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-0.3.0.tgz",
-      "integrity": "sha512-dqmASpaTCavldZqwdEpokgG4yOXmEiEGPP3ATTsBbdXXSKf6kx8jt2fPcKhodABdZlYe82OehR2oFK1y9gwZxw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
+      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
       "dev": true,
       "requires": {
-        "@jridgewell/resolve-uri": "1.0.0",
-        "sourcemap-codec": "1.4.8"
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
       }
     },
     "@babel/code-frame": {
@@ -6066,10 +6090,27 @@
       "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
       "dev": true
     },
+    "@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
     "@jridgewell/resolve-uri": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-1.0.0.tgz",
-      "integrity": "sha512-9oLAnygRMi8Q5QkYEU4XWK04B+nuoXoxjRvRxgjuChkLZFBja0YPSgdZ7dZtwhncLBcQe/I/E+fLuk5qxcYVJA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "dev": true
+    },
+    "@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
       "dev": true
     },
     "@jridgewell/sourcemap-codec": {
@@ -6078,6 +6119,24 @@
       "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
       "dev": true
     },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.18",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
+      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
+      },
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": {
+          "version": "1.4.14",
+          "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+          "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+          "dev": true
+        }
+      }
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -9433,14 +9492,6 @@
             "ansi-regex": "^5.0.1"
           }
         },
-        "typescript": {
-          "version": "5.0.4",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
-          "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
-          "dev": true,
-          "optional": true,
-          "peer": true
-        },
         "wrap-ansi": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -10076,9 +10127,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "3.9.10",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
-      "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
+      "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
       "dev": true
     },
     "unbox-primitive": {
diff --git a/package.json b/package.json
index 814320d091..2a407f3d42 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "dev": "rollup -cw",
     "posttest": "agadoo internal/index.mjs",
     "prepublishOnly": "node check_publish_env.js && npm run lint && npm run build && npm test",
-    "tsd": "node ./generate-type-definitions.js",
+    "tsd": "tsc -p src/compiler --emitDeclarationOnly && tsc -p src/runtime --emitDeclarationOnly",
     "lint": "eslint \"{src,test}/**/*.{ts,js}\" --cache"
   },
   "repository": {
@@ -119,7 +119,7 @@
   },
   "homepage": "https://svelte.dev",
   "devDependencies": {
-    "@ampproject/remapping": "^0.3.0",
+    "@ampproject/remapping": "^2.2.1",
     "@jridgewell/sourcemap-codec": "^1.4.15",
     "@rollup/plugin-commonjs": "^11.0.0",
     "@rollup/plugin-json": "^6.0.0",
@@ -157,7 +157,7 @@
     "source-map-support": "^0.5.21",
     "tiny-glob": "^0.2.9",
     "tslib": "^2.5.0",
-    "typescript": "^3.7.5",
+    "typescript": "^5.0.4",
     "util": "^0.12.5"
   }
 }
diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts
index e87cf6218a..9fb41b6108 100644
--- a/src/compiler/compile/Component.ts
+++ b/src/compiler/compile/Component.ts
@@ -1,3 +1,4 @@
+import type { DecodedSourceMap, RawSourceMap } from '@ampproject/remapping';
 import { walk } from 'estree-walker';
 import { getLocator } from 'locate-character';
 import Stats from '../Stats';
@@ -32,7 +33,6 @@ import { print, b } from 'code-red';
 import { is_reserved_keyword } from './utils/reserved_keywords';
 import { apply_preprocessor_sourcemap } from '../utils/mapped_code';
 import Element from './nodes/Element';
-import { DecodedSourceMap, RawSourceMap } from '@ampproject/remapping/dist/types/types';
 import { clone } from '../utils/clone';
 import compiler_warnings from './compiler_warnings';
 import compiler_errors from './compiler_errors';
diff --git a/src/compiler/compile/render_dom/index.ts b/src/compiler/compile/render_dom/index.ts
index 58b7a8317b..879bc93a95 100644
--- a/src/compiler/compile/render_dom/index.ts
+++ b/src/compiler/compile/render_dom/index.ts
@@ -1,3 +1,4 @@
+import type { RawSourceMap, DecodedSourceMap } from '@ampproject/remapping';
 import { b, x, p } from 'code-red';
 import Component from '../Component';
 import Renderer from './Renderer';
@@ -8,7 +9,6 @@ import { invalidate } from './invalidate';
 import Block from './Block';
 import { ImportDeclaration, ClassDeclaration, FunctionExpression, Node, Statement, ObjectExpression, Expression } from 'estree';
 import { apply_preprocessor_sourcemap } from '../../utils/mapped_code';
-import { RawSourceMap, DecodedSourceMap } from '@ampproject/remapping/dist/types/types';
 import { flatten } from '../../utils/flatten';
 import check_enable_sourcemap from '../utils/check_enable_sourcemap';
 import { push_array } from '../../utils/push_array';
diff --git a/src/compiler/index.ts b/src/compiler/index.ts
index 76eb45d37f..6ab256c59b 100644
--- a/src/compiler/index.ts
+++ b/src/compiler/index.ts
@@ -2,6 +2,6 @@ export { default as compile } from './compile/index';
 export { default as parse } from './parse/index';
 export { default as preprocess } from './preprocess/index';
 export { walk } from 'estree-walker';
+export type { CompileOptions, ModuleFormat, EnableSourcemap, CssHashGetter } from './interfaces';
 
 export const VERSION = '__VERSION__';
-// additional exports added through generate-type-definitions.js
diff --git a/src/compiler/preprocess/index.ts b/src/compiler/preprocess/index.ts
index 45885afa96..0301eba8c7 100644
--- a/src/compiler/preprocess/index.ts
+++ b/src/compiler/preprocess/index.ts
@@ -1,4 +1,4 @@
-import { RawSourceMap, DecodedSourceMap } from '@ampproject/remapping/dist/types/types';
+import type { RawSourceMap, DecodedSourceMap } from '@ampproject/remapping';
 import { getLocator } from 'locate-character';
 import { MappedCode, SourceLocation, parse_attached_sourcemap, sourcemap_add_offset, combine_sourcemaps } from '../utils/mapped_code';
 import { decode_map } from './decode_sourcemap';
@@ -57,7 +57,7 @@ class PreprocessResult implements Source {
 
 	to_processed(): Processed {
 		// Combine all the source maps for each preprocessor function into one
-		const map: RawSourceMap = combine_sourcemaps(this.file_basename, this.sourcemap_list);
+		const map = combine_sourcemaps(this.file_basename, this.sourcemap_list);
 
 		return {
 			// TODO return separated output, in future version where svelte.compile supports it:
diff --git a/src/compiler/utils/mapped_code.ts b/src/compiler/utils/mapped_code.ts
index bf7b016fc5..0bc4b97cb6 100644
--- a/src/compiler/utils/mapped_code.ts
+++ b/src/compiler/utils/mapped_code.ts
@@ -1,4 +1,4 @@
-import { DecodedSourceMap, RawSourceMap, SourceMapLoader } from '@ampproject/remapping/dist/types/types';
+import type { DecodedSourceMap, RawSourceMap, SourceMapLoader } from '@ampproject/remapping';
 import remapping from '@ampproject/remapping';
 import { SourceMap } from 'magic-string';
 import { Source, Processed } from '../preprocess/types';
@@ -216,11 +216,11 @@ export class MappedCode {
 export function combine_sourcemaps(
 	filename: string,
 	sourcemap_list: Array<DecodedSourceMap | RawSourceMap>
-): RawSourceMap {
+) {
 	if (sourcemap_list.length == 0) return null;
 
 	let map_idx = 1;
-	const map: RawSourceMap =
+	const map =
 		sourcemap_list.slice(0, -1)
 			.find(m => m.sources.length !== 1) === undefined
 
diff --git a/src/runtime/index.ts b/src/runtime/index.ts
index 2029f67a04..3bce9163ca 100644
--- a/src/runtime/index.ts
+++ b/src/runtime/index.ts
@@ -13,5 +13,5 @@ export {
 	createEventDispatcher,
 	SvelteComponentDev as SvelteComponent,
 	SvelteComponentTyped
-	// additional exports added through generate-type-definitions.js
 } from 'svelte/internal';
+export type { ComponentType, ComponentConstructorOptions, ComponentProps, ComponentEvents } from 'svelte/internal';
diff --git a/src/runtime/motion/tweened.ts b/src/runtime/motion/tweened.ts
index f0ede9add7..fd83fcb5f5 100644
--- a/src/runtime/motion/tweened.ts
+++ b/src/runtime/motion/tweened.ts
@@ -122,7 +122,7 @@ export function tweened<T>(value?: T, defaults: Options<T> = {}): Tweened<T> {
 
 			const elapsed = now - start;
 
-			if (elapsed > duration) {
+			if (elapsed > <number> duration) {
 				store.set(value = new_value);
 				return false;
 			}
diff --git a/tsconfig.json b/tsconfig.json
index f2e055a2a9..39532bfe48 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,7 +6,7 @@
 
 		// target node v8+ (https://node.green/)
 		// the only missing feature is Array.prototype.values
-		"lib": ["es2017"],
+		"lib": ["es2017", "DOM"],
 		"target": "es2017",
 
 		"declaration": true,

From 42e0f7d5f852c3c95778b8bc547901bb670ae871 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Wed, 12 Apr 2023 00:34:25 -0700
Subject: [PATCH 103/110] chore: Svelte 4 dependency upgrades (#8486)

---
 package-lock.json                             | 3853 +++++++----------
 package.json                                  |   16 +-
 .../compile/nodes/shared/Expression.ts        |    2 +-
 3 files changed, 1467 insertions(+), 2404 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b42190d19d..7c607ef5a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,26 +20,26 @@
         "@rollup/plugin-virtual": "^3.0.1",
         "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.8.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",
+        "@types/mocha": "^10.0.1",
+        "@types/node": "^14.14.31",
+        "@typescript-eslint/eslint-plugin": "^5.58.0",
+        "@typescript-eslint/parser": "^5.58.0",
+        "acorn": "^8.8.2",
         "agadoo": "^3.0.0",
         "aria-query": "^5.1.3",
         "axobject-query": "^3.1.1",
         "code-red": "^1.0.0",
         "css-tree": "^2.3.1",
         "eslint": "^8.35.0",
-        "eslint-plugin-import": "^2.27.0",
+        "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-svelte3": "^4.0.0",
         "estree-walker": "^3.0.3",
         "is-reference": "^3.0.1",
-        "jsdom": "^15.2.1",
+        "jsdom": "^21.1.1",
         "kleur": "^4.1.5",
         "locate-character": "^2.0.5",
         "magic-string": "^0.30.0",
-        "mocha": "^7.0.0",
+        "mocha": "^10.2.0",
         "periscopic": "^3.1.0",
         "puppeteer": "^19.8.5",
         "rollup": "^1.27.14",
@@ -51,7 +51,7 @@
         "util": "^0.12.5"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 14"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -102,6 +102,42 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
+      "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz",
+      "integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz",
@@ -125,24 +161,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "node_modules/@eslint/eslintrc/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -578,6 +596,15 @@
       "resolved": "git+ssh://git@github.com/sveltejs/eslint-config.git#31fd4faeea88990069502460b023698b1c9c2d13",
       "dev": true
     },
+    "node_modules/@tootallnate/once": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/@types/aria-query": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz",
@@ -603,15 +630,15 @@
       "dev": true
     },
     "node_modules/@types/mocha": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz",
-      "integrity": "sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.1.tgz",
+      "integrity": "sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q==",
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "8.10.53",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.53.tgz",
-      "integrity": "sha512-aOmXdv1a1/vYUn1OT1CED8ftbkmmYbKhKGSyMDeJiidLvKRKvZUQOdXwG/wcNY7T1Qb0XTlVdiYjIq00U7pLrQ==",
+      "version": "14.18.42",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.42.tgz",
+      "integrity": "sha512-xefu+RBie4xWlK8hwAzGh3npDz/4VhF6icY/shU+zv/1fNn+ZVG7T7CRwe9LId9sAYRPxI+59QBPuKL3WpyGRg==",
       "dev": true
     },
     "node_modules/@types/resolve": {
@@ -623,6 +650,12 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/semver": {
+      "version": "7.3.13",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
+      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
+      "dev": true
+    },
     "node_modules/@types/yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
@@ -634,18 +667,19 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.29.0.tgz",
-      "integrity": "sha512-kgTsISt9pM53yRFQmLZ4npj99yGl3x3Pl7z4eA66OuTzAGC4bQB5H5fuLwPnqTKU3yyrrg4MIhjF17UYnL4c0w==",
+      "version": "5.58.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.58.0.tgz",
+      "integrity": "sha512-vxHvLhH0qgBd3/tW6/VccptSfc8FxPQIkmNTVLWcCOVqSBvqpnKkBTYrhcGlXfSnd78azwe+PsjYFj0X34/njA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.29.0",
-        "@typescript-eslint/type-utils": "5.29.0",
-        "@typescript-eslint/utils": "5.29.0",
+        "@eslint-community/regexpp": "^4.4.0",
+        "@typescript-eslint/scope-manager": "5.58.0",
+        "@typescript-eslint/type-utils": "5.58.0",
+        "@typescript-eslint/utils": "5.58.0",
         "debug": "^4.3.4",
-        "functional-red-black-tree": "^1.0.1",
+        "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
-        "regexpp": "^3.2.0",
+        "natural-compare-lite": "^1.4.0",
         "semver": "^7.3.7",
         "tsutils": "^3.21.0"
       },
@@ -666,30 +700,15 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
-      "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"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@typescript-eslint/parser": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.29.0.tgz",
-      "integrity": "sha512-ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw==",
+      "version": "5.58.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.58.0.tgz",
+      "integrity": "sha512-ixaM3gRtlfrKzP8N6lRhBbjTow1t6ztfBvQNGuRM8qH1bjFFXIJ35XY+FC0RRBKn3C6cT+7VW1y8tNm7DwPHDQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.29.0",
-        "@typescript-eslint/types": "5.29.0",
-        "@typescript-eslint/typescript-estree": "5.29.0",
+        "@typescript-eslint/scope-manager": "5.58.0",
+        "@typescript-eslint/types": "5.58.0",
+        "@typescript-eslint/typescript-estree": "5.58.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -709,13 +728,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.29.0.tgz",
-      "integrity": "sha512-etbXUT0FygFi2ihcxDZjz21LtC+Eps9V2xVx09zFoN44RRHPrkMflidGMI+2dUs821zR1tDS6Oc9IXxIjOUZwA==",
+      "version": "5.58.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.58.0.tgz",
+      "integrity": "sha512-b+w8ypN5CFvrXWQb9Ow9T4/6LC2MikNf1viLkYTiTbkQl46CnR69w7lajz1icW0TBsYmlpg+mRzFJ4LEJ8X9NA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.29.0",
-        "@typescript-eslint/visitor-keys": "5.29.0"
+        "@typescript-eslint/types": "5.58.0",
+        "@typescript-eslint/visitor-keys": "5.58.0"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -726,12 +745,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "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==",
+      "version": "5.58.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.58.0.tgz",
+      "integrity": "sha512-FF5vP/SKAFJ+LmR9PENql7fQVVgGDOS+dq3j+cKl9iW/9VuZC/8CFmzIP0DLKXfWKpRHawJiG70rVH+xZZbp8w==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/utils": "5.29.0",
+        "@typescript-eslint/typescript-estree": "5.58.0",
+        "@typescript-eslint/utils": "5.58.0",
         "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       },
@@ -752,9 +772,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.29.0.tgz",
-      "integrity": "sha512-X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg==",
+      "version": "5.58.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.58.0.tgz",
+      "integrity": "sha512-JYV4eITHPzVQMnHZcYJXl2ZloC7thuUHrcUmxtzvItyKPvQ50kb9QXBkgNAt90OYMqwaodQh2kHutWZl1fc+1g==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -765,13 +785,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "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==",
+      "version": "5.58.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.58.0.tgz",
+      "integrity": "sha512-cRACvGTodA+UxnYM2uwA2KCwRL7VAzo45syNysqlMyNyjw0Z35Icc9ihPJZjIYuA5bXJYiJ2YGUB59BqlOZT1Q==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.29.0",
-        "@typescript-eslint/visitor-keys": "5.29.0",
+        "@typescript-eslint/types": "5.58.0",
+        "@typescript-eslint/visitor-keys": "5.58.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -791,33 +811,20 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "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"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@typescript-eslint/utils": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.29.0.tgz",
-      "integrity": "sha512-3Eos6uP1nyLOBayc/VUdKZikV90HahXE5Dx9L5YlSd/7ylQPXhLk1BYb29SDgnBnTp+jmSZUU0QxUiyHgW4p7A==",
+      "version": "5.58.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.58.0.tgz",
+      "integrity": "sha512-gAmLOTFXMXOC+zP1fsqm3VceKSBQJNzV385Ok3+yzlavNHZoedajjS4UyS21gabJYcobuigQPs/z71A9MdJFqQ==",
       "dev": true,
       "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
         "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.29.0",
-        "@typescript-eslint/types": "5.29.0",
-        "@typescript-eslint/typescript-estree": "5.29.0",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.58.0",
+        "@typescript-eslint/types": "5.58.0",
+        "@typescript-eslint/typescript-estree": "5.58.0",
         "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0"
+        "semver": "^7.3.7"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -831,12 +838,12 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.29.0.tgz",
-      "integrity": "sha512-Hpb/mCWsjILvikMQoZIE3voc9wtQcS0A9FUw3h8bhr9UxBdtI/tw1ZDZUOXHXLOVMedKCH5NxyzATwnU78bWCQ==",
+      "version": "5.58.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.58.0.tgz",
+      "integrity": "sha512-/fBraTlPj0jwdyTwLyrRTxv/3lnU2H96pNTVM6z3esTWLtA5MZ9ghSMJ7Rb+TtUAdtEw9EyJzJ0EydIMKxQ9gA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/types": "5.58.0",
         "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
@@ -848,18 +855,21 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
+      "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/abab": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz",
-      "integrity": "sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
       "dev": true
     },
     "node_modules/acorn": {
@@ -875,25 +885,13 @@
       }
     },
     "node_modules/acorn-globals": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.3.tgz",
-      "integrity": "sha512-vkR40VwS2SYO98AIeFvzWWh+xyc2qi9s7OoXSFEGIP/rOJKzjnhykaZJNnHdoq4BL2gGxI5EZOU16z896EYnOQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
+      "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
       "dev": true,
       "dependencies": {
-        "acorn": "^6.0.1",
-        "acorn-walk": "^6.0.1"
-      }
-    },
-    "node_modules/acorn-globals/node_modules/acorn": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-      "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
+        "acorn": "^8.1.0",
+        "acorn-walk": "^8.0.2"
       }
     },
     "node_modules/acorn-jsx": {
@@ -906,9 +904,9 @@
       }
     },
     "node_modules/acorn-walk": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
-      "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
       "dev": true,
       "engines": {
         "node": ">=0.4.0"
@@ -928,20 +926,6 @@
         "agadoo": "cli.js"
       }
     },
-    "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",
@@ -986,15 +970,24 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/ansi-regex": {
+    "node_modules/ansi-colors": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
       "dev": true,
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/ansi-styles": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -1014,9 +1007,9 @@
       "dev": true
     },
     "node_modules/anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
@@ -1027,13 +1020,10 @@
       }
     },
     "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
     },
     "node_modules/aria-query": {
       "version": "5.1.3",
@@ -1044,12 +1034,6 @@
         "deep-equal": "^2.0.5"
       }
     },
-    "node_modules/array-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
-      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
-      "dev": true
-    },
     "node_modules/array-includes": {
       "version": "3.1.6",
       "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
@@ -1114,28 +1098,10 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true
     },
     "node_modules/available-typed-arrays": {
@@ -1150,21 +1116,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/aws4": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
-      "dev": true
-    },
     "node_modules/axobject-query": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz",
@@ -1200,15 +1151,6 @@
         }
       ]
     },
-    "node_modules/bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
-      "dependencies": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
     "node_modules/binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -1251,12 +1193,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/browser-process-hrtime": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz",
-      "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==",
-      "dev": true
-    },
     "node_modules/browser-stdout": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
@@ -1334,20 +1270,17 @@
       }
     },
     "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
       "dev": true,
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
-    },
     "node_modules/chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -1375,24 +1308,30 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz",
-      "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
       "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
       "dependencies": {
-        "anymatch": "~3.1.1",
+        "anymatch": "~3.1.2",
         "braces": "~3.0.2",
-        "glob-parent": "~5.1.0",
+        "glob-parent": "~5.1.2",
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
-        "readdirp": "~3.2.0"
+        "readdirp": "~3.6.0"
       },
       "engines": {
         "node": ">= 8.10.0"
       },
       "optionalDependencies": {
-        "fsevents": "~2.1.1"
+        "fsevents": "~2.3.2"
       }
     },
     "node_modules/chownr": {
@@ -1414,14 +1353,14 @@
       }
     },
     "node_modules/cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "dev": true,
       "dependencies": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
       }
     },
     "node_modules/code-red": {
@@ -1479,12 +1418,6 @@
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
-    "node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
-    },
     "node_modules/cosmiconfig": {
       "version": "8.1.3",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
@@ -1503,24 +1436,6 @@
         "url": "https://github.com/sponsors/d-fischer"
       }
     },
-    "node_modules/cosmiconfig/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/cosmiconfig/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "node_modules/cross-fetch": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
@@ -1543,51 +1458,30 @@
         "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
       }
     },
-    "node_modules/cssom": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
-      "dev": true
-    },
     "node_modules/cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz",
+      "integrity": "sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==",
       "dev": true,
       "dependencies": {
-        "cssom": "~0.3.6"
+        "rrweb-cssom": "^0.6.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=14"
       }
     },
-    "node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-      "dev": true
-    },
-    "node_modules/dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+    "node_modules/data-urls": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz",
+      "integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==",
       "dev": true,
       "dependencies": {
-        "assert-plus": "^1.0.0"
+        "abab": "^2.0.6",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^12.0.0"
       },
       "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/data-urls": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
-      "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.0",
-        "whatwg-mimetype": "^2.2.0",
-        "whatwg-url": "^7.0.0"
+        "node": ">=14"
       }
     },
     "node_modules/debug": {
@@ -1608,14 +1502,23 @@
       }
     },
     "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/decimal.js": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
+      "dev": true
+    },
     "node_modules/deep-equal": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz",
@@ -1700,7 +1603,7 @@
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
       "engines": {
         "node": ">=0.4.0"
@@ -1713,9 +1616,9 @@
       "dev": true
     },
     "node_modules/diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
       "dev": true,
       "engines": {
         "node": ">=0.3.1"
@@ -1746,28 +1649,21 @@
       }
     },
     "node_modules/domexception": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
-      "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
-      "dev": true,
-      "dependencies": {
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "node_modules/ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
       "dev": true,
       "dependencies": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
     },
     "node_modules/end-of-stream": {
@@ -1779,6 +1675,18 @@
         "once": "^1.4.0"
       }
     },
+    "node_modules/entities": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
+      "integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
     "node_modules/error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -1911,13 +1819,13 @@
       }
     },
     "node_modules/escodegen": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz",
-      "integrity": "sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
       "dev": true,
       "dependencies": {
-        "esprima": "^3.1.3",
-        "estraverse": "^4.2.0",
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
         "esutils": "^2.0.2",
         "optionator": "^0.8.1"
       },
@@ -1926,23 +1834,19 @@
         "esgenerate": "bin/esgenerate.js"
       },
       "engines": {
-        "node": ">=4.0"
+        "node": ">=6.0"
       },
       "optionalDependencies": {
         "source-map": "~0.6.1"
       }
     },
-    "node_modules/escodegen/node_modules/esprima": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-      "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+    "node_modules/escodegen/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
       "engines": {
-        "node": ">=4"
+        "node": ">=4.0"
       }
     },
     "node_modules/escodegen/node_modules/source-map": {
@@ -2179,15 +2083,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/eslint/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/eslint/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -2200,12 +2095,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/eslint/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
     "node_modules/eslint/node_modules/chalk": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
@@ -2294,22 +2183,6 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/eslint/node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/eslint/node_modules/glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -2331,18 +2204,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/eslint/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "node_modules/eslint/node_modules/levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -2356,21 +2217,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/eslint/node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/eslint/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -2400,45 +2246,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/eslint/node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/eslint/node_modules/path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -2478,18 +2285,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/eslint/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/eslint/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -2611,12 +2406,12 @@
       }
     },
     "node_modules/estraverse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4.0"
       }
     },
     "node_modules/estree-walker": {
@@ -2637,12 +2432,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
     "node_modules/extract-zip": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
@@ -2663,15 +2452,6 @@
         "@types/yauzl": "^2.9.1"
       }
     },
-    "node_modules/extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ]
-    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -2749,25 +2529,26 @@
       }
     },
     "node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
       "dependencies": {
-        "locate-path": "^3.0.0"
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/flat": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz",
-      "integrity": "sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
       "dev": true,
-      "dependencies": {
-        "is-buffer": "~2.0.3"
-      },
       "bin": {
         "flat": "cli.js"
       }
@@ -2815,27 +2596,18 @@
         "is-callable": "^1.1.3"
       }
     },
-    "node_modules/forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
       "dev": true,
       "dependencies": {
         "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
+        "combined-stream": "^1.0.8",
         "mime-types": "^2.1.12"
       },
       "engines": {
-        "node": ">= 0.12"
+        "node": ">= 6"
       }
     },
     "node_modules/fs-constants": {
@@ -2851,10 +2623,9 @@
       "dev": true
     },
     "node_modules/fsevents": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-      "deprecated": "\"Please update to latest v2.3 or v2.2\"",
+      "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,
@@ -2889,12 +2660,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "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": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
-      "dev": true
-    },
     "node_modules/functions-have-names": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
@@ -2958,19 +2723,10 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "node_modules/glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
       "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
@@ -3052,37 +2808,6 @@
       "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
       "dev": true
     },
-    "node_modules/growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.x"
-      }
-    },
-    "node_modules/har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.5.5",
-        "har-schema": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -3162,27 +2887,29 @@
       }
     },
     "node_modules/html-encoding-sniffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
-      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
       "dev": true,
       "dependencies": {
-        "whatwg-encoding": "^1.0.1"
+        "whatwg-encoding": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+    "node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
       "dev": true,
       "dependencies": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
       },
       "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
+        "node": ">= 6"
       }
     },
     "node_modules/https-proxy-agent": {
@@ -3199,12 +2926,12 @@
       }
     },
     "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
       "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
@@ -3294,15 +3021,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/is-arguments": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
@@ -3365,29 +3083,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-buffer": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
-      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/is-callable": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
@@ -3437,12 +3132,12 @@
       }
     },
     "node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/is-generator-function": {
@@ -3532,6 +3227,21 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-plain-obj": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "dev": true
+    },
     "node_modules/is-reference": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.1.tgz",
@@ -3627,11 +3337,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/is-weakmap": {
       "version": "2.0.1",
@@ -3673,12 +3389,6 @@
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
       "dev": true
     },
-    "node_modules/isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
-    },
     "node_modules/js-sdsl": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz",
@@ -3692,71 +3402,60 @@
       "dev": true
     },
     "node_modules/js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
       "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "argparse": "^2.0.1"
       },
       "bin": {
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
-    },
     "node_modules/jsdom": {
-      "version": "15.2.1",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz",
-      "integrity": "sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.0",
-        "acorn": "^7.1.0",
-        "acorn-globals": "^4.3.2",
-        "array-equal": "^1.0.0",
-        "cssom": "^0.4.1",
-        "cssstyle": "^2.0.0",
-        "data-urls": "^1.1.0",
-        "domexception": "^1.0.1",
-        "escodegen": "^1.11.1",
-        "html-encoding-sniffer": "^1.0.2",
-        "nwsapi": "^2.2.0",
-        "parse5": "5.1.0",
-        "pn": "^1.1.0",
-        "request": "^2.88.0",
-        "request-promise-native": "^1.0.7",
-        "saxes": "^3.1.9",
-        "symbol-tree": "^3.2.2",
-        "tough-cookie": "^3.0.1",
-        "w3c-hr-time": "^1.0.1",
-        "w3c-xmlserializer": "^1.1.2",
-        "webidl-conversions": "^4.0.2",
-        "whatwg-encoding": "^1.0.5",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^7.0.0",
-        "ws": "^7.0.0",
-        "xml-name-validator": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jsdom/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-21.1.1.tgz",
+      "integrity": "sha512-Jjgdmw48RKcdAIQyUD1UdBh2ecH7VqwaXPN3ehoZN6MqgVbMn+lRm1aAT1AsdJRAJpwfa4IpwgzySn61h2qu3w==",
       "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
+      "dependencies": {
+        "abab": "^2.0.6",
+        "acorn": "^8.8.2",
+        "acorn-globals": "^7.0.0",
+        "cssstyle": "^3.0.0",
+        "data-urls": "^4.0.0",
+        "decimal.js": "^10.4.3",
+        "domexception": "^4.0.0",
+        "escodegen": "^2.0.0",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.1",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.2",
+        "parse5": "^7.1.2",
+        "rrweb-cssom": "^0.6.0",
+        "saxes": "^6.0.0",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.1.2",
+        "w3c-xmlserializer": "^4.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^2.0.0",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^12.0.1",
+        "ws": "^8.13.0",
+        "xml-name-validator": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
       }
     },
     "node_modules/json-parse-even-better-errors": {
@@ -3765,12 +3464,6 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "node_modules/json-schema": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-      "dev": true
-    },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -3783,12 +3476,6 @@
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
-    },
     "node_modules/json5": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
@@ -3801,25 +3488,10 @@
         "json5": "lib/cli.js"
       }
     },
-    "node_modules/jsprim": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
-      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
-      "dev": true,
-      "dependencies": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.4.0",
-        "verror": "1.10.0"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/kleur": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
-      "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
+    "node_modules/kleur": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
+      "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -3828,7 +3500,7 @@
     "node_modules/levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
       "dev": true,
       "dependencies": {
         "prelude-ls": "~1.1.2",
@@ -3851,43 +3523,107 @@
       "dev": true
     },
     "node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
       "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
+        "p-locate": "^5.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "node_modules/lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-symbols/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/log-symbols/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/log-symbols": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
-      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+    "node_modules/log-symbols/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/log-symbols/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
-        "chalk": "^2.4.2"
+        "has-flag": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
@@ -3946,21 +3682,21 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.50.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz",
-      "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
-      "version": "2.1.33",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz",
-      "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
       "dependencies": {
-        "mime-db": "1.50.0"
+        "mime-db": "1.52.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -3990,18 +3726,6 @@
       "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==",
       "dev": true
     },
-    "node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
     "node_modules/mkdirp-classic": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
@@ -4009,119 +3733,91 @@
       "dev": true
     },
     "node_modules/mocha": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz",
-      "integrity": "sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz",
+      "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==",
       "dev": true,
       "dependencies": {
-        "ansi-colors": "3.2.3",
+        "ansi-colors": "4.1.1",
         "browser-stdout": "1.3.1",
-        "chokidar": "3.3.0",
-        "debug": "3.2.6",
-        "diff": "3.5.0",
-        "escape-string-regexp": "1.0.5",
-        "find-up": "3.0.0",
-        "glob": "7.1.3",
-        "growl": "1.10.5",
+        "chokidar": "3.5.3",
+        "debug": "4.3.4",
+        "diff": "5.0.0",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.2.0",
         "he": "1.2.0",
-        "js-yaml": "3.13.1",
-        "log-symbols": "3.0.0",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.5",
-        "ms": "2.1.1",
-        "node-environment-flags": "1.0.6",
-        "object.assign": "4.1.0",
-        "strip-json-comments": "2.0.1",
-        "supports-color": "6.0.0",
-        "which": "1.3.1",
-        "wide-align": "1.1.3",
-        "yargs": "13.3.2",
-        "yargs-parser": "13.1.2",
-        "yargs-unparser": "1.6.0"
+        "js-yaml": "4.1.0",
+        "log-symbols": "4.1.0",
+        "minimatch": "5.0.1",
+        "ms": "2.1.3",
+        "nanoid": "3.3.3",
+        "serialize-javascript": "6.0.0",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "8.1.1",
+        "workerpool": "6.2.1",
+        "yargs": "16.2.0",
+        "yargs-parser": "20.2.4",
+        "yargs-unparser": "2.0.0"
       },
       "bin": {
         "_mocha": "bin/_mocha",
-        "mocha": "bin/mocha"
+        "mocha": "bin/mocha.js"
       },
       "engines": {
-        "node": ">= 8.10.0"
+        "node": ">= 14.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/mochajs"
       }
     },
-    "node_modules/mocha/node_modules/ansi-colors": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
-      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+    "node_modules/mocha/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
-      "engines": {
-        "node": ">=6"
+      "dependencies": {
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/mocha/node_modules/debug": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
+    "node_modules/mocha/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/mocha/node_modules/glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+    "node_modules/mocha/node_modules/minimatch": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
       "dev": true,
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": "*"
+        "node": ">=10"
       }
     },
     "node_modules/mocha/node_modules/ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
-    "node_modules/mocha/node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/mocha/node_modules/supports-color": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
-      "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/mocha/node_modules/yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+      "version": "20.2.4",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
       "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/ms": {
@@ -4141,21 +3837,29 @@
         "thenify-all": "^1.0.0"
       }
     },
+    "node_modules/nanoid": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
+      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
+      "dev": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
-    "node_modules/node-environment-flags": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
-      "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==",
-      "dev": true,
-      "dependencies": {
-        "object.getownpropertydescriptors": "^2.0.3",
-        "semver": "^5.7.0"
-      }
+    "node_modules/natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "dev": true
     },
     "node_modules/node-fetch": {
       "version": "2.6.7",
@@ -4218,20 +3922,11 @@
       }
     },
     "node_modules/nwsapi": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.3.tgz",
+      "integrity": "sha512-jscxIO4/VKScHlbmFBdV1Z6LXnLO+ZR4VMtypudUdfwtKxUN3TQcNFIHLwKtrUbDyHN4/GycY9+oRGZ2XMXYPw==",
       "dev": true
     },
-    "node_modules/oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -4275,38 +3970,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz",
-      "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/object.values": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
@@ -4334,53 +3997,50 @@
       }
     },
     "node_modules/optionator": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
       "dev": true,
       "dependencies": {
         "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.4",
+        "fast-levenshtein": "~2.0.6",
         "levn": "~0.3.0",
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2",
-        "wordwrap": "~1.0.0"
+        "word-wrap": "~1.2.3"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "node_modules/p-limit": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
-      "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
       "dependencies": {
-        "p-try": "^2.0.0"
+        "yocto-queue": "^0.1.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
       "dependencies": {
-        "p-limit": "^2.0.0"
+        "p-limit": "^3.0.2"
       },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/parent-module": {
@@ -4414,18 +4074,24 @@
       }
     },
     "node_modules/parse5": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
-      "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==",
-      "dev": true
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "dev": true,
+      "dependencies": {
+        "entities": "^4.4.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
     },
     "node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/path-is-absolute": {
@@ -4458,12 +4124,6 @@
       "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
       "dev": true
     },
-    "node_modules/performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
-    },
     "node_modules/periscopic": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-3.1.0.tgz",
@@ -4499,16 +4159,10 @@
         "node": ">= 6"
       }
     },
-    "node_modules/pn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
-      "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
-      "dev": true
-    },
     "node_modules/prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
       "dev": true,
       "engines": {
         "node": ">= 0.8.0"
@@ -4530,9 +4184,9 @@
       "dev": true
     },
     "node_modules/psl": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz",
-      "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
       "dev": true
     },
     "node_modules/pump": {
@@ -4546,9 +4200,9 @@
       }
     },
     "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -4599,15 +4253,6 @@
         }
       }
     },
-    "node_modules/puppeteer/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/puppeteer/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -4655,21 +4300,6 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
-    "node_modules/puppeteer/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/puppeteer/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/puppeteer/node_modules/puppeteer-core": {
       "version": "19.8.5",
       "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.8.5.tgz",
@@ -4791,14 +4421,11 @@
         "node": ">=12"
       }
     },
-    "node_modules/qs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
     },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
@@ -4820,6 +4447,15 @@
         }
       ]
     },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
     "node_modules/readable-stream": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -4835,15 +4471,15 @@
       }
     },
     "node_modules/readdirp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz",
-      "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
       "dependencies": {
-        "picomatch": "^2.0.4"
+        "picomatch": "^2.2.1"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=8.10.0"
       }
     },
     "node_modules/regexp.prototype.flags": {
@@ -4875,95 +4511,6 @@
         "url": "https://github.com/sponsors/mysticatea"
       }
     },
-    "node_modules/request": {
-      "version": "2.88.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-      "dev": true,
-      "dependencies": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/request-promise-core": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz",
-      "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.11"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/request-promise-native": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz",
-      "integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==",
-      "dev": true,
-      "dependencies": {
-        "request-promise-core": "1.1.2",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
-      },
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/request-promise-native/node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dev": true,
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/request/node_modules/punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-      "dev": true
-    },
-    "node_modules/request/node_modules/tough-cookie": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-      "dev": true,
-      "dependencies": {
-        "psl": "^1.1.24",
-        "punycode": "^1.4.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -4973,10 +4520,10 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
       "dev": true
     },
     "node_modules/resolve": {
@@ -5041,6 +4588,12 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/rrweb-cssom": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
+      "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==",
+      "dev": true
+    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -5105,31 +4658,40 @@
       "dev": true
     },
     "node_modules/saxes": {
-      "version": "3.1.11",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz",
-      "integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
+      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
       "dev": true,
       "dependencies": {
-        "xmlchars": "^2.1.1"
+        "xmlchars": "^2.2.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=v12.22.7"
       }
     },
     "node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.4.0.tgz",
+      "integrity": "sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==",
       "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
       "bin": {
-        "semver": "bin/semver"
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
+    "node_modules/serialize-javascript": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "dev": true,
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
     },
     "node_modules/side-channel": {
       "version": "1.0.4",
@@ -5197,41 +4759,6 @@
       "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
       "dev": true
     },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "node_modules/sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dev": true,
-      "dependencies": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/stealthy-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -5242,17 +4769,17 @@
       }
     },
     "node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
       "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
     "node_modules/string.prototype.trimend": {
@@ -5284,15 +4811,15 @@
       }
     },
     "node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^4.1.0"
+        "ansi-regex": "^5.0.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
     "node_modules/strip-bom": {
@@ -5354,6 +4881,30 @@
         "node": "*"
       }
     },
+    "node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/supports-color/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
@@ -5466,26 +5017,30 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
+      "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
       "dev": true,
       "dependencies": {
-        "ip-regex": "^2.1.0",
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
       },
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/tr46": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
+      "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
       "dev": true,
       "dependencies": {
-        "punycode": "^2.1.0"
+        "punycode": "^2.3.0"
+      },
+      "engines": {
+        "node": ">=14"
       }
     },
     "node_modules/ts-interface-checker": {
@@ -5533,28 +5088,10 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
-    },
     "node_modules/type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
       "dev": true,
       "dependencies": {
         "prelude-ls": "~1.1.2"
@@ -5613,6 +5150,15 @@
         "through": "^2.3.8"
       }
     },
+    "node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
     "node_modules/uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -5622,6 +5168,16 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
     "node_modules/util": {
       "version": "0.12.5",
       "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
@@ -5641,91 +5197,59 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
-    "node_modules/uuid": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
-      "dev": true,
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
-    "node_modules/verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "node_modules/w3c-hr-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",
-      "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=",
-      "dev": true,
-      "dependencies": {
-        "browser-process-hrtime": "^0.1.2"
-      }
-    },
     "node_modules/w3c-xmlserializer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz",
-      "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
+      "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
       "dev": true,
       "dependencies": {
-        "domexception": "^1.0.1",
-        "webidl-conversions": "^4.0.2",
-        "xml-name-validator": "^3.0.0"
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
       }
     },
     "node_modules/webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
-      "dev": true
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/whatwg-encoding": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
       "dev": true,
       "dependencies": {
-        "iconv-lite": "0.4.24"
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/whatwg-mimetype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-      "dev": true
-    },
-    "node_modules/whatwg-url": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
-      "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
       "dev": true,
-      "dependencies": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^1.0.1",
-        "webidl-conversions": "^4.0.2"
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+    "node_modules/whatwg-url": {
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
+      "integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
       "dev": true,
       "dependencies": {
-        "isexe": "^2.0.0"
+        "tr46": "^4.1.1",
+        "webidl-conversions": "^7.0.0"
       },
-      "bin": {
-        "which": "bin/which"
+      "engines": {
+        "node": ">=14"
       }
     },
     "node_modules/which-boxed-primitive": {
@@ -5759,12 +5283,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
     "node_modules/which-typed-array": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz",
@@ -5785,78 +5303,71 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^1.0.2 || 2"
-      }
-    },
-    "node_modules/wide-align/node_modules/ansi-regex": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/wide-align/node_modules/string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
-      "dependencies": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
+    "node_modules/workerpool": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
+      "dev": true
     },
-    "node_modules/wide-align/node_modules/strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^3.0.0"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/wordwrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-      "dev": true
-    },
-    "node_modules/wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=7.0.0"
       }
     },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -5864,31 +5375,49 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "7.4.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
-      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
       "dev": true,
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
     "node_modules/xml-name-validator": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-      "dev": true
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/xmlchars": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.1.1.tgz",
-      "integrity": "sha512-7hew1RPJ1iIuje/Y01bGD/mXokXxegAgVS+e+E0wSi2ILHQkYAH1+JXARwTjZSM4Z4Z+c73aKspEcqj+zPPL/w==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
       "dev": true
     },
     "node_modules/y18n": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
-      "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
-      "dev": true
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
     },
     "node_modules/yallist": {
       "version": "4.0.0",
@@ -5897,21 +5426,21 @@
       "dev": true
     },
     "node_modules/yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
       "dev": true,
       "dependencies": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/yargs-parser": {
@@ -5924,27 +5453,27 @@
       }
     },
     "node_modules/yargs-unparser": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
-      "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
       "dev": true,
       "dependencies": {
-        "flat": "^4.1.0",
-        "lodash": "^4.17.15",
-        "yargs": "^13.3.0"
+        "camelcase": "^6.0.0",
+        "decamelize": "^4.0.0",
+        "flat": "^5.0.2",
+        "is-plain-obj": "^2.1.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
       }
     },
     "node_modules/yargs/node_modules/yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
       "dev": true,
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/yauzl": {
@@ -6007,6 +5536,29 @@
         "js-tokens": "^4.0.0"
       }
     },
+    "@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
+          "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
+          "dev": true
+        }
+      }
+    },
+    "@eslint-community/regexpp": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz",
+      "integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==",
+      "dev": true
+    },
     "@eslint/eslintrc": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz",
@@ -6024,21 +5576,6 @@
         "strip-json-comments": "^3.1.1"
       },
       "dependencies": {
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "dev": true,
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        },
         "minimatch": {
           "version": "3.1.2",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -6368,6 +5905,12 @@
       "dev": true,
       "from": "@sveltejs/eslint-config@github:sveltejs/eslint-config#v5.8.0"
     },
+    "@tootallnate/once": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "dev": true
+    },
     "@types/aria-query": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz",
@@ -6393,15 +5936,15 @@
       "dev": true
     },
     "@types/mocha": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz",
-      "integrity": "sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.1.tgz",
+      "integrity": "sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q==",
       "dev": true
     },
     "@types/node": {
-      "version": "8.10.53",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.53.tgz",
-      "integrity": "sha512-aOmXdv1a1/vYUn1OT1CED8ftbkmmYbKhKGSyMDeJiidLvKRKvZUQOdXwG/wcNY7T1Qb0XTlVdiYjIq00U7pLrQ==",
+      "version": "14.18.42",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.42.tgz",
+      "integrity": "sha512-xefu+RBie4xWlK8hwAzGh3npDz/4VhF6icY/shU+zv/1fNn+ZVG7T7CRwe9LId9sAYRPxI+59QBPuKL3WpyGRg==",
       "dev": true
     },
     "@types/resolve": {
@@ -6413,6 +5956,12 @@
         "@types/node": "*"
       }
     },
+    "@types/semver": {
+      "version": "7.3.13",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
+      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
+      "dev": true
+    },
     "@types/yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
@@ -6424,134 +5973,116 @@
       }
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.29.0.tgz",
-      "integrity": "sha512-kgTsISt9pM53yRFQmLZ4npj99yGl3x3Pl7z4eA66OuTzAGC4bQB5H5fuLwPnqTKU3yyrrg4MIhjF17UYnL4c0w==",
+      "version": "5.58.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.58.0.tgz",
+      "integrity": "sha512-vxHvLhH0qgBd3/tW6/VccptSfc8FxPQIkmNTVLWcCOVqSBvqpnKkBTYrhcGlXfSnd78azwe+PsjYFj0X34/njA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.29.0",
-        "@typescript-eslint/type-utils": "5.29.0",
-        "@typescript-eslint/utils": "5.29.0",
+        "@eslint-community/regexpp": "^4.4.0",
+        "@typescript-eslint/scope-manager": "5.58.0",
+        "@typescript-eslint/type-utils": "5.58.0",
+        "@typescript-eslint/utils": "5.58.0",
         "debug": "^4.3.4",
-        "functional-red-black-tree": "^1.0.1",
+        "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
-        "regexpp": "^3.2.0",
+        "natural-compare-lite": "^1.4.0",
         "semver": "^7.3.7",
         "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "semver": {
-          "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"
-          }
-        }
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.29.0.tgz",
-      "integrity": "sha512-ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw==",
+      "version": "5.58.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.58.0.tgz",
+      "integrity": "sha512-ixaM3gRtlfrKzP8N6lRhBbjTow1t6ztfBvQNGuRM8qH1bjFFXIJ35XY+FC0RRBKn3C6cT+7VW1y8tNm7DwPHDQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.29.0",
-        "@typescript-eslint/types": "5.29.0",
-        "@typescript-eslint/typescript-estree": "5.29.0",
+        "@typescript-eslint/scope-manager": "5.58.0",
+        "@typescript-eslint/types": "5.58.0",
+        "@typescript-eslint/typescript-estree": "5.58.0",
         "debug": "^4.3.4"
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.29.0.tgz",
-      "integrity": "sha512-etbXUT0FygFi2ihcxDZjz21LtC+Eps9V2xVx09zFoN44RRHPrkMflidGMI+2dUs821zR1tDS6Oc9IXxIjOUZwA==",
+      "version": "5.58.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.58.0.tgz",
+      "integrity": "sha512-b+w8ypN5CFvrXWQb9Ow9T4/6LC2MikNf1viLkYTiTbkQl46CnR69w7lajz1icW0TBsYmlpg+mRzFJ4LEJ8X9NA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.29.0",
-        "@typescript-eslint/visitor-keys": "5.29.0"
+        "@typescript-eslint/types": "5.58.0",
+        "@typescript-eslint/visitor-keys": "5.58.0"
       }
     },
     "@typescript-eslint/type-utils": {
-      "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==",
+      "version": "5.58.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.58.0.tgz",
+      "integrity": "sha512-FF5vP/SKAFJ+LmR9PENql7fQVVgGDOS+dq3j+cKl9iW/9VuZC/8CFmzIP0DLKXfWKpRHawJiG70rVH+xZZbp8w==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/utils": "5.29.0",
+        "@typescript-eslint/typescript-estree": "5.58.0",
+        "@typescript-eslint/utils": "5.58.0",
         "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.29.0.tgz",
-      "integrity": "sha512-X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg==",
+      "version": "5.58.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.58.0.tgz",
+      "integrity": "sha512-JYV4eITHPzVQMnHZcYJXl2ZloC7thuUHrcUmxtzvItyKPvQ50kb9QXBkgNAt90OYMqwaodQh2kHutWZl1fc+1g==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "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==",
+      "version": "5.58.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.58.0.tgz",
+      "integrity": "sha512-cRACvGTodA+UxnYM2uwA2KCwRL7VAzo45syNysqlMyNyjw0Z35Icc9ihPJZjIYuA5bXJYiJ2YGUB59BqlOZT1Q==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.29.0",
-        "@typescript-eslint/visitor-keys": "5.29.0",
+        "@typescript-eslint/types": "5.58.0",
+        "@typescript-eslint/visitor-keys": "5.58.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
         "semver": "^7.3.7",
         "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "semver": {
-          "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"
-          }
-        }
       }
     },
     "@typescript-eslint/utils": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.29.0.tgz",
-      "integrity": "sha512-3Eos6uP1nyLOBayc/VUdKZikV90HahXE5Dx9L5YlSd/7ylQPXhLk1BYb29SDgnBnTp+jmSZUU0QxUiyHgW4p7A==",
+      "version": "5.58.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.58.0.tgz",
+      "integrity": "sha512-gAmLOTFXMXOC+zP1fsqm3VceKSBQJNzV385Ok3+yzlavNHZoedajjS4UyS21gabJYcobuigQPs/z71A9MdJFqQ==",
       "dev": true,
       "requires": {
+        "@eslint-community/eslint-utils": "^4.2.0",
         "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.29.0",
-        "@typescript-eslint/types": "5.29.0",
-        "@typescript-eslint/typescript-estree": "5.29.0",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.58.0",
+        "@typescript-eslint/types": "5.58.0",
+        "@typescript-eslint/typescript-estree": "5.58.0",
         "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0"
+        "semver": "^7.3.7"
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.29.0.tgz",
-      "integrity": "sha512-Hpb/mCWsjILvikMQoZIE3voc9wtQcS0A9FUw3h8bhr9UxBdtI/tw1ZDZUOXHXLOVMedKCH5NxyzATwnU78bWCQ==",
+      "version": "5.58.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.58.0.tgz",
+      "integrity": "sha512-/fBraTlPj0jwdyTwLyrRTxv/3lnU2H96pNTVM6z3esTWLtA5MZ9ghSMJ7Rb+TtUAdtEw9EyJzJ0EydIMKxQ9gA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/types": "5.58.0",
         "eslint-visitor-keys": "^3.3.0"
       },
       "dependencies": {
         "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz",
+          "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==",
           "dev": true
         }
       }
     },
     "abab": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz",
-      "integrity": "sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
       "dev": true
     },
     "acorn": {
@@ -6561,21 +6092,13 @@
       "dev": true
     },
     "acorn-globals": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.3.tgz",
-      "integrity": "sha512-vkR40VwS2SYO98AIeFvzWWh+xyc2qi9s7OoXSFEGIP/rOJKzjnhykaZJNnHdoq4BL2gGxI5EZOU16z896EYnOQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
+      "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
       "dev": true,
       "requires": {
-        "acorn": "^6.0.1",
-        "acorn-walk": "^6.0.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
-          "dev": true
-        }
+        "acorn": "^8.1.0",
+        "acorn-walk": "^8.0.2"
       }
     },
     "acorn-jsx": {
@@ -6586,9 +6109,9 @@
       "requires": {}
     },
     "acorn-walk": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
-      "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
       "dev": true
     },
     "agadoo": {
@@ -6602,13 +6125,6 @@
         "rollup": "^3.5.0"
       },
       "dependencies": {
-        "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",
@@ -6641,10 +6157,16 @@
         "uri-js": "^4.2.2"
       }
     },
-    "ansi-regex": {
+    "ansi-colors": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true
     },
     "ansi-styles": {
@@ -6663,9 +6185,9 @@
       "dev": true
     },
     "anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
@@ -6673,13 +6195,10 @@
       }
     },
     "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
     },
     "aria-query": {
       "version": "5.1.3",
@@ -6690,12 +6209,6 @@
         "deep-equal": "^2.0.5"
       }
     },
-    "array-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
-      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
-      "dev": true
-    },
     "array-includes": {
       "version": "3.1.6",
       "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
@@ -6739,25 +6252,10 @@
         "es-shim-unscopables": "^1.0.0"
       }
     },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
-    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true
     },
     "available-typed-arrays": {
@@ -6766,18 +6264,6 @@
       "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
       "dev": true
     },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
-    },
-    "aws4": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
-      "dev": true
-    },
     "axobject-query": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz",
@@ -6799,15 +6285,6 @@
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
       "dev": true
     },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
     "binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -6844,12 +6321,6 @@
         "fill-range": "^7.0.1"
       }
     },
-    "browser-process-hrtime": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz",
-      "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==",
-      "dev": true
-    },
     "browser-stdout": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
@@ -6901,15 +6372,9 @@
       "dev": true
     },
     "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
       "dev": true
     },
     "chalk": {
@@ -6935,19 +6400,19 @@
       }
     },
     "chokidar": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz",
-      "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
       "dev": true,
       "requires": {
-        "anymatch": "~3.1.1",
+        "anymatch": "~3.1.2",
         "braces": "~3.0.2",
-        "fsevents": "~2.1.1",
-        "glob-parent": "~5.1.0",
+        "fsevents": "~2.3.2",
+        "glob-parent": "~5.1.2",
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
-        "readdirp": "~3.2.0"
+        "readdirp": "~3.6.0"
       }
     },
     "chownr": {
@@ -6966,14 +6431,14 @@
       }
     },
     "cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "dev": true,
       "requires": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
       }
     },
     "code-red": {
@@ -7025,12 +6490,6 @@
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
-    },
     "cosmiconfig": {
       "version": "8.1.3",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
@@ -7041,23 +6500,6 @@
         "js-yaml": "^4.1.0",
         "parse-json": "^5.0.0",
         "path-type": "^4.0.0"
-      },
-      "dependencies": {
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "dev": true,
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        }
       }
     },
     "cross-fetch": {
@@ -7079,47 +6521,24 @@
         "source-map-js": "^1.0.1"
       }
     },
-    "cssom": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
-      "dev": true
-    },
     "cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-      "dev": true,
-      "requires": {
-        "cssom": "~0.3.6"
-      },
-      "dependencies": {
-        "cssom": {
-          "version": "0.3.8",
-          "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-          "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-          "dev": true
-        }
-      }
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz",
+      "integrity": "sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0"
+        "rrweb-cssom": "^0.6.0"
       }
     },
     "data-urls": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
-      "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz",
+      "integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==",
       "dev": true,
       "requires": {
-        "abab": "^2.0.0",
-        "whatwg-mimetype": "^2.2.0",
-        "whatwg-url": "^7.0.0"
+        "abab": "^2.0.6",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^12.0.0"
       }
     },
     "debug": {
@@ -7132,9 +6551,15 @@
       }
     },
     "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+      "dev": true
+    },
+    "decimal.js": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
       "dev": true
     },
     "deep-equal": {
@@ -7205,7 +6630,7 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true
     },
     "devtools-protocol": {
@@ -7215,9 +6640,9 @@
       "dev": true
     },
     "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
+      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
       "dev": true
     },
     "dir-glob": {
@@ -7239,28 +6664,18 @@
       }
     },
     "domexception": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
-      "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
-      "dev": true,
-      "requires": {
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
       "dev": true,
       "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
+        "webidl-conversions": "^7.0.0"
       }
     },
     "emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
     },
     "end-of-stream": {
@@ -7272,6 +6687,12 @@
         "once": "^1.4.0"
       }
     },
+    "entities": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
+      "integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==",
+      "dev": true
+    },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -7384,22 +6805,22 @@
       "dev": true
     },
     "escodegen": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz",
-      "integrity": "sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
       "dev": true,
       "requires": {
-        "esprima": "^3.1.3",
-        "estraverse": "^4.2.0",
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
         "esutils": "^2.0.2",
         "optionator": "^0.8.1",
         "source-map": "~0.6.1"
       },
       "dependencies": {
-        "esprima": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
           "dev": true
         },
         "source-map": {
@@ -7459,12 +6880,6 @@
         "text-table": "^0.2.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -7474,12 +6889,6 @@
             "color-convert": "^2.0.1"
           }
         },
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
-        },
         "chalk": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
@@ -7544,16 +6953,6 @@
           "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
           "dev": true
         },
-        "find-up": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^6.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
         "glob-parent": {
           "version": "6.0.2",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -7569,32 +6968,14 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "dev": true,
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        },
         "levn": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-          "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-          "dev": true,
-          "requires": {
-            "prelude-ls": "^1.2.1",
-            "type-check": "~0.4.0"
-          }
-        },
-        "locate-path": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+          "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
           "dev": true,
           "requires": {
-            "p-locate": "^5.0.0"
+            "prelude-ls": "^1.2.1",
+            "type-check": "~0.4.0"
           }
         },
         "minimatch": {
@@ -7620,30 +7001,6 @@
             "word-wrap": "^1.2.3"
           }
         },
-        "p-limit": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-          "dev": true,
-          "requires": {
-            "yocto-queue": "^0.1.0"
-          }
-        },
-        "p-locate": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^3.0.2"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
         "path-key": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -7671,15 +7028,6 @@
           "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
           "dev": true
         },
-        "strip-ansi": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.1"
-          }
-        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -7901,9 +7249,9 @@
       }
     },
     "estraverse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true
     },
     "estree-walker": {
@@ -7921,12 +7269,6 @@
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true
     },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
     "extract-zip": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
@@ -7939,12 +7281,6 @@
         "yauzl": "^2.10.0"
       }
     },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
-    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -8013,22 +7349,20 @@
       }
     },
     "find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
       "requires": {
-        "locate-path": "^3.0.0"
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
       }
     },
     "flat": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.1.tgz",
-      "integrity": "sha512-FmTtBsHskrU6FJ2VxCnsDb84wu9zhmO3cUX2kGFb5tuwhfXxGciiT0oRY+cck35QmG+NmGh5eLz6lLCpWTqwpA==",
-      "dev": true,
-      "requires": {
-        "is-buffer": "~2.0.3"
-      }
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true
     },
     "flat-cache": {
       "version": "3.0.4",
@@ -8066,20 +7400,14 @@
         "is-callable": "^1.1.3"
       }
     },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
-    },
     "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
       "dev": true,
       "requires": {
         "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
+        "combined-stream": "^1.0.8",
         "mime-types": "^2.1.12"
       }
     },
@@ -8096,9 +7424,9 @@
       "dev": true
     },
     "fsevents": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "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
     },
@@ -8120,12 +7448,6 @@
         "functions-have-names": "^1.2.2"
       }
     },
-    "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": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
-      "dev": true
-    },
     "functions-have-names": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
@@ -8168,19 +7490,10 @@
         "get-intrinsic": "^1.1.1"
       }
     },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
       "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
@@ -8241,28 +7554,6 @@
       "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
       "dev": true
     },
-    "growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
-    },
-    "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.5.5",
-        "har-schema": "^2.0.0"
-      }
-    },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -8315,23 +7606,23 @@
       "dev": true
     },
     "html-encoding-sniffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
-      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
       "dev": true,
       "requires": {
-        "whatwg-encoding": "^1.0.1"
+        "whatwg-encoding": "^2.0.0"
       }
     },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+    "http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
       }
     },
     "https-proxy-agent": {
@@ -8345,12 +7636,12 @@
       }
     },
     "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
       "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
       }
     },
     "ieee754": {
@@ -8408,12 +7699,6 @@
         "side-channel": "^1.0.4"
       }
     },
-    "ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
-      "dev": true
-    },
     "is-arguments": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
@@ -8458,12 +7743,6 @@
         "has-tostringtag": "^1.0.0"
       }
     },
-    "is-buffer": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
-      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
-      "dev": true
-    },
     "is-callable": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
@@ -8495,9 +7774,9 @@
       "dev": true
     },
     "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true
     },
     "is-generator-function": {
@@ -8557,6 +7836,18 @@
       "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
       "dev": true
     },
+    "is-plain-obj": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "dev": true
+    },
+    "is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "dev": true
+    },
     "is-reference": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.1.tgz",
@@ -8622,10 +7913,10 @@
         "has-tostringtag": "^1.0.0"
       }
     },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+    "is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
       "dev": true
     },
     "is-weakmap": {
@@ -8659,12 +7950,6 @@
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
       "dev": true
     },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
-    },
     "js-sdsl": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz",
@@ -8678,61 +7963,46 @@
       "dev": true
     },
     "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
       "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "argparse": "^2.0.1"
       }
     },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
-    },
     "jsdom": {
-      "version": "15.2.1",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz",
-      "integrity": "sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==",
-      "dev": true,
-      "requires": {
-        "abab": "^2.0.0",
-        "acorn": "^7.1.0",
-        "acorn-globals": "^4.3.2",
-        "array-equal": "^1.0.0",
-        "cssom": "^0.4.1",
-        "cssstyle": "^2.0.0",
-        "data-urls": "^1.1.0",
-        "domexception": "^1.0.1",
-        "escodegen": "^1.11.1",
-        "html-encoding-sniffer": "^1.0.2",
-        "nwsapi": "^2.2.0",
-        "parse5": "5.1.0",
-        "pn": "^1.1.0",
-        "request": "^2.88.0",
-        "request-promise-native": "^1.0.7",
-        "saxes": "^3.1.9",
-        "symbol-tree": "^3.2.2",
-        "tough-cookie": "^3.0.1",
-        "w3c-hr-time": "^1.0.1",
-        "w3c-xmlserializer": "^1.1.2",
-        "webidl-conversions": "^4.0.2",
-        "whatwg-encoding": "^1.0.5",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^7.0.0",
-        "ws": "^7.0.0",
-        "xml-name-validator": "^3.0.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
-        }
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-21.1.1.tgz",
+      "integrity": "sha512-Jjgdmw48RKcdAIQyUD1UdBh2ecH7VqwaXPN3ehoZN6MqgVbMn+lRm1aAT1AsdJRAJpwfa4IpwgzySn61h2qu3w==",
+      "dev": true,
+      "requires": {
+        "abab": "^2.0.6",
+        "acorn": "^8.8.2",
+        "acorn-globals": "^7.0.0",
+        "cssstyle": "^3.0.0",
+        "data-urls": "^4.0.0",
+        "decimal.js": "^10.4.3",
+        "domexception": "^4.0.0",
+        "escodegen": "^2.0.0",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.1",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.2",
+        "parse5": "^7.1.2",
+        "rrweb-cssom": "^0.6.0",
+        "saxes": "^6.0.0",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.1.2",
+        "w3c-xmlserializer": "^4.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^2.0.0",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^12.0.1",
+        "ws": "^8.13.0",
+        "xml-name-validator": "^4.0.0"
       }
     },
     "json-parse-even-better-errors": {
@@ -8741,12 +8011,6 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "json-schema": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-      "dev": true
-    },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -8759,12 +8023,6 @@
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
-    },
     "json5": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
@@ -8774,18 +8032,6 @@
         "minimist": "^1.2.0"
       }
     },
-    "jsprim": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
-      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.4.0",
-        "verror": "1.10.0"
-      }
-    },
     "kleur": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
@@ -8795,7 +8041,7 @@
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
       "dev": true,
       "requires": {
         "prelude-ls": "~1.1.2",
@@ -8815,40 +8061,79 @@
       "dev": true
     },
     "locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
       "requires": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
+        "p-locate": "^5.0.0"
       }
     },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
     "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
-      "dev": true
-    },
     "log-symbols": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
-      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.2"
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "lru-cache": {
@@ -8892,18 +8177,18 @@
       }
     },
     "mime-db": {
-      "version": "1.50.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz",
-      "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "dev": true
     },
     "mime-types": {
-      "version": "2.1.33",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz",
-      "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dev": true,
       "requires": {
-        "mime-db": "1.50.0"
+        "mime-db": "1.52.0"
       }
     },
     "minimatch": {
@@ -8927,15 +8212,6 @@
       "integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==",
       "dev": true
     },
-    "mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
     "mkdirp-classic": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
@@ -8943,96 +8219,69 @@
       "dev": true
     },
     "mocha": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz",
-      "integrity": "sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz",
+      "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==",
       "dev": true,
       "requires": {
-        "ansi-colors": "3.2.3",
+        "ansi-colors": "4.1.1",
         "browser-stdout": "1.3.1",
-        "chokidar": "3.3.0",
-        "debug": "3.2.6",
-        "diff": "3.5.0",
-        "escape-string-regexp": "1.0.5",
-        "find-up": "3.0.0",
-        "glob": "7.1.3",
-        "growl": "1.10.5",
+        "chokidar": "3.5.3",
+        "debug": "4.3.4",
+        "diff": "5.0.0",
+        "escape-string-regexp": "4.0.0",
+        "find-up": "5.0.0",
+        "glob": "7.2.0",
         "he": "1.2.0",
-        "js-yaml": "3.13.1",
-        "log-symbols": "3.0.0",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.5",
-        "ms": "2.1.1",
-        "node-environment-flags": "1.0.6",
-        "object.assign": "4.1.0",
-        "strip-json-comments": "2.0.1",
-        "supports-color": "6.0.0",
-        "which": "1.3.1",
-        "wide-align": "1.1.3",
-        "yargs": "13.3.2",
-        "yargs-parser": "13.1.2",
-        "yargs-unparser": "1.6.0"
-      },
-      "dependencies": {
-        "ansi-colors": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
-          "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
-          "dev": true
-        },
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+        "js-yaml": "4.1.0",
+        "log-symbols": "4.1.0",
+        "minimatch": "5.0.1",
+        "ms": "2.1.3",
+        "nanoid": "3.3.3",
+        "serialize-javascript": "6.0.0",
+        "strip-json-comments": "3.1.1",
+        "supports-color": "8.1.1",
+        "workerpool": "6.2.1",
+        "yargs": "16.2.0",
+        "yargs-parser": "20.2.4",
+        "yargs-unparser": "2.0.0"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "balanced-match": "^1.0.0"
           }
         },
-        "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+          "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "brace-expansion": "^2.0.1"
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
           "dev": true
         },
-        "supports-color": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
-          "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        },
         "yargs-parser": {
-          "version": "13.1.2",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
+          "version": "20.2.4",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+          "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+          "dev": true
         }
       }
     },
@@ -9053,21 +8302,23 @@
         "thenify-all": "^1.0.0"
       }
     },
+    "nanoid": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
+      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
+      "dev": true
+    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
-    "node-environment-flags": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
-      "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==",
-      "dev": true,
-      "requires": {
-        "object.getownpropertydescriptors": "^2.0.3",
-        "semver": "^5.7.0"
-      }
+    "natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "dev": true
     },
     "node-fetch": {
       "version": "2.6.7",
@@ -9115,15 +8366,9 @@
       "dev": true
     },
     "nwsapi": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
-      "dev": true
-    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.3.tgz",
+      "integrity": "sha512-jscxIO4/VKScHlbmFBdV1Z6LXnLO+ZR4VMtypudUdfwtKxUN3TQcNFIHLwKtrUbDyHN4/GycY9+oRGZ2XMXYPw==",
       "dev": true
     },
     "object-assign": {
@@ -9139,44 +8384,21 @@
       "dev": true
     },
     "object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true
-    },
-    "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
-      }
-    },
-    "object.getownpropertydescriptors": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz",
-      "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2"
+        "define-properties": "^1.1.3"
       }
     },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
+    },
     "object.values": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
@@ -9198,43 +8420,37 @@
       }
     },
     "optionator": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
       "dev": true,
       "requires": {
         "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.4",
+        "fast-levenshtein": "~2.0.6",
         "levn": "~0.3.0",
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2",
-        "wordwrap": "~1.0.0"
+        "word-wrap": "~1.2.3"
       }
     },
     "p-limit": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
-      "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
       "requires": {
-        "p-try": "^2.0.0"
+        "yocto-queue": "^0.1.0"
       }
     },
     "p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
       "requires": {
-        "p-limit": "^2.0.0"
+        "p-limit": "^3.0.2"
       }
     },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true
-    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -9257,15 +8473,18 @@
       }
     },
     "parse5": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
-      "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==",
-      "dev": true
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "dev": true,
+      "requires": {
+        "entities": "^4.4.0"
+      }
     },
     "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true
     },
     "path-is-absolute": {
@@ -9292,12 +8511,6 @@
       "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
       "dev": true
     },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
-    },
     "periscopic": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-3.1.0.tgz",
@@ -9324,16 +8537,10 @@
         "node-modules-regexp": "^1.0.0"
       }
     },
-    "pn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
-      "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
-      "dev": true
-    },
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
       "dev": true
     },
     "progress": {
@@ -9349,9 +8556,9 @@
       "dev": true
     },
     "psl": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz",
-      "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
       "dev": true
     },
     "pump": {
@@ -9365,9 +8572,9 @@
       }
     },
     "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
       "dev": true
     },
     "puppeteer": {
@@ -9400,12 +8607,6 @@
             "yargs": "17.7.1"
           }
         },
-        "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -9441,18 +8642,6 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
         "puppeteer-core": {
           "version": "19.8.5",
           "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.8.5.tgz",
@@ -9533,10 +8722,10 @@
         }
       }
     },
-    "qs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+    "querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
       "dev": true
     },
     "queue-microtask": {
@@ -9545,6 +8734,15 @@
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true
     },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
     "readable-stream": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -9557,12 +8755,12 @@
       }
     },
     "readdirp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz",
-      "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
       "requires": {
-        "picomatch": "^2.0.4"
+        "picomatch": "^2.2.1"
       }
     },
     "regexp.prototype.flags": {
@@ -9582,94 +8780,16 @@
       "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true
     },
-    "request": {
-      "version": "2.88.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-      "dev": true,
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        },
-        "tough-cookie": {
-          "version": "2.4.3",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-          "dev": true,
-          "requires": {
-            "psl": "^1.1.24",
-            "punycode": "^1.4.1"
-          }
-        }
-      }
-    },
-    "request-promise-core": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz",
-      "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.11"
-      }
-    },
-    "request-promise-native": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz",
-      "integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==",
-      "dev": true,
-      "requires": {
-        "request-promise-core": "1.1.2",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
-      },
-      "dependencies": {
-        "tough-cookie": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-          "dev": true,
-          "requires": {
-            "psl": "^1.1.28",
-            "punycode": "^2.1.1"
-          }
-        }
-      }
-    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
       "dev": true
     },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
       "dev": true
     },
     "resolve": {
@@ -9714,6 +8834,12 @@
         }
       }
     },
+    "rrweb-cssom": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
+      "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==",
+      "dev": true
+    },
     "run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -9747,25 +8873,31 @@
       "dev": true
     },
     "saxes": {
-      "version": "3.1.11",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz",
-      "integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
+      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
       "dev": true,
       "requires": {
-        "xmlchars": "^2.1.1"
+        "xmlchars": "^2.2.0"
       }
     },
     "semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.4.0.tgz",
+      "integrity": "sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^6.0.0"
+      }
     },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
+    "serialize-javascript": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.1.0"
+      }
     },
     "side-channel": {
       "version": "1.0.4",
@@ -9820,35 +8952,6 @@
       "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
       "dev": true
     },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dev": true,
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
-    "stealthy-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
-      "dev": true
-    },
     "string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -9859,14 +8962,14 @@
       }
     },
     "string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
       "requires": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
       }
     },
     "string.prototype.trimend": {
@@ -9892,12 +8995,12 @@
       }
     },
     "strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
       "requires": {
-        "ansi-regex": "^4.1.0"
+        "ansi-regex": "^5.0.1"
       }
     },
     "strip-bom": {
@@ -9942,6 +9045,23 @@
         }
       }
     },
+    "supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^4.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        }
+      }
+    },
     "supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
@@ -10036,23 +9156,24 @@
       }
     },
     "tough-cookie": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
+      "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
       "dev": true,
       "requires": {
-        "ip-regex": "^2.1.0",
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
       }
     },
     "tr46": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
+      "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
       "dev": true,
       "requires": {
-        "punycode": "^2.1.0"
+        "punycode": "^2.3.0"
       }
     },
     "ts-interface-checker": {
@@ -10096,25 +9217,10 @@
         }
       }
     },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
-    },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
       "dev": true,
       "requires": {
         "prelude-ls": "~1.1.2"
@@ -10154,6 +9260,12 @@
         "through": "^2.3.8"
       }
     },
+    "universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "dev": true
+    },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -10163,6 +9275,16 @@
         "punycode": "^2.1.0"
       }
     },
+    "url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
     "util": {
       "version": "0.12.5",
       "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
@@ -10182,82 +9304,44 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
-    "uuid": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
-      "dev": true
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "w3c-hr-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",
-      "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=",
-      "dev": true,
-      "requires": {
-        "browser-process-hrtime": "^0.1.2"
-      }
-    },
     "w3c-xmlserializer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz",
-      "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
+      "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
       "dev": true,
       "requires": {
-        "domexception": "^1.0.1",
-        "webidl-conversions": "^4.0.2",
-        "xml-name-validator": "^3.0.0"
+        "xml-name-validator": "^4.0.0"
       }
     },
     "webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
       "dev": true
     },
     "whatwg-encoding": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
       "dev": true,
       "requires": {
-        "iconv-lite": "0.4.24"
+        "iconv-lite": "0.6.3"
       }
     },
     "whatwg-mimetype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
       "dev": true
     },
     "whatwg-url": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
-      "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
-      "dev": true,
-      "requires": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^1.0.1",
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
+      "integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
       "dev": true,
       "requires": {
-        "isexe": "^2.0.0"
+        "tr46": "^4.1.1",
+        "webidl-conversions": "^7.0.0"
       }
     },
     "which-boxed-primitive": {
@@ -10285,12 +9369,6 @@
         "is-weakset": "^2.0.1"
       }
     },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
     "which-typed-array": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz",
@@ -10305,65 +9383,55 @@
         "is-typed-array": "^1.1.9"
       }
     },
-    "wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
+    },
+    "workerpool": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
+      "dev": true
+    },
+    "wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.2 || 2"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "color-convert": "^2.0.1"
           }
         },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "color-name": "~1.1.4"
           }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
         }
       }
     },
-    "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true
-    },
-    "wordwrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-      "dev": true
-    },
-    "wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
-      }
-    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -10371,27 +9439,28 @@
       "dev": true
     },
     "ws": {
-      "version": "7.4.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
-      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
-      "dev": true
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+      "dev": true,
+      "requires": {}
     },
     "xml-name-validator": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
       "dev": true
     },
     "xmlchars": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.1.1.tgz",
-      "integrity": "sha512-7hew1RPJ1iIuje/Y01bGD/mXokXxegAgVS+e+E0wSi2ILHQkYAH1+JXARwTjZSM4Z4Z+c73aKspEcqj+zPPL/w==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
       "dev": true
     },
     "y18n": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
-      "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "dev": true
     },
     "yallist": {
@@ -10401,32 +9470,25 @@
       "dev": true
     },
     "yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
       "dev": true,
       "requires": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
       },
       "dependencies": {
         "yargs-parser": {
-          "version": "13.1.2",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
+          "version": "20.2.9",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+          "dev": true
         }
       }
     },
@@ -10437,14 +9499,15 @@
       "dev": true
     },
     "yargs-unparser": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
-      "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
       "dev": true,
       "requires": {
-        "flat": "^4.1.0",
-        "lodash": "^4.17.15",
-        "yargs": "^13.3.0"
+        "camelcase": "^6.0.0",
+        "decamelize": "^4.0.0",
+        "flat": "^5.0.2",
+        "is-plain-obj": "^2.1.0"
       }
     },
     "yauzl": {
diff --git a/package.json b/package.json
index 2a407f3d42..f38f6af578 100644
--- a/package.json
+++ b/package.json
@@ -130,26 +130,26 @@
     "@rollup/plugin-virtual": "^3.0.1",
     "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.8.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",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^14.14.31",
+    "@typescript-eslint/eslint-plugin": "^5.58.0",
+    "@typescript-eslint/parser": "^5.58.0",
+    "acorn": "^8.8.2",
     "agadoo": "^3.0.0",
     "aria-query": "^5.1.3",
     "axobject-query": "^3.1.1",
     "code-red": "^1.0.0",
     "css-tree": "^2.3.1",
     "eslint": "^8.35.0",
-    "eslint-plugin-import": "^2.27.0",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-svelte3": "^4.0.0",
     "estree-walker": "^3.0.3",
     "is-reference": "^3.0.1",
-    "jsdom": "^15.2.1",
+    "jsdom": "^21.1.1",
     "kleur": "^4.1.5",
     "locate-character": "^2.0.5",
     "magic-string": "^0.30.0",
-    "mocha": "^7.0.0",
+    "mocha": "^10.2.0",
     "periscopic": "^3.1.0",
     "puppeteer": "^19.8.5",
     "rollup": "^1.27.14",
diff --git a/src/compiler/compile/nodes/shared/Expression.ts b/src/compiler/compile/nodes/shared/Expression.ts
index 3a85bf35c8..65b10d04c8 100644
--- a/src/compiler/compile/nodes/shared/Expression.ts
+++ b/src/compiler/compile/nodes/shared/Expression.ts
@@ -24,7 +24,7 @@ type Owner = INode;
 const regex_contains_term_function_expression = /FunctionExpression/;
 
 export default class Expression {
-	type: 'Expression' = 'Expression';
+	type: 'Expression' = 'Expression' as const;
 	component: Component;
 	owner: Owner;
 	node: Node;

From c9ccd6e20f2f0ec6cbf657220bb43cfaeb1d49a8 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Wed, 12 Apr 2023 05:16:11 -0700
Subject: [PATCH 104/110] chore: upgrade rollup (#8491)

bump to rollup 3. Includes reworking the "treat those imports as external" a bit so that Rollup builds correctly but doesn't bundle some of the (now relative) imports

---------

Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 package-lock.json                     | 683 +++++++++++---------------
 package.json                          |  10 +-
 rollup.config.js => rollup.config.mjs |  56 ++-
 src/runtime/animate/index.ts          |   4 +-
 src/runtime/easing/index.ts           |   2 +-
 src/runtime/index.ts                  |   4 +-
 src/runtime/internal/utils.ts         |   2 +-
 src/runtime/motion/spring.ts          |   4 +-
 src/runtime/motion/tweened.ts         |   6 +-
 src/runtime/store/index.ts            |   2 +-
 src/runtime/transition/index.ts       |   4 +-
 tsconfig.json                         |   4 +-
 12 files changed, 360 insertions(+), 421 deletions(-)
 rename rollup.config.js => rollup.config.mjs (59%)

diff --git a/package-lock.json b/package-lock.json
index 7c607ef5a6..d52d33f24b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,12 +11,12 @@
       "devDependencies": {
         "@ampproject/remapping": "^2.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.15",
-        "@rollup/plugin-commonjs": "^11.0.0",
+        "@rollup/plugin-commonjs": "^24.1.0",
         "@rollup/plugin-json": "^6.0.0",
-        "@rollup/plugin-node-resolve": "^11.2.1",
+        "@rollup/plugin-node-resolve": "^15.0.2",
         "@rollup/plugin-replace": "^5.0.2",
-        "@rollup/plugin-sucrase": "^3.1.0",
-        "@rollup/plugin-typescript": "^2.0.1",
+        "@rollup/plugin-sucrase": "^5.0.1",
+        "@rollup/plugin-typescript": "^11.1.0",
         "@rollup/plugin-virtual": "^3.0.1",
         "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.8.0",
         "@types/aria-query": "^5.0.1",
@@ -42,7 +42,7 @@
         "mocha": "^10.2.0",
         "periscopic": "^3.1.0",
         "puppeteer": "^19.8.5",
-        "rollup": "^1.27.14",
+        "rollup": "^3.20.2",
         "source-map": "^0.7.4",
         "source-map-support": "^0.5.21",
         "tiny-glob": "^0.2.9",
@@ -317,27 +317,64 @@
       }
     },
     "node_modules/@rollup/plugin-commonjs": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.0.0.tgz",
-      "integrity": "sha512-jnm//T5ZWOZ6zmJ61fReSCBOif+Ax8dHVoVggA+d2NA7T4qCWgQ3KYr+zN2faGEYLpe1wa03IzvhR+sqVLxUWg==",
+      "version": "24.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-24.1.0.tgz",
+      "integrity": "sha512-eSL45hjhCWI0jCCXcNtLVqM5N1JlBGvlFfY0m6oOYnLCJ6N0qEXoZql4sY2MOUArzhH4SA/qBpTxvvZp2Sc+DQ==",
       "dev": true,
       "dependencies": {
-        "@rollup/pluginutils": "^3.0.0",
-        "estree-walker": "^0.6.1",
-        "is-reference": "^1.1.2",
-        "magic-string": "^0.25.2",
-        "resolve": "^1.11.0"
+        "@rollup/pluginutils": "^5.0.1",
+        "commondir": "^1.0.1",
+        "estree-walker": "^2.0.2",
+        "glob": "^8.0.3",
+        "is-reference": "1.2.1",
+        "magic-string": "^0.27.0"
       },
       "engines": {
-        "node": ">= 8.0.0"
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.68.0||^3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-commonjs/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
       }
     },
     "node_modules/@rollup/plugin-commonjs/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==",
+      "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-commonjs/node_modules/glob": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@rollup/plugin-commonjs/node_modules/is-reference": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
@@ -348,12 +385,27 @@
       }
     },
     "node_modules/@rollup/plugin-commonjs/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": {
+        "@jridgewell/sourcemap-codec": "^1.4.13"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@rollup/plugin-commonjs/node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
       "dependencies": {
-        "sourcemap-codec": "^1.4.8"
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/@rollup/plugin-json": {
@@ -376,21 +428,24 @@
         }
       }
     },
-    "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==",
+    "node_modules/@rollup/plugin-node-resolve": {
+      "version": "15.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.2.tgz",
+      "integrity": "sha512-Y35fRGUjC3FaurG722uhUuG8YHOJRJQbI6/CkbRkdPotSpDj9NtIN85z1zrcyDcCQIW4qp5mgG72U+gJ0TAFEg==",
       "dev": true,
       "dependencies": {
-        "@types/estree": "^1.0.0",
-        "estree-walker": "^2.0.2",
-        "picomatch": "^2.3.1"
+        "@rollup/pluginutils": "^5.0.1",
+        "@types/resolve": "1.20.2",
+        "deepmerge": "^4.2.2",
+        "is-builtin-module": "^3.2.1",
+        "is-module": "^1.0.0",
+        "resolve": "^1.22.1"
       },
       "engines": {
         "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0||^3.0.0"
+        "rollup": "^2.78.0||^3.0.0"
       },
       "peerDependenciesMeta": {
         "rollup": {
@@ -398,67 +453,6 @@
         }
       }
     },
-    "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",
-      "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
-      "dev": true,
-      "dependencies": {
-        "@rollup/pluginutils": "^3.1.0",
-        "@types/resolve": "1.17.1",
-        "builtin-modules": "^3.1.0",
-        "deepmerge": "^4.2.2",
-        "is-module": "^1.0.0",
-        "resolve": "^1.19.0"
-      },
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0"
-      }
-    },
-    "node_modules/@rollup/plugin-node-resolve/node_modules/@rollup/pluginutils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
-      "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "0.0.39",
-        "estree-walker": "^1.0.1",
-        "picomatch": "^2.2.2"
-      },
-      "engines": {
-        "node": ">= 8.0.0"
-      },
-      "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0"
-      }
-    },
-    "node_modules/@rollup/plugin-node-resolve/node_modules/@types/estree": {
-      "version": "0.0.39",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
-      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
-      "dev": true
-    },
-    "node_modules/@rollup/plugin-node-resolve/node_modules/estree-walker": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
-      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
-      "dev": true
-    },
     "node_modules/@rollup/plugin-replace": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-5.0.2.tgz",
@@ -480,40 +474,6 @@
         }
       }
     },
-    "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.27.0",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz",
@@ -527,34 +487,50 @@
       }
     },
     "node_modules/@rollup/plugin-sucrase": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-sucrase/-/plugin-sucrase-3.1.0.tgz",
-      "integrity": "sha512-PZ70LDNgIj8rL+3pKwKwTBOQ2c9JofXeLbWz+2V4/nCt4LqwYTNqxJJf1riTJsVARVzJdA0woIzUzjKZvL8TfA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-sucrase/-/plugin-sucrase-5.0.1.tgz",
+      "integrity": "sha512-3mYe28rR/sUTkV8v10yPCP55TQ/oJkvcxKZBj6NGx9ZfCn9BdBtBL1v1S0TQrcOV4WD3FTHJaI7TbbukALx9wA==",
       "dev": true,
       "dependencies": {
-        "@rollup/pluginutils": "^3.0.1",
-        "sucrase": "^3.10.1"
+        "@rollup/pluginutils": "^5.0.1",
+        "sucrase": "^3.27.0"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.53.1||^3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
       }
     },
     "node_modules/@rollup/plugin-typescript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-2.1.0.tgz",
-      "integrity": "sha512-7lXKGY06aofrceVez/YnN2axttFdHSqlUBpCJ6ebzDfxwLDKMgSV5lD4ykBcdgE7aK3egxuLkD/HKyRB5L8Log==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-11.1.0.tgz",
+      "integrity": "sha512-86flrfE+bSHB69znnTV6kVjkncs2LBMhcTCyxWgRxLyfXfQrxg4UwlAqENnjrrxnSNS/XKCDJCl8EkdFJVHOxw==",
       "dev": true,
       "dependencies": {
-        "@rollup/pluginutils": "^3.0.0",
-        "resolve": "^1.13.1"
+        "@rollup/pluginutils": "^5.0.1",
+        "resolve": "^1.22.1"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "rollup": "^1.20.0",
+        "rollup": "^2.14.0||^3.0.0",
         "tslib": "*",
-        "typescript": ">=2.1.0"
+        "typescript": ">=3.7.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        },
+        "tslib": {
+          "optional": true
+        }
       }
     },
     "node_modules/@rollup/plugin-virtual": {
@@ -575,21 +551,31 @@
       }
     },
     "node_modules/@rollup/pluginutils": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.1.tgz",
-      "integrity": "sha512-PmNurkecagFimv7ZdKCVOfQuqKDPkrcpLFxRBcQ00LYr4HAjJwhCFxBiY2Xoletll2htTIiXBg6g0Yg21h2M3w==",
+      "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": {
-        "estree-walker": "^0.6.1"
+        "@types/estree": "^1.0.0",
+        "estree-walker": "^2.0.2",
+        "picomatch": "^2.3.1"
       },
       "engines": {
-        "node": ">= 8.0.0"
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
       }
     },
     "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==",
+      "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/@sveltejs/eslint-config": {
@@ -642,13 +628,10 @@
       "dev": true
     },
     "node_modules/@types/resolve": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
-      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
+      "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
+      "dev": true
     },
     "node_modules/@types/semver": {
       "version": "7.3.13",
@@ -926,22 +909,6 @@
         "agadoo": "cli.js"
       }
     },
-    "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": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=14.18.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
     "node_modules/agent-base": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
@@ -1003,7 +970,7 @@
     "node_modules/any-promise": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
       "dev": true
     },
     "node_modules/anymatch": {
@@ -1239,12 +1206,15 @@
       "dev": true
     },
     "node_modules/builtin-modules": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz",
-      "integrity": "sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
       "dev": true,
       "engines": {
         "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/call-bind": {
@@ -1412,6 +1382,12 @@
         "node": ">= 6"
       }
     },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+      "dev": true
+    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -3083,6 +3059,21 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-builtin-module": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
+      "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
+      "dev": true,
+      "dependencies": {
+        "builtin-modules": "^3.3.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-callable": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
@@ -3903,15 +3894,6 @@
         "webidl-conversions": "^3.0.0"
       }
     },
-    "node_modules/node-modules-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -3930,7 +3912,7 @@
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -4148,13 +4130,10 @@
       }
     },
     "node_modules/pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
+      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
       "dev": true,
-      "dependencies": {
-        "node-modules-regexp": "^1.0.0"
-      },
       "engines": {
         "node": ">= 6"
       }
@@ -4563,29 +4542,19 @@
       }
     },
     "node_modules/rollup": {
-      "version": "1.27.14",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.27.14.tgz",
-      "integrity": "sha512-DuDjEyn8Y79ALYXMt+nH/EI58L5pEw5HU9K38xXdRnxQhvzUTI/nxAawhkAHUQeudANQ//8iyrhVRHJBuR6DSQ==",
+      "version": "3.20.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.20.2.tgz",
+      "integrity": "sha512-3zwkBQl7Ai7MFYQE0y1MeQ15+9jsi7XxfrqwTb/9EK8D9C9+//EBR4M+CuA1KODRaNbFez/lWxA5vhEGZp4MUg==",
       "dev": true,
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/node": "*",
-        "acorn": "^7.1.0"
-      },
       "bin": {
         "rollup": "dist/bin/rollup"
-      }
-    },
-    "node_modules/rollup/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
       },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=14.18.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
       }
     },
     "node_modules/rrweb-cssom": {
@@ -4753,12 +4722,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
-      "dev": true
-    },
     "node_modules/string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -4844,11 +4807,12 @@
       }
     },
     "node_modules/sucrase": {
-      "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.16.0.tgz",
-      "integrity": "sha512-ovVuswxV5TayCPXfTk8bgBgk6uNRvsinIkEpq0J6zS1xXCx5N/LLGcbsKdRhqn/ToZylMX6+yXaR1LSn1I42Pg==",
+      "version": "3.32.0",
+      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz",
+      "integrity": "sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==",
       "dev": true,
       "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.2",
         "commander": "^4.0.0",
         "glob": "7.1.6",
         "lines-and-columns": "^1.1.6",
@@ -4879,6 +4843,9 @@
       },
       "engines": {
         "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/supports-color": {
@@ -4979,7 +4946,7 @@
     "node_modules/thenify-all": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-      "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
       "dev": true,
       "dependencies": {
         "thenify": ">= 3.1.0 < 4"
@@ -5701,24 +5668,47 @@
       }
     },
     "@rollup/plugin-commonjs": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.0.0.tgz",
-      "integrity": "sha512-jnm//T5ZWOZ6zmJ61fReSCBOif+Ax8dHVoVggA+d2NA7T4qCWgQ3KYr+zN2faGEYLpe1wa03IzvhR+sqVLxUWg==",
+      "version": "24.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-24.1.0.tgz",
+      "integrity": "sha512-eSL45hjhCWI0jCCXcNtLVqM5N1JlBGvlFfY0m6oOYnLCJ6N0qEXoZql4sY2MOUArzhH4SA/qBpTxvvZp2Sc+DQ==",
       "dev": true,
       "requires": {
-        "@rollup/pluginutils": "^3.0.0",
-        "estree-walker": "^0.6.1",
-        "is-reference": "^1.1.2",
-        "magic-string": "^0.25.2",
-        "resolve": "^1.11.0"
+        "@rollup/pluginutils": "^5.0.1",
+        "commondir": "^1.0.1",
+        "estree-walker": "^2.0.2",
+        "glob": "^8.0.3",
+        "is-reference": "1.2.1",
+        "magic-string": "^0.27.0"
       },
       "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
         "estree-walker": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
-          "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
+          "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
         },
+        "glob": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+          "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^5.0.1",
+            "once": "^1.3.0"
+          }
+        },
         "is-reference": {
           "version": "1.2.1",
           "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
@@ -5729,12 +5719,21 @@
           }
         },
         "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"
+          }
+        },
+        "minimatch": {
+          "version": "5.1.6",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
           }
         }
       }
@@ -5746,70 +5745,20 @@
       "dev": true,
       "requires": {
         "@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": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz",
-      "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
+      "version": "15.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.2.tgz",
+      "integrity": "sha512-Y35fRGUjC3FaurG722uhUuG8YHOJRJQbI6/CkbRkdPotSpDj9NtIN85z1zrcyDcCQIW4qp5mgG72U+gJ0TAFEg==",
       "dev": true,
       "requires": {
-        "@rollup/pluginutils": "^3.1.0",
-        "@types/resolve": "1.17.1",
-        "builtin-modules": "^3.1.0",
+        "@rollup/pluginutils": "^5.0.1",
+        "@types/resolve": "1.20.2",
         "deepmerge": "^4.2.2",
+        "is-builtin-module": "^3.2.1",
         "is-module": "^1.0.0",
-        "resolve": "^1.19.0"
-      },
-      "dependencies": {
-        "@rollup/pluginutils": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
-          "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
-          "dev": true,
-          "requires": {
-            "@types/estree": "0.0.39",
-            "estree-walker": "^1.0.1",
-            "picomatch": "^2.2.2"
-          }
-        },
-        "@types/estree": {
-          "version": "0.0.39",
-          "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
-          "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
-          "dev": true
-        },
-        "estree-walker": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
-          "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
-          "dev": true
-        }
+        "resolve": "^1.22.1"
       }
     },
     "@rollup/plugin-replace": {
@@ -5822,29 +5771,6 @@
         "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.27.0",
           "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz",
@@ -5857,23 +5783,23 @@
       }
     },
     "@rollup/plugin-sucrase": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-sucrase/-/plugin-sucrase-3.1.0.tgz",
-      "integrity": "sha512-PZ70LDNgIj8rL+3pKwKwTBOQ2c9JofXeLbWz+2V4/nCt4LqwYTNqxJJf1riTJsVARVzJdA0woIzUzjKZvL8TfA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-sucrase/-/plugin-sucrase-5.0.1.tgz",
+      "integrity": "sha512-3mYe28rR/sUTkV8v10yPCP55TQ/oJkvcxKZBj6NGx9ZfCn9BdBtBL1v1S0TQrcOV4WD3FTHJaI7TbbukALx9wA==",
       "dev": true,
       "requires": {
-        "@rollup/pluginutils": "^3.0.1",
-        "sucrase": "^3.10.1"
+        "@rollup/pluginutils": "^5.0.1",
+        "sucrase": "^3.27.0"
       }
     },
     "@rollup/plugin-typescript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-2.1.0.tgz",
-      "integrity": "sha512-7lXKGY06aofrceVez/YnN2axttFdHSqlUBpCJ6ebzDfxwLDKMgSV5lD4ykBcdgE7aK3egxuLkD/HKyRB5L8Log==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-11.1.0.tgz",
+      "integrity": "sha512-86flrfE+bSHB69znnTV6kVjkncs2LBMhcTCyxWgRxLyfXfQrxg4UwlAqENnjrrxnSNS/XKCDJCl8EkdFJVHOxw==",
       "dev": true,
       "requires": {
-        "@rollup/pluginutils": "^3.0.0",
-        "resolve": "^1.13.1"
+        "@rollup/pluginutils": "^5.0.1",
+        "resolve": "^1.22.1"
       }
     },
     "@rollup/plugin-virtual": {
@@ -5884,18 +5810,20 @@
       "requires": {}
     },
     "@rollup/pluginutils": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.1.tgz",
-      "integrity": "sha512-PmNurkecagFimv7ZdKCVOfQuqKDPkrcpLFxRBcQ00LYr4HAjJwhCFxBiY2Xoletll2htTIiXBg6g0Yg21h2M3w==",
+      "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": {
-        "estree-walker": "^0.6.1"
+        "@types/estree": "^1.0.0",
+        "estree-walker": "^2.0.2",
+        "picomatch": "^2.3.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==",
+          "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
         }
       }
@@ -5948,13 +5876,10 @@
       "dev": true
     },
     "@types/resolve": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
-      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
+      "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
+      "dev": true
     },
     "@types/semver": {
       "version": "7.3.13",
@@ -6123,17 +6048,6 @@
         "@rollup/plugin-virtual": "^3.0.1",
         "acorn": "^8.8.1",
         "rollup": "^3.5.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        }
       }
     },
     "agent-base": {
@@ -6181,7 +6095,7 @@
     "any-promise": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
       "dev": true
     },
     "anymatch": {
@@ -6350,9 +6264,9 @@
       "dev": true
     },
     "builtin-modules": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz",
-      "integrity": "sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
       "dev": true
     },
     "call-bind": {
@@ -6484,6 +6398,12 @@
       "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
       "dev": true
     },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+      "dev": true
+    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -7743,6 +7663,15 @@
         "has-tostringtag": "^1.0.0"
       }
     },
+    "is-builtin-module": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
+      "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
+      "dev": true,
+      "requires": {
+        "builtin-modules": "^3.3.0"
+      }
+    },
     "is-callable": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
@@ -8353,12 +8282,6 @@
         }
       }
     },
-    "node-modules-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
-      "dev": true
-    },
     "normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -8374,7 +8297,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
       "dev": true
     },
     "object-inspect": {
@@ -8529,13 +8452,10 @@
       "dev": true
     },
     "pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-      "dev": true,
-      "requires": {
-        "node-modules-regexp": "^1.0.0"
-      }
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
+      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
+      "dev": true
     },
     "prelude-ls": {
       "version": "1.1.2",
@@ -8816,22 +8736,12 @@
       "dev": true
     },
     "rollup": {
-      "version": "1.27.14",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.27.14.tgz",
-      "integrity": "sha512-DuDjEyn8Y79ALYXMt+nH/EI58L5pEw5HU9K38xXdRnxQhvzUTI/nxAawhkAHUQeudANQ//8iyrhVRHJBuR6DSQ==",
+      "version": "3.20.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.20.2.tgz",
+      "integrity": "sha512-3zwkBQl7Ai7MFYQE0y1MeQ15+9jsi7XxfrqwTb/9EK8D9C9+//EBR4M+CuA1KODRaNbFez/lWxA5vhEGZp4MUg==",
       "dev": true,
       "requires": {
-        "@types/estree": "*",
-        "@types/node": "*",
-        "acorn": "^7.1.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": "~2.3.2"
       }
     },
     "rrweb-cssom": {
@@ -8946,12 +8856,6 @@
         }
       }
     },
-    "sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
-      "dev": true
-    },
     "string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -9016,11 +8920,12 @@
       "dev": true
     },
     "sucrase": {
-      "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.16.0.tgz",
-      "integrity": "sha512-ovVuswxV5TayCPXfTk8bgBgk6uNRvsinIkEpq0J6zS1xXCx5N/LLGcbsKdRhqn/ToZylMX6+yXaR1LSn1I42Pg==",
+      "version": "3.32.0",
+      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz",
+      "integrity": "sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==",
       "dev": true,
       "requires": {
+        "@jridgewell/gen-mapping": "^0.3.2",
         "commander": "^4.0.0",
         "glob": "7.1.6",
         "lines-and-columns": "^1.1.6",
@@ -9124,7 +9029,7 @@
     "thenify-all": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-      "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
       "dev": true,
       "requires": {
         "thenify": ">= 3.1.0 < 4"
diff --git a/package.json b/package.json
index f38f6af578..c5239c8b50 100644
--- a/package.json
+++ b/package.json
@@ -121,12 +121,12 @@
   "devDependencies": {
     "@ampproject/remapping": "^2.2.1",
     "@jridgewell/sourcemap-codec": "^1.4.15",
-    "@rollup/plugin-commonjs": "^11.0.0",
+    "@rollup/plugin-commonjs": "^24.1.0",
     "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^11.2.1",
+    "@rollup/plugin-node-resolve": "^15.0.2",
     "@rollup/plugin-replace": "^5.0.2",
-    "@rollup/plugin-sucrase": "^3.1.0",
-    "@rollup/plugin-typescript": "^2.0.1",
+    "@rollup/plugin-sucrase": "^5.0.1",
+    "@rollup/plugin-typescript": "^11.1.0",
     "@rollup/plugin-virtual": "^3.0.1",
     "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.8.0",
     "@types/aria-query": "^5.0.1",
@@ -152,7 +152,7 @@
     "mocha": "^10.2.0",
     "periscopic": "^3.1.0",
     "puppeteer": "^19.8.5",
-    "rollup": "^1.27.14",
+    "rollup": "^3.20.2",
     "source-map": "^0.7.4",
     "source-map-support": "^0.5.21",
     "tiny-glob": "^0.2.9",
diff --git a/rollup.config.js b/rollup.config.mjs
similarity index 59%
rename from rollup.config.js
rename to rollup.config.mjs
index 8ce26f4b84..56ebdaa755 100644
--- a/rollup.config.js
+++ b/rollup.config.mjs
@@ -1,24 +1,58 @@
-import fs from 'fs';
+import fs from 'node:fs';
+import { createRequire } from 'node:module';
 import replace from '@rollup/plugin-replace';
 import resolve from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
 import json from '@rollup/plugin-json';
 import sucrase from '@rollup/plugin-sucrase';
 import typescript from '@rollup/plugin-typescript';
-import pkg from './package.json';
+
+const require = createRequire(import.meta.url);
+const pkg = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
 
 const is_publish = !!process.env.PUBLISH;
 
 const ts_plugin = is_publish
 	? typescript({
-		include: 'src/**',
 		typescript: require('typescript')
 	})
 	: sucrase({
 		transforms: ['typescript']
 	});
 
-const external = id => id.startsWith('svelte/');
+// The following external and path logic is necessary so that the bundled runtime pieces and the index file
+// reference each other correctly instead of bundling their references to each other
+
+/**
+ * Ensures that relative imports inside `src/runtime` like `./internal` and `../store` are externalized correctly
+ */
+const external = (id, parent_id) => {
+	const parent_segments = parent_id.replace(/\\/g, '/').split('/');
+	// TODO needs to be adjusted when we move to JS modules
+	if (parent_segments[parent_segments.length - 3] === 'runtime') {
+		return /\.\.\/\w+$/.test(id);
+	} else {
+		return id === './internal' && parent_segments[parent_segments.length - 2] === 'runtime';
+	}
+}
+
+/**
+ * Transforms externalized import paths like `../store` into correct relative imports with correct index file extension import
+ */
+const replace_relative_svelte_imports = (id, ending) => {
+	id = id.replace(/\\/g, '/');
+	// TODO needs to be adjusted when we move to JS modules
+	return /src\/runtime\/\w+$/.test(id) && `../${id.split('/').pop()}/${ending}`;
+}
+
+/**
+ * Transforms externalized `./internal` import path into correct relative import with correct index file extension import
+ */
+const replace_relative_internal_import = (id, ending) => {
+	id = id.replace(/\\/g, '/');
+	// TODO needs to be adjusted when we move to JS modules
+	return id.endsWith('src/runtime/internal') && `./internal/${ending}`;
+}
 
 fs.writeFileSync(`./compiler.d.ts`, `export { compile, parse, preprocess, walk, VERSION } from './types/compiler/index';`);
 
@@ -30,12 +64,12 @@ export default [
 			{
 				file: `index.mjs`,
 				format: 'esm',
-				paths: id => id.startsWith('svelte/') && `${id.replace('svelte', '.')}/index.mjs`
+				paths: id => replace_relative_internal_import(id, 'index.mjs')
 			},
 			{
 				file: `index.js`,
 				format: 'cjs',
-				paths: id => id.startsWith('svelte/') && `${id.replace('svelte', '.')}/index.js`
+				paths: id => replace_relative_internal_import(id, 'index.js')
 			}
 		],
 		external,
@@ -48,12 +82,12 @@ export default [
 			{
 				file: `ssr.mjs`,
 				format: 'esm',
-				paths: id => id.startsWith('svelte/') && `${id.replace('svelte', '.')}/index.mjs`
+				paths: id => replace_relative_internal_import(id, 'index.mjs')
 			},
 			{
 				file: `ssr.js`,
 				format: 'cjs',
-				paths: id => id.startsWith('svelte/') && `${id.replace('svelte', '.')}/index.js`
+				paths: id => replace_relative_internal_import(id, 'index.js')
 			}
 		],
 		external,
@@ -68,12 +102,12 @@ export default [
 				{
 					file: `${dir}/index.mjs`,
 					format: 'esm',
-					paths: id => id.startsWith('svelte/') && `${id.replace('svelte', '..')}/index.mjs`
+					paths: id => replace_relative_svelte_imports(id, 'index.mjs')
 				},
 				{
 					file: `${dir}/index.js`,
 					format: 'cjs',
-					paths: id => id.startsWith('svelte/') && `${id.replace('svelte', '..')}/index.js`
+					paths: id => replace_relative_svelte_imports(id, 'index.js')
 				}
 			],
 			external,
@@ -83,7 +117,7 @@ export default [
 				}),
 				ts_plugin,
 				{
-					writeBundle(bundle) {
+					writeBundle(_options, bundle) {
 						if (dir === 'internal') {
 							const mod = bundle['index.mjs'];
 							if (mod) {
diff --git a/src/runtime/animate/index.ts b/src/runtime/animate/index.ts
index ff73bbc29e..3b422d72fa 100644
--- a/src/runtime/animate/index.ts
+++ b/src/runtime/animate/index.ts
@@ -1,5 +1,5 @@
-import { cubicOut } from 'svelte/easing';
-import { is_function } from 'svelte/internal';
+import { cubicOut } from '../easing';
+import { is_function } from '../internal';
 
 // todo: same as Transition, should it be shared?
 export interface AnimationConfig {
diff --git a/src/runtime/easing/index.ts b/src/runtime/easing/index.ts
index c23019b320..b466ec5840 100644
--- a/src/runtime/easing/index.ts
+++ b/src/runtime/easing/index.ts
@@ -3,7 +3,7 @@ Adapted from https://github.com/mattdesl
 Distributed under MIT License https://github.com/mattdesl/eases/blob/master/LICENSE.md
 */
 
-export { identity as linear } from 'svelte/internal';
+export { identity as linear } from '../internal';
 
 export function backInOut(t: number) {
 	const s = 1.70158 * 1.525;
diff --git a/src/runtime/index.ts b/src/runtime/index.ts
index 3bce9163ca..2f8a1ffd12 100644
--- a/src/runtime/index.ts
+++ b/src/runtime/index.ts
@@ -13,5 +13,5 @@ export {
 	createEventDispatcher,
 	SvelteComponentDev as SvelteComponent,
 	SvelteComponentTyped
-} from 'svelte/internal';
-export type { ComponentType, ComponentConstructorOptions, ComponentProps, ComponentEvents } from 'svelte/internal';
+} from './internal';
+export type { ComponentType, ComponentConstructorOptions, ComponentProps, ComponentEvents } from './internal';
diff --git a/src/runtime/internal/utils.ts b/src/runtime/internal/utils.ts
index 192f40140e..1507bad541 100644
--- a/src/runtime/internal/utils.ts
+++ b/src/runtime/internal/utils.ts
@@ -1,4 +1,4 @@
-import { Readable } from 'svelte/store';
+import type { Readable } from '../store';
 
 export function noop() {}
 
diff --git a/src/runtime/motion/spring.ts b/src/runtime/motion/spring.ts
index 64d17a058b..526d4384f1 100644
--- a/src/runtime/motion/spring.ts
+++ b/src/runtime/motion/spring.ts
@@ -1,5 +1,5 @@
-import { Readable, writable } from 'svelte/store';
-import { loop, now, Task } from 'svelte/internal';
+import { Readable, writable } from '../store';
+import { loop, now, Task } from '../internal';
 import { is_date } from './utils';
 
 interface TickContext<T> {
diff --git a/src/runtime/motion/tweened.ts b/src/runtime/motion/tweened.ts
index fd83fcb5f5..5e9298011e 100644
--- a/src/runtime/motion/tweened.ts
+++ b/src/runtime/motion/tweened.ts
@@ -1,6 +1,6 @@
-import { Readable, writable } from 'svelte/store';
-import { assign, loop, now, Task } from 'svelte/internal';
-import { linear } from 'svelte/easing';
+import { Readable, writable } from '../store';
+import { assign, loop, now, Task } from '../internal';
+import { linear } from '../easing';
 import { is_date } from './utils';
 
 function get_interpolator(a, b) {
diff --git a/src/runtime/store/index.ts b/src/runtime/store/index.ts
index 67c2bcb15c..4991c05700 100644
--- a/src/runtime/store/index.ts
+++ b/src/runtime/store/index.ts
@@ -1,4 +1,4 @@
-import { run_all, subscribe, noop, safe_not_equal, is_function, get_store_value } from 'svelte/internal';
+import { run_all, subscribe, noop, safe_not_equal, is_function, get_store_value } from '../internal';
 
 /** Callback to inform of a value updates. */
 export type Subscriber<T> = (value: T) => void;
diff --git a/src/runtime/transition/index.ts b/src/runtime/transition/index.ts
index 7ea08a02d2..9369e2a801 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, split_css_unit, is_function } from 'svelte/internal';
+import { cubicOut, cubicInOut, linear } from '../easing';
+import { assign, split_css_unit, is_function } from '../internal';
 
 export type EasingFunction = (t: number) => number;
 
diff --git a/tsconfig.json b/tsconfig.json
index 39532bfe48..16d4a70709 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,12 +1,12 @@
 {
-	"include": [],
+	"include": ["src/**/*"],
 
 	"compilerOptions": {
 		"rootDir": "src",
 
 		// target node v8+ (https://node.green/)
 		// the only missing feature is Array.prototype.values
-		"lib": ["es2017", "DOM"],
+		"lib": ["es2017", "DOM", "DOM.Iterable"],
 		"target": "es2017",
 
 		"declaration": true,

From 573784cbc36514d8b38c41c493be42d19eb89e82 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Thu, 13 Apr 2023 06:46:34 -0700
Subject: [PATCH 105/110] chore: run fewer CI jobs (#8496)

---
 .github/workflows/ci.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0a4d83558f..9288f8333c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,8 +11,17 @@ jobs:
     timeout-minutes: 15
     strategy:
       matrix:
-        node-version: [14, 16, 18]
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        include:
+          - node-version: 14
+            os: ubuntu-latest
+          - node-version: 14
+            os: windows-latest
+          - node-version: 14
+            os: macOS-latest
+          - node-version: 16
+            os: ubuntu-latest
+          - node-version: 18
+            os: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
@@ -37,6 +46,7 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
+        node-version: 14
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - uses: actions/checkout@v3

From d6bcddd582544ee25e48360443194590ebac68c1 Mon Sep 17 00:00:00 2001
From: Hofer Ivan <ivan.hofer@outlook.com>
Date: Fri, 14 Apr 2023 12:28:45 +0200
Subject: [PATCH 106/110] breaking: improve types for `createEventDispatcher`
 (#7224)

---------

Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 .github/workflows/ci.yml              | 13 ++++++--
 CHANGELOG.md                          |  4 ++-
 package.json                          |  2 +-
 src/runtime/internal/lifecycle.ts     | 31 ++++++++++++-------
 test/types/create-event-dispatcher.ts | 43 +++++++++++++++++++++++++++
 test/types/tsconfig.json              | 16 ++++++++++
 6 files changed, 95 insertions(+), 14 deletions(-)
 create mode 100644 test/types/create-event-dispatcher.ts
 create mode 100644 test/types/tsconfig.json

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9288f8333c..8520c04310 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,8 +46,17 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        node-version: 14
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        include:
+          - node-version: 14
+            os: ubuntu-latest
+          - node-version: 14
+            os: windows-latest
+          - node-version: 14
+            os: macOS-latest
+          - node-version: 16
+            os: ubuntu-latest
+          - node-version: 18
+            os: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44b50c6951..a6345d99b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,9 @@
 
 ## Unreleased (4.0)
 
-* Minimum supported Node version is now Node 14
+* **breaking** Minimum supported Node version is now Node 14
+* **breaking** Minimum supported TypeScript version is now 5 (it will likely work with lower versions, but we make no guarantess about that)
+* **breaking** Stricter types for `createEventDispatcher` (see PR for migration instructions) ([#7224](https://github.com/sveltejs/svelte/pull/7224))
 
 ## Unreleased (3.0)
 
diff --git a/package.json b/package.json
index c5239c8b50..dc27fa2084 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
   },
   "types": "types/runtime/index.d.ts",
   "scripts": {
-    "test": "npm run test:unit && npm run test:integration",
+    "test": "npm run test:unit && npm run test:integration && echo \"manually check that there are no type errors in test/types by opening the files in there\"",
     "test:integration": "mocha --exit",
     "test:unit": "mocha --config .mocharc.unit.js --exit",
     "quicktest": "mocha --exit",
diff --git a/src/runtime/internal/lifecycle.ts b/src/runtime/internal/lifecycle.ts
index e75bbdc501..7592e72a38 100644
--- a/src/runtime/internal/lifecycle.ts
+++ b/src/runtime/internal/lifecycle.ts
@@ -56,6 +56,14 @@ export function onDestroy(fn: () => any) {
 	get_current_component().$$.on_destroy.push(fn);
 }
 
+export interface EventDispatcher<EventMap extends Record<string, any>> {
+	<Type extends keyof EventMap>(
+		...args: [EventMap[Type]] extends [never] ? [type: Type, parameter?: null | undefined, options?: DispatchOptions] :
+		null extends EventMap[Type] ? [type: Type, parameter?: EventMap[Type], options?: DispatchOptions] :
+		undefined extends EventMap[Type] ? [type: Type, parameter?: EventMap[Type], options?: DispatchOptions] :
+		[type: Type, parameter: EventMap[Type], options?: DispatchOptions]): boolean;
+}
+
 export interface DispatchOptions {
 	cancelable?: boolean;
 }
@@ -68,20 +76,23 @@ export interface DispatchOptions {
  * [CustomEvent](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent). 
  * These events do not [bubble](https://developer.mozilla.org/en-US/docs/Learn/JavaScript/Building_blocks/Events#Event_bubbling_and_capture).
  * The `detail` argument corresponds to the [CustomEvent.detail](https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent/detail) 
- * property and can contain any type of data. 
+ * property and can contain any type of data.
+ * 
+ * The event dispatcher can be typed to narrow the allowed event names and the type of the `detail` argument:
+ * ```ts
+ * const dispatch = createEventDispatcher<{
+ *  loaded: never; // does not take a detail argument
+ *  change: string; // takes a detail argument of type string, which is required
+ *  optional: number | null; // takes an optional detail argument of type number
+ * }>();
+ * ```
  * 
  * https://svelte.dev/docs#run-time-svelte-createeventdispatcher
  */
-export function createEventDispatcher<EventMap extends {} = any>(): <
-	EventKey extends Extract<keyof EventMap, string>
->(
-	type: EventKey,
-	detail?: EventMap[EventKey],
-	options?: DispatchOptions
-) => boolean {
+export function createEventDispatcher<EventMap extends Record<string, any> = any>(): EventDispatcher<EventMap> {
 	const component = get_current_component();
 
-	return (type: string, detail?: any, { cancelable = false } = {}): boolean => {
+	return ((type: string, detail?: any, { cancelable = false } = {}): boolean => {
 		const callbacks = component.$$.callbacks[type];
 
 		if (callbacks) {
@@ -95,7 +106,7 @@ export function createEventDispatcher<EventMap extends {} = any>(): <
 		}
 
 		return true;
-	};
+	}) as EventDispatcher<EventMap>;
 }
 
 /**
diff --git a/test/types/create-event-dispatcher.ts b/test/types/create-event-dispatcher.ts
new file mode 100644
index 0000000000..d9fc6c65bd
--- /dev/null
+++ b/test/types/create-event-dispatcher.ts
@@ -0,0 +1,43 @@
+import { createEventDispatcher } from '$runtime/internal/lifecycle';
+
+const dispatch = createEventDispatcher<{
+   loaded: never
+   change: string
+   valid: boolean
+   optional: number | null
+}>();
+
+// @ts-expect-error: dispatch invalid event
+dispatch('some-event');
+
+dispatch('loaded');
+dispatch('loaded', null);
+dispatch('loaded', undefined);
+dispatch('loaded', undefined, { cancelable: true });
+// @ts-expect-error: no detail accepted
+dispatch('loaded', 123);
+
+// @ts-expect-error: detail not provided
+dispatch('change');
+dispatch('change', 'string');
+dispatch('change', 'string', { cancelable: true });
+// @ts-expect-error: wrong type of detail
+dispatch('change', 123);
+// @ts-expect-error: wrong type of detail
+dispatch('change', undefined);
+
+dispatch('valid', true);
+dispatch('valid', true, { cancelable: true });
+// @ts-expect-error: wrong type of detail
+dispatch('valid', 'string');
+
+dispatch('optional');
+dispatch('optional', 123);
+dispatch('optional', 123, { cancelable: true });
+dispatch('optional', null);
+dispatch('optional', undefined);
+dispatch('optional', undefined, { cancelable: true });
+// @ts-expect-error: wrong type of optional detail
+dispatch('optional', 'string');
+// @ts-expect-error: wrong type of option
+dispatch('optional', undefined, { cancelabled: true });
diff --git a/test/types/tsconfig.json b/test/types/tsconfig.json
new file mode 100644
index 0000000000..108ed2a2b2
--- /dev/null
+++ b/test/types/tsconfig.json
@@ -0,0 +1,16 @@
+{
+	"extends": "../../tsconfig.json",
+	"compilerOptions": {
+        "rootDir": "../..",
+		"baseUrl": "../../",
+		"paths": {
+			"$runtime/*": ["src/runtime/*"]
+		},
+		// enable strictest options
+		"allowUnreachableCode": false,
+		"noFallthroughCasesInSwitch": true,
+		"noImplicitReturns": true,
+		"strict": true,
+	},
+	"include": ["."]
+}
\ No newline at end of file

From 56a6738a5bdb8a0cd36c74852e04241eec1c2318 Mon Sep 17 00:00:00 2001
From: Tan Li Hau <tanhauhau@users.noreply.github.com>
Date: Fri, 14 Apr 2023 19:21:20 +0800
Subject: [PATCH 107/110] breaking: conditional ActionReturn type if Parameter
 is void (#7442)

---------

Co-authored-by: Ivan Hofer <ivan.hofer@outlook.com>
Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
Co-authored-by: Ignatius Bagus <ignatius.mbs@gmail.com>
Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 CHANGELOG.md                      |   1 +
 src/runtime/action/index.ts       |  19 ++--
 src/runtime/internal/lifecycle.ts |   3 +
 test/types/actions.ts             | 153 ++++++++++++++++++++++++++++++
 4 files changed, 170 insertions(+), 6 deletions(-)
 create mode 100644 test/types/actions.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6345d99b3..e28643f1f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * **breaking** Minimum supported Node version is now Node 14
 * **breaking** Minimum supported TypeScript version is now 5 (it will likely work with lower versions, but we make no guarantess about that)
 * **breaking** Stricter types for `createEventDispatcher` (see PR for migration instructions) ([#7224](https://github.com/sveltejs/svelte/pull/7224))
+* **breaking** Stricter types for `Action` and `ActionReturn` (see PR for migration instructions) ([#7224](https://github.com/sveltejs/svelte/pull/7224))
 
 ## Unreleased (3.0)
 
diff --git a/src/runtime/action/index.ts b/src/runtime/action/index.ts
index 388f6f040e..a672bb7ae5 100644
--- a/src/runtime/action/index.ts
+++ b/src/runtime/action/index.ts
@@ -1,7 +1,8 @@
 /**
  * Actions can return an object containing the two properties defined in this interface. Both are optional.
  * - update: An action can have a parameter. This method will be called whenever that parameter changes,
- *   immediately after Svelte has applied updates to the markup.
+ *   immediately after Svelte has applied updates to the markup. `ActionReturn` and `ActionReturn<never>` both
+ *   mean that the action accepts no parameters, which makes it illegal to set the `update` method.
  * - destroy: Method that is called after the element is unmounted
  *
  * Additionally, you can specify which additional attributes and events the action enables on the applied element.
@@ -25,8 +26,8 @@
  *
  * Docs: https://svelte.dev/docs#template-syntax-element-directives-use-action
  */
-export interface ActionReturn<Parameter = any, Attributes extends Record<string, any> = Record<never, any>> {
-	update?: (parameter: Parameter) => void;
+export interface ActionReturn<Parameter = never, Attributes extends Record<string, any> = Record<never, any>> {
+	update?: [Parameter] extends [never] ? never : (parameter: Parameter) => void;
 	destroy?: () => void;
 	/**
 	 * ### DO NOT USE THIS
@@ -42,15 +43,21 @@ export interface ActionReturn<Parameter = any, Attributes extends Record<string,
  * The following example defines an action that only works on `<div>` elements
  * and optionally accepts a parameter which it has a default value for:
  * ```ts
- * export const myAction: Action<HTMLDivElement, { someProperty: boolean }> = (node, param = { someProperty: true }) => {
+ * export const myAction: Action<HTMLDivElement, { someProperty: boolean } | undefined> = (node, param = { someProperty: true }) => {
  *   // ...
  * }
  * ```
+ * `Action<HTMLDivElement>` and `Action<HTMLDiveElement, never>` both signal that the action accepts no parameters.
+ *
  * You can return an object with methods `update` and `destroy` from the function and type which additional attributes and events it has.
  * See interface `ActionReturn` for more details.
  *
  * Docs: https://svelte.dev/docs#template-syntax-element-directives-use-action
  */
-export interface Action<Element = HTMLElement, Parameter = any, Attributes extends Record<string, any> = Record<never, any>> {
-	<Node extends Element>(node: Node, parameter?: Parameter): void | ActionReturn<Parameter, Attributes>;
+export interface Action<Element = HTMLElement, Parameter = never, Attributes extends Record<string, any> = Record<never, any>> {
+	<Node extends Element>(...args: [Parameter] extends [never] ? [node: Node] : undefined extends Parameter ? [node: Node, parameter?: Parameter] : [node: Node, parameter: Parameter]): void | ActionReturn<Parameter, Attributes>;
 }
+
+// Implementation notes:
+// - undefined extends X instead of X extends undefined makes this work better with both strict and nonstrict mode
+// - [X] extends [never] is needed, X extends never would reduce the whole resulting type to never and not to one of the condition outcomes
diff --git a/src/runtime/internal/lifecycle.ts b/src/runtime/internal/lifecycle.ts
index 7592e72a38..29888e9de3 100644
--- a/src/runtime/internal/lifecycle.ts
+++ b/src/runtime/internal/lifecycle.ts
@@ -57,6 +57,9 @@ export function onDestroy(fn: () => any) {
 }
 
 export interface EventDispatcher<EventMap extends Record<string, any>> {
+	// Implementation notes:
+	// - undefined extends X instead of X extends undefined makes this work better with both strict and nonstrict mode
+	// - [X] extends [never] is needed, X extends never would reduce the whole resulting type to never and not to one of the condition outcomes
 	<Type extends keyof EventMap>(
 		...args: [EventMap[Type]] extends [never] ? [type: Type, parameter?: null | undefined, options?: DispatchOptions] :
 		null extends EventMap[Type] ? [type: Type, parameter?: EventMap[Type], options?: DispatchOptions] :
diff --git a/test/types/actions.ts b/test/types/actions.ts
new file mode 100644
index 0000000000..2a604151a8
--- /dev/null
+++ b/test/types/actions.ts
@@ -0,0 +1,153 @@
+import type { Action, ActionReturn } from '$runtime/action';
+
+// ---------------- Action
+
+const href: Action<HTMLAnchorElement> = (node) => {
+    node.href = '';
+    // @ts-expect-error
+    node.href = 1;
+};
+href;
+
+const required: Action<HTMLElement, boolean> = (node, param) => {
+    node;
+    param;
+};
+required(null as any, true);
+// @ts-expect-error (only in strict mode) boolean missing
+required(null as any);
+// @ts-expect-error no boolean
+required(null as any, 'string');
+
+const required1: Action<HTMLElement, boolean> = (node, param) => {
+    node;
+    param;
+    return {
+        update: (p) => p === true,
+        destroy: () => {}
+    };
+};
+required1;
+
+const required2: Action<HTMLElement, boolean> = (node) => {
+    node;
+};
+required2;
+
+const required3: Action<HTMLElement, boolean> = (node, param) => {
+    node;
+    param;
+    return {
+        // @ts-expect-error comparison always resolves to false
+        update: (p) => p === 'd',
+        destroy: () => {}
+    };
+};
+required3;
+
+const optional: Action<HTMLElement, boolean | undefined> = (node, param?) => {
+    node;
+    param;
+};
+optional(null as any, true);
+optional(null as any);
+// @ts-expect-error no boolean
+optional(null as any, 'string');
+
+const optional1: Action<HTMLElement, boolean | undefined> = (node, param?) => {
+    node;
+    param;
+    return {
+        update: (p) => p === true,
+        destroy: () => {}
+    };
+};
+optional1;
+
+const optional2: Action<HTMLElement, boolean | undefined> = (node) => {
+    node;
+};
+optional2;
+
+const optional3: Action<HTMLElement, boolean | undefined> = (node, param) => {
+    node;
+    param;
+};
+optional3;
+
+const optional4: Action<HTMLElement, boolean | undefined> = (node, param?) => {
+    node;
+    param;
+    return {
+        // @ts-expect-error comparison always resolves to false
+        update: (p) => p === 'd',
+        destroy: () => {}
+    };
+};
+optional4;
+
+const no: Action<HTMLElement, never> = (node) => {
+    node;
+};
+// @ts-expect-error second param
+no(null as any, true);
+no(null as any);
+// @ts-expect-error second param
+no(null as any, 'string');
+
+const no1: Action<HTMLElement, never> = (node) => {
+    node;
+    return {
+        destroy: () => {}
+    };
+};
+no1;
+
+// @ts-expect-error param given
+const no2: Action<HTMLElement, never> = (node, param?) => {};
+no2;
+
+// @ts-expect-error param given
+const no3: Action<HTMLElement, never> = (node, param) => {};
+no3;
+
+// @ts-expect-error update method given
+const no4: Action<HTMLElement, never> = (node) => {
+    return {
+        update: () => {},
+        destroy: () => {}
+    };
+};
+no4;
+
+// ---------------- ActionReturn
+
+const requiredReturn: ActionReturn<string> = {
+    update: (p) => p.toString()
+};
+requiredReturn;
+
+const optionalReturn: ActionReturn<boolean | undefined> = {
+    update: (p) => {
+        p === true;
+        // @ts-expect-error could be undefined
+        p.toString();
+    }
+};
+optionalReturn;
+
+const invalidProperty: ActionReturn = {
+    // @ts-expect-error invalid property
+    invalid: () => {}
+};
+invalidProperty;
+
+type Attributes = ActionReturn<never, { a: string; }>['$$_attributes'];
+const attributes: Attributes = { a: 'a' };
+attributes;
+// @ts-expect-error wrong type
+const invalidAttributes1: Attributes = { a: 1 };
+invalidAttributes1;
+// @ts-expect-error missing prop
+const invalidAttributes2: Attributes = {};
+invalidAttributes2;

From 94606169905b9764789f127917aa8fc23cf61a96 Mon Sep 17 00:00:00 2001
From: Tim McCabe <timmccabe@khanacademy.org>
Date: Fri, 14 Apr 2023 08:51:04 -0400
Subject: [PATCH 108/110] feat: add `a11y-no-static-element-interactions`
 compiler rule (#8251)

Ref: #820
---
 src/compiler/compile/compiler_warnings.ts     |  4 +++
 src/compiler/compile/nodes/Element.ts         | 31 +++++++++++++++++--
 src/compiler/compile/utils/a11y.ts            |  9 ++++--
 .../input.svelte                              | 17 ++++++++++
 .../warnings.json                             | 28 ++++++++---------
 .../input.svelte                              |  6 ++++
 .../warnings.json                             | 16 +++++-----
 .../input.svelte                              | 18 +++++++++++
 .../warnings.json                             | 26 ++++++++++++++++
 .../samples/slot-warning-ignore/input.svelte  |  1 +
 .../samples/slot-warning/input.svelte         |  1 +
 .../samples/slot-warning/warnings.json        |  4 +--
 .../samples/slot-warning2/input.svelte        |  1 +
 .../samples/slot-warning2/warnings.json       |  4 +--
 14 files changed, 135 insertions(+), 31 deletions(-)
 create mode 100644 test/validator/samples/a11y-no-static-element-interactions/input.svelte
 create mode 100644 test/validator/samples/a11y-no-static-element-interactions/warnings.json

diff --git a/src/compiler/compile/compiler_warnings.ts b/src/compiler/compile/compiler_warnings.ts
index a851bc24c2..e9fc80cabe 100644
--- a/src/compiler/compile/compiler_warnings.ts
+++ b/src/compiler/compile/compiler_warnings.ts
@@ -115,6 +115,10 @@ export default {
 		code: 'a11y-no-redundant-roles',
 		message: `A11y: Redundant role '${role}'`
 	}),
+	a11y_no_static_element_interactions: (element: string, handlers: string[]) => ({
+		code: 'a11y-no-static-element-interactions',
+		message: `A11y: <${element}> with ${handlers.join(', ')} ${handlers.length === 1 ? 'handler' : 'handlers'} must have an ARIA role`
+	}),
 	a11y_no_interactive_element_to_noninteractive_role: (role: string | boolean, element: string) => ({
 		code: 'a11y-no-interactive-element-to-noninteractive-role',
 		message: `A11y: <${element}> cannot have role '${role}'`
diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index 2410904d63..3e6d886a5d 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -738,8 +738,10 @@ export default class Element extends Node {
 			}
 		}
 
+		const role = attribute_map.get('role')?.get_static_value() as ARIARoleDefinitionKey;
+
 		// 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 ARIARoleDefinitionKey)) {
+		if (!this.is_dynamic_element && !is_interactive_element(this.name, attribute_map) && !is_interactive_roles(role)) {
 			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);
@@ -747,8 +749,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 ARIARoleDefinitionKey;
+		const role_value = (role ?? 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)));
@@ -762,6 +763,30 @@ export default class Element extends Node {
 					}
 				});
 		}
+
+		const has_dynamic_role = attribute_map.get('role') && !attribute_map.get('role').is_static;
+
+		// no-static-element-interactions
+		if (
+			!has_dynamic_role &&
+			!is_hidden_from_screen_reader(this.name, attribute_map) &&
+			!is_presentation_role(role) &&
+			!is_interactive_element(this.name, attribute_map) &&
+			!is_interactive_roles(role) &&
+			!is_non_interactive_element(this.name, attribute_map) &&
+			!is_non_interactive_roles(role) &&
+			!is_abstract_role(role)
+		) {
+			const interactive_handlers = handlers
+				.map((handler) => handler.name)
+				.filter((handlerName) => a11y_interactive_handlers.has(handlerName));
+			if (interactive_handlers.length > 0) {
+				component.warn(
+					this,
+					compiler_warnings.a11y_no_static_element_interactions(this.name, interactive_handlers)
+				);
+			}
+		}
 	}
 
 	validate_special_cases() {
diff --git a/src/compiler/compile/utils/a11y.ts b/src/compiler/compile/utils/a11y.ts
index 4409f80262..bc23f5c818 100644
--- a/src/compiler/compile/utils/a11y.ts
+++ b/src/compiler/compile/utils/a11y.ts
@@ -19,7 +19,8 @@ const non_interactive_roles = new Set(
 				// 'toolbar' does not descend from widget, but it does support
 				// aria-activedescendant, thus in practice we treat it as a widget.
 				// focusable tabpanel elements are recommended if any panels in a set contain content where the first element in the panel is not focusable.
-				!['toolbar', 'tabpanel'].includes(name) &&
+				// 'generic' is meant to have no semantic meaning.
+				!['toolbar', 'tabpanel', 'generic'].includes(name) &&
 				!role.superClass.some((classes) => classes.includes('widget'))
 			);
 		})
@@ -31,7 +32,11 @@ const non_interactive_roles = new Set(
 );
 
 const interactive_roles = new Set(
-	non_abstract_roles.filter((name) => !non_interactive_roles.has(name))
+	non_abstract_roles.filter((name) => 
+		!non_interactive_roles.has(name) &&
+		// 'generic' is meant to have no semantic meaning.
+		name !== 'generic'
+	)
 );
 
 export function is_non_interactive_roles(role: ARIARoleDefinitionKey) {
diff --git a/test/validator/samples/a11y-click-events-have-key-events/input.svelte b/test/validator/samples/a11y-click-events-have-key-events/input.svelte
index 8737f04ec5..c6ac9ac866 100644
--- a/test/validator/samples/a11y-click-events-have-key-events/input.svelte
+++ b/test/validator/samples/a11y-click-events-have-key-events/input.svelte
@@ -9,12 +9,16 @@
 </script>
 
 <!-- should warn -->
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:click={noop} />
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:click={noop} aria-hidden="false" />
 
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <section on:click={noop} />
 <main on:click={noop} />
 <article on:click={noop} />
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <header on:click={noop} />
 <footer on:click={noop} />
 
@@ -28,24 +32,37 @@
 <input type="button" on:click={noop} />
 <input type={dynamicTypeValue} on:click={noop} />
 
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:click={noop} {...props} />
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:click={noop} on:keydown={noop} />
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:click={noop} on:keyup={noop} />
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:click={noop} on:keypress={noop} />
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:click={noop} on:keydown={noop} on:keyup={noop} />
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:click={noop} on:keyup={noop} on:keypress={noop} />
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:click={noop} on:keypress={noop} on:keydown={noop} />
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:click={noop} on:keydown={noop} on:keyup={noop} on:keypress={noop} />
 
 <input on:click={noop} type="hidden" />
 
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:click={noop} aria-hidden />
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:click={noop} aria-hidden="true" />
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:click={noop} aria-hidden="false" on:keydown={noop} />
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:click={noop} aria-hidden={dynamicAriaHiddenValue} />
 
 <div on:click={noop} role="presentation" />
 <div on:click={noop} role="none" />
 <div on:click={noop} role={dynamicRole} />
 
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <svelte:element this={Math.random() ? 'button' : 'div'} on:click={noop} />
diff --git a/test/validator/samples/a11y-click-events-have-key-events/warnings.json b/test/validator/samples/a11y-click-events-have-key-events/warnings.json
index 904c733a99..42eaed0025 100644
--- a/test/validator/samples/a11y-click-events-have-key-events/warnings.json
+++ b/test/validator/samples/a11y-click-events-have-key-events/warnings.json
@@ -3,11 +3,11 @@
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
-			"line": 12,
+			"line": 13,
 			"column": 0
 		},
 		"end": {
-			"line": 12,
+			"line": 13,
 			"column": 23
 		}
 	},
@@ -15,11 +15,11 @@
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
-			"line": 13,
+			"line": 15,
 			"column": 0
 		},
 		"end": {
-			"line": 13,
+			"line": 15,
 			"column": 43
 		}
 	},
@@ -27,11 +27,11 @@
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
-			"line": 15,
+			"line": 18,
 			"column": 0
 		},
 		"end": {
-			"line": 15,
+			"line": 18,
 			"column": 27
 		}
 	},
@@ -39,11 +39,11 @@
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
-			"line": 16,
+			"line": 19,
 			"column": 0
 		},
 		"end": {
-			"line": 16,
+			"line": 19,
 			"column": 24
 		}
 	},
@@ -51,11 +51,11 @@
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
-			"line": 17,
+			"line": 20,
 			"column": 0
 		},
 		"end": {
-			"line": 17,
+			"line": 20,
 			"column": 27
 		}
 	},
@@ -63,11 +63,11 @@
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
-			"line": 18,
+			"line": 22,
 			"column": 0
 		},
 		"end": {
-			"line": 18,
+			"line": 22,
 			"column": 26
 		}
 	},
@@ -75,11 +75,11 @@
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
-			"line": 19,
+			"line": 23,
 			"column": 0
 		},
 		"end": {
-			"line": 19,
+			"line": 23,
 			"column": 26
 		}
 	}
diff --git a/test/validator/samples/a11y-mouse-events-have-key-events/input.svelte b/test/validator/samples/a11y-mouse-events-have-key-events/input.svelte
index ae67bcd307..493f637c75 100644
--- a/test/validator/samples/a11y-mouse-events-have-key-events/input.svelte
+++ b/test/validator/samples/a11y-mouse-events-have-key-events/input.svelte
@@ -7,9 +7,15 @@
 	};
 </script>
 
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:mouseover={() => void 0} />
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:mouseover={() => void 0} on:focus={() => void 0} />
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:mouseover={() => void 0} {...otherProps} />
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:mouseout={() => void 0} />
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:mouseout={() => void 0} on:blur={() => void 0} />
+<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div on:mouseout={() => void 0} {...otherProps} />
diff --git a/test/validator/samples/a11y-mouse-events-have-key-events/warnings.json b/test/validator/samples/a11y-mouse-events-have-key-events/warnings.json
index e67a2a718f..7aae042a79 100644
--- a/test/validator/samples/a11y-mouse-events-have-key-events/warnings.json
+++ b/test/validator/samples/a11y-mouse-events-have-key-events/warnings.json
@@ -3,48 +3,48 @@
         "code": "a11y-mouse-events-have-key-events",
         "end": {
             "column": 35,
-            "line": 10
+            "line": 11
         },
         "message": "A11y: on:mouseover must be accompanied by on:focus",
         "start": {
             "column": 0,
-            "line": 10
+            "line": 11
         }
     },
     {
         "code": "a11y-mouse-events-have-key-events",
         "end": {
             "column": 51,
-            "line": 12
+            "line": 15
         },
         "message": "A11y: on:mouseover must be accompanied by on:focus",
         "start": {
             "column": 0,
-            "line": 12
+            "line": 15
         }
     },
     {
         "code": "a11y-mouse-events-have-key-events",
         "end": {
             "column": 34,
-            "line": 13
+            "line": 17
         },
         "message": "A11y: on:mouseout must be accompanied by on:blur",
         "start": {
             "column": 0,
-            "line": 13
+            "line": 17
         }
     },
     {
         "code": "a11y-mouse-events-have-key-events",
         "end": {
             "column": 50,
-            "line": 15
+            "line": 21
         },
         "message": "A11y: on:mouseout must be accompanied by on:blur",
         "start": {
             "column": 0,
-            "line": 15
+            "line": 21
         }
     }
 ]
diff --git a/test/validator/samples/a11y-no-static-element-interactions/input.svelte b/test/validator/samples/a11y-no-static-element-interactions/input.svelte
new file mode 100644
index 0000000000..06a389d025
--- /dev/null
+++ b/test/validator/samples/a11y-no-static-element-interactions/input.svelte
@@ -0,0 +1,18 @@
+<script>
+	const dynamicRole = "button";
+</script>
+
+<!-- valid -->
+<button on:click={() => {}} />
+<!-- svelte-ignore a11y-interactive-supports-focus -->
+<div on:keydown={() => {}} role="button" />
+<input type="text" on:click={() => {}} />
+<div on:copy={() => {}} />
+<a href="/foo" on:click={() => {}}>link</a>
+<div role={dynamicRole} on:click={() => {}} />
+<footer on:keydown={() => {}} />
+
+<!-- invalid -->
+<div on:keydown={() => {}} />
+<!-- svelte-ignore a11y-missing-attribute -->
+<a on:mousedown={() => {}} on:mouseup={() => {}} on:copy={() => {}}>link</a>
diff --git a/test/validator/samples/a11y-no-static-element-interactions/warnings.json b/test/validator/samples/a11y-no-static-element-interactions/warnings.json
new file mode 100644
index 0000000000..d70ab42a2a
--- /dev/null
+++ b/test/validator/samples/a11y-no-static-element-interactions/warnings.json
@@ -0,0 +1,26 @@
+[
+	{
+		"code": "a11y-no-static-element-interactions",
+		"end": {
+			"column": 29,
+			"line": 16
+		},
+		"message": "A11y: <div> with keydown handler must have an ARIA role",
+		"start": {
+			"column": 0,
+			"line": 16
+		}
+	},
+	{
+		"code": "a11y-no-static-element-interactions",
+		"end": {
+			"column": 76,
+			"line": 18
+		},
+		"message": "A11y: <a> with mousedown, mouseup handlers must have an ARIA role",
+		"start": {
+			"column": 0,
+			"line": 18
+		}
+	}
+]
diff --git a/test/validator/samples/slot-warning-ignore/input.svelte b/test/validator/samples/slot-warning-ignore/input.svelte
index 003b5bde63..032264aa97 100644
--- a/test/validator/samples/slot-warning-ignore/input.svelte
+++ b/test/validator/samples/slot-warning-ignore/input.svelte
@@ -4,5 +4,6 @@
 
 <Component>
 	<!-- svelte-ignore a11y-click-events-have-key-events -->
+	<!-- svelte-ignore a11y-no-static-element-interactions -->
 	<div slot='foo' on:click>hi!</div>
 </Component>
diff --git a/test/validator/samples/slot-warning/input.svelte b/test/validator/samples/slot-warning/input.svelte
index 3d60236edc..d5f0e7b210 100644
--- a/test/validator/samples/slot-warning/input.svelte
+++ b/test/validator/samples/slot-warning/input.svelte
@@ -3,5 +3,6 @@
 </script>
 
 <Component>
+	<!-- svelte-ignore a11y-no-static-element-interactions -->
 	<div slot='foo' on:click>hi!</div>
 </Component>
diff --git a/test/validator/samples/slot-warning/warnings.json b/test/validator/samples/slot-warning/warnings.json
index 66ae0fa3a7..52157ecc45 100644
--- a/test/validator/samples/slot-warning/warnings.json
+++ b/test/validator/samples/slot-warning/warnings.json
@@ -4,11 +4,11 @@
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
 			"column": 1,
-			"line": 6
+			"line": 7
 		},
 		"end": {
 			"column": 35,
-			"line": 6
+			"line": 7
 		}
 	}
 ]
diff --git a/test/validator/samples/slot-warning2/input.svelte b/test/validator/samples/slot-warning2/input.svelte
index ab3c52d35d..e1cf63a5bf 100644
--- a/test/validator/samples/slot-warning2/input.svelte
+++ b/test/validator/samples/slot-warning2/input.svelte
@@ -4,5 +4,6 @@
 
 <Component>
 	<!-- svelte-ignore unrelated-warning -->
+	<!-- svelte-ignore a11y-no-static-element-interactions -->
 	<div slot='foo' on:click>hi!</div>
 </Component>
diff --git a/test/validator/samples/slot-warning2/warnings.json b/test/validator/samples/slot-warning2/warnings.json
index 52157ecc45..b6dcf85b97 100644
--- a/test/validator/samples/slot-warning2/warnings.json
+++ b/test/validator/samples/slot-warning2/warnings.json
@@ -4,11 +4,11 @@
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
 			"column": 1,
-			"line": 7
+			"line": 8
 		},
 		"end": {
 			"column": 35,
-			"line": 7
+			"line": 8
 		}
 	}
 ]

From 88728e35918738ea28e50f0bdf588b3777aac502 Mon Sep 17 00:00:00 2001
From: Theodore Brown <theodorejb@outlook.com>
Date: Fri, 14 Apr 2023 10:13:30 -0500
Subject: [PATCH 109/110] fix: bind null option and input values consistently
 (#8328)

Null and undefined `value` bindings should always be set to an empty string. This allows native browser validation of `required` fields to work as expected with placeholder options.

Placeholder options bound to null are necessary in forms where the field is conditionally required, and the bound value is posted to an API endpoint which requires it to be a nullable number or object rather than a string.

fixes #8312
---
 .../render_dom/wrappers/Element/Attribute.ts  |  2 +-
 .../samples/select-dynamic-value/expected.js  |  7 +++--
 .../_config.js                                | 28 +++++++++++++++++++
 .../main.svelte                               | 11 ++++++++
 4 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 test/runtime/samples/binding-select-null-placeholder/_config.js
 create mode 100644 test/runtime/samples/binding-select-null-placeholder/main.svelte

diff --git a/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts b/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
index 64178030f6..61311fd83c 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
@@ -172,7 +172,7 @@ export default class AttributeWrapper extends BaseAttributeWrapper {
 		}
 
 		if (is_indirectly_bound_value) {
-			const update_value = b`${element.var}.value = ${element.var}.__value;`;
+			const update_value = b`@set_input_value(${element.var}, ${element.var}.__value);`;
 			block.chunks.hydrate.push(update_value);
 
 			updater = b`
diff --git a/test/js/samples/select-dynamic-value/expected.js b/test/js/samples/select-dynamic-value/expected.js
index cd1ab1d812..1d0896d6e8 100644
--- a/test/js/samples/select-dynamic-value/expected.js
+++ b/test/js/samples/select-dynamic-value/expected.js
@@ -8,7 +8,8 @@ import {
 	insert,
 	noop,
 	safe_not_equal,
-	select_option
+	select_option,
+	set_input_value
 } from "svelte/internal";
 
 function create_fragment(ctx) {
@@ -24,9 +25,9 @@ function create_fragment(ctx) {
 			option1 = element("option");
 			option1.textContent = "2";
 			option0.__value = "1";
-			option0.value = option0.__value;
+			set_input_value(option0, option0.__value);
 			option1.__value = "2";
-			option1.value = option1.__value;
+			set_input_value(option1, option1.__value);
 		},
 		m(target, anchor) {
 			insert(target, select, anchor);
diff --git a/test/runtime/samples/binding-select-null-placeholder/_config.js b/test/runtime/samples/binding-select-null-placeholder/_config.js
new file mode 100644
index 0000000000..b453e6869a
--- /dev/null
+++ b/test/runtime/samples/binding-select-null-placeholder/_config.js
@@ -0,0 +1,28 @@
+const items = [ { id: 'a' }, { id: 'b' } ];
+
+export default {
+	props: {
+		foo: null,
+		items
+	},
+
+	test({ assert, component, target }) {
+		const select = target.querySelector( 'select' );
+		const options = target.querySelectorAll( 'option' );
+
+		assert.equal( options[0].selected, true );
+		assert.equal( options[0].disabled, true );
+		assert.equal( options[1].selected, false );
+		assert.equal( options[1].disabled, false );
+
+		// placeholder option value must be blank string for native required field validation
+		assert.equal( options[0].value, '' );
+		assert.equal( select.checkValidity(), false );
+
+		component.foo = items[0];
+
+		assert.equal( options[0].selected, false );
+		assert.equal( options[1].selected, true );
+		assert.equal( select.checkValidity(), true );
+	}
+};
diff --git a/test/runtime/samples/binding-select-null-placeholder/main.svelte b/test/runtime/samples/binding-select-null-placeholder/main.svelte
new file mode 100644
index 0000000000..65cab99495
--- /dev/null
+++ b/test/runtime/samples/binding-select-null-placeholder/main.svelte
@@ -0,0 +1,11 @@
+<script>
+	export let foo;
+	export let items;
+</script>
+
+<select bind:value={foo} required>
+	<option value={null} disabled>Select an option</option>
+	{#each items as item}
+		<option value={item}>{item.id}</option>
+	{/each}
+</select>

From d1a972217e583d0aedd231be6ef72e379c409ea2 Mon Sep 17 00:00:00 2001
From: Nguyen Tran <88808276+ngtr6788@users.noreply.github.com>
Date: Fri, 14 Apr 2023 11:20:40 -0400
Subject: [PATCH 110/110] feat: add a11y
 `no-noninteractive-element-interactions` (#8391)

#820
---
 CHANGELOG.md                                  |  3 +
 .../content/docs/06-accessibility-warnings.md | 14 +++++
 src/compiler/compile/compiler_warnings.ts     |  4 ++
 src/compiler/compile/nodes/Element.ts         | 41 +++++++++---
 .../input.svelte                              |  3 +
 .../warnings.json                             | 16 ++---
 .../input.svelte                              | 14 +++++
 .../warnings.json                             | 62 +++++++++++++++++++
 .../input.svelte                              |  1 +
 .../warnings.json                             |  8 +--
 10 files changed, 146 insertions(+), 20 deletions(-)
 create mode 100644 test/validator/samples/a11y-no-noninteractive-element-interactions/input.svelte
 create mode 100644 test/validator/samples/a11y-no-noninteractive-element-interactions/warnings.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e28643f1f0..fb855b2996 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@
 * **breaking** Minimum supported TypeScript version is now 5 (it will likely work with lower versions, but we make no guarantess about that)
 * **breaking** Stricter types for `createEventDispatcher` (see PR for migration instructions) ([#7224](https://github.com/sveltejs/svelte/pull/7224))
 * **breaking** Stricter types for `Action` and `ActionReturn` (see PR for migration instructions) ([#7224](https://github.com/sveltejs/svelte/pull/7224))
+* Add `a11y no-noninteractive-element-interactions` rule ([#8391](https://github.com/sveltejs/svelte/pull/8391))
+* Add `a11y-no-static-element-interactions`rule ([#8251](https://github.com/sveltejs/svelte/pull/8251))
+* Bind `null` option and input values consistently ([#8312](https://github.com/sveltejs/svelte/issues/8312))
 
 ## Unreleased (3.0)
 
diff --git a/site/content/docs/06-accessibility-warnings.md b/site/content/docs/06-accessibility-warnings.md
index 0d025d797d..934cf638e6 100644
--- a/site/content/docs/06-accessibility-warnings.md
+++ b/site/content/docs/06-accessibility-warnings.md
@@ -288,6 +288,20 @@ Some HTML elements have default ARIA roles. Giving these elements an ARIA role t
 
 ---
 
+### `a11y-no-noninteractive-element-interactions`
+
+A non-interactive element does not support event handlers (mouse and key handlers). Non-interactive elements include `<main>`, `<area>`, `<h1>` (,`<h2>`, etc), `<p>`, `<img>`, `<li>`, `<ul>` and `<ol>`. Non-interactive [WAI-ARIA roles](https://www.w3.org/TR/wai-aria-1.1/#usage_intro) include `article`, `banner`, `complementary`, `img`, `listitem`, `main`, `region` and `tooltip`.
+
+```sv
+<!-- `A11y: Non-interactive element <li> should not be assigned mouse or keyboard event listeners.` -->
+<li on:click={() => {}} />
+
+<!-- `A11y: Non-interactive element <div> should not be assigned mouse or keyboard event listeners.` -->
+<div role="listitem" on:click={() => {}} />
+```
+
+---
+
 ### `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`.
diff --git a/src/compiler/compile/compiler_warnings.ts b/src/compiler/compile/compiler_warnings.ts
index e9fc80cabe..2138e81213 100644
--- a/src/compiler/compile/compiler_warnings.ts
+++ b/src/compiler/compile/compiler_warnings.ts
@@ -123,6 +123,10 @@ export default {
 		code: 'a11y-no-interactive-element-to-noninteractive-role',
 		message: `A11y: <${element}> cannot have role '${role}'`
 	}),
+	a11y_no_noninteractive_element_interactions: (element: string) => ({
+		code: 'a11y-no-noninteractive-element-interactions',
+		message: `A11y: Non-interactive element <${element}> should not be assigned mouse or keyboard event listeners.`
+	}),
 	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}'`
diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index 3e6d886a5d..ee62d3e7e8 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -11,7 +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 { is_name_contenteditable, get_contenteditable_attr, has_contenteditable_attr } from '../utils/contenteditable';
 import { regex_dimensions, regex_starts_with_newline, regex_non_whitespace_character, regex_box_size } from '../../utils/patterns';
 import fuzzymatch from '../../utils/fuzzymatch';
 import list from '../../utils/list';
@@ -102,6 +102,15 @@ const a11y_interactive_handlers = new Set([
 	'mouseup'
 ]);
 
+const a11y_recommended_interactive_handlers = new Set([
+	'click',
+	'mousedown',
+	'mouseup',
+	'keypress',
+	'keydown',
+	'keyup'
+]);
+
 const a11y_nested_implicit_semantics = new Map([
 	['header', 'banner'],
 	['footer', 'contentinfo']
@@ -738,10 +747,12 @@ export default class Element extends Node {
 			}
 		}
 
-		const role = attribute_map.get('role')?.get_static_value() as ARIARoleDefinitionKey;
+		const role = attribute_map.get('role');
+		const role_static_value = role?.get_static_value() as ARIARoleDefinitionKey;
+		const role_value = (role ? role_static_value : get_implicit_role(this.name, attribute_map)) as ARIARoleDefinitionKey;
 
 		// no-noninteractive-tabindex
-		if (!this.is_dynamic_element && !is_interactive_element(this.name, attribute_map) && !is_interactive_roles(role)) {
+		if (!this.is_dynamic_element && !is_interactive_element(this.name, attribute_map) && !is_interactive_roles(role_static_value)) {
 			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);
@@ -749,7 +760,6 @@ export default class Element extends Node {
 		}
 
 		// role-supports-aria-props
-		const role_value = (role ?? 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)));
@@ -764,18 +774,33 @@ export default class Element extends Node {
 				});
 		}
 
+		// no-noninteractive-element-interactions
+		if (
+			!has_contenteditable_attr(this) &&
+			!is_hidden_from_screen_reader(this.name, attribute_map) &&
+			!is_presentation_role(role_static_value) &&
+			((!is_interactive_element(this.name, attribute_map) && 
+				is_non_interactive_roles(role_static_value)) ||
+			 (is_non_interactive_element(this.name, attribute_map) && !role))
+		) {
+			const has_interactive_handlers = handlers.some((handler) => a11y_recommended_interactive_handlers.has(handler.name));
+			if (has_interactive_handlers) {
+				component.warn(this, compiler_warnings.a11y_no_noninteractive_element_interactions(this.name));
+			}
+		}
+
 		const has_dynamic_role = attribute_map.get('role') && !attribute_map.get('role').is_static;
 
 		// no-static-element-interactions
 		if (
 			!has_dynamic_role &&
 			!is_hidden_from_screen_reader(this.name, attribute_map) &&
-			!is_presentation_role(role) &&
+			!is_presentation_role(role_static_value) &&
 			!is_interactive_element(this.name, attribute_map) &&
-			!is_interactive_roles(role) &&
+			!is_interactive_roles(role_static_value) &&
 			!is_non_interactive_element(this.name, attribute_map) &&
-			!is_non_interactive_roles(role) &&
-			!is_abstract_role(role)
+			!is_non_interactive_roles(role_static_value) &&
+			!is_abstract_role(role_static_value)
 		) {
 			const interactive_handlers = handlers
 				.map((handler) => handler.name)
diff --git a/test/validator/samples/a11y-click-events-have-key-events/input.svelte b/test/validator/samples/a11y-click-events-have-key-events/input.svelte
index c6ac9ac866..3fb1ded53d 100644
--- a/test/validator/samples/a11y-click-events-have-key-events/input.svelte
+++ b/test/validator/samples/a11y-click-events-have-key-events/input.svelte
@@ -16,10 +16,13 @@
 
 <!-- svelte-ignore a11y-no-static-element-interactions -->
 <section on:click={noop} />
+<!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
 <main on:click={noop} />
+<!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
 <article on:click={noop} />
 <!-- svelte-ignore a11y-no-static-element-interactions -->
 <header on:click={noop} />
+<!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
 <footer on:click={noop} />
 
 <!-- should not warn -->
diff --git a/test/validator/samples/a11y-click-events-have-key-events/warnings.json b/test/validator/samples/a11y-click-events-have-key-events/warnings.json
index 42eaed0025..f508c12785 100644
--- a/test/validator/samples/a11y-click-events-have-key-events/warnings.json
+++ b/test/validator/samples/a11y-click-events-have-key-events/warnings.json
@@ -39,11 +39,11 @@
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
-			"line": 19,
+			"line": 20,
 			"column": 0
 		},
 		"end": {
-			"line": 19,
+			"line": 20,
 			"column": 24
 		}
 	},
@@ -51,11 +51,11 @@
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
-			"line": 20,
+			"line": 22,
 			"column": 0
 		},
 		"end": {
-			"line": 20,
+			"line": 22,
 			"column": 27
 		}
 	},
@@ -63,11 +63,11 @@
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
-			"line": 22,
+			"line": 24,
 			"column": 0
 		},
 		"end": {
-			"line": 22,
+			"line": 24,
 			"column": 26
 		}
 	},
@@ -75,11 +75,11 @@
 		"code": "a11y-click-events-have-key-events",
 		"message": "A11y: visible, non-interactive elements with an on:click event must be accompanied by an on:keydown, on:keyup, or on:keypress event.",
 		"start": {
-			"line": 23,
+			"line": 26,
 			"column": 0
 		},
 		"end": {
-			"line": 23,
+			"line": 26,
 			"column": 26
 		}
 	}
diff --git a/test/validator/samples/a11y-no-noninteractive-element-interactions/input.svelte b/test/validator/samples/a11y-no-noninteractive-element-interactions/input.svelte
new file mode 100644
index 0000000000..91d0ddc382
--- /dev/null
+++ b/test/validator/samples/a11y-no-noninteractive-element-interactions/input.svelte
@@ -0,0 +1,14 @@
+<!-- VALID -->
+<div role="presentation" on:mouseup={() => {}} />
+<div role="button" tabindex="-1" on:click={() => {}} on:keypress={() => {}} />
+<div role="listitem" aria-hidden on:click={() => {}} on:keypress={() => {}} />
+<button on:click={() => {}} />
+<h1 contenteditable="true" on:keydown={() => {}}>Heading</h1>
+<h1>Heading</h1>
+
+<!-- INVALID -->
+<div role="listitem" on:mousedown={() => {}} />
+<h1 on:click={() => {}} on:keydown={() => {}}>Heading</h1>
+<h1 role="banner" on:keyup={() => {}}>Heading</h1>
+<p on:keypress={() => {}} />
+<div role="paragraph" on:mouseup={() => {}} />
diff --git a/test/validator/samples/a11y-no-noninteractive-element-interactions/warnings.json b/test/validator/samples/a11y-no-noninteractive-element-interactions/warnings.json
new file mode 100644
index 0000000000..66b387b2c3
--- /dev/null
+++ b/test/validator/samples/a11y-no-noninteractive-element-interactions/warnings.json
@@ -0,0 +1,62 @@
+[
+  {
+    "code": "a11y-no-noninteractive-element-interactions",
+    "end": {
+      "column": 47,
+      "line": 10
+    },
+    "message": "A11y: Non-interactive element <div> should not be assigned mouse or keyboard event listeners.",
+    "start": {
+      "column": 0,
+      "line": 10
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-interactions",
+    "end": {
+      "column": 58,
+      "line": 11
+    },
+    "message": "A11y: Non-interactive element <h1> should not be assigned mouse or keyboard event listeners.",
+    "start": {
+      "column": 0,
+      "line": 11
+    }
+  },
+  {
+    "code": "a11y-no-noninteractive-element-interactions",
+    "end": {
+      "column": 50,
+      "line": 12
+    },
+    "message": "A11y: Non-interactive element <h1> should not be assigned mouse or keyboard event listeners.",
+    "start": {
+      "column": 0,
+      "line": 12
+    }
+  },
+  {
+		"code": "a11y-no-noninteractive-element-interactions",
+		"end": {
+			"column": 28,
+			"line": 13
+		},
+		"message": "A11y: Non-interactive element <p> should not be assigned mouse or keyboard event listeners.",
+		"start": {
+			"column": 0,
+			"line": 13
+		}
+	},
+	{
+		"code": "a11y-no-noninteractive-element-interactions",
+		"end": {
+			"column": 46,
+			"line": 14
+		},
+		"message": "A11y: Non-interactive element <div> should not be assigned mouse or keyboard event listeners.",
+		"start": {
+			"column": 0,
+			"line": 14
+		}
+	}
+]
diff --git a/test/validator/samples/a11y-no-static-element-interactions/input.svelte b/test/validator/samples/a11y-no-static-element-interactions/input.svelte
index 06a389d025..bb4c5e3047 100644
--- a/test/validator/samples/a11y-no-static-element-interactions/input.svelte
+++ b/test/validator/samples/a11y-no-static-element-interactions/input.svelte
@@ -10,6 +10,7 @@
 <div on:copy={() => {}} />
 <a href="/foo" on:click={() => {}}>link</a>
 <div role={dynamicRole} on:click={() => {}} />
+<!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
 <footer on:keydown={() => {}} />
 
 <!-- invalid -->
diff --git a/test/validator/samples/a11y-no-static-element-interactions/warnings.json b/test/validator/samples/a11y-no-static-element-interactions/warnings.json
index d70ab42a2a..8ca74b7a1b 100644
--- a/test/validator/samples/a11y-no-static-element-interactions/warnings.json
+++ b/test/validator/samples/a11y-no-static-element-interactions/warnings.json
@@ -3,24 +3,24 @@
 		"code": "a11y-no-static-element-interactions",
 		"end": {
 			"column": 29,
-			"line": 16
+			"line": 17
 		},
 		"message": "A11y: <div> with keydown handler must have an ARIA role",
 		"start": {
 			"column": 0,
-			"line": 16
+			"line": 17
 		}
 	},
 	{
 		"code": "a11y-no-static-element-interactions",
 		"end": {
 			"column": 76,
-			"line": 18
+			"line": 19
 		},
 		"message": "A11y: <a> with mousedown, mouseup handlers must have an ARIA role",
 		"start": {
 			"column": 0,
-			"line": 18
+			"line": 19
 		}
 	}
 ]