diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8b4979fde..ede7feaf22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,43 @@
 
 ## Unreleased
 
+* 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))
+* 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))
+* 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))
+* 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
 
diff --git a/elements/index.d.ts b/elements/index.d.ts
index d57d97ad28..72a077a7d5 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;
@@ -540,10 +543,12 @@ export interface HTMLAttributes<T extends EventTarget> extends AriaAttributes, D
 	'bind:textContent'?: string | undefined | null;
 
 	// SvelteKit
+	'data-sveltekit-keepfocus'?: true | '' | 'off' | undefined | null;
 	'data-sveltekit-noscroll'?: true | '' | 'off' | undefined | null;
 	'data-sveltekit-preload-code'?: true | '' | 'eager' | 'viewport' | 'hover' | 'tap' | 'off' | undefined | null;
 	'data-sveltekit-preload-data'?: true | '' | 'hover' | 'tap' | 'off' | undefined | null;
 	'data-sveltekit-reload'?: true | '' | 'off' | undefined | null;
+	'data-sveltekit-replacestate'?: true | '' | 'off' | undefined | null;
 }
 
 export type HTMLAttributeAnchorTarget =
@@ -705,6 +710,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> {
@@ -840,6 +848,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;
@@ -860,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;
 }
diff --git a/package-lock.json b/package-lock.json
index 5ab035cd2e..a374ae9b32 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,43 +10,43 @@
       "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-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",
         "@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": "^0.2.5",
-        "css-tree": "^2.2.1",
-        "eslint": "^8.26.0",
-        "eslint-plugin-import": "^2.26.0",
+        "code-red": "^1.0.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.25.3",
+        "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",
-        "sourcemap-codec": "^1.4.8",
         "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",
@@ -162,6 +183,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",
@@ -238,14 +265,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": "^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": {
-        "rollup-pluginutils": "^2.5.0"
+        "@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",
@@ -296,22 +368,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": {
@@ -328,23 +448,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",
@@ -375,9 +511,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": {
@@ -420,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": {
@@ -453,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"
@@ -468,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"
@@ -495,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"
@@ -512,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": {
@@ -538,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"
@@ -551,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": {
@@ -578,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"
@@ -593,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"
       },
@@ -617,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"
@@ -649,9 +785,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"
@@ -701,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": {
@@ -816,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": {
@@ -844,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": {
@@ -1105,17 +1277,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": {
@@ -1182,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": {
@@ -1243,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"
@@ -1575,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",
@@ -1594,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",
@@ -1631,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": {
@@ -1650,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": {
@@ -1671,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": {
@@ -1757,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": {
@@ -1789,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",
@@ -2196,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",
@@ -2235,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"
@@ -2247,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"
@@ -2286,10 +2409,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",
@@ -2352,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",
@@ -2559,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": {
@@ -2652,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"
@@ -3027,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"
@@ -3159,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": "*"
@@ -3526,18 +3652,21 @@
       }
     },
     "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": {
-      "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": {
@@ -3883,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"
@@ -4022,11 +4151,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"
       }
@@ -4327,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"
       },
@@ -4388,28 +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-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",
@@ -4840,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": {
@@ -5302,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",
@@ -5344,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": {
@@ -5373,6 +5498,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",
@@ -5439,12 +5570,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": {
@@ -5487,22 +5643,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"
           }
         }
       }
@@ -5518,20 +5697,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",
@@ -5562,9 +5742,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": {
@@ -5607,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"
@@ -5635,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"
@@ -5700,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": {
@@ -5738,9 +5918,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": {
@@ -5775,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"
+          }
         }
       }
     },
@@ -5867,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"
       }
     },
@@ -5886,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"
       }
     },
@@ -6099,17 +6301,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": {
@@ -6167,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"
       }
     },
@@ -6220,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"
@@ -6479,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",
@@ -6498,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",
@@ -6776,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": {
@@ -6797,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": {
@@ -6814,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": {
@@ -6908,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
         }
       }
@@ -6949,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",
@@ -6974,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
         }
       }
@@ -7014,10 +7175,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",
@@ -7073,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",
@@ -7238,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": {
@@ -7307,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"
@@ -7565,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"
@@ -7652,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": "*"
@@ -7949,18 +8113,18 @@
       }
     },
     "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": {
-      "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": {
@@ -8227,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": {
@@ -8336,11 +8500,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"
       }
@@ -8575,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"
       }
@@ -8625,29 +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
-    },
-    "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",
@@ -8977,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 1efd4cb780..1c8d3bceab 100644
--- a/package.json
+++ b/package.json
@@ -120,43 +120,43 @@
   "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-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",
     "@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": "^0.2.5",
-    "css-tree": "^2.2.1",
-    "eslint": "^8.26.0",
-    "eslint-plugin-import": "^2.26.0",
+    "code-red": "^1.0.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.25.3",
+    "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",
-    "sourcemap-codec": "^1.4.8",
     "tiny-glob": "^0.2.9",
-    "tslib": "^2.4.1",
+    "tslib": "^2.5.0",
     "typescript": "^3.7.5",
     "util": "^0.12.5"
   }
diff --git a/site/content/docs/03-template-syntax.md b/site/content/docs/03-template-syntax.md
index 481fbd4405..ebc4ee8ef2 100644
--- a/site/content/docs/03-template-syntax.md
+++ b/site/content/docs/03-template-syntax.md
@@ -206,6 +206,7 @@ Additional conditions can be added with `{:else if expression}`, optionally endi
 {/if}
 ```
 
+(Blocks don't have to wrap elements, they can also wrap text within elements!)
 
 ### {#each ...}
 
@@ -538,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
@@ -712,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
@@ -720,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:
 
@@ -740,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
@@ -750,6 +754,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
 
 ---
@@ -1500,6 +1520,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*`">`
 
 ---
diff --git a/site/content/docs/04-run-time.md b/site/content/docs/04-run-time.md
index bf5574ad44..46d025fe3e 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`
 
@@ -698,7 +721,7 @@ out:fly={params}
 
 ---
 
-Animates the x and y positions and the opacity of an element. `in` transitions animate from an element's current (default) values to the provided values, passed as parameters. `out` transitions animate from the provided values to an element's default values.
+Animates the x and y positions and the opacity of an element. `in` transitions animate from the provided values, passed as parameters to the element's default values. `out` transitions animate from the element's default values to the provided values.
 
 `fly` accepts the following parameters:
 
@@ -745,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>
@@ -753,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}
 ```
@@ -853,7 +877,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/site/content/docs/06-accessibility-warnings.md b/site/content/docs/06-accessibility-warnings.md
index 8d3d44a94e..4324ed7b75 100644
--- a/site/content/docs/06-accessibility-warnings.md
+++ b/site/content/docs/06-accessibility-warnings.md
@@ -19,6 +19,18 @@ Enforce no `accesskey` on element. Access keys are HTML attributes that allow we
 
 ---
 
+### `a11y-aria-activedescendant-has-tabindex`
+
+An element with `aria-activedescendant` must be tabbable, so it must either have an inherent `tabindex` or declare `tabindex` as an attribute.
+
+```sv
+<!-- A11y: Elements with attribute aria-activedescendant should have tabindex value -->
+<div aria-activedescendant="some-id" />
+
+```
+
+---
+
 ### `a11y-aria-attributes`
 
 Certain reserved DOM elements do not support ARIA roles, states and properties. This is often because they are not visible, for example `meta`, `html`, `script`, `style`. This rule enforces that these DOM elements do not contain the `aria-*` props.
@@ -43,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.
 
@@ -52,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`
@@ -296,6 +310,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/site/content/examples/15-composition/05-modal/App.svelte b/site/content/examples/15-composition/05-modal/App.svelte
index cfd3856447..af93ba39af 100644
--- a/site/content/examples/15-composition/05-modal/App.svelte
+++ b/site/content/examples/15-composition/05-modal/App.svelte
@@ -4,26 +4,26 @@
 	let showModal = false;
 </script>
 
-<button on:click="{() => showModal = true}">
+<button on:click={() => (showModal = true)}>
 	show modal
 </button>
 
-{#if showModal}
-	<Modal on:close="{() => showModal = false}">
-		<h2 slot="header">
-			modal
-			<small><em>adjective</em>  mod·al \ˈmō-dəl\</small>
-		</h2>
+<Modal bind:showModal>
+	<h2 slot="header">
+		modal
+		<small><em>adjective</em> mod·al \ˈmō-dəl\</small>
+	</h2>
 
-		<ol class="definition-list">
-			<li>of or relating to modality in logic</li>
-			<li>containing provisions as to the mode of procedure or the manner of taking effect —used of a contract or legacy</li>
-			<li>of or relating to a musical mode</li>
-			<li>of or relating to structure as opposed to substance</li>
-			<li>of, relating to, or constituting a grammatical form or category characteristically indicating predication</li>
-			<li>of or relating to a statistical mode</li>
-		</ol>
+	<ol class="definition-list">
+		<li>of or relating to modality in logic</li>
+		<li>
+			containing provisions as to the mode of procedure or the manner of taking effect —used of a contract or legacy
+		</li>
+		<li>of or relating to a musical mode</li>
+		<li>of or relating to structure as opposed to substance</li>
+		<li>of, relating to, or constituting a grammatical form or category characteristically indicating predication</li>
+		<li>of or relating to a statistical mode</li>
+	</ol>
 
-		<a href="https://www.merriam-webster.com/dictionary/modal">merriam-webster.com</a>
-	</Modal>
-{/if}
+	<a href="https://www.merriam-webster.com/dictionary/modal">merriam-webster.com</a>
+</Modal>
diff --git a/site/content/examples/15-composition/05-modal/Modal.svelte b/site/content/examples/15-composition/05-modal/Modal.svelte
index baa57824bc..acdbd50ab1 100644
--- a/site/content/examples/15-composition/05-modal/Modal.svelte
+++ b/site/content/examples/15-composition/05-modal/Modal.svelte
@@ -1,81 +1,63 @@
 <script>
-	import { createEventDispatcher, onDestroy } from 'svelte';
+	export let showModal; // boolean
 
-	const dispatch = createEventDispatcher();
-	const close = () => dispatch('close');
+	let dialog; // HTMLDialogElement
 
-	let modal;
-
-	const handle_keydown = e => {
-		if (e.key === 'Escape') {
-			close();
-			return;
-		}
-
-		if (e.key === 'Tab') {
-			// trap focus
-			const nodes = modal.querySelectorAll('*');
-			const tabbable = Array.from(nodes).filter(n => n.tabIndex >= 0);
-
-			let index = tabbable.indexOf(document.activeElement);
-			if (index === -1 && e.shiftKey) index = 0;
-
-			index += tabbable.length + (e.shiftKey ? -1 : 1);
-			index %= tabbable.length;
-
-			tabbable[index].focus();
-			e.preventDefault();
-		}
-	};
-
-	const previously_focused = typeof document !== 'undefined' && document.activeElement;
-
-	if (previously_focused) {
-		onDestroy(() => {
-			previously_focused.focus();
-		});
-	}
+	$: if (dialog && showModal) dialog.showModal();
 </script>
 
-<svelte:window on:keydown={handle_keydown}/>
-
-<div class="modal-background" on:click={close}></div>
-
-<div class="modal" role="dialog" aria-modal="true" bind:this={modal}>
-	<slot name="header"></slot>
-	<hr>
-	<slot></slot>
-	<hr>
-
-	<!-- svelte-ignore a11y-autofocus -->
-	<button autofocus on:click={close}>close modal</button>
-</div>
+<!-- svelte-ignore a11y-click-events-have-key-events -->
+<dialog
+	bind:this={dialog}
+	on:close={() => (showModal = false)}
+	on:click|self={() => dialog.close()}
+>
+	<div on:click|stopPropagation>
+		<slot name="header" />
+		<hr />
+		<slot />
+		<hr />
+		<!-- svelte-ignore a11y-autofocus -->
+		<button autofocus on:click={() => dialog.close()}>close modal</button>
+	</div>
+</dialog>
 
 <style>
-	.modal-background {
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		background: rgba(0,0,0,0.3);
-	}
-
-	.modal {
-		position: absolute;
-		left: 50%;
-		top: 50%;
-		width: calc(100vw - 4em);
+	dialog {
 		max-width: 32em;
-		max-height: calc(100vh - 4em);
-		overflow: auto;
-		transform: translate(-50%,-50%);
-		padding: 1em;
 		border-radius: 0.2em;
-		background: white;
+		border: none;
+		padding: 0;
+	}
+	dialog::backdrop {
+		background: rgba(0, 0, 0, 0.3);
+	}
+	dialog > div {
+		padding: 1em;
+	}
+	dialog[open] {
+		animation: zoom 0.3s cubic-bezier(0.34, 1.56, 0.64, 1);
+	}
+	@keyframes zoom {
+		from {
+			transform: scale(0.95);
+		}
+		to {
+			transform: scale(1);
+		}
+	}
+	dialog[open]::backdrop {
+		animation: fade 0.2s ease-out;
+	}
+	@keyframes fade {
+		from {
+			opacity: 0;
+		}
+		to {
+			opacity: 1;
+		}
 	}
-
 	button {
 		display: block;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/site/content/faq/800-how-do-i-test-svelte-apps.md b/site/content/faq/800-how-do-i-test-svelte-apps.md
index 0e9bc9e146..5ebabdb214 100644
--- a/site/content/faq/800-how-do-i-test-svelte-apps.md
+++ b/site/content/faq/800-how-do-i-test-svelte-apps.md
@@ -2,12 +2,20 @@
 question: How do I test Svelte apps?
 ---
 
-We recommend trying to separate your view logic from your business logic. Data transformation or cross component state management is best kept outside of Svelte components. You can test those parts like you would test any JavaScript functionality that way. When it comes to testing the components, it is best to test the logic of the component and remember that the Svelte library has its own tests and you do not need to test implementation details provided by Svelte.
+How your application is structured and where logic is defined will determine the best way to ensure it is properly tested. It is important to note that not all logic belongs within a component - this includes concerns such as data transformation, cross-component state management, and logging, among others. Remember that the Svelte library has its own test suite, so you do not need to write tests to validate implementation details provided by Svelte.
 
-There are a few approaches that people take when testing, but it generally involves compiling the component and mounting it to something and then performing the tests. You essentially need to create a bundle for each component you're testing (since svelte is a compiler and not a normal library) and then mount them. You can mount to a JSDOM instance. Or you can use a real browser powered by a library like Playwright, Puppeteer, WebdriverIO or Cypress.
+A Svelte application will typically have three different types of tests: Unit, Component, and End-to-End (E2E).
 
-Some resources for getting started with unit testing:
+*Unit Tests*: Focus on testing business logic in isolation. Often this is validating individual functions and edge cases. By minimizing the surface area of these tests they can be kept lean and fast, and by extracting as much logic as possible from your Svelte components more of your application can be covered using them. When creating a new SvelteKit project, you will be asked whether you would like to setup [Vitest](https://vitest.dev/) for unit testing. There are a number of other test runners that could be used as well.
+
+*Component Tests*: Validating that a Svelte component mounts and interacts as expected throughout its lifecycle requires a tool that provides a Document Object Model (DOM). Components can be compiled (since Svelte is a compiler and not a normal library) and mounted to allow asserting against element structure, listeners, state, and all the other capabilities provided by a Svelte component. Tools for component testing range from an in-memory implementation like jsdom paired with a test runner like [Vitest](https://vitest.dev/) to solutions that leverage an actual browser to provide a visual testing capability such as [Playwright](https://playwright.dev/docs/test-components) or [Cypress](https://www.cypress.io/).
+
+*End-to-End Tests*: To ensure your users are able to interact with your application it is necessary to test it as a whole in a manner as close to production as possible. This is done by writing end-to-end (E2E) tests which load and interact with a deployed version of your application in order to simulate how the user will interact with your application. When creating a new SvelteKit project, you will be asked whether you would like to setup [Playwright](https://playwright.dev/) for end-to-end testing. There are many other E2E test libraries available for use as well.
+
+Some resources for getting started with testing:
 - [Svelte Testing Library](https://testing-library.com/docs/svelte-testing-library/example/)
+- [Svelte Component Testing in Cypress](https://docs.cypress.io/guides/component-testing/svelte/overview)
 - [Example using vitest](https://github.com/vitest-dev/vitest/tree/main/examples/svelte)
 - [Example using uvu test runner with JSDOM](https://github.com/lukeed/uvu/tree/master/examples/svelte)
-- [Component testing in real browser](https://webdriver.io/docs/component-testing/svelte)
+- [Test Svelte components using Vitest & Playwright](https://davipon.hashnode.dev/test-svelte-component-using-vitest-playwright)
+- [Component testing with WebdriverIO](https://webdriver.io/docs/component-testing/svelte)
diff --git a/site/content/tutorial/01-introduction/07-making-an-app/app-a/App.svelte b/site/content/tutorial/01-introduction/06-making-an-app/app-a/App.svelte
similarity index 100%
rename from site/content/tutorial/01-introduction/07-making-an-app/app-a/App.svelte
rename to site/content/tutorial/01-introduction/06-making-an-app/app-a/App.svelte
diff --git a/site/content/tutorial/01-introduction/07-making-an-app/text.md b/site/content/tutorial/01-introduction/06-making-an-app/text.md
similarity index 100%
rename from site/content/tutorial/01-introduction/07-making-an-app/text.md
rename to site/content/tutorial/01-introduction/06-making-an-app/text.md
diff --git a/site/content/tutorial/04-logic/05-keyed-each-blocks/app-a/Thing.svelte b/site/content/tutorial/04-logic/05-keyed-each-blocks/app-a/Thing.svelte
index 02e6fa7640..e91026fb98 100644
--- a/site/content/tutorial/04-logic/05-keyed-each-blocks/app-a/Thing.svelte
+++ b/site/content/tutorial/04-logic/05-keyed-each-blocks/app-a/Thing.svelte
@@ -1,4 +1,6 @@
 <script>
+	import { onDestroy } from 'svelte';
+
 	const emojis = {
         apple: "🍎",
         banana: "🍌",
@@ -12,6 +14,11 @@
 
 	// ...but the "emoji" variable is fixed upon initialisation of the component
 	const emoji = emojis[name];
+
+	// observe in the console which entry is removed
+	onDestroy(() => {
+		console.log('thing destroyed: ' + name)
+	});
 </script>
 
 <p>
diff --git a/site/content/tutorial/04-logic/05-keyed-each-blocks/app-b/Thing.svelte b/site/content/tutorial/04-logic/05-keyed-each-blocks/app-b/Thing.svelte
index 02e6fa7640..e91026fb98 100644
--- a/site/content/tutorial/04-logic/05-keyed-each-blocks/app-b/Thing.svelte
+++ b/site/content/tutorial/04-logic/05-keyed-each-blocks/app-b/Thing.svelte
@@ -1,4 +1,6 @@
 <script>
+	import { onDestroy } from 'svelte';
+
 	const emojis = {
         apple: "🍎",
         banana: "🍌",
@@ -12,6 +14,11 @@
 
 	// ...but the "emoji" variable is fixed upon initialisation of the component
 	const emoji = emojis[name];
+
+	// observe in the console which entry is removed
+	onDestroy(() => {
+		console.log('thing destroyed: ' + name)
+	});
 </script>
 
 <p>
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.
 
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.
diff --git a/site/content/tutorial/16-special-elements/08-svelte-options/app-a/Todo.svelte b/site/content/tutorial/16-special-elements/08-svelte-options/app-a/Todo.svelte
index 57d4dcc79a..cc3856316c 100644
--- a/site/content/tutorial/16-special-elements/08-svelte-options/app-a/Todo.svelte
+++ b/site/content/tutorial/16-special-elements/08-svelte-options/app-a/Todo.svelte
@@ -4,22 +4,24 @@
 
 	export let todo;
 
-	let div;
+	let button;
 
 	afterUpdate(() => {
-		flash(div);
+		flash(button);
 	});
 </script>
 
 <!-- the text will flash red whenever
      the `todo` object changes -->
-<div bind:this={div} on:click>
+<button bind:this={button} type="button" on:click>
 	{todo.done ? '👍': ''} {todo.text}
-</div>
+</button>
 
 <style>
-	div {
+	button {
+		all: unset;
+		display: block;
 		cursor: pointer;
 		line-height: 1.5;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/site/content/tutorial/16-special-elements/08-svelte-options/app-b/Todo.svelte b/site/content/tutorial/16-special-elements/08-svelte-options/app-b/Todo.svelte
index fa81d35989..848f167d02 100644
--- a/site/content/tutorial/16-special-elements/08-svelte-options/app-b/Todo.svelte
+++ b/site/content/tutorial/16-special-elements/08-svelte-options/app-b/Todo.svelte
@@ -6,22 +6,24 @@
 
 	export let todo;
 
-	let div;
+	let button;
 
 	afterUpdate(() => {
-		flash(div);
+		flash(button);
 	});
 </script>
 
 <!-- the text will flash red whenever
      the `todo` object changes -->
-<div bind:this={div} on:click>
+<button bind:this={button} type="button" on:click>
 	{todo.done ? '👍': ''} {todo.text}
-</div>
+</button>
 
 <style>
-	div {
+	button {
+		all: unset;
+		display: block;
 		cursor: pointer;
 		line-height: 1.5;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/site/content/tutorial/18-debugging/meta.json b/site/content/tutorial/18-debugging/meta.json
deleted file mode 100644
index 5eeed281d3..0000000000
--- a/site/content/tutorial/18-debugging/meta.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"title": "Debugging"
-}
\ No newline at end of file
diff --git a/site/content/tutorial/18-debugging/01-debug/app-a/App.svelte b/site/content/tutorial/18-special-tags/01-debug/app-a/App.svelte
similarity index 100%
rename from site/content/tutorial/18-debugging/01-debug/app-a/App.svelte
rename to site/content/tutorial/18-special-tags/01-debug/app-a/App.svelte
diff --git a/site/content/tutorial/18-debugging/01-debug/app-b/App.svelte b/site/content/tutorial/18-special-tags/01-debug/app-b/App.svelte
similarity index 100%
rename from site/content/tutorial/18-debugging/01-debug/app-b/App.svelte
rename to site/content/tutorial/18-special-tags/01-debug/app-b/App.svelte
diff --git a/site/content/tutorial/18-debugging/01-debug/text.md b/site/content/tutorial/18-special-tags/01-debug/text.md
similarity index 100%
rename from site/content/tutorial/18-debugging/01-debug/text.md
rename to site/content/tutorial/18-special-tags/01-debug/text.md
diff --git a/site/content/tutorial/01-introduction/06-html-tags/app-a/App.svelte b/site/content/tutorial/18-special-tags/02-html-tags/app-a/App.svelte
similarity index 100%
rename from site/content/tutorial/01-introduction/06-html-tags/app-a/App.svelte
rename to site/content/tutorial/18-special-tags/02-html-tags/app-a/App.svelte
diff --git a/site/content/tutorial/01-introduction/06-html-tags/app-b/App.svelte b/site/content/tutorial/18-special-tags/02-html-tags/app-b/App.svelte
similarity index 100%
rename from site/content/tutorial/01-introduction/06-html-tags/app-b/App.svelte
rename to site/content/tutorial/18-special-tags/02-html-tags/app-b/App.svelte
diff --git a/site/content/tutorial/01-introduction/06-html-tags/text.md b/site/content/tutorial/18-special-tags/02-html-tags/text.md
similarity index 57%
rename from site/content/tutorial/01-introduction/06-html-tags/text.md
rename to site/content/tutorial/18-special-tags/02-html-tags/text.md
index ff547247e2..0da4708020 100644
--- a/site/content/tutorial/01-introduction/06-html-tags/text.md
+++ b/site/content/tutorial/18-special-tags/02-html-tags/text.md
@@ -12,4 +12,4 @@ In Svelte, you do this with the special `{@html ...}` tag:
 <p>{@html string}</p>
 ```
 
-> Svelte doesn't perform any sanitization of the expression inside `{@html ...}` before it gets inserted into the DOM. In other words, if you use this feature it's critical that you manually escape HTML that comes from sources you don't trust, otherwise you risk exposing your users to XSS attacks.
+> **Warning!** Svelte doesn't perform any sanitization of the expression inside `{@html ...}` before it gets inserted into the DOM. In other words, if you use this feature it's **critical** that you manually escape HTML that comes from sources you don't trust, otherwise you risk exposing your users to XSS attacks.
diff --git a/site/content/tutorial/18-special-tags/meta.json b/site/content/tutorial/18-special-tags/meta.json
new file mode 100644
index 0000000000..06e1732030
--- /dev/null
+++ b/site/content/tutorial/18-special-tags/meta.json
@@ -0,0 +1,3 @@
+{
+	"title": "Special tags"
+}
\ No newline at end of file
diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts
index c0d703892b..0d6a329dcb 100644
--- a/src/compiler/compile/Component.ts
+++ b/src/compiler/compile/Component.ts
@@ -38,6 +38,7 @@ 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;
@@ -793,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;
@@ -939,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 === '$' &&
@@ -1380,12 +1392,11 @@ 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] === '$' || is_writable_or_mutated)
+									(name[0] === '$' || variable)
 								) {
 									dependencies.add(name);
 								}
@@ -1409,6 +1420,19 @@ 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/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/compiler_warnings.ts b/src/compiler/compile/compiler_warnings.ts
index 3f552eb8b8..d6b2dbc5aa 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'
@@ -175,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`
@@ -187,6 +198,10 @@ export default {
 		code: 'a11y-no-noninteractive-tabindex',
 		message: 'A11y: noninteractive element cannot have nonnegative tabIndex value'
 	},
+	a11y_aria_activedescendant_has_tabindex: {
+		code: 'a11y-aria-activedescendant-has-tabindex',
+		message: 'A11y: Elements with attribute aria-activedescendant should have tabindex value'
+	},
 	redundant_event_modifier_for_touch: {
 		code: 'redundant-event-modifier',
 		message: 'Touch event handlers that don\'t use the \'event\' object are passive by default'
diff --git a/src/compiler/compile/css/Selector.ts b/src/compiler/compile/css/Selector.ts
index 07e2dc439e..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);
 				}
@@ -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[0])
+				) {
+					component.error(selector, compiler_errors.css_invalid_global_selector_position);
+				}
+			}
+		}
+	}
+
 	get_amount_class_specificity_increased() {
 		let count = 0;
 		for (const block of this.blocks) {
@@ -350,7 +368,7 @@ function attribute_matches(node: CssNode, name: string, expected_value: string,
 	const attr = node.attributes.find((attr: CssNode) => attr.name === name);
 	if (!attr) return false;
 	if (attr.is_true) return operator === null;
-	if (!expected_value) return true;
+	if (expected_value == null) return true;
 
 	if (attr.chunks.length === 1) {
 		const value = attr.chunks[0];
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/src/compiler/compile/nodes/Binding.ts b/src/compiler/compile/nodes/Binding.ts
index 46112a03a3..0c29f7ec67 100644
--- a/src/compiler/compile/nodes/Binding.ts
+++ b/src/compiler/compile/nodes/Binding.ts
@@ -22,7 +22,10 @@ const read_only_media_attributes = new Set([
 	'seeking',
 	'ended',
 	'videoHeight',
-	'videoWidth'
+	'videoWidth',
+	'naturalWidth',
+	'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 cb3d8c718f..416f1d7b31 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,11 +123,67 @@ 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([
 	'preventDefault',
 	'stopPropagation',
+	'stopImmediatePropagation',
 	'capture',
 	'once',
 	'passive',
@@ -225,6 +289,7 @@ export default class Element extends Node {
 	namespace: string;
 	needs_manual_style_scoping: boolean;
 	tag_expr: Expression;
+	contains_a11y_label: boolean;
 
 	get is_dynamic_element() {
 		return this.name === 'svelte:element';
@@ -484,6 +549,11 @@ export default class Element extends Node {
 						component.warn(attribute, compiler_warnings.a11y_incorrect_attribute_type(schema, name));
 					}
 				}
+
+				// aria-activedescendant-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);
+				}
 			}
 
 			// aria-role
@@ -505,7 +575,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));
@@ -521,7 +591,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);
@@ -553,7 +623,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);
 			}
 
@@ -573,6 +643,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) &&
@@ -586,19 +657,36 @@ 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);
 			}
 		}
+
+		// 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() {
@@ -620,6 +708,7 @@ export default class Element extends Node {
 			const id_attribute = attribute_map.get('id');
 			const name_attribute = attribute_map.get('name');
 			const target_attribute = attribute_map.get('target');
+			const aria_label_attribute = attribute_map.get('aria-label');
 
 			// links with target="_blank" should have noopener or noreferrer: https://developer.chrome.com/docs/lighthouse/best-practices/external-anchors-use-rel-noopener/
 			// modern browsers add noopener by default, so we only need to check legacy browsers
@@ -642,6 +731,13 @@ export default class Element extends Node {
 				}
 			}
 
+			if (aria_label_attribute) {
+				const aria_value = aria_label_attribute.get_static_value();
+				if (aria_value != '') {
+					this.contains_a11y_label = true;
+				}
+			}
+
 			if (href_attribute) {
 				const href_value = href_attribute.get_static_value();
 
@@ -718,7 +814,10 @@ export default class Element extends Node {
 		}
 
 		if (this.name === 'video') {
-			if (attribute_map.has('muted')) {
+			const aria_hidden_attribute = attribute_map.get('aria-hidden');
+			const aria_hidden_exist = aria_hidden_attribute && aria_hidden_attribute.get_static_value();
+
+			if (attribute_map.has('muted') || aria_hidden_exist === 'true') {
 				return;
 			}
 
@@ -881,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));
@@ -901,6 +1001,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'
@@ -922,6 +1029,7 @@ export default class Element extends Node {
 
 	validate_content() {
 		if (!a11y_required_content.has(this.name)) return;
+		if (this.contains_a11y_label) return;
 		if (
 			this.bindings
 				.some((binding) => ['textContent', 'innerHTML'].includes(binding.name))
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/index.ts b/src/compiler/compile/render_dom/index.ts
index 58b7a8317b..bc56f2eb27 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);
+			return variable && (variable.reassigned || variable.export_name) && !variable.is_reactive_static;
 		})
 		.map(({ name }) => b`$$self.$$.on_destroy.push(() => ${`$$unsubscribe_${name.slice(1)}`}());`);
 
 	if (has_definition) {
-		const reactive_declarations: (Node | Node[]) = [];
-		const fixed_reactive_declarations: Node[] = []; // not really 'reactive' but whatever
+		const reactive_declarations: Node[] = [];
+		const fixed_reactive_declarations: Array<Node | Node[]> = []; // not really 'reactive' but whatever
 
 		component.reactive_declarations.forEach(d => {
 			const dependencies = Array.from(d.dependencies);
@@ -417,6 +417,15 @@ 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));
+						`);
+					}
+				}
 			}
 		});
 
@@ -430,7 +439,7 @@ export default function dom(
 			const name = $name.slice(1);
 
 			const store = component.var_lookup.get(name);
-			if (store && (store.reassigned || store.export_name)) {
+			if (store && (store.reassigned || store.export_name) && !store.is_reactive_static) {
 				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 ffc5b6b42e..d9efdb5142 100644
--- a/src/compiler/compile/render_dom/invalidate.ts
+++ b/src/compiler/compile/render_dom/invalidate.ts
@@ -19,6 +19,7 @@ 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/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/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts b/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
index 81a1898331..6cb3a00218 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([
@@ -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));
 
@@ -324,7 +336,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 +362,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/compiler/compile/render_dom/wrappers/Element/Binding.ts b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
index 9e2ec85f0f..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());
 
@@ -120,7 +130,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}`
@@ -140,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;
 			}
 
@@ -212,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}) {
@@ -264,7 +256,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};`;
@@ -277,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('.');
 
@@ -312,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(
@@ -384,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};
@@ -400,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;
@@ -425,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/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/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index 8a8f59810b..eaef3a3b69 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,12 +129,23 @@ 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'],
 		filter: (node: Element, _name: string) =>
 			node.name === 'details'
+	},
+	{
+		event_names: ['load'],
+		filter: (_: Element, name: string) => name === 'naturalHeight' || name === 'naturalWidth'
 	}
 ];
 
@@ -151,8 +160,11 @@ export default class ElementWrapper extends Wrapper {
 	bindings: Binding[];
 	event_handlers: EventHandler[];
 	class_dependencies: string[];
+	has_dynamic_attribute: boolean;
 
 	select_binding_dependencies?: Set<string>;
+	has_dynamic_value: boolean;
+	dynamic_value_condition: any;
 
 	var: any;
 	void: boolean;
@@ -219,6 +231,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,
@@ -287,9 +300,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});`}
@@ -311,44 +323,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`;
-
-		block.chunks.update.push(b`
-			if (${tag}) {
-				if (!${previous_tag}) {
-					${this.var} = ${this.child_dynamic_element_block.name}(#ctx);
-					${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);
-					${this.var}.c();
-					${this.var}.m(${this.get_update_mount_node(anchor)}, ${anchor});
-				} else {
+		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`);
+			}
+
+			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};
+							`
+				}
+				}
+			`);
+		} else {
+			block.chunks.update.push(b`
+				if (${tag}) {
 					${this.var}.p(#ctx, #dirty);
 				}
-			} else if (${previous_tag}) {
-				${has_transitions
-				? b`
-							@group_outros();
-							@transition_out(${this.var}, 1, 1, () => {
-								${this.var} = null;
-							});
-							@check_outros();
-						`
-				: b`
-							${this.var}.d(1);
-							${this.var} = null;
-						`
-			}
-			}
-			${previous_tag} = ${tag};
-		`);
+			`);
+		}
 
 		if (this.child_dynamic_element_block.has_intros) {
 			block.chunks.intro.push(b`@transition_in(${this.var});`);
@@ -487,7 +527,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);
@@ -765,7 +809,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;
 		}
@@ -814,29 +858,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}
@@ -854,8 +887,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);
 			`);
@@ -863,7 +897,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}) {
@@ -880,6 +916,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;
@@ -1077,7 +1142,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/compiler/compile/render_dom/wrappers/InlineComponent/index.ts b/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
index bca01fdb4c..ab140a75c5 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(
@@ -414,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);
@@ -464,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/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/__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/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/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) {
diff --git a/src/compiler/interfaces.ts b/src/compiler/interfaces.ts
index eb2cc336ed..402f9ff5e1 100644
--- a/src/compiler/interfaces.ts
+++ b/src/compiler/interfaces.ts
@@ -223,6 +223,7 @@ export interface Var {
 	subscribable?: boolean;
 	is_reactive_dependency?: boolean;
 	imported?: boolean;
+	is_reactive_static?: boolean;
 }
 
 export interface CssResult {
diff --git a/src/compiler/parse/index.ts b/src/compiler/parse/index.ts
index 8de6563c8b..86c27b33cf 100644
--- a/src/compiler/parse/index.ts
+++ b/src/compiler/parse/index.ts
@@ -132,6 +132,10 @@ export class Parser {
 		return this.template.slice(this.index, this.index + str.length) === str;
 	}
 
+	/**
+	 * Match a regex at the current index
+	 * @param pattern Should have a ^ anchor at the start so the regex doesn't search past the beginning, resulting in worse performance
+	 */
 	match_regex(pattern: RegExp) {
 		const match = pattern.exec(this.template.slice(this.index));
 		if (!match || match.index !== 0) return null;
@@ -148,6 +152,10 @@ export class Parser {
 		}
 	}
 
+	/**
+	 * Search for a regex starting at the current index and return the result if it matches
+	 * @param pattern Should have a ^ anchor at the start so the regex doesn't search past the beginning, resulting in worse performance
+	 */
 	read(pattern: RegExp) {
 		const result = this.match_regex(pattern);
 		if (result) this.index += result.length;
diff --git a/src/compiler/parse/read/script.ts b/src/compiler/parse/read/script.ts
index 02506ab3d5..43974c26ab 100644
--- a/src/compiler/parse/read/script.ts
+++ b/src/compiler/parse/read/script.ts
@@ -6,6 +6,7 @@ import parser_errors from '../errors';
 import { regex_not_newline_characters } from '../../utils/patterns';
 
 const regex_closing_script_tag = /<\/script\s*>/;
+const regex_starts_with_closing_script_tag = /^<\/script\s*>/;
 
 function get_context(parser: Parser, attributes: any[], start: number): string {
 	const context = attributes.find(attribute => attribute.name === 'context');
@@ -32,7 +33,7 @@ export default function read_script(parser: Parser, start: number, attributes: N
 	}
 
 	const source = parser.template.slice(0, script_start).replace(regex_not_newline_characters, ' ') + data;
-	parser.read(regex_closing_script_tag);
+	parser.read(regex_starts_with_closing_script_tag);
 
 	let ast: Program;
 
diff --git a/src/compiler/parse/read/style.ts b/src/compiler/parse/read/style.ts
index 560d377cec..3ed510c3d0 100644
--- a/src/compiler/parse/read/style.ts
+++ b/src/compiler/parse/read/style.ts
@@ -7,6 +7,7 @@ import { Style } from '../../interfaces';
 import parser_errors from '../errors';
 
 const regex_closing_style_tag = /<\/style\s*>/;
+const regex_starts_with_closing_style_tag = /^<\/style\s*>/;
 
 export default function read_style(parser: Parser, start: number, attributes: Node[]): Style {
 	const content_start = parser.index;
@@ -21,7 +22,7 @@ export default function read_style(parser: Parser, start: number, attributes: No
 
 	// discard styles when css is disabled
 	if (parser.css_mode === 'none') {
-		parser.read(regex_closing_style_tag);
+		parser.read(regex_starts_with_closing_style_tag);
 		return null;
 	}
 
@@ -76,7 +77,7 @@ export default function read_style(parser: Parser, start: number, attributes: No
 		}
 	});
 
-	parser.read(regex_closing_style_tag);
+	parser.read(regex_starts_with_closing_style_tag);
   
 	const end = parser.index;
 
diff --git a/src/compiler/parse/state/mustache.ts b/src/compiler/parse/state/mustache.ts
index c3b58afe2a..328a043677 100644
--- a/src/compiler/parse/state/mustache.ts
+++ b/src/compiler/parse/state/mustache.ts
@@ -33,7 +33,7 @@ function trim_whitespace(block: TemplateNode, trim_before: boolean, trim_after:
 	}
 }
 
-const regex_whitespace_with_closing_curly_brace = /\s*}/;
+const regex_whitespace_with_closing_curly_brace = /^\s*}/;
 
 export default function mustache(parser: Parser) {
 	const start = parser.index;
diff --git a/src/compiler/parse/state/tag.ts b/src/compiler/parse/state/tag.ts
index 9d1bf5e5c2..cbd3213f53 100644
--- a/src/compiler/parse/state/tag.ts
+++ b/src/compiler/parse/state/tag.ts
@@ -12,6 +12,9 @@ import { closing_tag_omitted, decode_character_references } from '../utils/html'
 // eslint-disable-next-line no-useless-escape
 const valid_tag_name = /^\!?[a-zA-Z]{1,}:?[a-zA-Z0-9\-]*/;
 
+/** Invalid attribute characters if the attribute is not surrounded by quotes */
+const regex_starts_with_invalid_attr_value = /^(\/>|[\s"'=<>`])/;
+
 const meta_tags = new Map([
 	['svelte:head', 'Head'],
 	['svelte:options', 'Options'],
@@ -293,7 +296,7 @@ function read_tag_name(parser: Parser) {
 
 // eslint-disable-next-line no-useless-escape
 const regex_token_ending_character = /[\s=\/>"']/;
-const regex_quote_characters = /["']/;
+const regex_starts_with_quote_characters = /^["']/;
 
 function read_attribute(parser: Parser, unique_names: Set<string>) {
 	const start = parser.index;
@@ -368,7 +371,7 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
 		parser.allow_whitespace();
 		value = read_attribute_value(parser);
 		end = parser.index;
-	} else if (parser.match_regex(regex_quote_characters)) {
+	} else if (parser.match_regex(regex_starts_with_quote_characters)) {
 		parser.error(parser_errors.unexpected_token('='), parser.index);
 	}
 
@@ -475,15 +478,13 @@ function read_attribute_value(parser: Parser) {
 		}];
 	}
 
-	const regex = (
-		quote_mark === "'" ? /'/ :
-			quote_mark === '"' ? /"/ :
-				/(\/>|[\s"'=<>`])/
-	);
-
 	let value;
 	try {
-		value = read_sequence(parser, () => !!parser.match_regex(regex), 'in attribute value');
+		value = read_sequence(parser, () => {
+			// handle common case of quote marks existing outside of regex for performance reasons
+			if (quote_mark) return parser.match(quote_mark);
+			return !!parser.match_regex(regex_starts_with_invalid_attr_value);
+		}, 'in attribute value');
 	} catch (error) {
 		if (error.code === 'parse-error') {
 			// if the attribute value didn't close + self-closing tag
@@ -518,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/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';
 
 /**
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/src/runtime/internal/Component.ts b/src/runtime/internal/Component.ts
index 5aec24c651..a8a500b25b 100644
--- a/src/runtime/internal/Component.ts
+++ b/src/runtime/internal/Component.ts
@@ -1,4 +1,4 @@
-import { add_render_callback, flush, schedule_update, dirty_components } from './scheduler';
+import { add_render_callback, flush, flush_render_callbacks, schedule_update, dirty_components } from './scheduler';
 import { current_component, set_current_component } from './lifecycle';
 import { blank_object, is_empty, is_function, run, run_all, noop } from './utils';
 import { children, detach, start_hydrating, end_hydrating } from './dom';
@@ -51,6 +51,8 @@ export function mount_component(component, target, anchor, customElement) {
 export function destroy_component(component, detaching) {
 	const $$ = component.$$;
 	if ($$.fragment !== null) {
+		flush_render_callbacks($$.after_update);
+
 		run_all($$.on_destroy);
 
 		$$.fragment && $$.fragment.d(detaching);
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 ca76b11ab3..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,22 +268,30 @@ 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);
 	};
 }
 
+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) {
+	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);
 	};
@@ -332,6 +340,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);
 }
@@ -347,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;
 }
@@ -380,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 };
 	}
 }
 
@@ -567,8 +626,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;
 }
 
@@ -624,6 +691,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();
 		};
 	}
 
@@ -644,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;
@@ -682,7 +753,7 @@ export class HtmlTag {
 	// html tag nodes
 	n: ChildNode[];
 	// target
-	t: HTMLElement | SVGElement;
+	t: HTMLElement | SVGElement | DocumentFragment;
 	// anchor
 	a: HTMLElement | SVGElement;
 
@@ -702,8 +773,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);
 		}
 
@@ -712,7 +784,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/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/src/runtime/internal/scheduler.ts b/src/runtime/internal/scheduler.ts
index f95ba446f5..5327e7b5b5 100644
--- a/src/runtime/internal/scheduler.ts
+++ b/src/runtime/internal/scheduler.ts
@@ -5,7 +5,7 @@ export const dirty_components = [];
 export const intros = { enabled: false };
 
 export const binding_callbacks = [];
-const render_callbacks = [];
+let render_callbacks = [];
 const flush_callbacks = [];
 
 const resolved_promise = Promise.resolve();
@@ -122,3 +122,14 @@ function update($$) {
 		$$.after_update.forEach(add_render_callback);
 	}
 }
+
+/**
+ * Useful for example to execute remaining `afterUpdate` callbacks before executing `destroy`.
+ */
+export function flush_render_callbacks(fns: Function[]): void {
+	const filtered = [];
+	const targets = [];
+	render_callbacks.forEach((c) => fns.indexOf(c) === -1 ? filtered.push(c) : targets.push(c));
+	targets.forEach((c) => c());
+	render_callbacks = filtered;
+}
diff --git a/src/runtime/store/index.ts b/src/runtime/store/index.ts
index e947fa0740..ee277c6216 100644
--- a/src/runtime/store/index.ts
+++ b/src/runtime/store/index.ts
@@ -98,7 +98,7 @@ export function writable<T>(value?: T, start: StartStopNotifier<T> = noop): Writ
 
 		return () => {
 			subscribers.delete(subscriber);
-			if (subscribers.size === 0) {
+			if (subscribers.size === 0 && stop) {
 				stop();
 				stop = null;
 			}
@@ -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/src/runtime/transition/index.ts b/src/runtime/transition/index.ts
index c6d9dbc97a..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;`
 	};
 }
 
@@ -211,7 +215,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 +236,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 +269,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
diff --git a/src/shared/boolean_attributes.ts b/src/shared/boolean_attributes.ts
index e29f921e32..668dd97975 100644
--- a/src/shared/boolean_attributes.ts
+++ b/src/shared/boolean_attributes.ts
@@ -1,5 +1,4 @@
-// source: https://html.spec.whatwg.org/multipage/indices.html
-export const boolean_attributes = new Set([
+const _boolean_attributes = [
 	'allowfullscreen',
 	'allowpaymentrequest',
 	'async',
@@ -26,4 +25,12 @@ export const boolean_attributes = new Set([
 	'required',
 	'reversed',
 	'selected'
-]);
+] 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/css/samples/unused-selector-empty-attribute/_config.js b/test/css/samples/unused-selector-empty-attribute/_config.js
new file mode 100644
index 0000000000..6f77c6a3e1
--- /dev/null
+++ b/test/css/samples/unused-selector-empty-attribute/_config.js
@@ -0,0 +1,25 @@
+export default {
+	warnings: [{
+		filename: 'SvelteComponent.svelte',
+		code: 'css-unused-selector',
+		message: 'Unused CSS selector "img[alt=""]"',
+		start: {
+			character: 87,
+			column: 1,
+			line: 8
+		  },
+		end: {
+			character: 98,
+			column: 12,
+			line: 8
+		  },
+		pos: 87,
+		frame: `
+			 6:   }
+			 7:
+			 8:   img[alt=""] {
+			      ^
+			 9:     border: 1px solid red;
+			10:   }`
+	}]
+};
diff --git a/test/css/samples/unused-selector-empty-attribute/expected.css b/test/css/samples/unused-selector-empty-attribute/expected.css
new file mode 100644
index 0000000000..987fa142db
--- /dev/null
+++ b/test/css/samples/unused-selector-empty-attribute/expected.css
@@ -0,0 +1 @@
+img[alt].svelte-xyz{border:1px solid green}
\ No newline at end of file
diff --git a/test/css/samples/unused-selector-empty-attribute/expected.html b/test/css/samples/unused-selector-empty-attribute/expected.html
new file mode 100644
index 0000000000..889908c217
--- /dev/null
+++ b/test/css/samples/unused-selector-empty-attribute/expected.html
@@ -0,0 +1 @@
+<img alt="a foo" class="svelte-xyz" src="foo.jpg">
\ No newline at end of file
diff --git a/test/css/samples/unused-selector-empty-attribute/input.svelte b/test/css/samples/unused-selector-empty-attribute/input.svelte
new file mode 100644
index 0000000000..0200e537be
--- /dev/null
+++ b/test/css/samples/unused-selector-empty-attribute/input.svelte
@@ -0,0 +1,11 @@
+<img src="foo.jpg" alt="a foo" />
+
+<style>
+	img[alt] {
+		border: 1px solid green;
+	}
+
+	img[alt=""] {
+		border: 1px solid red;
+	}
+</style>
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/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/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/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/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}
diff --git a/test/js/samples/reactive-class-optimized/expected.js b/test/js/samples/reactive-class-optimized/expected.js
index 1d0606ad60..f75a4015b0 100644
--- a/test/js/samples/reactive-class-optimized/expected.js
+++ b/test/js/samples/reactive-class-optimized/expected.js
@@ -9,7 +9,6 @@ import {
 	noop,
 	safe_not_equal,
 	space,
-	subscribe,
 	toggle_class
 } from "svelte/internal";
 
@@ -133,13 +132,8 @@ let reactiveModuleVar = Math.random();
 function instance($$self, $$props, $$invalidate) {
 	let reactiveDeclaration;
 	let $reactiveStoreVal;
-
-	let $reactiveDeclaration,
-		$$unsubscribe_reactiveDeclaration = noop,
-		$$subscribe_reactiveDeclaration = () => ($$unsubscribe_reactiveDeclaration(), $$unsubscribe_reactiveDeclaration = subscribe(reactiveDeclaration, $$value => $$invalidate(3, $reactiveDeclaration = $$value)), reactiveDeclaration);
-
+	let $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;
@@ -148,7 +142,8 @@ function instance($$self, $$props, $$invalidate) {
 		reactiveConst.x += 1;
 	}
 
-	$: $$subscribe_reactiveDeclaration($$invalidate(1, reactiveDeclaration = reactiveModuleVar * 2));
+	$: reactiveDeclaration = reactiveModuleVar * 2;
+	component_subscribe($$self, reactiveDeclaration, $$value => $$invalidate(3, $reactiveDeclaration = $$value));
 	return [reactiveConst, reactiveDeclaration, $reactiveStoreVal, $reactiveDeclaration];
 }
 
diff --git a/test/js/samples/reactive-values/expected.js b/test/js/samples/reactive-values/expected.js
new file mode 100644
index 0000000000..7ed435d6ad
--- /dev/null
+++ b/test/js/samples/reactive-values/expected.js
@@ -0,0 +1,60 @@
+/* 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
new file mode 100644
index 0000000000..d713217771
--- /dev/null
+++ b/test/js/samples/reactive-values/input.svelte
@@ -0,0 +1,7 @@
+<script>
+	let name = 'world';
+	$: foo = name + name;
+</script>
+
+<h1>Hello {name}!</h1>
+{foo}
\ No newline at end of file
diff --git a/test/js/samples/svelte-element-event-handlers/expected.js b/test/js/samples/svelte-element-event-handlers/expected.js
index ab24f2e924..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,44 +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);
-					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);
-					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;
+				svelte_element.p(ctx, dirty);
 			}
-
-			previous_tag = a;
 		},
 		i: noop,
 		o: noop,
 		d(detaching) {
-			if (detaching) detach(svelte_element_anchor);
 			if (svelte_element) svelte_element.d(detaching);
 		}
 	};
diff --git a/test/js/samples/svelte-element-svg/expected.js b/test/js/samples/svelte-element-svg/expected.js
index 7db210219b..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,44 +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);
-					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);
-					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;
+				svelte_element.p(ctx, dirty);
 			}
-
-			previous_tag = /*tag*/ ctx[0].svg;
 		},
 		i: noop,
 		o: noop,
 		d(detaching) {
-			if (detaching) detach(svelte_element_anchor);
 			if (svelte_element) svelte_element.d(detaching);
 		}
 	};
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/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/>
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>
diff --git a/test/runtime/samples/action-update-before-destroy/Component.svelte b/test/runtime/samples/action-update-before-destroy/Component.svelte
new file mode 100644
index 0000000000..e38a0fff64
--- /dev/null
+++ b/test/runtime/samples/action-update-before-destroy/Component.svelte
@@ -0,0 +1,27 @@
+<script>
+  import { afterUpdate, onDestroy } from "svelte";
+
+  export let id;
+	export let items;
+
+  let item = $items[id];
+	let selected = true;
+
+  function onClick() {
+    selected = !selected;
+    items.set({});
+  }
+
+  onDestroy(() => {
+		console.log("onDestroy");
+  });
+
+  afterUpdate(() => {
+    console.log("afterUpdate");
+  });
+</script>
+
+<button on:click="{onClick}">Click Me</button>
+{#if selected}
+  <div>{item.id}</div>
+{/if}
diff --git a/test/runtime/samples/action-update-before-destroy/_config.js b/test/runtime/samples/action-update-before-destroy/_config.js
new file mode 100644
index 0000000000..a822c4d8a5
--- /dev/null
+++ b/test/runtime/samples/action-update-before-destroy/_config.js
@@ -0,0 +1,16 @@
+export default {
+	html: `
+		<button>Click Me</button>
+		<div>1</div>
+	`,
+	async test({ assert, target, window }) {
+		const button = target.querySelector('button');
+		const event = new window.MouseEvent('click');
+		const messages = [];
+		const log = console.log;
+		console.log = msg => messages.push(msg);
+		await button.dispatchEvent(event);
+		console.log = log;
+		assert.deepEqual(messages, ['afterUpdate', 'onDestroy']);
+	}
+};
diff --git a/test/runtime/samples/action-update-before-destroy/main.svelte b/test/runtime/samples/action-update-before-destroy/main.svelte
new file mode 100644
index 0000000000..7f99ce0f38
--- /dev/null
+++ b/test/runtime/samples/action-update-before-destroy/main.svelte
@@ -0,0 +1,10 @@
+<script>
+	import { writable } from 'svelte/store';
+  import Component from "./Component.svelte";
+
+	let items = writable({ 1: { id: 1 } });
+</script>
+
+{#each Object.values($items) as item (item.id)}
+  <Component id="{item.id}" {items} />
+{/each}
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/runtime/samples/attribute-boolean-indeterminate/_config.js b/test/runtime/samples/attribute-boolean-indeterminate/_config.js
index d6e97ffc0e..5853e76922 100644
--- a/test/runtime/samples/attribute-boolean-indeterminate/_config.js
+++ b/test/runtime/samples/attribute-boolean-indeterminate/_config.js
@@ -9,10 +9,6 @@ export default {
 
 	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');
 
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}  />
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}
+
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>
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>
+		`);
 	}
 };
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>
 
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}
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>
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}
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/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>
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>
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}
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
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(
diff --git a/test/store/index.ts b/test/store/index.ts
index b6fc5940e1..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', () => {
@@ -88,6 +88,14 @@ describe('store', () => {
 
 			unsubscribe();
 		});
+
+		it('no error even if unsubscribe calls twice', () => {
+			let num = 0;
+			const store = writable(num, set => set(num += 1));
+			const unsubscribe = store.subscribe(() => { });
+			unsubscribe();
+			assert.doesNotThrow(() => unsubscribe());
+		});
 	});
 
 	describe('readable', () => {
@@ -411,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));
+		});
+
+	});
 });
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-aria-label-has-no-content/input.svelte b/test/validator/samples/a11y-anchor-aria-label-has-no-content/input.svelte
new file mode 100644
index 0000000000..c13df04b22
--- /dev/null
+++ b/test/validator/samples/a11y-anchor-aria-label-has-no-content/input.svelte
@@ -0,0 +1 @@
+<a href="/foo" aria-label="baz"></a>
diff --git a/test/validator/samples/a11y-anchor-aria-label-has-no-content/warnings.json b/test/validator/samples/a11y-anchor-aria-label-has-no-content/warnings.json
new file mode 100644
index 0000000000..fe51488c70
--- /dev/null
+++ b/test/validator/samples/a11y-anchor-aria-label-has-no-content/warnings.json
@@ -0,0 +1 @@
+[]
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/input.svelte b/test/validator/samples/a11y-aria-activedescendant/input.svelte
new file mode 100644
index 0000000000..24a2d59ac1
--- /dev/null
+++ b/test/validator/samples/a11y-aria-activedescendant/input.svelte
@@ -0,0 +1,16 @@
+<!-- VALID -->
+<input />
+<input tabindex="0" />
+<input aria-activedescendant="some-id" />
+<input aria-activedescendant="some-id" tabindex={0} />
+<input aria-activedescendant="some-id" tabindex={1} />
+<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-aria-activedescendant/warnings.json b/test/validator/samples/a11y-aria-activedescendant/warnings.json
new file mode 100644
index 0000000000..57288f188f
--- /dev/null
+++ b/test/validator/samples/a11y-aria-activedescendant/warnings.json
@@ -0,0 +1,14 @@
+[
+  {
+    "code": "a11y-aria-activedescendant-has-tabindex",
+    "end": {
+      "column": 36,
+      "line": 16
+    },
+    "message": "A11y: Elements with attribute aria-activedescendant should have tabindex value",
+    "start": {
+      "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/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-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/input.svelte b/test/validator/samples/a11y-media-has-caption/input.svelte
index 6d98fd3734..30f9a05f91 100644
--- a/test/validator/samples/a11y-media-has-caption/input.svelte
+++ b/test/validator/samples/a11y-media-has-caption/input.svelte
@@ -2,3 +2,6 @@
 <video></video>
 <video><track /></video>
 <audio></audio>
+<video aria-hidden></video>
+<video aria-hidden="false"></video>
+<video aria-hidden="true"></video>
diff --git a/test/validator/samples/a11y-media-has-caption/warnings.json b/test/validator/samples/a11y-media-has-caption/warnings.json
index 72c2caae53..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,16 +14,37 @@
   {
     "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
     }
+  },
+  {
+    "code": "a11y-media-has-caption",
+    "end": {
+      "column": 27,
+      "line": 5
+    },
+    "message": "A11y: <video> elements must have a <track kind=\"captions\">",
+    "start": {
+      "column": 0,
+      "line": 5
+    }
+  },
+  {
+    "code": "a11y-media-has-caption",
+    "end": {
+      "column": 35,
+      "line": 6
+    },
+    "message": "A11y: <video> elements must have a <track kind=\"captions\">",
+    "start": {
+      "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/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 1c643c896b..73f00429df 100644
--- a/test/validator/samples/a11y-no-noninteractive-tabindex/warnings.json
+++ b/test/validator/samples/a11y-no-noninteractive-tabindex/warnings.json
@@ -2,61 +2,49 @@
 	{
 		"code": "a11y-no-noninteractive-tabindex",
 		"end": {
-			"character": 278,
 			"column": 20,
-			"line": 12
+			"line": 13
 		},
 		"message": "A11y: noninteractive element cannot have nonnegative tabIndex value",
-		"pos": 258,
 		"start": {
-			"character": 258,
 			"column": 0,
-			"line": 12
+			"line": 13
 		}
 	},
 	{
 		"code": "a11y-no-noninteractive-tabindex",
 		"end": {
-			"character": 314,
 			"column": 35,
-			"line": 13
+			"line": 14
 		},
 		"message": "A11y: noninteractive element cannot have nonnegative tabIndex value",
-		"pos": 279,
 		"start": {
-			"character": 279,
 			"column": 0,
-			"line": 13
+			"line": 14
 		}
 	},
 	{
 		"code": "a11y-no-noninteractive-tabindex",
 		"end": {
-			"character": 339,
 			"column": 24,
-			"line": 14
+			"line": 15
 		},
 		"message": "A11y: noninteractive element cannot have nonnegative tabIndex value",
-		"pos": 315,
 		"start": {
-			"character": 315,
 			"column": 0,
-			"line": 14
+			"line": 15
 		}
 	},
 	{
 		"code": "a11y-no-noninteractive-tabindex",
 		"end": {
-			"character": 366,
 			"column": 26,
-			"line": 15
+			"line": 16
 		},
 		"message": "A11y: noninteractive element cannot have nonnegative tabIndex value",
-		"pos": 340,
 		"start": {
-			"character": 340,
 			"column": 0,
-			"line": 15
+			"line": 16
 		}
 	}
 ]
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/input.svelte b/test/validator/samples/a11y-role-has-required-aria-props/input.svelte
index 113ed65316..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,4 +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" />
-<input role="radio" type="radio" />
\ No newline at end of file
+<svelte:element this={Math.random() ? 'input' : 'div'} role="checkbox" />
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-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
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 192e0b764e..b8e36cef5d 100644
--- a/test/validator/samples/a11y-scope/warnings.json
+++ b/test/validator/samples/a11y-scope/warnings.json
@@ -3,15 +3,12 @@
 		"code": "a11y-misplaced-scope",
 		"message": "A11y: The scope attribute should only be used with <th> elements",
 		"start": {
-			"line": 1,
-			"column": 5,
-			"character": 5
+			"line": 6,
+			"column": 5
 		},
 		"end": {
-			"line": 1,
-			"column": 10,
-			"character": 10
-		},
-		"pos": 5
+			"line": 6,
+			"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-5/errors.json b/test/validator/samples/assignment-to-const-5/errors.json
new file mode 100644
index 0000000000..bca92bf266
--- /dev/null
+++ b/test/validator/samples/assignment-to-const-5/errors.json
@@ -0,0 +1,14 @@
+[
+	{
+		"code": "assignment-to-const",
+		"message": "You are assigning to a const",
+		"start": {
+			"line": 3,
+			"column": 1
+		},
+		"end": {
+			"line": 3,
+			"column": 33
+		}
+	}
+]
\ 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..5304a61c4b
--- /dev/null
+++ b/test/validator/samples/assignment-to-const-7/errors.json
@@ -0,0 +1,14 @@
+[
+	{
+		"code": "assignment-to-const",
+		"message": "You are assigning to a const",
+		"start": {
+			"line": 3,
+			"column": 1
+		},
+		"end": {
+			"line": 3,
+			"column": 42
+		}
+	}
+]
\ 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}
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/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>
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-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>
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
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..b3a2c0017c 100644
--- a/test/validator/samples/event-modifiers-invalid/errors.json
+++ b/test/validator/samples/event-modifiers-invalid/errors.json
@@ -1,15 +1,12 @@
 [{
-	"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,
-		"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
+	}
+}]