diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 6871094f5c..7daff3f1ab 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -8,10 +8,13 @@ the issue. One way we prioritize issues is by the number of :+1: reactions on
 their descriptions. Please DO NOT add `+1` or :+1: comments.
 
 ### Feature requests and proposals
+
 We're excited to hear how we can make Svelte better. Please add as much detail
-as you can on your use case.
+as you can on your use case. To propose an implementation of a large feature or
+change, please create an [RFC](https://github.com/sveltejs/rfcs).
 
 ### Bugs
+
 If you're filing an issue about a bug please include as much information
 as you can including the following.
 
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index f5369e9991..94f0340e8e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,6 +7,8 @@ assignees: ''
 
 ---
 
+## Is this about svelte@next? This project is currently in a pre-release stage and breaking changes may occur at any time. Please do not post any kind of bug reports or questions on GitHub about it.
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index e533c21c96..923bfdb50c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,6 +7,11 @@ assignees: ''
 
 ---
 
+<!--
+If you'd like to propose an implementation for a large new feature or change then please create an RFC:
+https://github.com/sveltejs/rfcs
+-->
+
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. For example: I'm always frustrated when [...]
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7bd900ac33..d14a0f9fe4 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,7 @@
-
-
 ### Before submitting the PR, please make sure you do the following
-- [ ] It's really useful if your PR relates to an outstanding issue, so please reference it in your PR, or create an explanatory one for discussion. In many cases, features are absent for a reason.
-- [ ] This message body should clearly illustrate what problems it solves. If there are related issues, remember to reference them.
-- [ ] Ideally, include a test that fails without this PR but passes with it. PRs will only be merged once they pass CI. (Remember to `npm run lint`!)
+- [ ] It's really useful if your PR references an issue where it is discussed ahead of time. In many cases, features are absent for a reason. For large changes, please create an RFC: https://github.com/sveltejs/rfcs
+- [ ] This message body should clearly illustrate what problems it solves.
+- [ ] Ideally, include a test that fails without this PR but passes with it.
+
 ### Tests
--  [ ] Run the tests with `npm test` or `yarn test`)
+-  [ ] Run the tests with `npm test` and lint the project with `npm run lint`
diff --git a/.gitignore b/.gitignore
index f7fac04eba..a471c3aaa2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,10 +18,6 @@ node_modules
 /coverage/
 /coverage.lcov
 /test/*/samples/_
-/test/sourcemaps/samples/*/output.js
-/test/sourcemaps/samples/*/output.js.map
-/test/sourcemaps/samples/*/output.css
-/test/sourcemaps/samples/*/output.css.map
 /yarn-error.log
 _actual*.*
 _output
diff --git a/.mocharc.js b/.mocharc.js
new file mode 100644
index 0000000000..e55f26099e
--- /dev/null
+++ b/.mocharc.js
@@ -0,0 +1,14 @@
+module.exports = {
+	file: [
+		'test/test.ts'
+	],
+	require: [
+		'sucrase/register'
+	]
+};
+
+// add coverage options when running 'npx c8 mocha'
+if (process.env.NODE_V8_COVERAGE) {
+	module.exports.fullTrace = true;
+	module.exports.require.push('source-map-support/register');
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ceff78b107..4afd7f20e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,82 @@
 
 ## Unreleased
 
+* Fix `$$props` and `$$restProps` when compiling to a custom element ([#5482](https://github.com/sveltejs/svelte/issues/5482))
+* Fix function calls in `<slot>` props that use contextual values ([#5565](https://github.com/sveltejs/svelte/issues/5565))
+* Add `Element` and `Node` to known globals ([#5586](https://github.com/sveltejs/svelte/issues/5586))
+
+## 3.29.4
+
+* Fix code generation error with `??` alongside logical operators ([#5558](https://github.com/sveltejs/svelte/issues/5558))
+
+## 3.29.3
+
+* Hopefully actually republish with proper UMD build for use in the REPL
+
+## 3.29.2
+
+* Republish with proper UMD build for use in the REPL
+
+## 3.29.1
+
+* Fix compiler hanging on `<slot slot="...">` ([#5475](https://github.com/sveltejs/svelte/issues/5475))
+* Fix types on `get` function in `svelte/store` ([#5483](https://github.com/sveltejs/svelte/pull/5483))
+* Add missing `end` field on ASTs for non-top-level `<style>` elements ([#5487](https://github.com/sveltejs/svelte/pull/5487))
+* Fix `{#if}` inside `{#await}` with destructuring ([#5508](https://github.com/sveltejs/svelte/issues/5508))
+* Fix types on lifecycle hooks ([#5529](https://github.com/sveltejs/svelte/pull/5529))
+
+## 3.29.0
+
+* Support `<slot slot="...">` ([#2079](https://github.com/sveltejs/svelte/issues/2079))
+* Fix unmounting components with a bidirectional transition with a delay ([#4954](https://github.com/sveltejs/svelte/issues/4954))
+* Add types to `get` function in `svelte/store` ([#5269](https://github.com/sveltejs/svelte/pull/5269))
+* Add a warning when a component looks like it's trying to use another component without beginning with a capital letter ([#5302](https://github.com/sveltejs/svelte/pull/5302))
+* Add `EventSource` to known globals ([#5463](https://github.com/sveltejs/svelte/issues/5463))
+* Fix compiler exception with `~`/`+` combinators and `{...spread}` attributes ([#5465](https://github.com/sveltejs/svelte/issues/5465))
+
+## 3.28.0
+
+* Add `{#key}` block for keying arbitrary content on an expression ([#1469](https://github.com/sveltejs/svelte/issues/1469))
+
+## 3.27.0
+
+* Add `|nonpassive` event modifier, explicitly passing `passive: false` ([#2068](https://github.com/sveltejs/svelte/issues/2068))
+* Scope CSS selectors with `~` and `+` combinators ([#3104](https://github.com/sveltejs/svelte/issues/3104))
+* Fix keyed `{#each}` not reacting to key changing ([#5444](https://github.com/sveltejs/svelte/issues/5444))
+* Fix destructuring into store values ([#5449](https://github.com/sveltejs/svelte/issues/5449))
+* Fix erroneous `missing-declaration` warning with `use:obj.method` ([#5451](https://github.com/sveltejs/svelte/issues/5451))
+
+## 3.26.0
+
+* Support `use:obj.method` as actions ([#3935](https://github.com/sveltejs/svelte/issues/3935))
+* Support `_` as numeric separator ([#5407](https://github.com/sveltejs/svelte/issues/5407))
+* Fix assignments to properties on store values ([#5412](https://github.com/sveltejs/svelte/issues/5412))
+* Add special style scoping handling of `[open]` selectors on `<details>` elements ([#5421](https://github.com/sveltejs/svelte/issues/5421))
+* Support `import.meta` in template expressions ([#5422](https://github.com/sveltejs/svelte/issues/5422))
+
+## 3.25.1
+
+* Fix specificity of certain styles involving a child selector ([#4795](https://github.com/sveltejs/svelte/issues/4795))
+* Fix transitions that are parameterised with stores ([#5244](https://github.com/sveltejs/svelte/issues/5244))
+* Fix scoping of styles involving child selector and `*` ([#5370](https://github.com/sveltejs/svelte/issues/5370))
+* Fix destructuring which reassigns stores ([#5388](https://github.com/sveltejs/svelte/issues/5388))
+* Fix `{#await}`s with no `{:catch}` getting stuck unresolved if the promise rejects ([#5401](https://github.com/sveltejs/svelte/issues/5401))
+
+## 3.25.0
+
+* Use `null` rather than `undefined` for coerced bound value of `<input type="number">` ([#1701](https://github.com/sveltejs/svelte/issues/1701))
 * Expose object of which slots have received content in `$$slots` ([#2106](https://github.com/sveltejs/svelte/issues/2106))
+* Correctly disallow using lifecycle hooks after synchronous component initialisation ([#4259](https://github.com/sveltejs/svelte/issues/4259), [#4899](https://github.com/sveltejs/svelte/issues/4899))
+* Re-throw an unhandled rejection when an `{#await}` block with no `{:catch}` gets a rejection ([#5129](https://github.com/sveltejs/svelte/issues/5129))
 * Add types to `createEventDispatcher` ([#5211](https://github.com/sveltejs/svelte/issues/5211))
 * In SSR mode, do not automatically declare variables for reactive assignments to member expressions ([#5247](https://github.com/sveltejs/svelte/issues/5247))
 * Include selector in message of `unused-css-selector` warning ([#5252](https://github.com/sveltejs/svelte/issues/5252))
 * Fix using `<Namespaced.Component/>`s in child `{#await}`/`{#each}` contexts ([#5255](https://github.com/sveltejs/svelte/issues/5255))
 * Fix using `<svelte:component>` in `{:catch}` ([#5259](https://github.com/sveltejs/svelte/issues/5259))
+* Fix setting one-way bound `<input>` `value` to `undefined` when it has spread attributes ([#5270](https://github.com/sveltejs/svelte/issues/5270))
+* Fix deep two-way bindings inside an `{#each}` involving a store ([#5286](https://github.com/sveltejs/svelte/issues/5286))
+* Use valid XHTML for elements that are optimised and inserted with `.innerHTML` ([#5315](https://github.com/sveltejs/svelte/issues/5315))
+* Fix reactivity of `$$props` in slot fallback content ([#5367](https://github.com/sveltejs/svelte/issues/5367))
 
 ## 3.24.1
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c3eff81da3..a1e92d3924 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -43,13 +43,16 @@ When [opening a new issue](https://github.com/sveltejs/svelte/issues/new/choose)
 - **One issue, one bug:** Please report a single bug per issue.
 - **Provide reproduction steps:** List all the steps necessary to reproduce the issue. The person reading your bug report should be able to follow these steps to reproduce your issue with minimal effort. If possible, use the [REPL](https://svelte.dev/repl) to create your reproduction.
 
+## RFCs
+
+If you'd like to propose an implementation for a large new feature or change then please [create an RFC](https://github.com/sveltejs/rfcs) to discuss it up front.
+
 ## Installation
 
 1. Ensure you have [npm](https://www.npmjs.com/get-npm) installed.
 1. After cloning the repository, run `npm install` in the root of the repository.
 1. To start a development server, run `npm run dev`.
 
-
 ## Pull requests
 
 ### Your first pull request
diff --git a/README.md b/README.md
index 33faec0588..9fbada7aa3 100644
--- a/README.md
+++ b/README.md
@@ -2,14 +2,15 @@
   <a href="https://svelte.dev">
 	<img alt="Cybernetically enhanced web apps: Svelte" src="https://sveltejs.github.io/assets/banner.png">
   </a>
-
   <a href="https://www.npmjs.com/package/svelte">
     <img src="https://img.shields.io/npm/v/svelte.svg" alt="npm version">
   </a>
-
   <a href="https://github.com/sveltejs/svelte/blob/master/LICENSE">
     <img src="https://img.shields.io/npm/l/svelte.svg" alt="license">
   </a>
+  <a href="https://svelte.dev/chat">
+    <img src="https://img.shields.io/badge/chat-on%20discord-7289da.svg" alt="Chat">
+  </a>
 </p>
 
 
@@ -20,6 +21,15 @@ Svelte is a new way to build web applications. It's a compiler that takes your d
 Learn more at the [Svelte website](https://svelte.dev), or stop by the [Discord chatroom](https://svelte.dev/chat).
 
 
+## Supporting Svelte
+
+Svelte is an MIT-licensed open source project with its ongoing development made possible entirely by the support of awesome volunteers. If you'd like to support their efforts, please consider:
+
+- [Becoming a backer on Open Collective](https://opencollective.com/svelte).
+
+Funds donated via Open Collective will be used for compensating expenses related to Svelte's development such as hosting costs. If sufficient donations are received, funds may also be used to support Svelte's development more directly.
+
+
 ## Development
 
 Pull requests are encouraged and always welcome. [Pick an issue](https://github.com/sveltejs/svelte/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) and help us out!
diff --git a/mocha.coverage.opts b/mocha.coverage.opts
deleted file mode 100644
index cfec67a99a..0000000000
--- a/mocha.coverage.opts
+++ /dev/null
@@ -1,4 +0,0 @@
---require source-map-support/register
---full-trace
---recursive
-test/test.js
diff --git a/mocha.opts b/mocha.opts
deleted file mode 100644
index 427b029758..0000000000
--- a/mocha.opts
+++ /dev/null
@@ -1 +0,0 @@
-test/test.js
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 0110595c76..e04cc22175 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "3.24.1",
+  "version": "3.29.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -144,8 +144,8 @@
       }
     },
     "@sveltejs/eslint-config": {
-      "version": "github:sveltejs/eslint-config#e8a9b27cd3f7aa66388474412b1a5c11c5a44ade",
-      "from": "github:sveltejs/eslint-config#v0.0.1",
+      "version": "github:sveltejs/eslint-config#54081d752d199dba97db9f578665c87f18469da3",
+      "from": "github:sveltejs/eslint-config#v5.5.0",
       "dev": true
     },
     "@tootallnate/once": {
@@ -197,9 +197,9 @@
       "dev": true
     },
     "@types/mocha": {
-      "version": "5.2.7",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz",
-      "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz",
+      "integrity": "sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==",
       "dev": true
     },
     "@types/node": {
@@ -315,9 +315,9 @@
       "dev": true
     },
     "acorn": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
-      "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
+      "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==",
       "dev": true
     },
     "acorn-globals": {
@@ -422,6 +422,16 @@
       "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
       "dev": true
     },
+    "anymatch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "dev": true,
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      }
+    },
     "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -630,6 +640,12 @@
         "tweetnacl": "^0.14.3"
       }
     },
+    "binary-extensions": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
+      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
+      "dev": true
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -640,6 +656,15 @@
         "concat-map": "0.0.1"
       }
     },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
     "browser-process-hrtime": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz",
@@ -736,6 +761,22 @@
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
       "dev": true
     },
+    "chokidar": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz",
+      "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==",
+      "dev": true,
+      "requires": {
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "fsevents": "~2.1.1",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.2.0"
+      }
+    },
     "cli-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
@@ -762,16 +803,10 @@
         "wrap-ansi": "^5.1.0"
       }
     },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
-    },
     "code-red": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/code-red/-/code-red-0.1.3.tgz",
-      "integrity": "sha512-3n9i1Jv0om4+2Aq7pCL8M5xRgc2wTXsblsYUxXJDpgBZ3wJP1zbcNzu4XgUqrG0rjc1to2yh+3n9rwHsJa7qSA==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/code-red/-/code-red-0.1.4.tgz",
+      "integrity": "sha512-NPiLFd1EfonYONCNXCH1oVirQMXk5oAOQ3FanRbjB4HZ09rTU/lZGKjVOOP0FKr4pccGVYE5I4CqtyU6ens2VA==",
       "dev": true,
       "requires": {
         "acorn": "^7.3.1",
@@ -1020,23 +1055,36 @@
       }
     },
     "es-abstract": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
-      "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+      "version": "1.17.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
+      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
       "dev": true,
       "requires": {
-        "es-to-primitive": "^1.2.0",
+        "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
-        "is-callable": "^1.1.4",
-        "is-regex": "^1.0.4",
-        "object-keys": "^1.0.12"
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.2.0",
+        "is-regex": "^1.1.0",
+        "object-inspect": "^1.7.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.0",
+        "string.prototype.trimend": "^1.0.1",
+        "string.prototype.trimstart": "^1.0.1"
+      },
+      "dependencies": {
+        "has-symbols": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+          "dev": true
+        }
       }
     },
     "es-to-primitive": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
-      "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
       "dev": true,
       "requires": {
         "is-callable": "^1.1.4",
@@ -1722,6 +1770,15 @@
         "flat-cache": "^2.0.1"
       }
     },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
     "find-up": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
@@ -1790,6 +1847,13 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
+    "fsevents": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "dev": true,
+      "optional": true
+    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -2204,16 +2268,25 @@
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
       "dev": true
     },
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
     "is-buffer": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
-      "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
+      "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
       "dev": true
     },
     "is-callable": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz",
+      "integrity": "sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg==",
       "dev": true
     },
     "is-date-object": {
@@ -2249,6 +2322,12 @@
       "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
       "dev": true
     },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
     "is-reference": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
@@ -2259,12 +2338,20 @@
       }
     },
     "is-regex": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
       "dev": true,
       "requires": {
-        "has": "^1.0.1"
+        "has-symbols": "^1.0.1"
+      },
+      "dependencies": {
+        "has-symbols": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+          "dev": true
+        }
       }
     },
     "is-stream": {
@@ -2539,12 +2626,12 @@
       "dev": true
     },
     "log-symbols": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
+      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
       "dev": true,
       "requires": {
-        "chalk": "^2.0.1"
+        "chalk": "^2.4.2"
       }
     },
     "lru-cache": {
@@ -2662,13 +2749,14 @@
       }
     },
     "mocha": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.0.tgz",
-      "integrity": "sha512-qwfFgY+7EKAAUAdv7VYMZQknI7YJSGesxHyhn6qD52DV8UcSZs5XwCifcZGMVIE4a5fbmhvbotxC0DLQ0oKohQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz",
+      "integrity": "sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==",
       "dev": true,
       "requires": {
         "ansi-colors": "3.2.3",
         "browser-stdout": "1.3.1",
+        "chokidar": "3.3.0",
         "debug": "3.2.6",
         "diff": "3.5.0",
         "escape-string-regexp": "1.0.5",
@@ -2677,50 +2765,21 @@
         "growl": "1.10.5",
         "he": "1.2.0",
         "js-yaml": "3.13.1",
-        "log-symbols": "2.2.0",
+        "log-symbols": "3.0.0",
         "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
+        "mkdirp": "0.5.5",
         "ms": "2.1.1",
-        "node-environment-flags": "1.0.5",
+        "node-environment-flags": "1.0.6",
         "object.assign": "4.1.0",
         "strip-json-comments": "2.0.1",
         "supports-color": "6.0.0",
         "which": "1.3.1",
         "wide-align": "1.1.3",
-        "yargs": "13.2.2",
-        "yargs-parser": "13.0.0",
-        "yargs-unparser": "1.5.0"
+        "yargs": "13.3.2",
+        "yargs-parser": "13.1.2",
+        "yargs-unparser": "1.6.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-              "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-              "dev": true,
-              "requires": {
-                "is-fullwidth-code-point": "^2.0.0",
-                "strip-ansi": "^4.0.0"
-              }
-            }
-          }
-        },
         "glob": {
           "version": "7.1.3",
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
@@ -2735,36 +2794,12 @@
             "path-is-absolute": "^1.0.0"
           }
         },
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
         "ms": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
           "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
           "dev": true
         },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        },
         "strip-json-comments": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
@@ -2780,76 +2815,28 @@
             "has-flag": "^3.0.0"
           }
         },
-        "wrap-ansi": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-          "dev": true,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-              "dev": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-              "dev": true,
-              "requires": {
-                "number-is-nan": "^1.0.0"
-              }
-            },
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-              "dev": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            },
-            "strip-ansi": {
-              "version": "3.0.1",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^2.0.0"
-              }
-            }
-          }
-        },
         "yargs": {
-          "version": "13.2.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.2.tgz",
-          "integrity": "sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==",
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
           "dev": true,
           "requires": {
-            "cliui": "^4.0.0",
+            "cliui": "^5.0.0",
             "find-up": "^3.0.0",
             "get-caller-file": "^2.0.1",
-            "os-locale": "^3.1.0",
             "require-directory": "^2.1.1",
             "require-main-filename": "^2.0.0",
             "set-blocking": "^2.0.0",
             "string-width": "^3.0.0",
             "which-module": "^2.0.0",
             "y18n": "^4.0.0",
-            "yargs-parser": "^13.0.0"
+            "yargs-parser": "^13.1.2"
           }
         },
         "yargs-parser": {
-          "version": "13.0.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz",
-          "integrity": "sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==",
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
@@ -2894,9 +2881,9 @@
       "dev": true
     },
     "node-environment-flags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz",
-      "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
+      "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==",
       "dev": true,
       "requires": {
         "object.getownpropertydescriptors": "^2.0.3",
@@ -2904,17 +2891,17 @@
       },
       "dependencies": {
         "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         }
       }
     },
     "node-fetch": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
       "dev": true
     },
     "node-modules-regexp": {
@@ -2935,6 +2922,12 @@
         "validate-npm-package-license": "^3.0.1"
       }
     },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
+    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -2944,12 +2937,6 @@
         "path-key": "^2.0.0"
       }
     },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
-    },
     "nwsapi": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz",
@@ -2993,13 +2980,13 @@
       }
     },
     "object.getownpropertydescriptors": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
-      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
+      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.5.1"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
       }
     },
     "object.values": {
@@ -3253,6 +3240,12 @@
         "is-reference": "^1.1.4"
       }
     },
+    "picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "dev": true
+    },
     "pify": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
@@ -3466,6 +3459,15 @@
         "util-deprecate": "~1.0.1"
       }
     },
+    "readdirp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz",
+      "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==",
+      "dev": true,
+      "requires": {
+        "picomatch": "^2.0.4"
+      }
+    },
     "regexpp": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
@@ -4257,6 +4259,15 @@
         "os-tmpdir": "~1.0.2"
       }
     },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
     "tough-cookie": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
@@ -4616,135 +4627,38 @@
       }
     },
     "yargs-unparser": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.5.0.tgz",
-      "integrity": "sha512-HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
+      "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
       "dev": true,
       "requires": {
         "flat": "^4.1.0",
-        "lodash": "^4.17.11",
-        "yargs": "^12.0.5"
+        "lodash": "^4.17.15",
+        "yargs": "^13.3.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
-          }
-        },
-        "get-caller-file": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-          "dev": true
-        },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-          "dev": true,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-              "dev": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-              "dev": true,
-              "requires": {
-                "number-is-nan": "^1.0.0"
-              }
-            },
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-              "dev": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            },
-            "strip-ansi": {
-              "version": "3.0.1",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^2.0.0"
-              }
-            }
-          }
-        },
         "yargs": {
-          "version": "12.0.5",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
-          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
           "dev": true,
           "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^1.2.0",
+            "cliui": "^5.0.0",
             "find-up": "^3.0.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^3.0.0",
+            "get-caller-file": "^2.0.1",
             "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
+            "require-main-filename": "^2.0.0",
             "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
+            "string-width": "^3.0.0",
             "which-module": "^2.0.0",
-            "y18n": "^3.2.1 || ^4.0.0",
-            "yargs-parser": "^11.1.1"
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.2"
           }
         },
         "yargs-parser": {
-          "version": "11.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
diff --git a/package.json b/package.json
index e0de8670ef..a0f0b9e455 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "3.24.1",
+  "version": "3.29.4",
   "description": "Cybernetically enhanced web apps",
   "module": "index.mjs",
   "main": "index",
@@ -23,10 +23,10 @@
   },
   "types": "types/runtime/index.d.ts",
   "scripts": {
-    "test": "mocha --opts mocha.opts",
+    "test": "mocha",
     "test:unit": "mocha --require sucrase/register --recursive src/**/__test__.ts",
-    "quicktest": "mocha --opts mocha.opts",
-    "precoverage": "c8 mocha --opts mocha.coverage.opts",
+    "quicktest": "mocha",
+    "precoverage": "c8 mocha",
     "coverage": "c8 report --reporter=text-lcov > coverage.lcov && c8 report --reporter=html",
     "codecov": "codecov",
     "precodecov": "npm run coverage",
@@ -63,15 +63,15 @@
     "@rollup/plugin-sucrase": "^3.0.0",
     "@rollup/plugin-typescript": "^2.0.1",
     "@rollup/plugin-virtual": "^2.0.0",
-    "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v0.0.1",
-    "@types/mocha": "^5.2.7",
+    "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.5.0",
+    "@types/mocha": "^7.0.0",
     "@types/node": "^8.10.53",
     "@typescript-eslint/eslint-plugin": "^3.0.2",
     "@typescript-eslint/parser": "^3.0.2",
-    "acorn": "^7.3.1",
+    "acorn": "^7.4.0",
     "agadoo": "^1.1.0",
     "c8": "^5.0.1",
-    "code-red": "^0.1.3",
+    "code-red": "^0.1.4",
     "codecov": "^3.5.0",
     "css-tree": "1.0.0-alpha22",
     "eslint": "^7.1.0",
@@ -83,7 +83,7 @@
     "kleur": "^3.0.3",
     "locate-character": "^2.0.5",
     "magic-string": "^0.25.3",
-    "mocha": "^6.2.0",
+    "mocha": "^7.0.0",
     "periscopic": "^2.0.1",
     "puppeteer": "^2.1.1",
     "rollup": "^1.27.14",
diff --git a/site/Makefile b/site/Makefile
index 6fd08fd8ee..48b3e972e6 100644
--- a/site/Makefile
+++ b/site/Makefile
@@ -9,7 +9,7 @@ sapper:
 	@echo "\n~> updating template & contributors list"
 	@npm run update
 	@echo "\n~> building Sapper app"
-	@npm run sapper
+	@npm run build
 
 
 docker:
diff --git a/site/README.md b/site/README.md
index 892b8e1249..7d8adbd6c5 100644
--- a/site/README.md
+++ b/site/README.md
@@ -47,7 +47,7 @@ In order for the REPL's GitHub integration to work properly when running locally
 
 ## Building the site
 
-To build the website, run `npm run sapper`. The output can be found in `__sapper__/build`.
+To build the website, run `npm run build`. The output can be found in `__sapper__/build`.
 
 ## Testing
 
diff --git a/site/content/blog/2019-04-15-setting-up-your-editor.md b/site/content/blog/2019-04-15-setting-up-your-editor.md
index b80223d820..fb8287d0cb 100644
--- a/site/content/blog/2019-04-15-setting-up-your-editor.md
+++ b/site/content/blog/2019-04-15-setting-up-your-editor.md
@@ -30,7 +30,9 @@ To treat `*.svelte` files as HTML, open *__Edit → Config...__* and add the fol
 
 ## Vim/Neovim
 
-To treat all `*.svelte` files as HTML, add the following line to your `init.vim`:
+You can use the [coc-svelte extension](https://github.com/coc-extensions/coc-svelte) which utilises the official language-server.
+
+As an alternative you can treat all `*.svelte` files as HTML. Add the following line to your `init.vim`:
 
 ```
 au! BufNewFile,BufRead *.svelte set ft=html
@@ -50,13 +52,7 @@ To set the filetype for a single file, use a [modeline](https://vim.fandom.com/w
 
 ## Visual Studio Code
 
-To treat `*.svelte` files as HTML, add the following lines to your `settings.json` file:
-
-```cson
-  "files.associations": {
-    "*.svelte": "html"
-  }
-```
+We recommend using the official [Svelte for VS Code extension](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode).
 
 ## JetBrains WebStorm
 
diff --git a/site/content/blog/2020-07-17-svelte-and-typescript.md b/site/content/blog/2020-07-17-svelte-and-typescript.md
index 9c228a17da..bb5f389aa2 100644
--- a/site/content/blog/2020-07-17-svelte-and-typescript.md
+++ b/site/content/blog/2020-07-17-svelte-and-typescript.md
@@ -107,7 +107,7 @@ Your `include`/`exclude` may differ per project — these are defaults that shou
 
 Any editor [using an LSP](https://langserver.org/#implementations-client) can be supported. The [VS Code](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode) extension has been our primary focus, but there is work in progress [on Atom](https://github.com/sveltejs/language-tools/pull/160), and Vim via [coc-svelte](https://github.com/coc-extensions/coc-svelte) has been updated with the latest LSP.
 
-These editor extensions will improve your coding experience even if you only use JavaScript. The editor won't offer errors, but it will offer inference and refactoring tools. You can [add `// @check-js`](https://www.staging-typescript.org/docs/handbook/intro-to-js-ts.html) to the top of a `<script>` tag using JavaScript to get better error messages with no infra changes.
+These editor extensions will improve your coding experience even if you only use JavaScript. The editor won't offer errors, but it will offer inference and refactoring tools. You can [add `// @ts-check`](https://www.staging-typescript.org/docs/handbook/intro-to-js-ts.html) to the top of a `<script>` tag using JavaScript to get better error messages with no infra changes.
 
 To switch a `<script>` to use TypeScript, use `<script lang="ts">` and that should be it. Hopefully you won't be seeing an ocean of red squiggles.
 
diff --git a/site/content/blog/2020-10-01-whats-new-in-svelte-october-2020.md b/site/content/blog/2020-10-01-whats-new-in-svelte-october-2020.md
new file mode 100644
index 0000000000..d57e88173c
--- /dev/null
+++ b/site/content/blog/2020-10-01-whats-new-in-svelte-october-2020.md
@@ -0,0 +1,85 @@
+---
+title: What's new in Svelte: October 2020
+description: New object methods, in-depth learning resources and tons of integration examples!
+author: Daniel Sandoval
+authorURL: https://desandoval.net
+---
+
+Welcome to the first edition of our "What's new in Svelte" series! We'll try to make this a monthly blog post in which you'll find out about new features, bug fixes, and a showcase of Svelte projects from around the community.
+
+## New features
+1. `use:obj.method` allows functions defined within objects to be used within actions ([Example](https://svelte.dev/repl/c305722adb4a4545b27b198ea8ff9bde?version=3.27.0), **3.26.0**, warning removed in **3.27.0**)
+2. `_` is now supported as a "numerical separator", similar to a `.` or `,` ([Example](https://svelte.dev/repl/844c39e91d1248649fe54af839fab570?version=3.26.0), **3.26.0**)
+3. `import.meta` now works in template expressions ([Example](https://svelte.dev/repl/9630de41957a4c80a4fce264360a6bc7?version=3.26.0), **3.26.0**)
+4. CSS Selectors with `~` and `+` combinators are now supported ([Example](https://svelte.dev/repl/91ad9257d2d1430185a504a18cc60172?version=3.29.0), **3.27.0**, with a compiler fix in **3.29.0**)
+5. The `{#key}` block is now available to key arbitrary content on an expression. Whever the expression changes, the contents inside the `{#key}` block will be destroyed and recreated. For an in-depth explanation and to find out how it's implemented, check out the [new blog post](https://lihautan.com/contributing-to-svelte-implement-key-block/) of Svelte Team member Tan Li Hau. ([More info](https://github.com/sveltejs/svelte/issues/1469), **3.29.0**)
+6. Slots can now be forwarded through child components! This used to only be possible by adding extra wrapper `<div>`s ([More info](https://github.com/sveltejs/svelte/issues/2079), **3.29.0**)
+7. When using TypeScript, you can now type the `createEventDispatcher` method:
+```html
+<script lang="ts">
+    import { createEventDispatcher } from 'svelte';
+
+    const dispatch = createEventDispatcher<{
+        /**
+         * you can also add docs
+         */
+        checked: boolean; // Will translate to `CustomEvent<boolean>`
+        hello: string;
+    }>();
+
+    // ...
+</script>
+```
+This will make sure that you can invoke dispatch only with the specified event names and its types. The Svelte for VS Code extension was also updated to deal with this new feature. It will provide strong typings for these events as well as autocompletion and hover information.
+
+**New from Sapper!**
+Sapper 0.28.9 just came out. The highlights from it include much better support for CSP nonces, asset preload support for exported pages, and error details are now available in the `$page` store on error pages.
+
+In addition, Sapper's CSS handling has been rewritten over the course of recent releases in order to fix existing CSS handling bugs, refactor the CSS handling to occur entirely within a Rollup plugin, and remove the need internally to register CSS in the routing system. Congrats and thank you to the folks working on Sapper for all their solid work!
+
+
+## Impactful bug fixes
+- CSS compilation will no longer remove rules for the `open` attribute on `<details>` elements ([Example](https://svelte.dev/repl/ab4c0c177d1f4fab92f46eb8539cea9a?version=3.26.0), **3.26.0**)
+- `prettier-plugin-svelte` will do a better job now at dealing with whitespaces, especially around inline elements. It will also preserve formatting inside `<pre>` tags and will no longer format languages which are not supported by Prettier, like SASS, Pug or Stylus.
+
+
+## Coming up
+- [Svelte Summit](https://sveltesummit.com/), Svelte's second global online conference, is taking place on October 18! Sign up for free to get reminders and talk updates!
+
+For all the features and bugfixes see the CHANGELOG for [Svelte](https://github.com/sveltejs/svelte/blob/master/CHANGELOG.md) and [Sapper](https://github.com/sveltejs/sapper/blob/master/CHANGELOG.md).
+
+
+---
+
+## Svelte Showcase
+- [This CustomMenu example](https://svelte.dev/repl/3a33725c3adb4f57b46b597f9dade0c1?version=3.25.0) demos how to replace the OS right-click menu
+- [Github Tetris](https://svelte.dev/repl/cc1eaa7c66964fedb5e70e3ecbbaa0e1?version=3.25.1) lets you play a Tetris-like game in a git commit history
+- [Who are my representatives?](https://whoaremyrepresentatives.us/) is a website built with Svelte to help US residents get more info on their congressional representatives
+- [Pick Palette](https://github.com/bluwy/pick-palette) is a color palette manager made with Svelte!
+
+#### In-depth learning:
+- [Svelte 3 Up and Running](https://www.amazon.com/dp/B08D6T6BKS/ref=cm_sw_r_tw_dp_x_OQMtFb3GPQCB2) is a new book about building production-ready static web apps with Svelte 3
+- [Sapper Tutorial (Crash Course)](https://www.youtube.com/playlist?list=PL4cUxeGkcC9gdr4Qhx83gBBcID-KMe-PQ) walks through the ins-and-outs of Sapper, the Svelte-powered application framework
+- [Svelte Society Day France](https://france.sveltesociety.dev/) happened September 27th featuring a wide variety of topics all in French! You can find the full recording [here](https://www.youtube.com/watch?v=aS1TQ155JK4).
+
+#### Plug-and-play components:
+- [svelte-zoom](https://github.com/vaheqelyan/svelte-zoom) brings "nearly native" pan-and-zoom to images on desktop and mobile
+- [svelte-materialify](https://github.com/TheComputerM/svelte-materialify) is a Material component library for Svelte with over 50 components
+- [svelte-undoable](https://github.com/macfja/svelte-undoable) makes it easy to introduce undo and redo functionality using `bind:`
+- [This Tilt component](https://svelte.dev/repl/7b23ad9d2693424482cd411b0378b55b?version=3.24.1) implements a common UX pattern where the hovered element tilts to follow the mouse
+
+#### Lots of examples of how use JS tech came out this month:
+  - [Sapper with PostCSS and Tailwind](https://codechips.me/sapper-with-postcss-and-tailwind/)
+  - [PrismJS (Code block syntax highlighting)](https://github.com/phptuts/Svelte-PrismJS)
+  - [Filepond (Drag-and-drop file upload)](https://github.com/pqina/svelte-filepond)
+  - [Ionic (UI Components)](https://github.com/Tommertom/svelte-ionic-app)
+  - [Pell (WYSIWYG Editor)](https://github.com/Demonicious/svelte-pell/)
+  - [Leaflet (Mapping)](https://github.com/anoram/leaflet-svelte)
+
+**Reminder**: There's a [Svelte integrations repo](https://github.com/sveltejs/integrations) that demonstrates ways to incorporate Svelte into your stack (and vice versa). If you've got questions on how to use a particular piece of tech with Svelte, you may find your answer there... and if you've gotten something to work with Svelte, consider contributing!
+
+For more amazing Svelte projects, check out the [Svelte Society](https://sveltesociety.dev/), [Reddit](https://www.reddit.com/r/sveltejs/) and [Discord](https://discord.com/invite/yy75DKs)… and be sure to post your own!
+
+## See you next month!
+
+By the way, Svelte now has an [OpenCollective](https://opencollective.com/svelte)! All contributions and all expenses are published in our transparent public ledger. Learn who is donating, how much, where that money is going, submit expenses, get reimbursed and more!
diff --git a/site/content/docs/02-template-syntax.md b/site/content/docs/02-template-syntax.md
index 202489df6c..72b654a5e3 100644
--- a/site/content/docs/02-template-syntax.md
+++ b/site/content/docs/02-template-syntax.md
@@ -107,7 +107,7 @@ An element or component can have multiple spread attributes, interspersed with r
 
 ---
 
-*`$$props`* references all props that are passed to a component – including ones that are not declared with `export`. It is useful in rare cases, but not generally recommended, as it is difficult for Svelte to optimise.
+*`$$props`* references all props that are passed to a component, including ones that are not declared with `export`. It is not generally recommended, as it is difficult for Svelte to optimise. But it can be useful in rare cases – for example, when you don't know at compile time what props might be passed to a component.
 
 ```sv
 <Widget {...$$props}/>
@@ -115,7 +115,7 @@ An element or component can have multiple spread attributes, interspersed with r
 
 ---
 
-*`$$restProps`* contains only the props which are *not* declared with `export`. It can be used to pass down other unknown attributes to an element in a component.
+*`$$restProps`* contains only the props which are *not* declared with `export`. It can be used to pass down other unknown attributes to an element in a component. It shares the same optimisation problems as *`$$props`*, and is likewise not recommended.
 
 ```html
 <input {...$$restProps}>
@@ -342,6 +342,33 @@ If you don't care about the pending state, you can also omit the initial block.
 {/await}
 ```
 
+### {#key ...}
+
+```sv
+{#key expression}...{/key}
+```
+
+Key blocks destroy and recreate their contents when the value of an expression changes.
+
+---
+
+This is useful if you want an element to play its transition whenever a value changes.
+
+```sv
+{#key value}
+	<div transition:fade>{value}</div>
+{/key}
+```
+
+---
+
+When used around components, this will cause them to be reinstantiated and reinitialised.
+
+```sv
+{#key value}
+	<Component />
+{/key}
+```
 
 ### {@html ...}
 
@@ -471,6 +498,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
 * `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
 * `once` — remove the handler after the first time it runs
 * `self` — only trigger handler if event.target is the element itself
diff --git a/site/content/docs/03-run-time.md b/site/content/docs/03-run-time.md
index 42a99bea70..3b6df3071d 100644
--- a/site/content/docs/03-run-time.md
+++ b/site/content/docs/03-run-time.md
@@ -547,6 +547,7 @@ Animates the opacity of an element from 0 to the current opacity for `in` transi
 
 * `delay` (`number`, default 0) — milliseconds before starting
 * `duration` (`number`, default 400) — milliseconds the transition lasts
+* `easing` (`function`, default `linear`) — an [easing function](docs#svelte_easing)
 
 You can see the `fade` transition in action in the [transition tutorial](tutorial/transition).
 
diff --git a/site/content/examples/05-bindings/09-media-elements/App.svelte b/site/content/examples/05-bindings/09-media-elements/App.svelte
index 7a071dbe49..45345a39ff 100644
--- a/site/content/examples/05-bindings/09-media-elements/App.svelte
+++ b/site/content/examples/05-bindings/09-media-elements/App.svelte
@@ -115,8 +115,9 @@
 		on:mousedown={handleMousedown}
 		bind:currentTime={time}
 		bind:duration
-		bind:paused
-	></video>
+		bind:paused>
+			<track kind="captions"/>
+	</video>
 
 	<div class="controls" style="opacity: {duration && showControls ? 1 : 0}">
 		<progress value="{(time / duration) || 0}"/>
diff --git a/site/content/faq/200-are-there-any-video-courses.md b/site/content/faq/200-are-there-any-video-courses.md
index 1a70cdfcf5..f5e49207ae 100644
--- a/site/content/faq/200-are-there-any-video-courses.md
+++ b/site/content/faq/200-are-there-any-video-courses.md
@@ -6,9 +6,13 @@ Rich Harris, the creator of Svelte, taught a course:
 
 - [Frontend Masters](https://frontendmasters.com/courses/svelte/)
 
-There are also a couple of third-party courses:
+There are also a number of third-party courses:
 
-- [Egghead](https://egghead.io/playlists/getting-started-with-svelte-3-05a8541a)
-- [Udemy](https://www.udemy.com/sveltejs-the-complete-guide/)
+- [Egghead](https://egghead.io/browse/frameworks/svelte)
+- [Udemy](https://www.udemy.com/courses/search/?q=sveltejs+svelte) (Note: Udemy frequently has discounts over 90%)
+- [Pluralsight](https://www.pluralsight.com/search?q=svelte)
 
-Note that Udemy very frequently has discounts over 90%.
+Finally, there are also YouTube channels and playlists that teach Svelte:
+
+- [Svelte Master](https://www.youtube.com/channel/UCg6SQd5jnWo5Y70rZD9SQFA)
+- [Svelte Tutorial for Beginners](https://www.youtube.com/watch?v=zojEMeQGGHs&list=PL4cUxeGkcC9hlbrVO_2QFVqVPhlZmz7tO) by The Net Ninja
diff --git a/site/content/faq/250-are-there-any-books.md b/site/content/faq/250-are-there-any-books.md
new file mode 100644
index 0000000000..80870428ec
--- /dev/null
+++ b/site/content/faq/250-are-there-any-books.md
@@ -0,0 +1,9 @@
+---
+question: Are there any books?
+---
+
+There are a few books:
+
+- [Svelte Handbook](https://flaviocopes.com/page/download-svelte-handbook/) by Flavio Copes
+- [Svelte 3 Up and Running](https://www.amazon.com/dp/B08D6T6BKS/) by Alessandro Segala
+- [Svelte and Sapper in Action](https://www.manning.com/books/svelte-and-sapper-in-action) by R. Mark Volkmann
diff --git a/site/content/tutorial/01-introduction/07-making-an-app/text.md b/site/content/tutorial/01-introduction/07-making-an-app/text.md
index 4d044272b5..d75a9a626c 100644
--- a/site/content/tutorial/01-introduction/07-making-an-app/text.md
+++ b/site/content/tutorial/01-introduction/07-making-an-app/text.md
@@ -13,7 +13,7 @@ First, you'll need to integrate Svelte with a build tool. There are officially m
 
 Don't worry if you're relatively new to web development and haven't used these tools before. We've prepared a simple step-by-step guide, [Svelte for new developers](blog/svelte-for-new-developers), which walks you through the process.
 
-You'll also want to configure your text editor to treat `.svelte` files the same as `.html` for the sake of syntax highlighting. [Read this guide to learn how](blog/setting-up-your-editor).
+You'll also want to configure your text editor. If you're using VS Code, install the [Svelte extension](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode), otherwise follow [this guide](blog/setting-up-your-editor) to configure your text editor to treat `.svelte` files the same as `.html` for the sake of syntax highlighting.
 
 Then, once you've got your project set up, using Svelte components is easy. The compiler turns each component into a regular JavaScript class — just import it and instantiate with `new`:
 
diff --git a/site/content/tutorial/03-props/03-spread-props/text.md b/site/content/tutorial/03-props/03-spread-props/text.md
index aa7d4dc831..1480ad8065 100644
--- a/site/content/tutorial/03-props/03-spread-props/text.md
+++ b/site/content/tutorial/03-props/03-spread-props/text.md
@@ -2,10 +2,10 @@
 title: Spread props
 ---
 
-If you have an object of properties, you can 'spread' them on to a component instead of specifying each one:
+If you have an object of properties, you can 'spread' them onto a component instead of specifying each one:
 
 ```html
 <Info {...pkg}/>
 ```
 
-> Conversely, if you need to reference all the props that were passed into a component, including ones that weren't declared with `export`, you can do so by accessing `$$props` directly. It's not generally recommended, as it's difficult for Svelte to optimise, but it's useful in rare cases.
\ No newline at end of file
+> Conversely, if you need to reference all the props that were passed into a component, including ones that weren't declared with `export`, you can do so by accessing `$$props` directly. It's not generally recommended, as it's difficult for Svelte to optimise, but it's useful in rare cases.
diff --git a/site/content/tutorial/04-logic/06-await-blocks/app-a/App.svelte b/site/content/tutorial/04-logic/06-await-blocks/app-a/App.svelte
index 7ac5ca3c9e..ae2acecf8b 100644
--- a/site/content/tutorial/04-logic/06-await-blocks/app-a/App.svelte
+++ b/site/content/tutorial/04-logic/06-await-blocks/app-a/App.svelte
@@ -1,6 +1,4 @@
 <script>
-	let promise = getRandomNumber();
-
 	async function getRandomNumber() {
 		const res = await fetch(`tutorial/random-number`);
 		const text = await res.text();
@@ -12,6 +10,8 @@
 		}
 	}
 
+	let promise = getRandomNumber();
+
 	function handleClick() {
 		promise = getRandomNumber();
 	}
@@ -22,4 +22,4 @@
 </button>
 
 <!-- replace this element -->
-<p>{promise}</p>
\ No newline at end of file
+<p>{promise}</p>
diff --git a/site/content/tutorial/04-logic/06-await-blocks/app-b/App.svelte b/site/content/tutorial/04-logic/06-await-blocks/app-b/App.svelte
index 8c8036c0f1..ccb12ba4fb 100644
--- a/site/content/tutorial/04-logic/06-await-blocks/app-b/App.svelte
+++ b/site/content/tutorial/04-logic/06-await-blocks/app-b/App.svelte
@@ -1,6 +1,4 @@
 <script>
-	let promise = getRandomNumber();
-
 	async function getRandomNumber() {
 		const res = await fetch(`tutorial/random-number`);
 		const text = await res.text();
@@ -11,6 +9,8 @@
 			throw new Error(text);
 		}
 	}
+	
+	let promise = getRandomNumber();
 
 	function handleClick() {
 		promise = getRandomNumber();
@@ -27,4 +27,4 @@
 	<p>The number is {number}</p>
 {:catch error}
 	<p style="color: red">{error.message}</p>
-{/await}
\ No newline at end of file
+{/await}
diff --git a/site/content/tutorial/05-events/03-event-modifiers/text.md b/site/content/tutorial/05-events/03-event-modifiers/text.md
index 41154cafcd..2b2d6e6b31 100644
--- a/site/content/tutorial/05-events/03-event-modifiers/text.md
+++ b/site/content/tutorial/05-events/03-event-modifiers/text.md
@@ -21,6 +21,7 @@ The full list of modifiers:
 * `preventDefault` — calls `event.preventDefault()` before running the handler. Useful for client-side form handling, for example.
 * `stopPropagation` — calls `event.stopPropagation()`, preventing the event reaching the next element
 * `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 ([MDN docs](https://developer.mozilla.org/en-US/docs/Learn/JavaScript/Building_blocks/Events#Event_bubbling_and_capture))
 * `once` — remove the handler after the first time it runs
 * `self` — only trigger handler if event.target is the element itself
diff --git a/site/content/tutorial/06-bindings/10-media-elements/app-a/App.svelte b/site/content/tutorial/06-bindings/10-media-elements/app-a/App.svelte
index 40276110f4..122b2cf9e9 100644
--- a/site/content/tutorial/06-bindings/10-media-elements/app-a/App.svelte
+++ b/site/content/tutorial/06-bindings/10-media-elements/app-a/App.svelte
@@ -112,8 +112,9 @@
 		poster="https://sveltejs.github.io/assets/caminandes-llamigos.jpg"
 		src="https://sveltejs.github.io/assets/caminandes-llamigos.mp4"
 		on:mousemove={handleMousemove}
-		on:mousedown={handleMousedown}
-	></video>
+		on:mousedown={handleMousedown}>
+		<track kind="captions">
+	</video>
 
 	<div class="controls" style="opacity: {duration && showControls ? 1 : 0}">
 		<progress value="{(time / duration) || 0}"/>
diff --git a/site/content/tutorial/06-bindings/10-media-elements/app-b/App.svelte b/site/content/tutorial/06-bindings/10-media-elements/app-b/App.svelte
index 8712d6718b..6135105d6a 100644
--- a/site/content/tutorial/06-bindings/10-media-elements/app-b/App.svelte
+++ b/site/content/tutorial/06-bindings/10-media-elements/app-b/App.svelte
@@ -115,8 +115,9 @@
 		on:mousedown={handleMousedown}
 		bind:currentTime={time}
 		bind:duration
-		bind:paused
-	></video>
+		bind:paused>
+		<track kind="captions">
+	</video>
 
 	<div class="controls" style="opacity: {duration && showControls ? 1 : 0}">
 		<progress value="{(time / duration) || 0}"/>
diff --git a/site/content/tutorial/13-classes/01-classes/app-a/App.svelte b/site/content/tutorial/13-classes/01-classes/app-a/App.svelte
index 68cb642463..baa2543562 100644
--- a/site/content/tutorial/13-classes/01-classes/app-a/App.svelte
+++ b/site/content/tutorial/13-classes/01-classes/app-a/App.svelte
@@ -7,23 +7,23 @@
 		display: block;
 	}
 
-	.active {
+	.selected {
 		background-color: #ff3e00;
 		color: white;
 	}
 </style>
 
 <button
-	class="{current === 'foo' ? 'active' : ''}"
+	class="{current === 'foo' ? 'selected' : ''}"
 	on:click="{() => current = 'foo'}"
 >foo</button>
 
 <button
-	class="{current === 'bar' ? 'active' : ''}"
+	class="{current === 'bar' ? 'selected' : ''}"
 	on:click="{() => current = 'bar'}"
 >bar</button>
 
 <button
-	class="{current === 'baz' ? 'active' : ''}"
+	class="{current === 'baz' ? 'selected' : ''}"
 	on:click="{() => current = 'baz'}"
 >baz</button>
\ No newline at end of file
diff --git a/site/content/tutorial/13-classes/01-classes/app-b/App.svelte b/site/content/tutorial/13-classes/01-classes/app-b/App.svelte
index 4da386991d..a8861ad537 100644
--- a/site/content/tutorial/13-classes/01-classes/app-b/App.svelte
+++ b/site/content/tutorial/13-classes/01-classes/app-b/App.svelte
@@ -7,23 +7,23 @@
 		display: block;
 	}
 
-	.active {
+	.selected {
 		background-color: #ff3e00;
 		color: white;
 	}
 </style>
 
 <button
-	class:active="{current === 'foo'}"
+	class:selected="{current === 'foo'}"
 	on:click="{() => current = 'foo'}"
 >foo</button>
 
 <button
-	class:active="{current === 'bar'}"
+	class:selected="{current === 'bar'}"
 	on:click="{() => current = 'bar'}"
 >bar</button>
 
 <button
-	class:active="{current === 'baz'}"
+	class:selected="{current === 'baz'}"
 	on:click="{() => current = 'baz'}"
 >baz</button>
\ No newline at end of file
diff --git a/site/content/tutorial/13-classes/01-classes/text.md b/site/content/tutorial/13-classes/01-classes/text.md
index 7ad3045399..6e5b3b3c0d 100644
--- a/site/content/tutorial/13-classes/01-classes/text.md
+++ b/site/content/tutorial/13-classes/01-classes/text.md
@@ -6,7 +6,7 @@ Like any other attribute, you can specify classes with a JavaScript attribute, s
 
 ```html
 <button
-	class="{current === 'foo' ? 'active' : ''}"
+	class="{current === 'foo' ? 'selected' : ''}"
 	on:click="{() => current = 'foo'}"
 >foo</button>
 ```
@@ -15,9 +15,9 @@ This is such a common pattern in UI development that Svelte includes a special d
 
 ```html
 <button
-	class:active="{current === 'foo'}"
+	class:selected="{current === 'foo'}"
 	on:click="{() => current = 'foo'}"
 >foo</button>
 ```
 
-The `active` class is added to the element whenever the value of the expression is truthy, and removed when it's falsy.
\ No newline at end of file
+The `selected` class is added to the element whenever the value of the expression is truthy, and removed when it's falsy.
diff --git a/site/package-lock.json b/site/package-lock.json
index 00da27f0c7..93932806f8 100644
--- a/site/package-lock.json
+++ b/site/package-lock.json
@@ -315,6 +315,12 @@
         "@babel/types": "^7.4.4"
       }
     },
+    "@babel/helper-validator-identifier": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+      "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+      "dev": true
+    },
     "@babel/helper-wrap-function": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz",
@@ -1270,6 +1276,168 @@
       "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.9.tgz",
       "integrity": "sha512-VZqSaulg2kVQYMulmuZcvapPwH5/y81YHANiFIKz1GNZoG/F4o1JSeLlrvXJ8tC+RPUjxdrebfT3Qn+bnMi0bA=="
     },
+    "@rollup/plugin-babel": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.2.0.tgz",
+      "integrity": "sha512-CPABsajaKjINgBQ3it+yMnfVO3ibsrMBxRzbUOUw2cL1hsZJ7aogU8mgglQm3S2hHJgjnAmxPz0Rq7DVdmHsTw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.10.4",
+        "@rollup/pluginutils": "^3.1.0"
+      },
+      "dependencies": {
+        "@babel/helper-module-imports": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
+          "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.10.4"
+          }
+        },
+        "@babel/types": {
+          "version": "7.11.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
+          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "lodash": "^4.17.19",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@rollup/plugin-commonjs": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.0.0.tgz",
+      "integrity": "sha512-8uAdikHqVyrT32w1zB9VhW6uGwGjhKgnDNP4pQJsjdnyF4FgCj6/bmv24c7v2CuKhq32CcyCwRzMPEElaKkn0w==",
+      "dev": true,
+      "requires": {
+        "@rollup/pluginutils": "^3.1.0",
+        "commondir": "^1.0.1",
+        "estree-walker": "^2.0.1",
+        "glob": "^7.1.6",
+        "is-reference": "^1.2.1",
+        "magic-string": "^0.25.7",
+        "resolve": "^1.17.0"
+      },
+      "dependencies": {
+        "estree-walker": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.1.tgz",
+          "integrity": "sha512-tF0hv+Yi2Ot1cwj9eYHtxC0jB9bmjacjQs6ZBTj82H8JwUywFuc+7E83NWfNMwHXZc11mjfFcVXPe9gEP4B8dg==",
+          "dev": true
+        },
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "is-reference": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
+          "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
+          "dev": true,
+          "requires": {
+            "@types/estree": "*"
+          }
+        },
+        "magic-string": {
+          "version": "0.25.7",
+          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
+          "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+          "dev": true,
+          "requires": {
+            "sourcemap-codec": "^1.4.4"
+          }
+        },
+        "resolve": {
+          "version": "1.17.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+          "dev": true,
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        }
+      }
+    },
+    "@rollup/plugin-json": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz",
+      "integrity": "sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==",
+      "dev": true,
+      "requires": {
+        "@rollup/pluginutils": "^3.0.8"
+      }
+    },
+    "@rollup/plugin-node-resolve": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-9.0.0.tgz",
+      "integrity": "sha512-gPz+utFHLRrd41WMP13Jq5mqqzHL3OXrfj3/MkSyB6UBIcuNt9j60GCbarzMzdf1VHFpOxfQh/ez7wyadLMqkg==",
+      "dev": true,
+      "requires": {
+        "@rollup/pluginutils": "^3.1.0",
+        "@types/resolve": "1.17.1",
+        "builtin-modules": "^3.1.0",
+        "deepmerge": "^4.2.2",
+        "is-module": "^1.0.0",
+        "resolve": "^1.17.0"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.17.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+          "dev": true,
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        }
+      }
+    },
+    "@rollup/plugin-replace": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.3.3.tgz",
+      "integrity": "sha512-XPmVXZ7IlaoWaJLkSCDaa0Y6uVo5XQYHhiMFzOd5qSv5rE+t/UJToPIOE56flKIxBFQI27ONsxb7dqHnwSsjKQ==",
+      "dev": true,
+      "requires": {
+        "@rollup/pluginutils": "^3.0.8",
+        "magic-string": "^0.25.5"
+      },
+      "dependencies": {
+        "magic-string": {
+          "version": "0.25.7",
+          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
+          "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+          "dev": true,
+          "requires": {
+            "sourcemap-codec": "^1.4.4"
+          }
+        }
+      }
+    },
+    "@rollup/pluginutils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
+      "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
+      "dev": true,
+      "requires": {
+        "@types/estree": "0.0.39",
+        "estree-walker": "^1.0.1",
+        "picomatch": "^2.2.2"
+      }
+    },
     "@sindresorhus/slugify": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/@sindresorhus/slugify/-/slugify-0.9.1.tgz",
@@ -1281,9 +1449,9 @@
       }
     },
     "@sveltejs/site-kit": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@sveltejs/site-kit/-/site-kit-1.2.4.tgz",
-      "integrity": "sha512-W+/PthWX4R8UvKr+IyWIITGoY3cl/54ePZr3dU9ZlyP9r/weEvvKDBvjmW8tAKQFRfbxyySmXUxEGBoPhF8XAA==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/@sveltejs/site-kit/-/site-kit-1.2.5.tgz",
+      "integrity": "sha512-fA1YWW4tYOxPRVocx+jF4S2LGamku8xeKx/+J5aY7ZCbwuo/c4VF+T0K7WuQRI8U6Dw3pJqdiCra+xH4TnCGRw==",
       "dev": true,
       "requires": {
         "@sindresorhus/slugify": "^0.9.1",
@@ -1291,9 +1459,9 @@
       }
     },
     "@sveltejs/svelte-repl": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@sveltejs/svelte-repl/-/svelte-repl-0.2.0.tgz",
-      "integrity": "sha512-2vLQnOVrsmn2d2K4a6urGm8OulGGSPhZCGNySSb1H8nOPsgKrdcTt5qoaxNYXgcyVp55Yow2SvXYXsyJKd4KEQ==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@sveltejs/svelte-repl/-/svelte-repl-0.2.1.tgz",
+      "integrity": "sha512-ShNjMdsEAzGLu2PoogJEuWcV47E+1CsO8dNJ2wZcs7xyPsvuswp6KV1jFsBQmWZ+jLqtnRhlo6w2Mf43XOS/Dg==",
       "dev": true,
       "requires": {
         "codemirror": "^5.49.2",
@@ -1356,20 +1524,14 @@
       }
     },
     "@types/resolve": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
-      "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==",
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
+      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
       "dev": true,
       "requires": {
         "@types/node": "*"
       }
     },
-    "acorn": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
-      "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
-      "dev": true
-    },
     "ansi-colors": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
@@ -1556,9 +1718,9 @@
       "dev": true
     },
     "clean-css": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
-      "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
+      "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
       "dev": true,
       "requires": {
         "source-map": "~0.6.0"
@@ -1601,9 +1763,9 @@
       "dev": true
     },
     "codemirror": {
-      "version": "5.55.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.55.0.tgz",
-      "integrity": "sha512-TumikSANlwiGkdF/Blnu/rqovZ0Y3Jh8yy9TqrPbSM0xxSucq3RgnpVDQ+mD9q6JERJEIT2FMuF/fBGfkhIR/g==",
+      "version": "5.57.0",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.57.0.tgz",
+      "integrity": "sha512-WGc6UL7Hqt+8a6ZAsj/f1ApQl3NPvHY/UQSzG6fB6l4BjExgVdhFaxd7mRTw1UCiYe/6q86zHP+kfvBQcZGvUg==",
       "dev": true
     },
     "color-convert": {
@@ -1622,9 +1784,15 @@
       "dev": true
     },
     "commander": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
     "concat-map": {
@@ -1693,12 +1861,6 @@
         }
       }
     },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
-    },
     "cross-spawn": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -1727,6 +1889,12 @@
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
       "dev": true
     },
+    "deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "dev": true
+    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -1865,9 +2033,9 @@
       "dev": true
     },
     "estree-walker": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
-      "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
+      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
       "dev": true
     },
     "esutils": {
@@ -1950,6 +2118,13 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
+    "fsevents": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "dev": true,
+      "optional": true
+    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -2178,15 +2353,6 @@
       "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
       "dev": true
     },
-    "is-reference": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.1.3.tgz",
-      "integrity": "sha512-W1iHHv/oyBb2pPxkBxtaewxa1BC58Pn5J0hogyCdefwUIvb6R+TGbAcIa4qPNYLqLhb3EnOgUf2MQkkF76BcKw==",
-      "dev": true,
-      "requires": {
-        "@types/estree": "0.0.39"
-      }
-    },
     "is-regex": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
@@ -2211,12 +2377,6 @@
         "has-symbols": "^1.0.0"
       }
     },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -2224,22 +2384,29 @@
       "dev": true
     },
     "jest-worker": {
-      "version": "24.6.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.6.0.tgz",
-      "integrity": "sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==",
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.3.0.tgz",
+      "integrity": "sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==",
       "dev": true,
       "requires": {
-        "merge-stream": "^1.0.1",
-        "supports-color": "^6.1.0"
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
       },
       "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "^4.0.0"
           }
         }
       }
@@ -2474,15 +2641,6 @@
       "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
       "dev": true
     },
-    "magic-string": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.2.tgz",
-      "integrity": "sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==",
-      "dev": true,
-      "requires": {
-        "sourcemap-codec": "^1.4.4"
-      }
-    },
     "map-age-cleaner": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -2493,9 +2651,9 @@
       }
     },
     "marked": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
-      "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz",
+      "integrity": "sha512-mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw=="
     },
     "mem": {
       "version": "4.3.0",
@@ -2515,18 +2673,15 @@
       "dev": true
     },
     "merge-stream": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
-      "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.1"
-      }
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
     },
     "mime": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-      "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="
+      "version": "2.4.6",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
+      "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="
     },
     "mimic-fn": {
       "version": "2.1.0",
@@ -2702,9 +2857,9 @@
       }
     },
     "node-fetch": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
       "dev": true
     },
     "node-pg-migrate": {
@@ -3105,6 +3260,12 @@
       "integrity": "sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA==",
       "dev": true
     },
+    "picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "dev": true
+    },
     "pidtree": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.0.tgz",
@@ -3189,12 +3350,6 @@
       "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=",
       "dev": true
     },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
     "pump": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -3205,6 +3360,15 @@
         "once": "^1.3.1"
       }
     },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
     "read-pkg": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
@@ -3216,21 +3380,6 @@
         "path-type": "^3.0.0"
       }
     },
-    "readable-stream": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-      "dev": true,
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
     "rechoir": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
@@ -3361,121 +3510,74 @@
       }
     },
     "rollup": {
-      "version": "1.21.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.21.2.tgz",
-      "integrity": "sha512-sCAHlcQ/PExU5t/kRwkEWHdhGmQrZ2IgdQzbjPVNfhWbKHMMZGYqkASVTpQqRPLtQKg15xzEscc+BnIK/TE7/Q==",
+      "version": "2.26.10",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.26.10.tgz",
+      "integrity": "sha512-dUnjCWOA0h9qNX6qtcHidyatz8FAFZxVxt1dbcGtKdlJkpSxGK3G9+DLCYvtZr9v94D129ij9zUhG+xbRoqepw==",
       "dev": true,
       "requires": {
-        "@types/estree": "0.0.39",
-        "@types/node": "^12.7.4",
-        "acorn": "^7.0.0"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "12.7.4",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.4.tgz",
-          "integrity": "sha512-W0+n1Y+gK/8G2P/piTkBBN38Qc5Q1ZSO6B5H3QmPCUewaiXOo2GCAWZ4ElZCcNhjJuBSUSLGFUJnmlCn5+nxOQ==",
-          "dev": true
-        }
-      }
-    },
-    "rollup-plugin-babel": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.3.3.tgz",
-      "integrity": "sha512-tKzWOCmIJD/6aKNz0H1GMM+lW1q9KyFubbWzGiOG540zxPPifnEAHTZwjo0g991Y+DyOZcLqBgqOdqazYE5fkw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "rollup-pluginutils": "^2.8.1"
-      }
-    },
-    "rollup-plugin-commonjs": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz",
-      "integrity": "sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==",
-      "dev": true,
-      "requires": {
-        "estree-walker": "^0.6.1",
-        "is-reference": "^1.1.2",
-        "magic-string": "^0.25.2",
-        "resolve": "^1.11.0",
-        "rollup-pluginutils": "^2.8.1"
+        "fsevents": "~2.1.2"
       }
     },
-    "rollup-plugin-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-json/-/rollup-plugin-json-4.0.0.tgz",
-      "integrity": "sha512-hgb8N7Cgfw5SZAkb3jf0QXii6QX/FOkiIq2M7BAQIEydjHvTyxXHQiIzZaTFgx1GK0cRCHOCBHIyEkkLdWKxow==",
+    "rollup-plugin-svelte": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-svelte/-/rollup-plugin-svelte-6.0.0.tgz",
+      "integrity": "sha512-y9qtWa+iNYwXdOZqaEqz3i6k3gzofC9JXzv+WVKDOt0DLiJxJaSrlKKf4YkKG91RzTK5Lo+0fW8in9QH/DxEhA==",
       "dev": true,
       "requires": {
-        "rollup-pluginutils": "^2.5.0"
+        "require-relative": "^0.8.7",
+        "rollup-pluginutils": "^2.8.2",
+        "sourcemap-codec": "^1.4.8"
       }
     },
-    "rollup-plugin-node-resolve": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz",
-      "integrity": "sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==",
+    "rollup-plugin-terser": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.1.tgz",
+      "integrity": "sha512-HL0dgzSxBYG/Ly9i/E5Sc+PuKKZ0zBzk11VmLCfdUtpqH4yYqkLclPkTqRy85FU9246yetImOClaQ/ufnj08vg==",
       "dev": true,
       "requires": {
-        "@types/resolve": "0.0.8",
-        "builtin-modules": "^3.1.0",
-        "is-module": "^1.0.0",
-        "resolve": "^1.11.1",
-        "rollup-pluginutils": "^2.8.1"
+        "@babel/code-frame": "^7.10.4",
+        "jest-worker": "^26.2.1",
+        "serialize-javascript": "^4.0.0",
+        "terser": "^5.0.0"
       },
       "dependencies": {
-        "resolve": {
-          "version": "1.11.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
-          "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
+        "@babel/code-frame": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
           "dev": true,
           "requires": {
-            "path-parse": "^1.0.6"
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.4",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
           }
         }
       }
     },
-    "rollup-plugin-replace": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-replace/-/rollup-plugin-replace-2.2.0.tgz",
-      "integrity": "sha512-/5bxtUPkDHyBJAKketb4NfaeZjL5yLZdeUihSfbF2PQMz+rSTEb8ARKoOl3UBT4m7/X+QOXJo3sLTcq+yMMYTA==",
-      "dev": true,
-      "requires": {
-        "magic-string": "^0.25.2",
-        "rollup-pluginutils": "^2.6.0"
-      }
-    },
-    "rollup-plugin-svelte": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-svelte/-/rollup-plugin-svelte-5.1.0.tgz",
-      "integrity": "sha512-4MRZG29dAWDpoxEs5uIHzDnYafQEOLaKIJAuDYUtFIzEm1F1IGSTlFyjd8/qk4wltlHdu6V7YfZY53+CKryhMg==",
-      "dev": true,
-      "requires": {
-        "require-relative": "^0.8.7",
-        "rollup-pluginutils": "^2.3.3",
-        "sourcemap-codec": "^1.4.4"
-      }
-    },
-    "rollup-plugin-terser": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-5.1.1.tgz",
-      "integrity": "sha512-McIMCDEY8EU6Y839C09UopeRR56wXHGdvKKjlfiZG/GrP6wvZQ62u2ko/Xh1MNH2M9WDL+obAAHySljIZYCuPQ==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "jest-worker": "^24.6.0",
-        "rollup-pluginutils": "^2.8.1",
-        "serialize-javascript": "^1.7.0",
-        "terser": "^4.1.0"
-      }
-    },
     "rollup-pluginutils": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.1.tgz",
-      "integrity": "sha512-J5oAoysWar6GuZo0s+3bZ6sVZAC0pfqKz68De7ZgDi5z63jOVZn1uJL/+z1jeKHNbGII8kAyHF5q8LnxSX5lQg==",
+      "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
+        }
       }
     },
     "safe-buffer": {
@@ -3495,9 +3597,9 @@
       }
     },
     "sapper": {
-      "version": "0.27.11",
-      "resolved": "https://registry.npmjs.org/sapper/-/sapper-0.27.11.tgz",
-      "integrity": "sha512-5EaPZhlc8OnyN3UCI6dRSM1Gz5sxyzLZG/1z5nMvZhg9Ng+rSvEvJx/rW/tSHcnQPa8or7+YcbfvQHKS5oPHiw==",
+      "version": "0.27.16",
+      "resolved": "https://registry.npmjs.org/sapper/-/sapper-0.27.16.tgz",
+      "integrity": "sha512-q8dohkbhga6xO+0a8h84odFyoilQ0D0vJtF8NHra/DQmSeN2R2MXUfwhw3EyvLms3T1x8H3v+qw642Qf5JXA9g==",
       "dev": true,
       "requires": {
         "html-minifier": "^4.0.0",
@@ -3505,14 +3607,6 @@
         "shimport": "^1.0.1",
         "sourcemap-codec": "^1.4.6",
         "string-hash": "^1.1.3"
-      },
-      "dependencies": {
-        "sourcemap-codec": {
-          "version": "1.4.6",
-          "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz",
-          "integrity": "sha512-1ZooVLYFxC448piVLBbtOxFcXwnymH9oUF8nRd3CuYDVvkRBxRl6pB4Mtas5a4drtL+E8LDgFkQNcgIw6tc8Hg==",
-          "dev": true
-        }
       }
     },
     "sax": {
@@ -3533,10 +3627,13 @@
       "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
     },
     "serialize-javascript": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz",
-      "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==",
-      "dev": true
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.1.0"
+      }
     },
     "set-blocking": {
       "version": "2.0.0",
@@ -3595,9 +3692,9 @@
       "dev": true
     },
     "sirv": {
-      "version": "1.0.0-next.2",
-      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.0-next.2.tgz",
-      "integrity": "sha512-hWp0todr4jSb1BFBiANRmqYRXzX02l36/X4tyHPYKqMZ+e1hrDZKUjIIXrAOBRWlAE/G5cGImUciMrUcU8DeOg==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.6.tgz",
+      "integrity": "sha512-LRGu7Op4Xl9hhigOy2kcB53zAYTjNDdpooey49dIU0cMdpOv9ithVf7nstk3jvs8EhMiT/VORoyazZYGgw4vnA==",
       "requires": {
         "@polka/url": "^1.0.0-next.9",
         "mime": "^2.3.1",
@@ -3611,9 +3708,9 @@
       "dev": true
     },
     "source-map-support": {
-      "version": "0.5.12",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
-      "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
       "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
@@ -3629,9 +3726,9 @@
       }
     },
     "sourcemap-codec": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz",
-      "integrity": "sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==",
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
       "dev": true
     },
     "spdx-correct": {
@@ -3718,15 +3815,6 @@
         "function-bind": "^1.1.1"
       }
     },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "strip-ansi": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -3791,9 +3879,9 @@
       }
     },
     "terser": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.1.2.tgz",
-      "integrity": "sha512-jvNoEQSPXJdssFwqPSgWjsOrb+ELoE+ILpHPKXC83tIxOlh2U75F1KuB2luLD/3a6/7K3Vw5pDn+hvu0C4AzSw==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.0.tgz",
+      "integrity": "sha512-XTT3D3AwxC54KywJijmY2mxZ8nJiEjBHVYzq8l9OaYuRFWeQNBwvipuzzYEP4e+/AVcd1hqG/CqgsdIRyT45Fg==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -3839,9 +3927,9 @@
       "dev": true
     },
     "totalist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.0.1.tgz",
-      "integrity": "sha512-HuAt9bWDCdLkebrIQr+i63NgQSvjeD2VTNUIEBqof/4pG4Gb6omuBOMUX0vF371cbfImXQzmb4Ue/0c9MUWGew=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",
+      "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g=="
     },
     "trim-right": {
       "version": "1.0.1",
@@ -3858,22 +3946,10 @@
       }
     },
     "uglify-js": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz",
-      "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==",
-      "dev": true,
-      "requires": {
-        "commander": "~2.20.0",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
+      "version": "3.10.4",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.4.tgz",
+      "integrity": "sha512-kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw==",
+      "dev": true
     },
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
@@ -3918,12 +3994,6 @@
         "pako": "^1.0.5"
       }
     },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
     "util.promisify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
diff --git a/site/package.json b/site/package.json
index c416fe5bf1..6e00636476 100644
--- a/site/package.json
+++ b/site/package.json
@@ -4,9 +4,9 @@
   "description": "Docs and examples for Svelte",
   "scripts": {
     "dev": "npm run copy-workers && sapper dev",
-    "copy-workers": "rm -rf static/workers && cp -r node_modules/@sveltejs/svelte-repl/workers static",
+    "copy-workers": "node scripts/copy-workers.js",
     "migrate": "node-pg-migrate -r dotenv/config",
-    "sapper": "npm run copy-workers && sapper build --legacy",
+    "build": "npm run copy-workers && sapper build --legacy",
     "update": "node scripts/update_template.js && node scripts/get-contributors.js && node scripts/update_whos_using.js",
     "start": "node __sapper__/build",
     "test": "mocha -r esm test/**",
@@ -21,12 +21,12 @@
     "flru": "^1.0.2",
     "httpie": "^1.1.2",
     "jsonwebtoken": "^8.5.1",
-    "marked": "^0.7.0",
+    "marked": "^1.0.0",
     "pg": "^7.12.1",
     "polka": "^1.0.0-next.9",
     "prism-svelte": "^0.4.3",
     "prismjs": "^1.21.0",
-    "sirv": "^1.0.0-next.2",
+    "sirv": "^1.0.0",
     "yootils": "0.0.16"
   },
   "devDependencies": {
@@ -35,26 +35,26 @@
     "@babel/plugin-transform-runtime": "^7.6.0",
     "@babel/preset-env": "^7.6.0",
     "@babel/runtime": "^7.6.0",
+    "@rollup/plugin-babel": "^5.0.0",
+    "@rollup/plugin-commonjs": "^15.0.0",
+    "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-node-resolve": "^9.0.0",
+    "@rollup/plugin-replace": "^2.2.0",
     "@sindresorhus/slugify": "^0.9.1",
-    "@sveltejs/site-kit": "^1.2.4",
-    "@sveltejs/svelte-repl": "^0.2.0",
+    "@sveltejs/site-kit": "^1.2.5",
+    "@sveltejs/svelte-repl": "^0.2.1",
     "degit": "^2.1.4",
     "dotenv": "^8.1.0",
     "esm": "^3.2.25",
     "jimp": "^0.8.0",
     "mocha": "^6.2.0",
-    "node-fetch": "^2.6.0",
+    "node-fetch": "^2.6.1",
     "node-pg-migrate": "^3.22.0",
     "npm-run-all": "^4.1.5",
-    "rollup": "^1.21.2",
-    "rollup-plugin-babel": "^4.3.3",
-    "rollup-plugin-commonjs": "^10.1.0",
-    "rollup-plugin-json": "^4.0.0",
-    "rollup-plugin-node-resolve": "^5.2.0",
-    "rollup-plugin-replace": "^2.2.0",
-    "rollup-plugin-svelte": "^5.1.0",
-    "rollup-plugin-terser": "^5.1.1",
-    "sapper": "^0.27.11",
+    "rollup": "^2.26.10",
+    "rollup-plugin-svelte": "^6.0.0",
+    "rollup-plugin-terser": "^7.0.0",
+    "sapper": "^0.27.16",
     "shelljs": "^0.8.3",
     "svelte": "^3.12.0"
   },
diff --git a/site/rollup.config.js b/site/rollup.config.js
index d4efb4eb29..0078711c7a 100644
--- a/site/rollup.config.js
+++ b/site/rollup.config.js
@@ -1,10 +1,10 @@
 import 'dotenv/config';
-import resolve from 'rollup-plugin-node-resolve';
-import replace from 'rollup-plugin-replace';
-import commonjs from 'rollup-plugin-commonjs';
+import babel from '@rollup/plugin-babel';
+import commonjs from '@rollup/plugin-commonjs';
+import json from '@rollup/plugin-json';
+import replace from '@rollup/plugin-replace';
+import resolve from '@rollup/plugin-node-resolve';
 import svelte from 'rollup-plugin-svelte';
-import babel from 'rollup-plugin-babel';
-import json from 'rollup-plugin-json';
 import { terser } from 'rollup-plugin-terser';
 import config from 'sapper/config/rollup.js';
 import pkg from './package.json';
@@ -44,7 +44,7 @@ export default {
 
 			legacy && babel({
 				extensions: ['.js', '.mjs', '.html', '.svelte'],
-				runtimeHelpers: true,
+				babelHelpers: 'runtime',
 				exclude: ['node_modules/@babel/**'],
 				presets: [
 					['@babel/preset-env', {
@@ -63,6 +63,8 @@ export default {
 				module: true
 			})
 		],
+
+		preserveEntrySignatures: false,
 		onwarn
 	},
 
@@ -91,6 +93,8 @@ export default {
 				require('module').builtinModules || Object.keys(process.binding('natives'))
 			)
 		],
+
+		preserveEntrySignatures: 'strict',
 		onwarn
 	},
 
@@ -105,6 +109,9 @@ export default {
 			}),
 			commonjs(),
 			!dev && terser()
-		]
+		],
+
+		preserveEntrySignatures: false,
+		onwarn
 	}
 };
diff --git a/site/scripts/copy-workers.js b/site/scripts/copy-workers.js
new file mode 100644
index 0000000000..4856764ad0
--- /dev/null
+++ b/site/scripts/copy-workers.js
@@ -0,0 +1,4 @@
+const sh = require('shelljs');
+
+sh.rm('-rf', 'static/workers');
+sh.cp('-r', 'node_modules/@sveltejs/svelte-repl/workers', 'static');
diff --git a/site/src/routes/_layout.svelte b/site/src/routes/_layout.svelte
index 07445de0a0..55f4861880 100644
--- a/site/src/routes/_layout.svelte
+++ b/site/src/routes/_layout.svelte
@@ -62,7 +62,6 @@
 
 <style>
 	main {
-		height: 100%;
 		position: relative;
 		margin: 0 auto;
 		/* padding: var(--nav-h) var(--side-nav) 0 var(--side-nav); */
diff --git a/site/src/routes/repl/[id]/index.svelte b/site/src/routes/repl/[id]/index.svelte
index 59ca292adb..945678ba33 100644
--- a/site/src/routes/repl/[id]/index.svelte
+++ b/site/src/routes/repl/[id]/index.svelte
@@ -117,7 +117,7 @@
 <style>
 	.repl-outer {
 		position: relative;
-		height: 100%;
+		height: calc(100vh - var(--nav-h));
 		--app-controls-h: 5.6rem;
 		--pane-controls-h: 4.2rem;
 		overflow: hidden;
diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts
index 88fe197993..d2542c9830 100644
--- a/src/compiler/compile/Component.ts
+++ b/src/compiler/compile/Component.ts
@@ -8,7 +8,7 @@ import {
 	create_scopes,
 	extract_names,
 	Scope,
-	extract_identifiers,
+	extract_identifiers
 } from './utils/scope';
 import Stylesheet from './css/Stylesheet';
 import { test } from '../config';
@@ -29,6 +29,7 @@ import add_to_set from './utils/add_to_set';
 import check_graph_for_cycles from './utils/check_graph_for_cycles';
 import { print, x, b } from 'code-red';
 import { is_reserved_keyword } from './utils/reserved_keywords';
+import Element from './nodes/Element';
 
 interface ComponentOptions {
 	namespace?: string;
@@ -85,6 +86,7 @@ export default class Component {
 	file: string;
 	locate: (c: number) => { line: number; column: number };
 
+	elements: Element[] = [];
 	stylesheet: Stylesheet;
 
 	aliases: Map<string, Identifier> = new Map();
@@ -155,7 +157,7 @@ export default class Component {
 				) || { start: 0, end: 0 };
 				this.warn(svelteOptions, {
 					code: 'custom-element-no-tag',
-					message: `No custom element 'tag' option was specified. To automatically register a custom element, specify a name with a hyphen in it, e.g. <svelte:options tag="my-thing"/>. To hide this warning, use <svelte:options tag={null}/>`,
+					message: 'No custom element \'tag\' option was specified. To automatically register a custom element, specify a name with a hyphen in it, e.g. <svelte:options tag="my-thing"/>. To hide this warning, use <svelte:options tag={null}/>'
 				});
 			}
 			this.tag = this.component_options.tag || compile_options.tag;
@@ -171,8 +173,8 @@ export default class Component {
 
 		this.walk_instance_js_post_template();
 
+		this.elements.forEach(element => this.stylesheet.apply(element));
 		if (!compile_options.customElement) this.stylesheet.reify();
-
 		this.stylesheet.warn_on_unused_selectors(this);
 	}
 
@@ -190,7 +192,7 @@ export default class Component {
 			this.add_var({
 				name,
 				injected: true,
-				referenced: true,
+				referenced: true
 			});
 		} else if (name[0] === '$') {
 			this.add_var({
@@ -198,7 +200,7 @@ export default class Component {
 				injected: true,
 				referenced: true,
 				mutated: true,
-				writable: true,
+				writable: true
 			});
 
 			const subscribable_name = name.slice(1);
@@ -221,6 +223,10 @@ export default class Component {
 		return this.aliases.get(name);
 	}
 
+	apply_stylesheet(element: Element) {
+		this.elements.push(element);
+	}
+
 	global(name: string) {
 		const alias = this.alias(name);
 		this.globals.set(name, alias);
@@ -235,7 +241,7 @@ export default class Component {
 			const { compile_options, name } = this;
 			const { format = 'esm' } = compile_options;
 
-			const banner = `${this.file ? `${this.file} ` : ``}generated by Svelte v${'__VERSION__'}`;
+			const banner = `${this.file ? `${this.file} ` : ''}generated by Svelte v${'__VERSION__'}`;
 
 			const program: any = { type: 'Program', body: result.js };
 
@@ -289,7 +295,7 @@ export default class Component {
 			}
 			const imported_helpers = Array.from(this.helpers, ([name, alias]) => ({
 				name,
-				alias,
+				alias
 			}));
 
 			create_module(
@@ -305,7 +311,7 @@ export default class Component {
 					.filter(variable => variable.module && variable.export_name)
 					.map(variable => ({
 						name: variable.name,
-						as: variable.export_name,
+						as: variable.export_name
 					}))
 			);
 
@@ -342,9 +348,9 @@ export default class Component {
 					reassigned: v.reassigned || false,
 					referenced: v.referenced || false,
 					writable: v.writable || false,
-					referenced_from_script: v.referenced_from_script || false,
+					referenced_from_script: v.referenced_from_script || false
 				})),
-			stats: this.stats.render(),
+			stats: this.stats.render()
 		};
 	}
 
@@ -409,7 +415,7 @@ export default class Component {
 			source: this.source,
 			start: pos.start,
 			end: pos.end,
-			filename: this.compile_options.filename,
+			filename: this.compile_options.filename
 		});
 	}
 
@@ -441,7 +447,7 @@ export default class Component {
 			pos: pos.start,
 			filename: this.compile_options.filename,
 			toString: () =>
-				`${warning.message} (${start.line}:${start.column})\n${frame}`,
+				`${warning.message} (${start.line}:${start.column})\n${frame}`
 		});
 	}
 
@@ -452,16 +458,16 @@ export default class Component {
 	extract_exports(node) {
 		if (node.type === 'ExportDefaultDeclaration') {
 			this.error(node, {
-				code: `default-export`,
-				message: `A component cannot have a default export`,
+				code: 'default-export',
+				message: 'A component cannot have a default export'
 			});
 		}
 
 		if (node.type === 'ExportNamedDeclaration') {
 			if (node.source) {
 				this.error(node, {
-					code: `not-implemented`,
-					message: `A component currently cannot have an export ... from`,
+					code: 'not-implemented',
+					message: 'A component currently cannot have an export ... from'
 				});
 			}
 			if (node.declaration) {
@@ -472,7 +478,7 @@ export default class Component {
 							variable.export_name = name;
 							if (variable.writable && !(variable.referenced || variable.referenced_from_script || variable.subscribable)) {
 								this.warn(declarator, {
-									code: `unused-export-let`,
+									code: 'unused-export-let',
 									message: `${this.name.name} has unused export property '${name}'. If it is for external reference only, please consider using \`export const ${name}\``
 								});
 							}
@@ -495,7 +501,7 @@ export default class Component {
 
 						if (variable.writable && !(variable.referenced || variable.referenced_from_script || variable.subscribable)) {
 							this.warn(specifier, {
-								code: `unused-export-let`,
+								code: 'unused-export-let',
 								message: `${this.name.name} has unused export property '${specifier.exported.name}'. If it is for external reference only, please consider using \`export const ${specifier.exported.name}\``
 							});
 						}
@@ -515,8 +521,7 @@ export default class Component {
 			if (this.hoistable_nodes.has(node)) return false;
 			if (this.reactive_declaration_nodes.has(node)) return false;
 			if (node.type === 'ImportDeclaration') return false;
-			if (node.type === 'ExportDeclaration' && node.specifiers.length > 0)
-				return false;
+			if (node.type === 'ExportDeclaration' && node.specifiers.length > 0) return false;
 			return true;
 		});
 	}
@@ -531,10 +536,10 @@ export default class Component {
 				if (node.type === 'LabeledStatement' && node.label.name === '$') {
 					component.warn(node as any, {
 						code: 'module-script-reactive-declaration',
-						message: '$: has no effect in a module script',
+						message: '$: has no effect in a module script'
 					});
 				}
-			},
+			}
 		});
 
 		const { scope, globals } = create_scopes(script.content);
@@ -544,7 +549,7 @@ export default class Component {
 			if (name[0] === '$') {
 				this.error(node as any, {
 					code: 'illegal-declaration',
-					message: `The $ prefix is reserved, and cannot be used for variable and import names`,
+					message: 'The $ prefix is reserved, and cannot be used for variable and import names'
 				});
 			}
 
@@ -562,7 +567,7 @@ export default class Component {
 			if (name[0] === '$') {
 				this.error(node as any, {
 					code: 'illegal-subscription',
-					message: `Cannot reference store value inside <script context="module">`,
+					message: 'Cannot reference store value inside <script context="module">'
 				});
 			} else {
 				this.add_var({
@@ -623,16 +628,18 @@ export default class Component {
 			if (name[0] === '$') {
 				this.error(node as any, {
 					code: 'illegal-declaration',
-					message: `The $ prefix is reserved, and cannot be used for variable and import names`,
+					message: 'The $ prefix is reserved, and cannot be used for variable and import names'
 				});
 			}
 
 			const writable = node.type === 'VariableDeclaration' && (node.kind === 'var' || node.kind === 'let');
+			const imported = node.type.startsWith('Import');
 
 			this.add_var({
 				name,
 				initialised: instance_scope.initialised_declarations.has(name),
-				writable
+				writable,
+				imported
 			});
 
 			this.node_for_declaration.set(name, node);
@@ -647,12 +654,12 @@ export default class Component {
 					injected: true,
 					writable: true,
 					reassigned: true,
-					initialised: true,
+					initialised: true
 				});
 			} else if (is_reserved_keyword(name)) {
 				this.add_var({
 					name,
-					injected: true,
+					injected: true
 				});
 			} else if (name[0] === '$') {
 				if (name === '$' || name[1] === '$') {
@@ -666,7 +673,7 @@ export default class Component {
 					name,
 					injected: true,
 					mutated: true,
-					writable: true,
+					writable: true
 				});
 
 				this.add_reference(name.slice(1));
@@ -764,7 +771,7 @@ export default class Component {
 				if (map.has(node)) {
 					scope = scope.parent;
 				}
-			},
+			}
 		});
 
 		for (const [parent, prop, index] of to_remove) {
@@ -832,7 +839,7 @@ export default class Component {
 				if (map.has(node)) {
 					scope = scope.parent;
 				}
-			},
+			}
 		});
 	}
 
@@ -844,7 +851,7 @@ export default class Component {
 		) {
 			this.warn(node as any, {
 				code: 'non-top-level-reactive-declaration',
-				message: '$: has no effect outside of the top-level',
+				message: '$: has no effect outside of the top-level'
 			});
 		}
 
@@ -859,8 +866,8 @@ export default class Component {
 
 				if (name[1] !== '$' && scope.has(name.slice(1)) && scope.find_owner(name.slice(1)) !== this.instance_scope) {
 					this.error(node, {
-						code: `contextual-store`,
-						message: `Stores must be declared at the top level of the component (this may change in a future version of Svelte)`
+						code: 'contextual-store',
+						message: 'Stores must be declared at the top level of the component (this may change in a future version of Svelte)'
 					});
 				}
 			}
@@ -881,7 +888,7 @@ export default class Component {
 			if (node.body.type !== 'BlockStatement') {
 				node.body = {
 					type: 'BlockStatement',
-					body: [node.body],
+					body: [node.body]
 				};
 			}
 			node.body.body.push(inside[0]);
@@ -890,8 +897,8 @@ export default class Component {
 				type: 'BlockStatement',
 				body: [
 					before[0],
-					node,
-				],
+					node
+				]
 			};
 		}
 		return null;
@@ -927,7 +934,7 @@ export default class Component {
 										// TODO is this still true post-#3539?
 										component.error(declarator as any, {
 											code: 'destructured-prop',
-											message: `Cannot declare props in destructured declaration`,
+											message: 'Cannot declare props in destructured declaration'
 										});
 									}
 
@@ -947,12 +954,6 @@ export default class Component {
 							const variable = component.var_lookup.get(name);
 
 							if (variable.export_name && variable.writable) {
-								const insert = variable.subscribable
-									? get_insert(variable)
-									: null;
-
-								parent[key].splice(index + 1, 0, insert);
-
 								declarator.id = {
 									type: 'ObjectPattern',
 									properties: [{
@@ -973,7 +974,9 @@ export default class Component {
 								};
 
 								declarator.init = x`$$props`;
-							} else if (variable.subscribable) {
+							}
+
+							if (variable.subscribable && declarator.init) {
 								const insert = get_insert(variable);
 								parent[key].splice(index + 1, 0, ...insert);
 							}
@@ -990,7 +993,7 @@ export default class Component {
 				if (node.type === 'ExportNamedDeclaration' && node.declaration) {
 					(parent as Program).body[index] = node.declaration;
 				}
-			},
+			}
 		});
 	}
 
@@ -1004,7 +1007,7 @@ export default class Component {
 			hoistable_nodes,
 			var_lookup,
 			injected_reactive_declaration_vars,
-			imports,
+			imports
 		} = this;
 
 		const top_level_function_declarations = new Map();
@@ -1034,8 +1037,9 @@ export default class Component {
 						this.vars.find(
 							variable => variable.name === name && variable.module
 						)
-					)
+					) {
 						return false;
+					}
 
 					return true;
 				});
@@ -1136,7 +1140,7 @@ export default class Component {
 					if (map.has(node)) {
 						scope = scope.parent;
 					}
-				},
+				}
 			});
 
 			checked.add(fn_declaration);
@@ -1229,7 +1233,7 @@ export default class Component {
 						if (map.has(node)) {
 							scope = scope.parent;
 						}
-					},
+					}
 				});
 
 				const { expression } = node.body as ExpressionStatement;
@@ -1239,7 +1243,7 @@ export default class Component {
 					assignees,
 					dependencies,
 					node,
-					declaration,
+					declaration
 				});
 			}
 		});
@@ -1284,8 +1288,9 @@ export default class Component {
 			declaration.dependencies.forEach(name => {
 				if (declaration.assignees.has(name)) return;
 				const earlier_declarations = lookup.get(name);
-				if (earlier_declarations)
+				if (earlier_declarations) {
 					earlier_declarations.forEach(add_declaration);
+				}
 			});
 
 			this.reactive_declarations.push(declaration);
@@ -1315,12 +1320,13 @@ export default class Component {
 		if (globals.has(name) && node.type !== 'InlineComponent') return;
 
 		let message = `'${name}' is not defined`;
-		if (!this.ast.instance)
+		if (!this.ast.instance) {
 			message += `. Consider adding a <script> block with 'export let ${name}' to declare a prop`;
+		}
 
 		this.warn(node, {
 			code: 'missing-declaration',
-			message,
+			message
 		});
 	}
 
@@ -1343,7 +1349,7 @@ function process_component_options(component: Component, nodes) {
 			'accessors' in component.compile_options
 				? component.compile_options.accessors
 				: !!component.compile_options.customElement,
-		preserveWhitespace: !!component.compile_options.preserveWhitespace,
+		preserveWhitespace: !!component.compile_options.preserveWhitespace
 	};
 
 	const node = nodes.find(node => node.name === 'svelte:options');
@@ -1375,23 +1381,24 @@ function process_component_options(component: Component, nodes) {
 				switch (name) {
 					case 'tag': {
 						const code = 'invalid-tag-attribute';
-						const message = `'tag' must be a string literal`;
+						const message = "'tag' must be a string literal";
 						const tag = get_value(attribute, code, message);
 
-						if (typeof tag !== 'string' && tag !== null)
+						if (typeof tag !== 'string' && tag !== null) {
 							component.error(attribute, { code, message });
+						}
 
 						if (tag && !/^[a-zA-Z][a-zA-Z0-9]*-[a-zA-Z0-9-]+$/.test(tag)) {
 							component.error(attribute, {
-								code: `invalid-tag-property`,
-								message: `tag name must be two or more words joined by the '-' character`,
+								code: 'invalid-tag-property',
+								message: "tag name must be two or more words joined by the '-' character"
 							});
 						}
 
 						if (tag && !component.compile_options.customElement) {
 							component.warn(attribute, {
 								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?`
+								message: "The 'tag' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?"
 							});
 						}
 
@@ -1401,23 +1408,24 @@ function process_component_options(component: Component, nodes) {
 
 					case 'namespace': {
 						const code = 'invalid-namespace-attribute';
-						const message = `The 'namespace' attribute must be a string literal representing a valid namespace`;
+						const message = "The 'namespace' attribute must be a string literal representing a valid namespace";
 						const ns = get_value(attribute, code, message);
 
-						if (typeof ns !== 'string')
+						if (typeof ns !== 'string') {
 							component.error(attribute, { code, message });
+						}
 
 						if (valid_namespaces.indexOf(ns) === -1) {
 							const match = fuzzymatch(ns, valid_namespaces);
 							if (match) {
 								component.error(attribute, {
-									code: `invalid-namespace-property`,
-									message: `Invalid namespace '${ns}' (did you mean '${match}'?)`,
+									code: 'invalid-namespace-property',
+									message: `Invalid namespace '${ns}' (did you mean '${match}'?)`
 								});
 							} else {
 								component.error(attribute, {
-									code: `invalid-namespace-property`,
-									message: `Invalid namespace '${ns}'`,
+									code: 'invalid-namespace-property',
+									message: `Invalid namespace '${ns}'`
 								});
 							}
 						}
@@ -1433,8 +1441,9 @@ function process_component_options(component: Component, nodes) {
 						const message = `${name} attribute must be true or false`;
 						const value = get_value(attribute, code, message);
 
-						if (typeof value !== 'boolean')
+						if (typeof value !== 'boolean') {
 							component.error(attribute, { code, message });
+						}
 
 						component_options[name] = value;
 						break;
@@ -1442,14 +1451,14 @@ function process_component_options(component: Component, nodes) {
 
 					default:
 						component.error(attribute, {
-							code: `invalid-options-attribute`,
-							message: `<svelte:options> unknown attribute`,
+							code: 'invalid-options-attribute',
+							message: '<svelte:options> unknown attribute'
 						});
 				}
 			} else {
 				component.error(attribute, {
-					code: `invalid-options-attribute`,
-					message: `<svelte:options> can only have static 'tag', 'namespace', 'accessors', 'immutable' and 'preserveWhitespace' attributes`,
+					code: 'invalid-options-attribute',
+					message: "<svelte:options> can only have static 'tag', 'namespace', 'accessors', 'immutable' and 'preserveWhitespace' attributes"
 				});
 			}
 		});
diff --git a/src/compiler/compile/css/Selector.ts b/src/compiler/compile/css/Selector.ts
index 6bc046c93e..e20aa43fb6 100644
--- a/src/compiler/compile/css/Selector.ts
+++ b/src/compiler/compile/css/Selector.ts
@@ -4,12 +4,24 @@ import { gather_possible_values, UNKNOWN } from './gather_possible_values';
 import { CssNode } from './interfaces';
 import Component from '../Component';
 import Element from '../nodes/Element';
+import { INode } from '../nodes/interfaces';
+import EachBlock from '../nodes/EachBlock';
+import IfBlock from '../nodes/IfBlock';
+import AwaitBlock from '../nodes/AwaitBlock';
 
 enum BlockAppliesToNode {
 	NotPossible,
 	Possible,
 	UnknownSelectorType
 }
+enum NodeExist {
+	Probably = 1,
+	Definitely = 2,
+}
+
+const whitelist_attribute_selector = new Map([
+	['details', new Set(['open'])]
+]);
 
 export default class Selector {
 	node: CssNode;
@@ -35,10 +47,10 @@ export default class Selector {
 		this.used = this.local_blocks.length === 0;
 	}
 
-	apply(node: Element, stack: Element[]) {
+	apply(node: Element) {
 		const to_encapsulate: any[] = [];
 
-		apply_selector(this.local_blocks.slice(), node, stack.slice(), to_encapsulate);
+		apply_selector(this.local_blocks.slice(), node, to_encapsulate);
 
 		if (to_encapsulate.length > 0) {
 			to_encapsulate.forEach(({ node, block }) => {
@@ -65,9 +77,8 @@ export default class Selector {
 
 	transform(code: MagicString, attr: string, max_amount_class_specificity_increased: number) {
 		const amount_class_specificity_to_increase = max_amount_class_specificity_increased - this.blocks.filter(block => block.should_encapsulate).length;
-		attr = attr.repeat(amount_class_specificity_to_increase + 1);
 
-		function encapsulate_block(block: Block) {
+		function encapsulate_block(block: Block, attr: string) {
 			let i = block.selectors.length;
 
 			while (i--) {
@@ -89,15 +100,14 @@ export default class Selector {
 			}
 		}
 
-		this.blocks.forEach((block) => {
+		this.blocks.forEach((block, index) => {
 			if (block.global) {
 				const selector = block.selectors[0];
 				const first = selector.children[0];
 				const last = selector.children[selector.children.length - 1];
 				code.remove(selector.start, first.start).remove(last.end, selector.end);
 			}
-
-			if (block.should_encapsulate) encapsulate_block(block);
+			if (block.should_encapsulate) encapsulate_block(block, index === this.blocks.length - 1 ? attr.repeat(amount_class_specificity_to_increase + 1) : attr);
 		});
 	}
 
@@ -108,8 +118,8 @@ export default class Selector {
 				const selector = block.selectors[i];
 				if (selector.type === 'PseudoClassSelector' && selector.name === 'global') {
 					component.error(selector, {
-						code: `css-invalid-global`,
-						message: `:global(...) must be the first element in a compound selector`
+						code: 'css-invalid-global',
+						message: ':global(...) must be the first element in a compound selector'
 					});
 				}
 			}
@@ -129,8 +139,8 @@ export default class Selector {
 		for (let i = start; i < end; i += 1) {
 			if (this.blocks[i].global) {
 				component.error(this.blocks[i].selectors[0], {
-					code: `css-invalid-global`,
-					message: `:global(...) can be at the start or end of a selector sequence, but not in the middle`
+					code: 'css-invalid-global',
+					message: ':global(...) can be at the start or end of a selector sequence, but not in the middle'
 				});
 			}
 		}
@@ -147,12 +157,12 @@ export default class Selector {
 	}
 }
 
-function apply_selector(blocks: Block[], node: Element, stack: Element[], to_encapsulate: any[]): boolean {
+function apply_selector(blocks: Block[], node: Element, to_encapsulate: any[]): boolean {
 	const block = blocks.pop();
 	if (!block) return false;
 
 	if (!node) {
-		return blocks.every(block => block.global);
+		return block.global && blocks.every(block => block.global);
 	}
 
 	switch (block_might_apply_to_node(block, node)) {
@@ -160,7 +170,7 @@ function apply_selector(blocks: Block[], node: Element, stack: Element[], to_enc
 			return false;
 
 		case BlockAppliesToNode.UnknownSelectorType:
-			// bail. TODO figure out what these could be
+		// bail. TODO figure out what these could be
 			to_encapsulate.push({ node, block });
 			return true;
 	}
@@ -172,9 +182,10 @@ function apply_selector(blocks: Block[], node: Element, stack: Element[], to_enc
 					continue;
 				}
 
-				for (const stack_node of stack) {
-					if (block_might_apply_to_node(ancestor_block, stack_node) !== BlockAppliesToNode.NotPossible) {
-						to_encapsulate.push({ node: stack_node, block: ancestor_block });
+				let parent = node;
+				while (parent = get_element_parent(parent)) {
+					if (block_might_apply_to_node(ancestor_block, parent) !== BlockAppliesToNode.NotPossible) {
+						to_encapsulate.push({ node: parent, block: ancestor_block });
 					}
 				}
 
@@ -191,12 +202,22 @@ function apply_selector(blocks: Block[], node: Element, stack: Element[], to_enc
 
 			return false;
 		} else if (block.combinator.name === '>') {
-			if (apply_selector(blocks, stack.pop(), stack, to_encapsulate)) {
+			if (apply_selector(blocks, get_element_parent(node), to_encapsulate)) {
 				to_encapsulate.push({ node, block });
 				return true;
 			}
 
 			return false;
+		} else if (block.combinator.name === '+' || block.combinator.name === '~') {
+			const siblings = get_possible_element_siblings(node, block.combinator.name === '+');
+			let has_match = false;
+			for (const possible_sibling of siblings.keys()) {
+				if (apply_selector(blocks.slice(), possible_sibling, to_encapsulate)) {
+					to_encapsulate.push({ node, block });
+					has_match = true;
+				}
+			}
+			return has_match;
 		}
 
 		// TODO other combinators
@@ -208,7 +229,7 @@ function apply_selector(blocks: Block[], node: Element, stack: Element[], to_enc
 	return true;
 }
 
-function block_might_apply_to_node(block, node): BlockAppliesToNode {
+function block_might_apply_to_node(block: Block, node: Element): BlockAppliesToNode {
 	let i = block.selectors.length;
 
 	while (i--) {
@@ -234,7 +255,11 @@ function block_might_apply_to_node(block, node): BlockAppliesToNode {
 		}
 
 		else if (selector.type === 'AttributeSelector') {
-			if (!attribute_matches(node, selector.name.name, selector.value && unquote(selector.value), selector.matcher, selector.flags)) return BlockAppliesToNode.NotPossible;
+			if (
+				!(whitelist_attribute_selector.has(node.name.toLowerCase()) && whitelist_attribute_selector.get(node.name.toLowerCase()).has(selector.name.name.toLowerCase())) &&
+				!attribute_matches(node, selector.name.name, selector.value && unquote(selector.value), selector.matcher, selector.flags)) {
+				return BlockAppliesToNode.NotPossible;
+			}
 		}
 
 		else if (selector.type === 'TypeSelector') {
@@ -261,7 +286,7 @@ function test_attribute(operator, expected_value, case_insensitive, value) {
 		case '^=': return value.startsWith(expected_value);
 		case '$=': return value.endsWith(expected_value);
 		case '*=': return value.includes(expected_value);
-		default: throw new Error(`this shouldn't happen`);
+		default: throw new Error("this shouldn't happen");
 	}
 }
 
@@ -370,6 +395,158 @@ function unquote(value: CssNode) {
 	return str;
 }
 
+function get_element_parent(node: Element): Element | null {
+	let parent: INode = node;
+	while ((parent = parent.parent) && parent.type !== 'Element');
+	return parent as Element | null;
+}
+
+function get_possible_element_siblings(node: INode, adjacent_only: boolean): Map<Element, NodeExist> {
+	const result: Map<Element, NodeExist> = new Map();
+	let prev: INode = node;
+	while (prev = prev.prev) {
+		if (prev.type === 'Element') {
+			if (!prev.attributes.find(attr => attr.type === 'Attribute' && attr.name.toLowerCase() === 'slot')) {
+				result.set(prev, NodeExist.Definitely);
+			}
+
+			if (adjacent_only) {
+				break;
+			}
+		} else if (prev.type === 'EachBlock' || prev.type === 'IfBlock' || prev.type === 'AwaitBlock') {
+			const possible_last_child = get_possible_last_child(prev, adjacent_only);
+
+			add_to_map(possible_last_child, result);
+			if (adjacent_only && has_definite_elements(possible_last_child)) {
+				return result;
+			}
+		}
+	}
+
+	if (!prev || !adjacent_only) {
+		let parent: INode = node;
+		let skip_each_for_last_child = node.type === 'ElseBlock';
+		while ((parent = parent.parent) && (parent.type === 'EachBlock' || parent.type === 'IfBlock' || parent.type === 'ElseBlock' || parent.type === 'AwaitBlock')) {
+			const possible_siblings = get_possible_element_siblings(parent, adjacent_only);
+			add_to_map(possible_siblings, result);
+			
+			if (parent.type === 'EachBlock') {
+				// first child of each block can select the last child of each block as previous sibling
+				if (skip_each_for_last_child) {
+					skip_each_for_last_child = false;
+				} else {
+					add_to_map(get_possible_last_child(parent, adjacent_only), result);
+				}
+			} else if (parent.type === 'ElseBlock') {
+				skip_each_for_last_child = true;
+				parent = parent.parent;
+			}
+
+			if (adjacent_only && has_definite_elements(possible_siblings)) {
+				break;
+			}
+		}
+	}
+
+	return result;
+}
+
+function get_possible_last_child(block: EachBlock | IfBlock | AwaitBlock, adjacent_only: boolean): Map<Element, NodeExist> {
+	const result: Map<Element, NodeExist> = new Map();
+
+	if (block.type === 'EachBlock') {
+		const each_result: Map<Element, NodeExist> = loop_child(block.children, adjacent_only);
+		const else_result: Map<Element, NodeExist> = block.else ? loop_child(block.else.children, adjacent_only) : new Map();
+		
+		const not_exhaustive = !has_definite_elements(else_result);
+
+		if (not_exhaustive) {
+			mark_as_probably(each_result);
+			mark_as_probably(else_result);
+		}
+		add_to_map(each_result, result);
+		add_to_map(else_result, result);
+	} else if (block.type === 'IfBlock') {
+		const if_result: Map<Element, NodeExist> = loop_child(block.children, adjacent_only);
+		const else_result: Map<Element, NodeExist> = block.else ? loop_child(block.else.children, adjacent_only) : new Map();
+
+		const not_exhaustive = !has_definite_elements(if_result) || !has_definite_elements(else_result);
+
+		if (not_exhaustive) {
+			mark_as_probably(if_result);
+			mark_as_probably(else_result);
+		}
+
+		add_to_map(if_result, result);
+		add_to_map(else_result, result);
+	} else if (block.type === 'AwaitBlock') {
+		const pending_result: Map<Element, NodeExist> = block.pending ? loop_child(block.pending.children, adjacent_only) : new Map();
+		const then_result: Map<Element, NodeExist> = block.then ? loop_child(block.then.children, adjacent_only) : new Map();
+		const catch_result: Map<Element, NodeExist> = block.catch ? loop_child(block.catch.children, adjacent_only) : new Map();
+
+		const not_exhaustive = !has_definite_elements(pending_result) || !has_definite_elements(then_result) || !has_definite_elements(catch_result);
+
+		if (not_exhaustive) {
+			mark_as_probably(pending_result);
+			mark_as_probably(then_result);
+			mark_as_probably(catch_result);
+		}
+
+		add_to_map(pending_result, result);
+		add_to_map(then_result, result);
+		add_to_map(catch_result, result);
+	}
+
+	return result;
+}
+
+function has_definite_elements(result: Map<Element, NodeExist>): boolean {
+	if (result.size === 0) return false;
+	for (const exist of result.values()) {
+		if (exist === NodeExist.Definitely) {
+			return true;
+		}
+	}
+	return false;
+}
+
+function add_to_map(from: Map<Element, NodeExist>, to: Map<Element, NodeExist>) {
+	from.forEach((exist, element) => {
+		to.set(element, higher_existance(exist, to.get(element)));
+	});
+}
+
+function higher_existance(exist1: NodeExist | null, exist2: NodeExist | null): NodeExist {
+	if (exist1 === undefined || exist2 === undefined) return exist1 || exist2;
+	return exist1 > exist2 ? exist1 : exist2;
+}
+
+function mark_as_probably(result: Map<Element, NodeExist>) {
+	for (const key of result.keys()) {
+		result.set(key, NodeExist.Probably);
+	}
+}
+
+function loop_child(children: INode[], adjacent_only: boolean) {
+	const result: Map<Element, NodeExist> = new Map();
+	for (let i = children.length - 1; i >= 0; i--) {
+		const child = children[i];
+		if (child.type === 'Element') {
+			result.set(child, NodeExist.Definitely);
+			if (adjacent_only) {
+				break;
+			}
+		} else if (child.type === 'EachBlock' || child.type === 'IfBlock' || child.type === 'AwaitBlock') {
+			const child_result = get_possible_last_child(child, adjacent_only);
+			add_to_map(child_result, result);
+			if (adjacent_only && has_definite_elements(child_result)) {
+				break;
+			}
+		}
+	}
+	return result;
+}
+
 class Block {
 	global: boolean;
 	combinator: CssNode;
diff --git a/src/compiler/compile/css/Stylesheet.ts b/src/compiler/compile/css/Stylesheet.ts
index 27438947ff..5547c6eb0c 100644
--- a/src/compiler/compile/css/Stylesheet.ts
+++ b/src/compiler/compile/css/Stylesheet.ts
@@ -2,10 +2,10 @@ import MagicString from 'magic-string';
 import { walk } from 'estree-walker';
 import Selector from './Selector';
 import Element from '../nodes/Element';
-import { Ast, TemplateNode } from '../../interfaces';
+import { Ast } from '../../interfaces';
 import Component from '../Component';
 import { CssNode } from './interfaces';
-import hash from "../utils/hash";
+import hash from '../utils/hash';
 
 function remove_css_prefix(name: string): string {
 	return name.replace(/^-((webkit)|(moz)|(o)|(ms))-/, '');
@@ -51,8 +51,8 @@ class Rule {
 		this.declarations = node.block.children.map((node: CssNode) => new Declaration(node));
 	}
 
-	apply(node: Element, stack: Element[]) {
-		this.selectors.forEach(selector => selector.apply(node, stack)); // TODO move the logic in here?
+	apply(node: Element) {
+		this.selectors.forEach(selector => selector.apply(node)); // TODO move the logic in here?
 	}
 
 	is_used(dev: boolean) {
@@ -162,10 +162,10 @@ class Atrule {
 		this.declarations = [];
 	}
 
-	apply(node: Element, stack: Element[]) {
+	apply(node: Element) {
 		if (this.node.name === 'media' || this.node.name === 'supports') {
 			this.children.forEach(child => {
-				child.apply(node, stack);
+				child.apply(node);
 			});
 		}
 
@@ -364,15 +364,9 @@ export default class Stylesheet {
 	apply(node: Element) {
 		if (!this.has_styles) return;
 
-		const stack: Element[] = [];
-		let parent: TemplateNode = node;
-		while (parent = parent.parent) {
-			if (parent.type === 'Element') stack.unshift(parent as Element);
-		}
-
 		for (let i = 0; i < this.children.length; i += 1) {
 			const child = this.children[i];
-			child.apply(node, stack);
+			child.apply(node);
 		}
 	}
 
@@ -434,7 +428,7 @@ export default class Stylesheet {
 		this.children.forEach(child => {
 			child.warn_on_unused_selector((selector: Selector) => {
 				component.warn(selector.node, {
-					code: `css-unused-selector`,
+					code: 'css-unused-selector',
 					message: `Unused CSS selector "${this.source.slice(selector.node.start, selector.node.end)}"`
 				});
 			});
diff --git a/src/compiler/compile/css/gather_possible_values.ts b/src/compiler/compile/css/gather_possible_values.ts
index 85f2e032c8..4390e23c8d 100644
--- a/src/compiler/compile/css/gather_possible_values.ts
+++ b/src/compiler/compile/css/gather_possible_values.ts
@@ -15,4 +15,4 @@ export function gather_possible_values(node: Node, set: Set<string|{}>) {
 	else {
 		set.add(UNKNOWN);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/css/interfaces.ts b/src/compiler/compile/css/interfaces.ts
index 103bc18d79..b732186de4 100644
--- a/src/compiler/compile/css/interfaces.ts
+++ b/src/compiler/compile/css/interfaces.ts
@@ -3,4 +3,4 @@ export interface CssNode {
 	start: number;
 	end: number;
 	[prop_name: string]: any;
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/index.ts b/src/compiler/compile/index.ts
index 12b161aeeb..1faa33ee1e 100644
--- a/src/compiler/compile/index.ts
+++ b/src/compiler/compile/index.ts
@@ -1,4 +1,3 @@
-import { assign } from '../../runtime/internal/utils';
 import Stats from '../Stats';
 import parse from '../parse/index';
 import render_dom from './render_dom/index';
@@ -47,28 +46,28 @@ function validate_options(options: CompileOptions, warnings: Warning[]) {
 	}
 
 	if (name && /^[a-z]/.test(name)) {
-		const message = `options.name should be capitalised`;
+		const message = 'options.name should be capitalised';
 		warnings.push({
-			code: `options-lowercase-name`,
+			code: 'options-lowercase-name',
 			message,
 			filename,
-			toString: () => message,
+			toString: () => message
 		});
 	}
 
 	if (loopGuardTimeout && !dev) {
 		const message = 'options.loopGuardTimeout is for options.dev = true only';
 		warnings.push({
-			code: `options-loop-guard-timeout`,
+			code: 'options-loop-guard-timeout',
 			message,
 			filename,
-			toString: () => message,
+			toString: () => message
 		});
 	}
 }
 
 export default function compile(source: string, options: CompileOptions = {}) {
-	options = assign({ generate: 'dom', dev: false }, options);
+	options = Object.assign({ generate: 'dom', dev: false }, options);
 
 	const stats = new Stats();
 	const warnings = [];
diff --git a/src/compiler/compile/nodes/Action.ts b/src/compiler/compile/nodes/Action.ts
index 86aefa0ced..edd2a8d97a 100644
--- a/src/compiler/compile/nodes/Action.ts
+++ b/src/compiler/compile/nodes/Action.ts
@@ -11,10 +11,11 @@ export default class Action extends Node {
 	constructor(component: Component, parent, scope, info) {
 		super(component, parent, scope, info);
 
-		component.warn_if_undefined(info.name, info, scope);
+		const object = info.name.split('.')[0];
+		component.warn_if_undefined(object, info, scope);
 
 		this.name = info.name;
-		component.add_reference(info.name.split('.')[0]);
+		component.add_reference(object);
 
 		this.expression = info.expression
 			? new Expression(component, this, scope, info.expression)
@@ -22,4 +23,4 @@ export default class Action extends Node {
 
 		this.uses_context = this.expression && this.expression.uses_context;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/nodes/Animation.ts b/src/compiler/compile/nodes/Animation.ts
index 10cc9364a0..88c9175d04 100644
--- a/src/compiler/compile/nodes/Animation.ts
+++ b/src/compiler/compile/nodes/Animation.ts
@@ -17,8 +17,8 @@ export default class Animation extends Node {
 
 		if (parent.animation) {
 			component.error(this, {
-				code: `duplicate-animation`,
-				message: `An element can only have one 'animate' directive`
+				code: 'duplicate-animation',
+				message: "An element can only have one 'animate' directive"
 			});
 		}
 
@@ -26,8 +26,8 @@ export default class Animation extends Node {
 		if (!block || block.type !== 'EachBlock' || !block.key) {
 			// TODO can we relax the 'immediate child' rule?
 			component.error(this, {
-				code: `invalid-animation`,
-				message: `An element that use the animate directive must be the immediate child of a keyed each block`
+				code: 'invalid-animation',
+				message: 'An element that use the animate directive must be the immediate child of a keyed each block'
 			});
 		}
 
@@ -37,4 +37,4 @@ export default class Animation extends Node {
 			? new Expression(component, this, scope, info.expression, true)
 			: null;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/nodes/Binding.ts b/src/compiler/compile/nodes/Binding.ts
index c561e72b99..0d619449e3 100644
--- a/src/compiler/compile/nodes/Binding.ts
+++ b/src/compiler/compile/nodes/Binding.ts
@@ -3,7 +3,7 @@ import get_object from '../utils/get_object';
 import Expression from './shared/Expression';
 import Component from '../Component';
 import TemplateScope from './shared/TemplateScope';
-import {dimensions} from "../../utils/patterns";
+import {dimensions} from '../../utils/patterns';
 import { Node as ESTreeNode } from 'estree';
 
 // TODO this should live in a specific binding
@@ -67,17 +67,21 @@ export default class Binding extends Node {
 		} else {
 			const variable = component.var_lookup.get(name);
 
-			if (!variable || variable.global) component.error(this.expression.node, {
-				code: 'binding-undeclared',
-				message: `${name} is not declared`
-			});
+			if (!variable || variable.global) {
+				component.error(this.expression.node, {
+					code: 'binding-undeclared',
+					message: `${name} is not declared`
+				});
+			}
 
 			variable[this.expression.node.type === 'MemberExpression' ? 'mutated' : 'reassigned'] = true;
 
-			if (info.expression.type === 'Identifier' && !variable.writable) component.error(this.expression.node, {
-				code: 'invalid-binding',
-				message: 'Cannot bind to a variable which is not writable',
-			});
+			if (info.expression.type === 'Identifier' && !variable.writable) {
+				component.error(this.expression.node, {
+					code: 'invalid-binding',
+					message: 'Cannot bind to a variable which is not writable'
+				});
+			}
 		}
 
 		const type = parent.get_static_attribute_value('type');
diff --git a/src/compiler/compile/nodes/Class.ts b/src/compiler/compile/nodes/Class.ts
index 75000371d9..8d3ee1f265 100644
--- a/src/compiler/compile/nodes/Class.ts
+++ b/src/compiler/compile/nodes/Class.ts
@@ -15,4 +15,4 @@ export default class Class extends Node {
 			? new Expression(component, this, scope, info.expression)
 			: null;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/nodes/Comment.ts b/src/compiler/compile/nodes/Comment.ts
index 161150bd25..c9b4d548bf 100644
--- a/src/compiler/compile/nodes/Comment.ts
+++ b/src/compiler/compile/nodes/Comment.ts
@@ -14,4 +14,4 @@ export default class Comment extends Node {
 		const match = pattern.exec(this.data);
 		this.ignores = match ? match[1].split(/[^\S]/).map(x => x.trim()).filter(Boolean) : [];
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/nodes/EachBlock.ts b/src/compiler/compile/nodes/EachBlock.ts
index 30306745bd..38cc976e6f 100644
--- a/src/compiler/compile/nodes/EachBlock.ts
+++ b/src/compiler/compile/nodes/EachBlock.ts
@@ -60,8 +60,8 @@ export default class EachBlock extends AbstractBlock {
 			if (this.children.length !== 1) {
 				const child = this.children.find(child => !!(child as Element).animation);
 				component.error((child as Element).animation, {
-					code: `invalid-animation`,
-					message: `An element that use the animate directive must be the sole child of a keyed each block`
+					code: 'invalid-animation',
+					message: 'An element that use the animate directive must be the sole child of a keyed each block'
 				});
 			}
 		}
diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index 145866cf4f..f734c2b625 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -16,6 +16,7 @@ import list from '../../utils/list';
 import Let from './Let';
 import TemplateScope from './shared/TemplateScope';
 import { INode } from './interfaces';
+import Component from '../Component';
 
 const svg = /^(?:altGlyph|altGlyphDef|altGlyphItem|animate|animateColor|animateMotion|animateTransform|circle|clipPath|color-profile|cursor|defs|desc|discard|ellipse|feBlend|feColorMatrix|feComponentTransfer|feComposite|feConvolveMatrix|feDiffuseLighting|feDisplacementMap|feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feImage|feMerge|feMergeNode|feMorphology|feOffset|fePointLight|feSpecularLighting|feSpotLight|feTile|feTurbulence|filter|font|font-face|font-face-format|font-face-name|font-face-src|font-face-uri|foreignObject|g|glyph|glyphRef|hatch|hatchpath|hkern|image|line|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|metadata|missing-glyph|mpath|path|pattern|polygon|polyline|radialGradient|rect|set|solidcolor|stop|svg|switch|symbol|text|textPath|tref|tspan|unknown|use|view|vkern)$/;
 
@@ -62,14 +63,14 @@ const a11y_no_onchange = new Set([
 ]);
 
 const a11y_labelable = new Set([
-	"button",
-	"input",
-	"keygen",
-	"meter",
-	"output",
-	"progress",
-	"select",
-	"textarea"
+	'button',
+	'input',
+	'keygen',
+	'meter',
+	'output',
+	'progress',
+	'select',
+	'textarea'
 ]);
 
 const invisible_elements = new Set(['meta', 'html', 'script', 'style']);
@@ -80,6 +81,7 @@ const valid_modifiers = new Set([
 	'capture',
 	'once',
 	'passive',
+	'nonpassive',
 	'self'
 ]);
 
@@ -123,7 +125,7 @@ export default class Element extends Node {
 	namespace: string;
 	needs_manual_style_scoping: boolean;
 
-	constructor(component, parent, scope, info: any) {
+	constructor(component: Component, parent, scope, info: any) {
 		super(component, parent, scope, info);
 		this.name = info.name;
 
@@ -134,8 +136,8 @@ export default class Element extends Node {
 				const value_attribute = info.attributes.find(node => node.name === 'value');
 				if (value_attribute) {
 					component.error(value_attribute, {
-						code: `textarea-duplicate-value`,
-						message: `A <textarea> can have either a value attribute or (equivalently) child content, but not both`
+						code: 'textarea-duplicate-value',
+						message: 'A <textarea> can have either a value attribute or (equivalently) child content, but not both'
 					});
 				}
 
@@ -235,14 +237,21 @@ export default class Element extends Node {
 
 		this.validate();
 
-		component.stylesheet.apply(this);
+		component.apply_stylesheet(this);
 	}
 
 	validate() {
+		if (this.component.var_lookup.has(this.name) && this.component.var_lookup.get(this.name).imported) {
+			this.component.warn(this, {
+				code: 'component-name-lowercase',
+				message: `<${this.name}> will be treated as an HTML element unless it begins with a capital letter`
+			});
+		}
+
 		if (a11y_distracting_elements.has(this.name)) {
 			// no-distracting-elements
 			this.component.warn(this, {
-				code: `a11y-distracting-elements`,
+				code: 'a11y-distracting-elements',
 				message: `A11y: Avoid <${this.name}> elements`
 			});
 		}
@@ -264,8 +273,8 @@ export default class Element extends Node {
 
 			if (!is_figure_parent) {
 				this.component.warn(this, {
-					code: `a11y-structure`,
-					message: `A11y: <figcaption> must be an immediate child of <figure>`
+					code: 'a11y-structure',
+					message: 'A11y: <figcaption> must be an immediate child of <figure>'
 				});
 			}
 		}
@@ -281,8 +290,8 @@ export default class Element extends Node {
 
 			if (index !== -1 && (index !== 0 && index !== children.length - 1)) {
 				this.component.warn(children[index], {
-					code: `a11y-structure`,
-					message: `A11y: <figcaption> must be first or last child of <figure>`
+					code: 'a11y-structure',
+					message: 'A11y: <figcaption> must be first or last child of <figure>'
 				});
 			}
 		}
@@ -309,7 +318,7 @@ export default class Element extends Node {
 				if (invisible_elements.has(this.name)) {
 					// aria-unsupported-elements
 					component.warn(attribute, {
-						code: `a11y-aria-attributes`,
+						code: 'a11y-aria-attributes',
 						message: `A11y: <${this.name}> should not have aria-* attributes`
 					});
 				}
@@ -321,14 +330,14 @@ export default class Element extends Node {
 					if (match) message += ` (did you mean '${match}'?)`;
 
 					component.warn(attribute, {
-						code: `a11y-unknown-aria-attribute`,
+						code: 'a11y-unknown-aria-attribute',
 						message
 					});
 				}
 
 				if (name === 'aria-hidden' && /^h[1-6]$/.test(this.name)) {
 					component.warn(attribute, {
-						code: `a11y-hidden`,
+						code: 'a11y-hidden',
 						message: `A11y: <${this.name}> element should not be hidden`
 					});
 				}
@@ -339,7 +348,7 @@ export default class Element extends Node {
 				if (invisible_elements.has(this.name)) {
 					// aria-unsupported-elements
 					component.warn(attribute, {
-						code: `a11y-misplaced-role`,
+						code: 'a11y-misplaced-role',
 						message: `A11y: <${this.name}> should not have role attribute`
 					});
 				}
@@ -353,7 +362,7 @@ export default class Element extends Node {
 					if (match) message += ` (did you mean '${match}'?)`;
 
 					component.warn(attribute, {
-						code: `a11y-unknown-role`,
+						code: 'a11y-unknown-role',
 						message
 					});
 				}
@@ -362,24 +371,24 @@ export default class Element extends Node {
 			// no-access-key
 			if (name === 'accesskey') {
 				component.warn(attribute, {
-					code: `a11y-accesskey`,
-					message: `A11y: Avoid using accesskey`
+					code: 'a11y-accesskey',
+					message: 'A11y: Avoid using accesskey'
 				});
 			}
 
 			// no-autofocus
 			if (name === 'autofocus') {
 				component.warn(attribute, {
-					code: `a11y-autofocus`,
-					message: `A11y: Avoid using autofocus`
+					code: 'a11y-autofocus',
+					message: 'A11y: Avoid using autofocus'
 				});
 			}
 
 			// scope
 			if (name === 'scope' && this.name !== 'th') {
 				component.warn(attribute, {
-					code: `a11y-misplaced-scope`,
-					message: `A11y: The scope attribute should only be used with <th> elements`
+					code: 'a11y-misplaced-scope',
+					message: 'A11y: The scope attribute should only be used with <th> elements'
 				});
 			}
 
@@ -389,8 +398,8 @@ export default class Element extends Node {
 				// @ts-ignore todo is tabindex=true correct case?
 				if (!isNaN(value) && +value > 0) {
 					component.warn(attribute, {
-						code: `a11y-positive-tabindex`,
-						message: `A11y: avoid tabindex values above zero`
+						code: 'a11y-positive-tabindex',
+						message: 'A11y: avoid tabindex values above zero'
 					});
 				}
 			}
@@ -398,22 +407,22 @@ export default class Element extends Node {
 
 			if (/(^[0-9-.])|[\^$@%&#?!|()[\]{}^*+~;]/.test(name)) {
 				component.error(attribute, {
-					code: `illegal-attribute`,
-					message: `'${name}' is not a valid attribute name`,
+					code: 'illegal-attribute',
+					message: `'${name}' is not a valid attribute name`
 				});
 			}
 
 			if (name === 'slot') {
 				if (!attribute.is_static) {
 					component.error(attribute, {
-						code: `invalid-slot-attribute`,
-						message: `slot attribute cannot have a dynamic value`
+						code: 'invalid-slot-attribute',
+						message: 'slot attribute cannot have a dynamic value'
 					});
 				}
 
 				if (component.slot_outlets.has(name)) {
 					component.error(attribute, {
-						code: `duplicate-slot-attribute`,
+						code: 'duplicate-slot-attribute',
 						message: `Duplicate '${name}' slot`
 					});
 
@@ -422,8 +431,8 @@ export default class Element extends Node {
 
 				if (!(parent.type === 'InlineComponent' || within_custom_element(parent))) {
 					component.error(attribute, {
-						code: `invalid-slotted-content`,
-						message: `Element with a slot='...' attribute must be a child of a component or a descendant of a custom element`,
+						code: 'invalid-slotted-content',
+						message: 'Element with a slot=\'...\' attribute must be a child of a component or a descendant of a custom element'
 					});
 				}
 			}
@@ -431,7 +440,7 @@ export default class Element extends Node {
 			if (name === 'is') {
 				component.warn(attribute, {
 					code: 'avoid-is',
-					message: `The 'is' attribute is not supported cross-browser and should be avoided`
+					message: 'The \'is\' attribute is not supported cross-browser and should be avoided'
 				});
 			}
 
@@ -462,7 +471,7 @@ export default class Element extends Node {
 
 				if (href_value === '' || href_value === '#' || /^\W*javascript:/i.test(href_value)) {
 					component.warn(href_attribute, {
-						code: `a11y-invalid-attribute`,
+						code: 'a11y-invalid-attribute',
 						message: `A11y: '${href_value}' is not a valid ${href_attribute.name} attribute`
 					});
 				}
@@ -472,8 +481,8 @@ export default class Element extends Node {
 
 				if (!id_attribute_valid && !name_attribute_valid) {
 					component.warn(this, {
-						code: `a11y-missing-attribute`,
-						message: `A11y: <a> element should have an href attribute`
+						code: 'a11y-missing-attribute',
+						message: 'A11y: <a> element should have an href attribute'
 					});
 				}
 			}
@@ -511,8 +520,8 @@ export default class Element extends Node {
 
 				if (/\b(image|picture|photo)\b/i.test(alt_value)) {
 					component.warn(this, {
-						code: `a11y-img-redundant-alt`,
-						message: `A11y: Screenreaders already announce <img> elements as an image.`
+						code: 'a11y-img-redundant-alt',
+						message: 'A11y: Screenreaders already announce <img> elements as an image.'
 					});
 				}
 			}
@@ -522,8 +531,8 @@ export default class Element extends Node {
 			const has_input_child = this.children.some(i => (i instanceof Element && a11y_labelable.has(i.name) ));
 			if (!attribute_map.has('for') && !has_input_child) {
 				component.warn(this, {
-					code: `a11y-label-has-associated-control`,
-					message: `A11y: A form label must be associated with a control.`
+					code: 'a11y-label-has-associated-control',
+					message: 'A11y: A form label must be associated with a control.'
 				});
 			}
 		}
@@ -541,8 +550,8 @@ export default class Element extends Node {
 
 			if (!has_caption) {
 				component.warn(this, {
-					code: `a11y-media-has-caption`,
-					message: `A11y: Media elements must have a <track kind="captions">`
+					code: 'a11y-media-has-caption',
+					message: 'A11y: Media elements must have a <track kind="captions">'
 				});
 			}
 		}
@@ -550,8 +559,8 @@ export default class Element extends Node {
 		if (a11y_no_onchange.has(this.name)) {
 			if (handlers_map.has('change') && !handlers_map.has('blur')) {
 				component.warn(this, {
-					code: `a11y-no-onchange`,
-					message: `A11y: on:blur must be used instead of on:change, unless absolutely necessary and it causes no negative consequences for keyboard only or screen reader users.`
+					code: 'a11y-no-onchange',
+					message: 'A11y: on:blur must be used instead of on:change, unless absolutely necessary and it causes no negative consequences for keyboard only or screen reader users.'
 				});
 			}
 		}
@@ -569,8 +578,8 @@ export default class Element extends Node {
 
 			if (!attribute.is_static) {
 				component.error(attribute, {
-					code: `invalid-type`,
-					message: `'type' attribute cannot be dynamic if input uses two-way binding`
+					code: 'invalid-type',
+					message: '\'type\' attribute cannot be dynamic if input uses two-way binding'
 				});
 			}
 
@@ -578,8 +587,8 @@ export default class Element extends Node {
 
 			if (value === true) {
 				component.error(attribute, {
-					code: `missing-type`,
-					message: `'type' attribute must be specified`
+					code: 'missing-type',
+					message: '\'type\' attribute must be specified'
 				});
 			}
 
@@ -596,7 +605,7 @@ export default class Element extends Node {
 					this.name !== 'select'
 				) {
 					component.error(binding, {
-						code: `invalid-binding`,
+						code: 'invalid-binding',
 						message: `'value' is not a valid binding on <${this.name}> elements`
 					});
 				}
@@ -608,8 +617,8 @@ export default class Element extends Node {
 
 					if (attribute && !attribute.is_static) {
 						component.error(attribute, {
-							code: `dynamic-multiple-attribute`,
-							message: `'multiple' attribute cannot be dynamic if select uses two-way binding`
+							code: 'dynamic-multiple-attribute',
+							message: '\'multiple\' attribute cannot be dynamic if select uses two-way binding'
 						});
 					}
 				} else {
@@ -618,7 +627,7 @@ export default class Element extends Node {
 			} else if (name === 'checked' || name === 'indeterminate') {
 				if (this.name !== 'input') {
 					component.error(binding, {
-						code: `invalid-binding`,
+						code: 'invalid-binding',
 						message: `'${name}' is not a valid binding on <${this.name}> elements`
 					});
 				}
@@ -627,13 +636,13 @@ export default class Element extends Node {
 
 				if (type !== 'checkbox') {
 					let message = `'${name}' binding can only be used with <input type="checkbox">`;
-					if (type === 'radio') message += ` — for <input type="radio">, use 'group' binding`;
-					component.error(binding, { code: `invalid-binding`, message });
+					if (type === 'radio') message += ' — for <input type="radio">, use \'group\' binding';
+					component.error(binding, { code: 'invalid-binding', message });
 				}
 			} else if (name === 'group') {
 				if (this.name !== 'input') {
 					component.error(binding, {
-						code: `invalid-binding`,
+						code: 'invalid-binding',
 						message: `'group' is not a valid binding on <${this.name}> elements`
 					});
 				}
@@ -642,14 +651,14 @@ export default class Element extends Node {
 
 				if (type !== 'checkbox' && type !== 'radio') {
 					component.error(binding, {
-						code: `invalid-binding`,
-						message: `'group' binding can only be used with <input type="checkbox"> or <input type="radio">`
+						code: 'invalid-binding',
+						message: '\'group\' binding can only be used with <input type="checkbox"> or <input type="radio">'
 					});
 				}
 			} else if (name === 'files') {
 				if (this.name !== 'input') {
 					component.error(binding, {
-						code: `invalid-binding`,
+						code: 'invalid-binding',
 						message: `'files' is not a valid binding on <${this.name}> elements`
 					});
 				}
@@ -658,15 +667,15 @@ export default class Element extends Node {
 
 				if (type !== 'file') {
 					component.error(binding, {
-						code: `invalid-binding`,
-						message: `'files' binding can only be used with <input type="file">`
+						code: 'invalid-binding',
+						message: '\'files\' binding can only be used with <input type="file">'
 					});
 				}
 
 			} else if (name === 'open') {
 				if (this.name !== 'details') {
 					component.error(binding, {
-						code: `invalid-binding`,
+						code: 'invalid-binding',
 						message: `'${name}' binding can only be used with <details>`
 					});
 				}
@@ -685,7 +694,7 @@ export default class Element extends Node {
 			) {
 				if (this.name !== 'audio' && this.name !== 'video') {
 					component.error(binding, {
-						code: `invalid-binding`,
+						code: 'invalid-binding',
 						message: `'${name}' binding can only be used with <audio> or <video>`
 					});
 				}
@@ -695,7 +704,7 @@ export default class Element extends Node {
 			) {
 				if (this.name !== 'video') {
 					component.error(binding, {
-						code: `invalid-binding`,
+						code: 'invalid-binding',
 						message: `'${name}' binding can only be used with <video>`
 					});
 				}
@@ -726,18 +735,18 @@ export default class Element extends Node {
 
 				if (!contenteditable) {
 					component.error(binding, {
-						code: `missing-contenteditable-attribute`,
-						message: `'contenteditable' attribute is required for textContent and innerHTML two-way bindings`
+						code: 'missing-contenteditable-attribute',
+						message: '\'contenteditable\' attribute is required for textContent and innerHTML two-way bindings'
 					});
 				} else if (contenteditable && !contenteditable.is_static) {
 					component.error(contenteditable, {
-						code: `dynamic-contenteditable-attribute`,
-						message: `'contenteditable' attribute cannot be dynamic if element uses two-way binding`
+						code: 'dynamic-contenteditable-attribute',
+						message: '\'contenteditable\' attribute cannot be dynamic if element uses two-way binding'
 					});
 				}
 			} else if (name !== 'this') {
 				component.error(binding, {
-					code: `invalid-binding`,
+					code: 'invalid-binding',
 					message: `'${binding.name}' is not a valid binding`
 				});
 			}
@@ -753,7 +762,7 @@ export default class Element extends Node {
 
 		if (this.children.length === 0) {
 			this.component.warn(this, {
-				code: `a11y-missing-content`,
+				code: 'a11y-missing-content',
 				message: `A11y: <${this.name}> element should have child content`
 			});
 		}
@@ -766,7 +775,14 @@ export default class Element extends Node {
 			if (handler.modifiers.has('passive') && handler.modifiers.has('preventDefault')) {
 				component.error(handler, {
 					code: 'invalid-event-modifier',
-					message: `The 'passive' and 'preventDefault' modifiers cannot be used together`
+					message: 'The \'passive\' and \'preventDefault\' modifiers cannot be used together'
+				});
+			}
+
+			if (handler.modifiers.has('passive') && handler.modifiers.has('nonpassive')) {
+				component.error(handler, {
+					code: 'invalid-event-modifier',
+					message: 'The \'passive\' and \'nonpassive\' modifiers cannot be used together'
 				});
 			}
 
@@ -783,13 +799,13 @@ export default class Element extends Node {
 						if (handler.can_make_passive) {
 							component.warn(handler, {
 								code: 'redundant-event-modifier',
-								message: `Touch event handlers that don't use the 'event' object are passive by default`
+								message: 'Touch event handlers that don\'t use the \'event\' object are passive by default'
 							});
 						}
 					} else {
 						component.warn(handler, {
 							code: 'redundant-event-modifier',
-							message: `The passive modifier only works with wheel and touch events`
+							message: 'The passive modifier only works with wheel and touch events'
 						});
 					}
 				}
@@ -804,7 +820,7 @@ export default class Element extends Node {
 				}
 			});
 
-			if (passive_events.has(handler.name) && handler.can_make_passive && !handler.modifiers.has('preventDefault')) {
+			if (passive_events.has(handler.name) && handler.can_make_passive && !handler.modifiers.has('preventDefault') && !handler.modifiers.has('nonpassive')) {
 				// touch/wheel events should be passive by default
 				handler.modifiers.add('passive');
 			}
@@ -860,7 +876,7 @@ function should_have_attribute(
 		attributes[0];
 
 	node.component.warn(node, {
-		code: `a11y-missing-attribute`,
+		code: 'a11y-missing-attribute',
 		message: `A11y: <${name}> element should have ${article} ${sequence} attribute`
 	});
 }
diff --git a/src/compiler/compile/nodes/Head.ts b/src/compiler/compile/nodes/Head.ts
index 53e76d7a4d..fb329f28ae 100644
--- a/src/compiler/compile/nodes/Head.ts
+++ b/src/compiler/compile/nodes/Head.ts
@@ -12,8 +12,8 @@ export default class Head extends Node {
 
 		if (info.attributes.length) {
 			component.error(info.attributes[0], {
-				code: `invalid-attribute`,
-				message: `<svelte:head> should not have any attributes or directives`
+				code: 'invalid-attribute',
+				message: '<svelte:head> should not have any attributes or directives'
 			});
 		}
 
diff --git a/src/compiler/compile/nodes/InlineComponent.ts b/src/compiler/compile/nodes/InlineComponent.ts
index 0bd1c9a6a7..ea63c39ec4 100644
--- a/src/compiler/compile/nodes/InlineComponent.ts
+++ b/src/compiler/compile/nodes/InlineComponent.ts
@@ -40,15 +40,15 @@ export default class InlineComponent extends Node {
 			switch (node.type) {
 				case 'Action':
 					component.error(node, {
-						code: `invalid-action`,
-						message: `Actions can only be applied to DOM elements, not components`
+						code: 'invalid-action',
+						message: 'Actions can only be applied to DOM elements, not components'
 					});
 
 				case 'Attribute':
 					if (node.name === 'slot') {
 						component.error(node, {
-							code: `invalid-prop`,
-							message: `'slot' is reserved for future use in named slots`
+							code: 'invalid-prop',
+							message: "'slot' is reserved for future use in named slots"
 						});
 					}
 					// fallthrough
@@ -62,8 +62,8 @@ export default class InlineComponent extends Node {
 
 				case 'Class':
 					component.error(node, {
-						code: `invalid-class`,
-						message: `Classes can only be applied to DOM elements, not components`
+						code: 'invalid-class',
+						message: 'Classes can only be applied to DOM elements, not components'
 					});
 
 				case 'EventHandler':
@@ -76,8 +76,8 @@ export default class InlineComponent extends Node {
 
 				case 'Transition':
 					component.error(node, {
-						code: `invalid-transition`,
-						message: `Transitions can only be applied to DOM elements, not components`
+						code: 'invalid-transition',
+						message: 'Transitions can only be applied to DOM elements, not components'
 					});
 
 				default:
@@ -105,7 +105,7 @@ export default class InlineComponent extends Node {
 				if (modifier !== 'once') {
 					component.error(handler, {
 						code: 'invalid-event-modifier',
-						message: `Event modifiers other than 'once' can only be used on DOM elements`
+						message: "Event modifiers other than 'once' can only be used on DOM elements"
 					});
 				}
 			});
diff --git a/src/compiler/compile/nodes/KeyBlock.ts b/src/compiler/compile/nodes/KeyBlock.ts
new file mode 100644
index 0000000000..e1a00a342e
--- /dev/null
+++ b/src/compiler/compile/nodes/KeyBlock.ts
@@ -0,0 +1,19 @@
+import Expression from './shared/Expression';
+import map_children from './shared/map_children';
+import AbstractBlock from './shared/AbstractBlock';
+
+export default class KeyBlock extends AbstractBlock {
+	type: 'KeyBlock';
+
+	expression: Expression;
+
+	constructor(component, parent, scope, info) {
+		super(component, parent, scope, info);
+
+		this.expression = new Expression(component, this, scope, info.expression);
+
+		this.children = map_children(component, this, scope, info.children);
+
+		this.warn_if_empty_block();
+	}
+}
diff --git a/src/compiler/compile/nodes/Let.ts b/src/compiler/compile/nodes/Let.ts
index ef38cd36a8..77c344ee6d 100644
--- a/src/compiler/compile/nodes/Let.ts
+++ b/src/compiler/compile/nodes/Let.ts
@@ -26,7 +26,7 @@ export default class Let extends Node {
 					if (!applicable.has(node.type)) {
 						component.error(node as any, {
 							code: 'invalid-let',
-							message: `let directive value must be an identifier or an object/array pattern`
+							message: 'let directive value must be an identifier or an object/array pattern'
 						});
 					}
 
diff --git a/src/compiler/compile/nodes/Slot.ts b/src/compiler/compile/nodes/Slot.ts
index a03fe8c026..87b6c1ea91 100644
--- a/src/compiler/compile/nodes/Slot.ts
+++ b/src/compiler/compile/nodes/Slot.ts
@@ -17,24 +17,24 @@ export default class Slot extends Element {
 		info.attributes.forEach(attr => {
 			if (attr.type !== 'Attribute') {
 				component.error(attr, {
-					code: `invalid-slot-directive`,
-					message: `<slot> cannot have directives`
+					code: 'invalid-slot-directive',
+					message: '<slot> cannot have directives'
 				});
 			}
 
 			if (attr.name === 'name') {
 				if (attr.value.length !== 1 || attr.value[0].type !== 'Text') {
 					component.error(attr, {
-						code: `dynamic-slot-name`,
-						message: `<slot> name cannot be dynamic`
+						code: 'dynamic-slot-name',
+						message: '<slot> name cannot be dynamic'
 					});
 				}
 
 				this.slot_name = attr.value[0].data;
 				if (this.slot_name === 'default') {
 					component.error(attr, {
-						code: `invalid-slot-name`,
-						message: `default is a reserved word — it cannot be used as a slot name`
+						code: 'invalid-slot-name',
+						message: 'default is a reserved word — it cannot be used as a slot name'
 					});
 				}
 			}
diff --git a/src/compiler/compile/nodes/Text.ts b/src/compiler/compile/nodes/Text.ts
index 6b7432c22f..a4f26e7e9d 100644
--- a/src/compiler/compile/nodes/Text.ts
+++ b/src/compiler/compile/nodes/Text.ts
@@ -12,7 +12,7 @@ const elements_without_text = new Set([
 	'dl',
 	'optgroup',
 	'select',
-	'video',
+	'video'
 ]);
 
 export default class Text extends Node {
@@ -37,7 +37,7 @@ export default class Text extends Node {
 
 		// svg namespace exclusions
 		if (/svg$/.test(parent_element.namespace)) {
-			if (this.prev && this.prev.type === "Element" && this.prev.name === "tspan") return false;
+			if (this.prev && this.prev.type === 'Element' && this.prev.name === 'tspan') return false;
 		}
 
 		return parent_element.namespace || elements_without_text.has(parent_element.name);
diff --git a/src/compiler/compile/nodes/Title.ts b/src/compiler/compile/nodes/Title.ts
index 6ac0848053..ec1b7fe922 100644
--- a/src/compiler/compile/nodes/Title.ts
+++ b/src/compiler/compile/nodes/Title.ts
@@ -13,8 +13,8 @@ export default class Title extends Node {
 
 		if (info.attributes.length > 0) {
 			component.error(info.attributes[0], {
-				code: `illegal-attribute`,
-				message: `<title> cannot have attributes`
+				code: 'illegal-attribute',
+				message: '<title> cannot have attributes'
 			});
 		}
 
@@ -22,7 +22,7 @@ export default class Title extends Node {
 			if (child.type !== 'Text' && child.type !== 'MustacheTag') {
 				component.error(child, {
 					code: 'illegal-structure',
-					message: `<title> can only contain text and {tags}`
+					message: '<title> can only contain text and {tags}'
 				});
 			}
 		});
diff --git a/src/compiler/compile/nodes/Transition.ts b/src/compiler/compile/nodes/Transition.ts
index a680fde46e..7e9f335e24 100644
--- a/src/compiler/compile/nodes/Transition.ts
+++ b/src/compiler/compile/nodes/Transition.ts
@@ -28,19 +28,19 @@ export default class Transition extends Node {
 				: `An element cannot have both ${describe(parent_transition)} directive and ${describe(this)} directive`;
 
 			component.error(info, {
-				code: `duplicate-transition`,
+				code: 'duplicate-transition',
 				message
 			});
 		}
 
 		this.expression = info.expression
-			? new Expression(component, this, scope, info.expression, true)
+			? new Expression(component, this, scope, info.expression)
 			: null;
 	}
 }
 
 function describe(transition: Transition) {
 	return transition.directive === 'transition'
-		? `a 'transition'`
+		? "a 'transition'"
 		: `an '${transition.directive}'`;
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/nodes/Window.ts b/src/compiler/compile/nodes/Window.ts
index d1e61fb1fc..d0ad313c6f 100644
--- a/src/compiler/compile/nodes/Window.ts
+++ b/src/compiler/compile/nodes/Window.ts
@@ -36,7 +36,7 @@ export default class Window extends Node {
 
 					// TODO is this constraint necessary?
 					component.error(node.expression, {
-						code: `invalid-binding`,
+						code: 'invalid-binding',
 						message: `Bindings on <svelte:window> must be to top-level properties, e.g. '${parts[parts.length - 1]}' rather than '${parts.join('.')}'`
 					});
 				}
@@ -52,12 +52,12 @@ export default class Window extends Node {
 
 					if (match) {
 						component.error(node, {
-							code: `invalid-binding`,
+							code: 'invalid-binding',
 							message: `${message} (did you mean '${match}'?)`
 						});
 					} else {
 						component.error(node, {
-							code: `invalid-binding`,
+							code: 'invalid-binding',
 							message: `${message} — valid bindings are ${list(valid_bindings)}`
 						});
 					}
diff --git a/src/compiler/compile/nodes/interfaces.ts b/src/compiler/compile/nodes/interfaces.ts
index 752168a49d..d71d191cf4 100644
--- a/src/compiler/compile/nodes/interfaces.ts
+++ b/src/compiler/compile/nodes/interfaces.ts
@@ -18,6 +18,7 @@ import Fragment from './Fragment';
 import Head from './Head';
 import IfBlock from './IfBlock';
 import InlineComponent from './InlineComponent';
+import KeyBlock from './KeyBlock';
 import Let from './Let';
 import MustacheTag from './MustacheTag';
 import Options from './Options';
@@ -31,7 +32,7 @@ import Transition from './Transition';
 import Window from './Window';
 
 // note: to write less types each of types in union below should have type defined as literal
-// https://www.typescriptlang.org/docs/handbook/advanced-types.html#discriminated-unions
+// https://www.typescriptlang.org/docs/handbook/unions-and-intersections.html#discriminating-unions
 export type INode = Action
 | Animation
 | Attribute
@@ -50,6 +51,7 @@ export type INode = Action
 | Head
 | IfBlock
 | InlineComponent
+| KeyBlock
 | Let
 | MustacheTag
 | Options
diff --git a/src/compiler/compile/nodes/shared/Expression.ts b/src/compiler/compile/nodes/shared/Expression.ts
index bbbc1b2f2d..ef134f4359 100644
--- a/src/compiler/compile/nodes/shared/Expression.ts
+++ b/src/compiler/compile/nodes/shared/Expression.ts
@@ -4,7 +4,6 @@ import is_reference from 'is-reference';
 import flatten_reference from '../../utils/flatten_reference';
 import { create_scopes, Scope, extract_names } from '../../utils/scope';
 import { sanitize } from '../../../utils/names';
-import Wrapper from '../../render_dom/wrappers/shared/Wrapper';
 import TemplateScope from './TemplateScope';
 import get_object from '../../utils/get_object';
 import Block from '../../render_dom/Block';
@@ -12,12 +11,12 @@ import is_dynamic from '../../render_dom/wrappers/shared/is_dynamic';
 import { b } from 'code-red';
 import { invalidate } from '../../render_dom/invalidate';
 import { Node, FunctionExpression, Identifier } from 'estree';
-import { TemplateNode } from '../../../interfaces';
+import { INode } from '../interfaces';
 import { is_reserved_keyword } from '../../utils/reserved_keywords';
 import replace_object from '../../utils/replace_object';
 import EachBlock from '../EachBlock';
 
-type Owner = Wrapper | TemplateNode;
+type Owner = INode;
 
 export default class Expression {
 	type: 'Expression' = 'Expression';
@@ -37,7 +36,6 @@ export default class Expression {
 
 	manipulated: Node;
 
-	// todo: owner type
 	constructor(component: Component, owner: Owner, template_scope: TemplateScope, info, lazy?: boolean) {
 		// TODO revert to direct property access in prod?
 		Object.defineProperties(this, {
@@ -64,6 +62,8 @@ export default class Expression {
 			enter(node: any, parent: any, key: string) {
 				// don't manipulate shorthand props twice
 				if (key === 'value' && parent.shorthand) return;
+				// don't manipulate `import.meta`, `new.target`
+				if (node.type === 'MetaProperty') return this.skip();
 
 				if (map.has(node)) {
 					scope = map.get(node);
@@ -83,8 +83,8 @@ export default class Expression {
 						const store_name = name.slice(1);
 						if (template_scope.names.has(store_name) || scope.has(store_name)) {
 							component.error(node, {
-								code: `contextual-store`,
-								message: `Stores must be declared at the top level of the component (this may change in a future version of Svelte)`
+								code: 'contextual-store',
+								message: 'Stores must be declared at the top level of the component (this may change in a future version of Svelte)'
 							});
 						}
 					}
@@ -274,10 +274,12 @@ export default class Expression {
 					else {
 						// we need a combo block/init recipe
 						const deps = Array.from(contextual_dependencies);
+						const function_expression = node as FunctionExpression;
 
-						(node as FunctionExpression).params = [
+						const has_args = function_expression.params.length > 0;
+						function_expression.params = [
 							...deps.map(name => ({ type: 'Identifier', name } as Identifier)),
-							...(node as FunctionExpression).params
+							...function_expression.params
 						];
 
 						const context_args = deps.map(name => block.renderer.reference(name));
@@ -289,18 +291,49 @@ export default class Expression {
 
 						this.replace(id as any);
 
-						if ((node as FunctionExpression).params.length > 0) {
-							declarations.push(b`
-								function ${id}(...args) {
-									return ${callee}(${context_args}, ...args);
-								}
-							`);
+						const func_declaration = has_args
+							? b`function ${id}(...args) {
+								return ${callee}(${context_args}, ...args);
+							}`
+							: b`function ${id}() {
+								return ${callee}(${context_args});
+							}`;
+
+						if (owner.type === 'Attribute' && owner.parent.name === 'slot') {
+							const dep_scopes = new Set<INode>(deps.map(name => template_scope.get_owner(name)));
+							// find the nearest scopes
+							let node: INode = owner.parent;
+							while (node && !dep_scopes.has(node)) {
+								node = node.parent;
+							}
+
+							const func_expression = func_declaration[0];
+
+							if (node.type === 'InlineComponent') {
+								// <Comp let:data />
+								this.replace(func_expression);
+							} else {
+								// {#each}, {#await}
+								const func_id = component.get_unique_name(id.name + '_func');
+								block.renderer.add_to_context(func_id.name, true);
+								// rename #ctx -> child_ctx;
+								walk(func_expression, {
+									enter(node) {
+										if (node.type === 'Identifier' && node.name === '#ctx') {
+											node.name = 'child_ctx';
+										}
+									}
+								});
+								// add to get_xxx_context
+								// child_ctx[x] = function () { ... }
+								(template_scope.get_owner(deps[0]) as EachBlock).contexts.push({
+									key: func_id,
+									modifier: () => func_expression
+								});
+								this.replace(block.renderer.reference(func_id));
+							}
 						} else {
-							declarations.push(b`
-								function ${id}() {
-									return ${callee}(${context_args});
-								}
-							`);
+							declarations.push(func_declaration);
 						}
 					}
 
diff --git a/src/compiler/compile/nodes/shared/map_children.ts b/src/compiler/compile/nodes/shared/map_children.ts
index dcdc52f86d..5d5da223fb 100644
--- a/src/compiler/compile/nodes/shared/map_children.ts
+++ b/src/compiler/compile/nodes/shared/map_children.ts
@@ -6,6 +6,7 @@ import Element from '../Element';
 import Head from '../Head';
 import IfBlock from '../IfBlock';
 import InlineComponent from '../InlineComponent';
+import KeyBlock from '../KeyBlock';
 import MustacheTag from '../MustacheTag';
 import Options from '../Options';
 import RawMustacheTag from '../RawMustacheTag';
@@ -28,6 +29,7 @@ function get_constructor(type) {
 		case 'Head': return Head;
 		case 'IfBlock': return IfBlock;
 		case 'InlineComponent': return InlineComponent;
+		case 'KeyBlock': return KeyBlock;
 		case 'MustacheTag': return MustacheTag;
 		case 'Options': return Options;
 		case 'RawMustacheTag': return RawMustacheTag;
diff --git a/src/compiler/compile/render_dom/Block.ts b/src/compiler/compile/render_dom/Block.ts
index b77cf61112..1352464d4e 100644
--- a/src/compiler/compile/render_dom/Block.ts
+++ b/src/compiler/compile/render_dom/Block.ts
@@ -4,6 +4,15 @@ import { b, x } from 'code-red';
 import { Node, Identifier, ArrayPattern } from 'estree';
 import { is_head } from './wrappers/shared/is_head';
 
+export interface Bindings {
+	object: Identifier;
+	property: Identifier;
+	snippet: Node;
+	store: string;
+	tail: Node;
+	modifier: (node: Node) => Node;
+}
+
 export interface BlockOptions {
 	parent?: Block;
 	name: Identifier;
@@ -11,14 +20,7 @@ export interface BlockOptions {
 	renderer?: Renderer;
 	comment?: string;
 	key?: Identifier;
-	bindings?: Map<string, {
-		object: Identifier;
-		property: Identifier;
-		snippet: Node;
-		store: string;
-		tail: Node;
-		modifier: (node: Node) => Node;
-	}>;
+	bindings?: Map<string, Bindings>;
 	dependencies?: Set<string>;
 }
 
@@ -36,14 +38,7 @@ export default class Block {
 
 	dependencies: Set<string> = new Set();
 
-	bindings: Map<string, {
-		object: Identifier;
-		property: Identifier;
-		snippet: Node;
-		store: string;
-		tail: Node;
-		modifier: (node: Node) => Node;
-	}>;
+	bindings: Map<string, Bindings>;
 
 	chunks: {
 		declarations: Array<Node | Node[]>;
@@ -106,7 +101,7 @@ export default class Block {
 			intro: [],
 			update: [],
 			outro: [],
-			destroy: [],
+			destroy: []
 		};
 
 		this.has_animation = false;
@@ -491,4 +486,4 @@ export default class Block {
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/render_dom/Renderer.ts b/src/compiler/compile/render_dom/Renderer.ts
index 576f70984e..fb04be1574 100644
--- a/src/compiler/compile/render_dom/Renderer.ts
+++ b/src/compiler/compile/render_dom/Renderer.ts
@@ -76,7 +76,7 @@ export default class Renderer {
 
 			bindings: new Map(),
 
-			dependencies: new Set(),
+			dependencies: new Set()
 		});
 
 		this.block.has_update_method = true;
@@ -166,12 +166,14 @@ export default class Renderer {
 		return member;
 	}
 
-	invalidate(name: string, value?) {
+	invalidate(name: string, value?, main_execution_context: boolean = false) {
 		const variable = this.component.var_lookup.get(name);
 		const member = this.context_lookup.get(name);
 
 		if (variable && (variable.subscribable && (variable.reassigned || variable.export_name))) {
-			return x`${`$$subscribe_${name}`}($$invalidate(${member.index}, ${value || name}))`;
+			return main_execution_context
+			  ? x`${`$$subscribe_${name}`}(${value || name})`
+			  : x`${`$$subscribe_${name}`}($$invalidate(${member.index}, ${value || name}))`;
 		}
 
 		if (name[0] === '$' && name[1] !== '$') {
@@ -233,7 +235,7 @@ export default class Renderer {
 				if (!member) return;
 
 				if (member.index.value === -1) {
-					throw new Error(`unset index`);
+					throw new Error('unset index');
 				}
 
 				const value = member.index.value as number;
diff --git a/src/compiler/compile/render_dom/index.ts b/src/compiler/compile/render_dom/index.ts
index ab4ee904e8..024aafde14 100644
--- a/src/compiler/compile/render_dom/index.ts
+++ b/src/compiler/compile/render_dom/index.ts
@@ -81,7 +81,7 @@ export default function dom(
 
 	const uses_props = component.var_lookup.has('$$props');
 	const uses_rest = component.var_lookup.has('$$restProps');
-	const $$props = uses_props || uses_rest ? `$$new_props` : `$$props`;
+	const $$props = uses_props || uses_rest ? '$$new_props' : '$$props';
 	const props = component.vars.filter(variable => !variable.module && variable.export_name);
 	const writable_props = props.filter(variable => variable.writable);
 
@@ -474,7 +474,7 @@ export default function dom(
 
 					${css.code && b`this.shadowRoot.innerHTML = \`<style>${css.code.replace(/\\/g, '\\\\')}${options.dev ? `\n/*# sourceMappingURL=${css.map.toUrl()} */` : ''}</style>\`;`}
 
-					@init(this, { target: this.shadowRoot }, ${definition}, ${has_create_fragment ? 'create_fragment': 'null'}, ${not_equal}, ${prop_indexes}, ${dirty});
+					@init(this, { target: this.shadowRoot, props: @attribute_to_object(this.attributes) }, ${definition}, ${has_create_fragment ? 'create_fragment': 'null'}, ${not_equal}, ${prop_indexes}, ${dirty});
 
 					${dev_props_check}
 
@@ -524,7 +524,7 @@ export default function dom(
 		const declaration = b`
 			class ${name} extends ${superclass} {
 				constructor(options) {
-					super(${options.dev && `options`});
+					super(${options.dev && 'options'});
 					${should_add_css && b`if (!@_document.getElementById("${component.stylesheet.id}-style")) ${add_css}();`}
 					@init(this, options, ${definition}, ${has_create_fragment ? 'create_fragment': 'null'}, ${not_equal}, ${prop_indexes}, ${dirty});
 					${options.dev && b`@dispatch_dev("SvelteRegisterComponent", { component: this, tagName: "${name.name}", options, id: create_fragment.name });`}
diff --git a/src/compiler/compile/render_dom/invalidate.ts b/src/compiler/compile/render_dom/invalidate.ts
index 28e4f37e3f..f88c566d96 100644
--- a/src/compiler/compile/render_dom/invalidate.ts
+++ b/src/compiler/compile/render_dom/invalidate.ts
@@ -31,48 +31,51 @@ export function invalidate(renderer: Renderer, scope: Scope, node: Node, names:
 
 	function get_invalidated(variable: Var, node?: Expression) {
 		if (main_execution_context && !variable.subscribable && variable.name[0] !== '$') {
-			return node || x`${variable.name}`;
+			return node;
 		}
-
-		return renderer.invalidate(variable.name);
+		return renderer.invalidate(variable.name, undefined, main_execution_context);
 	}
 
-	if (head) {
-		component.has_reactive_assignments = true;
-
-		if (node.type === 'AssignmentExpression' && node.operator === '=' && nodes_match(node.left, node.right) && tail.length === 0) {
-			return get_invalidated(head, node);
-		} else {
-			const is_store_value = head.name[0] === '$' && head.name[1] !== '$';
-			const extra_args = tail.map(variable => get_invalidated(variable));
-
-			const pass_value = (
-				extra_args.length > 0 ||
-				(node.type === 'AssignmentExpression' && node.left.type !== 'Identifier') ||
-				(node.type === 'UpdateExpression' && (!node.prefix || node.argument.type !== 'Identifier'))
-			);
+	if (!head) {
+		return node;
+	}
 
-			if (pass_value) {
-				extra_args.unshift({
-					type: 'Identifier',
-					name: head.name
-				});
-			}
+	component.has_reactive_assignments = true;
 
-			let invalidate = is_store_value
-				? x`@set_store_value(${head.name.slice(1)}, ${node}, ${extra_args})`
-				: !main_execution_context
-					? x`$$invalidate(${renderer.context_lookup.get(head.name).index}, ${node}, ${extra_args})`
-					: node;
+	if (node.type === 'AssignmentExpression' && node.operator === '=' && nodes_match(node.left, node.right) && tail.length === 0) {
+		return get_invalidated(head, node);
+	}
 
-			if (head.subscribable && head.reassigned) {
-				const subscribe = `$$subscribe_${head.name}`;
-				invalidate = x`${subscribe}(${invalidate})`;
-			}
+	const is_store_value = head.name[0] === '$' && head.name[1] !== '$';
+	const extra_args = tail.map(variable => get_invalidated(variable)).filter(Boolean);
 
-			return invalidate;
+	if (is_store_value) {
+		return x`@set_store_value(${head.name.slice(1)}, ${node}, ${head.name}, ${extra_args})`;
+	}
+	
+	let invalidate;
+	if (!main_execution_context) {
+		const pass_value = (
+			extra_args.length > 0 ||
+			(node.type === 'AssignmentExpression' && node.left.type !== 'Identifier') ||
+			(node.type === 'UpdateExpression' && (!node.prefix || node.argument.type !== 'Identifier'))
+		);
+		if (pass_value) {
+			extra_args.unshift({
+				type: 'Identifier',
+				name: head.name
+			});
 		}
+		invalidate = x`$$invalidate(${renderer.context_lookup.get(head.name).index}, ${node}, ${extra_args})`;
+	} else {
+		// skip `$$invalidate` if it is in the main execution context
+		invalidate = extra_args.length ? [node, ...extra_args] : node;
+	}
+
+	if (head.subscribable && head.reassigned) {
+		const subscribe = `$$subscribe_${head.name}`;
+		invalidate = x`${subscribe}(${invalidate})`;
 	}
 
-	return node;
-}
\ No newline at end of file
+	return invalidate;
+}
diff --git a/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts b/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
index 495f1b3157..2038943d8b 100644
--- a/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
+++ b/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
@@ -96,7 +96,7 @@ class AwaitBlockBranch extends Wrapper {
 		`);
 		this.block.chunks.declarations.push(b`${get_context}(#ctx)`);
 		if (this.block.has_update_method) {
-			this.block.chunks.update.push(b`${get_context}(#ctx)`);
+			this.block.chunks.update.unshift(b`${get_context}(#ctx)`);
 		}
 	}
 }
@@ -177,8 +177,8 @@ export default class AwaitBlockWrapper extends Wrapper {
 
 		const snippet = this.node.expression.manipulate(block);
 
-		const info = block.get_unique_name(`info`);
-		const promise = block.get_unique_name(`promise`);
+		const info = block.get_unique_name('info');
+		const promise = block.get_unique_name('promise');
 
 		block.add_variable(promise);
 
@@ -188,6 +188,7 @@ export default class AwaitBlockWrapper extends Wrapper {
 			ctx: #ctx,
 			current: null,
 			token: null,
+			hasCatch: ${this.catch.node.start !== null ? 'true' : 'false'},
 			pending: ${this.pending.block.name},
 			then: ${this.then.block.name},
 			catch: ${this.catch.block.name},
diff --git a/src/compiler/compile/render_dom/wrappers/EachBlock.ts b/src/compiler/compile/render_dom/wrappers/EachBlock.ts
index 126b114487..a2c20e0074 100644
--- a/src/compiler/compile/render_dom/wrappers/EachBlock.ts
+++ b/src/compiler/compile/render_dom/wrappers/EachBlock.ts
@@ -7,6 +7,7 @@ import FragmentWrapper from './Fragment';
 import { b, x } from 'code-red';
 import ElseBlock from '../../nodes/ElseBlock';
 import { Identifier, Node } from 'estree';
+import get_object from '../../utils/get_object';
 
 export class ElseBlockWrapper extends Wrapper {
 	node: ElseBlock;
@@ -28,7 +29,7 @@ export class ElseBlockWrapper extends Wrapper {
 
 		this.block = block.child({
 			comment: create_debugging_comment(node, this.renderer.component),
-			name: this.renderer.component.get_unique_name(`create_else_block`),
+			name: this.renderer.component.get_unique_name('create_else_block'),
 			type: 'else'
 		});
 
@@ -139,11 +140,8 @@ export default class EachBlockWrapper extends Wrapper {
 			view_length: fixed_length === null ? x`${iterations}.length` : fixed_length
 		};
 
-		const store =
-			node.expression.node.type === 'Identifier' &&
-			node.expression.node.name[0] === '$'
-				? node.expression.node.name.slice(1)
-				: null;
+		const object = get_object(node.expression.node);
+		const store = object.type === 'Identifier' && object.name[0] === '$' ? object.name.slice(1) : null;
 
 		node.contexts.forEach(prop => {
 			this.block.bindings.set(prop.key.name, {
@@ -198,11 +196,6 @@ export default class EachBlockWrapper extends Wrapper {
 			? !this.next.is_dom_node() :
 			!parent_node || !this.parent.is_dom_node();
 
-		this.context_props = this.node.contexts.map(prop => b`child_ctx[${renderer.context_lookup.get(prop.key.name).index}] = ${prop.modifier(x`list[i]`)};`);
-
-		if (this.node.has_binding) this.context_props.push(b`child_ctx[${renderer.context_lookup.get(this.vars.each_block_value.name).index}] = list;`);
-		if (this.node.has_binding || this.node.has_index_binding || this.node.index) this.context_props.push(b`child_ctx[${renderer.context_lookup.get(this.index_name.name).index}] = i;`);
-
 		const snippet = this.node.expression.manipulate(block);
 
 		block.chunks.init.push(b`let ${this.vars.each_block_value} = ${snippet};`);
@@ -210,15 +203,6 @@ export default class EachBlockWrapper extends Wrapper {
 			block.chunks.init.push(b`@validate_each_argument(${this.vars.each_block_value});`);
 		}
 
-		// TODO which is better — Object.create(array) or array.slice()?
-		renderer.blocks.push(b`
-			function ${this.vars.get_each_context}(#ctx, list, i) {
-				const child_ctx = #ctx.slice();
-				${this.context_props}
-				return child_ctx;
-			}
-		`);
-
 		const initial_anchor_node: Identifier = { type: 'Identifier', name: parent_node ? 'null' : '#anchor' };
 		const initial_mount_node: Identifier = parent_node || { type: 'Identifier', name: '#target' };
 		const update_anchor_node = needs_anchor
@@ -241,6 +225,11 @@ export default class EachBlockWrapper extends Wrapper {
 		this.node.expression.dynamic_dependencies().forEach((dependency: string) => {
 			all_dependencies.add(dependency);
 		});
+		if (this.node.key) {
+			this.node.key.dynamic_dependencies().forEach((dependency: string) => {
+				all_dependencies.add(dependency);
+			});
+		}
 		this.dependencies = all_dependencies;
 
 		if (this.node.key) {
@@ -357,6 +346,19 @@ export default class EachBlockWrapper extends Wrapper {
 		if (this.else) {
 			this.else.fragment.render(this.else.block, null, x`#nodes` as Identifier);
 		}
+
+		this.context_props = this.node.contexts.map(prop => b`child_ctx[${renderer.context_lookup.get(prop.key.name).index}] = ${prop.modifier(x`list[i]`)};`);
+
+		if (this.node.has_binding) this.context_props.push(b`child_ctx[${renderer.context_lookup.get(this.vars.each_block_value.name).index}] = list;`);
+		if (this.node.has_binding || this.node.has_index_binding || this.node.index) this.context_props.push(b`child_ctx[${renderer.context_lookup.get(this.index_name.name).index}] = i;`);
+		// TODO which is better — Object.create(array) or array.slice()?
+		renderer.blocks.push(b`
+			function ${this.vars.get_each_context}(#ctx, list, i) {
+				const child_ctx = #ctx.slice();
+				${this.context_props}
+				return child_ctx;
+			}
+		`);
 	}
 
 	render_keyed({
@@ -438,11 +440,11 @@ export default class EachBlockWrapper extends Wrapper {
 
 		const destroy = this.node.has_animation
 			? (this.block.has_outros
-				? `@fix_and_outro_and_destroy_block`
-				: `@fix_and_destroy_block`)
+				? '@fix_and_outro_and_destroy_block'
+				: '@fix_and_destroy_block')
 			: this.block.has_outros
-				? `@outro_and_destroy_block`
-				: `@destroy_block`;
+				? '@outro_and_destroy_block'
+				: '@destroy_block';
 
 		if (this.dependencies.size) {
 			this.updates.push(b`
@@ -560,7 +562,7 @@ export default class EachBlockWrapper extends Wrapper {
 						}
 					`;
 
-			const start = this.block.has_update_method ? 0 : `#old_length`;
+			const start = this.block.has_update_method ? 0 : '#old_length';
 
 			let remove_old_blocks;
 
diff --git a/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts b/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
index ec281648b8..2969a7d82c 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/Attribute.ts
@@ -48,9 +48,10 @@ export default class AttributeWrapper extends BaseAttributeWrapper {
 			// special case — <option value={foo}> — see below
 			if (this.parent.node.name === 'option' && node.name === 'value') {
 				let select: ElementWrapper = this.parent;
-				while (select && (select.node.type !== 'Element' || select.node.name !== 'select'))
+				while (select && (select.node.type !== 'Element' || select.node.name !== 'select')) {
 					// @ts-ignore todo: doublecheck this, but looks to be correct
 					select = select.parent;
+				}
 
 				if (select && select.select_binding_dependencies) {
 					select.select_binding_dependencies.forEach(prop => {
@@ -187,7 +188,7 @@ export default class AttributeWrapper extends BaseAttributeWrapper {
 		if (this.is_input_value) {
 			const type = element.node.get_static_attribute_value('type');
 
-			if (type === null || type === "" || type === "text" || type === "email" || type === "password") {
+			if (type === null || type === '' || type === 'text' || type === 'email' || type === 'password') {
 				condition = x`${condition} && ${element.var}.${property_name} !== ${should_cache ? last : value}`;
 			}
 		}
@@ -277,7 +278,7 @@ export default class AttributeWrapper extends BaseAttributeWrapper {
 		if (this.node.is_true) return '';
 
 		const value = this.node.chunks;
-		if (value.length === 0) return `=""`;
+		if (value.length === 0) return '=""';
 
 		return `="${value.map(chunk => {
 			return chunk.type === 'Text'
@@ -307,8 +308,8 @@ const attribute_lookup = {
 			'optgroup',
 			'option',
 			'select',
-			'textarea',
-		],
+			'textarea'
+		]
 	},
 	formnovalidate: { property_name: 'formNoValidate', applies_to: ['button', 'input'] },
 	hidden: {},
@@ -335,9 +336,9 @@ const attribute_lookup = {
 			'progress',
 			'param',
 			'select',
-			'textarea',
-		],
-	},
+			'textarea'
+		]
+	}
 };
 
 Object.keys(attribute_lookup).forEach(name => {
@@ -387,4 +388,4 @@ function is_indirectly_bound_value(attribute: AttributeWrapper) {
 					(binding) =>
 						/checked|group/.test(binding.name)
 				)));
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
index 8e27a7f511..de070aa5c9 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
@@ -88,20 +88,20 @@ export default class BindingWrapper {
 			update_conditions.push(block.renderer.dirty(dependency_array));
 		}
 
-		if (parent.node.name === "input") {
-			const type = parent.node.get_static_attribute_value("type");
+		if (parent.node.name === 'input') {
+			const type = parent.node.get_static_attribute_value('type');
 
 			if (
 				type === null ||
-				type === "" ||
-				type === "text" ||
-				type === "email" ||
-				type === "password"
+				type === '' ||
+				type === 'text' ||
+				type === 'email' ||
+				type === 'password'
 			) {
 				update_conditions.push(
 					x`${parent.var}.${this.node.name} !== ${this.snippet}`
 				);
-			} else if (type === "number") {
+			} else if (type === 'number') {
 				update_conditions.push(
 					x`@to_number(${parent.var}.${this.node.name}) !== ${this.snippet}`
 				);
@@ -118,7 +118,7 @@ export default class BindingWrapper {
 			{
 				const { binding_group, is_context, contexts, index } = get_binding_group(parent.renderer, this.node, block);
 
-				block.renderer.add_to_context(`$$binding_groups`);
+				block.renderer.add_to_context('$$binding_groups');
 
 				if (is_context) {
 					if (contexts.length > 1) {
@@ -302,7 +302,7 @@ function get_binding_group(renderer: Renderer, value: Binding, block: Block) {
 			},
 			is_context: contexts.length > 0,
 			contexts,
-			index,
+			index
 		});
 	}
 
@@ -355,7 +355,7 @@ function get_event_handler(
 		uses_context: binding.node.is_contextual || binding.node.expression.uses_context, // TODO this is messy
 		mutation,
 		contextual_dependencies,
-		lhs,
+		lhs
 	};
 }
 
diff --git a/src/compiler/compile/render_dom/wrappers/Element/EventHandler.ts b/src/compiler/compile/render_dom/wrappers/Element/EventHandler.ts
index 157e186ea6..2fa2e9291a 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/EventHandler.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/EventHandler.ts
@@ -45,11 +45,17 @@ export default class EventHandlerWrapper {
 
 		const args = [];
 
-		const opts = ['passive', 'once', 'capture'].filter(mod => this.node.modifiers.has(mod));
+		const opts = ['nonpassive', 'passive', 'once', 'capture'].filter(mod => this.node.modifiers.has(mod));
 		if (opts.length) {
-			args.push((opts.length === 1 && opts[0] === 'capture')
-				? TRUE
-				: x`{ ${opts.map(opt => p`${opt}: true`)} }`);
+			if (opts.length === 1 && opts[0] === 'capture') {
+				args.push(TRUE);
+			} else {
+				args.push(x`{ ${ opts.map(opt =>
+					opt === 'nonpassive'
+						? p`passive: false`
+						: p`${opt}: true`
+				) } }`);
+			}
 		} else if (block.renderer.options.dev) {
 			args.push(FALSE);
 		}
diff --git a/src/compiler/compile/render_dom/wrappers/Element/SpreadAttribute.ts b/src/compiler/compile/render_dom/wrappers/Element/SpreadAttribute.ts
index a47ddc892b..2be346c15a 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/SpreadAttribute.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/SpreadAttribute.ts
@@ -1,3 +1,3 @@
-import { BaseAttributeWrapper } from "./Attribute";
+import { BaseAttributeWrapper } from './Attribute';
 
 export default class SpreadAttributeWrapper extends BaseAttributeWrapper {}
diff --git a/src/compiler/compile/render_dom/wrappers/Element/create_slot_block.ts b/src/compiler/compile/render_dom/wrappers/Element/create_slot_block.ts
new file mode 100644
index 0000000000..7078d4eee7
--- /dev/null
+++ b/src/compiler/compile/render_dom/wrappers/Element/create_slot_block.ts
@@ -0,0 +1,61 @@
+import ElementWrapper from './index';
+import SlotWrapper from '../Slot';
+import Block from '../../Block';
+import { sanitize } from '../../../../utils/names';
+import InlineComponentWrapper from '../InlineComponent';
+import create_debugging_comment from '../shared/create_debugging_comment';
+import { get_slot_definition } from '../shared/get_slot_definition';
+
+export default function create_slot_block(attribute, element: ElementWrapper | SlotWrapper, block: Block) {
+	const owner = find_slot_owner(element.parent);
+
+	if (owner && owner.node.type === 'InlineComponent') {
+		const name = attribute.get_static_value() as string;
+
+		if (!((owner as unknown) as InlineComponentWrapper).slots.has(name)) {
+			const child_block = block.child({
+				comment: create_debugging_comment(element.node, element.renderer.component),
+				name: element.renderer.component.get_unique_name(
+					`create_${sanitize(name)}_slot`
+				),
+				type: 'slot'
+			});
+
+			const { scope, lets } = element.node;
+			const seen = new Set(lets.map(l => l.name.name));
+
+			((owner as unknown) as InlineComponentWrapper).node.lets.forEach(l => {
+				if (!seen.has(l.name.name)) lets.push(l);
+			});
+
+			((owner as unknown) as InlineComponentWrapper).slots.set(
+				name,
+				get_slot_definition(child_block, scope, lets)
+			);
+			element.renderer.blocks.push(child_block);
+		}
+
+		element.slot_block = ((owner as unknown) as InlineComponentWrapper).slots.get(
+			name
+		).block;
+
+		return element.slot_block;
+	}
+
+	return block;
+}
+
+function find_slot_owner(owner) {
+	while (owner) {
+		if (owner.node.type === 'InlineComponent') {
+			break;
+		}
+
+		if (owner.node.type === 'Element' && /-/.test(owner.node.name)) {
+			break;
+		}
+
+		owner = owner.parent;
+	}
+	return owner;
+}
diff --git a/src/compiler/compile/render_dom/wrappers/Element/handle_select_value_binding.ts b/src/compiler/compile/render_dom/wrappers/Element/handle_select_value_binding.ts
index 93a83298f8..ff6e0a39ee 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/handle_select_value_binding.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/handle_select_value_binding.ts
@@ -1,13 +1,13 @@
-import AttributeWrapper from "./Attribute";
-import BindingWrapper from "./Binding";
-import ElementWrapper from "./index";
+import AttributeWrapper from './Attribute';
+import BindingWrapper from './Binding';
+import ElementWrapper from './index';
 
 export default function handle_select_value_binding(
 	attr: AttributeWrapper | BindingWrapper,
 	dependencies: Set<string>
 ) {
 	const { parent } = attr;
-	if (parent.node.name === "select") {
+	if (parent.node.name === 'select') {
 		(parent as ElementWrapper).select_binding_dependencies = dependencies;
 		dependencies.forEach((prop: string) => {
 			parent.renderer.component.indirect_dependencies.set(prop, new Set());
diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index f11ce63023..c6b88357a8 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -2,7 +2,7 @@ import Renderer from '../../Renderer';
 import Element from '../../../nodes/Element';
 import Wrapper from '../shared/Wrapper';
 import Block from '../../Block';
-import { is_void, sanitize } from '../../../../utils/names';
+import { is_void } from '../../../../utils/names';
 import FragmentWrapper from '../Fragment';
 import { escape_html, string_literal } from '../../../utils/stringify';
 import TextWrapper from '../Text';
@@ -14,12 +14,9 @@ import StyleAttributeWrapper from './StyleAttribute';
 import SpreadAttributeWrapper from './SpreadAttribute';
 import { dimensions } from '../../../../utils/patterns';
 import Binding from './Binding';
-import InlineComponentWrapper from '../InlineComponent';
 import add_to_set from '../../../utils/add_to_set';
 import { add_event_handler } from '../shared/add_event_handlers';
 import { add_action } from '../shared/add_actions';
-import create_debugging_comment from '../shared/create_debugging_comment';
-import { get_slot_definition } from '../shared/get_slot_definition';
 import bind_this from '../shared/bind_this';
 import { is_head } from '../shared/is_head';
 import { Identifier } from 'estree';
@@ -28,6 +25,7 @@ import { extract_names } from 'periscopic';
 import Action from '../../../nodes/Action';
 import MustacheTagWrapper from '../MustacheTag';
 import RawMustacheTagWrapper from '../RawMustacheTag';
+import create_slot_block from './create_slot_block';
 
 interface BindingGroup {
 	events: string[];
@@ -132,7 +130,7 @@ const events = [
 		event_names: ['toggle'],
 		filter: (node: Element, _name: string) =>
 			node.name === 'details'
-	},
+	}
 ];
 
 export default class ElementWrapper extends Wrapper {
@@ -177,47 +175,7 @@ export default class ElementWrapper extends Wrapper {
 
 		this.attributes = this.node.attributes.map(attribute => {
 			if (attribute.name === 'slot') {
-				// TODO make separate subclass for this?
-				let owner = this.parent;
-				while (owner) {
-					if (owner.node.type === 'InlineComponent') {
-						break;
-					}
-
-					if (owner.node.type === 'Element' && /-/.test(owner.node.name)) {
-						break;
-					}
-
-					owner = owner.parent;
-				}
-
-				if (owner && owner.node.type === 'InlineComponent') {
-					const name = attribute.get_static_value() as string;
-
-					if (!(owner as unknown as InlineComponentWrapper).slots.has(name)) {
-						const child_block = block.child({
-							comment: create_debugging_comment(node, this.renderer.component),
-							name: this.renderer.component.get_unique_name(`create_${sanitize(name)}_slot`),
-							type: 'slot'
-						});
-
-						const { scope, lets } = this.node;
-						const seen = new Set(lets.map(l => l.name.name));
-
-						(owner as unknown as InlineComponentWrapper).node.lets.forEach(l => {
-							if (!seen.has(l.name.name)) lets.push(l);
-						});
-
-						(owner as unknown as InlineComponentWrapper).slots.set(
-							name,
-							get_slot_definition(child_block, scope, lets)
-						);
-						this.renderer.blocks.push(child_block);
-					}
-
-					this.slot_block = (owner as unknown as InlineComponentWrapper).slots.get(name).block;
-					block = this.slot_block;
-				}
+				block = create_slot_block(attribute, this, block);
 			}
 			if (attribute.name === 'style') {
 				return new StyleAttributeWrapper(this, block, attribute);
@@ -725,6 +683,18 @@ export default class ElementWrapper extends Wrapper {
 			block.chunks.update.push(b`
 				if (${block.renderer.dirty(Array.from(dependencies))} && ${data}.multiple) @select_options(${this.var}, ${data}.value);
 			`);
+		} else if (this.node.name === 'input' && this.attributes.find(attr => attr.node.name === 'value')) {
+			const type = this.node.get_static_attribute_value('type');
+			if (type === null || type === '' || type === 'text' || type === 'email' || type === 'password') {
+				block.chunks.mount.push(b`
+					${this.var}.value = ${data}.value;
+				`);
+				block.chunks.update.push(b`
+					if ('value' in ${data}) {
+						${this.var}.value = ${data}.value;
+					}
+				`);
+			}
 		}
 	}
 
@@ -856,6 +826,10 @@ export default class ElementWrapper extends Wrapper {
 				block.chunks.destroy.push(b`if (detaching && ${outro_name}) ${outro_name}.end();`);
 			}
 		}
+
+		if ((intro && intro.expression && intro.expression.dependencies.size) || (outro && outro.expression && outro.expression.dependencies.size)) {
+			block.maintain_context = true;
+		}
 	}
 
 	add_animation(block: Block) {
@@ -982,15 +956,17 @@ function to_html(wrappers: Array<ElementWrapper | TextWrapper | MustacheTagWrapp
 					}
 				});
 
-				state.quasi.value.raw += `"`;
+				state.quasi.value.raw += '"';
 			});
 
-			state.quasi.value.raw += '>';
-
 			if (!wrapper.void) {
+				state.quasi.value.raw += '>';
+
 				to_html(wrapper.fragment.nodes as Array<ElementWrapper | TextWrapper>, block, literal, state);
 
 				state.quasi.value.raw += `</${wrapper.node.name}>`;
+			} else {
+				state.quasi.value.raw += '/>';
 			}
 		}
 	});
diff --git a/src/compiler/compile/render_dom/wrappers/Fragment.ts b/src/compiler/compile/render_dom/wrappers/Fragment.ts
index a0984b69b9..6b7ff56e64 100644
--- a/src/compiler/compile/render_dom/wrappers/Fragment.ts
+++ b/src/compiler/compile/render_dom/wrappers/Fragment.ts
@@ -6,6 +6,7 @@ import EachBlock from './EachBlock';
 import Element from './Element/index';
 import Head from './Head';
 import IfBlock from './IfBlock';
+import KeyBlock from './KeyBlock';
 import InlineComponent from './InlineComponent/index';
 import MustacheTag from './MustacheTag';
 import RawMustacheTag from './RawMustacheTag';
@@ -30,6 +31,7 @@ const wrappers = {
 	Head,
 	IfBlock,
 	InlineComponent,
+	KeyBlock,
 	MustacheTag,
 	Options: null,
 	RawMustacheTag,
@@ -67,7 +69,7 @@ export default class FragmentWrapper {
 			const child = nodes[i];
 
 			if (!child.type) {
-				throw new Error(`missing type`);
+				throw new Error('missing type');
 			}
 
 			if (!(child.type in wrappers)) {
diff --git a/src/compiler/compile/render_dom/wrappers/IfBlock.ts b/src/compiler/compile/render_dom/wrappers/IfBlock.ts
index 220b529902..0cb31036e6 100644
--- a/src/compiler/compile/render_dom/wrappers/IfBlock.ts
+++ b/src/compiler/compile/render_dom/wrappers/IfBlock.ts
@@ -55,7 +55,7 @@ class IfBlockBranch extends Wrapper {
 			});
 
 			if (should_cache) {
-				this.condition = block.get_unique_name(`show_if`);
+				this.condition = block.get_unique_name('show_if');
 				this.snippet = (expression.manipulate(block) as Node);
 			} else {
 				this.condition = expression.manipulate(block);
@@ -65,7 +65,7 @@ class IfBlockBranch extends Wrapper {
 		this.block = block.child({
 			comment: create_debugging_comment(node, parent.renderer.component),
 			name: parent.renderer.component.get_unique_name(
-				is_else ? `create_else_block` : `create_if_block`
+				is_else ? 'create_else_block' : 'create_if_block'
 			),
 			type: (node as IfBlock).expression ? 'if' : 'else'
 		});
@@ -257,8 +257,8 @@ export default class IfBlockWrapper extends Wrapper {
 		{ name, anchor, has_else, if_exists_condition, has_transitions },
 		detaching
 	) {
-		const select_block_type = this.renderer.component.get_unique_name(`select_block_type`);
-		const current_block_type = block.get_unique_name(`current_block_type`);
+		const select_block_type = this.renderer.component.get_unique_name('select_block_type');
+		const current_block_type = block.get_unique_name('current_block_type');
 		const get_block = has_else
 			? x`${current_block_type}(#ctx)`
 			: x`${current_block_type} && ${current_block_type}(#ctx)`;
@@ -364,11 +364,11 @@ export default class IfBlockWrapper extends Wrapper {
 		{ name, anchor, has_else, has_transitions, if_exists_condition },
 		detaching
 	) {
-		const select_block_type = this.renderer.component.get_unique_name(`select_block_type`);
-		const current_block_type_index = block.get_unique_name(`current_block_type_index`);
-		const previous_block_index = block.get_unique_name(`previous_block_index`);
-		const if_block_creators = block.get_unique_name(`if_block_creators`);
-		const if_blocks = block.get_unique_name(`if_blocks`);
+		const select_block_type = this.renderer.component.get_unique_name('select_block_type');
+		const current_block_type_index = block.get_unique_name('current_block_type_index');
+		const previous_block_index = block.get_unique_name('previous_block_index');
+		const if_block_creators = block.get_unique_name('if_block_creators');
+		const if_blocks = block.get_unique_name('if_blocks');
 
 		const if_current_block_type_index = has_else
 			? nodes => nodes
@@ -603,7 +603,7 @@ export default class IfBlockWrapper extends Wrapper {
 			// as -1
 			operator: val.operator,
 			prefix: val.prefix,
-			argument: val.argument,
+			argument: val.argument
 		};
 	}
 }
diff --git a/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts b/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
index 904cfa3329..be3d6d146d 100644
--- a/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/InlineComponent/index.ts
@@ -78,7 +78,7 @@ export default class InlineComponentWrapper extends Wrapper {
 
 			const default_slot = block.child({
 				comment: create_debugging_comment(node, renderer.component),
-				name: renderer.component.get_unique_name(`create_default_slot`),
+				name: renderer.component.get_unique_name('create_default_slot'),
 				type: 'slot'
 			});
 
@@ -112,7 +112,7 @@ export default class InlineComponentWrapper extends Wrapper {
 		if (variable.reassigned || variable.export_name || variable.is_reactive_dependency) {
 			this.renderer.component.warn(this.node, {
 				code: 'reactive-component',
-				message: `<${name}/> will not be reactive if ${name} changes. Use <svelte:component this={${name}}/> if you want this reactivity.`,
+				message: `<${name}/> will not be reactive if ${name} changes. Use <svelte:component this={${name}}/> if you want this reactivity.`
 			});
 		}
 	}
diff --git a/src/compiler/compile/render_dom/wrappers/KeyBlock.ts b/src/compiler/compile/render_dom/wrappers/KeyBlock.ts
new file mode 100644
index 0000000000..9688337d7c
--- /dev/null
+++ b/src/compiler/compile/render_dom/wrappers/KeyBlock.ts
@@ -0,0 +1,136 @@
+import Wrapper from './shared/Wrapper';
+import Renderer from '../Renderer';
+import Block from '../Block';
+import EachBlock from '../../nodes/EachBlock';
+import KeyBlock from '../../nodes/KeyBlock';
+import create_debugging_comment from './shared/create_debugging_comment';
+import FragmentWrapper from './Fragment';
+import { b, x } from 'code-red';
+import { Identifier } from 'estree';
+
+export default class KeyBlockWrapper extends Wrapper {
+	node: KeyBlock;
+	fragment: FragmentWrapper;
+	block: Block;
+	dependencies: string[];
+	var: Identifier = { type: 'Identifier', name: 'key_block' };
+
+	constructor(
+		renderer: Renderer,
+		block: Block,
+		parent: Wrapper,
+		node: EachBlock,
+		strip_whitespace: boolean,
+		next_sibling: Wrapper
+	) {
+		super(renderer, block, parent, node);
+
+		this.cannot_use_innerhtml();
+		this.not_static_content();
+
+		this.dependencies = node.expression.dynamic_dependencies();
+
+		if (this.dependencies.length) {
+			block = block.child({
+				comment: create_debugging_comment(node, renderer.component),
+				name: renderer.component.get_unique_name('create_key_block'),
+				type: 'key'
+			});
+			renderer.blocks.push(block);
+		}
+
+		this.block = block;
+		this.fragment = new FragmentWrapper(
+			renderer,
+			this.block,
+			node.children,
+			parent,
+			strip_whitespace,
+			next_sibling
+		);
+	}
+
+	render(block: Block, parent_node: Identifier, parent_nodes: Identifier) {
+		if (this.dependencies.length === 0) {
+			this.render_static_key(block, parent_node, parent_nodes);
+		} else {
+			this.render_dynamic_key(block, parent_node, parent_nodes);
+		}
+	}
+
+	render_static_key(_block: Block, parent_node: Identifier, parent_nodes: Identifier) {
+		this.fragment.render(this.block, parent_node, parent_nodes);
+	}
+
+	render_dynamic_key(block: Block, parent_node: Identifier, parent_nodes: Identifier) {
+		this.fragment.render(
+			this.block,
+			null,
+			(x`#nodes` as unknown) as Identifier
+		);
+
+		const has_transitions = !!(
+			this.block.has_intro_method || this.block.has_outro_method
+		);
+		const dynamic = this.block.has_update_method;
+
+		const previous_key = block.get_unique_name('previous_key');
+		const snippet = this.node.expression.manipulate(block);
+		block.add_variable(previous_key, snippet);
+
+		const not_equal = this.renderer.component.component_options.immutable ? x`@not_equal` : x`@safe_not_equal`;
+		const condition = x`${this.renderer.dirty(this.dependencies)} && ${not_equal}(${previous_key}, ${previous_key} = ${snippet})`;
+
+		block.chunks.init.push(b`
+			let ${this.var} = ${this.block.name}(#ctx);
+		`);
+		block.chunks.create.push(b`${this.var}.c();`);
+		if (this.renderer.options.hydratable) {
+			block.chunks.claim.push(b`${this.var}.l(${parent_nodes});`);
+		}
+		block.chunks.mount.push(
+			b`${this.var}.m(${parent_node || '#target'}, ${
+				parent_node ? 'null' : '#anchor'
+			});`
+		);
+		const anchor = this.get_or_create_anchor(block, parent_node, parent_nodes);
+		const body = b`
+			${
+				has_transitions
+					? b`
+						@group_outros();
+						@transition_out(${this.var}, 1, 1, @noop);
+						@check_outros();
+					`
+					: b`${this.var}.d(1);`
+			}
+			${this.var} = ${this.block.name}(#ctx);
+			${this.var}.c();
+			${has_transitions && b`@transition_in(${this.var})`}
+			${this.var}.m(${this.get_update_mount_node(anchor)}, ${anchor});
+		`;
+
+		if (dynamic) {
+			block.chunks.update.push(b`
+				if (${condition}) {
+					${body}
+				} else {
+					${this.var}.p(#ctx, #dirty);
+				}
+			`);
+		} else {
+			block.chunks.update.push(b`
+				if (${condition}) {
+					${body}
+				}
+			`);
+		}
+
+		if (has_transitions) {
+			block.chunks.intro.push(b`@transition_in(${this.var})`);
+			block.chunks.outro.push(b`@transition_out(${this.var})`);
+		}
+
+		block.chunks.destroy.push(b`${this.var}.d(detaching)`);
+	}
+}
diff --git a/src/compiler/compile/render_dom/wrappers/Slot.ts b/src/compiler/compile/render_dom/wrappers/Slot.ts
index 5c02e78158..0746de3237 100644
--- a/src/compiler/compile/render_dom/wrappers/Slot.ts
+++ b/src/compiler/compile/render_dom/wrappers/Slot.ts
@@ -12,11 +12,13 @@ import Expression from '../../nodes/shared/Expression';
 import is_dynamic from './shared/is_dynamic';
 import { Identifier, ObjectExpression } from 'estree';
 import create_debugging_comment from './shared/create_debugging_comment';
+import create_slot_block from './Element/create_slot_block';
 
 export default class SlotWrapper extends Wrapper {
 	node: Slot;
 	fragment: FragmentWrapper;
 	fallback: Block | null = null;
+	slot_block: Block;
 
 	var: Identifier = { type: 'Identifier', name: 'slot' };
 	dependencies: Set<string> = new Set(['$$scope']);
@@ -36,12 +38,16 @@ export default class SlotWrapper extends Wrapper {
 		if (this.node.children.length) {
 			this.fallback = block.child({
 				comment: create_debugging_comment(this.node.children[0], this.renderer.component),
-				name: this.renderer.component.get_unique_name(`fallback_block`),
+				name: this.renderer.component.get_unique_name('fallback_block'),
 				type: 'fallback'
 			});
 			renderer.blocks.push(this.fallback);
 		}
 
+		if (this.node.values.has('slot')) {
+			block = create_slot_block(this.node.values.get('slot'), this, block);
+		}
+
 		this.fragment = new FragmentWrapper(
 			renderer,
 			this.fallback,
@@ -71,6 +77,10 @@ export default class SlotWrapper extends Wrapper {
 
 		const { slot_name } = this.node;
 
+		if (this.slot_block) {
+			block = this.slot_block;
+		}
+
 		let get_slot_changes_fn;
 		let get_slot_context_fn;
 
diff --git a/src/compiler/compile/render_dom/wrappers/Text.ts b/src/compiler/compile/render_dom/wrappers/Text.ts
index 7ef8aebd70..daa3ccfd20 100644
--- a/src/compiler/compile/render_dom/wrappers/Text.ts
+++ b/src/compiler/compile/render_dom/wrappers/Text.ts
@@ -51,4 +51,4 @@ export default class TextWrapper extends Wrapper {
 			parent_node as Identifier
 		);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/render_dom/wrappers/Title.ts b/src/compiler/compile/render_dom/wrappers/Title.ts
index 428073ddd2..808384fabb 100644
--- a/src/compiler/compile/render_dom/wrappers/Title.ts
+++ b/src/compiler/compile/render_dom/wrappers/Title.ts
@@ -59,7 +59,7 @@ export default class TitleWrapper extends Wrapper {
 			}
 
 			const last = this.node.should_cache && block.get_unique_name(
-				`title_value`
+				'title_value'
 			);
 
 			if (this.node.should_cache) block.add_variable(last);
diff --git a/src/compiler/compile/render_dom/wrappers/Window.ts b/src/compiler/compile/render_dom/wrappers/Window.ts
index 18691ae9a8..dbc7efd891 100644
--- a/src/compiler/compile/render_dom/wrappers/Window.ts
+++ b/src/compiler/compile/render_dom/wrappers/Window.ts
@@ -16,7 +16,7 @@ const associated_events = {
 	outerHeight: 'resize',
 
 	scrollX: 'scroll',
-	scrollY: 'scroll',
+	scrollY: 'scroll'
 };
 
 const properties = {
@@ -29,7 +29,7 @@ const readonly = new Set([
 	'innerHeight',
 	'outerWidth',
 	'outerHeight',
-	'online',
+	'online'
 ]);
 
 export default class WindowWrapper extends Wrapper {
@@ -72,9 +72,9 @@ export default class WindowWrapper extends Wrapper {
 			});
 		});
 
-		const scrolling = block.get_unique_name(`scrolling`);
-		const clear_scrolling = block.get_unique_name(`clear_scrolling`);
-		const scrolling_timeout = block.get_unique_name(`scrolling_timeout`);
+		const scrolling = block.get_unique_name('scrolling');
+		const clear_scrolling = block.get_unique_name('clear_scrolling');
+		const scrolling_timeout = block.get_unique_name('scrolling_timeout');
 
 		Object.keys(events).forEach(event => {
 			const id = block.get_unique_name(`onwindow${event}`);
@@ -156,7 +156,7 @@ export default class WindowWrapper extends Wrapper {
 
 		// another special case. (I'm starting to think these are all special cases.)
 		if (bindings.online) {
-			const id = block.get_unique_name(`onlinestatuschanged`);
+			const id = block.get_unique_name('onlinestatuschanged');
 			const name = bindings.online;
 
 			renderer.add_to_context(id.name);
diff --git a/src/compiler/compile/render_dom/wrappers/shared/Tag.ts b/src/compiler/compile/render_dom/wrappers/shared/Tag.ts
index 10e2a4a18d..8d73b0329d 100644
--- a/src/compiler/compile/render_dom/wrappers/shared/Tag.ts
+++ b/src/compiler/compile/render_dom/wrappers/shared/Tag.ts
@@ -56,4 +56,4 @@ export default class Tag extends Wrapper {
 
 		return { init: content };
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/render_dom/wrappers/shared/add_actions.ts b/src/compiler/compile/render_dom/wrappers/shared/add_actions.ts
index 3d8c4fbbc0..6ca7de9a22 100644
--- a/src/compiler/compile/render_dom/wrappers/shared/add_actions.ts
+++ b/src/compiler/compile/render_dom/wrappers/shared/add_actions.ts
@@ -26,11 +26,19 @@ export function add_action(block: Block, target: string, action: Action) {
 
 	block.add_variable(id);
 
-	const fn = block.renderer.reference(action.name);
+	const [obj, ...properties] = action.name.split('.');
 
-	block.event_listeners.push(
-		x`@action_destroyer(${id} = ${fn}.call(null, ${target}, ${snippet}))`
-	);
+	const fn = block.renderer.reference(obj);
+
+	if (properties.length) {
+		block.event_listeners.push(
+			x`@action_destroyer(${id} = ${fn}.${properties.join('.')}(${target}, ${snippet}))`
+		);
+	} else {
+		block.event_listeners.push(
+			x`@action_destroyer(${id} = ${fn}.call(null, ${target}, ${snippet}))`
+		);
+	}
 
 	if (dependencies && dependencies.length > 0) {
 		let condition = x`${id} && @is_function(${id}.update)`;
diff --git a/src/compiler/compile/render_dom/wrappers/shared/bind_this.ts b/src/compiler/compile/render_dom/wrappers/shared/bind_this.ts
index c3aa04960e..1b8c4f9db8 100644
--- a/src/compiler/compile/render_dom/wrappers/shared/bind_this.ts
+++ b/src/compiler/compile/render_dom/wrappers/shared/bind_this.ts
@@ -94,4 +94,4 @@ export default function bind_this(component: Component, block: Block, binding: B
 
 	block.chunks.destroy.push(b`${callee}(null);`);
 	return b`${callee}(${variable});`;
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/render_dom/wrappers/shared/create_debugging_comment.ts b/src/compiler/compile/render_dom/wrappers/shared/create_debugging_comment.ts
index 1bdc473df0..6e295f99c1 100644
--- a/src/compiler/compile/render_dom/wrappers/shared/create_debugging_comment.ts
+++ b/src/compiler/compile/render_dom/wrappers/shared/create_debugging_comment.ts
@@ -29,7 +29,7 @@ export default function create_debugging_comment(
 	} else {
 		// @ts-ignore
 		d = node.expression ? node.expression.node.end : c;
-		while (source[d] !== '}') d += 1;
+		while (source[d] !== '}' && d <= source.length) d += 1;
 		while (source[d] === '}') d += 1;
 	}
 
diff --git a/src/compiler/compile/render_dom/wrappers/shared/get_slot_definition.ts b/src/compiler/compile/render_dom/wrappers/shared/get_slot_definition.ts
index 0f28689df3..2279c7c845 100644
--- a/src/compiler/compile/render_dom/wrappers/shared/get_slot_definition.ts
+++ b/src/compiler/compile/render_dom/wrappers/shared/get_slot_definition.ts
@@ -34,13 +34,13 @@ export function get_slot_definition(block: Block, scope: TemplateScope, lets: Le
 			type: 'Property',
 			kind: 'init',
 			key: l.name,
-			value,
+			value
 		});
 	});
 
 	const changes_input = {
 		type: 'ObjectPattern',
-		properties,
+		properties
 	};
 
 	const names: Set<string> = new Set();
@@ -112,4 +112,4 @@ export function get_slot_definition(block: Block, scope: TemplateScope, lets: Le
 		get_context: x`${context_input} => ${context}`,
 		get_changes: x`${changes_input} => ${changes}`
 	};
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/render_dom/wrappers/shared/is_dynamic.ts b/src/compiler/compile/render_dom/wrappers/shared/is_dynamic.ts
index d32ebe4594..01283943d4 100644
--- a/src/compiler/compile/render_dom/wrappers/shared/is_dynamic.ts
+++ b/src/compiler/compile/render_dom/wrappers/shared/is_dynamic.ts
@@ -1,10 +1,12 @@
 import { Var } from '../../../../interfaces';
+import { is_reserved_keyword } from '../../../utils/reserved_keywords';
 
 export default function is_dynamic(variable: Var) {
 	if (variable) {
 		if (variable.mutated || variable.reassigned) return true; // dynamic internal state
 		if (!variable.module && variable.writable && variable.export_name) return true; // writable props
+		if (is_reserved_keyword(variable.name)) return true;
 	}
 
 	return false;
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/render_dom/wrappers/shared/is_head.ts b/src/compiler/compile/render_dom/wrappers/shared/is_head.ts
index ebc6e27548..36bf571aad 100644
--- a/src/compiler/compile/render_dom/wrappers/shared/is_head.ts
+++ b/src/compiler/compile/render_dom/wrappers/shared/is_head.ts
@@ -1,3 +1,3 @@
 export function is_head(node) {
 	return node && node.type === 'MemberExpression' && node.object.name === '@_document' && node.property.name === 'head';
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/render_dom/wrappers/shared/mark_each_block_bindings.ts b/src/compiler/compile/render_dom/wrappers/shared/mark_each_block_bindings.ts
index 884d4b88b8..76a594c09c 100644
--- a/src/compiler/compile/render_dom/wrappers/shared/mark_each_block_bindings.ts
+++ b/src/compiler/compile/render_dom/wrappers/shared/mark_each_block_bindings.ts
@@ -1,7 +1,7 @@
-import EachBlock from "../../../nodes/EachBlock";
-import InlineComponentWrapper from "../InlineComponent";
-import ElementWrapper from "../Element";
-import Binding from "../../../nodes/Binding";
+import EachBlock from '../../../nodes/EachBlock';
+import InlineComponentWrapper from '../InlineComponent';
+import ElementWrapper from '../Element';
+import Binding from '../../../nodes/Binding';
 
 export default function mark_each_block_bindings(
 	parent: ElementWrapper | InlineComponentWrapper,
@@ -16,7 +16,7 @@ export default function mark_each_block_bindings(
 		}
 	});
 
-	if (binding.name === "group") {
+	if (binding.name === 'group') {
 		// for `<input bind:group={} >`, we make sure that all the each blocks creates context with `index`
 		for (const name of binding.expression.contextual_dependencies) {
 			const each_block = parent.node.scope.get_owner(name);
diff --git a/src/compiler/compile/render_ssr/Renderer.ts b/src/compiler/compile/render_ssr/Renderer.ts
index fb9216327c..c633ff8b0a 100644
--- a/src/compiler/compile/render_ssr/Renderer.ts
+++ b/src/compiler/compile/render_ssr/Renderer.ts
@@ -7,6 +7,7 @@ import Head from './handlers/Head';
 import HtmlTag from './handlers/HtmlTag';
 import IfBlock from './handlers/IfBlock';
 import InlineComponent from './handlers/InlineComponent';
+import KeyBlock from './handlers/KeyBlock';
 import Slot from './handlers/Slot';
 import Tag from './handlers/Tag';
 import Text from './handlers/Text';
@@ -30,6 +31,7 @@ const handlers: Record<string, Handler> = {
 	Head,
 	IfBlock,
 	InlineComponent,
+	KeyBlock,
 	MustacheTag: Tag, // TODO MustacheTag is an anachronism
 	Options: noop,
 	RawMustacheTag: HtmlTag,
diff --git a/src/compiler/compile/render_ssr/handlers/Element.ts b/src/compiler/compile/render_ssr/handlers/Element.ts
index ad5c421bc4..163e2bbea9 100644
--- a/src/compiler/compile/render_ssr/handlers/Element.ts
+++ b/src/compiler/compile/render_ssr/handlers/Element.ts
@@ -84,20 +84,20 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
 				attribute.chunks[0].type !== 'Text'
 			) {
 				// a boolean attribute with one non-Text chunk
-				renderer.add_string(` `);
+				renderer.add_string(' ');
 				renderer.add_expression(x`${(attribute.chunks[0] as Expression).node} ? "${attribute.name}" : ""`);
 			} else if (name === 'class' && class_expression) {
 				add_class_attribute = false;
 				renderer.add_string(` ${attribute.name}="`);
 				renderer.add_expression(x`[${get_class_attribute_value(attribute)}, ${class_expression}].join(' ').trim()`);
-				renderer.add_string(`"`);
+				renderer.add_string('"');
 			} else if (attribute.chunks.length === 1 && attribute.chunks[0].type !== 'Text') {
 				const snippet = (attribute.chunks[0] as Expression).node;
 				renderer.add_expression(x`@add_attribute("${attribute.name}", ${snippet}, ${boolean_attributes.has(name) ? 1 : 0})`);
 			} else {
 				renderer.add_string(` ${attribute.name}="`);
 				renderer.add_expression((name === 'class' ? get_class_attribute_value : get_attribute_value)(attribute));
-				renderer.add_string(`"`);
+				renderer.add_string('"');
 			}
 		});
 		if (add_class_attribute) {
diff --git a/src/compiler/compile/render_ssr/handlers/InlineComponent.ts b/src/compiler/compile/render_ssr/handlers/InlineComponent.ts
index 37f05a941c..e5afbf59cc 100644
--- a/src/compiler/compile/render_ssr/handlers/InlineComponent.ts
+++ b/src/compiler/compile/render_ssr/handlers/InlineComponent.ts
@@ -104,6 +104,6 @@ function is_empty_template_literal(template_literal) {
 	return (
 		template_literal.expressions.length === 0 &&
 		template_literal.quasis.length === 1 &&
-		template_literal.quasis[0].value.raw === ""
+		template_literal.quasis[0].value.raw === ''
 	);
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/render_ssr/handlers/KeyBlock.ts b/src/compiler/compile/render_ssr/handlers/KeyBlock.ts
new file mode 100644
index 0000000000..33a6681280
--- /dev/null
+++ b/src/compiler/compile/render_ssr/handlers/KeyBlock.ts
@@ -0,0 +1,6 @@
+import KeyBlock from '../../nodes/KeyBlock';
+import Renderer, { RenderOptions } from '../Renderer';
+
+export default function(node: KeyBlock, renderer: Renderer, options: RenderOptions) {
+	renderer.render(node.children, options);
+}
diff --git a/src/compiler/compile/render_ssr/handlers/Slot.ts b/src/compiler/compile/render_ssr/handlers/Slot.ts
index 32b6246e64..f89b619c46 100644
--- a/src/compiler/compile/render_ssr/handlers/Slot.ts
+++ b/src/compiler/compile/render_ssr/handlers/Slot.ts
@@ -2,9 +2,18 @@ import Renderer, { RenderOptions } from '../Renderer';
 import Slot from '../../nodes/Slot';
 import { x } from 'code-red';
 import get_slot_data from '../../utils/get_slot_data';
+import { get_slot_scope } from './shared/get_slot_scope';
 
-export default function(node: Slot, renderer: Renderer, options: RenderOptions) {
+export default function(node: Slot, renderer: Renderer, options: RenderOptions & {
+	slot_scopes: Map<any, any>;
+}) {
 	const slot_data = get_slot_data(node.values);
+	const slot = node.get_static_attribute_value('slot');
+	const nearest_inline_component = node.find_nearest(/InlineComponent/);
+
+	if (slot && nearest_inline_component) {
+		renderer.push();
+	}
 
 	renderer.push();
 	renderer.render(node.children, options);
@@ -15,4 +24,17 @@ export default function(node: Slot, renderer: Renderer, options: RenderOptions)
 			? #slots.${node.slot_name}(${slot_data})
 			: ${result}
 	`);
+
+	if (slot && nearest_inline_component) {
+		const lets = node.lets;
+		const seen = new Set(lets.map(l => l.name.name));
+
+		nearest_inline_component.lets.forEach(l => {
+			if (!seen.has(l.name.name)) lets.push(l);
+		});
+		options.slot_scopes.set(slot, {
+			input: get_slot_scope(node.lets),
+			output: renderer.pop()
+		});
+	}
 }
diff --git a/src/compiler/compile/render_ssr/handlers/Title.ts b/src/compiler/compile/render_ssr/handlers/Title.ts
index c4c7897185..9fe48dd1f1 100644
--- a/src/compiler/compile/render_ssr/handlers/Title.ts
+++ b/src/compiler/compile/render_ssr/handlers/Title.ts
@@ -5,11 +5,11 @@ import { x } from 'code-red';
 export default function(node: Title, renderer: Renderer, options: RenderOptions) {
 	renderer.push();
 
-	renderer.add_string(`<title>`);
+	renderer.add_string('<title>');
 
 	renderer.render(node.children, options);
 
-	renderer.add_string(`</title>`);
+	renderer.add_string('</title>');
 	const result = renderer.pop();
 
 	renderer.add_expression(x`$$result.title = ${result}, ""`);
diff --git a/src/compiler/compile/render_ssr/handlers/shared/get_slot_scope.ts b/src/compiler/compile/render_ssr/handlers/shared/get_slot_scope.ts
index bfde4cc195..1d1a5412a2 100644
--- a/src/compiler/compile/render_ssr/handlers/shared/get_slot_scope.ts
+++ b/src/compiler/compile/render_ssr/handlers/shared/get_slot_scope.ts
@@ -18,4 +18,4 @@ export function get_slot_scope(lets: Let[]): ObjectPattern {
 			};
 		})
 	};
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/utils/compare_node.ts b/src/compiler/compile/utils/compare_node.ts
index ead79a5ea0..3cd9321ea9 100644
--- a/src/compiler/compile/utils/compare_node.ts
+++ b/src/compiler/compile/utils/compare_node.ts
@@ -1,19 +1,19 @@
-import { Node, Literal, Identifier, MemberExpression } from "estree";
+import { Node, Literal, Identifier, MemberExpression } from 'estree';
 
 export function compare_node(a: Node | void, b: Node | void) {
 	if (a === b) return true;
 	if (!a || !b) return false;
 	if (a.type !== b.type) return false;
 	switch (a.type) {
-		case "Identifier":
+		case 'Identifier':
 			return a.name === (b as Identifier).name;
-		case "MemberExpression":
+		case 'MemberExpression':
 			return (
 				compare_node(a.object, (b as MemberExpression).object) &&
 				compare_node(a.property, (b as MemberExpression).property) &&
 				a.computed === (b as MemberExpression).computed
-      );
-    case 'Literal':
-      return a.value === (b as Literal).value;
+			);
+		case 'Literal':
+			return a.value === (b as Literal).value;
 	}
 }
diff --git a/src/compiler/compile/utils/flatten_reference.ts b/src/compiler/compile/utils/flatten_reference.ts
index 6715e68482..b95536d76f 100644
--- a/src/compiler/compile/utils/flatten_reference.ts
+++ b/src/compiler/compile/utils/flatten_reference.ts
@@ -36,4 +36,4 @@ function to_string(node: Node) {
 		case 'Identifier':
 			return node.name;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/utils/get_name_from_filename.ts b/src/compiler/compile/utils/get_name_from_filename.ts
index d1e0e167ce..b05605b5ee 100644
--- a/src/compiler/compile/utils/get_name_from_filename.ts
+++ b/src/compiler/compile/utils/get_name_from_filename.ts
@@ -13,7 +13,7 @@ export default function get_name_from_filename(filename: string) {
 
 	const base = parts.pop()
 		.replace(/%/g, 'u')
-		.replace(/\.[^.]+$/, "")
+		.replace(/\.[^.]+$/, '')
 		.replace(/[^a-zA-Z_$0-9]+/g, '_')
 		.replace(/^_/, '')
 		.replace(/_$/, '')
@@ -24,4 +24,4 @@ export default function get_name_from_filename(filename: string) {
 	}
 
 	return base[0].toUpperCase() + base.slice(1);
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/utils/get_slot_data.ts b/src/compiler/compile/utils/get_slot_data.ts
index a118d52023..c7f70aa488 100644
--- a/src/compiler/compile/utils/get_slot_data.ts
+++ b/src/compiler/compile/utils/get_slot_data.ts
@@ -28,4 +28,4 @@ function get_value(block: Block, attribute: Attribute) {
 	}
 
 	return value;
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/utils/hash.ts b/src/compiler/compile/utils/hash.ts
index e10013aca2..c0ea2b3d88 100644
--- a/src/compiler/compile/utils/hash.ts
+++ b/src/compiler/compile/utils/hash.ts
@@ -1,9 +1,9 @@
 // https://github.com/darkskyapp/string-hash/blob/master/index.js
 export default function hash(str: string): string {
-	str = str.replace(/\r/g, "");
+	str = str.replace(/\r/g, '');
 	let hash = 5381;
 	let i = str.length;
 
 	while (i--) hash = ((hash << 5) - hash) ^ str.charCodeAt(i);
 	return (hash >>> 0).toString(36);
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/utils/replace_object.ts b/src/compiler/compile/utils/replace_object.ts
index 42bfa611ec..2de1dbc24a 100644
--- a/src/compiler/compile/utils/replace_object.ts
+++ b/src/compiler/compile/utils/replace_object.ts
@@ -11,4 +11,4 @@ export default function replace_object(node: Node, replacement: Node) {
 	}
 	parent.object = replacement;
 	return ancestor;
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/utils/reserved_keywords.ts b/src/compiler/compile/utils/reserved_keywords.ts
index d6eb8b9673..a68819a493 100644
--- a/src/compiler/compile/utils/reserved_keywords.ts
+++ b/src/compiler/compile/utils/reserved_keywords.ts
@@ -1,5 +1,5 @@
-export const reserved_keywords = new Set(["$$props", "$$restProps", "$$slots"]);
+export const reserved_keywords = new Set(['$$props', '$$restProps', '$$slots']);
 
 export function is_reserved_keyword(name) {
 	return reserved_keywords.has(name);
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/utils/string_to_member_expression.ts b/src/compiler/compile/utils/string_to_member_expression.ts
index 553c1371bd..783571b035 100644
--- a/src/compiler/compile/utils/string_to_member_expression.ts
+++ b/src/compiler/compile/utils/string_to_member_expression.ts
@@ -1,16 +1,16 @@
-import { MemberExpression, Identifier } from "estree";
+import { MemberExpression, Identifier } from 'estree';
 
 export function string_to_member_expression(name: string) {
-	const parts = name.split(".");
+	const parts = name.split('.');
 	let node: MemberExpression | Identifier = {
-		type: "Identifier",
-		name: parts[0],
+		type: 'Identifier',
+		name: parts[0]
 	};
 	for (let i = 1; i < parts.length; i++) {
 		node = {
-			type: "MemberExpression",
+			type: 'MemberExpression',
 			object: node,
-			property: { type: "Identifier", name: parts[i] },
+			property: { type: 'Identifier', name: parts[i] }
 		} as MemberExpression;
 	}
 	return node;
diff --git a/src/compiler/compile/utils/stringify.ts b/src/compiler/compile/utils/stringify.ts
index 19f6d99673..aa1c42c512 100644
--- a/src/compiler/compile/utils/stringify.ts
+++ b/src/compiler/compile/utils/stringify.ts
@@ -12,11 +12,11 @@ export function escape(data: string, { only_escape_at_symbol = false } = {}) {
 }
 
 const escaped = {
-  '"': '&quot;',
-  "'": '&#39;',
+	'"': '&quot;',
+	"'": '&#39;',
 	'&': '&amp;',
 	'<': '&lt;',
-	'>': '&gt;',
+	'>': '&gt;'
 };
 
 export function escape_html(html) {
diff --git a/src/compiler/config.ts b/src/compiler/config.ts
index e37ef1aaee..e6d0f65a76 100644
--- a/src/compiler/config.ts
+++ b/src/compiler/config.ts
@@ -1 +1 @@
-export const test = typeof process !== 'undefined' && process.env.TEST;
\ No newline at end of file
+export const test = typeof process !== 'undefined' && process.env.TEST;
diff --git a/src/compiler/interfaces.ts b/src/compiler/interfaces.ts
index a5e286462f..5249c2fd48 100644
--- a/src/compiler/interfaces.ts
+++ b/src/compiler/interfaces.ts
@@ -1,4 +1,4 @@
-import { Node, Program } from "estree";
+import { Node, Program } from 'estree';
 import { SourceMap } from 'magic-string';
 
 interface BaseNode {
@@ -108,7 +108,7 @@ export interface CompileOptions {
 	format?: ModuleFormat;
 	name?: string;
 	filename?: string;
-	generate?: string | false;
+	generate?: 'dom' | 'ssr' | false;
 
 	outputFilename?: string;
 	cssOutputFilename?: string;
@@ -161,9 +161,10 @@ export interface Var {
 	hoistable?: boolean;
 	subscribable?: boolean;
 	is_reactive_dependency?: boolean;
+	imported?: boolean;
 }
 
 export interface CssResult { 
 	code: string;
 	map: SourceMap;
-}
\ No newline at end of file
+}
diff --git a/src/compiler/parse/acorn.ts b/src/compiler/parse/acorn.ts
index d14721cdab..bab8de7ce4 100644
--- a/src/compiler/parse/acorn.ts
+++ b/src/compiler/parse/acorn.ts
@@ -3,11 +3,12 @@ import * as code_red from 'code-red';
 
 export const parse = (source: string): Node => code_red.parse(source, {
 	sourceType: 'module',
-	ecmaVersion: 11,
+	ecmaVersion: 12,
 	locations: true
 });
 
 export const parse_expression_at = (source: string, index: number): Node => code_red.parseExpressionAt(source, index, {
-	ecmaVersion: 11,
+	sourceType: 'module',
+	ecmaVersion: 12,
 	locations: true
-});
\ No newline at end of file
+});
diff --git a/src/compiler/parse/index.ts b/src/compiler/parse/index.ts
index 52795c02a9..0603a0f800 100644
--- a/src/compiler/parse/index.ts
+++ b/src/compiler/parse/index.ts
@@ -41,7 +41,7 @@ export class Parser {
 			start: null,
 			end: null,
 			type: 'Fragment',
-			children: [],
+			children: []
 		};
 
 		this.stack.push(this.html);
@@ -66,7 +66,7 @@ export class Parser {
 
 		if (state !== fragment) {
 			this.error({
-				code: `unexpected-eof`,
+				code: 'unexpected-eof',
 				message: 'Unexpected end of input'
 			});
 		}
@@ -91,7 +91,7 @@ export class Parser {
 
 	acorn_error(err: any) {
 		this.error({
-			code: `parse-error`,
+			code: 'parse-error',
 			message: err.message.replace(/ \(\d+:\d+\)$/, '')
 		}, err.pos);
 	}
@@ -169,7 +169,7 @@ export class Parser {
 
 		if (!allow_reserved && reserved.has(identifier)) {
 			this.error({
-				code: `unexpected-reserved-word`,
+				code: 'unexpected-reserved-word',
 				message: `'${identifier}' is a reserved word in JavaScript and cannot be used here`
 			}, start);
 		}
@@ -178,11 +178,12 @@ export class Parser {
 	}
 
 	read_until(pattern: RegExp) {
-		if (this.index >= this.template.length)
+		if (this.index >= this.template.length) {
 			this.error({
-				code: `unexpected-eof`,
+				code: 'unexpected-eof',
 				message: 'Unexpected end of input'
 			});
+		}
 
 		const start = this.index;
 		const match = pattern.exec(this.template.slice(start));
@@ -199,8 +200,8 @@ export class Parser {
 	require_whitespace() {
 		if (!whitespace.test(this.template[this.index])) {
 			this.error({
-				code: `missing-whitespace`,
-				message: `Expected whitespace`
+				code: 'missing-whitespace',
+				message: 'Expected whitespace'
 			});
 		}
 
@@ -228,15 +229,15 @@ export default function parse(
 
 	if (instance_scripts.length > 1) {
 		parser.error({
-			code: `invalid-script`,
-			message: `A component can only have one instance-level <script> element`
+			code: 'invalid-script',
+			message: 'A component can only have one instance-level <script> element'
 		}, instance_scripts[1].start);
 	}
 
 	if (module_scripts.length > 1) {
 		parser.error({
-			code: `invalid-script`,
-			message: `A component can only have one <script context="module"> element`
+			code: 'invalid-script',
+			message: 'A component can only have one <script context="module"> element'
 		}, module_scripts[1].start);
 	}
 
diff --git a/src/compiler/parse/read/context.ts b/src/compiler/parse/read/context.ts
index 8d28bd2024..a11dfb25c5 100644
--- a/src/compiler/parse/read/context.ts
+++ b/src/compiler/parse/read/context.ts
@@ -1,14 +1,14 @@
-import { Parser } from "../index";
-import { isIdentifierStart } from "acorn";
-import full_char_code_at from "../../utils/full_char_code_at";
+import { Parser } from '../index';
+import { isIdentifierStart } from 'acorn';
+import full_char_code_at from '../../utils/full_char_code_at';
 import {
 	is_bracket_open,
 	is_bracket_close,
 	is_bracket_pair,
 	get_bracket_close
-} from "../utils/bracket";
-import { parse_expression_at } from "../acorn";
-import { Pattern } from "estree";
+} from '../utils/bracket';
+import { parse_expression_at } from '../acorn';
+import { Pattern } from 'estree';
 
 export default function read_context(
 	parser: Parser
@@ -19,7 +19,7 @@ export default function read_context(
 	const code = full_char_code_at(parser.template, i);
 	if (isIdentifierStart(code, true)) {
 		return {
-			type: "Identifier",
+			type: 'Identifier',
 			name: parser.read_identifier(),
 			start,
 			end: parser.index
@@ -28,8 +28,8 @@ export default function read_context(
 
 	if (!is_bracket_open(code)) {
 		parser.error({
-			code: "unexpected-token",
-			message: "Expected identifier or destructure pattern"
+			code: 'unexpected-token',
+			message: 'Expected identifier or destructure pattern'
 		});
 	}
 
@@ -43,7 +43,7 @@ export default function read_context(
 		} else if (is_bracket_close(code)) {
 			if (!is_bracket_pair(bracket_stack[bracket_stack.length - 1], code)) {
 				parser.error({
-					code: "unexpected-token",
+					code: 'unexpected-token',
 					message: `Expected ${String.fromCharCode(
 						get_bracket_close(bracket_stack[bracket_stack.length - 1])
 					)}`
diff --git a/src/compiler/parse/read/script.ts b/src/compiler/parse/read/script.ts
index 8260894215..2855e640e7 100644
--- a/src/compiler/parse/read/script.ts
+++ b/src/compiler/parse/read/script.ts
@@ -12,7 +12,7 @@ function get_context(parser: Parser, attributes: any[], start: number): string {
 	if (context.value.length !== 1 || context.value[0].type !== 'Text') {
 		parser.error({
 			code: 'invalid-script',
-			message: `context attribute must be static`
+			message: 'context attribute must be static'
 		}, start);
 	}
 
@@ -20,8 +20,8 @@ function get_context(parser: Parser, attributes: any[], start: number): string {
 
 	if (value !== 'module') {
 		parser.error({
-			code: `invalid-script`,
-			message: `If the context attribute is supplied, its value must be "module"`
+			code: 'invalid-script',
+			message: 'If the context attribute is supplied, its value must be "module"'
 		}, context.start);
 	}
 
@@ -32,10 +32,12 @@ export default function read_script(parser: Parser, start: number, attributes: N
 	const script_start = parser.index;
 	const script_end = parser.template.indexOf(script_closing_tag, script_start);
 
-	if (script_end === -1) parser.error({
-		code: `unclosed-script`,
-		message: `<script> must have a closing tag`
-	});
+	if (script_end === -1) {
+		parser.error({
+			code: 'unclosed-script',
+			message: '<script> must have a closing tag'
+		});
+	}
 
 	const source = parser.template.slice(0, script_start).replace(/[^\n]/g, ' ') +
 		parser.template.slice(script_start, script_end);
@@ -57,6 +59,6 @@ export default function read_script(parser: Parser, start: number, attributes: N
 		start,
 		end: parser.index,
 		context: get_context(parser, attributes, start),
-		content: ast,
+		content: ast
 	};
 }
diff --git a/src/compiler/parse/read/style.ts b/src/compiler/parse/read/style.ts
index 71fd629151..72fd8aeca1 100644
--- a/src/compiler/parse/read/style.ts
+++ b/src/compiler/parse/read/style.ts
@@ -14,12 +14,12 @@ export default function read_style(parser: Parser, start: number, attributes: No
 	try {
 		ast = parse(styles, {
 			positions: true,
-			offset: content_start,
+			offset: content_start
 		});
 	} catch (err) {
 		if (err.name === 'CssSyntaxError') {
 			parser.error({
-				code: `css-syntax-error`,
+				code: 'css-syntax-error',
 				message: err.message
 			}, err.offset);
 		} else {
@@ -40,7 +40,7 @@ export default function read_style(parser: Parser, start: number, attributes: No
 
 					if (is_ref_selector(a, b)) {
 						parser.error({
-							code: `invalid-ref-selector`,
+							code: 'invalid-ref-selector',
 							message: 'ref selectors are no longer supported'
 						}, a.loc.start.offset);
 					}
@@ -49,15 +49,15 @@ export default function read_style(parser: Parser, start: number, attributes: No
 
 			if (node.type === 'Declaration' && node.value.type === 'Value' && node.value.children.length === 0) {
 				parser.error({
-					code: `invalid-declaration`,
-					message: `Declaration cannot be empty`
+					code: 'invalid-declaration',
+					message: 'Declaration cannot be empty'
 				}, node.start);
 			}
 
 			if (node.type === 'PseudoClassSelector' && node.name === 'global' && node.children === null) {
 				parser.error({
-					code: `css-syntax-error`,
-					message: `:global() must contain a selector`
+					code: 'css-syntax-error',
+					message: ':global() must contain a selector'
 				}, node.loc.start.offset);
 			}
 
diff --git a/src/compiler/parse/state/mustache.ts b/src/compiler/parse/state/mustache.ts
index 4e1d5c5fd4..b4b34a0b74 100644
--- a/src/compiler/parse/state/mustache.ts
+++ b/src/compiler/parse/state/mustache.ts
@@ -38,7 +38,7 @@ export default function mustache(parser: Parser) {
 
 	parser.allow_whitespace();
 
-	// {/if}, {/each} or {/await}
+	// {/if}, {/each}, {/await} or {/key}
 	if (parser.eat('/')) {
 		let block = parser.current();
 		let expected;
@@ -63,10 +63,12 @@ export default function mustache(parser: Parser) {
 			expected = 'each';
 		} else if (block.type === 'AwaitBlock') {
 			expected = 'await';
+		} else if (block.type === 'KeyBlock') {
+			expected = 'key';
 		} else {
 			parser.error({
-				code: `unexpected-block-close`,
-				message: `Unexpected block closing tag`
+				code: 'unexpected-block-close',
+				message: 'Unexpected block closing tag'
 			});
 		}
 
@@ -98,7 +100,7 @@ export default function mustache(parser: Parser) {
 		if (parser.eat('if')) {
 			parser.error({
 				code: 'invalid-elseif',
-				message: `'elseif' should be 'else if'`
+				message: "'elseif' should be 'else if'"
 			});
 		}
 
@@ -109,10 +111,10 @@ export default function mustache(parser: Parser) {
 			const block = parser.current();
 			if (block.type !== 'IfBlock') {
 				parser.error({
-					code: `invalid-elseif-placement`,
+					code: 'invalid-elseif-placement',
 					message: parser.stack.some(block => block.type === 'IfBlock')
 						? `Expected to close ${to_string(block)} before seeing {:else if ...} block`
-						: `Cannot have an {:else if ...} block outside an {#if ...} block`
+						: 'Cannot have an {:else if ...} block outside an {#if ...} block'
 				});
 			}
 
@@ -134,9 +136,9 @@ export default function mustache(parser: Parser) {
 						type: 'IfBlock',
 						elseif: true,
 						expression,
-						children: [],
-					},
-				],
+						children: []
+					}
+				]
 			};
 
 			parser.stack.push(block.else.children[0]);
@@ -147,10 +149,10 @@ export default function mustache(parser: Parser) {
 			const block = parser.current();
 			if (block.type !== 'IfBlock' && block.type !== 'EachBlock') {
 				parser.error({
-					code: `invalid-else-placement`,
+					code: 'invalid-else-placement',
 					message: parser.stack.some(block => block.type === 'IfBlock' || block.type === 'EachBlock')
 						? `Expected to close ${to_string(block)} before seeing {:else} block`
-						: `Cannot have an {:else} block outside an {#if ...} or {#each ...} block`
+						: 'Cannot have an {:else} block outside an {#if ...} or {#each ...} block'
 				});
 			}
 
@@ -161,7 +163,7 @@ export default function mustache(parser: Parser) {
 				start: parser.index,
 				end: null,
 				type: 'ElseBlock',
-				children: [],
+				children: []
 			};
 
 			parser.stack.push(block.else);
@@ -173,19 +175,19 @@ export default function mustache(parser: Parser) {
 		if (is_then) {
 			if (block.type !== 'PendingBlock') {
 				parser.error({
-					code: `invalid-then-placement`,
+					code: 'invalid-then-placement',
 					message: parser.stack.some(block => block.type === 'PendingBlock')
 						? `Expected to close ${to_string(block)} before seeing {:then} block`
-						: `Cannot have an {:then} block outside an {#await ...} block`
+						: 'Cannot have an {:then} block outside an {#await ...} block'
 				});
 			}
 		} else {
 			if (block.type !== 'ThenBlock' && block.type !== 'PendingBlock') {
 				parser.error({
-					code: `invalid-catch-placement`,
+					code: 'invalid-catch-placement',
 					message: parser.stack.some(block => block.type === 'ThenBlock' || block.type === 'PendingBlock')
 						? `Expected to close ${to_string(block)} before seeing {:catch} block`
-						: `Cannot have an {:catch} block outside an {#await ...} block`
+						: 'Cannot have an {:catch} block outside an {#await ...} block'
 				});
 			}
 		}
@@ -221,10 +223,12 @@ export default function mustache(parser: Parser) {
 			type = 'EachBlock';
 		} else if (parser.eat('await')) {
 			type = 'AwaitBlock';
+		} else if (parser.eat('key')) {
+			type = 'KeyBlock';
 		} else {
 			parser.error({
-				code: `expected-block-type`,
-				message: `Expected if, each or await`
+				code: 'expected-block-type',
+				message: 'Expected if, each, await or key'
 			});
 		}
 
@@ -260,14 +264,14 @@ export default function mustache(parser: Parser) {
 					type: 'CatchBlock',
 					children: [],
 					skip: true
-				},
+				}
 			} :
 			{
 				start,
 				end: null,
 				type,
 				expression,
-				children: [],
+				children: []
 			};
 
 		parser.allow_whitespace();
@@ -284,10 +288,12 @@ export default function mustache(parser: Parser) {
 			if (parser.eat(',')) {
 				parser.allow_whitespace();
 				block.index = parser.read_identifier();
-				if (!block.index) parser.error({
-					code: `expected-name`,
-					message: `Expected name`
-				});
+				if (!block.index) {
+					parser.error({
+						code: 'expected-name',
+						message: 'Expected name'
+					});
+				}
 
 				parser.allow_whitespace();
 			}
@@ -350,7 +356,7 @@ export default function mustache(parser: Parser) {
 			start,
 			end: parser.index,
 			type: 'RawMustacheTag',
-			expression,
+			expression
 		});
 	} else if (parser.eat('@debug')) {
 		let identifiers;
@@ -394,7 +400,7 @@ export default function mustache(parser: Parser) {
 			start,
 			end: parser.index,
 			type: 'MustacheTag',
-			expression,
+			expression
 		});
 	}
 }
diff --git a/src/compiler/parse/state/tag.ts b/src/compiler/parse/state/tag.ts
index 311bf852e2..efeb9433bc 100644
--- a/src/compiler/parse/state/tag.ts
+++ b/src/compiler/parse/state/tag.ts
@@ -25,16 +25,16 @@ const specials = new Map([
 		'script',
 		{
 			read: read_script,
-			property: 'js',
-		},
+			property: 'js'
+		}
 	],
 	[
 		'style',
 		{
 			read: read_style,
-			property: 'css',
-		},
-	],
+			property: 'css'
+		}
+	]
 ]);
 
 const SELF = /^svelte:self(?=[\s/>])/;
@@ -63,7 +63,7 @@ export default function tag(parser: Parser) {
 			start,
 			end: parser.index,
 			type: 'Comment',
-			data,
+			data
 		});
 
 		return;
@@ -116,7 +116,7 @@ export default function tag(parser: Parser) {
 		type,
 		name,
 		attributes: [],
-		children: [],
+		children: []
 	};
 
 	parser.allow_whitespace();
@@ -124,7 +124,7 @@ export default function tag(parser: Parser) {
 	if (is_closing_tag) {
 		if (is_void(name)) {
 			parser.error({
-				code: `invalid-void-content`,
+				code: 'invalid-void-content',
 				message: `<${name}> is a void element and cannot have children, or a closing tag`
 			}, start);
 		}
@@ -138,7 +138,7 @@ export default function tag(parser: Parser) {
 					? `</${name}> attempted to close <${name}> that was already automatically closed by <${parser.last_auto_closed_tag.reason}>`
 					: `</${name}> attempted to close an element that was not open`;
 				parser.error({
-					code: `invalid-closing-tag`,
+					code: 'invalid-closing-tag',
 					message
 				}, start);
 			}
@@ -163,7 +163,7 @@ export default function tag(parser: Parser) {
 		parser.last_auto_closed_tag = {
 			tag: parent.name,
 			reason: name,
-			depth: parser.stack.length,
+			depth: parser.stack.length
 		};
 	}
 
@@ -179,16 +179,16 @@ export default function tag(parser: Parser) {
 		const index = element.attributes.findIndex(attr => attr.type === 'Attribute' && attr.name === 'this');
 		if (!~index) {
 			parser.error({
-				code: `missing-component-definition`,
-				message: `<svelte:component> must have a 'this' attribute`
+				code: 'missing-component-definition',
+				message: "<svelte:component> must have a 'this' attribute"
 			}, start);
 		}
 
 		const definition = element.attributes.splice(index, 1)[0];
 		if (definition.value === true || definition.value.length !== 1 || definition.value[0].type === 'Text') {
 			parser.error({
-				code: `invalid-component-definition`,
-				message: `invalid component definition`
+				code: 'invalid-component-definition',
+				message: 'invalid component definition'
 			}, definition.start);
 		}
 
@@ -223,21 +223,14 @@ export default function tag(parser: Parser) {
 		);
 		parser.read(/<\/textarea>/);
 		element.end = parser.index;
-	} else if (name === 'script') {
+	} else if (name === 'script' || name === 'style') {
 		// special case
 		const start = parser.index;
-		const data = parser.read_until(/<\/script>/);
+		const data = parser.read_until(new RegExp(`</${name}>`));
 		const end = parser.index;
 		element.children.push({ start, end, type: 'Text', data });
-		parser.eat('</script>', true);
+		parser.eat(`</${name}>`, true);
 		element.end = parser.index;
-	} else if (name === 'style') {
-		// special case
-		const start = parser.index;
-		const data = parser.read_until(/<\/style>/);
-		const end = parser.index;
-		element.children.push({ start, end, type: 'Text', data });
-		parser.eat('</style>', true);
 	} else {
 		parser.stack.push(element);
 	}
@@ -262,8 +255,8 @@ function read_tag_name(parser: Parser) {
 
 		if (!legal) {
 			parser.error({
-				code: `invalid-self-placement`,
-				message: `<svelte:self> components can only exist inside {#if} blocks, {#each} blocks, or slots passed to components`
+				code: 'invalid-self-placement',
+				message: '<svelte:self> components can only exist inside {#if} blocks, {#each} blocks, or slots passed to components'
 			}, start);
 		}
 
@@ -290,8 +283,8 @@ function read_tag_name(parser: Parser) {
 
 	if (!valid_tag_name.test(name)) {
 		parser.error({
-			code: `invalid-tag-name`,
-			message: `Expected valid tag name`
+			code: 'invalid-tag-name',
+			message: 'Expected valid tag name'
 		}, start);
 	}
 
@@ -304,7 +297,7 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
 	function check_unique(name: string) {
 		if (unique_names.has(name)) {
 			parser.error({
-				code: `duplicate-attribute`,
+				code: 'duplicate-attribute',
 				message: 'Attributes need to be unique'
 			}, start);
 		}
@@ -373,8 +366,8 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
 		end = parser.index;
 	} else if (parser.match_regex(/["']/)) {
 		parser.error({
-			code: `unexpected-token`,
-			message: `Expected =`
+			code: 'unexpected-token',
+			message: 'Expected ='
 		}, parser.index);
 	}
 
@@ -389,7 +382,7 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
 
 		if (type === 'Ref') {
 			parser.error({
-				code: `invalid-ref-directive`,
+				code: 'invalid-ref-directive',
 				message: `The ref directive is no longer supported — use \`bind:this={${directive_name}}\` instead`
 			}, start);
 		}
@@ -397,8 +390,8 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
 		if (value[0]) {
 			if ((value as any[]).length > 1 || value[0].type === 'Text') {
 				parser.error({
-					code: `invalid-directive-value`,
-					message: `Directive value must be a JavaScript expression enclosed in curly braces`
+					code: 'invalid-directive-value',
+					message: 'Directive value must be a JavaScript expression enclosed in curly braces'
 				}, value[0].start);
 			}
 		}
@@ -437,7 +430,7 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
 		end,
 		type: 'Attribute',
 		name,
-		value,
+		value
 	};
 }
 
@@ -453,11 +446,11 @@ function get_directive_type(name: string): DirectiveType {
 }
 
 function read_attribute_value(parser: Parser) {
-	const quote_mark = parser.eat(`'`) ? `'` : parser.eat(`"`) ? `"` : null;
+	const quote_mark = parser.eat("'") ? "'" : parser.eat('"') ? '"' : null;
 
 	const regex = (
-		quote_mark === `'` ? /'/ :
-			quote_mark === `"` ? /"/ :
+		quote_mark === "'" ? /'/ :
+			quote_mark === '"' ? /"/ :
 				/(\/>|[\s"'=<>`])/
 	);
 
@@ -504,7 +497,7 @@ function read_sequence(parser: Parser, done: () => boolean): TemplateNode[] {
 				start: index,
 				end: parser.index,
 				type: 'MustacheTag',
-				expression,
+				expression
 			});
 
 			current_chunk = {
@@ -520,7 +513,7 @@ function read_sequence(parser: Parser, done: () => boolean): TemplateNode[] {
 	}
 
 	parser.error({
-		code: `unexpected-eof`,
-		message: `Unexpected end of input`
+		code: 'unexpected-eof',
+		message: 'Unexpected end of input'
 	});
 }
diff --git a/src/compiler/parse/state/text.ts b/src/compiler/parse/state/text.ts
index 56be592ca9..a2275c9653 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)
 	};
 
 	parser.current().children.push(node);
diff --git a/src/compiler/parse/utils/bracket.ts b/src/compiler/parse/utils/bracket.ts
index ffbb9e4952..30e522c305 100644
--- a/src/compiler/parse/utils/bracket.ts
+++ b/src/compiler/parse/utils/bracket.ts
@@ -1,7 +1,7 @@
-const SQUARE_BRACKET_OPEN = "[".charCodeAt(0);
-const SQUARE_BRACKET_CLOSE = "]".charCodeAt(0);
-const CURLY_BRACKET_OPEN = "{".charCodeAt(0);
-const CURLY_BRACKET_CLOSE = "}".charCodeAt(0);
+const SQUARE_BRACKET_OPEN = '['.charCodeAt(0);
+const SQUARE_BRACKET_CLOSE = ']'.charCodeAt(0);
+const CURLY_BRACKET_OPEN = '{'.charCodeAt(0);
+const CURLY_BRACKET_CLOSE = '}'.charCodeAt(0);
 
 export function is_bracket_open(code) {
 	return code === SQUARE_BRACKET_OPEN || code === CURLY_BRACKET_OPEN;
@@ -25,4 +25,4 @@ export function get_bracket_close(open) {
 	if (open === CURLY_BRACKET_OPEN) {
 		return CURLY_BRACKET_CLOSE;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compiler/parse/utils/entities.ts b/src/compiler/parse/utils/entities.ts
index 91689c5f30..7b43ced2c1 100644
--- a/src/compiler/parse/utils/entities.ts
+++ b/src/compiler/parse/utils/entities.ts
@@ -2030,5 +2030,5 @@ export default {
 	sc: 8827,
 	wp: 8472,
 	wr: 8768,
-	xi: 958,
+	xi: 958
 };
diff --git a/src/compiler/parse/utils/html.ts b/src/compiler/parse/utils/html.ts
index 2b8c4213b7..0148361929 100644
--- a/src/compiler/parse/utils/html.ts
+++ b/src/compiler/parse/utils/html.ts
@@ -32,7 +32,7 @@ const windows_1252 = [
 	339,
 	157,
 	382,
-	376,
+	376
 ];
 
 const entity_pattern = new RegExp(
@@ -124,7 +124,7 @@ const disallowed_contents = new Map([
 			'address article aside blockquote div dl fieldset footer form h1 h2 h3 h4 h5 h6 header hgroup hr main menu nav ol p pre section table ul'.split(
 				' '
 			)
-		),
+		)
 	],
 	['rt', new Set(['rt', 'rp'])],
 	['rp', new Set(['rt', 'rp'])],
@@ -135,7 +135,7 @@ const disallowed_contents = new Map([
 	['tfoot', new Set(['tbody'])],
 	['tr', new Set(['tr', 'tbody'])],
 	['td', new Set(['td', 'th', 'tr'])],
-	['th', new Set(['td', 'th', 'tr'])],
+	['th', new Set(['td', 'th', 'tr'])]
 ]);
 
 // can this be a child of the parent element, or does it implicitly
diff --git a/src/compiler/preprocess/index.ts b/src/compiler/preprocess/index.ts
index d90d4814d7..1d7d74ceac 100644
--- a/src/compiler/preprocess/index.ts
+++ b/src/compiler/preprocess/index.ts
@@ -26,7 +26,7 @@ function parse_attributes(str: string) {
 		if (p === -1) {
 			attrs[attr] = true;
 		} else {
-			attrs[attr.slice(0, p)] = `'"`.includes(attr[p + 1]) ?
+			attrs[attr.slice(0, p)] = '\'"'.includes(attr[p + 1]) ?
 				attr.slice(p + 2, -1) :
 				attr.slice(p + 1);
 		}
@@ -49,7 +49,7 @@ async function replace_async(str: string, re: RegExp, func: (...any) => Promise<
 					({
 						offset: args[args.length - 2],
 						length: args[0].length,
-						replacement: res,
+						replacement: res
 					}) as Replacement
 			)
 		);
diff --git a/src/compiler/utils/error.ts b/src/compiler/utils/error.ts
index e05ea66df1..882ff54ebe 100644
--- a/src/compiler/utils/error.ts
+++ b/src/compiler/utils/error.ts
@@ -37,4 +37,4 @@ export default function error(message: string, props: {
 	error.frame = get_code_frame(props.source, start.line - 1, start.column);
 
 	throw error;
-}
\ No newline at end of file
+}
diff --git a/src/compiler/utils/full_char_code_at.ts b/src/compiler/utils/full_char_code_at.ts
index b5187693eb..0469b537fc 100644
--- a/src/compiler/utils/full_char_code_at.ts
+++ b/src/compiler/utils/full_char_code_at.ts
@@ -7,4 +7,4 @@ export default function full_char_code_at(str: string, i: number): number {
 
 	const next = str.charCodeAt(i + 1);
 	return (code << 10) + next - 0x35fdc00;
-}
\ No newline at end of file
+}
diff --git a/src/compiler/utils/fuzzymatch.ts b/src/compiler/utils/fuzzymatch.ts
index 2efadc3847..8b22a4175d 100644
--- a/src/compiler/utils/fuzzymatch.ts
+++ b/src/compiler/utils/fuzzymatch.ts
@@ -13,8 +13,9 @@ const GRAM_SIZE_UPPER = 3;
 
 // return an edit distance from 0 to 1
 function _distance(str1: string, str2: string) {
-	if (str1 === null && str2 === null)
+	if (str1 === null && str2 === null) {
 		throw 'Trying to compare two null values';
+	}
 	if (str1 === null || str2 === null) return 0;
 	str1 = String(str1);
 	str2 = String(str2);
@@ -206,7 +207,7 @@ class FuzzySet {
 			match_score = matches[match_index];
 			results.push([
 				match_score / (vector_normal * items[match_index][0]),
-				items[match_index][1],
+				items[match_index][1]
 			]);
 		}
 
@@ -218,7 +219,7 @@ class FuzzySet {
 		for (let i = 0; i < end_index; ++i) {
 			new_results.push([
 				_distance(results[i][1], normalized_value),
-				results[i][1],
+				results[i][1]
 			]);
 		}
 		results = new_results;
diff --git a/src/compiler/utils/names.ts b/src/compiler/utils/names.ts
index 02cc12e087..255d56a218 100644
--- a/src/compiler/utils/names.ts
+++ b/src/compiler/utils/names.ts
@@ -13,11 +13,13 @@ export const globals = new Set([
 	'decodeURI',
 	'decodeURIComponent',
 	'document',
+	'Element',
 	'encodeURI',
 	'encodeURIComponent',
 	'Error',
 	'EvalError',
 	'Event',
+	'EventSource',
 	'fetch',
 	'global',
 	'globalThis',
@@ -35,6 +37,7 @@ export const globals = new Set([
 	'NaN',
 	'navigator',
 	'Number',
+	'Node',
 	'Object',
 	'parseFloat',
 	'parseInt',
@@ -105,7 +108,7 @@ export const reserved = new Set([
 	'void',
 	'while',
 	'with',
-	'yield',
+	'yield'
 ]);
 
 const void_element_names = /^(?:area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)$/;
diff --git a/src/compiler/utils/namespaces.ts b/src/compiler/utils/namespaces.ts
index 3bde3ee308..3db7bc3fae 100644
--- a/src/compiler/utils/namespaces.ts
+++ b/src/compiler/utils/namespaces.ts
@@ -17,7 +17,7 @@ export const valid_namespaces = [
 	svg,
 	xlink,
 	xml,
-	xmlns,
+	xmlns
 ];
 
 export const namespaces: Record<string, string> = { html, mathml, svg, xlink, xml, xmlns };
diff --git a/src/compiler/utils/nodes_match.ts b/src/compiler/utils/nodes_match.ts
index 2b6f998c19..ff841d5f02 100644
--- a/src/compiler/utils/nodes_match.ts
+++ b/src/compiler/utils/nodes_match.ts
@@ -29,4 +29,4 @@ export function nodes_match(a, b) {
 	}
 
 	return a === b;
-}
\ No newline at end of file
+}
diff --git a/src/runtime/internal/await_block.ts b/src/runtime/internal/await_block.ts
index f70cbd6c2c..4b7ca6fd21 100644
--- a/src/runtime/internal/await_block.ts
+++ b/src/runtime/internal/await_block.ts
@@ -62,6 +62,9 @@ export function handle_promise(promise, info) {
 			set_current_component(current_component);
 			update(info.catch, 2, info.error, error);
 			set_current_component(null);
+			if (!info.hasCatch) {
+				throw error;
+			}
 		});
 
 		// if we previously had a then/catch block, destroy it
diff --git a/src/runtime/internal/dev.ts b/src/runtime/internal/dev.ts
index 28daa03ae8..708b393601 100644
--- a/src/runtime/internal/dev.ts
+++ b/src/runtime/internal/dev.ts
@@ -6,17 +6,17 @@ export function dispatch_dev<T=any>(type: string, detail?: T) {
 }
 
 export function append_dev(target: Node, node: Node) {
-	dispatch_dev("SvelteDOMInsert", { target, node });
+	dispatch_dev('SvelteDOMInsert', { target, node });
 	append(target, node);
 }
 
 export function insert_dev(target: Node, node: Node, anchor?: Node) {
-	dispatch_dev("SvelteDOMInsert", { target, node, anchor });
+	dispatch_dev('SvelteDOMInsert', { target, node, anchor });
 	insert(target, node, anchor);
 }
 
 export function detach_dev(node: Node) {
-	dispatch_dev("SvelteDOMRemove", { node });
+	dispatch_dev('SvelteDOMRemove', { node });
 	detach(node);
 }
 
@@ -39,15 +39,15 @@ 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) {
-	const modifiers = options === true ? [ "capture" ] : options ? Array.from(Object.keys(options)) : [];
+	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');
 
-	dispatch_dev("SvelteDOMAddEventListener", { node, event, handler, modifiers });
+	dispatch_dev('SvelteDOMAddEventListener', { node, event, handler, modifiers });
 
 	const dispose = listen(node, event, handler, options);
 	return () => {
-		dispatch_dev("SvelteDOMRemoveEventListener", { node, event, handler, modifiers });
+		dispatch_dev('SvelteDOMRemoveEventListener', { node, event, handler, modifiers });
 		dispose();
 	};
 }
@@ -55,27 +55,27 @@ export function listen_dev(node: Node, event: string, handler: EventListenerOrEv
 export function attr_dev(node: Element, attribute: string, value?: string) {
 	attr(node, attribute, value);
 
-	if (value == null) dispatch_dev("SvelteDOMRemoveAttribute", { node, attribute });
-	else dispatch_dev("SvelteDOMSetAttribute", { node, attribute, value });
+	if (value == null) dispatch_dev('SvelteDOMRemoveAttribute', { node, attribute });
+	else dispatch_dev('SvelteDOMSetAttribute', { node, attribute, value });
 }
 
 export function prop_dev(node: Element, property: string, value?: any) {
 	node[property] = value;
 
-	dispatch_dev("SvelteDOMSetProperty", { node, property, value });
+	dispatch_dev('SvelteDOMSetProperty', { node, property, value });
 }
 
 export function dataset_dev(node: HTMLElement, property: string, value?: any) {
 	node.dataset[property] = value;
 
-	dispatch_dev("SvelteDOMSetDataset", { node, property, value });
+	dispatch_dev('SvelteDOMSetDataset', { node, property, value });
 }
 
 export function set_data_dev(text, data) {
 	data = '' + data;
 	if (text.wholeText === data) return;
 
-	dispatch_dev("SvelteDOMSetData", { node: text, data });
+	dispatch_dev('SvelteDOMSetData', { node: text, data });
 	text.data = data;
 }
 
@@ -115,7 +115,7 @@ export class SvelteComponentDev extends SvelteComponent {
 		$$inline?: boolean;
     }) {
 		if (!options || (!options.target && !options.$$inline)) {
-			throw new Error(`'target' is a required option`);
+			throw new Error("'target' is a required option");
 		}
 
 		super();
@@ -124,7 +124,7 @@ export class SvelteComponentDev extends SvelteComponent {
 	$destroy() {
 		super.$destroy();
 		this.$destroy = () => {
-			console.warn(`Component was already destroyed`); // eslint-disable-line no-console
+			console.warn('Component was already destroyed'); // eslint-disable-line no-console
 		};
 	}
 
@@ -137,7 +137,7 @@ export function loop_guard(timeout) {
 	const start = Date.now();
 	return () => {
 		if (Date.now() - start > timeout) {
-			throw new Error(`Infinite loop detected`);
+			throw new Error('Infinite loop detected');
 		}
 	};
 }
diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index 7087336a6b..ad06d6ff08 100644
--- a/src/runtime/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -1,4 +1,4 @@
-import { has_prop } from "./utils";
+import { has_prop } from './utils';
 
 export function append(target: Node, node: Node) {
 	target.appendChild(node);
@@ -138,7 +138,7 @@ export function get_binding_group_value(group, __value, checked) {
 }
 
 export function to_number(value) {
-	return value === '' ? undefined : +value;
+	return value === '' ? null : +value;
 }
 
 export function time_ranges_to_array(ranges) {
@@ -269,7 +269,7 @@ export function add_resize_listener(node: HTMLElement, fn: () => void) {
 
 	const iframe = element('iframe');
 	iframe.setAttribute('style',
-		`display: block; position: absolute; top: 0; left: 0; width: 100%; height: 100%; ` +
+		'display: block; position: absolute; top: 0; left: 0; width: 100%; height: 100%; ' +
 		`overflow: hidden; border: 0; opacity: 0; pointer-events: none; z-index: ${z_index};`
 	);
 	iframe.setAttribute('aria-hidden', 'true');
@@ -280,7 +280,7 @@ export function add_resize_listener(node: HTMLElement, fn: () => void) {
 	let unsubscribe: () => void;
 
 	if (crossorigin) {
-		iframe.src = `data:text/html,<script>onresize=function(){parent.postMessage(0,'*')}</script>`;
+		iframe.src = "data:text/html,<script>onresize=function(){parent.postMessage(0,'*')}</script>";
 		unsubscribe = listen(window, 'message', (event: MessageEvent) => {
 			if (event.source === iframe.contentWindow) fn();
 		});
@@ -360,3 +360,11 @@ export class HtmlTag {
 		this.n.forEach(detach);
 	}
 }
+
+export function attribute_to_object(attributes) {
+	const result = {};
+	for (const attribute of attributes) {
+		result[attribute.name] = attribute.value;
+	}
+	return result;
+}
diff --git a/src/runtime/internal/keyed_each.ts b/src/runtime/internal/keyed_each.ts
index b397335c87..6e333da1a4 100644
--- a/src/runtime/internal/keyed_each.ts
+++ b/src/runtime/internal/keyed_each.ts
@@ -113,7 +113,7 @@ export function validate_each_keys(ctx, list, get_context, get_key) {
 	for (let i = 0; i < list.length; i++) {
 		const key = get_key(get_context(ctx, list, i));
 		if (keys.has(key)) {
-			throw new Error(`Cannot have duplicate keys in a keyed each`);
+			throw new Error('Cannot have duplicate keys in a keyed each');
 		}
 		keys.add(key);
 	}
diff --git a/src/runtime/internal/lifecycle.ts b/src/runtime/internal/lifecycle.ts
index 304e8d6a68..4a7616bdea 100644
--- a/src/runtime/internal/lifecycle.ts
+++ b/src/runtime/internal/lifecycle.ts
@@ -7,23 +7,23 @@ export function set_current_component(component) {
 }
 
 export function get_current_component() {
-	if (!current_component) throw new Error(`Function called outside component initialization`);
+	if (!current_component) throw new Error('Function called outside component initialization');
 	return current_component;
 }
 
-export function beforeUpdate(fn) {
+export function beforeUpdate(fn: () => any) {
 	get_current_component().$$.before_update.push(fn);
 }
 
-export function onMount(fn) {
+export function onMount(fn: () => any) {
 	get_current_component().$$.on_mount.push(fn);
 }
 
-export function afterUpdate(fn) {
+export function afterUpdate(fn: () => any) {
 	get_current_component().$$.after_update.push(fn);
 }
 
-export function onDestroy(fn) {
+export function onDestroy(fn: () => any) {
 	get_current_component().$$.on_destroy.push(fn);
 }
 
diff --git a/src/runtime/internal/scheduler.ts b/src/runtime/internal/scheduler.ts
index b0db71035a..568739e4f8 100644
--- a/src/runtime/internal/scheduler.ts
+++ b/src/runtime/internal/scheduler.ts
@@ -45,6 +45,7 @@ export function flush() {
 			set_current_component(component);
 			update(component.$$);
 		}
+		set_current_component(null);
 
 		dirty_components.length = 0;
 
diff --git a/src/runtime/internal/spread.ts b/src/runtime/internal/spread.ts
index 203b0b11e9..2acb98fd3f 100644
--- a/src/runtime/internal/spread.ts
+++ b/src/runtime/internal/spread.ts
@@ -38,4 +38,4 @@ export function get_spread_update(levels, updates) {
 
 export function get_spread_object(spread_props) {
 	return typeof spread_props === 'object' && spread_props !== null ? spread_props : {};
-}
\ No newline at end of file
+}
diff --git a/src/runtime/internal/ssr.ts b/src/runtime/internal/ssr.ts
index 646a81d817..2d843abb2f 100644
--- a/src/runtime/internal/ssr.ts
+++ b/src/runtime/internal/ssr.ts
@@ -21,9 +21,9 @@ export function spread(args, classes_to_add) {
 		if (invalid_attribute_name_character.test(name)) return;
 
 		const value = attributes[name];
-		if (value === true) str += " " + name;
+		if (value === true) str += ' ' + name;
 		else if (boolean_attributes.has(name.toLowerCase())) {
-			if (value) str += " " + name;
+			if (value) str += ' ' + name;
 		} else if (value != null) {
 			str += ` ${name}="${String(value).replace(/"/g, '&#34;').replace(/'/g, '&#39;')}"`;
 		}
@@ -133,5 +133,5 @@ export function add_attribute(name, value, boolean) {
 }
 
 export function add_classes(classes) {
-	return classes ? ` class="${classes}"` : ``;
-}
\ No newline at end of file
+	return classes ? ` class="${classes}"` : '';
+}
diff --git a/src/runtime/internal/style_manager.ts b/src/runtime/internal/style_manager.ts
index 31d7573a76..8060e65a5d 100644
--- a/src/runtime/internal/style_manager.ts
+++ b/src/runtime/internal/style_manager.ts
@@ -40,7 +40,7 @@ export function create_rule(node: Element & ElementCSSInlineStyle, a: number, b:
 	}
 
 	const animation = node.style.animation || '';
-	node.style.animation = `${animation ? `${animation}, ` : ``}${name} ${duration}ms linear ${delay}ms 1 both`;
+	node.style.animation = `${animation ? `${animation}, ` : ''}${name} ${duration}ms linear ${delay}ms 1 both`;
 
 	active += 1;
 	return name;
diff --git a/src/runtime/internal/transitions.ts b/src/runtime/internal/transitions.ts
index ed23d3c1dd..343a8c82e4 100644
--- a/src/runtime/internal/transitions.ts
+++ b/src/runtime/internal/transitions.ts
@@ -1,5 +1,5 @@
 import { identity as linear, is_function, noop, run_all } from './utils';
-import { now } from "./environment";
+import { now } from './environment';
 import { loop } from './loop';
 import { create_rule, delete_rule } from './style_manager';
 import { custom_event } from './dom';
@@ -273,7 +273,7 @@ export function create_bidirectional_transition(node: Element & ElementCSSInline
 			outros.r += 1;
 		}
 
-		if (running_program) {
+		if (running_program || pending_program) {
 			pending_program = program;
 		} else {
 			// if this is an intro, and there's a delay, we need to do
diff --git a/src/runtime/internal/utils.ts b/src/runtime/internal/utils.ts
index 633b6f054c..3b8815cb1d 100644
--- a/src/runtime/internal/utils.ts
+++ b/src/runtime/internal/utils.ts
@@ -1,3 +1,5 @@
+import { Readable } from 'svelte/store';
+
 export function noop() {}
 
 export const identity = x => x;
@@ -60,7 +62,7 @@ export function subscribe(store, ...callbacks) {
 	return unsub.unsubscribe ? () => unsub.unsubscribe() : unsub;
 }
 
-export function get_store_value(store) {
+export function get_store_value<T>(store: Readable<T>): T {
 	let value;
 	subscribe(store, _ => value = _)();
 	return value;
@@ -158,4 +160,4 @@ export const has_prop = (obj, prop) => Object.prototype.hasOwnProperty.call(obj,
 
 export function action_destroyer(action_result) {
 	return action_result && is_function(action_result.destroy) ? action_result.destroy : noop;
-}
\ No newline at end of file
+}
diff --git a/src/runtime/motion/spring.ts b/src/runtime/motion/spring.ts
index 5845a13a57..8d2056256c 100644
--- a/src/runtime/motion/spring.ts
+++ b/src/runtime/motion/spring.ts
@@ -34,9 +34,10 @@ function tick_spring<T>(ctx: TickContext<T>, last_value: T, current_value: T, ta
 			tick_spring(ctx, last_value[i], current_value[i], target_value[i]));
 	} else if (typeof current_value === 'object') {
 		const next_value = {};
-		for (const k in current_value)
+		for (const k in current_value) {
 			// @ts-ignore
 			next_value[k] = tick_spring(ctx, last_value[k], current_value[k], target_value[k]);
+		}
 		// @ts-ignore
 		return next_value;
 	} else {
@@ -121,8 +122,9 @@ export function spring<T=any>(value?: T, opts: SpringOpts = {}): Spring<T> {
 				last_value = value;
 				store.set(value = next_value);
 
-				if (ctx.settled)
+				if (ctx.settled) {
 					task = null;
+				}
 				return !ctx.settled;
 			});
 		}
diff --git a/src/runtime/store/index.ts b/src/runtime/store/index.ts
index 2bbfdfcd60..09040487f0 100644
--- a/src/runtime/store/index.ts
+++ b/src/runtime/store/index.ts
@@ -52,7 +52,7 @@ const subscriber_queue = [];
  */
 export function readable<T>(value: T, start: StartStopNotifier<T>): Readable<T> {
 	return {
-		subscribe: writable(value, start).subscribe,
+		subscribe: writable(value, start).subscribe
 	};
 }
 
@@ -184,7 +184,7 @@ export function derived<T>(stores: Stores, fn: Function, initial_value?: T): Rea
 			},
 			() => {
 				pending |= (1 << i);
-			}),
+			})
 		);
 
 		inited = true;
@@ -201,4 +201,4 @@ export function derived<T>(stores: Stores, fn: Function, initial_value?: T): Rea
  * Get the current value from a store by subscribing and immediately unsubscribing.
  * @param store readable
  */
-export { get_store_value as get };
\ No newline at end of file
+export { get_store_value as get };
diff --git a/src/runtime/transition/index.ts b/src/runtime/transition/index.ts
index f1197c0b17..7e879cb941 100644
--- a/src/runtime/transition/index.ts
+++ b/src/runtime/transition/index.ts
@@ -120,7 +120,7 @@ export function slide(node: Element, {
 		duration,
 		easing,
 		css: t =>
-			`overflow: hidden;` +
+			'overflow: hidden;' +
 			`opacity: ${Math.min(t * 20, 1) * opacity};` +
 			`height: ${t * height}px;` +
 			`padding-top: ${t * padding_top}px;` +
diff --git a/test/.eslintrc.json b/test/.eslintrc.json
index d5ba8f9d9c..fc493fa889 100644
--- a/test/.eslintrc.json
+++ b/test/.eslintrc.json
@@ -1,5 +1,6 @@
 {
   "rules": {
-    "no-console": "off"
+    "no-console": "off",
+    "@typescript-eslint/no-var-requires": "off"
   }
 }
diff --git a/test/css/index.js b/test/css/index.ts
similarity index 97%
rename from test/css/index.js
rename to test/css/index.ts
index 81d27a94bf..65b43322b1 100644
--- a/test/css/index.js
+++ b/test/css/index.ts
@@ -1,6 +1,5 @@
-import * as assert from 'assert';
 import * as fs from 'fs';
-import { env, svelte, setupHtmlEqual, shouldUpdateExpected } from '../helpers.js';
+import { assert, env, svelte, setupHtmlEqual, shouldUpdateExpected } from '../helpers';
 
 function try_require(file) {
 	try {
@@ -157,4 +156,4 @@ function read(file) {
 	} catch (err) {
 		return null;
 	}
-}
\ No newline at end of file
+}
diff --git a/test/css/samples/attribute-selector-details-open/expected.css b/test/css/samples/attribute-selector-details-open/expected.css
new file mode 100644
index 0000000000..20543c5c8e
--- /dev/null
+++ b/test/css/samples/attribute-selector-details-open/expected.css
@@ -0,0 +1 @@
+details[open].svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/attribute-selector-details-open/input.svelte b/test/css/samples/attribute-selector-details-open/input.svelte
new file mode 100644
index 0000000000..f8cb70eff7
--- /dev/null
+++ b/test/css/samples/attribute-selector-details-open/input.svelte
@@ -0,0 +1,7 @@
+<details>Hello</details>
+
+<style>
+	details[open] {
+		color: red;
+	}
+</style>
diff --git a/test/css/samples/child-combinator/expected.css b/test/css/samples/child-combinator/expected.css
new file mode 100644
index 0000000000..5d50ae16d7
--- /dev/null
+++ b/test/css/samples/child-combinator/expected.css
@@ -0,0 +1 @@
+main.svelte-xyz button.svelte-xyz.svelte-xyz{background-color:red}main.svelte-xyz div.svelte-xyz>button.svelte-xyz{background-color:blue}
\ No newline at end of file
diff --git a/test/css/samples/child-combinator/input.svelte b/test/css/samples/child-combinator/input.svelte
new file mode 100644
index 0000000000..9d5d8d27e0
--- /dev/null
+++ b/test/css/samples/child-combinator/input.svelte
@@ -0,0 +1,14 @@
+<style>
+  main button {
+    background-color: red;
+  }
+
+  main div > button {
+    background-color: blue;
+  }
+</style>
+<main>
+  <div>
+    <button type="submit">Blue</button>
+  </div>
+</main>
\ No newline at end of file
diff --git a/test/css/samples/empty-class/_config.js b/test/css/samples/empty-class/_config.js
index 064de4a564..ef5c5c1cc5 100644
--- a/test/css/samples/empty-class/_config.js
+++ b/test/css/samples/empty-class/_config.js
@@ -1,7 +1,7 @@
 export default {
 	warnings: [{
-		filename: "SvelteComponent.svelte",
-		code: `css-unused-selector`,
+		filename: 'SvelteComponent.svelte',
+		code: 'css-unused-selector',
 		message: 'Unused CSS selector ".x"',
 		start: {
 			line: 4,
@@ -22,4 +22,4 @@ export default {
 			5:     color: red;
 			6:   }`
 	}]
-};
\ No newline at end of file
+};
diff --git a/test/css/samples/empty-rule-dev/_config.js b/test/css/samples/empty-rule-dev/_config.js
index bdadb774d1..5b9d5ecf1a 100644
--- a/test/css/samples/empty-rule-dev/_config.js
+++ b/test/css/samples/empty-rule-dev/_config.js
@@ -2,4 +2,4 @@ export default {
 	compileOptions: {
 		dev: true
 	}
-};
\ No newline at end of file
+};
diff --git a/test/css/samples/general-siblings-combinator-await-not-exhaustive/_config.js b/test/css/samples/general-siblings-combinator-await-not-exhaustive/_config.js
new file mode 100644
index 0000000000..c81f1a9f82
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-await-not-exhaustive/_config.js
@@ -0,0 +1,3 @@
+export default {
+	warnings: []
+};
diff --git a/test/css/samples/general-siblings-combinator-await-not-exhaustive/expected.css b/test/css/samples/general-siblings-combinator-await-not-exhaustive/expected.css
new file mode 100644
index 0000000000..54eefc6088
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-await-not-exhaustive/expected.css
@@ -0,0 +1 @@
+.a.svelte-xyz~.b.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~.c.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~.d.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~.e.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~.f.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~.g.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~.h.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.b.svelte-xyz~.d.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz~.d.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.b.svelte-xyz~.e.svelte-xyz~.f.svelte-xyz~.h.svelte-xyz{color:green}.b.svelte-xyz~.d.svelte-xyz~.h.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz~.g.svelte-xyz.svelte-xyz.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-await-not-exhaustive/expected.html b/test/css/samples/general-siblings-combinator-await-not-exhaustive/expected.html
new file mode 100644
index 0000000000..de97b02a5e
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-await-not-exhaustive/expected.html
@@ -0,0 +1,4 @@
+<div class="a svelte-xyz"></div>
+<div class="d svelte-xyz"></div>
+<div class="f svelte-xyz"></div>
+<div class="h svelte-xyz"></div>
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-await-not-exhaustive/input.svelte b/test/css/samples/general-siblings-combinator-await-not-exhaustive/input.svelte
new file mode 100644
index 0000000000..a677077c33
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-await-not-exhaustive/input.svelte
@@ -0,0 +1,41 @@
+<script>
+	let promise = Promise.resolve();
+</script>
+
+<style>
+	.a ~ .b { color: green; }
+	.a ~ .c { color: green; }
+	.a ~ .d { color: green; }
+	.a ~ .e { color: green; }
+	.a ~ .f { color: green; }
+	.a ~ .g { color: green; }
+	.a ~ .h { color: green; }
+	
+	.b ~ .d { color: green; }
+	.c ~ .d { color: green; }
+	.b ~ .e ~ .f ~ .h { color: green; }
+	.b ~ .d ~ .h { color: green; }
+	.c ~ .g { color: green; }
+</style>
+
+<div class="a" />
+
+{#await promise then value}
+	<div class="b" />
+{:catch error}
+	<div class="c" />
+{/await}
+
+{#await promise}
+	<div class="d" />
+{:catch error}
+	<div class="e" />
+{/await}
+
+{#await promise}
+	<div class="f" />
+{:then error}
+	<div class="g" />
+{/await}
+
+<div class="h" />
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-await/_config.js b/test/css/samples/general-siblings-combinator-await/_config.js
new file mode 100644
index 0000000000..5892e32972
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-await/_config.js
@@ -0,0 +1,46 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				13:
+				14:   /* no match */
+				15:   .b ~ .c { color: green; }
+				      ^
+				16:   .c ~ .d { color: green; }
+				17:   .b ~ .d { color: green; }`,
+			message: 'Unused CSS selector ".b ~ .c"',
+			pos: 269,
+			start: { character: 269, column: 1, line: 15 },
+			end: { character: 276, column: 8, line: 15 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				14:   /* no match */
+				15:   .b ~ .c { color: green; }
+				16:   .c ~ .d { color: green; }
+				      ^
+				17:   .b ~ .d { color: green; }
+				18: </style>`,
+			message: 'Unused CSS selector ".c ~ .d"',
+			pos: 296,
+			start: { character: 296, column: 1, line: 16 },
+			end: { character: 303, column: 8, line: 16 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				15:   .b ~ .c { color: green; }
+				16:   .c ~ .d { color: green; }
+				17:   .b ~ .d { color: green; }
+				      ^
+				18: </style>
+				19:`,
+			message: 'Unused CSS selector ".b ~ .d"',
+			pos: 323,
+			start: { character: 323, column: 1, line: 17 },
+			end: { character: 330, column: 8, line: 17 }
+		}
+	]
+};
diff --git a/test/css/samples/general-siblings-combinator-await/expected.css b/test/css/samples/general-siblings-combinator-await/expected.css
new file mode 100644
index 0000000000..94a5494597
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-await/expected.css
@@ -0,0 +1 @@
+.a.svelte-xyz~.b.svelte-xyz{color:green}.a.svelte-xyz~.c.svelte-xyz{color:green}.a.svelte-xyz~.d.svelte-xyz{color:green}.b.svelte-xyz~.e.svelte-xyz{color:green}.c.svelte-xyz~.e.svelte-xyz{color:green}.d.svelte-xyz~.e.svelte-xyz{color:green}.a.svelte-xyz~.e.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-await/expected.html b/test/css/samples/general-siblings-combinator-await/expected.html
new file mode 100644
index 0000000000..3d8ac9f966
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-await/expected.html
@@ -0,0 +1,3 @@
+<div class="a svelte-xyz"></div>
+<div class="b svelte-xyz"></div>
+<div class="e svelte-xyz"></div>
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-await/input.svelte b/test/css/samples/general-siblings-combinator-await/input.svelte
new file mode 100644
index 0000000000..8aeadab170
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-await/input.svelte
@@ -0,0 +1,30 @@
+<script>
+	let promise = Promise.resolve();
+</script>
+
+<style>
+	.a ~ .b { color: green; }
+	.a ~ .c { color: green; }
+	.a ~ .d { color: green; }
+	.b ~ .e { color: green; }
+	.c ~ .e { color: green; }
+	.d ~ .e { color: green; }
+	.a ~ .e { color: green; }
+
+	/* no match */
+	.b ~ .c { color: green; }
+	.c ~ .d { color: green; }
+	.b ~ .d { color: green; }
+</style>
+
+<div class="a" />
+
+{#await promise}
+	<div class="b" />
+{:then value}
+	<div class="c" />
+{:catch error}
+	<div class="d" />
+{/await}
+
+<div class="e" />
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-each-2/_config.js b/test/css/samples/general-siblings-combinator-each-2/_config.js
new file mode 100644
index 0000000000..c81f1a9f82
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each-2/_config.js
@@ -0,0 +1,3 @@
+export default {
+	warnings: []
+};
diff --git a/test/css/samples/general-siblings-combinator-each-2/expected.css b/test/css/samples/general-siblings-combinator-each-2/expected.css
new file mode 100644
index 0000000000..d197058b24
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each-2/expected.css
@@ -0,0 +1 @@
+.a.svelte-xyz~.b.svelte-xyz{color:green}.c.svelte-xyz~.d.svelte-xyz{color:green}.a.svelte-xyz~.d.svelte-xyz{color:green}.c.svelte-xyz~.b.svelte-xyz{color:green}.b.svelte-xyz~.c.svelte-xyz{color:green}.a.svelte-xyz~.c.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-each-2/expected.html b/test/css/samples/general-siblings-combinator-each-2/expected.html
new file mode 100644
index 0000000000..331a5e4317
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each-2/expected.html
@@ -0,0 +1,4 @@
+<div class="a svelte-xyz"></div>
+<div class="b svelte-xyz"></div>
+<div class="c svelte-xyz"></div>
+<div class="d svelte-xyz"></div>
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-each-2/input.svelte b/test/css/samples/general-siblings-combinator-each-2/input.svelte
new file mode 100644
index 0000000000..5bbdbdef66
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each-2/input.svelte
@@ -0,0 +1,37 @@
+<script>
+	let array = [1];
+</script>
+
+<style>
+	/* boundary of each */
+	.a ~ .b {
+		color: green;
+	}
+	.c ~ .d {
+		color: green;
+	}
+	/* if array is empty */
+	.a ~ .d {
+		color: green;
+	}
+	/* if array has multiple items */
+	.c ~ .b {
+		color: green;
+	}
+	/* normal sibling */
+	.b ~ .c {
+		color: green;
+	}
+	.a ~ .c {
+		color: green;
+	}
+</style>
+
+<div class="a" />
+
+{#each array as item}
+	<div class="b" />
+	<div class="c" />
+{/each}
+
+<div class="d" />
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-each-else-nested/_config.js b/test/css/samples/general-siblings-combinator-each-else-nested/_config.js
new file mode 100644
index 0000000000..cd5cb14a66
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each-else-nested/_config.js
@@ -0,0 +1,18 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				33:
+				34:   /* no match */
+				35:   .e ~ .f { color: green; }
+				      ^
+				36: </style>
+				37:`,
+			message: 'Unused CSS selector ".e ~ .f"',
+			pos: 812,
+			start: { character: 812, column: 1, line: 35 },
+			end: { character: 819, column: 8, line: 35 }
+		}
+	]
+};
diff --git a/test/css/samples/general-siblings-combinator-each-else-nested/expected.css b/test/css/samples/general-siblings-combinator-each-else-nested/expected.css
new file mode 100644
index 0000000000..b055f35ecd
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each-else-nested/expected.css
@@ -0,0 +1 @@
+.a.svelte-xyz~.e.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~.f.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.b.svelte-xyz~.c.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.b.svelte-xyz~.d.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz~.e.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz~.f.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.d.svelte-xyz~.e.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.d.svelte-xyz~.f.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.e.svelte-xyz~.e.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.i.svelte-xyz~.j.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.g.svelte-xyz~.h.svelte-xyz~.j.svelte-xyz.svelte-xyz{color:green}.g.svelte-xyz~.i.svelte-xyz~.j.svelte-xyz.svelte-xyz{color:green}.m.svelte-xyz~.m.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.m.svelte-xyz~.l.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.l.svelte-xyz~.m.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~.c.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~.g.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.b.svelte-xyz~.e.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz~.g.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz~.k.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.d.svelte-xyz~.d.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.g.svelte-xyz~.g.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.h.svelte-xyz~.h.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.i.svelte-xyz~.i.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.j.svelte-xyz~.j.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.g.svelte-xyz~.j.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.g.svelte-xyz~.h.svelte-xyz~.i.svelte-xyz~.j.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-each-else-nested/expected.html b/test/css/samples/general-siblings-combinator-each-else-nested/expected.html
new file mode 100644
index 0000000000..67dd05f677
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each-else-nested/expected.html
@@ -0,0 +1,3 @@
+<div class="a svelte-xyz"></div>
+<div class="f svelte-xyz"></div>
+<div class="k svelte-xyz"></div>
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-each-else-nested/input.svelte b/test/css/samples/general-siblings-combinator-each-else-nested/input.svelte
new file mode 100644
index 0000000000..63a1123708
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each-else-nested/input.svelte
@@ -0,0 +1,77 @@
+<script>
+	let array = [];
+</script>
+
+<style>
+	.a ~ .e { color: green; }
+	.a ~ .f { color: green; }
+	.b ~ .c { color: green; }
+	.b ~ .d { color: green; }
+	.c ~ .e { color: green; }
+	.c ~ .f { color: green; }
+	.d ~ .e { color: green; }
+	.d ~ .f { color: green; }
+	.e ~ .e { color: green; }
+	.i ~ .j { color: green; }
+	.g ~ .h ~ .j { color: green; }
+	.g ~ .i ~ .j { color: green; }
+	.m ~ .m { color: green; }
+	.m ~ .l { color: green; }
+	.l ~ .m { color: green; }
+	.a ~ .c { color: green; }
+	.a ~ .g { color: green; }
+	.b ~ .e { color: green; }
+	.c ~ .g { color: green; }
+	.c ~ .k { color: green; }
+	.d ~ .d { color: green; }
+	.g ~ .g { color: green; }
+	.h ~ .h { color: green; }
+	.i ~ .i { color: green; }
+	.j ~ .j { color: green; }
+	.g ~ .j { color: green; }
+	.g ~ .h ~ .i ~ .j { color: green; }
+
+	/* no match */
+	.e ~ .f { color: green; }
+</style>
+
+<div class="a" />
+
+{#each array as a}
+	<div class="b" />
+	{#each array as b}
+		<div class="c" />
+	{:else}
+		<div class="d" />
+	{/each}
+{/each}
+
+{#each array as c}
+	{#each array as d}
+		<div class="e" />
+	{/each}
+{:else}
+	<div class="f" />
+{/each}
+
+{#each array as x}
+	<div class="g" />
+	{#each array as y}
+		{#each array as z}
+			<div class="h" />
+		{/each}
+	{:else}
+		<div class="i" />
+	{/each}
+	<div class="j" />
+{/each}
+
+<div class="k" />
+
+{#each array as item}
+	{#each array as item}
+		<div class="l" />
+	{:else}
+		<div class="m" />
+	{/each}
+{/each}
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-each-else/_config.js b/test/css/samples/general-siblings-combinator-each-else/_config.js
new file mode 100644
index 0000000000..410a4d0ac7
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each-else/_config.js
@@ -0,0 +1,18 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				11:
+				12:   /* no match */
+				13:   .b ~ .c { color: green; }
+				      ^
+				14: </style>
+				15:`,
+			message: 'Unused CSS selector ".b ~ .c"',
+			pos: 199,
+			start: { character: 199, column: 1, line: 13 },
+			end: { character: 206, column: 8, line: 13 }
+		}
+	]
+};
diff --git a/test/css/samples/general-siblings-combinator-each-else/expected.css b/test/css/samples/general-siblings-combinator-each-else/expected.css
new file mode 100644
index 0000000000..31fafa3243
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each-else/expected.css
@@ -0,0 +1 @@
+.a.svelte-xyz~.b.svelte-xyz{color:green}.a.svelte-xyz~.c.svelte-xyz{color:green}.b.svelte-xyz~.d.svelte-xyz{color:green}.c.svelte-xyz~.d.svelte-xyz{color:green}.a.svelte-xyz~.d.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-each-else/expected.html b/test/css/samples/general-siblings-combinator-each-else/expected.html
new file mode 100644
index 0000000000..fb838a55fd
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each-else/expected.html
@@ -0,0 +1,3 @@
+<div class="a svelte-xyz"></div>
+<div class="c svelte-xyz"></div>
+<div class="d svelte-xyz"></div>
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-each-else/input.svelte b/test/css/samples/general-siblings-combinator-each-else/input.svelte
new file mode 100644
index 0000000000..5cd78853ca
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each-else/input.svelte
@@ -0,0 +1,24 @@
+<script>
+	let array = [];
+</script>
+
+<style>
+	.a ~ .b { color: green; }
+	.a ~ .c { color: green; }
+	.b ~ .d { color: green; }
+	.c ~ .d { color: green; }
+	.a ~ .d { color: green; }
+	
+	/* no match */
+	.b ~ .c { color: green; }
+</style>
+
+<div class="a" />
+
+{#each array as item}
+	<div class="b" />
+{:else}
+	<div class="c" />
+{/each}
+
+<div class="d" />
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-each-nested/_config.js b/test/css/samples/general-siblings-combinator-each-nested/_config.js
new file mode 100644
index 0000000000..c81f1a9f82
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each-nested/_config.js
@@ -0,0 +1,3 @@
+export default {
+	warnings: []
+};
diff --git a/test/css/samples/general-siblings-combinator-each-nested/expected.css b/test/css/samples/general-siblings-combinator-each-nested/expected.css
new file mode 100644
index 0000000000..5bf1f832ae
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each-nested/expected.css
@@ -0,0 +1 @@
+.a.svelte-xyz~.d.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~.e.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~.f.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~.g.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz~.d.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz~.e.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz~.f.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz~.g.svelte-xyz.svelte-xyz{color:green}.j.svelte-xyz~.m.svelte-xyz.svelte-xyz{color:green}.j.svelte-xyz~.n.svelte-xyz.svelte-xyz{color:green}.j.svelte-xyz~.o.svelte-xyz.svelte-xyz{color:green}.k.svelte-xyz~.m.svelte-xyz.svelte-xyz{color:green}.k.svelte-xyz~.n.svelte-xyz.svelte-xyz{color:green}.k.svelte-xyz~.o.svelte-xyz.svelte-xyz{color:green}.l.svelte-xyz~.m.svelte-xyz.svelte-xyz{color:green}.l.svelte-xyz~.n.svelte-xyz.svelte-xyz{color:green}.l.svelte-xyz~.o.svelte-xyz.svelte-xyz{color:green}.d.svelte-xyz~.e.svelte-xyz.svelte-xyz{color:green}.e.svelte-xyz~.f.svelte-xyz.svelte-xyz{color:green}.g.svelte-xyz~.h.svelte-xyz.svelte-xyz{color:green}.f.svelte-xyz~.d.svelte-xyz.svelte-xyz{color:green}.f.svelte-xyz~.e.svelte-xyz.svelte-xyz{color:green}.f.svelte-xyz~.f.svelte-xyz.svelte-xyz{color:green}.h.svelte-xyz~.g.svelte-xyz.svelte-xyz{color:green}.i.svelte-xyz~.h.svelte-xyz.svelte-xyz{color:green}.i.svelte-xyz~.g.svelte-xyz.svelte-xyz{color:green}.d.svelte-xyz~.d.svelte-xyz.svelte-xyz{color:green}.e.svelte-xyz~.e.svelte-xyz.svelte-xyz{color:green}.f.svelte-xyz~.f.svelte-xyz.svelte-xyz{color:green}.g.svelte-xyz~.g.svelte-xyz.svelte-xyz{color:green}.h.svelte-xyz~.h.svelte-xyz.svelte-xyz{color:green}.i.svelte-xyz~.i.svelte-xyz.svelte-xyz{color:green}.e.svelte-xyz~.e.svelte-xyz~.f.svelte-xyz{color:green}.e.svelte-xyz~.e.svelte-xyz~.d.svelte-xyz{color:green}.h.svelte-xyz~.h.svelte-xyz~.i.svelte-xyz{color:green}.h.svelte-xyz~.h.svelte-xyz~.g.svelte-xyz{color:green}.a.svelte-xyz~.h.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~.i.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz~.h.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz~.i.svelte-xyz.svelte-xyz{color:green}.d.svelte-xyz~.f.svelte-xyz.svelte-xyz{color:green}.d.svelte-xyz~.g.svelte-xyz.svelte-xyz{color:green}.e.svelte-xyz~.g.svelte-xyz.svelte-xyz{color:green}.g.svelte-xyz~.i.svelte-xyz.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-each-nested/expected.html b/test/css/samples/general-siblings-combinator-each-nested/expected.html
new file mode 100644
index 0000000000..340d6fc4c8
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each-nested/expected.html
@@ -0,0 +1,15 @@
+<div class="a svelte-xyz"></div>
+<div class="b"></div>
+<div class="c svelte-xyz"></div>
+<div class="d svelte-xyz"></div>
+<div class="e svelte-xyz"></div>
+<div class="f svelte-xyz"></div>
+<div class="g svelte-xyz"></div>
+<div class="h svelte-xyz"></div>
+<div class="i svelte-xyz"></div>
+<div class="j svelte-xyz"></div>
+<div class="k svelte-xyz"></div>
+<div class="l svelte-xyz"></div>
+<div class="m svelte-xyz"></div>
+<div class="n svelte-xyz"></div>
+<div class="o svelte-xyz"></div>
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-each-nested/input.svelte b/test/css/samples/general-siblings-combinator-each-nested/input.svelte
new file mode 100644
index 0000000000..b7c7377015
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each-nested/input.svelte
@@ -0,0 +1,113 @@
+<script>
+	let array = [1];
+</script>
+
+<style>
+	/* boundary of each */
+	.a ~ .d { color: green; }
+	.a ~ .e { color: green; }
+	.a ~ .f { color: green; }
+	.a ~ .g { color: green; }
+	.c ~ .d { color: green; }
+	.c ~ .e { color: green; }
+	.c ~ .f { color: green; }
+	.c ~ .g { color: green; }
+
+	/* nested boundary of each */
+	.j ~ .m { color: green; }
+	.j ~ .n { color: green; }
+	.j ~ .o { color: green; }
+	.k ~ .m { color: green; }
+	.k ~ .n { color: green; }
+	.k ~ .o { color: green; }
+	.l ~ .m { color: green; }
+	.l ~ .n { color: green; }
+	.l ~ .o { color: green; }
+
+	/* parent each */
+	.d ~ .e { color: green; }
+	.e ~ .f { color: green; }
+
+	/* child each */
+	.g ~ .h { color: green; }
+
+	/* wrap around */
+	.f ~ .d { color: green; }
+	.f ~ .e { color: green; }
+	.f ~ .f { color: green; }
+
+	.h ~ .g { color: green; }
+	.i ~ .h { color: green; }
+	.i ~ .g { color: green; }
+
+	/* wrap around self */
+	.d ~ .d { color: green; }
+	.e ~ .e { color: green; }
+	.f ~ .f { color: green; }
+	.g ~ .g { color: green; }
+	.h ~ .h { color: green; }
+	.i ~ .i { color: green; }
+
+	/* wrap around self ~ next */
+	.e ~ .e ~ .f { color: green; }
+	.e ~ .e ~ .d { color: green; }
+	.h ~ .h ~ .i { color: green; }
+	.h ~ .h ~ .g { color: green; }
+
+	/* general siblings */
+	.a ~ .h { color: green; }
+	.a ~ .i { color: green; }
+	.c ~ .h { color: green; }
+	.c ~ .i { color: green; }
+	.d ~ .f { color: green; }
+	.d ~ .g { color: green; }
+	.e ~ .g { color: green; }
+	.g ~ .i { color: green; }
+</style>
+
+<div class="a" />
+
+{#each array as item}
+	<div class="b" />
+	<div class="c" />
+{/each}
+
+{#each array as item}
+	{#each array as item}
+		{#each array as item}
+			<div class="d" />
+		{/each}
+		<div class="e" />
+	{/each}
+	<div class="f" />
+{/each}
+
+{#each array as item}
+	<div class="g" />
+	{#each array as item}
+		<div class="h" />
+		{#each array as item}
+			<div class="i" />
+		{/each}
+	{/each}
+{/each}
+
+{#each array as item}
+	<div class="j" />
+	{#each array as item}
+		<div class="k" />
+		{#each array as item}
+			<div class="l" />
+		{/each}
+	{/each}
+{/each}
+
+{#each array as item}
+	{#each array as item}
+		{#each array as item}
+			<div class="m" />
+		{/each}
+		<div class="n" />
+	{/each}
+	<div class="o" />
+{/each}
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-each/expected.css b/test/css/samples/general-siblings-combinator-each/expected.css
new file mode 100644
index 0000000000..8c48251bdd
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each/expected.css
@@ -0,0 +1 @@
+div.svelte-xyz~span.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-each/expected.html b/test/css/samples/general-siblings-combinator-each/expected.html
new file mode 100644
index 0000000000..9d0416f01b
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each/expected.html
@@ -0,0 +1,6 @@
+<div class="svelte-xyz"></div>
+<span class="each svelte-xyz"></span>
+<div class="each svelte-xyz"></div>
+<span class="each svelte-xyz"></span>
+<div class="each svelte-xyz"></div>
+<span class="svelte-xyz"></span>
diff --git a/test/css/samples/general-siblings-combinator-each/input.svelte b/test/css/samples/general-siblings-combinator-each/input.svelte
new file mode 100644
index 0000000000..ce65da109d
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-each/input.svelte
@@ -0,0 +1,20 @@
+<script>
+	let array = [1];
+</script>
+
+<style>
+	div ~ span {
+		color: green;
+	}
+</style>
+
+<div />
+
+{#each array as item}
+	<span class="each" />
+	<div class="each" />
+	<span class="each" />
+	<div class="each" />
+{/each}
+
+<span />
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-if-not-exhaustive-with-each/_config.js b/test/css/samples/general-siblings-combinator-if-not-exhaustive-with-each/_config.js
new file mode 100644
index 0000000000..a4c915f421
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-if-not-exhaustive-with-each/_config.js
@@ -0,0 +1,18 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				16:
+				17:   /* no match */
+				18:   .b ~ .c { color: green; }
+				      ^
+				19: </style>
+				20:`,
+			message: 'Unused CSS selector ".b ~ .c"',
+			pos: 319,
+			start: { character: 319, column: 1, line: 18 },
+			end: { character: 326, column: 8, line: 18 }
+		}
+	]
+};
diff --git a/test/css/samples/general-siblings-combinator-if-not-exhaustive-with-each/expected.css b/test/css/samples/general-siblings-combinator-if-not-exhaustive-with-each/expected.css
new file mode 100644
index 0000000000..e6a974efca
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-if-not-exhaustive-with-each/expected.css
@@ -0,0 +1 @@
+.a.svelte-xyz~.b.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~.c.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~.d.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.b.svelte-xyz~.d.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz~.d.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~.c.svelte-xyz~.c.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz~.c.svelte-xyz~.d.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~.c.svelte-xyz~.c.svelte-xyz~.d.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-if-not-exhaustive-with-each/expected.html b/test/css/samples/general-siblings-combinator-if-not-exhaustive-with-each/expected.html
new file mode 100644
index 0000000000..fb838a55fd
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-if-not-exhaustive-with-each/expected.html
@@ -0,0 +1,3 @@
+<div class="a svelte-xyz"></div>
+<div class="c svelte-xyz"></div>
+<div class="d svelte-xyz"></div>
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-if-not-exhaustive-with-each/input.svelte b/test/css/samples/general-siblings-combinator-if-not-exhaustive-with-each/input.svelte
new file mode 100644
index 0000000000..2b53f7b5b8
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-if-not-exhaustive-with-each/input.svelte
@@ -0,0 +1,31 @@
+<script>
+	let foo = false;
+	let array = [1];
+</script>
+
+<style>
+	.a ~ .b { color: green; }
+	.a ~ .c { color: green; }
+	.a ~ .d { color: green; }
+	.b ~ .d { color: green; }
+	.c ~ .d { color: green; }
+
+	.a ~ .c ~ .c { color: green; }
+	.c ~ .c ~ .d { color: green; }
+	.a ~ .c ~ .c ~ .d { color: green; }
+
+	/* no match */
+	.b ~ .c { color: green; }
+</style>
+
+<div class="a" />
+
+{#if foo}
+	<div class="b" />
+{:else}
+	{#each array as item}
+		<div class="c" />
+	{/each}
+{/if}
+
+<div class="d" />
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-if-not-exhaustive/_config.js b/test/css/samples/general-siblings-combinator-if-not-exhaustive/_config.js
new file mode 100644
index 0000000000..2f3067b262
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-if-not-exhaustive/_config.js
@@ -0,0 +1,18 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				12:
+				13:   /* no match */
+				14:   .b ~ .c { color: green; }
+				      ^
+				15: </style>
+				16:`,
+			message: 'Unused CSS selector ".b ~ .c"',
+			pos: 215,
+			start: { character: 215, column: 1, line: 14 },
+			end: { character: 222, column: 8, line: 14 }
+		}
+	]
+};
diff --git a/test/css/samples/general-siblings-combinator-if-not-exhaustive/expected.css b/test/css/samples/general-siblings-combinator-if-not-exhaustive/expected.css
new file mode 100644
index 0000000000..dc7ee1b62b
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-if-not-exhaustive/expected.css
@@ -0,0 +1 @@
+.a.svelte-xyz~.b.svelte-xyz{color:green}.a.svelte-xyz~.c.svelte-xyz{color:green}.a.svelte-xyz~.d.svelte-xyz{color:green}.b.svelte-xyz~.d.svelte-xyz{color:green}.c.svelte-xyz~.d.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-if-not-exhaustive/expected.html b/test/css/samples/general-siblings-combinator-if-not-exhaustive/expected.html
new file mode 100644
index 0000000000..813e778dc6
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-if-not-exhaustive/expected.html
@@ -0,0 +1,3 @@
+<div class="a svelte-xyz"></div>
+<div class="b svelte-xyz"></div>
+<div class="d svelte-xyz"></div>
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-if-not-exhaustive/input.svelte b/test/css/samples/general-siblings-combinator-if-not-exhaustive/input.svelte
new file mode 100644
index 0000000000..3e5c5af7a2
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-if-not-exhaustive/input.svelte
@@ -0,0 +1,25 @@
+<script>
+	let foo = true;
+	let bar = true;
+</script>
+
+<style>
+	.a ~ .b { color: green; }
+	.a ~ .c { color: green; }
+	.a ~ .d { color: green; }
+	.b ~ .d { color: green; }
+	.c ~ .d { color: green; }
+
+	/* no match */
+	.b ~ .c { color: green; }
+</style>
+
+<div class="a" />
+
+{#if foo}
+	<div class="b" />
+{:else if bar}
+	<div class="c" />
+{/if}
+
+<div class="d" />
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-if/_config.js b/test/css/samples/general-siblings-combinator-if/_config.js
new file mode 100644
index 0000000000..c2eb0503cd
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-if/_config.js
@@ -0,0 +1,46 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				14:
+				15:   /* no match */
+				16:   .b ~ .c { color: green; }
+				      ^
+				17:   .b ~ .d { color: green; }
+				18:   .c ~ .d { color: green; }`,
+			message: 'Unused CSS selector ".b ~ .c"',
+			pos: 269,
+			start: { character: 269, column: 1, line: 16 },
+			end: { character: 276, column: 8, line: 16 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				15:   /* no match */
+				16:   .b ~ .c { color: green; }
+				17:   .b ~ .d { color: green; }
+				      ^
+				18:   .c ~ .d { color: green; }
+				19: </style>`,
+			message: 'Unused CSS selector ".b ~ .d"',
+			pos: 296,
+			start: { character: 296, column: 1, line: 17 },
+			end: { character: 303, column: 8, line: 17 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				16:   .b ~ .c { color: green; }
+				17:   .b ~ .d { color: green; }
+				18:   .c ~ .d { color: green; }
+				      ^
+				19: </style>
+				20:`,
+			message: 'Unused CSS selector ".c ~ .d"',
+			pos: 323,
+			start: { character: 323, column: 1, line: 18 },
+			end: { character: 330, column: 8, line: 18 }
+		}
+	]
+};
diff --git a/test/css/samples/general-siblings-combinator-if/expected.css b/test/css/samples/general-siblings-combinator-if/expected.css
new file mode 100644
index 0000000000..94a5494597
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-if/expected.css
@@ -0,0 +1 @@
+.a.svelte-xyz~.b.svelte-xyz{color:green}.a.svelte-xyz~.c.svelte-xyz{color:green}.a.svelte-xyz~.d.svelte-xyz{color:green}.b.svelte-xyz~.e.svelte-xyz{color:green}.c.svelte-xyz~.e.svelte-xyz{color:green}.d.svelte-xyz~.e.svelte-xyz{color:green}.a.svelte-xyz~.e.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-if/expected.html b/test/css/samples/general-siblings-combinator-if/expected.html
new file mode 100644
index 0000000000..3d8ac9f966
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-if/expected.html
@@ -0,0 +1,3 @@
+<div class="a svelte-xyz"></div>
+<div class="b svelte-xyz"></div>
+<div class="e svelte-xyz"></div>
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-if/input.svelte b/test/css/samples/general-siblings-combinator-if/input.svelte
new file mode 100644
index 0000000000..fca5499f2e
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-if/input.svelte
@@ -0,0 +1,31 @@
+<script>
+	let foo = true;
+	let bar = true;
+</script>
+
+<style>
+	.a ~ .b { color: green; }
+	.a ~ .c { color: green; }
+	.a ~ .d { color: green; }
+	.b ~ .e { color: green; }
+	.c ~ .e { color: green; }
+	.d ~ .e { color: green; }
+	.a ~ .e { color: green; }
+
+	/* no match */
+	.b ~ .c { color: green; }
+	.b ~ .d { color: green; }
+	.c ~ .d { color: green; }
+</style>
+
+<div class="a" />
+
+{#if foo}
+	<div class="b" />
+{:else if bar}
+	<div class="c" />
+{:else}
+	<div class="d" />
+{/if}
+
+<div class="e" />
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-slot/_config.js b/test/css/samples/general-siblings-combinator-slot/_config.js
new file mode 100644
index 0000000000..5d8747d4f1
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-slot/_config.js
@@ -0,0 +1,88 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				 8:
+				 9:   /* no match */
+				10:   .a ~ .b { color: green; }
+				      ^
+				11:   .b ~ .c { color: green; }
+				12:   .c ~ .f { color: green; }`,
+			message: 'Unused CSS selector ".a ~ .b"',
+			pos: 111,
+			start: { character: 111, column: 1, line: 10 },
+			end: { character: 118, column: 8, line: 10 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				 9:   /* no match */
+				10:   .a ~ .b { color: green; }
+				11:   .b ~ .c { color: green; }
+				      ^
+				12:   .c ~ .f { color: green; }
+				13:   .f ~ .g { color: green; }`,
+			message: 'Unused CSS selector ".b ~ .c"',
+			pos: 138,
+			start: { character: 138, column: 1, line: 11 },
+			end: { character: 145, column: 8, line: 11 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				10:   .a ~ .b { color: green; }
+				11:   .b ~ .c { color: green; }
+				12:   .c ~ .f { color: green; }
+				      ^
+				13:   .f ~ .g { color: green; }
+				14:   .b ~ .f { color: green; }`,
+			message: 'Unused CSS selector ".c ~ .f"',
+			pos: 165,
+			start: { character: 165, column: 1, line: 12 },
+			end: { character: 172, column: 8, line: 12 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				11:   .b ~ .c { color: green; }
+				12:   .c ~ .f { color: green; }
+				13:   .f ~ .g { color: green; }
+				      ^
+				14:   .b ~ .f { color: green; }
+				15:   .b ~ .g { color: green; }`,
+			message: 'Unused CSS selector ".f ~ .g"',
+			pos: 192,
+			start: { character: 192, column: 1, line: 13 },
+			end: { character: 199, column: 8, line: 13 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				12:   .c ~ .f { color: green; }
+				13:   .f ~ .g { color: green; }
+				14:   .b ~ .f { color: green; }
+				      ^
+				15:   .b ~ .g { color: green; }
+				16: </style>`,
+			message: 'Unused CSS selector ".b ~ .f"',
+			pos: 219,
+			start: { character: 219, column: 1, line: 14 },
+			end: { character: 226, column: 8, line: 14 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				13:   .f ~ .g { color: green; }
+				14:   .b ~ .f { color: green; }
+				15:   .b ~ .g { color: green; }
+				      ^
+				16: </style>
+				17:`,
+			message: 'Unused CSS selector ".b ~ .g"',
+			pos: 246,
+			start: { character: 246, column: 1, line: 15 },
+			end: { character: 253, column: 8, line: 15 }
+		}
+	]
+};
diff --git a/test/css/samples/general-siblings-combinator-slot/expected.css b/test/css/samples/general-siblings-combinator-slot/expected.css
new file mode 100644
index 0000000000..29325e0cef
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-slot/expected.css
@@ -0,0 +1 @@
+.d.svelte-xyz~.e.svelte-xyz{color:green}.a.svelte-xyz~.g.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-slot/input.svelte b/test/css/samples/general-siblings-combinator-slot/input.svelte
new file mode 100644
index 0000000000..e5af4c0962
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-slot/input.svelte
@@ -0,0 +1,30 @@
+<script>
+	let App;
+</script>
+
+<style>
+	.d ~ .e { color: green; }
+	.a ~ .g { color: green; }
+	
+	/* no match */
+	.a ~ .b { color: green; }
+	.b ~ .c { color: green; }
+	.c ~ .f { color: green; }
+	.f ~ .g { color: green; }
+	.b ~ .f { color: green; }
+	.b ~ .g { color: green; }
+</style>
+
+<div class="a" />
+<App>
+	<div class="b" slot="a" />
+
+	<div class="c" slot="b">
+		<div class="d" />
+		<div class="e" />
+	</div>
+
+	<div class="f" slot="c" />
+</App>
+
+<div class="g" />
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-star/_config.js b/test/css/samples/general-siblings-combinator-star/_config.js
new file mode 100644
index 0000000000..0079310544
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-star/_config.js
@@ -0,0 +1,18 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				3:     margin-left: 4px;
+				4:   }
+				5:   .not-match > * ~ * {
+				     ^
+				6:     margin-left: 4px;
+				7:   }`,
+			message: 'Unused CSS selector ".not-match > * ~ *"',
+			pos: 50,
+			start: { character: 50, column: 1, line: 5 },
+      end: { character: 68, column: 19, line: 5 }
+		}
+	]
+};
diff --git a/test/css/samples/general-siblings-combinator-star/expected.css b/test/css/samples/general-siblings-combinator-star/expected.css
new file mode 100644
index 0000000000..de947fa47e
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-star/expected.css
@@ -0,0 +1 @@
+.match.svelte-xyz>.svelte-xyz~.svelte-xyz{margin-left:4px}
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-star/expected.html b/test/css/samples/general-siblings-combinator-star/expected.html
new file mode 100644
index 0000000000..1cfae6e6f7
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-star/expected.html
@@ -0,0 +1,7 @@
+<div class="not-match">
+  <div></div>
+</div>
+<div class="match svelte-xyz">
+  <div class="svelte-xyz"></div>
+  <div class="svelte-xyz"></div>
+</div>
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator-star/input.svelte b/test/css/samples/general-siblings-combinator-star/input.svelte
new file mode 100644
index 0000000000..a069685d4f
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator-star/input.svelte
@@ -0,0 +1,17 @@
+<style>
+	.match > * ~ * {
+		margin-left: 4px;
+	}
+	.not-match > * ~ * {
+		margin-left: 4px;
+	}
+</style>
+
+<div class="not-match">
+	<div />
+</div>
+
+<div class="match">
+	<div />
+	<div />
+</div>
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator/_config.js b/test/css/samples/general-siblings-combinator/_config.js
new file mode 100644
index 0000000000..662c01ae6c
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator/_config.js
@@ -0,0 +1,60 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				10:
+				11:   /* no match */
+				12:   article ~ div { color: green; }
+				      ^
+				13:   span ~ article { color: green; }
+				14:   b ~ article { color: green; }`,
+			message: 'Unused CSS selector "article ~ div"',
+			pos: 275,
+			start: { character: 275, column: 1, line: 12 },
+			end: { character: 288, column: 14, line: 12 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				11:   /* no match */
+				12:   article ~ div { color: green; }
+				13:   span ~ article { color: green; }
+				      ^
+				14:   b ~ article { color: green; }
+				15:   span ~ div { color: green; }`,
+			message: 'Unused CSS selector "span ~ article"',
+			pos: 308,
+			start: { character: 308, column: 1, line: 13 },
+			end: { character: 322, column: 15, line: 13 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				12:   article ~ div { color: green; }
+				13:   span ~ article { color: green; }
+				14:   b ~ article { color: green; }
+				      ^
+				15:   span ~ div { color: green; }
+				16: </style>`,
+			message: 'Unused CSS selector "b ~ article"',
+			pos: 342,
+			start: { character: 342, column: 1, line: 14 },
+			end: { character: 353, column: 12, line: 14 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				13:   span ~ article { color: green; }
+				14:   b ~ article { color: green; }
+				15:   span ~ div { color: green; }
+				      ^
+				16: </style>
+				17:`,
+			message: 'Unused CSS selector "span ~ div"',
+			pos: 373,
+			start: { character: 373, column: 1, line: 15 },
+			end: { character: 383, column: 11, line: 15 }
+		}
+	]
+};
diff --git a/test/css/samples/general-siblings-combinator/expected.css b/test/css/samples/general-siblings-combinator/expected.css
new file mode 100644
index 0000000000..647a53f778
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator/expected.css
@@ -0,0 +1 @@
+div.svelte-xyz~article.svelte-xyz.svelte-xyz{color:green}span.svelte-xyz~b.svelte-xyz.svelte-xyz{color:green}div.svelte-xyz span.svelte-xyz~b.svelte-xyz{color:green}.a.svelte-xyz~article.svelte-xyz.svelte-xyz{color:green}div.svelte-xyz~.b.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~.c.svelte-xyz.svelte-xyz{color:green}article.svelte-xyz~details.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz~details.svelte-xyz.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator/expected.html b/test/css/samples/general-siblings-combinator/expected.html
new file mode 100644
index 0000000000..01fbffcae4
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator/expected.html
@@ -0,0 +1,7 @@
+<div class="a svelte-xyz">
+  <span class="svelte-xyz"></span>
+  <b class="svelte-xyz"></b>
+</div>
+<article class="b svelte-xyz"></article>
+<p class="c svelte-xyz"></p>
+<details class="d svelte-xyz"></details>
\ No newline at end of file
diff --git a/test/css/samples/general-siblings-combinator/input.svelte b/test/css/samples/general-siblings-combinator/input.svelte
new file mode 100644
index 0000000000..533702a3a3
--- /dev/null
+++ b/test/css/samples/general-siblings-combinator/input.svelte
@@ -0,0 +1,24 @@
+<style>
+	div ~ article { color: green; }
+	span ~ b { color: green; }
+	div span ~ b { color: green; }
+	.a ~ article { color: green; }
+	div ~ .b { color: green; }
+	.a ~ .c { color: green; }
+	article ~ details { color: green; }
+	.a ~ details { color: green; }
+
+	/* no match */
+	article ~ div { color: green; }
+	span ~ article { color: green; }
+	b ~ article { color: green; }
+	span ~ div { color: green; }
+</style>
+
+<div class="a">
+	<span />
+	<b />
+</div>
+<article class="b"></article>
+<p class="c"></p>
+<details class="d"></details>
\ No newline at end of file
diff --git a/test/css/samples/nested/_config.js b/test/css/samples/nested/_config.js
index e90f873ac1..5678e73bed 100644
--- a/test/css/samples/nested/_config.js
+++ b/test/css/samples/nested/_config.js
@@ -2,4 +2,4 @@ export default {
 	props: {
 		dynamic: 'x'
 	}
-};
\ No newline at end of file
+};
diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/_config.js b/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/_config.js
index 2e954ca8e9..f0dad3b273 100644
--- a/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/_config.js
+++ b/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/_config.js
@@ -2,4 +2,4 @@ export default {
 	props: {
 		dynamic: 'whatever'
 	}
-};
\ No newline at end of file
+};
diff --git a/test/css/samples/omit-scoping-attribute-descendant-global-inner-class/_config.js b/test/css/samples/omit-scoping-attribute-descendant-global-inner-class/_config.js
index 1ae834ca0d..50317168a6 100644
--- a/test/css/samples/omit-scoping-attribute-descendant-global-inner-class/_config.js
+++ b/test/css/samples/omit-scoping-attribute-descendant-global-inner-class/_config.js
@@ -2,4 +2,4 @@ export default {
 	props: {
 		raw: '<p>raw</p>'
 	}
-};
\ No newline at end of file
+};
diff --git a/test/css/samples/omit-scoping-attribute-descendant-global-inner-multiple/_config.js b/test/css/samples/omit-scoping-attribute-descendant-global-inner-multiple/_config.js
index 1ae834ca0d..50317168a6 100644
--- a/test/css/samples/omit-scoping-attribute-descendant-global-inner-multiple/_config.js
+++ b/test/css/samples/omit-scoping-attribute-descendant-global-inner-multiple/_config.js
@@ -2,4 +2,4 @@ export default {
 	props: {
 		raw: '<p>raw</p>'
 	}
-};
\ No newline at end of file
+};
diff --git a/test/css/samples/omit-scoping-attribute-descendant-global-inner/_config.js b/test/css/samples/omit-scoping-attribute-descendant-global-inner/_config.js
index 1ae834ca0d..50317168a6 100644
--- a/test/css/samples/omit-scoping-attribute-descendant-global-inner/_config.js
+++ b/test/css/samples/omit-scoping-attribute-descendant-global-inner/_config.js
@@ -2,4 +2,4 @@ export default {
 	props: {
 		raw: '<p>raw</p>'
 	}
-};
\ No newline at end of file
+};
diff --git a/test/css/samples/omit-scoping-attribute-descendant-global-outer-multiple/_config.js b/test/css/samples/omit-scoping-attribute-descendant-global-outer-multiple/_config.js
index 1ae834ca0d..50317168a6 100644
--- a/test/css/samples/omit-scoping-attribute-descendant-global-outer-multiple/_config.js
+++ b/test/css/samples/omit-scoping-attribute-descendant-global-outer-multiple/_config.js
@@ -2,4 +2,4 @@ export default {
 	props: {
 		raw: '<p>raw</p>'
 	}
-};
\ No newline at end of file
+};
diff --git a/test/css/samples/omit-scoping-attribute-descendant-global-outer/_config.js b/test/css/samples/omit-scoping-attribute-descendant-global-outer/_config.js
index 1ae834ca0d..50317168a6 100644
--- a/test/css/samples/omit-scoping-attribute-descendant-global-outer/_config.js
+++ b/test/css/samples/omit-scoping-attribute-descendant-global-outer/_config.js
@@ -2,4 +2,4 @@ export default {
 	props: {
 		raw: '<p>raw</p>'
 	}
-};
\ No newline at end of file
+};
diff --git a/test/css/samples/omit-scoping-attribute-descendant/_config.js b/test/css/samples/omit-scoping-attribute-descendant/_config.js
index 25e2a28ebb..4b70a48802 100644
--- a/test/css/samples/omit-scoping-attribute-descendant/_config.js
+++ b/test/css/samples/omit-scoping-attribute-descendant/_config.js
@@ -1,6 +1,6 @@
 export default {
 	warnings: [{
-		code: `css-unused-selector`,
+		code: 'css-unused-selector',
 		message: 'Unused CSS selector "div > p"',
 		start: {
 			line: 8,
@@ -21,4 +21,4 @@ export default {
 			 9:     color: red;
 			10:   }`
 	}]
-};
\ No newline at end of file
+};
diff --git a/test/css/samples/omit-scoping-attribute-global/_config.js b/test/css/samples/omit-scoping-attribute-global/_config.js
index 1ae834ca0d..50317168a6 100644
--- a/test/css/samples/omit-scoping-attribute-global/_config.js
+++ b/test/css/samples/omit-scoping-attribute-global/_config.js
@@ -2,4 +2,4 @@ export default {
 	props: {
 		raw: '<p>raw</p>'
 	}
-};
\ No newline at end of file
+};
diff --git a/test/css/samples/siblings-combinator-await-not-exhaustive/_config.js b/test/css/samples/siblings-combinator-await-not-exhaustive/_config.js
new file mode 100644
index 0000000000..c81f1a9f82
--- /dev/null
+++ b/test/css/samples/siblings-combinator-await-not-exhaustive/_config.js
@@ -0,0 +1,3 @@
+export default {
+	warnings: []
+};
diff --git a/test/css/samples/siblings-combinator-await-not-exhaustive/expected.css b/test/css/samples/siblings-combinator-await-not-exhaustive/expected.css
new file mode 100644
index 0000000000..60bb8e92dc
--- /dev/null
+++ b/test/css/samples/siblings-combinator-await-not-exhaustive/expected.css
@@ -0,0 +1 @@
+.a.svelte-xyz+.b.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz+.c.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz+.d.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz+.e.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz+.f.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz+.g.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz+.h.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.b.svelte-xyz+.d.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz+.d.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.b.svelte-xyz+.e.svelte-xyz+.f.svelte-xyz+.h.svelte-xyz{color:green}.b.svelte-xyz+.d.svelte-xyz+.h.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz+.g.svelte-xyz.svelte-xyz.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-await-not-exhaustive/expected.html b/test/css/samples/siblings-combinator-await-not-exhaustive/expected.html
new file mode 100644
index 0000000000..de97b02a5e
--- /dev/null
+++ b/test/css/samples/siblings-combinator-await-not-exhaustive/expected.html
@@ -0,0 +1,4 @@
+<div class="a svelte-xyz"></div>
+<div class="d svelte-xyz"></div>
+<div class="f svelte-xyz"></div>
+<div class="h svelte-xyz"></div>
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-await-not-exhaustive/input.svelte b/test/css/samples/siblings-combinator-await-not-exhaustive/input.svelte
new file mode 100644
index 0000000000..d3345c6edc
--- /dev/null
+++ b/test/css/samples/siblings-combinator-await-not-exhaustive/input.svelte
@@ -0,0 +1,41 @@
+<script>
+	let promise = Promise.resolve();
+</script>
+
+<style>
+	.a + .b { color: green; }
+	.a + .c { color: green; }
+	.a + .d { color: green; }
+	.a + .e { color: green; }
+	.a + .f { color: green; }
+	.a + .g { color: green; }
+	.a + .h { color: green; }
+	
+	.b + .d { color: green; }
+	.c + .d { color: green; }
+	.b + .e + .f + .h { color: green; }
+	.b + .d + .h { color: green; }
+	.c + .g { color: green; }
+</style>
+
+<div class="a" />
+
+{#await promise then value}
+	<div class="b" />
+{:catch error}
+	<div class="c" />
+{/await}
+
+{#await promise}
+	<div class="d" />
+{:catch error}
+	<div class="e" />
+{/await}
+
+{#await promise}
+	<div class="f" />
+{:then error}
+	<div class="g" />
+{/await}
+
+<div class="h" />
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-await/_config.js b/test/css/samples/siblings-combinator-await/_config.js
new file mode 100644
index 0000000000..b51eb7a83e
--- /dev/null
+++ b/test/css/samples/siblings-combinator-await/_config.js
@@ -0,0 +1,60 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				12:
+				13:   /* no match */
+				14:   .a + .e { color: green; }
+				      ^
+				15:   .b + .c { color: green; }
+				16:   .c + .d { color: green; }`,
+			message: 'Unused CSS selector ".a + .e"',
+			pos: 242,
+			start: { character: 242, column: 1, line: 14 },
+			end: { character: 249, column: 8, line: 14 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				13:   /* no match */
+				14:   .a + .e { color: green; }
+				15:   .b + .c { color: green; }
+				      ^
+				16:   .c + .d { color: green; }
+				17:   .b + .d { color: green; }`,
+			message: 'Unused CSS selector ".b + .c"',
+			pos: 269,
+			start: { character: 269, column: 1, line: 15 },
+			end: { character: 276, column: 8, line: 15 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				14:   .a + .e { color: green; }
+				15:   .b + .c { color: green; }
+				16:   .c + .d { color: green; }
+				      ^
+				17:   .b + .d { color: green; }
+				18: </style>`,
+			message: 'Unused CSS selector ".c + .d"',
+			pos: 296,
+			start: { character: 296, column: 1, line: 16 },
+			end: { character: 303, column: 8, line: 16 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				15:   .b + .c { color: green; }
+				16:   .c + .d { color: green; }
+				17:   .b + .d { color: green; }
+				      ^
+				18: </style>
+				19:`,
+			message: 'Unused CSS selector ".b + .d"',
+			pos: 323,
+			start: { character: 323, column: 1, line: 17 },
+			end: { character: 330, column: 8, line: 17 }
+		}
+	]
+};
diff --git a/test/css/samples/siblings-combinator-await/expected.css b/test/css/samples/siblings-combinator-await/expected.css
new file mode 100644
index 0000000000..5ea39be7c2
--- /dev/null
+++ b/test/css/samples/siblings-combinator-await/expected.css
@@ -0,0 +1 @@
+.a.svelte-xyz+.b.svelte-xyz{color:green}.a.svelte-xyz+.c.svelte-xyz{color:green}.a.svelte-xyz+.d.svelte-xyz{color:green}.b.svelte-xyz+.e.svelte-xyz{color:green}.c.svelte-xyz+.e.svelte-xyz{color:green}.d.svelte-xyz+.e.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-await/expected.html b/test/css/samples/siblings-combinator-await/expected.html
new file mode 100644
index 0000000000..3d8ac9f966
--- /dev/null
+++ b/test/css/samples/siblings-combinator-await/expected.html
@@ -0,0 +1,3 @@
+<div class="a svelte-xyz"></div>
+<div class="b svelte-xyz"></div>
+<div class="e svelte-xyz"></div>
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-await/input.svelte b/test/css/samples/siblings-combinator-await/input.svelte
new file mode 100644
index 0000000000..07698c2a30
--- /dev/null
+++ b/test/css/samples/siblings-combinator-await/input.svelte
@@ -0,0 +1,30 @@
+<script>
+	let promise = Promise.resolve();
+</script>
+
+<style>
+	.a + .b { color: green; }
+	.a + .c { color: green; }
+	.a + .d { color: green; }
+	.b + .e { color: green; }
+	.c + .e { color: green; }
+	.d + .e { color: green; }
+
+	/* no match */
+	.a + .e { color: green; }
+	.b + .c { color: green; }
+	.c + .d { color: green; }
+	.b + .d { color: green; }
+</style>
+
+<div class="a" />
+
+{#await promise}
+	<div class="b" />
+{:then value}
+	<div class="c" />
+{:catch error}
+	<div class="d" />
+{/await}
+
+<div class="e" />
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-each-2/_config.js b/test/css/samples/siblings-combinator-each-2/_config.js
new file mode 100644
index 0000000000..644fe6a0ee
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each-2/_config.js
@@ -0,0 +1,18 @@
+export default {
+	warnings: [
+		{
+		  code: 'css-unused-selector',
+			frame: `
+				24:   }
+				25:   /* not match */
+				26:   .a + .c {
+				      ^
+				27:     color: green;
+				28:   }`,
+		  message: 'Unused CSS selector ".a + .c"',
+		  pos: 320,
+		  start: { character: 320, column: 1, line: 26 },
+		  end: { character: 327, column: 8, line: 26 }
+		}
+	]
+};
diff --git a/test/css/samples/siblings-combinator-each-2/expected.css b/test/css/samples/siblings-combinator-each-2/expected.css
new file mode 100644
index 0000000000..60fa224269
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each-2/expected.css
@@ -0,0 +1 @@
+.a.svelte-xyz+.b.svelte-xyz{color:green}.c.svelte-xyz+.d.svelte-xyz{color:green}.a.svelte-xyz+.d.svelte-xyz{color:green}.c.svelte-xyz+.b.svelte-xyz{color:green}.b.svelte-xyz+.c.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-each-2/expected.html b/test/css/samples/siblings-combinator-each-2/expected.html
new file mode 100644
index 0000000000..331a5e4317
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each-2/expected.html
@@ -0,0 +1,4 @@
+<div class="a svelte-xyz"></div>
+<div class="b svelte-xyz"></div>
+<div class="c svelte-xyz"></div>
+<div class="d svelte-xyz"></div>
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-each-2/input.svelte b/test/css/samples/siblings-combinator-each-2/input.svelte
new file mode 100644
index 0000000000..bbad045fbc
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each-2/input.svelte
@@ -0,0 +1,38 @@
+<script>
+	let array = [1];
+</script>
+
+<style>
+	/* boundary of each */
+	.a + .b {
+		color: green;
+	}
+	.c + .d {
+		color: green;
+	}
+	/* if array is empty */
+	.a + .d {
+		color: green;
+	}
+	/* if array has multiple items */
+	.c + .b {
+		color: green;
+	}
+	/* normal sibling */
+	.b + .c {
+		color: green;
+	}
+	/* not match */
+	.a + .c {
+		color: green;
+	}
+</style>
+
+<div class="a" />
+
+{#each array as item}
+	<div class="b" />
+	<div class="c" />
+{/each}
+
+<div class="d" />
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-each-else-nested/_config.js b/test/css/samples/siblings-combinator-each-else-nested/_config.js
new file mode 100644
index 0000000000..be47c1f049
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each-else-nested/_config.js
@@ -0,0 +1,144 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				21:
+				22:   /* no match */
+				23:   .a + .c { color: green; }
+				      ^
+				24:   .a + .g { color: green; }
+				25:   .b + .e { color: green; }`,
+			message: 'Unused CSS selector ".a + .c"',
+			pos: 479,
+			start: { character: 479, column: 1, line: 23 },
+			end: { character: 486, column: 8, line: 23 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				22:   /* no match */
+				23:   .a + .c { color: green; }
+				24:   .a + .g { color: green; }
+				      ^
+				25:   .b + .e { color: green; }
+				26:   .c + .g { color: green; }`,
+			message: 'Unused CSS selector ".a + .g"',
+			pos: 506,
+			start: { character: 506, column: 1, line: 24 },
+			end: { character: 513, column: 8, line: 24 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				23:   .a + .c { color: green; }
+				24:   .a + .g { color: green; }
+				25:   .b + .e { color: green; }
+				      ^
+				26:   .c + .g { color: green; }
+				27:   .c + .k { color: green; }`,
+			message: 'Unused CSS selector ".b + .e"',
+			pos: 533,
+			start: { character: 533, column: 1, line: 25 },
+			end: { character: 540, column: 8, line: 25 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				24:   .a + .g { color: green; }
+				25:   .b + .e { color: green; }
+				26:   .c + .g { color: green; }
+				      ^
+				27:   .c + .k { color: green; }
+				28:   .d + .d { color: green; }`,
+			message: 'Unused CSS selector ".c + .g"',
+			pos: 560,
+			start: { character: 560, column: 1, line: 26 },
+			end: { character: 567, column: 8, line: 26 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				25:   .b + .e { color: green; }
+				26:   .c + .g { color: green; }
+				27:   .c + .k { color: green; }
+				      ^
+				28:   .d + .d { color: green; }
+				29:   .e + .f { color: green; }`,
+			message: 'Unused CSS selector ".c + .k"',
+			pos: 587,
+			start: { character: 587, column: 1, line: 27 },
+			end: { character: 594, column: 8, line: 27 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				26:   .c + .g { color: green; }
+				27:   .c + .k { color: green; }
+				28:   .d + .d { color: green; }
+				      ^
+				29:   .e + .f { color: green; }
+				30:   .f + .f { color: green; }`,
+			message: 'Unused CSS selector ".d + .d"',
+			pos: 614,
+			start: { character: 614, column: 1, line: 28 },
+			end: { character: 621, column: 8, line: 28 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				27:   .c + .k { color: green; }
+				28:   .d + .d { color: green; }
+				29:   .e + .f { color: green; }
+				      ^
+				30:   .f + .f { color: green; }
+				31:   .g + .j { color: green; }`,
+			message: 'Unused CSS selector ".e + .f"',
+			pos: 641,
+			start: { character: 641, column: 1, line: 29 },
+			end: { character: 648, column: 8, line: 29 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				28:   .d + .d { color: green; }
+				29:   .e + .f { color: green; }
+				30:   .f + .f { color: green; }
+				      ^
+				31:   .g + .j { color: green; }
+				32:   .g + .h + .i + .j { color: green; }`,
+			message: 'Unused CSS selector ".f + .f"',
+			pos: 668,
+			start: { character: 668, column: 1, line: 30 },
+			end: { character: 675, column: 8, line: 30 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				29:   .e + .f { color: green; }
+				30:   .f + .f { color: green; }
+				31:   .g + .j { color: green; }
+				      ^
+				32:   .g + .h + .i + .j { color: green; }
+				33: </style>`,
+			message: 'Unused CSS selector ".g + .j"',
+			pos: 695,
+			start: { character: 695, column: 1, line: 31 },
+			end: { character: 702, column: 8, line: 31 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				30:   .f + .f { color: green; }
+				31:   .g + .j { color: green; }
+				32:   .g + .h + .i + .j { color: green; }
+				      ^
+				33: </style>
+				34:`,
+			message: 'Unused CSS selector ".g + .h + .i + .j"',
+			pos: 722,
+			start: { character: 722, column: 1, line: 32 },
+			end: { character: 739, column: 18, line: 32 }
+		}
+	]
+};
diff --git a/test/css/samples/siblings-combinator-each-else-nested/expected.css b/test/css/samples/siblings-combinator-each-else-nested/expected.css
new file mode 100644
index 0000000000..aa4e04081d
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each-else-nested/expected.css
@@ -0,0 +1 @@
+.a.svelte-xyz+.e.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz+.f.svelte-xyz.svelte-xyz{color:green}.b.svelte-xyz+.c.svelte-xyz.svelte-xyz{color:green}.b.svelte-xyz+.d.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz+.e.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz+.f.svelte-xyz.svelte-xyz{color:green}.d.svelte-xyz+.e.svelte-xyz.svelte-xyz{color:green}.d.svelte-xyz+.f.svelte-xyz.svelte-xyz{color:green}.e.svelte-xyz+.e.svelte-xyz.svelte-xyz{color:green}.i.svelte-xyz+.j.svelte-xyz.svelte-xyz{color:green}.g.svelte-xyz+.h.svelte-xyz+.j.svelte-xyz{color:green}.g.svelte-xyz+.i.svelte-xyz+.j.svelte-xyz{color:green}.m.svelte-xyz+.m.svelte-xyz.svelte-xyz{color:green}.m.svelte-xyz+.l.svelte-xyz.svelte-xyz{color:green}.l.svelte-xyz+.m.svelte-xyz.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-each-else-nested/expected.html b/test/css/samples/siblings-combinator-each-else-nested/expected.html
new file mode 100644
index 0000000000..5f25a2d38a
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each-else-nested/expected.html
@@ -0,0 +1,3 @@
+<div class="a svelte-xyz"></div>
+<div class="f svelte-xyz"></div>
+<div class="k"></div>
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-each-else-nested/input.svelte b/test/css/samples/siblings-combinator-each-else-nested/input.svelte
new file mode 100644
index 0000000000..bee9c6b1dc
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each-else-nested/input.svelte
@@ -0,0 +1,74 @@
+<script>
+	let array = [];
+</script>
+
+<style>
+	.a + .e { color: green; }
+	.a + .f { color: green; }
+	.b + .c { color: green; }
+	.b + .d { color: green; }
+	.c + .e { color: green; }
+	.c + .f { color: green; }
+	.d + .e { color: green; }
+	.d + .f { color: green; }
+	.e + .e { color: green; }
+	.i + .j { color: green; }
+	.g + .h + .j { color: green; }
+	.g + .i + .j { color: green; }
+	.m + .m { color: green; }
+	.m + .l { color: green; }
+	.l + .m { color: green; }
+	
+	/* no match */
+	.a + .c { color: green; }
+	.a + .g { color: green; }
+	.b + .e { color: green; }
+	.c + .g { color: green; }
+	.c + .k { color: green; }
+	.d + .d { color: green; }
+	.e + .f { color: green; }
+	.f + .f { color: green; }
+	.g + .j { color: green; }
+	.g + .h + .i + .j { color: green; }
+</style>
+
+<div class="a" />
+
+{#each array as a}
+	<div class="b" />
+	{#each array as b}
+		<div class="c" />
+	{:else}
+		<div class="d" />
+	{/each}
+{/each}
+
+{#each array as c}
+	{#each array as d}
+		<div class="e" />
+	{/each}
+{:else}
+	<div class="f" />
+{/each}
+
+{#each array as item}
+	<div class="g" />
+	{#each array as item}
+		{#each array as item}
+			<div class="h" />
+		{/each}
+	{:else}
+		<div class="i" />
+	{/each}
+	<div class="j" />
+{/each}
+
+<div class="k" />
+
+{#each array as item}
+	{#each array as item}
+		<div class="l" />
+	{:else}
+		<div class="m" />
+	{/each}
+{/each}
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-each-else/_config.js b/test/css/samples/siblings-combinator-each-else/_config.js
new file mode 100644
index 0000000000..89cbd9ef1a
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each-else/_config.js
@@ -0,0 +1,32 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				10:
+				11:   /* no match */
+				12:   .a + .d { color: green; }
+				      ^
+				13:   .b + .c { color: green; }
+				14: </style>`,
+			message: 'Unused CSS selector ".a + .d"',
+			pos: 172,
+			start: { character: 172, column: 1, line: 12 },
+			end: { character: 179, column: 8, line: 12 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				11:   /* no match */
+				12:   .a + .d { color: green; }
+				13:   .b + .c { color: green; }
+				      ^
+				14: </style>
+				15:`,
+			message: 'Unused CSS selector ".b + .c"',
+			pos: 199,
+			start: { character: 199, column: 1, line: 13 },
+			end: { character: 206, column: 8, line: 13 }
+		}
+	]
+};
diff --git a/test/css/samples/siblings-combinator-each-else/expected.css b/test/css/samples/siblings-combinator-each-else/expected.css
new file mode 100644
index 0000000000..f82bca8215
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each-else/expected.css
@@ -0,0 +1 @@
+.a.svelte-xyz+.b.svelte-xyz{color:green}.a.svelte-xyz+.c.svelte-xyz{color:green}.b.svelte-xyz+.d.svelte-xyz{color:green}.c.svelte-xyz+.d.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-each-else/expected.html b/test/css/samples/siblings-combinator-each-else/expected.html
new file mode 100644
index 0000000000..fb838a55fd
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each-else/expected.html
@@ -0,0 +1,3 @@
+<div class="a svelte-xyz"></div>
+<div class="c svelte-xyz"></div>
+<div class="d svelte-xyz"></div>
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-each-else/input.svelte b/test/css/samples/siblings-combinator-each-else/input.svelte
new file mode 100644
index 0000000000..ecd48968c2
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each-else/input.svelte
@@ -0,0 +1,24 @@
+<script>
+	let array = [];
+</script>
+
+<style>
+	.a + .b { color: green; }
+	.a + .c { color: green; }
+	.b + .d { color: green; }
+	.c + .d { color: green; }
+	
+	/* no match */
+	.a + .d { color: green; }
+	.b + .c { color: green; }
+</style>
+
+<div class="a" />
+
+{#each array as item}
+	<div class="b" />
+{:else}
+	<div class="c" />
+{/each}
+
+<div class="d" />
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-each-nested/_config.js b/test/css/samples/siblings-combinator-each-nested/_config.js
new file mode 100644
index 0000000000..6d58e6a4ec
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each-nested/_config.js
@@ -0,0 +1,116 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				56:
+				57:   /* no match */
+				58:   .a + .h { color: green; }
+				      ^
+				59:   .a + .i { color: green; }
+				60:   .c + .h { color: green; }`,
+			message: 'Unused CSS selector ".a + .h"',
+			pos: 1229,
+			start: { character: 1229, column: 1, line: 58 },
+			end: { character: 1236, column: 8, line: 58 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				57:   /* no match */
+				58:   .a + .h { color: green; }
+				59:   .a + .i { color: green; }
+				      ^
+				60:   .c + .h { color: green; }
+				61:   .c + .i { color: green; }`,
+			message: 'Unused CSS selector ".a + .i"',
+			pos: 1256,
+			start: { character: 1256, column: 1, line: 59 },
+			end: { character: 1263, column: 8, line: 59 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				58:   .a + .h { color: green; }
+				59:   .a + .i { color: green; }
+				60:   .c + .h { color: green; }
+				      ^
+				61:   .c + .i { color: green; }
+				62:   .d + .f { color: green; }`,
+			message: 'Unused CSS selector ".c + .h"',
+			pos: 1283,
+			start: { character: 1283, column: 1, line: 60 },
+			end: { character: 1290, column: 8, line: 60 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				59:   .a + .i { color: green; }
+				60:   .c + .h { color: green; }
+				61:   .c + .i { color: green; }
+				      ^
+				62:   .d + .f { color: green; }
+				63:   .d + .g { color: green; }`,
+			message: 'Unused CSS selector ".c + .i"',
+			pos: 1310,
+			start: { character: 1310, column: 1, line: 61 },
+			end: { character: 1317, column: 8, line: 61 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				60:   .c + .h { color: green; }
+				61:   .c + .i { color: green; }
+				62:   .d + .f { color: green; }
+				      ^
+				63:   .d + .g { color: green; }
+				64:   .e + .g { color: green; }`,
+			message: 'Unused CSS selector ".d + .f"',
+			pos: 1337,
+			start: { character: 1337, column: 1, line: 62 },
+			end: { character: 1344, column: 8, line: 62 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				61:   .c + .i { color: green; }
+				62:   .d + .f { color: green; }
+				63:   .d + .g { color: green; }
+				      ^
+				64:   .e + .g { color: green; }
+				65:   .g + .i { color: green; }`,
+			message: 'Unused CSS selector ".d + .g"',
+			pos: 1364,
+			start: { character: 1364, column: 1, line: 63 },
+			end: { character: 1371, column: 8, line: 63 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				62:   .d + .f { color: green; }
+				63:   .d + .g { color: green; }
+				64:   .e + .g { color: green; }
+				      ^
+				65:   .g + .i { color: green; }
+				66: </style>`,
+			message: 'Unused CSS selector ".e + .g"',
+			pos: 1391,
+			start: { character: 1391, column: 1, line: 64 },
+			end: { character: 1398, column: 8, line: 64 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				63:   .d + .g { color: green; }
+				64:   .e + .g { color: green; }
+				65:   .g + .i { color: green; }
+				      ^
+				66: </style>
+				67:`,
+			message: 'Unused CSS selector ".g + .i"',
+			pos: 1418,
+			start: { character: 1418, column: 1, line: 65 },
+			end: { character: 1425, column: 8, line: 65 }
+		}
+	]
+};
diff --git a/test/css/samples/siblings-combinator-each-nested/expected.css b/test/css/samples/siblings-combinator-each-nested/expected.css
new file mode 100644
index 0000000000..616d739670
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each-nested/expected.css
@@ -0,0 +1 @@
+.a.svelte-xyz+.d.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz+.e.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz+.f.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz+.g.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz+.d.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz+.e.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz+.f.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz+.g.svelte-xyz.svelte-xyz{color:green}.j.svelte-xyz+.m.svelte-xyz.svelte-xyz{color:green}.j.svelte-xyz+.n.svelte-xyz.svelte-xyz{color:green}.j.svelte-xyz+.o.svelte-xyz.svelte-xyz{color:green}.k.svelte-xyz+.m.svelte-xyz.svelte-xyz{color:green}.k.svelte-xyz+.n.svelte-xyz.svelte-xyz{color:green}.k.svelte-xyz+.o.svelte-xyz.svelte-xyz{color:green}.l.svelte-xyz+.m.svelte-xyz.svelte-xyz{color:green}.l.svelte-xyz+.n.svelte-xyz.svelte-xyz{color:green}.l.svelte-xyz+.o.svelte-xyz.svelte-xyz{color:green}.d.svelte-xyz+.e.svelte-xyz.svelte-xyz{color:green}.e.svelte-xyz+.f.svelte-xyz.svelte-xyz{color:green}.g.svelte-xyz+.h.svelte-xyz.svelte-xyz{color:green}.f.svelte-xyz+.d.svelte-xyz.svelte-xyz{color:green}.f.svelte-xyz+.e.svelte-xyz.svelte-xyz{color:green}.f.svelte-xyz+.f.svelte-xyz.svelte-xyz{color:green}.h.svelte-xyz+.g.svelte-xyz.svelte-xyz{color:green}.i.svelte-xyz+.h.svelte-xyz.svelte-xyz{color:green}.i.svelte-xyz+.g.svelte-xyz.svelte-xyz{color:green}.d.svelte-xyz+.d.svelte-xyz.svelte-xyz{color:green}.e.svelte-xyz+.e.svelte-xyz.svelte-xyz{color:green}.f.svelte-xyz+.f.svelte-xyz.svelte-xyz{color:green}.g.svelte-xyz+.g.svelte-xyz.svelte-xyz{color:green}.h.svelte-xyz+.h.svelte-xyz.svelte-xyz{color:green}.i.svelte-xyz+.i.svelte-xyz.svelte-xyz{color:green}.e.svelte-xyz+.e.svelte-xyz+.f.svelte-xyz{color:green}.e.svelte-xyz+.e.svelte-xyz+.d.svelte-xyz{color:green}.h.svelte-xyz+.h.svelte-xyz+.i.svelte-xyz{color:green}.h.svelte-xyz+.h.svelte-xyz+.g.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-each-nested/expected.html b/test/css/samples/siblings-combinator-each-nested/expected.html
new file mode 100644
index 0000000000..340d6fc4c8
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each-nested/expected.html
@@ -0,0 +1,15 @@
+<div class="a svelte-xyz"></div>
+<div class="b"></div>
+<div class="c svelte-xyz"></div>
+<div class="d svelte-xyz"></div>
+<div class="e svelte-xyz"></div>
+<div class="f svelte-xyz"></div>
+<div class="g svelte-xyz"></div>
+<div class="h svelte-xyz"></div>
+<div class="i svelte-xyz"></div>
+<div class="j svelte-xyz"></div>
+<div class="k svelte-xyz"></div>
+<div class="l svelte-xyz"></div>
+<div class="m svelte-xyz"></div>
+<div class="n svelte-xyz"></div>
+<div class="o svelte-xyz"></div>
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-each-nested/input.svelte b/test/css/samples/siblings-combinator-each-nested/input.svelte
new file mode 100644
index 0000000000..b5b9242675
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each-nested/input.svelte
@@ -0,0 +1,113 @@
+<script>
+	let array = [1];
+</script>
+
+<style>
+	/* boundary of each */
+	.a + .d { color: green; }
+	.a + .e { color: green; }
+	.a + .f { color: green; }
+	.a + .g { color: green; }
+	.c + .d { color: green; }
+	.c + .e { color: green; }
+	.c + .f { color: green; }
+	.c + .g { color: green; }
+
+	/* nested boundary of each */
+	.j + .m { color: green; }
+	.j + .n { color: green; }
+	.j + .o { color: green; }
+	.k + .m { color: green; }
+	.k + .n { color: green; }
+	.k + .o { color: green; }
+	.l + .m { color: green; }
+	.l + .n { color: green; }
+	.l + .o { color: green; }
+
+	/* parent each */
+	.d + .e { color: green; }
+	.e + .f { color: green; }
+
+	/* child each */
+	.g + .h { color: green; }
+
+	/* wrap around */
+	.f + .d { color: green; }
+	.f + .e { color: green; }
+	.f + .f { color: green; }
+
+	.h + .g { color: green; }
+	.i + .h { color: green; }
+	.i + .g { color: green; }
+
+	/* wrap around self */
+	.d + .d { color: green; }
+	.e + .e { color: green; }
+	.f + .f { color: green; }
+	.g + .g { color: green; }
+	.h + .h { color: green; }
+	.i + .i { color: green; }
+
+	/* wrap around self + next */
+	.e + .e + .f { color: green; }
+	.e + .e + .d { color: green; }
+	.h + .h + .i { color: green; }
+	.h + .h + .g { color: green; }
+
+	/* no match */
+	.a + .h { color: green; }
+	.a + .i { color: green; }
+	.c + .h { color: green; }
+	.c + .i { color: green; }
+	.d + .f { color: green; }
+	.d + .g { color: green; }
+	.e + .g { color: green; }
+	.g + .i { color: green; }
+</style>
+
+<div class="a" />
+
+{#each array as item}
+	<div class="b" />
+	<div class="c" />
+{/each}
+
+{#each array as item}
+	{#each array as item}
+		{#each array as item}
+			<div class="d" />
+		{/each}
+		<div class="e" />
+	{/each}
+	<div class="f" />
+{/each}
+
+{#each array as item}
+	<div class="g" />
+	{#each array as item}
+		<div class="h" />
+		{#each array as item}
+			<div class="i" />
+		{/each}
+	{/each}
+{/each}
+
+{#each array as item}
+	<div class="j" />
+	{#each array as item}
+		<div class="k" />
+		{#each array as item}
+			<div class="l" />
+		{/each}
+	{/each}
+{/each}
+
+{#each array as item}
+	{#each array as item}
+		{#each array as item}
+			<div class="m" />
+		{/each}
+		<div class="n" />
+	{/each}
+	<div class="o" />
+{/each}
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-each/expected.css b/test/css/samples/siblings-combinator-each/expected.css
new file mode 100644
index 0000000000..a46fc4ed4e
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each/expected.css
@@ -0,0 +1 @@
+div.svelte-xyz+span.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-each/expected.html b/test/css/samples/siblings-combinator-each/expected.html
new file mode 100644
index 0000000000..9d0416f01b
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each/expected.html
@@ -0,0 +1,6 @@
+<div class="svelte-xyz"></div>
+<span class="each svelte-xyz"></span>
+<div class="each svelte-xyz"></div>
+<span class="each svelte-xyz"></span>
+<div class="each svelte-xyz"></div>
+<span class="svelte-xyz"></span>
diff --git a/test/css/samples/siblings-combinator-each/input.svelte b/test/css/samples/siblings-combinator-each/input.svelte
new file mode 100644
index 0000000000..de77a25180
--- /dev/null
+++ b/test/css/samples/siblings-combinator-each/input.svelte
@@ -0,0 +1,20 @@
+<script>
+	let array = [1];
+</script>
+
+<style>
+	div + span {
+		color: green;
+	}
+</style>
+
+<div />
+
+{#each array as item}
+	<span class="each" />
+	<div class="each" />
+	<span class="each" />
+	<div class="each" />
+{/each}
+
+<span />
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-if-not-exhaustive-with-each/_config.js b/test/css/samples/siblings-combinator-if-not-exhaustive-with-each/_config.js
new file mode 100644
index 0000000000..6648dec55d
--- /dev/null
+++ b/test/css/samples/siblings-combinator-if-not-exhaustive-with-each/_config.js
@@ -0,0 +1,18 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				16:
+				17:   /* no match */
+				18:   .b + .c { color: green; }
+				      ^
+				19: </style>
+				20:`,
+			message: 'Unused CSS selector ".b + .c"',
+			pos: 319,
+			start: { character: 319, column: 1, line: 18 },
+			end: { character: 326, column: 8, line: 18 }
+		}
+	]
+};
diff --git a/test/css/samples/siblings-combinator-if-not-exhaustive-with-each/expected.css b/test/css/samples/siblings-combinator-if-not-exhaustive-with-each/expected.css
new file mode 100644
index 0000000000..93cd539f00
--- /dev/null
+++ b/test/css/samples/siblings-combinator-if-not-exhaustive-with-each/expected.css
@@ -0,0 +1 @@
+.a.svelte-xyz+.b.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz+.c.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz+.d.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.b.svelte-xyz+.d.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz+.d.svelte-xyz.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz+.c.svelte-xyz+.c.svelte-xyz.svelte-xyz{color:green}.c.svelte-xyz+.c.svelte-xyz+.d.svelte-xyz.svelte-xyz{color:green}.a.svelte-xyz+.c.svelte-xyz+.c.svelte-xyz+.d.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-if-not-exhaustive-with-each/expected.html b/test/css/samples/siblings-combinator-if-not-exhaustive-with-each/expected.html
new file mode 100644
index 0000000000..fb838a55fd
--- /dev/null
+++ b/test/css/samples/siblings-combinator-if-not-exhaustive-with-each/expected.html
@@ -0,0 +1,3 @@
+<div class="a svelte-xyz"></div>
+<div class="c svelte-xyz"></div>
+<div class="d svelte-xyz"></div>
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-if-not-exhaustive-with-each/input.svelte b/test/css/samples/siblings-combinator-if-not-exhaustive-with-each/input.svelte
new file mode 100644
index 0000000000..ff9f10dc1c
--- /dev/null
+++ b/test/css/samples/siblings-combinator-if-not-exhaustive-with-each/input.svelte
@@ -0,0 +1,31 @@
+<script>
+	let foo = false;
+	let array = [1];
+</script>
+
+<style>
+	.a + .b { color: green; }
+	.a + .c { color: green; }
+	.a + .d { color: green; }
+	.b + .d { color: green; }
+	.c + .d { color: green; }
+
+	.a + .c + .c { color: green; }
+	.c + .c + .d { color: green; }
+	.a + .c + .c + .d { color: green; }
+
+	/* no match */
+	.b + .c { color: green; }
+</style>
+
+<div class="a" />
+
+{#if foo}
+	<div class="b" />
+{:else}
+	{#each array as item}
+		<div class="c" />
+	{/each}
+{/if}
+
+<div class="d" />
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-if-not-exhaustive/_config.js b/test/css/samples/siblings-combinator-if-not-exhaustive/_config.js
new file mode 100644
index 0000000000..51ca551055
--- /dev/null
+++ b/test/css/samples/siblings-combinator-if-not-exhaustive/_config.js
@@ -0,0 +1,18 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				12:
+				13:   /* no match */
+				14:   .b + .c { color: green; }
+				      ^
+				15: </style>
+				16:`,
+			message: 'Unused CSS selector ".b + .c"',
+			pos: 215,
+			start: { character: 215, column: 1, line: 14 },
+			end: { character: 222, column: 8, line: 14 }
+		}
+	]
+};
diff --git a/test/css/samples/siblings-combinator-if-not-exhaustive/expected.css b/test/css/samples/siblings-combinator-if-not-exhaustive/expected.css
new file mode 100644
index 0000000000..b1225e36a1
--- /dev/null
+++ b/test/css/samples/siblings-combinator-if-not-exhaustive/expected.css
@@ -0,0 +1 @@
+.a.svelte-xyz+.b.svelte-xyz{color:green}.a.svelte-xyz+.c.svelte-xyz{color:green}.a.svelte-xyz+.d.svelte-xyz{color:green}.b.svelte-xyz+.d.svelte-xyz{color:green}.c.svelte-xyz+.d.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-if-not-exhaustive/expected.html b/test/css/samples/siblings-combinator-if-not-exhaustive/expected.html
new file mode 100644
index 0000000000..813e778dc6
--- /dev/null
+++ b/test/css/samples/siblings-combinator-if-not-exhaustive/expected.html
@@ -0,0 +1,3 @@
+<div class="a svelte-xyz"></div>
+<div class="b svelte-xyz"></div>
+<div class="d svelte-xyz"></div>
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-if-not-exhaustive/input.svelte b/test/css/samples/siblings-combinator-if-not-exhaustive/input.svelte
new file mode 100644
index 0000000000..4f832b3b47
--- /dev/null
+++ b/test/css/samples/siblings-combinator-if-not-exhaustive/input.svelte
@@ -0,0 +1,25 @@
+<script>
+	let foo = true;
+	let bar = true;
+</script>
+
+<style>
+	.a + .b { color: green; }
+	.a + .c { color: green; }
+	.a + .d { color: green; }
+	.b + .d { color: green; }
+	.c + .d { color: green; }
+
+	/* no match */
+	.b + .c { color: green; }
+</style>
+
+<div class="a" />
+
+{#if foo}
+	<div class="b" />
+{:else if bar}
+	<div class="c" />
+{/if}
+
+<div class="d" />
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-if/_config.js b/test/css/samples/siblings-combinator-if/_config.js
new file mode 100644
index 0000000000..bc8e32f5fd
--- /dev/null
+++ b/test/css/samples/siblings-combinator-if/_config.js
@@ -0,0 +1,60 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				13:
+				14:   /* no match */
+				15:   .a + .e { color: green; }
+				      ^
+				16:   .b + .c { color: green; }
+				17:   .b + .d { color: green; }`,
+			message: 'Unused CSS selector ".a + .e"',
+			pos: 242,
+			start: { character: 242, column: 1, line: 15 },
+			end: { character: 249, column: 8, line: 15 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				14:   /* no match */
+				15:   .a + .e { color: green; }
+				16:   .b + .c { color: green; }
+				      ^
+				17:   .b + .d { color: green; }
+				18:   .c + .d { color: green; }`,
+			message: 'Unused CSS selector ".b + .c"',
+			pos: 269,
+			start: { character: 269, column: 1, line: 16 },
+			end: { character: 276, column: 8, line: 16 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				15:   .a + .e { color: green; }
+				16:   .b + .c { color: green; }
+				17:   .b + .d { color: green; }
+				      ^
+				18:   .c + .d { color: green; }
+				19: </style>`,
+			message: 'Unused CSS selector ".b + .d"',
+			pos: 296,
+			start: { character: 296, column: 1, line: 17 },
+			end: { character: 303, column: 8, line: 17 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				16:   .b + .c { color: green; }
+				17:   .b + .d { color: green; }
+				18:   .c + .d { color: green; }
+				      ^
+				19: </style>
+				20:`,
+			message: 'Unused CSS selector ".c + .d"',
+			pos: 323,
+			start: { character: 323, column: 1, line: 18 },
+			end: { character: 330, column: 8, line: 18 }
+		}
+	]
+};
diff --git a/test/css/samples/siblings-combinator-if/expected.css b/test/css/samples/siblings-combinator-if/expected.css
new file mode 100644
index 0000000000..5ea39be7c2
--- /dev/null
+++ b/test/css/samples/siblings-combinator-if/expected.css
@@ -0,0 +1 @@
+.a.svelte-xyz+.b.svelte-xyz{color:green}.a.svelte-xyz+.c.svelte-xyz{color:green}.a.svelte-xyz+.d.svelte-xyz{color:green}.b.svelte-xyz+.e.svelte-xyz{color:green}.c.svelte-xyz+.e.svelte-xyz{color:green}.d.svelte-xyz+.e.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-if/expected.html b/test/css/samples/siblings-combinator-if/expected.html
new file mode 100644
index 0000000000..3d8ac9f966
--- /dev/null
+++ b/test/css/samples/siblings-combinator-if/expected.html
@@ -0,0 +1,3 @@
+<div class="a svelte-xyz"></div>
+<div class="b svelte-xyz"></div>
+<div class="e svelte-xyz"></div>
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-if/input.svelte b/test/css/samples/siblings-combinator-if/input.svelte
new file mode 100644
index 0000000000..6cfc436876
--- /dev/null
+++ b/test/css/samples/siblings-combinator-if/input.svelte
@@ -0,0 +1,31 @@
+<script>
+	let foo = true;
+	let bar = true;
+</script>
+
+<style>
+	.a + .b { color: green; }
+	.a + .c { color: green; }
+	.a + .d { color: green; }
+	.b + .e { color: green; }
+	.c + .e { color: green; }
+	.d + .e { color: green; }
+
+	/* no match */
+	.a + .e { color: green; }
+	.b + .c { color: green; }
+	.b + .d { color: green; }
+	.c + .d { color: green; }
+</style>
+
+<div class="a" />
+
+{#if foo}
+	<div class="b" />
+{:else if bar}
+	<div class="c" />
+{:else}
+	<div class="d" />
+{/if}
+
+<div class="e" />
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-slot/_config.js b/test/css/samples/siblings-combinator-slot/_config.js
new file mode 100644
index 0000000000..8dbb714bd3
--- /dev/null
+++ b/test/css/samples/siblings-combinator-slot/_config.js
@@ -0,0 +1,46 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				 7:
+				 8:   /* no match */
+				 9:   .a + .b { color: green; }
+				      ^
+				10:   .b + .c { color: green; }
+				11:   .c + .f { color: green; }`,
+			message: 'Unused CSS selector ".a + .b"',
+			pos: 84,
+			start: { character: 84, column: 1, line: 9 },
+			end: { character: 91, column: 8, line: 9 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				 8:   /* no match */
+				 9:   .a + .b { color: green; }
+				10:   .b + .c { color: green; }
+				      ^
+				11:   .c + .f { color: green; }
+				12: </style>`,
+			message: 'Unused CSS selector ".b + .c"',
+			pos: 111,
+			start: { character: 111, column: 1, line: 10 },
+			end: { character: 118, column: 8, line: 10 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				 9:   .a + .b { color: green; }
+				10:   .b + .c { color: green; }
+				11:   .c + .f { color: green; }
+				      ^
+				12: </style>
+				13:`,
+			message: 'Unused CSS selector ".c + .f"',
+			pos: 138,
+			start: { character: 138, column: 1, line: 11 },
+			end: { character: 145, column: 8, line: 11 }
+		}
+	]
+};
diff --git a/test/css/samples/siblings-combinator-slot/expected.css b/test/css/samples/siblings-combinator-slot/expected.css
new file mode 100644
index 0000000000..bbdd03f274
--- /dev/null
+++ b/test/css/samples/siblings-combinator-slot/expected.css
@@ -0,0 +1 @@
+.d.svelte-xyz+.e.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-slot/input.svelte b/test/css/samples/siblings-combinator-slot/input.svelte
new file mode 100644
index 0000000000..42fe0e4c30
--- /dev/null
+++ b/test/css/samples/siblings-combinator-slot/input.svelte
@@ -0,0 +1,24 @@
+<script>
+	let App;
+</script>
+
+<style>
+	.d + .e { color: green; }
+	
+	/* no match */
+	.a + .b { color: green; }
+	.b + .c { color: green; }
+	.c + .f { color: green; }
+</style>
+
+<div class="a" />
+<App>
+	<div class="b" slot="a" />
+
+	<div class="c" slot="b">
+		<div class="d" />
+		<div class="e" />
+	</div>
+</App>
+
+<div class="f" />
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-star/_config.js b/test/css/samples/siblings-combinator-star/_config.js
new file mode 100644
index 0000000000..687331e41c
--- /dev/null
+++ b/test/css/samples/siblings-combinator-star/_config.js
@@ -0,0 +1,18 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				3:     margin-left: 4px;
+				4:   }
+				5:   .not-match > * + * {
+				     ^
+				6:     margin-left: 4px;
+				7:   }`,
+			message: 'Unused CSS selector ".not-match > * + *"',
+			pos: 50,
+			start: { character: 50, column: 1, line: 5 },
+      end: { character: 68, column: 19, line: 5 }
+		}
+	]
+};
diff --git a/test/css/samples/siblings-combinator-star/expected.css b/test/css/samples/siblings-combinator-star/expected.css
new file mode 100644
index 0000000000..c1a06945f9
--- /dev/null
+++ b/test/css/samples/siblings-combinator-star/expected.css
@@ -0,0 +1 @@
+.match.svelte-xyz>.svelte-xyz+.svelte-xyz{margin-left:4px}
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-star/expected.html b/test/css/samples/siblings-combinator-star/expected.html
new file mode 100644
index 0000000000..1cfae6e6f7
--- /dev/null
+++ b/test/css/samples/siblings-combinator-star/expected.html
@@ -0,0 +1,7 @@
+<div class="not-match">
+  <div></div>
+</div>
+<div class="match svelte-xyz">
+  <div class="svelte-xyz"></div>
+  <div class="svelte-xyz"></div>
+</div>
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-star/input.svelte b/test/css/samples/siblings-combinator-star/input.svelte
new file mode 100644
index 0000000000..ca837f2239
--- /dev/null
+++ b/test/css/samples/siblings-combinator-star/input.svelte
@@ -0,0 +1,17 @@
+<style>
+	.match > * + * {
+		margin-left: 4px;
+	}
+	.not-match > * + * {
+		margin-left: 4px;
+	}
+</style>
+
+<div class="not-match">
+	<div />
+</div>
+
+<div class="match">
+	<div />
+	<div />
+</div>
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-with-spread/_config.js b/test/css/samples/siblings-combinator-with-spread/_config.js
new file mode 100644
index 0000000000..c81f1a9f82
--- /dev/null
+++ b/test/css/samples/siblings-combinator-with-spread/_config.js
@@ -0,0 +1,3 @@
+export default {
+	warnings: []
+};
diff --git a/test/css/samples/siblings-combinator-with-spread/expected.css b/test/css/samples/siblings-combinator-with-spread/expected.css
new file mode 100644
index 0000000000..aacf6e7db5
--- /dev/null
+++ b/test/css/samples/siblings-combinator-with-spread/expected.css
@@ -0,0 +1 @@
+input.svelte-xyz:focus+div.svelte-xyz{color:red}input.svelte-xyz:focus~div.svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-with-spread/expected.html b/test/css/samples/siblings-combinator-with-spread/expected.html
new file mode 100644
index 0000000000..d732739701
--- /dev/null
+++ b/test/css/samples/siblings-combinator-with-spread/expected.html
@@ -0,0 +1,2 @@
+<input placeholder="Text" class="svelte-xyz">
+<div class="svelte-xyz">Should be red, when input is focused</div>
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator-with-spread/input.svelte b/test/css/samples/siblings-combinator-with-spread/input.svelte
new file mode 100644
index 0000000000..45c889c1ae
--- /dev/null
+++ b/test/css/samples/siblings-combinator-with-spread/input.svelte
@@ -0,0 +1,11 @@
+<script>
+	const test = { placeholder: 'Text' };
+</script>
+
+<style>
+	input:focus + div { color: red; }
+	input:focus ~ div { color: red; }
+</style>
+
+<input {...test}>
+<div>Should be red, when input is focused</div>
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator/_config.js b/test/css/samples/siblings-combinator/_config.js
new file mode 100644
index 0000000000..b54cd28190
--- /dev/null
+++ b/test/css/samples/siblings-combinator/_config.js
@@ -0,0 +1,62 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			frame: `
+				3:     color: green;
+				4:   }
+				5:   article + div {
+				     ^
+				6:     color: green;
+				7:   }`,
+			message: 'Unused CSS selector "article + div"',
+			pos: 45,
+			start: { character: 45, column: 1, line: 5 },
+			end: { character: 58, column: 14, line: 5 }
+		},
+		{
+			code: 'css-unused-selector',
+			
+			frame:`
+				 6:     color: green;
+				 7:   }
+				 8:   span + article {
+				      ^
+				 9:     color: green;
+				10:   }`,
+			message: 'Unused CSS selector "span + article"',
+			pos: 81,
+			start: { character: 81, column: 1, line: 8 },
+			end: { character: 95, column: 15, line: 8 }
+		},
+		{
+			code: 'css-unused-selector',
+			
+			frame: `
+				 9:     color: green;
+				10:   }
+				11:   b + article {
+				      ^
+				12:     color: green;
+				13:   }`,
+			message: 'Unused CSS selector "b + article"',
+			pos: 118,
+			start: { character: 118, column: 1, line: 11 },
+			end: { character: 129, column: 12, line: 11 }
+		},
+		{
+			code: 'css-unused-selector',
+			frame: `
+				12:     color: green;
+				13:   }
+				14:   span + div {
+				      ^
+				15:     color: green;
+				16:   }`,
+			message: 'Unused CSS selector "span + div"',
+			pos: 152,
+			start: { character: 152, column: 1, line: 14 },
+			end: { character: 162, column: 11, line: 14 }
+		}
+	]
+};
diff --git a/test/css/samples/siblings-combinator/expected.css b/test/css/samples/siblings-combinator/expected.css
new file mode 100644
index 0000000000..be01048cf1
--- /dev/null
+++ b/test/css/samples/siblings-combinator/expected.css
@@ -0,0 +1 @@
+div.svelte-xyz+article.svelte-xyz.svelte-xyz{color:green}span.svelte-xyz+b.svelte-xyz.svelte-xyz{color:green}div.svelte-xyz span.svelte-xyz+b.svelte-xyz{color:green}.a.svelte-xyz+article.svelte-xyz.svelte-xyz{color:green}div.svelte-xyz+.b.svelte-xyz.svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator/expected.html b/test/css/samples/siblings-combinator/expected.html
new file mode 100644
index 0000000000..f4692365dd
--- /dev/null
+++ b/test/css/samples/siblings-combinator/expected.html
@@ -0,0 +1,5 @@
+<div class="a svelte-xyz">
+  <span class="svelte-xyz"></span>
+  <b class="svelte-xyz"></b>
+</div>
+<article class="b svelte-xyz"></article>
\ No newline at end of file
diff --git a/test/css/samples/siblings-combinator/input.svelte b/test/css/samples/siblings-combinator/input.svelte
new file mode 100644
index 0000000000..3e22076d52
--- /dev/null
+++ b/test/css/samples/siblings-combinator/input.svelte
@@ -0,0 +1,35 @@
+<style>
+	div + article {
+		color: green;
+	}
+	article + div {
+		color: green;
+	}
+	span + article {
+		color: green;
+	}
+	b + article {
+		color: green;
+	}
+	span + div {
+		color: green;
+	}
+	span + b {
+		color: green;
+	}
+	div span + b {
+		color: green;
+	}
+	.a + article {
+		color: green;
+	}
+	div + .b {
+		color: green;
+	}
+</style>
+
+<div class="a">
+	<span />
+	<b />
+</div>
+<article class="b"></article>
\ No newline at end of file
diff --git a/test/css/samples/unused-selector-child-combinator/_config.js b/test/css/samples/unused-selector-child-combinator/_config.js
new file mode 100644
index 0000000000..603e0d1fd0
--- /dev/null
+++ b/test/css/samples/unused-selector-child-combinator/_config.js
@@ -0,0 +1,45 @@
+export default {
+	warnings: [
+		{
+			code: 'css-unused-selector',
+			message: 'Unused CSS selector "article > *"',
+			frame: `
+			1: <style>
+			2:   article > * {
+			     ^
+			3:     font-size: 36px;
+			4:   }`,
+			pos: 10,
+			start: { character: 10, column: 1, line: 2 },
+			end: { character: 21, column: 12, line: 2 }
+		},
+		{
+			code: 'css-unused-selector',
+			message: 'Unused CSS selector "article *"',
+			frame: `
+			4:   }
+			5:
+			6:   article * {
+			     ^
+			7:     font-size: 36px;
+			8:   }`,
+			pos: 49,
+			start: { character: 49, column: 1, line: 6 },
+			end: { character: 58, column: 10, line: 6 }
+		},
+		{
+			code: 'css-unused-selector',
+			message: 'Unused CSS selector ".article > *"',
+			frame: `
+			 8:   }
+			 9:
+			10:   .article > * {
+			      ^
+			11:     font-size: 48px;
+			12:   }`,
+			pos: 86,
+			start: { character: 86, column: 1, line: 10 },
+			end: { character: 98, column: 13, line: 10 }
+		}
+	]
+};
diff --git a/test/css/samples/unused-selector-child-combinator/expected.css b/test/css/samples/unused-selector-child-combinator/expected.css
new file mode 100644
index 0000000000..68b778844f
--- /dev/null
+++ b/test/css/samples/unused-selector-child-combinator/expected.css
@@ -0,0 +1 @@
+div.svelte-xyz>.svelte-xyz{color:orange}
\ No newline at end of file
diff --git a/test/css/samples/unused-selector-child-combinator/input.svelte b/test/css/samples/unused-selector-child-combinator/input.svelte
new file mode 100644
index 0000000000..33a27e0465
--- /dev/null
+++ b/test/css/samples/unused-selector-child-combinator/input.svelte
@@ -0,0 +1,23 @@
+<style>	
+	article > * {
+		font-size: 36px;
+  }
+
+	article * {
+		font-size: 36px;
+	}
+	
+	.article > * {
+		font-size: 48px;
+	}
+	
+	div > * {
+		color: orange;
+	}
+</style>
+
+<div>
+	<p>
+		Svelte REPLs are svelte.
+	</p>
+</div>
\ No newline at end of file
diff --git a/test/css/samples/unused-selector-leading/_config.js b/test/css/samples/unused-selector-leading/_config.js
index 2516567f59..8d1c41af1c 100644
--- a/test/css/samples/unused-selector-leading/_config.js
+++ b/test/css/samples/unused-selector-leading/_config.js
@@ -1,8 +1,8 @@
 export default {
 	warnings: [
 		{
-			filename: "SvelteComponent.svelte",
-			code: `css-unused-selector`,
+			filename: 'SvelteComponent.svelte',
+			code: 'css-unused-selector',
 			message: 'Unused CSS selector ".foo"',
 			start: {
 				line: 4,
@@ -25,8 +25,8 @@ export default {
 		},
 
 		{
-			filename: "SvelteComponent.svelte",
-			code: `css-unused-selector`,
+			filename: 'SvelteComponent.svelte',
+			code: 'css-unused-selector',
 			message: 'Unused CSS selector ".baz"',
 			start: {
 				line: 4,
@@ -48,4 +48,4 @@ export default {
 				6:   }`
 		}
 	]
-};
\ No newline at end of file
+};
diff --git a/test/css/samples/unused-selector-string-concat/_config.js b/test/css/samples/unused-selector-string-concat/_config.js
index ea8f85754e..78fce87b69 100644
--- a/test/css/samples/unused-selector-string-concat/_config.js
+++ b/test/css/samples/unused-selector-string-concat/_config.js
@@ -12,7 +12,7 @@ export default {
 				13:   .foocc {color: red;}`,
 			start: { line: 11, column: 2, character: 206 },
 			end: { line: 11, column: 8, character: 212 },
-			pos: 206,
+			pos: 206
 		},
 		{
 			code: 'css-unused-selector',
@@ -26,7 +26,7 @@ export default {
 				14:   .foodd {color: red;}`,
 			start: { line: 12, column: 2, character: 229 },
 			end: { line: 12, column: 8, character: 235 },
-			pos: 229,
+			pos: 229
 		},
 		{
 			code: 'css-unused-selector',
@@ -40,7 +40,7 @@ export default {
 				16:   .bb {color: red;}`,
 			start: { line: 14, column: 2, character: 275 },
 			end: { line: 14, column: 8, character: 281 },
-			pos: 275,
+			pos: 275
 		},
 		{
 			code: 'css-unused-selector',
@@ -54,7 +54,7 @@ export default {
 				22:   .ddbar {color: red;}`,
 			start: { line: 20, column: 2, character: 401 },
 			end: { line: 20, column: 8, character: 407 },
-			pos: 401,
+			pos: 401
 		},
 		{
 			code: 'css-unused-selector',
@@ -68,7 +68,7 @@ export default {
 				23:   .fooaabar {color: red;}`,
 			start: { line: 21, column: 2, character: 424 },
 			end: { line: 21, column: 8, character: 430 },
-			pos: 424,
+			pos: 424
 		},
 		{
 			code: 'css-unused-selector',
@@ -82,7 +82,7 @@ export default {
 				24:   .foobbbar {color: red;}`,
 			start: { line: 22, column: 2, character: 447 },
 			end: { line: 22, column: 8, character: 453 },
-			pos: 447,
+			pos: 447
 		},
 		{
 			code: 'css-unused-selector',
@@ -96,7 +96,7 @@ export default {
 				25:   .fooccbar {color: red;}`,
 			start: { line: 23, column: 2, character: 470 },
 			end: { line: 23, column: 11, character: 479 },
-			pos: 470,
+			pos: 470
 		},
 		{
 			code: 'css-unused-selector',
@@ -110,7 +110,7 @@ export default {
 				26:   .fooddbar {color: red;}`,
 			start: { line: 24, column: 2, character: 496 },
 			end: { line: 24, column: 11, character: 505 },
-			pos: 496,
+			pos: 496
 		},
 		{
 			code: 'css-unused-selector',
@@ -124,7 +124,7 @@ export default {
 				27:   .baz {color: red;}`,
 			start: { line: 25, column: 2, character: 522 },
 			end: { line: 25, column: 11, character: 531 },
-			pos: 522,
+			pos: 522
 		},
 		{
 			code: 'css-unused-selector',
@@ -137,7 +137,7 @@ export default {
 				29: </style>`,
 			start: { line: 28, column: 2, character: 595 },
 			end: { line: 28, column: 9, character: 602 },
-			pos: 595,
-		},
-	],
+			pos: 595
+		}
+	]
 };
diff --git a/test/css/samples/unused-selector-ternary-bailed/_config.js b/test/css/samples/unused-selector-ternary-bailed/_config.js
index e5f82e4a85..c81f1a9f82 100644
--- a/test/css/samples/unused-selector-ternary-bailed/_config.js
+++ b/test/css/samples/unused-selector-ternary-bailed/_config.js
@@ -1,3 +1,3 @@
 export default {
-	warnings: [],
+	warnings: []
 };
diff --git a/test/css/samples/unused-selector-ternary-concat/_config.js b/test/css/samples/unused-selector-ternary-concat/_config.js
index 1f2bdcc47e..c95b76e440 100644
--- a/test/css/samples/unused-selector-ternary-concat/_config.js
+++ b/test/css/samples/unused-selector-ternary-concat/_config.js
@@ -5,7 +5,7 @@ export default {
 			end: {
 				character: 205,
 				column: 9,
-				line: 14,
+				line: 14
 			},
 			frame: `
 				12:   .thing.active {color: blue;}
@@ -18,8 +18,8 @@ export default {
 			start: {
 				character: 198,
 				column: 2,
-				line: 14,
-			},
-		},
-	],
+				line: 14
+			}
+		}
+	]
 };
diff --git a/test/css/samples/unused-selector-ternary-nested/_config.js b/test/css/samples/unused-selector-ternary-nested/_config.js
index 936ac639e5..1898599950 100644
--- a/test/css/samples/unused-selector-ternary-nested/_config.js
+++ b/test/css/samples/unused-selector-ternary-nested/_config.js
@@ -12,7 +12,7 @@ export default {
 				17:   .unused {color: blue;}`,
 			start: { line: 15, column: 2, character: 261 },
 			end: { line: 15, column: 15, character: 274 },
-			pos: 261,
+			pos: 261
 		},
 		{
 			code: 'css-unused-selector',
@@ -25,7 +25,7 @@ export default {
 				18: </style>`,
 			start: { line: 17, column: 2, character: 295 },
 			end: { line: 17, column: 9, character: 302 },
-			pos: 295,
-		},
-	],
+			pos: 295
+		}
+	]
 };
diff --git a/test/css/samples/unused-selector-ternary/_config.js b/test/css/samples/unused-selector-ternary/_config.js
index 4eb12f3fe2..7009e60cc0 100644
--- a/test/css/samples/unused-selector-ternary/_config.js
+++ b/test/css/samples/unused-selector-ternary/_config.js
@@ -4,8 +4,8 @@ export default {
 	},
 
 	warnings: [{
-		filename: "SvelteComponent.svelte",
-		code: `css-unused-selector`,
+		filename: 'SvelteComponent.svelte',
+		code: 'css-unused-selector',
 		message: 'Unused CSS selector ".maybeactive"',
 		start: {
 			line: 16,
@@ -26,4 +26,4 @@ export default {
 			17:     color: green;
 			18:   }`
 	}]
-};
\ No newline at end of file
+};
diff --git a/test/css/samples/unused-selector/_config.js b/test/css/samples/unused-selector/_config.js
index 790eb9e875..ed1a2032ca 100644
--- a/test/css/samples/unused-selector/_config.js
+++ b/test/css/samples/unused-selector/_config.js
@@ -1,7 +1,7 @@
 export default {
 	warnings: [{
-		filename: "SvelteComponent.svelte",
-		code: `css-unused-selector`,
+		filename: 'SvelteComponent.svelte',
+		code: 'css-unused-selector',
 		message: 'Unused CSS selector ".bar"',
 		start: {
 			line: 8,
@@ -22,4 +22,4 @@ export default {
 			 9:     color: blue;
 			10:   }`
 	}]
-};
\ No newline at end of file
+};
diff --git a/test/custom-elements/assert.js b/test/custom-elements/assert.js
index 0edbd31124..4ee8d9dda0 100644
--- a/test/custom-elements/assert.js
+++ b/test/custom-elements/assert.js
@@ -30,4 +30,25 @@ export function equal(a, b, message) {
 
 export function ok(condition, message) {
 	if (!condition) throw new Error(message || `Expected ${condition} to be truthy`);
-}
\ No newline at end of file
+}
+
+export function htmlEqual(actual, expected, message) {
+	return deepEqual(
+		normalizeHtml(window, actual),
+		normalizeHtml(window, expected),
+		message
+	);
+}
+
+function normalizeHtml(window, html) {
+	try {
+		const node = window.document.createElement('div');
+		node.innerHTML = html
+			.replace(/<!--.*?-->/g, '')
+			.replace(/>[\s\r\n]+</g, '><')
+			.trim();
+		return node.innerHTML.replace(/<\/?noscript\/?>/g, '');
+	} catch (err) {
+		throw new Error(`Failed to normalize HTML:\n${html}`);
+	}
+}
diff --git a/test/custom-elements/index.js b/test/custom-elements/index.ts
similarity index 93%
rename from test/custom-elements/index.js
rename to test/custom-elements/index.ts
index 1329dbd2cf..d3644a3142 100644
--- a/test/custom-elements/index.js
+++ b/test/custom-elements/index.ts
@@ -2,9 +2,9 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as http from 'http';
 import { rollup } from 'rollup';
-import * as virtual from '@rollup/plugin-virtual';
-import * as puppeteer from 'puppeteer';
-import { addLineNumbers, loadConfig, loadSvelte } from "../helpers.js";
+import virtual from '@rollup/plugin-virtual';
+import puppeteer from 'puppeteer';
+import { addLineNumbers, loadConfig, loadSvelte } from '../helpers';
 import { deepEqual } from 'assert';
 
 const page = `
@@ -87,7 +87,7 @@ describe('custom-elements', function() {
 
 						transform(code, id) {
 							if (id.endsWith('.svelte')) {
-								const compiled = svelte.compile(code.replace(/\r/g, ""), {
+								const compiled = svelte.compile(code.replace(/\r/g, ''), {
 									customElement: true,
 									dev: config.dev
 								});
diff --git a/test/custom-elements/samples/$$props/main.svelte b/test/custom-elements/samples/$$props/main.svelte
new file mode 100644
index 0000000000..68931e22db
--- /dev/null
+++ b/test/custom-elements/samples/$$props/main.svelte
@@ -0,0 +1,10 @@
+<svelte:options tag="custom-element"/>
+
+<script>
+	export let name;
+</script>
+
+<p>name: {name}</p>
+<p>$$props: {JSON.stringify($$props)}</p>
+<p>$$restProps: {JSON.stringify($$restProps)}</p>
+
diff --git a/test/custom-elements/samples/$$props/test.js b/test/custom-elements/samples/$$props/test.js
new file mode 100644
index 0000000000..94cad86577
--- /dev/null
+++ b/test/custom-elements/samples/$$props/test.js
@@ -0,0 +1,13 @@
+import * as assert from 'assert';
+import './main.svelte';
+
+export default function (target) {
+	target.innerHTML = '<custom-element name="world" answer="42" test="svelte"></custom-element>';
+	const el = target.querySelector('custom-element');
+
+	assert.htmlEqual(el.shadowRoot.innerHTML, `
+		<p>name: world</p>
+		<p>$$props: {"name":"world","answer":"42","test":"svelte"}</p>
+		<p>$$restProps: {"answer":"42","test":"svelte"}</p>
+	`);
+}
diff --git a/test/custom-elements/samples/custom-method/test.js b/test/custom-elements/samples/custom-method/test.js
index e274786079..08c58c3383 100644
--- a/test/custom-elements/samples/custom-method/test.js
+++ b/test/custom-elements/samples/custom-method/test.js
@@ -9,4 +9,4 @@ export default async function (target) {
 
 	const p = el.shadowRoot.querySelector('p');
 	assert.equal(p.textContent, '42');
-}
\ No newline at end of file
+}
diff --git a/test/custom-elements/samples/escaped-css/test.js b/test/custom-elements/samples/escaped-css/test.js
index 3696ee8c1b..6277ccba32 100644
--- a/test/custom-elements/samples/escaped-css/test.js
+++ b/test/custom-elements/samples/escaped-css/test.js
@@ -10,4 +10,4 @@ export default function (target) {
 	const before = getComputedStyle(icon, '::before');
 
 	assert.equal(before.content, JSON.stringify(String.fromCharCode(0xff)));
-}
\ No newline at end of file
+}
diff --git a/test/custom-elements/samples/extended-builtin/_config.js b/test/custom-elements/samples/extended-builtin/_config.js
index cbd57acc65..932460335f 100644
--- a/test/custom-elements/samples/extended-builtin/_config.js
+++ b/test/custom-elements/samples/extended-builtin/_config.js
@@ -1,6 +1,6 @@
 export default {
 	warnings: [{
-		code: "avoid-is",
+		code: 'avoid-is',
 		message: "The 'is' attribute is not supported cross-browser and should be avoided",
 		pos: 98,
 		start: {
diff --git a/test/custom-elements/samples/extended-builtin/custom-button.js b/test/custom-elements/samples/extended-builtin/custom-button.js
index 9134b2af9f..19fe4aa0e7 100644
--- a/test/custom-elements/samples/extended-builtin/custom-button.js
+++ b/test/custom-elements/samples/extended-builtin/custom-button.js
@@ -1,2 +1,2 @@
 class CustomButton extends HTMLButtonElement {}
-customElements.define('custom-button', CustomButton, { extends: 'button' });
\ No newline at end of file
+customElements.define('custom-button', CustomButton, { extends: 'button' });
diff --git a/test/custom-elements/samples/extended-builtin/test.js b/test/custom-elements/samples/extended-builtin/test.js
index 3886ae1149..a2f253e5d4 100644
--- a/test/custom-elements/samples/extended-builtin/test.js
+++ b/test/custom-elements/samples/extended-builtin/test.js
@@ -12,4 +12,4 @@ export default function (target) {
 	const button = el.shadowRoot.querySelector('button');
 
 	assert.ok(button instanceof customElements.get('custom-button'));
-}
\ No newline at end of file
+}
diff --git a/test/custom-elements/samples/html-slots/test.js b/test/custom-elements/samples/html-slots/test.js
index bb38a83eab..06d18d9944 100644
--- a/test/custom-elements/samples/html-slots/test.js
+++ b/test/custom-elements/samples/html-slots/test.js
@@ -14,4 +14,4 @@ export default function (target) {
 
 	assert.equal(slot0.assignedNodes()[1], target.querySelector('strong'));
 	assert.equal(slot1.assignedNodes().length, 0);
-}
\ No newline at end of file
+}
diff --git a/test/custom-elements/samples/html/test.js b/test/custom-elements/samples/html/test.js
index 1638ead784..4e38fd6c2d 100644
--- a/test/custom-elements/samples/html/test.js
+++ b/test/custom-elements/samples/html/test.js
@@ -9,4 +9,4 @@ export default function (target) {
 
 	const h1 = el.shadowRoot.querySelector('h1');
 	assert.equal(h1.textContent, 'Hello world!');
-}
\ No newline at end of file
+}
diff --git a/test/custom-elements/samples/nested.skip/test.js b/test/custom-elements/samples/nested.skip/test.js
index 85320297ea..09edc38f54 100644
--- a/test/custom-elements/samples/nested.skip/test.js
+++ b/test/custom-elements/samples/nested.skip/test.js
@@ -8,10 +8,10 @@ export default async function (target) {
 	const button = counter.shadowRoot.querySelector('button');
 
 	assert.equal(counter.count, 0);
-	assert.equal(counter.shadowRoot.innerHTML, `<button>count: 0</button>`);
+	assert.equal(counter.shadowRoot.innerHTML, '<button>count: 0</button>');
 
 	await button.dispatchEvent(new MouseEvent('click'));
 
 	assert.equal(counter.count, 1);
-	assert.equal(counter.shadowRoot.innerHTML, `<button>count: 1</button>`);
-}
\ No newline at end of file
+	assert.equal(counter.shadowRoot.innerHTML, '<button>count: 1</button>');
+}
diff --git a/test/custom-elements/samples/new-styled/test.js b/test/custom-elements/samples/new-styled/test.js
index f027121009..72c2cecd10 100644
--- a/test/custom-elements/samples/new-styled/test.js
+++ b/test/custom-elements/samples/new-styled/test.js
@@ -16,4 +16,4 @@ export default function (target) {
 
 	assert.equal(getComputedStyle(unstyled).color, 'rgb(0, 0, 0)');
 	assert.equal(getComputedStyle(styled).color, 'rgb(255, 0, 0)');
-}
\ No newline at end of file
+}
diff --git a/test/custom-elements/samples/new/test.js b/test/custom-elements/samples/new/test.js
index 1137495e35..88ba69ab69 100644
--- a/test/custom-elements/samples/new/test.js
+++ b/test/custom-elements/samples/new/test.js
@@ -15,4 +15,4 @@ export default function (target) {
 	const h1 = el.shadowRoot.querySelector('h1');
 
 	assert.equal(h1.textContent, 'Hello world!');
-}
\ No newline at end of file
+}
diff --git a/test/custom-elements/samples/no-missing-prop-warnings/_config.js b/test/custom-elements/samples/no-missing-prop-warnings/_config.js
index e26996239d..083edcd210 100644
--- a/test/custom-elements/samples/no-missing-prop-warnings/_config.js
+++ b/test/custom-elements/samples/no-missing-prop-warnings/_config.js
@@ -1,3 +1,3 @@
 export default {
 	dev: true
-};
\ No newline at end of file
+};
diff --git a/test/custom-elements/samples/no-missing-prop-warnings/test.js b/test/custom-elements/samples/no-missing-prop-warnings/test.js
index 1909e7aef9..6f15b63920 100644
--- a/test/custom-elements/samples/no-missing-prop-warnings/test.js
+++ b/test/custom-elements/samples/no-missing-prop-warnings/test.js
@@ -12,8 +12,8 @@ export default function (target) {
 	target.innerHTML = '<my-app foo=yes />';
 
 	assert.deepEqual(warnings, [
-		`<my-app> was created without expected prop 'bar'`
+		"<my-app> was created without expected prop 'bar'"
 	]);
 
 	console.warn = warn;
-}
\ No newline at end of file
+}
diff --git a/test/custom-elements/samples/no-svelte-options/_config.js b/test/custom-elements/samples/no-svelte-options/_config.js
index e45582a127..98273f767f 100644
--- a/test/custom-elements/samples/no-svelte-options/_config.js
+++ b/test/custom-elements/samples/no-svelte-options/_config.js
@@ -1,6 +1,6 @@
 export default {
 	warnings: [{
-		code: "custom-element-no-tag",
+		code: 'custom-element-no-tag',
 		message: "No custom element 'tag' option was specified. To automatically register a custom element, specify a name with a hyphen in it, e.g. <svelte:options tag=\"my-thing\"/>. To hide this warning, use <svelte:options tag={null}/>",
 		pos: 0,
 		start: {
diff --git a/test/custom-elements/samples/no-svelte-options/test.js b/test/custom-elements/samples/no-svelte-options/test.js
index c77f035088..e6ce82d1a4 100644
--- a/test/custom-elements/samples/no-svelte-options/test.js
+++ b/test/custom-elements/samples/no-svelte-options/test.js
@@ -3,7 +3,7 @@ import CustomElement from './main.svelte';
 
 export default function (target) {
 	customElements.define('no-tag', CustomElement);
-	target.innerHTML = `<no-tag name="world"></no-tag>`;
+	target.innerHTML = '<no-tag name="world"></no-tag>';
 
 	const el = target.querySelector('no-tag');
 	const h1 = el.shadowRoot.querySelector('h1');
diff --git a/test/custom-elements/samples/no-tag-warning/_config.js b/test/custom-elements/samples/no-tag-warning/_config.js
index 7cdfdbaec6..fb476a7b5b 100644
--- a/test/custom-elements/samples/no-tag-warning/_config.js
+++ b/test/custom-elements/samples/no-tag-warning/_config.js
@@ -1,6 +1,6 @@
 export default {
 	warnings: [{
-		code: "custom-element-no-tag",
+		code: 'custom-element-no-tag',
 		message: "No custom element 'tag' option was specified. To automatically register a custom element, specify a name with a hyphen in it, e.g. <svelte:options tag=\"my-thing\"/>. To hide this warning, use <svelte:options tag={null}/>",
 		pos: 0,
 		start: {
diff --git a/test/custom-elements/samples/no-tag-warning/test.js b/test/custom-elements/samples/no-tag-warning/test.js
index c77f035088..e6ce82d1a4 100644
--- a/test/custom-elements/samples/no-tag-warning/test.js
+++ b/test/custom-elements/samples/no-tag-warning/test.js
@@ -3,7 +3,7 @@ import CustomElement from './main.svelte';
 
 export default function (target) {
 	customElements.define('no-tag', CustomElement);
-	target.innerHTML = `<no-tag name="world"></no-tag>`;
+	target.innerHTML = '<no-tag name="world"></no-tag>';
 
 	const el = target.querySelector('no-tag');
 	const h1 = el.shadowRoot.querySelector('h1');
diff --git a/test/custom-elements/samples/no-tag/test.js b/test/custom-elements/samples/no-tag/test.js
index c77f035088..e6ce82d1a4 100644
--- a/test/custom-elements/samples/no-tag/test.js
+++ b/test/custom-elements/samples/no-tag/test.js
@@ -3,7 +3,7 @@ import CustomElement from './main.svelte';
 
 export default function (target) {
 	customElements.define('no-tag', CustomElement);
-	target.innerHTML = `<no-tag name="world"></no-tag>`;
+	target.innerHTML = '<no-tag name="world"></no-tag>';
 
 	const el = target.querySelector('no-tag');
 	const h1 = el.shadowRoot.querySelector('h1');
diff --git a/test/custom-elements/samples/oncreate/test.js b/test/custom-elements/samples/oncreate/test.js
index 11d76078f2..c33f8a6a10 100644
--- a/test/custom-elements/samples/oncreate/test.js
+++ b/test/custom-elements/samples/oncreate/test.js
@@ -5,4 +5,4 @@ export default function (target) {
 	target.innerHTML = '<my-app/>';
 	const el = target.querySelector('my-app');
 	assert.ok(el.wasCreated);
-}
\ No newline at end of file
+}
diff --git a/test/custom-elements/samples/props/test.js b/test/custom-elements/samples/props/test.js
index 9c7e44c3a3..fc8c01c623 100644
--- a/test/custom-elements/samples/props/test.js
+++ b/test/custom-elements/samples/props/test.js
@@ -20,4 +20,4 @@ export default function (target) {
 
 	assert.equal(p1.textContent, '5 items');
 	assert.equal(p2.textContent, 'd, e, f, g, h');
-}
\ No newline at end of file
+}
diff --git a/test/helpers.js b/test/helpers.ts
similarity index 95%
rename from test/helpers.js
rename to test/helpers.ts
index a764d43f96..78f000c274 100644
--- a/test/helpers.js
+++ b/test/helpers.ts
@@ -1,9 +1,10 @@
+import * as assert$1 from 'assert';
 import * as jsdom from 'jsdom';
-import * as assert from 'assert';
-import * as glob from 'tiny-glob/sync.js';
+import glob from 'tiny-glob/sync';
 import * as path from 'path';
 import * as fs from 'fs';
 import * as colors from 'kleur';
+export const assert = (assert$1 as unknown) as typeof assert$1 & { htmlEqual: (actual, expected, message?) => void };
 
 // for coverage purposes, we need to test source files,
 // but for sanity purposes, we need to test dist files
@@ -63,7 +64,7 @@ global.window = window;
 
 // add missing ecmascript globals to window
 for (const key of Object.getOwnPropertyNames(global)) {
-	window[key] = window[key] || global[key];
+	if (!(key in window)) window[key] = global[key];
 }
 
 // implement mock scroll
@@ -153,6 +154,7 @@ export function normalizeHtml(window, html) {
 export function setupHtmlEqual() {
 	const window = env();
 
+	// eslint-disable-next-line no-import-assign
 	assert.htmlEqual = (actual, expected, message) => {
 		assert.deepEqual(
 			normalizeHtml(window, actual),
@@ -257,4 +259,4 @@ export function mkdirp(dir) {
 	} catch (err) {
 		// do nothing
 	}
-}
\ No newline at end of file
+}
diff --git a/test/hydration/index.js b/test/hydration/index.ts
similarity index 91%
rename from test/hydration/index.js
rename to test/hydration/index.ts
index f57a0cdc1a..2eefee3fac 100644
--- a/test/hydration/index.js
+++ b/test/hydration/index.ts
@@ -1,15 +1,15 @@
-import * as assert from 'assert';
 import * as path from 'path';
 import * as fs from 'fs';
 
 import {
+	assert,
 	showOutput,
 	loadConfig,
 	loadSvelte,
 	env,
 	setupHtmlEqual,
 	shouldUpdateExpected
-} from '../helpers.js';
+} from '../helpers';
 
 let compileOptions = null;
 
@@ -58,13 +58,7 @@ describe('hydration', () => {
 			try {
 				global.window = window;
 
-				let SvelteComponent;
-
-				try {
-					SvelteComponent = require(`${cwd}/main.svelte`).default;
-				} catch (err) {
-					throw err;
-				}
+				const SvelteComponent = require(`${cwd}/main.svelte`).default;
 
 				const target = window.document.body;
 				const head = window.document.head;
@@ -75,7 +69,9 @@ describe('hydration', () => {
 				try {
 					before_head = fs.readFileSync(`${cwd}/_before_head.html`, 'utf-8');
 					head.innerHTML = before_head;
-				} catch (err) {}
+				} catch (err) {
+					// continue regardless of error
+				}
 
 				const snapshot = config.snapshot ? config.snapshot(target) : {};
 
@@ -122,9 +118,11 @@ describe('hydration', () => {
 				throw err;
 			}
 
-			if (config.show) showOutput(cwd, {
-				hydratable: true
-			});
+			if (config.show) {
+				showOutput(cwd, {
+					hydratable: true
+				});
+			}
 		});
 	}
 
diff --git a/test/hydration/samples/basic/_config.js b/test/hydration/samples/basic/_config.js
index 79d91d0d8a..81d01322e4 100644
--- a/test/hydration/samples/basic/_config.js
+++ b/test/hydration/samples/basic/_config.js
@@ -14,4 +14,4 @@ export default {
 		assert.equal(h1, snapshot.h1);
 		assert.equal(h1.childNodes[0], snapshot.text);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/binding-input/_config.js b/test/hydration/samples/binding-input/_config.js
index 9004d06490..ac3a6be43a 100644
--- a/test/hydration/samples/binding-input/_config.js
+++ b/test/hydration/samples/binding-input/_config.js
@@ -26,4 +26,4 @@ export default {
 			<p>Hello everybody!</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/component-in-element/_config.js b/test/hydration/samples/component-in-element/_config.js
index 790b026400..557fe068c4 100644
--- a/test/hydration/samples/component-in-element/_config.js
+++ b/test/hydration/samples/component-in-element/_config.js
@@ -18,4 +18,4 @@ export default {
 		assert.equal(p, snapshot.p);
 		assert.equal(p.childNodes[0], snapshot.text);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/component/_config.js b/test/hydration/samples/component/_config.js
index c26b3c7ad0..4435b2f86e 100644
--- a/test/hydration/samples/component/_config.js
+++ b/test/hydration/samples/component/_config.js
@@ -14,4 +14,4 @@ export default {
 		assert.equal(p, snapshot.p);
 		assert.equal(p.childNodes[0], snapshot.text);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/dynamic-text-changed/_config.js b/test/hydration/samples/dynamic-text-changed/_config.js
index 467aef49ac..c42e251464 100644
--- a/test/hydration/samples/dynamic-text-changed/_config.js
+++ b/test/hydration/samples/dynamic-text-changed/_config.js
@@ -18,4 +18,4 @@ export default {
 		assert.equal(h1, snapshot.h1);
 		assert.equal(h1.childNodes[0], snapshot.text);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/dynamic-text-nil/_config.js b/test/hydration/samples/dynamic-text-nil/_config.js
index 0f98a704b0..b4d013b777 100644
--- a/test/hydration/samples/dynamic-text-nil/_config.js
+++ b/test/hydration/samples/dynamic-text-nil/_config.js
@@ -7,7 +7,7 @@ export default {
 
 		return {
 			nullText,
-			undefinedText,
+			undefinedText
 		};
 	},
 
@@ -17,5 +17,5 @@ export default {
 
 		assert.equal(nullText, snapshot.nullText);
 		assert.equal(undefinedText, snapshot.undefinedText);
-	},
+	}
 };
diff --git a/test/hydration/samples/dynamic-text/_config.js b/test/hydration/samples/dynamic-text/_config.js
index a7f0fc3d8b..47e095d4ca 100644
--- a/test/hydration/samples/dynamic-text/_config.js
+++ b/test/hydration/samples/dynamic-text/_config.js
@@ -18,4 +18,4 @@ export default {
 		assert.equal(h1, snapshot.h1);
 		assert.equal(h1.childNodes[0], snapshot.text);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/each-block/_config.js b/test/hydration/samples/each-block/_config.js
index 5c58a4c232..81f0a75831 100644
--- a/test/hydration/samples/each-block/_config.js
+++ b/test/hydration/samples/each-block/_config.js
@@ -26,4 +26,4 @@ export default {
 		assert.equal(lis[1], snapshot.lis[1]);
 		assert.equal(lis[2], snapshot.lis[2]);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/element-attribute-added/_config.js b/test/hydration/samples/element-attribute-added/_config.js
index fb4a90bd3d..a662743c2c 100644
--- a/test/hydration/samples/element-attribute-added/_config.js
+++ b/test/hydration/samples/element-attribute-added/_config.js
@@ -16,4 +16,4 @@ export default {
 
 		assert.equal(div, snapshot.div);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/element-attribute-changed/_config.js b/test/hydration/samples/element-attribute-changed/_config.js
index 05881f748f..d402e35d7b 100644
--- a/test/hydration/samples/element-attribute-changed/_config.js
+++ b/test/hydration/samples/element-attribute-changed/_config.js
@@ -16,4 +16,4 @@ export default {
 
 		assert.equal(div, snapshot.div);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/element-attribute-removed/_config.js b/test/hydration/samples/element-attribute-removed/_config.js
index 05881f748f..d402e35d7b 100644
--- a/test/hydration/samples/element-attribute-removed/_config.js
+++ b/test/hydration/samples/element-attribute-removed/_config.js
@@ -16,4 +16,4 @@ export default {
 
 		assert.equal(div, snapshot.div);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/element-attribute-unchanged/_config.js b/test/hydration/samples/element-attribute-unchanged/_config.js
index d41f5db0fb..d9d220b6e5 100644
--- a/test/hydration/samples/element-attribute-unchanged/_config.js
+++ b/test/hydration/samples/element-attribute-unchanged/_config.js
@@ -12,4 +12,4 @@ export default {
 
 		assert.equal(div, snapshot.div);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/element-nested/_config.js b/test/hydration/samples/element-nested/_config.js
index 0965bc39c6..cd34008c04 100644
--- a/test/hydration/samples/element-nested/_config.js
+++ b/test/hydration/samples/element-nested/_config.js
@@ -14,4 +14,4 @@ export default {
 		assert.equal(div, snapshot.div);
 		assert.equal(div.querySelector('p'), snapshot.p);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/element-ref/_config.js b/test/hydration/samples/element-ref/_config.js
index 772fad9827..80d681f7c5 100644
--- a/test/hydration/samples/element-ref/_config.js
+++ b/test/hydration/samples/element-ref/_config.js
@@ -3,7 +3,7 @@ export default {
 		const h1 = target.querySelector('h1');
 
 		return {
-			h1,
+			h1
 		};
 	},
 
@@ -13,4 +13,4 @@ export default {
 		assert.equal(h1, snapshot.h1);
 		assert.equal(component.h1, h1);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/event-handler/_config.js b/test/hydration/samples/event-handler/_config.js
index cdf7431836..027b2bd15b 100644
--- a/test/hydration/samples/event-handler/_config.js
+++ b/test/hydration/samples/event-handler/_config.js
@@ -23,4 +23,4 @@ export default {
 			<p>clicked!</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/if-block-anchor/_config.js b/test/hydration/samples/if-block-anchor/_config.js
index ee5ed39ad9..ab519c913b 100644
--- a/test/hydration/samples/if-block-anchor/_config.js
+++ b/test/hydration/samples/if-block-anchor/_config.js
@@ -23,4 +23,4 @@ export default {
 		assert.equal(ps[0], snapshot.p0);
 		assert.equal(ps[1], snapshot.p1);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/if-block-false/_config.js b/test/hydration/samples/if-block-false/_config.js
index 6be30614f8..a11d800e45 100644
--- a/test/hydration/samples/if-block-false/_config.js
+++ b/test/hydration/samples/if-block-false/_config.js
@@ -16,4 +16,4 @@ export default {
 
 		assert.equal(p, snapshot.p);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/if-block-update/_config.js b/test/hydration/samples/if-block-update/_config.js
index 75d056e04d..fb4a723145 100644
--- a/test/hydration/samples/if-block-update/_config.js
+++ b/test/hydration/samples/if-block-update/_config.js
@@ -19,6 +19,6 @@ export default {
 
 		component.foo = false;
 		component.bar = true;
-		assert.htmlEqual(target.innerHTML, `<p>bar!</p>`);
+		assert.htmlEqual(target.innerHTML, '<p>bar!</p>');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/if-block/_config.js b/test/hydration/samples/if-block/_config.js
index 7aca2ce55d..bd89748dc0 100644
--- a/test/hydration/samples/if-block/_config.js
+++ b/test/hydration/samples/if-block/_config.js
@@ -16,4 +16,4 @@ export default {
 
 		assert.equal(p, snapshot.p);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/raw/_config.js b/test/hydration/samples/raw/_config.js
index 4af36b099e..f4fb2889cd 100644
--- a/test/hydration/samples/raw/_config.js
+++ b/test/hydration/samples/raw/_config.js
@@ -2,7 +2,7 @@ export default {
 	skip: true, // existing nodes are blown away
 
 	props: {
-		raw: `<p>this is some html</p> <p>and so is this</p>`
+		raw: '<p>this is some html</p> <p>and so is this</p>'
 	},
 
 	snapshot(target) {
@@ -24,4 +24,4 @@ export default {
 		assert.equal(ps[1], snapshot.p1);
 		assert.equal(ps[1].firstChild, snapshot.text1);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/hydration/samples/top-level-text/_config.js b/test/hydration/samples/top-level-text/_config.js
index e8a81e7ca1..2ccf126555 100644
--- a/test/hydration/samples/top-level-text/_config.js
+++ b/test/hydration/samples/top-level-text/_config.js
@@ -10,4 +10,4 @@ export default {
 
 		assert.equal(text, snapshot.text);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/js/index.js b/test/js/index.ts
similarity index 70%
rename from test/js/index.js
rename to test/js/index.ts
index 8aa4cc76a9..b94c9c01d6 100644
--- a/test/js/index.js
+++ b/test/js/index.ts
@@ -1,18 +1,18 @@
-import * as assert from "assert";
-import * as fs from "fs";
-import * as path from "path";
-import * as colors from "kleur";
-import { loadConfig, svelte, shouldUpdateExpected } from "../helpers.js";
+import * as assert from 'assert';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as colors from 'kleur';
+import { loadConfig, svelte, shouldUpdateExpected } from '../helpers';
 
-describe("js", () => {
+describe('js', () => {
 	fs.readdirSync(`${__dirname}/samples`).forEach(dir => {
-		if (dir[0] === ".") return;
+		if (dir[0] === '.') return;
 
 		// add .solo to a sample directory name to only run that test
 		const solo = /\.solo/.test(dir);
 
 		if (solo && process.env.CI) {
-			throw new Error("Forgot to remove `solo: true` from test");
+			throw new Error('Forgot to remove `solo: true` from test');
 		}
 
 		const resolved = path.resolve(`${__dirname}/samples`, dir);
@@ -25,7 +25,7 @@ describe("js", () => {
 		(solo ? it.only : it)(dir, () => {
 			const config = loadConfig(`${resolved}/_config.js`);
 
-			const input = fs.readFileSync(`${resolved}/input.svelte`, "utf-8").replace(/\s+$/, "").replace(/\r/g, "");
+			const input = fs.readFileSync(`${resolved}/input.svelte`, 'utf-8').replace(/\s+$/, '').replace(/\r/g, '');
 
 			let actual;
 
@@ -45,7 +45,7 @@ describe("js", () => {
 
 			let expected = '';
 			try {
-				expected = fs.readFileSync(expectedPath, "utf-8");
+				expected = fs.readFileSync(expectedPath, 'utf-8');
 			} catch (error) {
 				console.log(error);
 				if (error.code === 'ENOENT') {
@@ -56,8 +56,8 @@ describe("js", () => {
 
 			try {
 				assert.equal(
-					actual.trim().replace(/^[ \t]+$/gm, "").replace(/\r/g, ""),
-					expected.trim().replace(/^[ \t]+$/gm, "").replace(/\r/g, "")
+					actual.trim().replace(/^[ \t]+$/gm, '').replace(/\r/g, ''),
+					expected.trim().replace(/^[ \t]+$/gm, '').replace(/\r/g, '')
 				);
 			} catch (error) {
 				if (shouldUpdateExpected()) {
diff --git a/test/js/samples/capture-inject-dev-only/_config.js b/test/js/samples/capture-inject-dev-only/_config.js
index 1e0819f22e..1f2b217a9a 100644
--- a/test/js/samples/capture-inject-dev-only/_config.js
+++ b/test/js/samples/capture-inject-dev-only/_config.js
@@ -2,4 +2,4 @@ export default {
 	options: {
 		dev: false
 	}
-};
\ No newline at end of file
+};
diff --git a/test/js/samples/component-static-immutable/_config.js b/test/js/samples/component-static-immutable/_config.js
index 06713941e0..e9026d8223 100644
--- a/test/js/samples/component-static-immutable/_config.js
+++ b/test/js/samples/component-static-immutable/_config.js
@@ -2,4 +2,4 @@ export default {
 	options: {
 		immutable: true
 	}
-};
\ No newline at end of file
+};
diff --git a/test/js/samples/component-static-immutable2/_config.js b/test/js/samples/component-static-immutable2/_config.js
index 06713941e0..e9026d8223 100644
--- a/test/js/samples/component-static-immutable2/_config.js
+++ b/test/js/samples/component-static-immutable2/_config.js
@@ -2,4 +2,4 @@ export default {
 	options: {
 		immutable: true
 	}
-};
\ No newline at end of file
+};
diff --git a/test/js/samples/component-store-file-invalidate/store.js b/test/js/samples/component-store-file-invalidate/store.js
index 99e27e5584..b799c0ffc4 100644
--- a/test/js/samples/component-store-file-invalidate/store.js
+++ b/test/js/samples/component-store-file-invalidate/store.js
@@ -1,3 +1,3 @@
 import { writable } from '../../../../store';
 
-export const count = writable(0);
\ No newline at end of file
+export const count = writable(0);
diff --git a/test/js/samples/css-shadow-dom-keyframes/_config.js b/test/js/samples/css-shadow-dom-keyframes/_config.js
index 735dd07e62..e8a05d399c 100644
--- a/test/js/samples/css-shadow-dom-keyframes/_config.js
+++ b/test/js/samples/css-shadow-dom-keyframes/_config.js
@@ -2,4 +2,4 @@ export default {
 	options: {
 		customElement: true
 	}
-};
\ No newline at end of file
+};
diff --git a/test/js/samples/css-shadow-dom-keyframes/expected.js b/test/js/samples/css-shadow-dom-keyframes/expected.js
index a0a0ebe021..82a39e5924 100644
--- a/test/js/samples/css-shadow-dom-keyframes/expected.js
+++ b/test/js/samples/css-shadow-dom-keyframes/expected.js
@@ -1,6 +1,7 @@
 /* generated by Svelte vX.Y.Z */
 import {
 	SvelteElement,
+	attribute_to_object,
 	detach,
 	element,
 	init,
@@ -34,7 +35,18 @@ class Component extends SvelteElement {
 	constructor(options) {
 		super();
 		this.shadowRoot.innerHTML = `<style>div{animation:foo 1s}@keyframes foo{0%{opacity:0}100%{opacity:1}}</style>`;
-		init(this, { target: this.shadowRoot }, null, create_fragment, safe_not_equal, {});
+
+		init(
+			this,
+			{
+				target: this.shadowRoot,
+				props: attribute_to_object(this.attributes)
+			},
+			null,
+			create_fragment,
+			safe_not_equal,
+			{}
+		);
 
 		if (options) {
 			if (options.target) {
diff --git a/test/js/samples/debug-empty/_config.js b/test/js/samples/debug-empty/_config.js
index b1f2518e8a..414b026a97 100644
--- a/test/js/samples/debug-empty/_config.js
+++ b/test/js/samples/debug-empty/_config.js
@@ -2,4 +2,4 @@ export default {
 	options: {
 		dev: true
 	}
-};
\ No newline at end of file
+};
diff --git a/test/js/samples/debug-foo-bar-baz-things/_config.js b/test/js/samples/debug-foo-bar-baz-things/_config.js
index b1f2518e8a..414b026a97 100644
--- a/test/js/samples/debug-foo-bar-baz-things/_config.js
+++ b/test/js/samples/debug-foo-bar-baz-things/_config.js
@@ -2,4 +2,4 @@ export default {
 	options: {
 		dev: true
 	}
-};
\ No newline at end of file
+};
diff --git a/test/js/samples/debug-foo/_config.js b/test/js/samples/debug-foo/_config.js
index b1f2518e8a..414b026a97 100644
--- a/test/js/samples/debug-foo/_config.js
+++ b/test/js/samples/debug-foo/_config.js
@@ -2,4 +2,4 @@ export default {
 	options: {
 		dev: true
 	}
-};
\ No newline at end of file
+};
diff --git a/test/js/samples/debug-no-dependencies/_config.js b/test/js/samples/debug-no-dependencies/_config.js
index b1f2518e8a..414b026a97 100644
--- a/test/js/samples/debug-no-dependencies/_config.js
+++ b/test/js/samples/debug-no-dependencies/_config.js
@@ -2,4 +2,4 @@ export default {
 	options: {
 		dev: true
 	}
-};
\ No newline at end of file
+};
diff --git a/test/js/samples/debug-ssr-foo/_config.js b/test/js/samples/debug-ssr-foo/_config.js
index 39bfbe7e62..c4070b9a3b 100644
--- a/test/js/samples/debug-ssr-foo/_config.js
+++ b/test/js/samples/debug-ssr-foo/_config.js
@@ -3,4 +3,4 @@ export default {
 		generate: 'ssr',
 		dev: true
 	}
-};
\ No newline at end of file
+};
diff --git a/test/js/samples/dev-warning-missing-data-computed/_config.js b/test/js/samples/dev-warning-missing-data-computed/_config.js
index b1f2518e8a..414b026a97 100644
--- a/test/js/samples/dev-warning-missing-data-computed/_config.js
+++ b/test/js/samples/dev-warning-missing-data-computed/_config.js
@@ -2,4 +2,4 @@ export default {
 	options: {
 		dev: true
 	}
-};
\ No newline at end of file
+};
diff --git a/test/js/samples/event-modifiers/expected.js b/test/js/samples/event-modifiers/expected.js
index 6aa3c161f9..3901753661 100644
--- a/test/js/samples/event-modifiers/expected.js
+++ b/test/js/samples/event-modifiers/expected.js
@@ -16,41 +16,49 @@ import {
 } from "svelte/internal";
 
 function create_fragment(ctx) {
-	let div;
-	let button0;
+	let div1;
+	let div0;
 	let t1;
-	let button1;
+	let button0;
 	let t3;
+	let button1;
+	let t5;
 	let button2;
 	let mounted;
 	let dispose;
 
 	return {
 		c() {
-			div = element("div");
+			div1 = element("div");
+			div0 = element("div");
+			div0.textContent = "touch me";
+			t1 = space();
 			button0 = element("button");
 			button0.textContent = "click me";
-			t1 = space();
+			t3 = space();
 			button1 = element("button");
 			button1.textContent = "or me";
-			t3 = space();
+			t5 = space();
 			button2 = element("button");
 			button2.textContent = "or me!";
 		},
 		m(target, anchor) {
-			insert(target, div, anchor);
-			append(div, button0);
-			append(div, t1);
-			append(div, button1);
-			append(div, t3);
-			append(div, button2);
+			insert(target, div1, anchor);
+			append(div1, div0);
+			append(div1, t1);
+			append(div1, button0);
+			append(div1, t3);
+			append(div1, button1);
+			append(div1, t5);
+			append(div1, button2);
 
 			if (!mounted) {
 				dispose = [
+					listen(div0, "touchstart", handleTouchstart, { passive: false }),
 					listen(button0, "click", stop_propagation(prevent_default(handleClick))),
 					listen(button1, "click", handleClick, { once: true, capture: true }),
 					listen(button2, "click", handleClick, true),
-					listen(div, "touchstart", handleTouchstart, { passive: true })
+					listen(div1, "touchstart", handleTouchstart, { passive: true })
 				];
 
 				mounted = true;
@@ -60,7 +68,7 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 		d(detaching) {
-			if (detaching) detach(div);
+			if (detaching) detach(div1);
 			mounted = false;
 			run_all(dispose);
 		}
diff --git a/test/js/samples/event-modifiers/input.svelte b/test/js/samples/event-modifiers/input.svelte
index 225134f598..c72d58dabb 100644
--- a/test/js/samples/event-modifiers/input.svelte
+++ b/test/js/samples/event-modifiers/input.svelte
@@ -9,6 +9,7 @@
 </script>
 
 <div on:touchstart={handleTouchstart}>
+	<div on:touchstart|nonpassive={handleTouchstart}>touch me</div>
 	<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>
diff --git a/test/js/samples/hydrated-void-element/_config.js b/test/js/samples/hydrated-void-element/_config.js
index 84c0d733ef..af1bf11a52 100644
--- a/test/js/samples/hydrated-void-element/_config.js
+++ b/test/js/samples/hydrated-void-element/_config.js
@@ -2,4 +2,4 @@ export default {
 	options: {
 		hydratable: true
 	}
-};
\ No newline at end of file
+};
diff --git a/test/js/samples/import-meta/expected.js b/test/js/samples/import-meta/expected.js
new file mode 100644
index 0000000000..ba77398321
--- /dev/null
+++ b/test/js/samples/import-meta/expected.js
@@ -0,0 +1,53 @@
+/* generated by Svelte vX.Y.Z */
+import {
+	SvelteComponent,
+	detach,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	space,
+	text
+} from "svelte/internal";
+
+function create_fragment(ctx) {
+	let t0;
+	let t1;
+	let t2_value = import.meta.url + "";
+	let t2;
+
+	return {
+		c() {
+			t0 = text(/*url*/ ctx[0]);
+			t1 = space();
+			t2 = text(t2_value);
+		},
+		m(target, anchor) {
+			insert(target, t0, anchor);
+			insert(target, t1, anchor);
+			insert(target, t2, anchor);
+		},
+		p: noop,
+		i: noop,
+		o: noop,
+		d(detaching) {
+			if (detaching) detach(t0);
+			if (detaching) detach(t1);
+			if (detaching) detach(t2);
+		}
+	};
+}
+
+function instance($$self) {
+	const url = import.meta.url;
+	return [url];
+}
+
+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/import-meta/input.svelte b/test/js/samples/import-meta/input.svelte
new file mode 100644
index 0000000000..a5ce32dd77
--- /dev/null
+++ b/test/js/samples/import-meta/input.svelte
@@ -0,0 +1,6 @@
+<script>
+	const url = import.meta.url;
+</script>
+
+{url}
+{import.meta.url}
diff --git a/test/js/samples/legacy-input-type/_config.js b/test/js/samples/legacy-input-type/_config.js
index b5141be9ab..67924a4ffe 100644
--- a/test/js/samples/legacy-input-type/_config.js
+++ b/test/js/samples/legacy-input-type/_config.js
@@ -2,4 +2,4 @@ export default {
 	options: {
 		legacy: true
 	}
-};
\ No newline at end of file
+};
diff --git a/test/js/samples/loop-protect/_config.js b/test/js/samples/loop-protect/_config.js
index fcbf8be09b..1dc927b4da 100644
--- a/test/js/samples/loop-protect/_config.js
+++ b/test/js/samples/loop-protect/_config.js
@@ -1,6 +1,6 @@
 export default {
 	options: {
 		dev: true,
-		loopGuardTimeout: 100,
-	},
+		loopGuardTimeout: 100
+	}
 };
diff --git a/test/js/samples/src-attribute-check/_config.js b/test/js/samples/src-attribute-check/_config.js
index 84c0d733ef..af1bf11a52 100644
--- a/test/js/samples/src-attribute-check/_config.js
+++ b/test/js/samples/src-attribute-check/_config.js
@@ -2,4 +2,4 @@ export default {
 	options: {
 		hydratable: true
 	}
-};
\ No newline at end of file
+};
diff --git a/test/js/samples/ssr-no-oncreate-etc/_config.js b/test/js/samples/ssr-no-oncreate-etc/_config.js
index 803712adec..bee4ab630c 100644
--- a/test/js/samples/ssr-no-oncreate-etc/_config.js
+++ b/test/js/samples/ssr-no-oncreate-etc/_config.js
@@ -2,4 +2,4 @@ export default {
 	options: {
 		generate: 'ssr'
 	}
-};
\ No newline at end of file
+};
diff --git a/test/js/samples/valid-inner-html-for-static-element/expected.js b/test/js/samples/valid-inner-html-for-static-element/expected.js
new file mode 100644
index 0000000000..f1ced27ba4
--- /dev/null
+++ b/test/js/samples/valid-inner-html-for-static-element/expected.js
@@ -0,0 +1,39 @@
+/* generated by Svelte vX.Y.Z */
+import {
+	SvelteComponent,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
+
+function create_fragment(ctx) {
+	let div;
+
+	return {
+		c() {
+			div = element("div");
+			div.innerHTML = `<img alt="Star" width="100" height="100" src="http://mdn.mozillademos.org/files/12676/star.svg"/>`;
+		},
+		m(target, anchor) {
+			insert(target, div, anchor);
+		},
+		p: noop,
+		i: noop,
+		o: noop,
+		d(detaching) {
+			if (detaching) detach(div);
+		}
+	};
+}
+
+class Component extends SvelteComponent {
+	constructor(options) {
+		super();
+		init(this, options, null, create_fragment, safe_not_equal, {});
+	}
+}
+
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/valid-inner-html-for-static-element/input.svelte b/test/js/samples/valid-inner-html-for-static-element/input.svelte
new file mode 100644
index 0000000000..3990b2a0c2
--- /dev/null
+++ b/test/js/samples/valid-inner-html-for-static-element/input.svelte
@@ -0,0 +1,3 @@
+<div>
+    <img alt="Star" width="100" height="100" src="http://mdn.mozillademos.org/files/12676/star.svg" />
+</div>
\ No newline at end of file
diff --git a/test/js/update.js b/test/js/update.js
index fa9c834182..3e968f0e4c 100644
--- a/test/js/update.js
+++ b/test/js/update.js
@@ -1,13 +1,13 @@
 // this file will replace all the expected.js files with their _actual
 // equivalents. Only use it when you're sure that you haven't
 // broken anything!
-const fs = require("fs");
-const glob = require("tiny-glob/sync.js");
+const fs = require('fs');
+const glob = require('tiny-glob/sync.js');
 
-glob("samples/*/_actual.js", { cwd: __dirname }).forEach(file => {
-	const actual = fs.readFileSync(`${__dirname}/${file}`, "utf-8");
+glob('samples/*/_actual.js', { cwd: __dirname }).forEach(file => {
+	const actual = fs.readFileSync(`${__dirname}/${file}`, 'utf-8');
 	fs.writeFileSync(
-		`${__dirname}/${file.replace("_actual.js", "expected.js")}`,
+		`${__dirname}/${file.replace('_actual.js', 'expected.js')}`,
 		actual
 	);
 });
diff --git a/test/motion/index.js b/test/motion/index.ts
similarity index 100%
rename from test/motion/index.js
rename to test/motion/index.ts
diff --git a/test/parser/index.js b/test/parser/index.ts
similarity index 89%
rename from test/parser/index.js
rename to test/parser/index.ts
index 2c8d516a7d..fe48737c96 100644
--- a/test/parser/index.js
+++ b/test/parser/index.ts
@@ -1,6 +1,6 @@
 import * as assert from 'assert';
 import * as fs from 'fs';
-import { svelte, tryToLoadJson, shouldUpdateExpected } from '../helpers.js';
+import { svelte, tryToLoadJson } from '../helpers';
 
 describe('parse', () => {
 	fs.readdirSync(`${__dirname}/samples`).forEach(dir => {
@@ -20,7 +20,7 @@ describe('parse', () => {
 		(skip ? it.skip : solo ? it.only : it)(dir, () => {
 			const options = tryToLoadJson(`${__dirname}/samples/${dir}/options.json`) || {};
 
-			const input = fs.readFileSync(`${__dirname}/samples/${dir}/input.svelte`, 'utf-8').replace(/\s+$/, '').replace(/\r/g, "");
+			const input = fs.readFileSync(`${__dirname}/samples/${dir}/input.svelte`, 'utf-8').replace(/\s+$/, '').replace(/\r/g, '');
 			const expectedOutput = tryToLoadJson(`${__dirname}/samples/${dir}/output.json`);
 			const expectedError = tryToLoadJson(`${__dirname}/samples/${dir}/error.json`);
 
@@ -38,7 +38,7 @@ describe('parse', () => {
 			} catch (err) {
 				if (err.name !== 'ParseError') throw err;
 				if (!expectedError) throw err;
-				const { code, message, pos, start } = err
+				const { code, message, pos, start } = err;
 				try {
 					assert.deepEqual({ code, message, pos, start }, expectedError);
 				} catch (err2) {
diff --git a/test/parser/samples/style-inside-head/input.svelte b/test/parser/samples/style-inside-head/input.svelte
new file mode 100644
index 0000000000..512e5b2fb4
--- /dev/null
+++ b/test/parser/samples/style-inside-head/input.svelte
@@ -0,0 +1 @@
+<svelte:head><style></style></svelte:head>
\ No newline at end of file
diff --git a/test/parser/samples/style-inside-head/output.json b/test/parser/samples/style-inside-head/output.json
new file mode 100644
index 0000000000..ae972c5fa8
--- /dev/null
+++ b/test/parser/samples/style-inside-head/output.json
@@ -0,0 +1,33 @@
+{
+	"html": {
+		"start": 0,
+		"end": 42,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 42,
+				"type": "Head",
+				"name": "svelte:head",
+				"attributes": [],
+				"children": [
+					{
+						"start": 13,
+						"end": 28,
+						"type": "Element",
+						"name": "style",
+						"attributes": [],
+						"children": [
+							{
+								"start": 20,
+								"end": 20,
+								"type": "Text",
+								"data": ""
+							}
+						]
+					}
+				]
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/test/parser/update.js b/test/parser/update.js
deleted file mode 100644
index 0edac895b5..0000000000
--- a/test/parser/update.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// this file will replace all the output.json files with their _actual.json
-// equivalents. Only use it when you're sure that you haven't
-// broken anything!
-const fs = require("fs");
-const glob = require("tiny-glob/sync.js");
-
-glob("samples/*/_actual.json", { cwd: __dirname }).forEach(file => {
-	const actual = fs.readFileSync(`${__dirname}/${file}`, "utf-8");
-	fs.writeFileSync(
-		`${__dirname}/${file.replace("_actual.json", "output.json")}`,
-		actual
-	);
-});
diff --git a/test/parser/update.ts b/test/parser/update.ts
new file mode 100644
index 0000000000..83b8cbc865
--- /dev/null
+++ b/test/parser/update.ts
@@ -0,0 +1,13 @@
+// this file will replace all the output.json files with their _actual.json
+// equivalents. Only use it when you're sure that you haven't
+// broken anything!
+const fs = require('fs');
+const glob = require('tiny-glob/sync.js');
+
+glob('samples/*/_actual.json', { cwd: __dirname }).forEach(file => {
+	const actual = fs.readFileSync(`${__dirname}/${file}`, 'utf-8');
+	fs.writeFileSync(
+		`${__dirname}/${file.replace('_actual.json', 'output.json')}`,
+		actual
+	);
+});
diff --git a/test/preprocess/index.js b/test/preprocess/index.ts
similarity index 72%
rename from test/preprocess/index.js
rename to test/preprocess/index.ts
index 5d83bb6059..60d3acbabb 100644
--- a/test/preprocess/index.js
+++ b/test/preprocess/index.ts
@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import * as assert from 'assert';
-import { loadConfig, svelte } from '../helpers.js';
+import { loadConfig, svelte } from '../helpers';
 
 describe('preprocess', () => {
 	fs.readdirSync(`${__dirname}/samples`).forEach(dir => {
@@ -8,16 +8,21 @@ describe('preprocess', () => {
 
 		const config = loadConfig(`${__dirname}/samples/${dir}/_config.js`);
 		const solo = config.solo || /\.solo/.test(dir);
+		const skip = config.skip || /\.skip/.test(dir);
 
 		if (solo && process.env.CI) {
 			throw new Error('Forgot to remove `solo: true` from test');
 		}
 
-		(config.skip ? it.skip : solo ? it.only : it)(dir, async () => {
+		(skip ? it.skip : solo ? it.only : it)(dir, async () => {
 			const input = fs.readFileSync(`${__dirname}/samples/${dir}/input.svelte`, 'utf-8');
 			const expected = fs.readFileSync(`${__dirname}/samples/${dir}/output.svelte`, 'utf-8');
 
-			const result = await svelte.preprocess(input, config.preprocess);
+			const result = await svelte.preprocess(
+				input,
+				config.preprocess || {},
+				config.options || { filename: 'input.svelte' }
+			);
 			fs.writeFileSync(`${__dirname}/samples/${dir}/_actual.html`, result.code);
 
 			assert.equal(result.code, expected);
diff --git a/test/preprocess/samples/comments/_config.js b/test/preprocess/samples/comments/_config.js
index 4416d121d0..fdec377567 100644
--- a/test/preprocess/samples/comments/_config.js
+++ b/test/preprocess/samples/comments/_config.js
@@ -2,7 +2,7 @@ export default {
 	preprocess: [
 		{
 			script: ({ content }) => ({ code: content.replace(/one/g, 'two') }),
-			style: ({ content }) => ({ code: content.replace(/one/g, 'three') }),
-		},
-	],
+			style: ({ content }) => ({ code: content.replace(/one/g, 'three') })
+		}
+	]
 };
diff --git a/test/preprocess/samples/dependencies/_config.js b/test/preprocess/samples/dependencies/_config.js
index fa2d8b40c9..4656cd98f9 100644
--- a/test/preprocess/samples/dependencies/_config.js
+++ b/test/preprocess/samples/dependencies/_config.js
@@ -12,4 +12,4 @@ export default {
 	},
 
 	dependencies: ['./foo.css']
-};
\ No newline at end of file
+};
diff --git a/test/preprocess/samples/filename/_config.js b/test/preprocess/samples/filename/_config.js
index c71cdafcac..161f084730 100644
--- a/test/preprocess/samples/filename/_config.js
+++ b/test/preprocess/samples/filename/_config.js
@@ -1,6 +1,5 @@
 export default {
 	preprocess: {
-		filename: 'file.svelte',
 		markup: ({ content, filename }) => {
 			return {
 				code: content.replace('__MARKUP_FILENAME__', filename)
@@ -16,5 +15,8 @@ export default {
 				code: content.replace('__SCRIPT_FILENAME__', filename)
 			};
 		}
+	},
+	options: {
+		filename: 'file.svelte'
 	}
-};
\ No newline at end of file
+};
diff --git a/test/preprocess/samples/ignores-null/_config.js b/test/preprocess/samples/ignores-null/_config.js
index 042ee89aed..08ba71c748 100644
--- a/test/preprocess/samples/ignores-null/_config.js
+++ b/test/preprocess/samples/ignores-null/_config.js
@@ -2,4 +2,4 @@ export default {
 	preprocess: {
 		script: () => null
 	}
-};
\ No newline at end of file
+};
diff --git a/test/preprocess/samples/markup/_config.js b/test/preprocess/samples/markup/_config.js
index 857da608af..13044d4132 100644
--- a/test/preprocess/samples/markup/_config.js
+++ b/test/preprocess/samples/markup/_config.js
@@ -6,4 +6,4 @@ export default {
 			};
 		}
 	}
-};
\ No newline at end of file
+};
diff --git a/test/preprocess/samples/multiple-preprocessors/_config.js b/test/preprocess/samples/multiple-preprocessors/_config.js
index 8a57567f6b..d6226203cc 100644
--- a/test/preprocess/samples/multiple-preprocessors/_config.js
+++ b/test/preprocess/samples/multiple-preprocessors/_config.js
@@ -11,4 +11,4 @@ export default {
 			style:  ({ content }) => ({ code: content.replace(/three/g, 'four') })
 		}
 	]
-};
\ No newline at end of file
+};
diff --git a/test/preprocess/samples/script-multiple/_config.js b/test/preprocess/samples/script-multiple/_config.js
index d6656ff48e..a523efe9bc 100644
--- a/test/preprocess/samples/script-multiple/_config.js
+++ b/test/preprocess/samples/script-multiple/_config.js
@@ -6,4 +6,4 @@ export default {
 			};
 		}
 	}
-};
\ No newline at end of file
+};
diff --git a/test/preprocess/samples/script-self-closing/_config.js b/test/preprocess/samples/script-self-closing/_config.js
index 4baab9730e..ab87c7be1e 100644
--- a/test/preprocess/samples/script-self-closing/_config.js
+++ b/test/preprocess/samples/script-self-closing/_config.js
@@ -1,11 +1,11 @@
-import * as assert from "assert";
+import * as assert from 'assert';
 
 export default {
 	preprocess: {
 		script: ({ content, attributes }) => {
-			assert.equal(content, "");
+			assert.equal(content, '');
 			return {
-				code: `console.log("${attributes["the-answer"]}");`
+				code: `console.log("${attributes['the-answer']}");`
 			};
 		}
 	}
diff --git a/test/preprocess/samples/script/_config.js b/test/preprocess/samples/script/_config.js
index 8e8ac1d2f9..1a21045465 100644
--- a/test/preprocess/samples/script/_config.js
+++ b/test/preprocess/samples/script/_config.js
@@ -6,4 +6,4 @@ export default {
 			};
 		}
 	}
-};
\ No newline at end of file
+};
diff --git a/test/preprocess/samples/style-async/_config.js b/test/preprocess/samples/style-async/_config.js
index a91f8f4307..00298a0bfb 100644
--- a/test/preprocess/samples/style-async/_config.js
+++ b/test/preprocess/samples/style-async/_config.js
@@ -6,4 +6,4 @@ export default {
 			});
 		}
 	}
-};
\ No newline at end of file
+};
diff --git a/test/preprocess/samples/style-attributes/_config.js b/test/preprocess/samples/style-attributes/_config.js
index 7a619054bd..ac2955397b 100644
--- a/test/preprocess/samples/style-attributes/_config.js
+++ b/test/preprocess/samples/style-attributes/_config.js
@@ -11,4 +11,4 @@ export default {
 			return { code: 'PROCESSED' };
 		}
 	}
-};
\ No newline at end of file
+};
diff --git a/test/preprocess/samples/style-self-closing/_config.js b/test/preprocess/samples/style-self-closing/_config.js
index 0a05cd3d64..af762e8da8 100644
--- a/test/preprocess/samples/style-self-closing/_config.js
+++ b/test/preprocess/samples/style-self-closing/_config.js
@@ -1,9 +1,9 @@
-import * as assert from "assert";
+import * as assert from 'assert';
 
 export default {
 	preprocess: {
 		style: ({ content, attributes: { color } }) => {
-			assert.equal(content, "");
+			assert.equal(content, '');
 			return {
 				code: `div { color: ${color}; }`
 			};
diff --git a/test/preprocess/samples/style/_config.js b/test/preprocess/samples/style/_config.js
index 59040eccdd..19da7ea384 100644
--- a/test/preprocess/samples/style/_config.js
+++ b/test/preprocess/samples/style/_config.js
@@ -6,4 +6,4 @@ export default {
 			};
 		}
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/index.js b/test/runtime/index.ts
similarity index 86%
rename from test/runtime/index.js
rename to test/runtime/index.ts
index 65157196c9..153ac9dbb8 100644
--- a/test/runtime/index.js
+++ b/test/runtime/index.ts
@@ -1,12 +1,12 @@
-import * as assert from "assert";
-import * as path from "path";
-import * as fs from "fs";
+import * as path from 'path';
+import * as fs from 'fs';
 import { rollup } from 'rollup';
-import * as virtual from '@rollup/plugin-virtual';
-import * as glob from 'tiny-glob/sync.js';
-import { clear_loops, flush, set_now, set_raf } from "../../internal";
+import virtual from '@rollup/plugin-virtual';
+import glob from 'tiny-glob/sync.js';
+import { clear_loops, flush, set_now, set_raf } from '../../internal';
 
 import {
+	assert,
 	showOutput,
 	loadConfig,
 	loadSvelte,
@@ -14,7 +14,7 @@ import {
 	env,
 	setupHtmlEqual,
 	mkdirp
-} from "../helpers.js";
+} from '../helpers';
 
 let svelte$;
 let svelte;
@@ -29,17 +29,17 @@ process.on('unhandledRejection', err => {
 	unhandled_rejection = err;
 });
 
-describe("runtime", () => {
+describe('runtime', () => {
 	before(() => {
 		svelte = loadSvelte(false);
 		svelte$ = loadSvelte(true);
 
-		require.extensions[".svelte"] = function(module, filename) {
+		require.extensions['.svelte'] = function(module, filename) {
 			const options = Object.assign({
 				filename
 			}, compileOptions);
 
-			const { js: { code } } = compile(fs.readFileSync(filename, "utf-8").replace(/\r/g, ""), options);
+			const { js: { code } } = compile(fs.readFileSync(filename, 'utf-8').replace(/\r/g, ''), options);
 
 			return module._compile(code, filename);
 		};
@@ -50,7 +50,7 @@ describe("runtime", () => {
 	const failed = new Set();
 
 	function runTest(dir, hydrate) {
-		if (dir[0] === ".") return;
+		if (dir[0] === '.') return;
 
 		const config = loadConfig(`${__dirname}/samples/${dir}/_config.js`);
 		const solo = config.solo || /\.solo/.test(dir);
@@ -58,7 +58,7 @@ describe("runtime", () => {
 		if (hydrate && config.skip_if_hydrate) return;
 
 		if (solo && process.env.CI) {
-			throw new Error("Forgot to remove `solo: true` from test");
+			throw new Error('Forgot to remove `solo: true` from test');
 		}
 
 		(config.skip ? it.skip : solo ? it.only : it)(`${dir} ${hydrate ? '(with hydration)' : ''}`, () => {
@@ -103,7 +103,7 @@ describe("runtime", () => {
 
 				try {
 					const { js } = compile(
-						fs.readFileSync(`${cwd}/${file}`, 'utf-8').replace(/\r/g, ""),
+						fs.readFileSync(`${cwd}/${file}`, 'utf-8').replace(/\r/g, ''),
 						{
 							...compileOptions,
 							filename: file
@@ -151,7 +151,7 @@ describe("runtime", () => {
 					// Put things we need on window for testing
 					window.SvelteComponent = SvelteComponent;
 
-					const target = window.document.querySelector("main");
+					const target = window.document.querySelector('main');
 
 					const warnings = [];
 					const warn = console.warn;
@@ -172,14 +172,14 @@ describe("runtime", () => {
 
 					if (config.error) {
 						unintendedError = true;
-						throw new Error("Expected a runtime error");
+						throw new Error('Expected a runtime error');
 					}
 
 					if (config.warnings) {
 						assert.deepEqual(warnings, config.warnings);
 					} else if (warnings.length) {
 						unintendedError = true;
-						throw new Error("Received unexpected warnings");
+						throw new Error('Received unexpected warnings');
 					}
 
 					if (config.html) {
@@ -204,7 +204,7 @@ describe("runtime", () => {
 						});
 					} else {
 						component.$destroy();
-						assert.htmlEqual(target.innerHTML, "");
+						assert.htmlEqual(target.innerHTML, '');
 
 						if (unhandled_rejection) {
 							throw unhandled_rejection;
@@ -250,8 +250,8 @@ describe("runtime", () => {
 
 	async function create_component(src = '<div></div>') {
 		const { js } = svelte$.compile(src, {
-			format: "esm",
-			name: "SvelteComponent",
+			format: 'esm',
+			name: 'SvelteComponent',
 			dev: true
 		});
 
@@ -282,7 +282,7 @@ describe("runtime", () => {
 		);
 	}
 
-	it("fails if options.target is missing in dev mode", async () => {
+	it('fails if options.target is missing in dev mode', async () => {
 		const App = await create_component();
 
 		assert.throws(() => {
@@ -290,7 +290,7 @@ describe("runtime", () => {
 		}, /'target' is a required option/);
 	});
 
-	it("fails if options.hydrate is true but the component is non-hydratable", async () => {
+	it('fails if options.hydrate is true but the component is non-hydratable', async () => {
 		const App = await create_component();
 
 		assert.throws(() => {
diff --git a/test/runtime/samples/$$rest-without-props/_config.js b/test/runtime/samples/$$rest-without-props/_config.js
index 017f9df561..1fb8e85a6a 100644
--- a/test/runtime/samples/$$rest-without-props/_config.js
+++ b/test/runtime/samples/$$rest-without-props/_config.js
@@ -11,7 +11,7 @@ export default {
 		<div d="4" e="5" foo="1"></div>
 		<button></button><button></button><button></button><button></button>
 	`,
-	async test({ assert, target, window, }) {
+	async test({ assert, target, window }) {
 		const [btn1, btn2, btn3, btn4] = target.querySelectorAll('button');
 		const clickEvent = new window.MouseEvent('click');
 
diff --git a/test/runtime/samples/$$rest/_config.js b/test/runtime/samples/$$rest/_config.js
index 255927f354..f00c26d712 100644
--- a/test/runtime/samples/$$rest/_config.js
+++ b/test/runtime/samples/$$rest/_config.js
@@ -13,7 +13,7 @@ export default {
 		<button></button><button></button><button></button><button></button>
 	`,
 
-	async test({ assert, target, window, }) {
+	async test({ assert, target, window }) {
 		const [btn1, btn2, btn3, btn4] = target.querySelectorAll('button');
 		const clickEvent = new window.MouseEvent('click');
 
diff --git a/test/runtime/samples/action-custom-event-handler-this/_config.js b/test/runtime/samples/action-custom-event-handler-this/_config.js
index 88a30232ab..ec3fa373eb 100644
--- a/test/runtime/samples/action-custom-event-handler-this/_config.js
+++ b/test/runtime/samples/action-custom-event-handler-this/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: `<input>`,
+	html: '<input>',
 
 	test({ assert, component, target, window }) {
 		const input = target.querySelector('input');
@@ -18,5 +18,5 @@ export default {
 		input.dispatchEvent(event);
 
 		assert.ok(blurred);
-	},
+	}
 };
diff --git a/test/runtime/samples/action-object/_config.js b/test/runtime/samples/action-object/_config.js
new file mode 100644
index 0000000000..7fdc11af2b
--- /dev/null
+++ b/test/runtime/samples/action-object/_config.js
@@ -0,0 +1,8 @@
+export default {
+	html: `
+		<button>action</button>
+	`,
+	async test({ assert, target, window }) {
+		assert.equal(target.querySelector('button').foo, 'bar1337');
+	}
+};
diff --git a/test/runtime/samples/action-object/main.svelte b/test/runtime/samples/action-object/main.svelte
new file mode 100644
index 0000000000..f15e319e6f
--- /dev/null
+++ b/test/runtime/samples/action-object/main.svelte
@@ -0,0 +1,10 @@
+<script>
+	const obj = {
+		foo : "bar",
+		action(element, { leet }) {
+			element.foo = this.foo + leet;
+		},
+	}
+</script>
+
+<button use:obj.action={{ leet: 1337 }}>action</button>
\ No newline at end of file
diff --git a/test/runtime/samples/action-ternary-template/_config.js b/test/runtime/samples/action-ternary-template/_config.js
index adf23a9f68..ecb18dceec 100644
--- a/test/runtime/samples/action-ternary-template/_config.js
+++ b/test/runtime/samples/action-ternary-template/_config.js
@@ -1,7 +1,7 @@
 export default {
 	props: {
 		target: 'World!',
-		display: true,
+		display: true
 	},
 
 	html: `
@@ -16,5 +16,5 @@ export default {
 		assert.htmlEqual(target.innerHTML, `
 			<h1>Hello World!</h1>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/action-this/_config.js b/test/runtime/samples/action-this/_config.js
index de7f834cdc..933ce993b9 100644
--- a/test/runtime/samples/action-this/_config.js
+++ b/test/runtime/samples/action-this/_config.js
@@ -3,9 +3,9 @@ export default {
 		const button = target.querySelector('button');
 		const click = new window.MouseEvent('click');
 
-		assert.htmlEqual(target.innerHTML, `<button>1</button>`);
+		assert.htmlEqual(target.innerHTML, '<button>1</button>');
 		await button.dispatchEvent(click);
 		await Promise.resolve();
-		assert.htmlEqual(target.innerHTML, `<button>2</button>`);
-	},
+		assert.htmlEqual(target.innerHTML, '<button>2</button>');
+	}
 };
diff --git a/test/runtime/samples/animation-css/_config.js b/test/runtime/samples/animation-css/_config.js
index 9410fb91e7..b80545de3a 100644
--- a/test/runtime/samples/animation-css/_config.js
+++ b/test/runtime/samples/animation-css/_config.js
@@ -54,4 +54,4 @@ export default {
 			divs[4].style.animation
 		], ['', '']);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/animation-js-delay/_config.js b/test/runtime/samples/animation-js-delay/_config.js
index 6bd02d17e6..931d37817b 100644
--- a/test/runtime/samples/animation-js-delay/_config.js
+++ b/test/runtime/samples/animation-js-delay/_config.js
@@ -57,4 +57,4 @@ export default {
 		assert.equal(divs[0].dy, 0);
 		assert.equal(divs[4].dy, 0);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/animation-js-easing/_config.js b/test/runtime/samples/animation-js-easing/_config.js
index 415af042a9..e466309f57 100644
--- a/test/runtime/samples/animation-js-easing/_config.js
+++ b/test/runtime/samples/animation-js-easing/_config.js
@@ -53,4 +53,4 @@ export default {
 		assert.equal(divs[0].dy, 0);
 		assert.equal(divs[4].dy, 0);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/animation-js-easing/easing.js b/test/runtime/samples/animation-js-easing/easing.js
index fecc4d96f6..6399b8858c 100644
--- a/test/runtime/samples/animation-js-easing/easing.js
+++ b/test/runtime/samples/animation-js-easing/easing.js
@@ -1,3 +1,3 @@
 export function linear(t) {
 	return t;
-}
\ No newline at end of file
+}
diff --git a/test/runtime/samples/animation-js/_config.js b/test/runtime/samples/animation-js/_config.js
index 521753633d..5c5e874b3e 100644
--- a/test/runtime/samples/animation-js/_config.js
+++ b/test/runtime/samples/animation-js/_config.js
@@ -74,4 +74,4 @@ export default {
 		assert.equal(divs[0].dy, 0);
 		assert.equal(divs[4].dy, 0);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/apply-directives-in-order-2/_config.js b/test/runtime/samples/apply-directives-in-order-2/_config.js
index a74ce41cb6..caff97a5b9 100644
--- a/test/runtime/samples/apply-directives-in-order-2/_config.js
+++ b/test/runtime/samples/apply-directives-in-order-2/_config.js
@@ -1,7 +1,7 @@
 const value = [];
 export default {
 	props: {
-		value,
+		value
 	},
 
 	async test({ assert, component, target, window }) {
@@ -32,7 +32,7 @@ export default {
 			'15',
 			'16',
 			'17',
-			'18',
+			'18'
 		]);
-	},
+	}
 };
diff --git a/test/runtime/samples/apply-directives-in-order/_config.js b/test/runtime/samples/apply-directives-in-order/_config.js
index e5e8980ed1..7c8f87ef85 100644
--- a/test/runtime/samples/apply-directives-in-order/_config.js
+++ b/test/runtime/samples/apply-directives-in-order/_config.js
@@ -33,5 +33,5 @@ export default {
 			<input>
 			<p>HE</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/array-literal-spread-deopt/_config.js b/test/runtime/samples/array-literal-spread-deopt/_config.js
index d4fdcfad85..926f462b55 100644
--- a/test/runtime/samples/array-literal-spread-deopt/_config.js
+++ b/test/runtime/samples/array-literal-spread-deopt/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<div>a</div> <div>b</div> <div>c</div>`
+	html: '<div>a</div> <div>b</div> <div>c</div>'
 };
diff --git a/test/runtime/samples/assignment-in-init/_config.js b/test/runtime/samples/assignment-in-init/_config.js
index bcf227f8e6..52428c607d 100644
--- a/test/runtime/samples/assignment-in-init/_config.js
+++ b/test/runtime/samples/assignment-in-init/_config.js
@@ -3,4 +3,4 @@ export default {
 		assert.equal(component.get_foo(), 1);
 		assert.equal(component.get_bar(), 2);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/assignment-to-computed-property/_config.js b/test/runtime/samples/assignment-to-computed-property/_config.js
index 7ba090abe9..25f94c844e 100644
--- a/test/runtime/samples/assignment-to-computed-property/_config.js
+++ b/test/runtime/samples/assignment-to-computed-property/_config.js
@@ -2,4 +2,4 @@ export default {
 	test({ assert, component }) {
 		assert.deepEqual(component.foo, { baz: 1 });
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/attribute-boolean-case-insensitive/_config.js b/test/runtime/samples/attribute-boolean-case-insensitive/_config.js
index 16e5ade6d2..99ccedb8c9 100644
--- a/test/runtime/samples/attribute-boolean-case-insensitive/_config.js
+++ b/test/runtime/samples/attribute-boolean-case-insensitive/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<input readonly>`
+	html: '<input readonly>'
 };
diff --git a/test/runtime/samples/attribute-boolean-false/_config.js b/test/runtime/samples/attribute-boolean-false/_config.js
index 14fdeb9fdc..935b709fab 100644
--- a/test/runtime/samples/attribute-boolean-false/_config.js
+++ b/test/runtime/samples/attribute-boolean-false/_config.js
@@ -1,7 +1,7 @@
 export default {
-	html: `<textarea></textarea>`,
+	html: '<textarea></textarea>',
 	test({ assert, component, target }) {
 		const textarea = target.querySelector('textarea');
 		assert.ok(textarea.readOnly === false);
-	},
+	}
 };
diff --git a/test/runtime/samples/attribute-boolean-indeterminate/_config.js b/test/runtime/samples/attribute-boolean-indeterminate/_config.js
index 0e24f92c51..d16cb5f96b 100644
--- a/test/runtime/samples/attribute-boolean-indeterminate/_config.js
+++ b/test/runtime/samples/attribute-boolean-indeterminate/_config.js
@@ -18,4 +18,4 @@ export default {
 		component.indeterminate = false;
 		assert.ok(!input.indeterminate);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/attribute-boolean-true/_config.js b/test/runtime/samples/attribute-boolean-true/_config.js
index 0e402ed1e3..ccc0814296 100644
--- a/test/runtime/samples/attribute-boolean-true/_config.js
+++ b/test/runtime/samples/attribute-boolean-true/_config.js
@@ -1,7 +1,7 @@
 export default {
-	html: `<textarea readonly></textarea>`,
+	html: '<textarea readonly></textarea>',
 	test({ assert, component, target }) {
 		const textarea = target.querySelector('textarea');
 		assert.ok(textarea.readOnly);
-	},
+	}
 };
diff --git a/test/runtime/samples/attribute-boolean-with-spread/_config.js b/test/runtime/samples/attribute-boolean-with-spread/_config.js
index 270804170d..1fd2443369 100644
--- a/test/runtime/samples/attribute-boolean-with-spread/_config.js
+++ b/test/runtime/samples/attribute-boolean-with-spread/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<input>`
+	html: '<input>'
 };
diff --git a/test/runtime/samples/attribute-dataset-without-value/_config.js b/test/runtime/samples/attribute-dataset-without-value/_config.js
index 934f44eb06..21e60b92aa 100644
--- a/test/runtime/samples/attribute-dataset-without-value/_config.js
+++ b/test/runtime/samples/attribute-dataset-without-value/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: '<div data-potato=""></div>',
+	html: '<div data-potato=""></div>'
 };
diff --git a/test/runtime/samples/attribute-dynamic-no-dependencies/_config.js b/test/runtime/samples/attribute-dynamic-no-dependencies/_config.js
index acf3c64bdd..f1088830af 100644
--- a/test/runtime/samples/attribute-dynamic-no-dependencies/_config.js
+++ b/test/runtime/samples/attribute-dynamic-no-dependencies/_config.js
@@ -1,5 +1,5 @@
 export default {
 	html: `
 		<div><div title='foo'>bar</div></div>
-	`,
+	`
 };
diff --git a/test/runtime/samples/attribute-dynamic-quotemarks/_config.js b/test/runtime/samples/attribute-dynamic-quotemarks/_config.js
index b9f4364624..d74a0445d2 100644
--- a/test/runtime/samples/attribute-dynamic-quotemarks/_config.js
+++ b/test/runtime/samples/attribute-dynamic-quotemarks/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<span title='"foo"'>foo</span>`
+	html: '<span title=\'"foo"\'>foo</span>'
 };
diff --git a/test/runtime/samples/attribute-dynamic-shorthand/_config.js b/test/runtime/samples/attribute-dynamic-shorthand/_config.js
index 53f474db23..ebf4dd3881 100644
--- a/test/runtime/samples/attribute-dynamic-shorthand/_config.js
+++ b/test/runtime/samples/attribute-dynamic-shorthand/_config.js
@@ -1,8 +1,8 @@
 export default {
-	html: `<div id="foo"></div>`,
+	html: '<div id="foo"></div>',
 
 	test({ assert, component, target }) {
 		component.id = 'bar';
-		assert.equal( target.innerHTML, `<div id="bar"></div>` );
+		assert.equal( target.innerHTML, '<div id="bar"></div>' );
 	}
 };
diff --git a/test/runtime/samples/attribute-dynamic-type/_config.js b/test/runtime/samples/attribute-dynamic-type/_config.js
index 92f6ce196d..19aa33d65e 100644
--- a/test/runtime/samples/attribute-dynamic-type/_config.js
+++ b/test/runtime/samples/attribute-dynamic-type/_config.js
@@ -6,7 +6,7 @@ export default {
 		inputValue: 42
 	},
 
-	html: `<input type="text">`,
+	html: '<input type="text">',
 
 	test({ assert, component, target }) {
 		const input = target.querySelector('input');
diff --git a/test/runtime/samples/attribute-dynamic/_config.js b/test/runtime/samples/attribute-dynamic/_config.js
index 04f419145d..34323a997e 100644
--- a/test/runtime/samples/attribute-dynamic/_config.js
+++ b/test/runtime/samples/attribute-dynamic/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: `<div style="color: red;">red</div>`,
+	html: '<div style="color: red;">red</div>',
 
 	test({ assert, component, target }) {
 		const div = target.querySelector( 'div' );
@@ -7,7 +7,7 @@ export default {
 		assert.equal( div.style.color, 'red' );
 
 		component.color = 'blue';
-		assert.equal( target.innerHTML, `<div style="color: blue;">blue</div>` );
+		assert.equal( target.innerHTML, '<div style="color: blue;">blue</div>' );
 		assert.equal( div.style.color, 'blue' );
 	}
 };
diff --git a/test/runtime/samples/attribute-empty/_config.js b/test/runtime/samples/attribute-empty/_config.js
index b9ce14cce1..f9aaeb39a6 100644
--- a/test/runtime/samples/attribute-empty/_config.js
+++ b/test/runtime/samples/attribute-empty/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<div class=""></div>`
+	html: '<div class=""></div>'
 };
diff --git a/test/runtime/samples/attribute-false/_config.js b/test/runtime/samples/attribute-false/_config.js
index 9fd08a2a48..c05d83cb3d 100644
--- a/test/runtime/samples/attribute-false/_config.js
+++ b/test/runtime/samples/attribute-false/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<div class="false"></div>`,
+	html: '<div class="false"></div>'
 };
diff --git a/test/runtime/samples/attribute-namespaced/_config.js b/test/runtime/samples/attribute-namespaced/_config.js
index f8c0cb03fb..275a198219 100644
--- a/test/runtime/samples/attribute-namespaced/_config.js
+++ b/test/runtime/samples/attribute-namespaced/_config.js
@@ -11,4 +11,4 @@ export default {
 		const use = target.querySelector( 'use' );
 		assert.equal( use.getAttributeNS( 'http://www.w3.org/1999/xlink', 'href' ), '#bar' );
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/attribute-null-classname-no-style/_config.js b/test/runtime/samples/attribute-null-classname-no-style/_config.js
index 4a78b680ef..6cfefc8834 100644
--- a/test/runtime/samples/attribute-null-classname-no-style/_config.js
+++ b/test/runtime/samples/attribute-null-classname-no-style/_config.js
@@ -1,9 +1,9 @@
 export default {
 	props: {
-		testName: "testClassName"
+		testName: 'testClassName'
 	},
 
-	html: `<div class="testClassName"></div>`,
+	html: '<div class="testClassName"></div>',
 
 	test({ assert, component, target }) {
 		const div = target.querySelector('div');
diff --git a/test/runtime/samples/attribute-null-classname-with-style/_config.js b/test/runtime/samples/attribute-null-classname-with-style/_config.js
index 3ebc593b5d..d81543295e 100644
--- a/test/runtime/samples/attribute-null-classname-with-style/_config.js
+++ b/test/runtime/samples/attribute-null-classname-with-style/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: `<div class=" svelte-x1o6ra"></div>`,
+	html: '<div class=" svelte-x1o6ra"></div>',
 
 	test({ assert, component, target }) {
 		const div = target.querySelector('div');
diff --git a/test/runtime/samples/attribute-null-classnames-no-style/_config.js b/test/runtime/samples/attribute-null-classnames-no-style/_config.js
index 917cf565c0..7281f5b637 100644
--- a/test/runtime/samples/attribute-null-classnames-no-style/_config.js
+++ b/test/runtime/samples/attribute-null-classnames-no-style/_config.js
@@ -1,10 +1,10 @@
 export default {
 	props: {
-		testName1: "test1",
-		testName2: "test2",
+		testName1: 'test1',
+		testName2: 'test2'
 	},
 
-	html: `<div class="test1test2"></div>`,
+	html: '<div class="test1test2"></div>',
 
 	test({ assert, component, target }) {
 		const div = target.querySelector('div');
@@ -15,11 +15,11 @@ export default {
 		assert.equal(div.className, '0');
 
 		component.testName1 = null;
-		component.testName2 = "test";
+		component.testName2 = 'test';
 		assert.equal(div.className, 'nulltest');
 
 		component.testName1 = undefined;
-		component.testName2 = "test";
+		component.testName2 = 'test';
 		assert.equal(div.className, 'undefinedtest');
 
 		component.testName1 = undefined;
diff --git a/test/runtime/samples/attribute-null-classnames-with-style/_config.js b/test/runtime/samples/attribute-null-classnames-with-style/_config.js
index 5762f628fb..547e62427f 100644
--- a/test/runtime/samples/attribute-null-classnames-with-style/_config.js
+++ b/test/runtime/samples/attribute-null-classnames-with-style/_config.js
@@ -1,10 +1,10 @@
 export default {
 	props: {
-		testName1: "test1",
-		testName2: "test2",
+		testName1: 'test1',
+		testName2: 'test2'
 	},
 
-	html: `<div class="test1test2 svelte-x1o6ra"></div>`,
+	html: '<div class="test1test2 svelte-x1o6ra"></div>',
 
 	test({ assert, component, target }) {
 		const div = target.querySelector('div');
@@ -15,11 +15,11 @@ export default {
 		assert.equal(div.className, '0 svelte-x1o6ra');
 
 		component.testName1 = null;
-		component.testName2 = "test";
+		component.testName2 = 'test';
 		assert.equal(div.className, 'nulltest svelte-x1o6ra');
 
 		component.testName1 = undefined;
-		component.testName2 = "test";
+		component.testName2 = 'test';
 		assert.equal(div.className, 'undefinedtest svelte-x1o6ra');
 
 		component.testName1 = undefined;
diff --git a/test/runtime/samples/attribute-null-func-classname-no-style/_config.js b/test/runtime/samples/attribute-null-func-classname-no-style/_config.js
index 4a78b680ef..6cfefc8834 100644
--- a/test/runtime/samples/attribute-null-func-classname-no-style/_config.js
+++ b/test/runtime/samples/attribute-null-func-classname-no-style/_config.js
@@ -1,9 +1,9 @@
 export default {
 	props: {
-		testName: "testClassName"
+		testName: 'testClassName'
 	},
 
-	html: `<div class="testClassName"></div>`,
+	html: '<div class="testClassName"></div>',
 
 	test({ assert, component, target }) {
 		const div = target.querySelector('div');
diff --git a/test/runtime/samples/attribute-null-func-classname-with-style/_config.js b/test/runtime/samples/attribute-null-func-classname-with-style/_config.js
index 1ed43d05b9..435a679da7 100644
--- a/test/runtime/samples/attribute-null-func-classname-with-style/_config.js
+++ b/test/runtime/samples/attribute-null-func-classname-with-style/_config.js
@@ -1,9 +1,9 @@
 export default {
 	props: {
-		testName: "testClassName"
+		testName: 'testClassName'
 	},
 
-	html: `<div class="testClassName svelte-x1o6ra"></div>`,
+	html: '<div class="testClassName svelte-x1o6ra"></div>',
 
 	test({ assert, component, target }) {
 		const div = target.querySelector('div');
diff --git a/test/runtime/samples/attribute-null-func-classnames-no-style/_config.js b/test/runtime/samples/attribute-null-func-classnames-no-style/_config.js
index 917cf565c0..7281f5b637 100644
--- a/test/runtime/samples/attribute-null-func-classnames-no-style/_config.js
+++ b/test/runtime/samples/attribute-null-func-classnames-no-style/_config.js
@@ -1,10 +1,10 @@
 export default {
 	props: {
-		testName1: "test1",
-		testName2: "test2",
+		testName1: 'test1',
+		testName2: 'test2'
 	},
 
-	html: `<div class="test1test2"></div>`,
+	html: '<div class="test1test2"></div>',
 
 	test({ assert, component, target }) {
 		const div = target.querySelector('div');
@@ -15,11 +15,11 @@ export default {
 		assert.equal(div.className, '0');
 
 		component.testName1 = null;
-		component.testName2 = "test";
+		component.testName2 = 'test';
 		assert.equal(div.className, 'nulltest');
 
 		component.testName1 = undefined;
-		component.testName2 = "test";
+		component.testName2 = 'test';
 		assert.equal(div.className, 'undefinedtest');
 
 		component.testName1 = undefined;
diff --git a/test/runtime/samples/attribute-null-func-classnames-with-style/_config.js b/test/runtime/samples/attribute-null-func-classnames-with-style/_config.js
index 5762f628fb..547e62427f 100644
--- a/test/runtime/samples/attribute-null-func-classnames-with-style/_config.js
+++ b/test/runtime/samples/attribute-null-func-classnames-with-style/_config.js
@@ -1,10 +1,10 @@
 export default {
 	props: {
-		testName1: "test1",
-		testName2: "test2",
+		testName1: 'test1',
+		testName2: 'test2'
 	},
 
-	html: `<div class="test1test2 svelte-x1o6ra"></div>`,
+	html: '<div class="test1test2 svelte-x1o6ra"></div>',
 
 	test({ assert, component, target }) {
 		const div = target.querySelector('div');
@@ -15,11 +15,11 @@ export default {
 		assert.equal(div.className, '0 svelte-x1o6ra');
 
 		component.testName1 = null;
-		component.testName2 = "test";
+		component.testName2 = 'test';
 		assert.equal(div.className, 'nulltest svelte-x1o6ra');
 
 		component.testName1 = undefined;
-		component.testName2 = "test";
+		component.testName2 = 'test';
 		assert.equal(div.className, 'undefinedtest svelte-x1o6ra');
 
 		component.testName1 = undefined;
diff --git a/test/runtime/samples/attribute-null/_config.js b/test/runtime/samples/attribute-null/_config.js
index ae2f0a8af6..ded19eef79 100644
--- a/test/runtime/samples/attribute-null/_config.js
+++ b/test/runtime/samples/attribute-null/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<div></div>`,
+	html: '<div></div>'
 };
diff --git a/test/runtime/samples/attribute-prefer-expression/_config.js b/test/runtime/samples/attribute-prefer-expression/_config.js
index 29fcbc7f13..2388ff35df 100644
--- a/test/runtime/samples/attribute-prefer-expression/_config.js
+++ b/test/runtime/samples/attribute-prefer-expression/_config.js
@@ -2,7 +2,7 @@ export default {
 	skip_if_ssr: true,
 
 	props: {
-		foo: false,
+		foo: false
 	},
 
 	test({ assert, component, target }) {
@@ -15,5 +15,5 @@ export default {
 
 		assert.ok(!inputs[0].checked);
 		assert.ok(inputs[1].checked);
-	},
+	}
 };
diff --git a/test/runtime/samples/attribute-static-at-symbol/_config.js b/test/runtime/samples/attribute-static-at-symbol/_config.js
index 40a45579a3..0be19f091f 100644
--- a/test/runtime/samples/attribute-static-at-symbol/_config.js
+++ b/test/runtime/samples/attribute-static-at-symbol/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<a href='mailto:hello@example.com'>email</a>`
-};
\ No newline at end of file
+	html: "<a href='mailto:hello@example.com'>email</a>"
+};
diff --git a/test/runtime/samples/attribute-static-boolean/_config.js b/test/runtime/samples/attribute-static-boolean/_config.js
index c8b4332386..3dba036319 100644
--- a/test/runtime/samples/attribute-static-boolean/_config.js
+++ b/test/runtime/samples/attribute-static-boolean/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: `<textarea readonly=""></textarea>`,
+	html: '<textarea readonly=""></textarea>',
 	test({ assert, component, target }) {
 		const textarea = target.querySelector( 'textarea' );
 		assert.ok( textarea.readOnly );
diff --git a/test/runtime/samples/attribute-static-quotemarks/_config.js b/test/runtime/samples/attribute-static-quotemarks/_config.js
index 3d389c2273..e908052b4f 100644
--- a/test/runtime/samples/attribute-static-quotemarks/_config.js
+++ b/test/runtime/samples/attribute-static-quotemarks/_config.js
@@ -5,4 +5,4 @@ export default {
   		<span title='"bar"'>bar</span>
 		</span>
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/attribute-static/_config.js b/test/runtime/samples/attribute-static/_config.js
index 5d3b9c81a8..60c3cb2fc0 100644
--- a/test/runtime/samples/attribute-static/_config.js
+++ b/test/runtime/samples/attribute-static/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<div class="foo"></div>`
+	html: '<div class="foo"></div>'
 };
diff --git a/test/runtime/samples/attribute-undefined/_config.js b/test/runtime/samples/attribute-undefined/_config.js
index ae2f0a8af6..ded19eef79 100644
--- a/test/runtime/samples/attribute-undefined/_config.js
+++ b/test/runtime/samples/attribute-undefined/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<div></div>`,
+	html: '<div></div>'
 };
diff --git a/test/runtime/samples/attribute-unknown-without-value/_config.js b/test/runtime/samples/attribute-unknown-without-value/_config.js
index 4f7cf1cbbf..9645e86ef4 100644
--- a/test/runtime/samples/attribute-unknown-without-value/_config.js
+++ b/test/runtime/samples/attribute-unknown-without-value/_config.js
@@ -1,3 +1,3 @@
 export default {
 	html: '<div potato=""></div>'
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/await-catch-shorthand/_config.js b/test/runtime/samples/await-catch-shorthand/_config.js
index 2e1574145f..fc65773107 100644
--- a/test/runtime/samples/await-catch-shorthand/_config.js
+++ b/test/runtime/samples/await-catch-shorthand/_config.js
@@ -9,14 +9,14 @@ export default {
 		thePromise
 	},
 
-	html: ``,
+	html: '',
 
 	test({ assert, component, target }) {
 		fulfil(42);
 
 		return thePromise
 			.then(() => {
-				assert.htmlEqual(target.innerHTML, ``);
+				assert.htmlEqual(target.innerHTML, '');
 
 				let reject;
 
@@ -26,7 +26,7 @@ export default {
 
 				component.thePromise = thePromise;
 
-				assert.htmlEqual(target.innerHTML, ``);
+				assert.htmlEqual(target.innerHTML, '');
 
 				reject(new Error('something broke'));
 
@@ -38,4 +38,4 @@ export default {
 				`);
 			});
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/await-component-oncreate/_config.js b/test/runtime/samples/await-component-oncreate/_config.js
index 3cb8fa0864..1de86c9f44 100644
--- a/test/runtime/samples/await-component-oncreate/_config.js
+++ b/test/runtime/samples/await-component-oncreate/_config.js
@@ -13,4 +13,4 @@ export default {
 			`);
 		});
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/await-conservative-update/_config.js b/test/runtime/samples/await-conservative-update/_config.js
index 4e81ff8e37..20a9448ebd 100644
--- a/test/runtime/samples/await-conservative-update/_config.js
+++ b/test/runtime/samples/await-conservative-update/_config.js
@@ -13,4 +13,4 @@ export default {
 			`);
 		});
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/await-conservative-update/sleep.js b/test/runtime/samples/await-conservative-update/sleep.js
index 994f85f38a..be592a4ea4 100644
--- a/test/runtime/samples/await-conservative-update/sleep.js
+++ b/test/runtime/samples/await-conservative-update/sleep.js
@@ -8,4 +8,4 @@ export const sleep = ms => new Promise(f => {
 		if (stopped) return;
 		f();
 	}, ms);
-});
\ No newline at end of file
+});
diff --git a/test/runtime/samples/await-containing-if/_config.js b/test/runtime/samples/await-containing-if/_config.js
index cd83585cc1..a81b040a12 100644
--- a/test/runtime/samples/await-containing-if/_config.js
+++ b/test/runtime/samples/await-containing-if/_config.js
@@ -24,7 +24,7 @@ export default {
 				`);
 
 				component.show = false;
-				assert.htmlEqual(target.innerHTML, `<div></div>`);
+				assert.htmlEqual(target.innerHTML, '<div></div>');
 
 				component.show = true;
 				assert.htmlEqual(target.innerHTML, `
@@ -32,4 +32,4 @@ export default {
 				`);
 			});
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/await-in-dynamic-component/_config.js b/test/runtime/samples/await-in-dynamic-component/_config.js
index 797298c554..d92757b68b 100644
--- a/test/runtime/samples/await-in-dynamic-component/_config.js
+++ b/test/runtime/samples/await-in-dynamic-component/_config.js
@@ -2,4 +2,4 @@ export default {
 	test({ component }) {
 		component.flag = false;
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/await-in-each/_config.js b/test/runtime/samples/await-in-each/_config.js
index 6c7da69ee3..a648bbe38a 100644
--- a/test/runtime/samples/await-in-each/_config.js
+++ b/test/runtime/samples/await-in-each/_config.js
@@ -28,4 +28,4 @@ export default {
 				`);
 			});
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/await-in-removed-if/_config.js b/test/runtime/samples/await-in-removed-if/_config.js
index 2f96f08e24..18b2ac7b74 100644
--- a/test/runtime/samples/await-in-removed-if/_config.js
+++ b/test/runtime/samples/await-in-removed-if/_config.js
@@ -9,7 +9,7 @@ export default {
 		promise
 	},
 
-	html: ``,
+	html: '',
 
 	async test({ assert, component, target }) {
 		component.condition = false;
@@ -17,6 +17,6 @@ export default {
 		fulfil();
 		await new Promise(f => setTimeout(f, 0));
 
-		assert.htmlEqual(target.innerHTML, ``);
+		assert.htmlEqual(target.innerHTML, '');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/await-set-simultaneous-reactive/_config.js b/test/runtime/samples/await-set-simultaneous-reactive/_config.js
index a591bf424f..0b5c0b8c74 100644
--- a/test/runtime/samples/await-set-simultaneous-reactive/_config.js
+++ b/test/runtime/samples/await-set-simultaneous-reactive/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: `<p>wait for it...</p>`,
+	html: '<p>wait for it...</p>',
 	test({ assert, component, target }) {
 
 		return component.promise
@@ -10,4 +10,4 @@ export default {
 				`);
 			});
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/await-set-simultaneous/_config.js b/test/runtime/samples/await-set-simultaneous/_config.js
index f9ed64e556..fb75a9f6f0 100644
--- a/test/runtime/samples/await-set-simultaneous/_config.js
+++ b/test/runtime/samples/await-set-simultaneous/_config.js
@@ -6,7 +6,7 @@ export default {
 
 		component.promise = promise;
 
-		assert.htmlEqual(target.innerHTML, `<p>wait for it...</p>`);
+		assert.htmlEqual(target.innerHTML, '<p>wait for it...</p>');
 
 		return promise
 			.then(() => {
@@ -15,4 +15,4 @@ export default {
 				`);
 			});
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/await-then-catch-event/_config.js b/test/runtime/samples/await-then-catch-event/_config.js
index e42d16c4d8..0f4ce27628 100644
--- a/test/runtime/samples/await-then-catch-event/_config.js
+++ b/test/runtime/samples/await-then-catch-event/_config.js
@@ -42,4 +42,4 @@ export default {
 				assert.equal(component.clicked, 43);
 			});
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/await-then-catch-in-slot/_config.js b/test/runtime/samples/await-then-catch-in-slot/_config.js
index b0600a0f27..14f3e7fdf5 100644
--- a/test/runtime/samples/await-then-catch-in-slot/_config.js
+++ b/test/runtime/samples/await-then-catch-in-slot/_config.js
@@ -44,4 +44,4 @@ export default {
 				`);
 			});
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/await-then-catch-multiple/_config.js b/test/runtime/samples/await-then-catch-multiple/_config.js
index 2daac524a2..8d2de596df 100644
--- a/test/runtime/samples/await-then-catch-multiple/_config.js
+++ b/test/runtime/samples/await-then-catch-multiple/_config.js
@@ -48,4 +48,4 @@ export default {
 				`);
 			});
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/await-then-catch-no-values/_config.js b/test/runtime/samples/await-then-catch-no-values/_config.js
index 2c3ce45dc1..51a79a50d0 100644
--- a/test/runtime/samples/await-then-catch-no-values/_config.js
+++ b/test/runtime/samples/await-then-catch-no-values/_config.js
@@ -9,14 +9,14 @@ export default {
 		thePromise
 	},
 
-	html: `waiting`,
+	html: 'waiting',
 
 	test({ assert, component, target }) {
 		fulfil(9000);
 
 		return thePromise
 			.then(() => {
-				assert.htmlEqual(target.innerHTML, `resolved`);
+				assert.htmlEqual(target.innerHTML, 'resolved');
 
 				let reject;
 
@@ -26,14 +26,14 @@ export default {
 
 				component.thePromise = thePromise;
 
-				assert.htmlEqual(target.innerHTML, `waiting`);
+				assert.htmlEqual(target.innerHTML, 'waiting');
 
 				reject(new Error('something broke'));
 
 				return thePromise.catch(() => {});
 			})
 			.then(() => {
-				assert.htmlEqual(target.innerHTML, `rejected`);
+				assert.htmlEqual(target.innerHTML, 'rejected');
 			});
 	}
 };
diff --git a/test/runtime/samples/await-then-catch-non-promise/_config.js b/test/runtime/samples/await-then-catch-non-promise/_config.js
index dbc2f5eddc..c05236cc5f 100644
--- a/test/runtime/samples/await-then-catch-non-promise/_config.js
+++ b/test/runtime/samples/await-then-catch-non-promise/_config.js
@@ -14,4 +14,4 @@ export default {
 			<p>the value is still not a promise</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/await-then-catch-static/_config.js b/test/runtime/samples/await-then-catch-static/_config.js
index ada0dcc75b..35fc865d44 100644
--- a/test/runtime/samples/await-then-catch-static/_config.js
+++ b/test/runtime/samples/await-then-catch-static/_config.js
@@ -42,4 +42,4 @@ export default {
 				`);
 			});
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/await-then-catch/_config.js b/test/runtime/samples/await-then-catch/_config.js
index b0600a0f27..14f3e7fdf5 100644
--- a/test/runtime/samples/await-then-catch/_config.js
+++ b/test/runtime/samples/await-then-catch/_config.js
@@ -44,4 +44,4 @@ export default {
 				`);
 			});
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/await-then-destruct-object-if/_config.js b/test/runtime/samples/await-then-destruct-object-if/_config.js
new file mode 100644
index 0000000000..6a29b2db37
--- /dev/null
+++ b/test/runtime/samples/await-then-destruct-object-if/_config.js
@@ -0,0 +1,29 @@
+export default {
+	props: {
+		thePromise: Promise.resolve({ result: 1 })
+	},
+
+	html: '',
+
+	async test({ assert, component, target }) {
+		await (component.thePromise = Promise.resolve({ result: 1 }));
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<p>result: 1</p>
+				<p>count: 0</p>
+			`
+		);
+
+		await new Promise(resolve => setTimeout(resolve, 1));
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<p>result: 1</p>
+				<p>count: 1</p>
+			`
+		);
+	}
+};
diff --git a/test/runtime/samples/await-then-destruct-object-if/main.svelte b/test/runtime/samples/await-then-destruct-object-if/main.svelte
new file mode 100644
index 0000000000..3425979e2c
--- /dev/null
+++ b/test/runtime/samples/await-then-destruct-object-if/main.svelte
@@ -0,0 +1,19 @@
+<script>
+	export let thePromise;
+
+	let count = 0;
+
+	setTimeout(() => {
+		count++;
+	}, 0);
+</script>
+
+{#await thePromise then { result }}
+	{#if result}
+		<p>result: {result}</p>
+		<p>count: {count}</p>
+	{:else}
+		<p>result: {result}</p>
+		<p>count: {count}</p>
+	{/if}
+{/await}
diff --git a/test/runtime/samples/await-then-destruct-object/_config.js b/test/runtime/samples/await-then-destruct-object/_config.js
index 371462de97..7d08ad3711 100644
--- a/test/runtime/samples/await-then-destruct-object/_config.js
+++ b/test/runtime/samples/await-then-destruct-object/_config.js
@@ -8,7 +8,7 @@ export default {
 	`,
 
 	async test({ assert, component, target }) {
-		await (component.thePromise = Promise.resolve({ error: "error message" }));
+		await (component.thePromise = Promise.resolve({ error: 'error message' }));
 
 		assert.htmlEqual(
 			target.innerHTML,
@@ -18,7 +18,7 @@ export default {
 			`
 		);
 
-		await (component.thePromise = Promise.resolve({ result: "42" }));
+		await (component.thePromise = Promise.resolve({ result: '42' }));
 
 		assert.htmlEqual(
 			target.innerHTML,
@@ -30,7 +30,7 @@ export default {
 
 		try {
 			await (component.thePromise = Promise.reject({
-				error: { message: "oops", code: "123" }
+				error: { message: 'oops', code: '123' }
 			}));
 		} catch (e) {
 			// do nothing
@@ -46,7 +46,7 @@ export default {
 
 		try {
 			await (component.thePromise = Promise.reject({
-				error: { message: "timeout", code: "456" }
+				error: { message: 'timeout', code: '456' }
 			}));
 		} catch (e) {
 			// do nothing
diff --git a/test/runtime/samples/await-then-if/_config.js b/test/runtime/samples/await-then-if/_config.js
index b26688d9f3..f9e81dd2cc 100644
--- a/test/runtime/samples/await-then-if/_config.js
+++ b/test/runtime/samples/await-then-if/_config.js
@@ -22,4 +22,4 @@ export default {
 			<p>promise array is empty</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/await-then-shorthand/_config.js b/test/runtime/samples/await-then-shorthand/_config.js
index 4635cf5127..ca07dd19e0 100644
--- a/test/runtime/samples/await-then-shorthand/_config.js
+++ b/test/runtime/samples/await-then-shorthand/_config.js
@@ -9,7 +9,7 @@ export default {
 		thePromise
 	},
 
-	html: ``,
+	html: '',
 
 	test({ assert, component, target }) {
 		fulfil(42);
@@ -28,7 +28,7 @@ export default {
 
 				component.thePromise = thePromise;
 
-				assert.htmlEqual(target.innerHTML, ``);
+				assert.htmlEqual(target.innerHTML, '');
 
 				reject(new Error('something broke'));
 
@@ -40,4 +40,4 @@ export default {
 				`);
 			});
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/await-with-update-2/_config.js b/test/runtime/samples/await-with-update-2/_config.js
index 7584381eeb..68f884c127 100644
--- a/test/runtime/samples/await-with-update-2/_config.js
+++ b/test/runtime/samples/await-with-update-2/_config.js
@@ -1,7 +1,7 @@
 export default {
 	props: {
 		thePromise: new Promise((_) => {}),
-		count: 0,
+		count: 0
 	},
 
 	html: `
@@ -9,7 +9,7 @@ export default {
 	`,
 
 	async test({ assert, component, target }) {
-		await (component.thePromise = Promise.resolve({ value: "success", Component: component.Component }));
+		await (component.thePromise = Promise.resolve({ value: 'success', Component: component.Component }));
 
 		assert.htmlEqual(
 			target.innerHTML,
@@ -34,7 +34,7 @@ export default {
 		);
 
 		try {
-			await (component.thePromise = Promise.reject({ value: "failure", Component: component.Component }));
+			await (component.thePromise = Promise.reject({ value: 'failure', Component: component.Component }));
 		} catch (error) {
 			// ignore
 		}
@@ -60,5 +60,5 @@ export default {
 			</div>
 			`
 		);
-	},
+	}
 };
diff --git a/test/runtime/samples/await-with-update/_config.js b/test/runtime/samples/await-with-update/_config.js
index 31de26ddba..08bf12b89e 100644
--- a/test/runtime/samples/await-with-update/_config.js
+++ b/test/runtime/samples/await-with-update/_config.js
@@ -1,7 +1,7 @@
 export default {
 	props: {
 		thePromise: new Promise((_) => {}),
-		count: 0,
+		count: 0
 	},
 
 	html: `
@@ -56,5 +56,5 @@ export default {
 			</div>
 			`
 		);
-	},
+	}
 };
diff --git a/test/runtime/samples/await-without-catch/_config.js b/test/runtime/samples/await-without-catch/_config.js
new file mode 100644
index 0000000000..5bc291bf1f
--- /dev/null
+++ b/test/runtime/samples/await-without-catch/_config.js
@@ -0,0 +1,45 @@
+let fulfil;
+
+let promise = new Promise(f => {
+	fulfil = f;
+});
+
+export default {
+	props: {
+		promise
+	},
+
+	html: `
+		<p>loading...</p>
+	`,
+
+	test({ assert, component, target }) {
+		fulfil(42);
+
+		return promise
+		.then(() => {
+			assert.htmlEqual(target.innerHTML, `
+				<p>loaded</p>
+			`);
+
+			let reject;
+
+			promise = new Promise((f, r) => {
+				reject = r;
+			});
+
+			component.promise = promise;
+
+			assert.htmlEqual(target.innerHTML, `
+				<p>loading...</p>
+			`);
+
+			reject(new Error('this error should be thrown'));
+			return promise;
+		})
+		.catch((err) => {
+			assert.equal(err.message, 'this error should be thrown');
+			assert.htmlEqual(target.innerHTML, '');
+		});
+	}
+};
diff --git a/test/runtime/samples/await-without-catch/main.svelte b/test/runtime/samples/await-without-catch/main.svelte
new file mode 100644
index 0000000000..f528a8bf69
--- /dev/null
+++ b/test/runtime/samples/await-without-catch/main.svelte
@@ -0,0 +1,9 @@
+<script>
+	export let promise;
+</script>
+
+{#await promise}
+	<p>loading...</p>
+{:then value}
+	<p>loaded</p>
+{/await}
\ No newline at end of file
diff --git a/test/runtime/samples/binding-contenteditable-html-initial/_config.js b/test/runtime/samples/binding-contenteditable-html-initial/_config.js
index 9eac2c9b17..4c30a3231a 100644
--- a/test/runtime/samples/binding-contenteditable-html-initial/_config.js
+++ b/test/runtime/samples/binding-contenteditable-html-initial/_config.js
@@ -36,5 +36,5 @@ export default {
 			<editor contenteditable="true">good<span>bye</span></editor>
 			<p>hello good<span>bye</span></p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-contenteditable-html/_config.js b/test/runtime/samples/binding-contenteditable-html/_config.js
index ceb6a75c70..639572faea 100644
--- a/test/runtime/samples/binding-contenteditable-html/_config.js
+++ b/test/runtime/samples/binding-contenteditable-html/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		name: '<b>world</b>',
+		name: '<b>world</b>'
 	},
 
 	html: `
@@ -34,5 +34,5 @@ export default {
 			<editor contenteditable="true">good<span>bye</span></editor>
 			<p>hello good<span>bye</span></p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-contenteditable-text-initial/_config.js b/test/runtime/samples/binding-contenteditable-text-initial/_config.js
index 4899f30f12..d5f331bb7a 100644
--- a/test/runtime/samples/binding-contenteditable-text-initial/_config.js
+++ b/test/runtime/samples/binding-contenteditable-text-initial/_config.js
@@ -30,5 +30,5 @@ export default {
 			<editor contenteditable="true">goodbye</editor>
 			<p>hello goodbye</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-contenteditable-text/_config.js b/test/runtime/samples/binding-contenteditable-text/_config.js
index 9f8645724d..89f3968258 100644
--- a/test/runtime/samples/binding-contenteditable-text/_config.js
+++ b/test/runtime/samples/binding-contenteditable-text/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		name: 'world',
+		name: 'world'
 	},
 
 	html: `
@@ -28,5 +28,5 @@ export default {
 			<editor contenteditable="true">goodbye</editor>
 			<p>hello goodbye</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-indirect-computed/_config.js b/test/runtime/samples/binding-indirect-computed/_config.js
index 7519c4b0ed..68be22d1f8 100644
--- a/test/runtime/samples/binding-indirect-computed/_config.js
+++ b/test/runtime/samples/binding-indirect-computed/_config.js
@@ -31,4 +31,4 @@ export default {
 			B
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/binding-indirect/_config.js b/test/runtime/samples/binding-indirect/_config.js
index a0a610f43f..e0f10b94bd 100644
--- a/test/runtime/samples/binding-indirect/_config.js
+++ b/test/runtime/samples/binding-indirect/_config.js
@@ -87,4 +87,4 @@ export default {
 			<p>shake it all about</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/binding-input-checkbox-indeterminate/_config.js b/test/runtime/samples/binding-input-checkbox-indeterminate/_config.js
index 2e3a1c296f..9d099feb0a 100644
--- a/test/runtime/samples/binding-input-checkbox-indeterminate/_config.js
+++ b/test/runtime/samples/binding-input-checkbox-indeterminate/_config.js
@@ -2,7 +2,7 @@ export default {
 	skip_if_ssr: true,
 
 	props: {
-		indeterminate: true,
+		indeterminate: true
 	},
 
 	html: `
@@ -38,5 +38,5 @@ export default {
 			<p>checked? true</p>
 			<p>indeterminate? true</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-input-checkbox-with-event-in-each/_config.js b/test/runtime/samples/binding-input-checkbox-with-event-in-each/_config.js
index b502ed40af..1247414c1c 100644
--- a/test/runtime/samples/binding-input-checkbox-with-event-in-each/_config.js
+++ b/test/runtime/samples/binding-input-checkbox-with-event-in-each/_config.js
@@ -2,14 +2,14 @@ export default {
 	props: {
 		cats: [
 			{
-				name: "cat 0",
-				checked: false,
+				name: 'cat 0',
+				checked: false
 			},
 			{
-				name: "cat 1",
-				checked: false,
-			},
-		],
+				name: 'cat 1',
+				checked: false
+			}
+		]
 	},
 
 	html: `
@@ -21,8 +21,8 @@ export default {
 		const { cats } = component;
 		const newCats = cats.slice();
 		newCats.push({
-			name: "cat " + cats.length,
-			checked: false,
+			name: 'cat ' + cats.length,
+			checked: false
 		});
 		component.cats = newCats;
 
diff --git a/test/runtime/samples/binding-input-group-duplicate-value/_config.js b/test/runtime/samples/binding-input-group-duplicate-value/_config.js
index 7aea9142fa..b5f3ae0115 100644
--- a/test/runtime/samples/binding-input-group-duplicate-value/_config.js
+++ b/test/runtime/samples/binding-input-group-duplicate-value/_config.js
@@ -18,8 +18,8 @@ export default {
 	`,
 
 	async test({ assert, component, target, window }) {
-		const inputs = target.querySelectorAll("input");
-		const p = target.querySelector("p");
+		const inputs = target.querySelectorAll('input');
+		const p = target.querySelector('p');
 
 		assert.equal(inputs[0].checked, false);
 		assert.equal(inputs[1].checked, false);
@@ -31,12 +31,12 @@ export default {
 		assert.equal(inputs[6].checked, false);
 		assert.equal(inputs[7].checked, false);
 
-		const event = new window.Event("change");
+		const event = new window.Event('change');
 
 		inputs[0].checked = true;
 		await inputs[0].dispatchEvent(event);
 
-		assert.htmlEqual(p.innerHTML, `Checked: a`);
+		assert.htmlEqual(p.innerHTML, 'Checked: a');
 
 		assert.equal(inputs[0].checked, true);
 		assert.equal(inputs[1].checked, false);
@@ -51,7 +51,7 @@ export default {
 		inputs[3].checked = true;
 		await inputs[3].dispatchEvent(event);
 
-		assert.htmlEqual(p.innerHTML, `Checked: a,d`);
+		assert.htmlEqual(p.innerHTML, 'Checked: a,d');
 
 		assert.equal(inputs[0].checked, true);
 		assert.equal(inputs[1].checked, false);
@@ -66,7 +66,7 @@ export default {
 		inputs[4].checked = false;
 		await inputs[4].dispatchEvent(event);
 
-		assert.htmlEqual(p.innerHTML, `Checked: d`);
+		assert.htmlEqual(p.innerHTML, 'Checked: d');
 
 		assert.equal(inputs[0].checked, false);
 		assert.equal(inputs[1].checked, false);
@@ -77,5 +77,5 @@ export default {
 		assert.equal(inputs[5].checked, false);
 		assert.equal(inputs[6].checked, false);
 		assert.equal(inputs[7].checked, true);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-input-group-each-1/_config.js b/test/runtime/samples/binding-input-group-each-1/_config.js
index b0477ec705..92010296dc 100644
--- a/test/runtime/samples/binding-input-group-each-1/_config.js
+++ b/test/runtime/samples/binding-input-group-each-1/_config.js
@@ -7,13 +7,13 @@ const values = [
 const selected_array = [
 	[values[1]],
 	[],
-	[values[2]],
+	[values[2]]
 ];
 
 export default {
 	props: {
 		values,
-		selected_array,
+		selected_array
 	},
 
 	html: `
diff --git a/test/runtime/samples/binding-input-group-each-3/_config.js b/test/runtime/samples/binding-input-group-each-3/_config.js
index b0477ec705..92010296dc 100644
--- a/test/runtime/samples/binding-input-group-each-3/_config.js
+++ b/test/runtime/samples/binding-input-group-each-3/_config.js
@@ -7,13 +7,13 @@ const values = [
 const selected_array = [
 	[values[1]],
 	[],
-	[values[2]],
+	[values[2]]
 ];
 
 export default {
 	props: {
 		values,
-		selected_array,
+		selected_array
 	},
 
 	html: `
diff --git a/test/runtime/samples/binding-input-number-2/_config.js b/test/runtime/samples/binding-input-number-2/_config.js
index a3510eb757..4411eac0b2 100644
--- a/test/runtime/samples/binding-input-number-2/_config.js
+++ b/test/runtime/samples/binding-input-number-2/_config.js
@@ -1,31 +1,31 @@
 export default {
 	test({ assert, target, window, component }) {
-		const input = target.querySelector("input");
-		const inputEvent = new window.InputEvent("input");
+		const input = target.querySelector('input');
+		const inputEvent = new window.InputEvent('input');
 		assert.equal(component.value, 5);
-		assert.equal(input.value, "5");
+		assert.equal(input.value, '5');
 
-		input.value = "5.";
+		input.value = '5.';
 		input.dispatchEvent(inputEvent);
 
 		// input type number has value === "" if ends with dot/comma
 		assert.equal(component.value, undefined);
-		assert.equal(input.value, "");
+		assert.equal(input.value, '');
 
-		input.value = "5.5";
+		input.value = '5.5';
 		input.dispatchEvent(inputEvent);
 
 		assert.equal(component.value, 5.5);
-		assert.equal(input.value, "5.5");
+		assert.equal(input.value, '5.5');
 
-		input.value = "5.50";
+		input.value = '5.50';
 		input.dispatchEvent(inputEvent);
 
 		assert.equal(component.value, 5.5);
-		assert.equal(input.value, "5.50");
+		assert.equal(input.value, '5.50');
 
 		component.value = 1;
 		assert.equal(component.value, 1);
-		assert.equal(input.value, "1");
-	},
+		assert.equal(input.value, '1');
+	}
 };
diff --git a/test/runtime/samples/binding-input-number/_config.js b/test/runtime/samples/binding-input-number/_config.js
index 869b9f9896..1a56a75c0c 100644
--- a/test/runtime/samples/binding-input-number/_config.js
+++ b/test/runtime/samples/binding-input-number/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		count: 42,
+		count: 42
 	},
 
 	html: `
@@ -35,14 +35,14 @@ export default {
 			<p>number 44</p>
 		`);
 
-		// empty string should be treated as undefined
+		// empty string should be treated as null
 		input.value = '';
 		await input.dispatchEvent(event);
 
-		assert.equal(component.count, undefined);
+		assert.equal(component.count, null);
 		assert.htmlEqual(target.innerHTML, `
 			<input type='number'>
-			<p>undefined undefined</p>
+			<p>object null</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-input-range-change-with-max/_config.js b/test/runtime/samples/binding-input-range-change-with-max/_config.js
index 1fda90d83c..dc3cf4ce28 100644
--- a/test/runtime/samples/binding-input-range-change-with-max/_config.js
+++ b/test/runtime/samples/binding-input-range-change-with-max/_config.js
@@ -29,5 +29,5 @@ export default {
 			<input type=range min=0 max=20>
 			<p>20 of 20</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-input-range-change/_config.js b/test/runtime/samples/binding-input-range-change/_config.js
index 62e9562770..f6ec2d9c53 100644
--- a/test/runtime/samples/binding-input-range-change/_config.js
+++ b/test/runtime/samples/binding-input-range-change/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		count: 42,
+		count: 42
 	},
 
 	html: `
@@ -34,5 +34,5 @@ export default {
 			<input type='range'>
 			<p>number 44</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-input-range/_config.js b/test/runtime/samples/binding-input-range/_config.js
index 4c3d37a667..dc6178e088 100644
--- a/test/runtime/samples/binding-input-range/_config.js
+++ b/test/runtime/samples/binding-input-range/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		count: 42,
+		count: 42
 	},
 
 	html: `
@@ -34,5 +34,5 @@ export default {
 			<input type='range'>
 			<p>number 44</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-input-text-contextual-deconflicted/_config.js b/test/runtime/samples/binding-input-text-contextual-deconflicted/_config.js
index 28cffdfa57..de4d6325b0 100644
--- a/test/runtime/samples/binding-input-text-contextual-deconflicted/_config.js
+++ b/test/runtime/samples/binding-input-text-contextual-deconflicted/_config.js
@@ -1,7 +1,7 @@
 export default {
 	props: {
 		foo: 'a',
-		items: ['x'],
+		items: ['x']
 	},
 
 	html: `
@@ -32,5 +32,5 @@ export default {
 			<div><input><p>b</p></div>
 			<div><input><p>y</p></div>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-input-text-contextual-reactive/_config.js b/test/runtime/samples/binding-input-text-contextual-reactive/_config.js
index 6fdfc4be52..a1584c18b8 100644
--- a/test/runtime/samples/binding-input-text-contextual-reactive/_config.js
+++ b/test/runtime/samples/binding-input-text-contextual-reactive/_config.js
@@ -121,5 +121,5 @@ export default {
 
 			<p>done:one / done:two / remaining:four</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-input-text-contextual/_config.js b/test/runtime/samples/binding-input-text-contextual/_config.js
index bb7f16c8bb..1c66ea7ff5 100644
--- a/test/runtime/samples/binding-input-text-contextual/_config.js
+++ b/test/runtime/samples/binding-input-text-contextual/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		items: ['one', 'two', 'three'],
+		items: ['one', 'two', 'three']
 	},
 
 	html: `
@@ -65,5 +65,5 @@ export default {
 				<input><p>five</p>
 			</div>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-input-text-deconflicted/_config.js b/test/runtime/samples/binding-input-text-deconflicted/_config.js
index 46fe3e2a38..48a7d2590a 100644
--- a/test/runtime/samples/binding-input-text-deconflicted/_config.js
+++ b/test/runtime/samples/binding-input-text-deconflicted/_config.js
@@ -1,8 +1,8 @@
 export default {
 	props: {
 		component: {
-			name: 'world',
-		},
+			name: 'world'
+		}
 	},
 
 	html: `
@@ -36,5 +36,5 @@ export default {
 			<h1>Hello goodbye!</h1>
 			<input>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-input-text-deep-computed-dynamic/_config.js b/test/runtime/samples/binding-input-text-deep-computed-dynamic/_config.js
index eeecdb0ef8..0afbb9d952 100644
--- a/test/runtime/samples/binding-input-text-deep-computed-dynamic/_config.js
+++ b/test/runtime/samples/binding-input-text-deep-computed-dynamic/_config.js
@@ -4,8 +4,8 @@ export default {
 		obj: {
 			foo: 'a',
 			bar: 'b',
-			baz: 'c',
-		},
+			baz: 'c'
+		}
 	},
 
 	html: `
@@ -56,5 +56,5 @@ export default {
 			<input>
 			<pre>{"foo":"d","bar":"e","baz":"f"}</pre>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-input-text-deep-computed/_config.js b/test/runtime/samples/binding-input-text-deep-computed/_config.js
index a1ea2c34ad..3a85d50d76 100644
--- a/test/runtime/samples/binding-input-text-deep-computed/_config.js
+++ b/test/runtime/samples/binding-input-text-deep-computed/_config.js
@@ -2,8 +2,8 @@ export default {
 	props: {
 		prop: 'name',
 		user: {
-			name: 'alice',
-		},
+			name: 'alice'
+		}
 	},
 
 	html: `
@@ -40,5 +40,5 @@ export default {
 			<input>
 			<p>hello carol</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-input-text-deep-contextual-computed-dynamic/_config.js b/test/runtime/samples/binding-input-text-deep-contextual-computed-dynamic/_config.js
index 364195233d..627ef5f15e 100644
--- a/test/runtime/samples/binding-input-text-deep-contextual-computed-dynamic/_config.js
+++ b/test/runtime/samples/binding-input-text-deep-contextual-computed-dynamic/_config.js
@@ -5,9 +5,9 @@ export default {
 			{
 				foo: 'a',
 				bar: 'b',
-				baz: 'c',
-			},
-		],
+				baz: 'c'
+			}
+		]
 	},
 
 	html: `
@@ -58,5 +58,5 @@ export default {
 			<input>
 			<pre>{"foo":"d","bar":"e","baz":"f"}</pre>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-input-text-deep-contextual/_config.js b/test/runtime/samples/binding-input-text-deep-contextual/_config.js
index 5b6b0d6577..cc80d38042 100644
--- a/test/runtime/samples/binding-input-text-deep-contextual/_config.js
+++ b/test/runtime/samples/binding-input-text-deep-contextual/_config.js
@@ -3,8 +3,8 @@ export default {
 		items: [
 			{ description: 'one' },
 			{ description: 'two' },
-			{ description: 'three' },
-		],
+			{ description: 'three' }
+		]
 	},
 
 	html: `
@@ -45,5 +45,5 @@ export default {
 			<div><input><p>four</p></div>
 			<div><input><p>five</p></div>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-input-text-deep/_config.js b/test/runtime/samples/binding-input-text-deep/_config.js
index e6113510a7..35443e9073 100644
--- a/test/runtime/samples/binding-input-text-deep/_config.js
+++ b/test/runtime/samples/binding-input-text-deep/_config.js
@@ -1,8 +1,8 @@
 export default {
 	props: {
 		user: {
-			name: 'alice',
-		},
+			name: 'alice'
+		}
 	},
 
 	html: `
@@ -39,5 +39,5 @@ export default {
 			<input>
 			<p>hello carol</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-input-text-undefined/_config.js b/test/runtime/samples/binding-input-text-undefined/_config.js
index 009e1b37ba..fa59b1f796 100644
--- a/test/runtime/samples/binding-input-text-undefined/_config.js
+++ b/test/runtime/samples/binding-input-text-undefined/_config.js
@@ -26,5 +26,5 @@ export default {
 
 		component.x = undefined;
 		assert.equal(input.value, '');
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-input-text/_config.js b/test/runtime/samples/binding-input-text/_config.js
index e7162b6153..52d8e44902 100644
--- a/test/runtime/samples/binding-input-text/_config.js
+++ b/test/runtime/samples/binding-input-text/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		name: 'world',
+		name: 'world'
 	},
 
 	html: `
@@ -33,5 +33,5 @@ export default {
 			<input>
 			<p>hello goodbye</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-select-in-yield/_config.js b/test/runtime/samples/binding-select-in-yield/_config.js
index 11dcb3d58c..042fba832b 100644
--- a/test/runtime/samples/binding-select-in-yield/_config.js
+++ b/test/runtime/samples/binding-select-in-yield/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: ``,
+	html: '',
 
 	props: {
 		letter: 'b'
diff --git a/test/runtime/samples/binding-select-initial-value/_config.js b/test/runtime/samples/binding-select-initial-value/_config.js
index d98e5d2e1c..d34a987fa5 100644
--- a/test/runtime/samples/binding-select-initial-value/_config.js
+++ b/test/runtime/samples/binding-select-initial-value/_config.js
@@ -24,7 +24,7 @@ export default {
 	`,
 
 	props: {
-		selected: 'b',
+		selected: 'b'
 	},
 
 	test({ assert, component, target }) {
@@ -33,5 +33,5 @@ export default {
 
 		assert.equal(select.value, 'b');
 		assert.ok(options[1].selected);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-select-optgroup/_config.js b/test/runtime/samples/binding-select-optgroup/_config.js
index e8a1d40797..03ad3e3280 100644
--- a/test/runtime/samples/binding-select-optgroup/_config.js
+++ b/test/runtime/samples/binding-select-optgroup/_config.js
@@ -45,5 +45,5 @@ export default {
 				</optgroup>
 			</select>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-select/_config.js b/test/runtime/samples/binding-select/_config.js
index a5995061a0..310315176b 100644
--- a/test/runtime/samples/binding-select/_config.js
+++ b/test/runtime/samples/binding-select/_config.js
@@ -24,7 +24,7 @@ export default {
 	`,
 
 	props: {
-		selected: 'one',
+		selected: 'one'
 	},
 
 	async test({ assert, component, target, window }) {
@@ -53,5 +53,5 @@ export default {
 		`);
 
 		component.selected = 'three';
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-store-deep/_config.js b/test/runtime/samples/binding-store-deep/_config.js
index 8bdd41818b..c0f4f63578 100644
--- a/test/runtime/samples/binding-store-deep/_config.js
+++ b/test/runtime/samples/binding-store-deep/_config.js
@@ -37,5 +37,5 @@ export default {
 
 		assert.deepEqual(names, ['world', 'everybody', 'goodbye']);
 		unsubscribe();
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-store/_config.js b/test/runtime/samples/binding-store/_config.js
index eb22d3e96c..6e7a70878a 100644
--- a/test/runtime/samples/binding-store/_config.js
+++ b/test/runtime/samples/binding-store/_config.js
@@ -37,5 +37,5 @@ export default {
 
 		assert.deepEqual(names, ['world', 'everybody', 'goodbye']);
 		unsubscribe();
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-textarea/_config.js b/test/runtime/samples/binding-textarea/_config.js
index ac092096e6..70646e5e4b 100644
--- a/test/runtime/samples/binding-textarea/_config.js
+++ b/test/runtime/samples/binding-textarea/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		value: 'some text',
+		value: 'some text'
 	},
 
 	html: `
@@ -33,5 +33,5 @@ export default {
 			<textarea></textarea>
 			<p>goodbye</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-this-each-block-property-2/_config.js b/test/runtime/samples/binding-this-each-block-property-2/_config.js
index eebd754fca..b67d27050e 100644
--- a/test/runtime/samples/binding-this-each-block-property-2/_config.js
+++ b/test/runtime/samples/binding-this-each-block-property-2/_config.js
@@ -3,9 +3,9 @@ function callback(refs) {
 	calls.push(refs.map(({ ref }) => ({ ref })));
 }
 export default {
-	html: ``,
+	html: '',
 	props: {
-		callback,
+		callback
 	},
 	after_test() {
 		calls = [];
@@ -16,7 +16,7 @@ export default {
 
 		await component.addItem();
 
-		let divs = target.querySelectorAll("div");
+		let divs = target.querySelectorAll('div');
 
 		assert.equal(calls.length, 3);
 		assert.equal(calls[1].length, 1);
@@ -26,7 +26,7 @@ export default {
 
 		await component.addItem();
 
-		divs = target.querySelectorAll("div");
+		divs = target.querySelectorAll('div');
 
 		assert.equal(calls.length, 5);
 		assert.equal(calls[3].length, 2);
@@ -38,7 +38,7 @@ export default {
 
 		await component.addItem();
 
-		divs = target.querySelectorAll("div");
+		divs = target.querySelectorAll('div');
 
 		assert.equal(calls.length, 7);
 		assert.equal(calls[5].length, 3);
@@ -49,5 +49,5 @@ export default {
 		assert.equal(calls[6][0].ref, divs[0]);
 		assert.equal(calls[6][1].ref, divs[1]);
 		assert.equal(calls[6][2].ref, divs[2]);
-	},
+	}
 };
diff --git a/test/runtime/samples/binding-this-each-block-property-component/_config.js b/test/runtime/samples/binding-this-each-block-property-component/_config.js
index 947ec17929..3346888555 100644
--- a/test/runtime/samples/binding-this-each-block-property-component/_config.js
+++ b/test/runtime/samples/binding-this-each-block-property-component/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: ``,
+	html: '',
 
 	async test({ assert, component, target }) {
 		component.visible = true;
diff --git a/test/runtime/samples/binding-this-each-block-property/_config.js b/test/runtime/samples/binding-this-each-block-property/_config.js
index 15ad4be5db..bb24bcc0bf 100644
--- a/test/runtime/samples/binding-this-each-block-property/_config.js
+++ b/test/runtime/samples/binding-this-each-block-property/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: ``,
+	html: '',
 
 	async test({ assert, component, target }) {
 		component.visible = true;
diff --git a/test/runtime/samples/binding-this-each-object-props/_config.js b/test/runtime/samples/binding-this-each-object-props/_config.js
index 5372667b82..e9ec7d90f0 100644
--- a/test/runtime/samples/binding-this-each-object-props/_config.js
+++ b/test/runtime/samples/binding-this-each-object-props/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: ``,
+	html: '',
 
 	async test({ assert, component, target }) {
 		component.visible = true;
diff --git a/test/runtime/samples/binding-this-each-object-spread/_config.js b/test/runtime/samples/binding-this-each-object-spread/_config.js
index cecec08db9..e88ebe8de5 100644
--- a/test/runtime/samples/binding-this-each-object-spread/_config.js
+++ b/test/runtime/samples/binding-this-each-object-spread/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: ``,
+	html: '',
 
 	async test({ assert, component, target }) {
 		component.visible = true;
diff --git a/test/runtime/samples/binding-this-store/_config.js b/test/runtime/samples/binding-this-store/_config.js
index f818c2e31e..32bc9c4ce9 100644
--- a/test/runtime/samples/binding-this-store/_config.js
+++ b/test/runtime/samples/binding-this-store/_config.js
@@ -1,4 +1,4 @@
 export default {
 	skip_if_ssr: true,
-	html: `<div>object</div>`
+	html: '<div>object</div>'
 };
diff --git a/test/runtime/samples/binding-using-props/_config.js b/test/runtime/samples/binding-using-props/_config.js
index dcb34c4357..2e5fef1f4f 100644
--- a/test/runtime/samples/binding-using-props/_config.js
+++ b/test/runtime/samples/binding-using-props/_config.js
@@ -11,4 +11,4 @@ export default {
 			<p>changed</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/binding-width-height-a11y/_config.js b/test/runtime/samples/binding-width-height-a11y/_config.js
index 93856bf0f6..198051e6d2 100644
--- a/test/runtime/samples/binding-width-height-a11y/_config.js
+++ b/test/runtime/samples/binding-width-height-a11y/_config.js
@@ -2,7 +2,7 @@ export default {
 	async test({ assert, target }) {
 		const iframe = target.querySelector('iframe');
 
-		assert.equal(iframe.getAttribute('aria-hidden'), "true");
-		assert.equal(iframe.getAttribute('tabindex'), "-1");
+		assert.equal(iframe.getAttribute('aria-hidden'), 'true');
+		assert.equal(iframe.getAttribute('tabindex'), '-1');
 	}
 };
diff --git a/test/runtime/samples/bindings-before-onmount/_config.js b/test/runtime/samples/bindings-before-onmount/_config.js
index d21751c528..1d2ac64fe8 100644
--- a/test/runtime/samples/bindings-before-onmount/_config.js
+++ b/test/runtime/samples/bindings-before-onmount/_config.js
@@ -2,4 +2,4 @@ export default {
 	test({ assert, component }) {
 		assert.equal(component.one.snapshot, 2);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/bindings-coalesced/_config.js b/test/runtime/samples/bindings-coalesced/_config.js
index 164d0b42e7..14ffd3ed89 100644
--- a/test/runtime/samples/bindings-coalesced/_config.js
+++ b/test/runtime/samples/bindings-coalesced/_config.js
@@ -14,4 +14,4 @@ export default {
 
 		assert.deepEqual(values, ['6']);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/bindings-global-dependency/_config.js b/test/runtime/samples/bindings-global-dependency/_config.js
index f5ab04de78..1180424e81 100644
--- a/test/runtime/samples/bindings-global-dependency/_config.js
+++ b/test/runtime/samples/bindings-global-dependency/_config.js
@@ -1,3 +1,3 @@
 export default {
 	html: '<input type="text">'
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/bitmask-overflow-2/_config.js b/test/runtime/samples/bitmask-overflow-2/_config.js
index 0b63791292..781c493245 100644
--- a/test/runtime/samples/bitmask-overflow-2/_config.js
+++ b/test/runtime/samples/bitmask-overflow-2/_config.js
@@ -1,3 +1,3 @@
 export default {
-	error: `potato is not defined`,
-};
\ No newline at end of file
+	error: 'potato is not defined'
+};
diff --git a/test/runtime/samples/bitmask-overflow-3/_config.js b/test/runtime/samples/bitmask-overflow-3/_config.js
index aee7d3237e..bd415bfd49 100644
--- a/test/runtime/samples/bitmask-overflow-3/_config.js
+++ b/test/runtime/samples/bitmask-overflow-3/_config.js
@@ -1,3 +1,3 @@
 export default {
-	error: `A is not defined`,
-};
\ No newline at end of file
+	error: 'A is not defined'
+};
diff --git a/test/runtime/samples/bitmask-overflow-if/_config.js b/test/runtime/samples/bitmask-overflow-if/_config.js
index 74bc70d414..49f48925c5 100644
--- a/test/runtime/samples/bitmask-overflow-if/_config.js
+++ b/test/runtime/samples/bitmask-overflow-if/_config.js
@@ -7,8 +7,8 @@ export default {
 	`,
 
 	async test({ assert, component, target, window }) {
-		const button = target.querySelector("button");
-		await button.dispatchEvent(new window.MouseEvent("click"));
+		const button = target.querySelector('button');
+		await button.dispatchEvent(new window.MouseEvent('click'));
 
 		assert.htmlEqual(
 			target.innerHTML,
diff --git a/test/runtime/samples/bitmask-overflow-slot-2/_config.js b/test/runtime/samples/bitmask-overflow-slot-2/_config.js
index b01bd81e00..1f9613711a 100644
--- a/test/runtime/samples/bitmask-overflow-slot-2/_config.js
+++ b/test/runtime/samples/bitmask-overflow-slot-2/_config.js
@@ -90,7 +90,7 @@ export default {
 
 		assert.deepEqual(component.reads, {
 			_0: 2,
-			_1: 2,
+			_1: 2
 		});
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/bitmask-overflow-slot-3/_config.js b/test/runtime/samples/bitmask-overflow-slot-3/_config.js
index 93e548e5f7..7921253e18 100644
--- a/test/runtime/samples/bitmask-overflow-slot-3/_config.js
+++ b/test/runtime/samples/bitmask-overflow-slot-3/_config.js
@@ -27,4 +27,4 @@ export default {
 			<button></button>
 		`);	
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/bitmask-overflow-slot-4/_config.js b/test/runtime/samples/bitmask-overflow-slot-4/_config.js
index cdaa5de77f..5aa339afd6 100644
--- a/test/runtime/samples/bitmask-overflow-slot-4/_config.js
+++ b/test/runtime/samples/bitmask-overflow-slot-4/_config.js
@@ -38,4 +38,4 @@ export default {
 			<button></button>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/bitmask-overflow-slot-5/_config.js b/test/runtime/samples/bitmask-overflow-slot-5/_config.js
index 7dedb8f7eb..80900d0042 100644
--- a/test/runtime/samples/bitmask-overflow-slot-5/_config.js
+++ b/test/runtime/samples/bitmask-overflow-slot-5/_config.js
@@ -46,4 +46,4 @@ export default {
 			<button></button>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/bitmask-overflow-slot-6/_config.js b/test/runtime/samples/bitmask-overflow-slot-6/_config.js
index 8cd8c07a65..7cf7538b69 100644
--- a/test/runtime/samples/bitmask-overflow-slot-6/_config.js
+++ b/test/runtime/samples/bitmask-overflow-slot-6/_config.js
@@ -29,4 +29,4 @@ export default {
 			<button>Toggle outside</button>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/bitmask-overflow-slot/_config.js b/test/runtime/samples/bitmask-overflow-slot/_config.js
index 9b24d5541f..a14ef3270f 100644
--- a/test/runtime/samples/bitmask-overflow-slot/_config.js
+++ b/test/runtime/samples/bitmask-overflow-slot/_config.js
@@ -121,4 +121,4 @@ export default {
 			_40: 1
 		});
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/bitmask-overflow/_config.js b/test/runtime/samples/bitmask-overflow/_config.js
index ada3195c81..e5e54ac10e 100644
--- a/test/runtime/samples/bitmask-overflow/_config.js
+++ b/test/runtime/samples/bitmask-overflow/_config.js
@@ -119,4 +119,4 @@ export default {
 			_40: 1
 		});
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/class-boolean/_config.js b/test/runtime/samples/class-boolean/_config.js
index a5003566cc..ac02a1a425 100644
--- a/test/runtime/samples/class-boolean/_config.js
+++ b/test/runtime/samples/class-boolean/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<div class="one"></div>`
+	html: '<div class="one"></div>'
 };
diff --git a/test/runtime/samples/class-helper/_config.js b/test/runtime/samples/class-helper/_config.js
index c38cc88240..6a62476493 100644
--- a/test/runtime/samples/class-helper/_config.js
+++ b/test/runtime/samples/class-helper/_config.js
@@ -3,7 +3,7 @@ export default {
 		user: { active: true }
 	},
 
-	html: `<div class="active"></div>`,
+	html: '<div class="active"></div>',
 
 	test({ assert, component, target }) {
 		component.user = { active: false };
diff --git a/test/runtime/samples/class-shortcut-with-class/_config.js b/test/runtime/samples/class-shortcut-with-class/_config.js
index fc1a00e8aa..6d647e8f9d 100644
--- a/test/runtime/samples/class-shortcut-with-class/_config.js
+++ b/test/runtime/samples/class-shortcut-with-class/_config.js
@@ -5,7 +5,7 @@ export default {
 		myClass: 'one two'
 	},
 
-	html: `<div class="one two foo bar"></div>`,
+	html: '<div class="one two foo bar"></div>',
 
 	test({ assert, component, target, window }) {
 		component.foo = false;
diff --git a/test/runtime/samples/class-shortcut/_config.js b/test/runtime/samples/class-shortcut/_config.js
index e0c8aec3a5..aba7e0e031 100644
--- a/test/runtime/samples/class-shortcut/_config.js
+++ b/test/runtime/samples/class-shortcut/_config.js
@@ -4,7 +4,7 @@ export default {
 		bar: true
 	},
 
-	html: `<div class="foo bar"></div>`,
+	html: '<div class="foo bar"></div>',
 
 	test({ assert, component, target, window }) {
 		component.foo = false;
diff --git a/test/runtime/samples/class-with-attribute/_config.js b/test/runtime/samples/class-with-attribute/_config.js
index 719e6bd473..7550b215ab 100644
--- a/test/runtime/samples/class-with-attribute/_config.js
+++ b/test/runtime/samples/class-with-attribute/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<div class="one two three"></div>`
+	html: '<div class="one two three"></div>'
 };
diff --git a/test/runtime/samples/class-with-dynamic-attribute-and-spread/_config.js b/test/runtime/samples/class-with-dynamic-attribute-and-spread/_config.js
index 58ccc76497..f704e9327f 100644
--- a/test/runtime/samples/class-with-dynamic-attribute-and-spread/_config.js
+++ b/test/runtime/samples/class-with-dynamic-attribute-and-spread/_config.js
@@ -6,7 +6,7 @@ export default {
 		}
 	},
 
-	html: `<div class="one two three" role="button"></div>`,
+	html: '<div class="one two three" role="button"></div>',
 
 	test({ assert, component, target, window }) {
 		component.myClass = 'one';
diff --git a/test/runtime/samples/class-with-dynamic-attribute/_config.js b/test/runtime/samples/class-with-dynamic-attribute/_config.js
index 12c955c24d..2be6500674 100644
--- a/test/runtime/samples/class-with-dynamic-attribute/_config.js
+++ b/test/runtime/samples/class-with-dynamic-attribute/_config.js
@@ -3,7 +3,7 @@ export default {
 		myClass: 'one two'
 	},
 
-	html: `<div class="one two three"></div>`,
+	html: '<div class="one two three"></div>',
 
 	test({ assert, component, target, window }) {
 		component.myClass = 'one';
diff --git a/test/runtime/samples/class-with-spread-and-bind/_config.js b/test/runtime/samples/class-with-spread-and-bind/_config.js
index f3c54e8c52..7b50502f34 100644
--- a/test/runtime/samples/class-with-spread-and-bind/_config.js
+++ b/test/runtime/samples/class-with-spread-and-bind/_config.js
@@ -1,9 +1,9 @@
 export default {
 	props: {
-		primary: true,
+		primary: true
 	},
 
-	html: `<div class="test-class primary" role="button"></div>`,
+	html: '<div class="test-class primary" role="button"></div>',
 
 	test({ assert, component, target, window }) {
 		component.primary = true;
@@ -14,5 +14,5 @@ export default {
 			<div class="test-class primary" role="button"></div>
 		`
 		);
-	},
+	}
 };
diff --git a/test/runtime/samples/class-with-spread/_config.js b/test/runtime/samples/class-with-spread/_config.js
index d5233a5849..c7c85e38b0 100644
--- a/test/runtime/samples/class-with-spread/_config.js
+++ b/test/runtime/samples/class-with-spread/_config.js
@@ -6,7 +6,7 @@ export default {
 		}
 	},
 
-	html: `<div class="one two" role="button"></div>`,
+	html: '<div class="one two" role="button"></div>',
 
 	test({ assert, component, target, window }) {
 		component.myClass = 'one';
diff --git a/test/runtime/samples/component-binding-deep/_config.js b/test/runtime/samples/component-binding-deep/_config.js
index be5a2624ac..8a2f5a56cf 100644
--- a/test/runtime/samples/component-binding-deep/_config.js
+++ b/test/runtime/samples/component-binding-deep/_config.js
@@ -21,5 +21,5 @@ export default {
 			<input>
 			<p>blah</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/component-binding-store/_config.js b/test/runtime/samples/component-binding-store/_config.js
index 4dec41459f..d17b9e2d80 100644
--- a/test/runtime/samples/component-binding-store/_config.js
+++ b/test/runtime/samples/component-binding-store/_config.js
@@ -11,10 +11,10 @@ export default {
 			count++;
 		};
 
-		const [input1, input2] = target.querySelectorAll("input");
+		const [input1, input2] = target.querySelectorAll('input');
 
-		input1.value = "1";
-		await input1.dispatchEvent(new window.Event("input"));
+		input1.value = '1';
+		await input1.dispatchEvent(new window.Event('input'));
 
 		assert.htmlEqual(
 			target.innerHTML,
@@ -24,12 +24,12 @@ export default {
 				<div>1</div>
 			`
 		);
-		assert.equal(input1.value, "1");
-		assert.equal(input2.value, "1");
+		assert.equal(input1.value, '1');
+		assert.equal(input2.value, '1');
 		assert.equal(count, 1);
 
-		input2.value = "123";
-		await input2.dispatchEvent(new window.Event("input"));
+		input2.value = '123';
+		await input2.dispatchEvent(new window.Event('input'));
 
 		assert.htmlEqual(
 			target.innerHTML,
@@ -39,12 +39,12 @@ export default {
 				<div>123</div>
 			`
 		);
-		assert.equal(input1.value, "123");
-		assert.equal(input2.value, "123");
+		assert.equal(input1.value, '123');
+		assert.equal(input2.value, '123');
 		assert.equal(count, 2);
 
-		input1.value = "456";
-		await input1.dispatchEvent(new window.Event("input"));
+		input1.value = '456';
+		await input1.dispatchEvent(new window.Event('input'));
 
 		assert.htmlEqual(
 			target.innerHTML,
@@ -54,8 +54,8 @@ export default {
 				<div>456</div>
 			`
 		);
-		assert.equal(input1.value, "456");
-		assert.equal(input2.value, "456");
+		assert.equal(input1.value, '456');
+		assert.equal(input2.value, '456');
 		assert.equal(count, 3);
-	},
+	}
 };
diff --git a/test/runtime/samples/component-data-dynamic-shorthand/_config.js b/test/runtime/samples/component-data-dynamic-shorthand/_config.js
index 80e8731dc5..779966d4aa 100644
--- a/test/runtime/samples/component-data-dynamic-shorthand/_config.js
+++ b/test/runtime/samples/component-data-dynamic-shorthand/_config.js
@@ -3,11 +3,11 @@ export default {
 		foo: 42
 	},
 
-	html: `<div><p>foo: 42</p></div>`,
+	html: '<div><p>foo: 42</p></div>',
 
 	test({ assert, component, target }) {
 		component.foo = 99;
 
-		assert.equal( target.innerHTML, `<div><p>foo: 99</p></div>` );
+		assert.equal( target.innerHTML, '<div><p>foo: 99</p></div>' );
 	}
 };
diff --git a/test/runtime/samples/component-data-empty/_config.js b/test/runtime/samples/component-data-empty/_config.js
index eaf16a72af..486827f398 100644
--- a/test/runtime/samples/component-data-empty/_config.js
+++ b/test/runtime/samples/component-data-empty/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<div><p>foo: ''</p></div>`
+	html: "<div><p>foo: ''</p></div>"
 };
diff --git a/test/runtime/samples/component-data-static-boolean-regression/_config.js b/test/runtime/samples/component-data-static-boolean-regression/_config.js
index 61f8ba0a06..93d0f1165c 100644
--- a/test/runtime/samples/component-data-static-boolean-regression/_config.js
+++ b/test/runtime/samples/component-data-static-boolean-regression/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<a href='/cool'>link</a>`
+	html: "<a href='/cool'>link</a>"
 };
diff --git a/test/runtime/samples/component-data-static-boolean/_config.js b/test/runtime/samples/component-data-static-boolean/_config.js
index aaaf3de630..7253644c64 100644
--- a/test/runtime/samples/component-data-static-boolean/_config.js
+++ b/test/runtime/samples/component-data-static-boolean/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<p>x: true (boolean)</p>`
+	html: '<p>x: true (boolean)</p>'
 };
diff --git a/test/runtime/samples/component-event-not-stale/_config.js b/test/runtime/samples/component-event-not-stale/_config.js
index 912ea1f7d0..7951afb9d5 100644
--- a/test/runtime/samples/component-event-not-stale/_config.js
+++ b/test/runtime/samples/component-event-not-stale/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		value: 1,
+		value: 1
 	},
 
 	test({ assert, component, target, window }) {
@@ -26,5 +26,5 @@ export default {
 			{ value: 2 },
 			{ value: 2 }
 		]);
-	},
+	}
 };
diff --git a/test/runtime/samples/component-events-console/_config.js b/test/runtime/samples/component-events-console/_config.js
index b800749785..39ccbd719f 100644
--- a/test/runtime/samples/component-events-console/_config.js
+++ b/test/runtime/samples/component-events-console/_config.js
@@ -21,5 +21,5 @@ export default {
 		}
 
 		console.log = log;
-	},
+	}
 };
diff --git a/test/runtime/samples/component-name-deconflicted-globals/_config.js b/test/runtime/samples/component-name-deconflicted-globals/_config.js
index 842b6a3a11..66d1d1a8f1 100644
--- a/test/runtime/samples/component-name-deconflicted-globals/_config.js
+++ b/test/runtime/samples/component-name-deconflicted-globals/_config.js
@@ -2,4 +2,4 @@ export default {
 	preserveIdentifiers: true,
 
 	error: 'Countdown is not defined'
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/component-name-deconflicted/_config.js b/test/runtime/samples/component-name-deconflicted/_config.js
index 97ea2290b6..5813042745 100644
--- a/test/runtime/samples/component-name-deconflicted/_config.js
+++ b/test/runtime/samples/component-name-deconflicted/_config.js
@@ -12,4 +12,4 @@ export default {
 			<span>4</span>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/component-namespaced/_config.js b/test/runtime/samples/component-namespaced/_config.js
index b91795d6c8..35a5e46d47 100644
--- a/test/runtime/samples/component-namespaced/_config.js
+++ b/test/runtime/samples/component-namespaced/_config.js
@@ -19,4 +19,4 @@ export default {
 			<p>foo 2</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/component-namespaced/components.js b/test/runtime/samples/component-namespaced/components.js
index 832d2412ee..7dcfcf157c 100644
--- a/test/runtime/samples/component-namespaced/components.js
+++ b/test/runtime/samples/component-namespaced/components.js
@@ -1,3 +1,3 @@
 import Foo from './Foo.svelte';
 
-export default { Foo };
\ No newline at end of file
+export default { Foo };
diff --git a/test/runtime/samples/component-shorthand-import/_config.js b/test/runtime/samples/component-shorthand-import/_config.js
index ceb8e19f68..dd60415537 100644
--- a/test/runtime/samples/component-shorthand-import/_config.js
+++ b/test/runtime/samples/component-shorthand-import/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<p>This is the widget.</p>`,
+	html: '<p>This is the widget.</p>'
 };
diff --git a/test/runtime/samples/component-slot-chained/_config.js b/test/runtime/samples/component-slot-chained/_config.js
index 6c028f8c31..f2f71df8d6 100644
--- a/test/runtime/samples/component-slot-chained/_config.js
+++ b/test/runtime/samples/component-slot-chained/_config.js
@@ -3,6 +3,6 @@ export default {
 
 	test({ assert, component, target }) {
 		component.text = 'two';
-		assert.htmlEqual(target.innerHTML, `two`);
+		assert.htmlEqual(target.innerHTML, 'two');
 	}
 };
diff --git a/test/runtime/samples/component-slot-context-props-each-nested/Nested.svelte b/test/runtime/samples/component-slot-context-props-each-nested/Nested.svelte
new file mode 100644
index 0000000000..fab3ae1890
--- /dev/null
+++ b/test/runtime/samples/component-slot-context-props-each-nested/Nested.svelte
@@ -0,0 +1,14 @@
+<script>
+	let keys = ['a', 'b'];
+	let items = ['c', 'd'];
+  export let log;
+	function setKey(key, value, item) {
+		log.push(`setKey(${key}, ${value}, ${item})`);
+  }
+</script>
+
+{#each items as item (item)}
+	{#each keys as key (key)}
+		<slot {key} {item} set={(value) => setKey(key, value, item)} />
+	{/each}
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-context-props-each-nested/_config.js b/test/runtime/samples/component-slot-context-props-each-nested/_config.js
new file mode 100644
index 0000000000..869cc555b1
--- /dev/null
+++ b/test/runtime/samples/component-slot-context-props-each-nested/_config.js
@@ -0,0 +1,36 @@
+export default {
+	html: `
+		<button type="button">Set a-c</button>
+		<button type="button">Set b-c</button>
+		<button type="button">Set a-d</button>
+		<button type="button">Set b-d</button>
+	`,
+	async test({ assert, target, window, component }) {
+		const [btn1, btn2, btn3, btn4] = target.querySelectorAll('button');
+		const click = new window.MouseEvent('click');
+
+		await btn1.dispatchEvent(click);
+		assert.deepEqual(component.log, ['setKey(a, value-a-c, c)']);
+
+		await btn2.dispatchEvent(click);
+		assert.deepEqual(component.log, [
+			'setKey(a, value-a-c, c)',
+			'setKey(b, value-b-c, c)'
+		]);
+
+		await btn3.dispatchEvent(click);
+		assert.deepEqual(component.log, [
+			'setKey(a, value-a-c, c)',
+			'setKey(b, value-b-c, c)',
+			'setKey(a, value-a-d, d)'
+		]);
+
+		await btn4.dispatchEvent(click);
+		assert.deepEqual(component.log, [
+			'setKey(a, value-a-c, c)',
+			'setKey(b, value-b-c, c)',
+			'setKey(a, value-a-d, d)',
+			'setKey(b, value-b-d, d)'
+		]);
+	}
+};
diff --git a/test/runtime/samples/component-slot-context-props-each-nested/main.svelte b/test/runtime/samples/component-slot-context-props-each-nested/main.svelte
new file mode 100644
index 0000000000..7feb55aaf6
--- /dev/null
+++ b/test/runtime/samples/component-slot-context-props-each-nested/main.svelte
@@ -0,0 +1,8 @@
+<script>
+	import Nested from './Nested.svelte';
+	export let log = [];
+</script>
+
+<Nested {log} let:set let:key let:item>
+	<button type="button" on:click={() => set(`value-${key}-${item}`)}>Set {key}-{item}</button>
+</Nested>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-context-props-each/Nested.svelte b/test/runtime/samples/component-slot-context-props-each/Nested.svelte
new file mode 100644
index 0000000000..a29ffe0376
--- /dev/null
+++ b/test/runtime/samples/component-slot-context-props-each/Nested.svelte
@@ -0,0 +1,11 @@
+<script>
+	let keys = ['a', 'b'];
+  export let log;
+	function setKey(key, value) {
+		log.push(`setKey(${key}, ${value})`);
+  }
+</script>
+
+{#each keys as key (key)}
+	<slot {key} set={(value) => setKey(key, value)} />
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-context-props-each/_config.js b/test/runtime/samples/component-slot-context-props-each/_config.js
new file mode 100644
index 0000000000..f374e7f827
--- /dev/null
+++ b/test/runtime/samples/component-slot-context-props-each/_config.js
@@ -0,0 +1,19 @@
+export default {
+	html: `
+		<button type="button">Set a</button>
+		<button type="button">Set b</button>
+	`,
+	async test({ assert, target, window, component }) {
+		const [btn1, btn2] = target.querySelectorAll('button');
+		const click = new window.MouseEvent('click');
+
+		await btn1.dispatchEvent(click);
+		assert.deepEqual(component.log, ['setKey(a, value-a)']);
+
+		await btn2.dispatchEvent(click);
+		assert.deepEqual(component.log, [
+			'setKey(a, value-a)',
+			'setKey(b, value-b)'
+		]);
+	}
+};
diff --git a/test/runtime/samples/component-slot-context-props-each/main.svelte b/test/runtime/samples/component-slot-context-props-each/main.svelte
new file mode 100644
index 0000000000..7dc17b4c95
--- /dev/null
+++ b/test/runtime/samples/component-slot-context-props-each/main.svelte
@@ -0,0 +1,8 @@
+<script>
+	import Nested from './Nested.svelte';
+	export let log = [];
+</script>
+
+<Nested {log} let:set let:key>
+	<button type="button" on:click={() => set(`value-${key}`)}>Set {key}</button>
+</Nested>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-context-props-let/Inner.svelte b/test/runtime/samples/component-slot-context-props-let/Inner.svelte
new file mode 100644
index 0000000000..6beaabbb68
--- /dev/null
+++ b/test/runtime/samples/component-slot-context-props-let/Inner.svelte
@@ -0,0 +1,9 @@
+<script>
+  export let log;
+	function setKey(key, value) {
+		log.push(`setKey(${key}, ${value})`);
+  }
+</script>
+
+<slot key="a" set={setKey} />
+<slot key="b" set={setKey} />
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-context-props-let/Nested.svelte b/test/runtime/samples/component-slot-context-props-let/Nested.svelte
new file mode 100644
index 0000000000..97c44c5145
--- /dev/null
+++ b/test/runtime/samples/component-slot-context-props-let/Nested.svelte
@@ -0,0 +1,8 @@
+<script>
+	import Inner from './Inner.svelte';
+  export let log;
+</script>
+
+<Inner {log} let:key let:set>
+	<slot {key} set={(value) => set(key, value)} />
+</Inner>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-context-props-let/_config.js b/test/runtime/samples/component-slot-context-props-let/_config.js
new file mode 100644
index 0000000000..f374e7f827
--- /dev/null
+++ b/test/runtime/samples/component-slot-context-props-let/_config.js
@@ -0,0 +1,19 @@
+export default {
+	html: `
+		<button type="button">Set a</button>
+		<button type="button">Set b</button>
+	`,
+	async test({ assert, target, window, component }) {
+		const [btn1, btn2] = target.querySelectorAll('button');
+		const click = new window.MouseEvent('click');
+
+		await btn1.dispatchEvent(click);
+		assert.deepEqual(component.log, ['setKey(a, value-a)']);
+
+		await btn2.dispatchEvent(click);
+		assert.deepEqual(component.log, [
+			'setKey(a, value-a)',
+			'setKey(b, value-b)'
+		]);
+	}
+};
diff --git a/test/runtime/samples/component-slot-context-props-let/main.svelte b/test/runtime/samples/component-slot-context-props-let/main.svelte
new file mode 100644
index 0000000000..a061f73b3a
--- /dev/null
+++ b/test/runtime/samples/component-slot-context-props-let/main.svelte
@@ -0,0 +1,8 @@
+<script>
+	import Nested from './Nested.svelte';
+	export let log = [];
+</script>
+
+<Nested {log} let:set let:key>
+	<button type="button" on:click={() => set(`value-${key}`)}>Set {key}</button>
+</Nested>
diff --git a/test/runtime/samples/component-slot-empty-b/_config.js b/test/runtime/samples/component-slot-empty-b/_config.js
index 8c1b13b1d5..388e1a3e4a 100644
--- a/test/runtime/samples/component-slot-empty-b/_config.js
+++ b/test/runtime/samples/component-slot-empty-b/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<div><input slot="slot1"></div>`
+	html: '<div><input slot="slot1"></div>'
 };
diff --git a/test/runtime/samples/component-slot-fallback-2/_config.js b/test/runtime/samples/component-slot-fallback-2/_config.js
index 585e3b4c9e..7c86357a8e 100644
--- a/test/runtime/samples/component-slot-fallback-2/_config.js
+++ b/test/runtime/samples/component-slot-fallback-2/_config.js
@@ -1,21 +1,21 @@
 export default {
-	html: `<input> <input> <input>`,
-	ssrHtml: `<input value="Blub"> <input value="Blub"> <input value="Blub">`,
+	html: '<input> <input> <input>',
+	ssrHtml: '<input value="Blub"> <input value="Blub"> <input value="Blub">',
 
 	async test({ assert, target, component, window }) {
-		const [input1, input2, inputFallback] = target.querySelectorAll("input");
+		const [input1, input2, inputFallback] = target.querySelectorAll('input');
 
 		assert.equal(component.getSubscriberCount(), 3);
 
-		input1.value = "a";
-		await input1.dispatchEvent(new window.Event("input"));
-		input1.value = "ab";
-		await input1.dispatchEvent(new window.Event("input"));
-		assert.equal(input1.value, "ab");
-		assert.equal(input2.value, "ab");
-		assert.equal(inputFallback.value, "ab");
+		input1.value = 'a';
+		await input1.dispatchEvent(new window.Event('input'));
+		input1.value = 'ab';
+		await input1.dispatchEvent(new window.Event('input'));
+		assert.equal(input1.value, 'ab');
+		assert.equal(input2.value, 'ab');
+		assert.equal(inputFallback.value, 'ab');
 
-		component.props = "hello";
+		component.props = 'hello';
 
 		assert.htmlEqual(
 			target.innerHTML,
@@ -26,7 +26,7 @@ export default {
 			`
 		);
 
-		component.fallback = "world";
+		component.fallback = 'world';
 		assert.htmlEqual(
 			target.innerHTML,
 			`
diff --git a/test/runtime/samples/component-slot-fallback-3/_config.js b/test/runtime/samples/component-slot-fallback-3/_config.js
index b5591fb5e0..25cc65eb2d 100644
--- a/test/runtime/samples/component-slot-fallback-3/_config.js
+++ b/test/runtime/samples/component-slot-fallback-3/_config.js
@@ -2,5 +2,5 @@ export default {
 	html: `
 	<div>Hello World</div>
 	<div>Hello</div><div>world</div><div>Bye</div><div>World</div>
-	`,
+	`
 };
diff --git a/test/runtime/samples/component-slot-fallback-4/_config.js b/test/runtime/samples/component-slot-fallback-4/_config.js
index b7c2b63ed6..4ebe353513 100644
--- a/test/runtime/samples/component-slot-fallback-4/_config.js
+++ b/test/runtime/samples/component-slot-fallback-4/_config.js
@@ -1,5 +1,5 @@
 export default {
 	html: `
 	foobar
-	`,
+	`
 };
diff --git a/test/runtime/samples/component-slot-fallback-5/_config.js b/test/runtime/samples/component-slot-fallback-5/_config.js
index fa374f3519..07d09a3be9 100644
--- a/test/runtime/samples/component-slot-fallback-5/_config.js
+++ b/test/runtime/samples/component-slot-fallback-5/_config.js
@@ -5,8 +5,8 @@ export default {
 	`,
 
 	async test({ assert, target, window }) {
-		const btn = target.querySelector("button");
-		const clickEvent = new window.MouseEvent("click");
+		const btn = target.querySelector('button');
+		const clickEvent = new window.MouseEvent('click');
 
 		await btn.dispatchEvent(clickEvent);
 
diff --git a/test/runtime/samples/component-slot-fallback-6/Foo.svelte b/test/runtime/samples/component-slot-fallback-6/Foo.svelte
new file mode 100644
index 0000000000..0385342cef
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-6/Foo.svelte
@@ -0,0 +1 @@
+<slot />
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-fallback-6/Inner.svelte b/test/runtime/samples/component-slot-fallback-6/Inner.svelte
new file mode 100644
index 0000000000..28f0fdd869
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-6/Inner.svelte
@@ -0,0 +1,9 @@
+<script>
+	import Foo from './Foo.svelte';
+</script>
+
+<Foo>
+	<slot>
+		{JSON.stringify($$props)}
+	</slot>
+</Foo>
diff --git a/test/runtime/samples/component-slot-fallback-6/_config.js b/test/runtime/samples/component-slot-fallback-6/_config.js
new file mode 100644
index 0000000000..b32d96db2e
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-6/_config.js
@@ -0,0 +1,18 @@
+// $$props reactivity in slot fallback
+export default {
+	html: `
+		<input>
+		{"value":""}
+	`,
+
+	async test({ assert, target, window }) {
+		const input = target.querySelector('input');
+		input.value = 'abc';
+		await input.dispatchEvent(new window.Event('input'));
+
+		assert.htmlEqual(target.innerHTML, `
+			<input>
+			{"value":"abc"}
+		`);
+	}
+};
diff --git a/test/runtime/samples/component-slot-fallback-6/main.svelte b/test/runtime/samples/component-slot-fallback-6/main.svelte
new file mode 100644
index 0000000000..35abebef10
--- /dev/null
+++ b/test/runtime/samples/component-slot-fallback-6/main.svelte
@@ -0,0 +1,8 @@
+<script>
+	import Inner from "./Inner.svelte";
+	let value = '';
+</script>
+
+<input bind:value />
+
+<Inner {value} />
diff --git a/test/runtime/samples/component-slot-let-in-slot/_config.js b/test/runtime/samples/component-slot-let-in-slot/_config.js
index a86d869581..eb16c27fda 100644
--- a/test/runtime/samples/component-slot-let-in-slot/_config.js
+++ b/test/runtime/samples/component-slot-let-in-slot/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		prop: 'a',
+		prop: 'a'
 	},
 
 	html: 'a',
diff --git a/test/runtime/samples/component-slot-let-static/_config.js b/test/runtime/samples/component-slot-let-static/_config.js
index 3067939b88..ede7a679c5 100644
--- a/test/runtime/samples/component-slot-let-static/_config.js
+++ b/test/runtime/samples/component-slot-let-static/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<p>Hi</p>`
+	html: '<p>Hi</p>'
 };
diff --git a/test/runtime/samples/component-slot-named-inherits-default-lets/_config.js b/test/runtime/samples/component-slot-named-inherits-default-lets/_config.js
index a07a1482bc..8297162b91 100644
--- a/test/runtime/samples/component-slot-named-inherits-default-lets/_config.js
+++ b/test/runtime/samples/component-slot-named-inherits-default-lets/_config.js
@@ -22,4 +22,4 @@ export default {
 			</div>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/component-slot-nested-error-2/_config.js b/test/runtime/samples/component-slot-nested-error-2/_config.js
index 98a9f1cab0..08c436b16d 100644
--- a/test/runtime/samples/component-slot-nested-error-2/_config.js
+++ b/test/runtime/samples/component-slot-nested-error-2/_config.js
@@ -1,3 +1,3 @@
 export default {
-	error: [`Element with a slot='...' attribute must be a child of a component or a descendant of a custom element`]
+	error: ["Element with a slot='...' attribute must be a child of a component or a descendant of a custom element"]
 };
diff --git a/test/runtime/samples/component-slot-nested-error-3/_config.js b/test/runtime/samples/component-slot-nested-error-3/_config.js
index 98a9f1cab0..08c436b16d 100644
--- a/test/runtime/samples/component-slot-nested-error-3/_config.js
+++ b/test/runtime/samples/component-slot-nested-error-3/_config.js
@@ -1,3 +1,3 @@
 export default {
-	error: [`Element with a slot='...' attribute must be a child of a component or a descendant of a custom element`]
+	error: ["Element with a slot='...' attribute must be a child of a component or a descendant of a custom element"]
 };
diff --git a/test/runtime/samples/component-slot-nested-error/_config.js b/test/runtime/samples/component-slot-nested-error/_config.js
index 98a9f1cab0..08c436b16d 100644
--- a/test/runtime/samples/component-slot-nested-error/_config.js
+++ b/test/runtime/samples/component-slot-nested-error/_config.js
@@ -1,3 +1,3 @@
 export default {
-	error: [`Element with a slot='...' attribute must be a child of a component or a descendant of a custom element`]
+	error: ["Element with a slot='...' attribute must be a child of a component or a descendant of a custom element"]
 };
diff --git a/test/runtime/samples/component-slot-nested-if/_config.js b/test/runtime/samples/component-slot-nested-if/_config.js
index 89dfd006cc..45c570fc22 100644
--- a/test/runtime/samples/component-slot-nested-if/_config.js
+++ b/test/runtime/samples/component-slot-nested-if/_config.js
@@ -26,5 +26,5 @@ export default {
 			Display: abc
 		`
 		);
-	},
+	}
 };
diff --git a/test/runtime/samples/component-slot-nested-in-slot/One.svelte b/test/runtime/samples/component-slot-nested-in-slot/One.svelte
new file mode 100644
index 0000000000..e27437c450
--- /dev/null
+++ b/test/runtime/samples/component-slot-nested-in-slot/One.svelte
@@ -0,0 +1,8 @@
+<script>
+	import Two from './Two.svelte';
+	export let a, b;
+</script>
+
+<Two {b} let:two>
+	<slot name="one" slot="two" one={a} two={two}></slot>
+</Two>
diff --git a/test/runtime/samples/component-slot-nested-in-slot/Two.svelte b/test/runtime/samples/component-slot-nested-in-slot/Two.svelte
new file mode 100644
index 0000000000..3f21e2d16f
--- /dev/null
+++ b/test/runtime/samples/component-slot-nested-in-slot/Two.svelte
@@ -0,0 +1,4 @@
+<script>
+  export let b;
+</script>
+<slot name="two" two={b}></slot>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-nested-in-slot/_config.js b/test/runtime/samples/component-slot-nested-in-slot/_config.js
new file mode 100644
index 0000000000..56a9ef2668
--- /dev/null
+++ b/test/runtime/samples/component-slot-nested-in-slot/_config.js
@@ -0,0 +1,18 @@
+export default {
+	html: `
+		<p slot='one'>one: 1 two: 2</p>
+	`,
+	test({ assert, component, target }) {
+		component.a = 3;
+		component.b = 4;
+		assert.htmlEqual(target.innerHTML, `
+			<p slot='one'>one: 3 two: 4</p>
+		`);
+
+		component.a = 5;
+		component.b = 6;
+		assert.htmlEqual(target.innerHTML, `
+			<p slot='one'>one: 5 two: 6</p>
+		`);
+	}
+};
diff --git a/test/runtime/samples/component-slot-nested-in-slot/main.svelte b/test/runtime/samples/component-slot-nested-in-slot/main.svelte
new file mode 100644
index 0000000000..38a172e668
--- /dev/null
+++ b/test/runtime/samples/component-slot-nested-in-slot/main.svelte
@@ -0,0 +1,9 @@
+<script>
+	import One from './One.svelte';
+	export let a = 1;
+	export let b = 2;
+</script>
+
+<One {a} {b}>
+	<p slot='one' let:one let:two>one: {one} two: {two}</p>
+</One>
\ No newline at end of file
diff --git a/test/runtime/samples/component-slot-slot/Component.svelte b/test/runtime/samples/component-slot-slot/Component.svelte
new file mode 100644
index 0000000000..fdcb8e7f2b
--- /dev/null
+++ b/test/runtime/samples/component-slot-slot/Component.svelte
@@ -0,0 +1,3 @@
+<div>
+	<slot name="test" />
+</div>
diff --git a/test/runtime/samples/component-slot-slot/Forward.svelte b/test/runtime/samples/component-slot-slot/Forward.svelte
new file mode 100644
index 0000000000..320be9df25
--- /dev/null
+++ b/test/runtime/samples/component-slot-slot/Forward.svelte
@@ -0,0 +1,7 @@
+<script>
+	import Component from './Component.svelte';
+</script>
+
+<Component>
+	<slot slot="test" />
+</Component>
diff --git a/test/runtime/samples/component-slot-slot/_config.js b/test/runtime/samples/component-slot-slot/_config.js
new file mode 100644
index 0000000000..32af774fac
--- /dev/null
+++ b/test/runtime/samples/component-slot-slot/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: '<div><span>lol</span></div>'
+};
diff --git a/test/runtime/samples/component-slot-slot/main.svelte b/test/runtime/samples/component-slot-slot/main.svelte
new file mode 100644
index 0000000000..1718494b16
--- /dev/null
+++ b/test/runtime/samples/component-slot-slot/main.svelte
@@ -0,0 +1,9 @@
+<script>
+	import Forward from './Forward.svelte';
+</script>
+
+<Forward>
+	<span>
+		lol
+	</span>
+</Forward>
diff --git a/test/runtime/samples/component-static-at-symbol/_config.js b/test/runtime/samples/component-static-at-symbol/_config.js
index a2f60e3de7..0be19f091f 100644
--- a/test/runtime/samples/component-static-at-symbol/_config.js
+++ b/test/runtime/samples/component-static-at-symbol/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<a href='mailto:hello@example.com'>email</a>`
+	html: "<a href='mailto:hello@example.com'>email</a>"
 };
diff --git a/test/runtime/samples/component-yield-multiple-in-if/_config.js b/test/runtime/samples/component-yield-multiple-in-if/_config.js
index d5d630a84d..7263cc55aa 100644
--- a/test/runtime/samples/component-yield-multiple-in-if/_config.js
+++ b/test/runtime/samples/component-yield-multiple-in-if/_config.js
@@ -5,6 +5,6 @@ export default {
 
 	test({ assert, component, target }) {
 		component.arriving = false;
-		assert.htmlEqual(target.innerHTML, `<div><p class='widget'>Goodbye</p></div>`);
+		assert.htmlEqual(target.innerHTML, "<div><p class='widget'>Goodbye</p></div>");
 	}
 };
diff --git a/test/runtime/samples/component-yield-nested-if/_config.js b/test/runtime/samples/component-yield-nested-if/_config.js
index f16a7bb6bf..b46996cea3 100644
--- a/test/runtime/samples/component-yield-nested-if/_config.js
+++ b/test/runtime/samples/component-yield-nested-if/_config.js
@@ -6,9 +6,9 @@ export default {
 
 	test({ assert, component, target }) {
 		component.foo = false;
-		assert.htmlEqual( target.innerHTML, `` );
+		assert.htmlEqual( target.innerHTML, '' );
 
 		component.foo = true;
-		assert.htmlEqual( target.innerHTML, `One\nInner` );
+		assert.htmlEqual( target.innerHTML, 'One\nInner' );
 	}
 };
diff --git a/test/runtime/samples/context-api-b/_config.js b/test/runtime/samples/context-api-b/_config.js
index 70dff54c06..314fd9f481 100644
--- a/test/runtime/samples/context-api-b/_config.js
+++ b/test/runtime/samples/context-api-b/_config.js
@@ -3,4 +3,4 @@ export default {
 		<div>foo/bar</div>
 		<div>foo/baz</div>
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/context-api/_config.js b/test/runtime/samples/context-api/_config.js
index 1bc475a156..3856aa5424 100644
--- a/test/runtime/samples/context-api/_config.js
+++ b/test/runtime/samples/context-api/_config.js
@@ -70,4 +70,4 @@ export default {
 			</div>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/context-in-await/_config.js b/test/runtime/samples/context-in-await/_config.js
index 221f5fbcca..fc498a36c2 100644
--- a/test/runtime/samples/context-in-await/_config.js
+++ b/test/runtime/samples/context-in-await/_config.js
@@ -10,4 +10,4 @@ export default {
 			<p>Context value: 123</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/contextual-callback/_config.js b/test/runtime/samples/contextual-callback/_config.js
index d47d9d001e..b27a7fc868 100644
--- a/test/runtime/samples/contextual-callback/_config.js
+++ b/test/runtime/samples/contextual-callback/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: `<button>click me</button>`,
+	html: '<button>click me</button>',
 
 	async test({ assert, component, target, window }) {
 		const button = target.querySelector('button');
@@ -9,4 +9,4 @@ export default {
 
 		assert.equal(component.clicked, 'x');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/deconflict-anchor/_config.js b/test/runtime/samples/deconflict-anchor/_config.js
index 817dd42fcb..323cb7530a 100644
--- a/test/runtime/samples/deconflict-anchor/_config.js
+++ b/test/runtime/samples/deconflict-anchor/_config.js
@@ -1,4 +1,4 @@
 export default {
 	preserveIdentifiers: true,
-	html: `<p>Anchor</p>`
+	html: '<p>Anchor</p>'
 };
diff --git a/test/runtime/samples/deconflict-block-methods/_config.js b/test/runtime/samples/deconflict-block-methods/_config.js
index 2bb1aa8424..07c699df4d 100644
--- a/test/runtime/samples/deconflict-block-methods/_config.js
+++ b/test/runtime/samples/deconflict-block-methods/_config.js
@@ -2,5 +2,5 @@ export default {
 	compileOptions: {
 		dev: true
 	},
-	html: `<div>deconflicted</div>`
+	html: '<div>deconflicted</div>'
 };
diff --git a/test/runtime/samples/deconflict-builtins-2/_config.js b/test/runtime/samples/deconflict-builtins-2/_config.js
index 5870ff073b..e136b0410d 100644
--- a/test/runtime/samples/deconflict-builtins-2/_config.js
+++ b/test/runtime/samples/deconflict-builtins-2/_config.js
@@ -1,4 +1,4 @@
 export default {
-	html: `<text>hello world</text>`,
-	preserveIdentifiers: true,
-};
\ No newline at end of file
+	html: '<text>hello world</text>',
+	preserveIdentifiers: true
+};
diff --git a/test/runtime/samples/deconflict-builtins/_config.js b/test/runtime/samples/deconflict-builtins/_config.js
index c7053194ee..3751bfc25d 100644
--- a/test/runtime/samples/deconflict-builtins/_config.js
+++ b/test/runtime/samples/deconflict-builtins/_config.js
@@ -1,7 +1,7 @@
 export default {
-	html: `<span>got</span>`,
+	html: '<span>got</span>',
 
 	test({ assert, component }) {
 		assert.equal(component.foo, 'got');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/deconflict-builtins/get.js b/test/runtime/samples/deconflict-builtins/get.js
index cd846d9be9..78477cc40f 100644
--- a/test/runtime/samples/deconflict-builtins/get.js
+++ b/test/runtime/samples/deconflict-builtins/get.js
@@ -1,3 +1,3 @@
 export function get () {
 	return 'got';
-}
\ No newline at end of file
+}
diff --git a/test/runtime/samples/deconflict-component-name-with-global/_config.js b/test/runtime/samples/deconflict-component-name-with-global/_config.js
index 4b8255868e..214483fc58 100644
--- a/test/runtime/samples/deconflict-component-name-with-global/_config.js
+++ b/test/runtime/samples/deconflict-component-name-with-global/_config.js
@@ -5,5 +5,5 @@ export default {
 
 	preserveIdentifiers: true,
 
-	html: `<p>true</p>`
-};
\ No newline at end of file
+	html: '<p>true</p>'
+};
diff --git a/test/runtime/samples/deconflict-component-name-with-module-global/_config.js b/test/runtime/samples/deconflict-component-name-with-module-global/_config.js
index 4b8255868e..214483fc58 100644
--- a/test/runtime/samples/deconflict-component-name-with-module-global/_config.js
+++ b/test/runtime/samples/deconflict-component-name-with-module-global/_config.js
@@ -5,5 +5,5 @@ export default {
 
 	preserveIdentifiers: true,
 
-	html: `<p>true</p>`
-};
\ No newline at end of file
+	html: '<p>true</p>'
+};
diff --git a/test/runtime/samples/deconflict-component-refs/_config.js b/test/runtime/samples/deconflict-component-refs/_config.js
index 8092aed7ca..992066d1e6 100644
--- a/test/runtime/samples/deconflict-component-refs/_config.js
+++ b/test/runtime/samples/deconflict-component-refs/_config.js
@@ -22,4 +22,4 @@ export default {
 			{ name: 'baz', edit: false }
 		]
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/deconflict-contexts/_config.js b/test/runtime/samples/deconflict-contexts/_config.js
index a32300e58a..5254655d89 100644
--- a/test/runtime/samples/deconflict-contexts/_config.js
+++ b/test/runtime/samples/deconflict-contexts/_config.js
@@ -6,4 +6,4 @@ export default {
 	props: {
 		components: [ 'foo', 'bar', 'baz' ]
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/deconflict-ctx/_config.js b/test/runtime/samples/deconflict-ctx/_config.js
index 88f3e2efca..b6d8bf51be 100644
--- a/test/runtime/samples/deconflict-ctx/_config.js
+++ b/test/runtime/samples/deconflict-ctx/_config.js
@@ -2,4 +2,4 @@ export default {
 	html: `
 		<h1>Hello world!</h1>
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/deconflict-elements-indexes/_config.js b/test/runtime/samples/deconflict-elements-indexes/_config.js
index b531603ac7..cb102638f2 100644
--- a/test/runtime/samples/deconflict-elements-indexes/_config.js
+++ b/test/runtime/samples/deconflict-elements-indexes/_config.js
@@ -19,4 +19,4 @@ export default {
 			</div>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/deconflict-non-helpers/_config.js b/test/runtime/samples/deconflict-non-helpers/_config.js
index 167ddc279c..8bbdc872e5 100644
--- a/test/runtime/samples/deconflict-non-helpers/_config.js
+++ b/test/runtime/samples/deconflict-non-helpers/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: `ABCD`,
+	html: 'ABCD',
 
 	test({ assert, component }) {
 		assert.equal(component.compute(), 'ABCD');
diff --git a/test/runtime/samples/deconflict-self/_config.js b/test/runtime/samples/deconflict-self/_config.js
index 86341e7379..44bea34e09 100644
--- a/test/runtime/samples/deconflict-self/_config.js
+++ b/test/runtime/samples/deconflict-self/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<p>nested component</p>`
+	html: '<p>nested component</p>'
 };
diff --git a/test/runtime/samples/deconflict-spread-i/_config.js b/test/runtime/samples/deconflict-spread-i/_config.js
index f147a4c1ff..7602cde023 100644
--- a/test/runtime/samples/deconflict-spread-i/_config.js
+++ b/test/runtime/samples/deconflict-spread-i/_config.js
@@ -1,3 +1,3 @@
 export default {
 	preserveIdentifiers: true
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/deconflict-template-1/_config.js b/test/runtime/samples/deconflict-template-1/_config.js
index c7ca7bec26..faddb5b6fd 100644
--- a/test/runtime/samples/deconflict-template-1/_config.js
+++ b/test/runtime/samples/deconflict-template-1/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `template`
+	html: 'template'
 };
diff --git a/test/runtime/samples/deconflict-template-2/_config.js b/test/runtime/samples/deconflict-template-2/_config.js
index c7ca7bec26..faddb5b6fd 100644
--- a/test/runtime/samples/deconflict-template-2/_config.js
+++ b/test/runtime/samples/deconflict-template-2/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `template`
+	html: 'template'
 };
diff --git a/test/runtime/samples/deconflict-vars/_config.js b/test/runtime/samples/deconflict-vars/_config.js
index b3303b13fe..e66ce0f141 100644
--- a/test/runtime/samples/deconflict-vars/_config.js
+++ b/test/runtime/samples/deconflict-vars/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<p>ab</p>`
+	html: '<p>ab</p>'
 };
diff --git a/test/runtime/samples/destroy-twice/_config.js b/test/runtime/samples/destroy-twice/_config.js
index 041518d284..1279b2315d 100644
--- a/test/runtime/samples/destroy-twice/_config.js
+++ b/test/runtime/samples/destroy-twice/_config.js
@@ -3,4 +3,4 @@ export default {
 		component.$destroy();
 		component.$destroy();
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/destructuring-assignment-array/_config.js b/test/runtime/samples/destructuring-assignment-array/_config.js
index ede4552803..5b39a0b86e 100644
--- a/test/runtime/samples/destructuring-assignment-array/_config.js
+++ b/test/runtime/samples/destructuring-assignment-array/_config.js
@@ -20,4 +20,4 @@ export default {
 			</ul>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/destructuring-between-exports/_config.js b/test/runtime/samples/destructuring-between-exports/_config.js
index 56061f510f..3b2ee6e9ee 100644
--- a/test/runtime/samples/destructuring-between-exports/_config.js
+++ b/test/runtime/samples/destructuring-between-exports/_config.js
@@ -5,4 +5,4 @@ export default {
 	html: `
 		<h1>42</h2>
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/destructuring/_config.js b/test/runtime/samples/destructuring/_config.js
index b8b138dfd0..93e4ed3936 100644
--- a/test/runtime/samples/destructuring/_config.js
+++ b/test/runtime/samples/destructuring/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: `<button>click me</button>`,
+	html: '<button>click me</button>',
 
 	props: {
 		foo: 42
@@ -22,4 +22,4 @@ export default {
 		assert.equal(count, 1);
 		assert.equal(number, 42);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/dev-warning-destroy-twice/_config.js b/test/runtime/samples/dev-warning-destroy-twice/_config.js
index 3acbd6447a..69ef5b1713 100644
--- a/test/runtime/samples/dev-warning-destroy-twice/_config.js
+++ b/test/runtime/samples/dev-warning-destroy-twice/_config.js
@@ -15,9 +15,9 @@ export default {
 		component.$destroy();
 
 		assert.deepEqual(warnings, [
-			`Component was already destroyed`
+			'Component was already destroyed'
 		]);
 
 		console.warn = warn; // eslint-disable-line no-console
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/dev-warning-each-block-no-sets-maps/_config.js b/test/runtime/samples/dev-warning-each-block-no-sets-maps/_config.js
index 83481d9ebe..036130c4e0 100644
--- a/test/runtime/samples/dev-warning-each-block-no-sets-maps/_config.js
+++ b/test/runtime/samples/dev-warning-each-block-no-sets-maps/_config.js
@@ -2,5 +2,5 @@ export default {
 	compileOptions: {
 		dev: true
 	},
-	error: `{#each} only iterates over array-like objects. You can use a spread to convert this iterable into an array.`
+	error: '{#each} only iterates over array-like objects. You can use a spread to convert this iterable into an array.'
 };
diff --git a/test/runtime/samples/dev-warning-each-block-require-arraylike/_config.js b/test/runtime/samples/dev-warning-each-block-require-arraylike/_config.js
index 62e5fc209b..ff6ef80607 100644
--- a/test/runtime/samples/dev-warning-each-block-require-arraylike/_config.js
+++ b/test/runtime/samples/dev-warning-each-block-require-arraylike/_config.js
@@ -2,5 +2,5 @@ export default {
 	compileOptions: {
 		dev: true
 	},
-	error: `{#each} only iterates over array-like objects.`
+	error: '{#each} only iterates over array-like objects.'
 };
diff --git a/test/runtime/samples/dev-warning-missing-data-binding/_config.js b/test/runtime/samples/dev-warning-missing-data-binding/_config.js
index f23c5d5ec5..1ba0dfc8ff 100644
--- a/test/runtime/samples/dev-warning-missing-data-binding/_config.js
+++ b/test/runtime/samples/dev-warning-missing-data-binding/_config.js
@@ -4,6 +4,6 @@ export default {
 	},
 
 	warnings: [
-		`<Main> was created without expected prop 'value'`
+		"<Main> was created without expected prop 'value'"
 	]
 };
diff --git a/test/runtime/samples/dev-warning-missing-data-component/_config.js b/test/runtime/samples/dev-warning-missing-data-component/_config.js
index a95e570988..ececa00a8c 100644
--- a/test/runtime/samples/dev-warning-missing-data-component/_config.js
+++ b/test/runtime/samples/dev-warning-missing-data-component/_config.js
@@ -4,6 +4,6 @@ export default {
 	},
 
 	warnings: [
-		`<Foo> was created without expected prop 'y'`
+		"<Foo> was created without expected prop 'y'"
 	]
 };
diff --git a/test/runtime/samples/dev-warning-missing-data-each/_config.js b/test/runtime/samples/dev-warning-missing-data-each/_config.js
index 92cda48fce..7d7794eff4 100644
--- a/test/runtime/samples/dev-warning-missing-data-each/_config.js
+++ b/test/runtime/samples/dev-warning-missing-data-each/_config.js
@@ -7,18 +7,18 @@ export default {
 		letters: [
 			{
 				id: 1,
-				char: 'a',
+				char: 'a'
 			},
 			{
 				id: 2,
-				char: 'b',
+				char: 'b'
 			},
 			{
 				id: 3,
-				char: 'c',
-			},
-		],
+				char: 'c'
+			}
+		]
 	},
 
-	warnings: [],
+	warnings: []
 };
diff --git a/test/runtime/samples/dev-warning-missing-data/_config.js b/test/runtime/samples/dev-warning-missing-data/_config.js
index b929ff4741..f489491ac9 100644
--- a/test/runtime/samples/dev-warning-missing-data/_config.js
+++ b/test/runtime/samples/dev-warning-missing-data/_config.js
@@ -4,7 +4,7 @@ export default {
 	},
 
 	warnings: [
-		`<Main> was created without expected prop 'foo'`,
-		`<Main> was created without expected prop 'bar'`
+		"<Main> was created without expected prop 'foo'",
+		"<Main> was created without expected prop 'bar'"
 	]
 };
diff --git a/test/runtime/samples/dev-warning-readonly-computed/_config.js b/test/runtime/samples/dev-warning-readonly-computed/_config.js
index 33339071f4..86037d7e1f 100644
--- a/test/runtime/samples/dev-warning-readonly-computed/_config.js
+++ b/test/runtime/samples/dev-warning-readonly-computed/_config.js
@@ -12,7 +12,7 @@ export default {
 			component.foo = 1;
 			throw new Error( 'Expected an error' );
 		} catch ( err ) {
-			assert.equal( err.message, `<Main>: Cannot set read-only property 'foo'` );
+			assert.equal( err.message, "<Main>: Cannot set read-only property 'foo'" );
 		}
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/dev-warning-readonly-window-binding/_config.js b/test/runtime/samples/dev-warning-readonly-window-binding/_config.js
index e0b46584e4..fc6075aef1 100644
--- a/test/runtime/samples/dev-warning-readonly-window-binding/_config.js
+++ b/test/runtime/samples/dev-warning-readonly-window-binding/_config.js
@@ -8,7 +8,7 @@ export default {
 			component.width = 99;
 			throw new Error('Expected an error');
 		} catch (err) {
-			assert.equal(err.message, `<Main>: Cannot set read-only property 'width'`);
+			assert.equal(err.message, "<Main>: Cannot set read-only property 'width'");
 		}
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/dev-warning-unknown-props-2/_config.js b/test/runtime/samples/dev-warning-unknown-props-2/_config.js
index 9bff4a2a74..b28724d719 100644
--- a/test/runtime/samples/dev-warning-unknown-props-2/_config.js
+++ b/test/runtime/samples/dev-warning-unknown-props-2/_config.js
@@ -4,6 +4,6 @@ export default {
 	},
 
 	warnings: [
-		`<Foo> was created with unknown prop 'fo'`
+		"<Foo> was created with unknown prop 'fo'"
 	]
 };
diff --git a/test/runtime/samples/dev-warning-unknown-props/_config.js b/test/runtime/samples/dev-warning-unknown-props/_config.js
index 9bff4a2a74..b28724d719 100644
--- a/test/runtime/samples/dev-warning-unknown-props/_config.js
+++ b/test/runtime/samples/dev-warning-unknown-props/_config.js
@@ -4,6 +4,6 @@ export default {
 	},
 
 	warnings: [
-		`<Foo> was created with unknown prop 'fo'`
+		"<Foo> was created with unknown prop 'fo'"
 	]
 };
diff --git a/test/runtime/samples/document-event/_config.js b/test/runtime/samples/document-event/_config.js
index f5e4b46f4f..d9a8866275 100644
--- a/test/runtime/samples/document-event/_config.js
+++ b/test/runtime/samples/document-event/_config.js
@@ -9,5 +9,5 @@ export default {
 		const event2 = new window.Event('mouseleave');
 		window.document.body.dispatchEvent(event2);
 		assert.deepEqual(component.events, ['enter', 'leave']);
-	},
+	}
 };
diff --git a/test/runtime/samples/dynamic-component-bindings-recreated-b/_config.js b/test/runtime/samples/dynamic-component-bindings-recreated-b/_config.js
index 0df87f06cd..2f73514e67 100644
--- a/test/runtime/samples/dynamic-component-bindings-recreated-b/_config.js
+++ b/test/runtime/samples/dynamic-component-bindings-recreated-b/_config.js
@@ -25,4 +25,4 @@ export default {
 			<p>green green</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/dynamic-component-bindings-recreated/_config.js b/test/runtime/samples/dynamic-component-bindings-recreated/_config.js
index b57c49ed58..7882996a8b 100644
--- a/test/runtime/samples/dynamic-component-bindings-recreated/_config.js
+++ b/test/runtime/samples/dynamic-component-bindings-recreated/_config.js
@@ -22,4 +22,4 @@ export default {
 			<p>green two</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/dynamic-component-bindings/_config.js b/test/runtime/samples/dynamic-component-bindings/_config.js
index 9ef9a87b91..4b76c89237 100644
--- a/test/runtime/samples/dynamic-component-bindings/_config.js
+++ b/test/runtime/samples/dynamic-component-bindings/_config.js
@@ -28,4 +28,4 @@ export default {
 
 		assert.equal(component.z, true);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/dynamic-component-destroy-null/_config.js b/test/runtime/samples/dynamic-component-destroy-null/_config.js
index 3c47aa5bae..00f7d47d0f 100644
--- a/test/runtime/samples/dynamic-component-destroy-null/_config.js
+++ b/test/runtime/samples/dynamic-component-destroy-null/_config.js
@@ -6,4 +6,4 @@ export default {
 	test({ assert, component }) {
 		component.x = false;
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/dynamic-component-events/_config.js b/test/runtime/samples/dynamic-component-events/_config.js
index 3c6bf370bb..cc54bef4e5 100644
--- a/test/runtime/samples/dynamic-component-events/_config.js
+++ b/test/runtime/samples/dynamic-component-events/_config.js
@@ -22,4 +22,4 @@ export default {
 		target.querySelector('button').dispatchEvent(click);
 		assert.equal(component.selected, 'bar');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/dynamic-component-in-if/_config.js b/test/runtime/samples/dynamic-component-in-if/_config.js
index b481c229c4..0c6829dbcd 100644
--- a/test/runtime/samples/dynamic-component-in-if/_config.js
+++ b/test/runtime/samples/dynamic-component-in-if/_config.js
@@ -10,4 +10,4 @@ export default {
 			<p>Bar</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/dynamic-component-inside-element/_config.js b/test/runtime/samples/dynamic-component-inside-element/_config.js
index 2e363f10da..ba144c96a6 100644
--- a/test/runtime/samples/dynamic-component-inside-element/_config.js
+++ b/test/runtime/samples/dynamic-component-inside-element/_config.js
@@ -14,4 +14,4 @@ export default {
 			<div><p>false, therefore Bar</p></div>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/dynamic-component-nulled-out-intro/_config.js b/test/runtime/samples/dynamic-component-nulled-out-intro/_config.js
index 9759ada538..18ccd5f21e 100644
--- a/test/runtime/samples/dynamic-component-nulled-out-intro/_config.js
+++ b/test/runtime/samples/dynamic-component-nulled-out-intro/_config.js
@@ -2,4 +2,4 @@ export default {
 	test({ component }) {
 		component.visible = true;
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/dynamic-component-nulled-out/_config.js b/test/runtime/samples/dynamic-component-nulled-out/_config.js
index e6ff6032bf..7e928aba86 100644
--- a/test/runtime/samples/dynamic-component-nulled-out/_config.js
+++ b/test/runtime/samples/dynamic-component-nulled-out/_config.js
@@ -8,7 +8,7 @@ export default {
 
 		component.Bar = null;
 
-		assert.htmlEqual(target.innerHTML, ``);
+		assert.htmlEqual(target.innerHTML, '');
 
 		component.Bar = Bar;
 
@@ -16,4 +16,4 @@ export default {
 			<p>Foo</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/dynamic-component-ref/_config.js b/test/runtime/samples/dynamic-component-ref/_config.js
index 6e3cabc435..f64a7fd195 100644
--- a/test/runtime/samples/dynamic-component-ref/_config.js
+++ b/test/runtime/samples/dynamic-component-ref/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: `Foo`,
+	html: 'Foo',
 
 	test({ assert, component }) {
 		assert.ok(component.test);
diff --git a/test/runtime/samples/dynamic-component-slot/_config.js b/test/runtime/samples/dynamic-component-slot/_config.js
index 58f413e3c4..aedf8bbb5b 100644
--- a/test/runtime/samples/dynamic-component-slot/_config.js
+++ b/test/runtime/samples/dynamic-component-slot/_config.js
@@ -32,4 +32,4 @@ export default {
 			<div slot='other'>what goes up must come down</div>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/dynamic-component-update-existing-instance/_config.js b/test/runtime/samples/dynamic-component-update-existing-instance/_config.js
index 5e3d836382..adca76f5a7 100644
--- a/test/runtime/samples/dynamic-component-update-existing-instance/_config.js
+++ b/test/runtime/samples/dynamic-component-update-existing-instance/_config.js
@@ -14,4 +14,4 @@ export default {
 			<p>Foo 2</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/dynamic-component/_config.js b/test/runtime/samples/dynamic-component/_config.js
index fe7ce5d65f..64abb9bd96 100644
--- a/test/runtime/samples/dynamic-component/_config.js
+++ b/test/runtime/samples/dynamic-component/_config.js
@@ -14,4 +14,4 @@ export default {
 			<p>false, therefore Bar</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/each-block-array-literal/_config.js b/test/runtime/samples/each-block-array-literal/_config.js
index 288d1cd09f..164e4730bc 100644
--- a/test/runtime/samples/each-block-array-literal/_config.js
+++ b/test/runtime/samples/each-block-array-literal/_config.js
@@ -15,5 +15,5 @@ export default {
 
 		button.dispatchEvent(event);
 		assert.equal(component.clicked, 'racoon');
-	},
+	}
 };
diff --git a/test/runtime/samples/each-block-component-no-props/_config.js b/test/runtime/samples/each-block-component-no-props/_config.js
index e8344496ca..329da68324 100644
--- a/test/runtime/samples/each-block-component-no-props/_config.js
+++ b/test/runtime/samples/each-block-component-no-props/_config.js
@@ -5,12 +5,12 @@ export default {
 
 	async test({ assert, component, target }) {
 		await component.remove();
-		assert.htmlEqual(target.innerHTML, ``);
+		assert.htmlEqual(target.innerHTML, '');
 
 		await component.add();
-		assert.htmlEqual(target.innerHTML, `<p>hello</p>`);
+		assert.htmlEqual(target.innerHTML, '<p>hello</p>');
 
 		await component.remove();
-		assert.htmlEqual(target.innerHTML, ``);
+		assert.htmlEqual(target.innerHTML, '');
 	}
 };
diff --git a/test/runtime/samples/each-block-containing-component-in-if/_config.js b/test/runtime/samples/each-block-containing-component-in-if/_config.js
index 9083742891..d617d23cd3 100644
--- a/test/runtime/samples/each-block-containing-component-in-if/_config.js
+++ b/test/runtime/samples/each-block-containing-component-in-if/_config.js
@@ -4,7 +4,7 @@ export default {
 		fields: [1, 2]
 	},
 
-	html: `<div></div>`,
+	html: '<div></div>',
 
 	test({ assert, component, target }) {
 		component.show = true;
diff --git a/test/runtime/samples/each-block-destructured-array-sparse/_config.js b/test/runtime/samples/each-block-destructured-array-sparse/_config.js
index 9805276600..331c3aec1b 100644
--- a/test/runtime/samples/each-block-destructured-array-sparse/_config.js
+++ b/test/runtime/samples/each-block-destructured-array-sparse/_config.js
@@ -16,5 +16,5 @@ export default {
 		assert.htmlEqual( target.innerHTML, `
 			<p>bar</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/each-block-destructured-array/_config.js b/test/runtime/samples/each-block-destructured-array/_config.js
index 432d8a3a78..e2924c8656 100644
--- a/test/runtime/samples/each-block-destructured-array/_config.js
+++ b/test/runtime/samples/each-block-destructured-array/_config.js
@@ -16,5 +16,5 @@ export default {
 		assert.htmlEqual( target.innerHTML, `
 			<p>foo: bar</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/each-block-destructured-default/_config.js b/test/runtime/samples/each-block-destructured-default/_config.js
index 133fd68532..0e99fd589f 100644
--- a/test/runtime/samples/each-block-destructured-default/_config.js
+++ b/test/runtime/samples/each-block-destructured-default/_config.js
@@ -18,5 +18,5 @@ export default {
 		assert.htmlEqual(target.innerHTML, `
 			<p class="mammal">cow - ‎B. taurus - 50kg</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/each-block-destructured-object-binding/_config.js b/test/runtime/samples/each-block-destructured-object-binding/_config.js
index 8b59a97034..2ab3e24397 100644
--- a/test/runtime/samples/each-block-destructured-object-binding/_config.js
+++ b/test/runtime/samples/each-block-destructured-object-binding/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		people: [{ name: { first: 'Doctor', last: 'Who' } }],
+		people: [{ name: { first: 'Doctor', last: 'Who' } }]
 	},
 
 	html: `
@@ -41,5 +41,5 @@ export default {
 			<input>
 			<p>Frank Oz</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/each-block-destructured-object-rest/_config.js b/test/runtime/samples/each-block-destructured-object-rest/_config.js
index 561d4e8442..be5d38b555 100644
--- a/test/runtime/samples/each-block-destructured-object-rest/_config.js
+++ b/test/runtime/samples/each-block-destructured-object-rest/_config.js
@@ -16,5 +16,5 @@ export default {
 		assert.htmlEqual(target.innerHTML, `
 			<p class="mammal">cow</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/each-block-destructured-object/_config.js b/test/runtime/samples/each-block-destructured-object/_config.js
index dc3943fffe..feec72f402 100644
--- a/test/runtime/samples/each-block-destructured-object/_config.js
+++ b/test/runtime/samples/each-block-destructured-object/_config.js
@@ -16,5 +16,5 @@ export default {
 		assert.htmlEqual( target.innerHTML, `
 			<p>cow: hooves</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/each-block-else-in-if/_config.js b/test/runtime/samples/each-block-else-in-if/_config.js
index c800ee8a30..24d1e5477a 100644
--- a/test/runtime/samples/each-block-else-in-if/_config.js
+++ b/test/runtime/samples/each-block-else-in-if/_config.js
@@ -6,7 +6,7 @@ export default {
 
 	test({ assert, component, target }) {
 		component.visible = false;
-		assert.htmlEqual(target.innerHTML, ``);
+		assert.htmlEqual(target.innerHTML, '');
 
 		component.visible = true;
 		assert.htmlEqual(target.innerHTML, `
diff --git a/test/runtime/samples/each-block-else-mount-or-intro/_config.js b/test/runtime/samples/each-block-else-mount-or-intro/_config.js
index 8460a4b5e0..15674ea651 100644
--- a/test/runtime/samples/each-block-else-mount-or-intro/_config.js
+++ b/test/runtime/samples/each-block-else-mount-or-intro/_config.js
@@ -1,4 +1,4 @@
 export default {
 	props: { items: [] },
-	html: `No items.`,
+	html: 'No items.'
 };
diff --git a/test/runtime/samples/each-block-empty-outro/_config.js b/test/runtime/samples/each-block-empty-outro/_config.js
index 92eb7c66b1..0acf1f572f 100644
--- a/test/runtime/samples/each-block-empty-outro/_config.js
+++ b/test/runtime/samples/each-block-empty-outro/_config.js
@@ -13,6 +13,6 @@ export default {
 	test({ assert, component, target }) {
 		component.visible = false;
 
-		assert.htmlEqual(target.innerHTML, ``);
+		assert.htmlEqual(target.innerHTML, '');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/each-block-in-if-block/_config.js b/test/runtime/samples/each-block-in-if-block/_config.js
index eda3ca14a9..082b9b3033 100644
--- a/test/runtime/samples/each-block-in-if-block/_config.js
+++ b/test/runtime/samples/each-block-in-if-block/_config.js
@@ -1,7 +1,7 @@
 export default {
 	props: {
 		dummy: false,
-		fruits: ['Apple', 'Banana', 'Tomato'],
+		fruits: ['Apple', 'Banana', 'Tomato']
 	},
 
 	html: '<div><div>Apple</div><div>Banana</div><div>Tomato</div></div>',
diff --git a/test/runtime/samples/each-block-indexed/_config.js b/test/runtime/samples/each-block-indexed/_config.js
index f65c83ca93..bad727bbf1 100644
--- a/test/runtime/samples/each-block-indexed/_config.js
+++ b/test/runtime/samples/each-block-indexed/_config.js
@@ -2,5 +2,5 @@ export default {
 	props: {
 		animals: [ 'adder', 'blue whale', 'chameleon' ]
 	},
-	html: `<p>0: adder</p><p>1: blue whale</p><p>2: chameleon</p><!---->`
+	html: '<p>0: adder</p><p>1: blue whale</p><p>2: chameleon</p><!---->'
 };
diff --git a/test/runtime/samples/each-block-keyed-component-action/_config.js b/test/runtime/samples/each-block-keyed-component-action/_config.js
index c4421f89ae..a1afc44c93 100644
--- a/test/runtime/samples/each-block-keyed-component-action/_config.js
+++ b/test/runtime/samples/each-block-keyed-component-action/_config.js
@@ -2,20 +2,20 @@ export default {
 	test({ assert, component, raf }) {
 		assert.equal(component.count, 0);
 
-		component.arr = ["2"];
+		component.arr = ['2'];
 
 		assert.equal(component.count, 1);
 
-		component.arr = ["1", "2"];
+		component.arr = ['1', '2'];
 
 		assert.equal(component.count, 2);
 
-		component.arr = ["2", "1"];
+		component.arr = ['2', '1'];
 
 		assert.equal(component.count, 2);
 
 		component.arr = [];
 
 		assert.equal(component.count, 0);
-	},
+	}
 };
diff --git a/test/runtime/samples/each-block-keyed-dyanmic-key/_config.js b/test/runtime/samples/each-block-keyed-dyanmic-key/_config.js
new file mode 100644
index 0000000000..0aed1b0e07
--- /dev/null
+++ b/test/runtime/samples/each-block-keyed-dyanmic-key/_config.js
@@ -0,0 +1,27 @@
+let count = 0;
+let value = 'foo';
+
+export default {
+	props: {
+		value() {
+			count++;
+			return value;
+		}
+	},
+
+	html: `
+		<div>foo</div>
+		<div>foo</div>
+	`,
+
+	test({ assert, component, target }) {
+		value = 'bar';
+		component.id = 1;
+
+		assert.equal(count, 4);
+		assert.htmlEqual(target.innerHTML, `
+			<div>bar</div>
+			<div>bar</div>
+		`);
+	}
+};
diff --git a/test/runtime/samples/each-block-keyed-dyanmic-key/main.svelte b/test/runtime/samples/each-block-keyed-dyanmic-key/main.svelte
new file mode 100644
index 0000000000..9a15c7d98e
--- /dev/null
+++ b/test/runtime/samples/each-block-keyed-dyanmic-key/main.svelte
@@ -0,0 +1,8 @@
+<script>
+	export let id = 0;
+	export let value;
+</script>
+
+{#each ['foo', 'bar'] as key (id + key)}
+	<div>{value()}</div>
+{/each}
\ No newline at end of file
diff --git a/test/runtime/samples/each-block-keyed-dynamic-2/_config.js b/test/runtime/samples/each-block-keyed-dynamic-2/_config.js
index 7eba75a5ff..e25083c751 100644
--- a/test/runtime/samples/each-block-keyed-dynamic-2/_config.js
+++ b/test/runtime/samples/each-block-keyed-dynamic-2/_config.js
@@ -6,9 +6,9 @@ export default {
 	`,
 
 	async test({ assert, component, target, window }) {
-		const button = target.querySelector("button");
+		const button = target.querySelector('button');
 
-		const event = new window.MouseEvent("click");
+		const event = new window.MouseEvent('click');
 		await button.dispatchEvent(event);
 
 		assert.htmlEqual(
diff --git a/test/runtime/samples/each-block-keyed-empty/_config.js b/test/runtime/samples/each-block-keyed-empty/_config.js
index cf8f4d3219..dfa810b3ff 100644
--- a/test/runtime/samples/each-block-keyed-empty/_config.js
+++ b/test/runtime/samples/each-block-keyed-empty/_config.js
@@ -1,7 +1,7 @@
 export default {
 	props: {
-		x: [{ z: 1 }, { z: 2 }],
+		x: [{ z: 1 }, { z: 2 }]
 	},
 
-	html: ``
+	html: ''
 };
diff --git a/test/runtime/samples/each-block-keyed-html/_config.js b/test/runtime/samples/each-block-keyed-html/_config.js
index 536e54543e..3ece052d5c 100644
--- a/test/runtime/samples/each-block-keyed-html/_config.js
+++ b/test/runtime/samples/each-block-keyed-html/_config.js
@@ -5,6 +5,6 @@ export default {
 
 	test({ assert, component, target }) {
 		component.names = component.names.reverse();
-		assert.htmlEqual(target.innerHTML, `JillJohn`);
+		assert.htmlEqual(target.innerHTML, 'JillJohn');
 	}
 };
diff --git a/test/runtime/samples/each-block-keyed-non-prop/_config.js b/test/runtime/samples/each-block-keyed-non-prop/_config.js
index 90e9a7f9c8..2cccbedef0 100644
--- a/test/runtime/samples/each-block-keyed-non-prop/_config.js
+++ b/test/runtime/samples/each-block-keyed-non-prop/_config.js
@@ -25,5 +25,5 @@ export default {
 
 		assert.equal(p1, p4, 'first <p> element should be retained');
 		assert.equal(p3, p5, 'last <p> element should be retained');
-	},
+	}
 };
diff --git a/test/runtime/samples/each-block-keyed-random-permute/_config.js b/test/runtime/samples/each-block-keyed-random-permute/_config.js
index 80bf2d9115..88330c4509 100644
--- a/test/runtime/samples/each-block-keyed-random-permute/_config.js
+++ b/test/runtime/samples/each-block-keyed-random-permute/_config.js
@@ -19,10 +19,10 @@ function permute() {
 
 export default {
 	props: {
-		values: toObjects('abc'),
+		values: toObjects('abc')
 	},
 
-	html: `(a)(b)(c)`,
+	html: '(a)(b)(c)',
 
 	test({ assert, component, target }) {
 		function test(sequence) {
diff --git a/test/runtime/samples/each-block-keyed-shift/_config.js b/test/runtime/samples/each-block-keyed-shift/_config.js
index 44ca8447f0..4e7809445c 100644
--- a/test/runtime/samples/each-block-keyed-shift/_config.js
+++ b/test/runtime/samples/each-block-keyed-shift/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		titles: [{ name: 'a', }, { name: 'b' }, { name: 'c' }]
+		titles: [{ name: 'a' }, { name: 'b' }, { name: 'c' }]
 	},
 
 	html: `
diff --git a/test/runtime/samples/each-block-keyed-siblings/_config.js b/test/runtime/samples/each-block-keyed-siblings/_config.js
index d87f8943da..a52b6c404d 100644
--- a/test/runtime/samples/each-block-keyed-siblings/_config.js
+++ b/test/runtime/samples/each-block-keyed-siblings/_config.js
@@ -1,7 +1,7 @@
 export default {
 	props: {
 		ones: [{ text: '1' }],
-		twos: [{ text: '2' }],
+		twos: [{ text: '2' }]
 	},
 
 	html: `
@@ -16,5 +16,5 @@ export default {
 			<div>11</div>
 			<div>2</div>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/each-block-keyed-static/_config.js b/test/runtime/samples/each-block-keyed-static/_config.js
index 629ea47ebb..57800c454f 100644
--- a/test/runtime/samples/each-block-keyed-static/_config.js
+++ b/test/runtime/samples/each-block-keyed-static/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		x: [{ z: 1 }, { z: 2 }],
+		x: [{ z: 1 }, { z: 2 }]
 	},
 
 	html: `
diff --git a/test/runtime/samples/each-block-scope-shadow-bind-2/_config.js b/test/runtime/samples/each-block-scope-shadow-bind-2/_config.js
index 00e436a5aa..655aac05b7 100644
--- a/test/runtime/samples/each-block-scope-shadow-bind-2/_config.js
+++ b/test/runtime/samples/each-block-scope-shadow-bind-2/_config.js
@@ -8,9 +8,9 @@ export default {
 		<input value="Hello"/>
 	`,
 	async test({ assert, target, window }) {
-		const input = target.querySelector("input");
-		input.value = "abcd";
-		await input.dispatchEvent(new window.Event("input"));
+		const input = target.querySelector('input');
+		input.value = 'abcd';
+		await input.dispatchEvent(new window.Event('input'));
 
 		assert.htmlEqual(
 			target.innerHTML,
@@ -19,5 +19,5 @@ export default {
         <input />
       `
 		);
-	},
+	}
 };
diff --git a/test/runtime/samples/each-block-scope-shadow-bind-3/_config.js b/test/runtime/samples/each-block-scope-shadow-bind-3/_config.js
index e1a385acaf..42b7a96e34 100644
--- a/test/runtime/samples/each-block-scope-shadow-bind-3/_config.js
+++ b/test/runtime/samples/each-block-scope-shadow-bind-3/_config.js
@@ -25,9 +25,9 @@ export default {
 		</div>
 	`,
 	async test({ assert, target, window }) {
-		const [input1, input2, input3, input4] = target.querySelectorAll("input");
-		input1.value = "Awesome";
-		await input1.dispatchEvent(new window.Event("input"));
+		const [input1, input2, input3, input4] = target.querySelectorAll('input');
+		input1.value = 'Awesome';
+		await input1.dispatchEvent(new window.Event('input'));
 
 		assert.htmlEqual(
 			target.innerHTML,
@@ -45,8 +45,8 @@ export default {
       `
 		);
 
-		input2.value = "Svelte";
-		await input2.dispatchEvent(new window.Event("input"));
+		input2.value = 'Svelte';
+		await input2.dispatchEvent(new window.Event('input'));
 
 		assert.htmlEqual(
 			target.innerHTML,
@@ -64,8 +64,8 @@ export default {
 			`
 		);
 
-		input3.value = "Foo";
-		await input3.dispatchEvent(new window.Event("input"));
+		input3.value = 'Foo';
+		await input3.dispatchEvent(new window.Event('input'));
 
 		assert.htmlEqual(
 			target.innerHTML,
@@ -83,8 +83,8 @@ export default {
 			`
 		);
 
-		input4.value = "Bar";
-		await input4.dispatchEvent(new window.Event("input"));
+		input4.value = 'Bar';
+		await input4.dispatchEvent(new window.Event('input'));
 
 		assert.htmlEqual(
 			target.innerHTML,
@@ -101,5 +101,5 @@ export default {
 				</div>
 			`
 		);
-	},
+	}
 };
diff --git a/test/runtime/samples/each-block-scope-shadow-bind-4/_config.js b/test/runtime/samples/each-block-scope-shadow-bind-4/_config.js
index 3dffa560da..f0570577b2 100644
--- a/test/runtime/samples/each-block-scope-shadow-bind-4/_config.js
+++ b/test/runtime/samples/each-block-scope-shadow-bind-4/_config.js
@@ -14,11 +14,11 @@ export default {
 		<button>Button</button>
 	`,
 	async test({ assert, target, window }) {
-		const input = target.querySelector("input");
-		const button = target.querySelector("button");
+		const input = target.querySelector('input');
+		const button = target.querySelector('button');
 
-		input.value = "Awesome";
-		await input.dispatchEvent(new window.Event("input"));
+		input.value = 'Awesome';
+		await input.dispatchEvent(new window.Event('input'));
 
 		assert.htmlEqual(
 			target.innerHTML,
@@ -32,7 +32,7 @@ export default {
 		);
 
 
-		await button.dispatchEvent(new window.MouseEvent("click"));
+		await button.dispatchEvent(new window.MouseEvent('click'));
 
 		assert.htmlEqual(
 			target.innerHTML,
@@ -47,8 +47,8 @@ export default {
 
 		assert.equal(input.value, 'World');
 
-		input.value = "Svelte";
-		await input.dispatchEvent(new window.Event("input"));
+		input.value = 'Svelte';
+		await input.dispatchEvent(new window.Event('input'));
 
 		assert.htmlEqual(
 			target.innerHTML,
@@ -60,5 +60,5 @@ export default {
 				<button>Button</button>
       `
 		);
-	},
+	}
 };
diff --git a/test/runtime/samples/each-block-scope-shadow-bind/_config.js b/test/runtime/samples/each-block-scope-shadow-bind/_config.js
index 00e436a5aa..655aac05b7 100644
--- a/test/runtime/samples/each-block-scope-shadow-bind/_config.js
+++ b/test/runtime/samples/each-block-scope-shadow-bind/_config.js
@@ -8,9 +8,9 @@ export default {
 		<input value="Hello"/>
 	`,
 	async test({ assert, target, window }) {
-		const input = target.querySelector("input");
-		input.value = "abcd";
-		await input.dispatchEvent(new window.Event("input"));
+		const input = target.querySelector('input');
+		input.value = 'abcd';
+		await input.dispatchEvent(new window.Event('input'));
 
 		assert.htmlEqual(
 			target.innerHTML,
@@ -19,5 +19,5 @@ export default {
         <input />
       `
 		);
-	},
+	}
 };
diff --git a/test/runtime/samples/each-block-scope-shadow-self/_config.js b/test/runtime/samples/each-block-scope-shadow-self/_config.js
index 1669dc5b6e..867aadfab9 100644
--- a/test/runtime/samples/each-block-scope-shadow-self/_config.js
+++ b/test/runtime/samples/each-block-scope-shadow-self/_config.js
@@ -9,5 +9,5 @@ export default {
 		assert.equal(target.querySelectorAll('input').length, 3);
 		assert.deepEqual(component.data, { a: 'svelte', b: 'B', c: 'C' });
 		assert.deepEqual(component.x, ['a', 'b', 'c']);
-	},
+	}
 };
diff --git a/test/runtime/samples/each-block-static/_config.js b/test/runtime/samples/each-block-static/_config.js
index b62d262d9b..fc2fb28cca 100644
--- a/test/runtime/samples/each-block-static/_config.js
+++ b/test/runtime/samples/each-block-static/_config.js
@@ -3,10 +3,10 @@ export default {
 		items: []
 	},
 
-	html: ``,
+	html: '',
 
 	test({ assert, component, target }) {
 		component.items = ['x'];
-		assert.htmlEqual(target.innerHTML, `foo`);
+		assert.htmlEqual(target.innerHTML, 'foo');
 	}
 };
diff --git a/test/runtime/samples/each-blocks-assignment-2/_config.js b/test/runtime/samples/each-blocks-assignment-2/_config.js
index e5fe84ea7c..f69b4fe9f6 100644
--- a/test/runtime/samples/each-blocks-assignment-2/_config.js
+++ b/test/runtime/samples/each-blocks-assignment-2/_config.js
@@ -4,9 +4,9 @@ export default {
 		<button>Test</button>
 	`,
 	async test({ assert, component, target, window }) {
-		const button = target.querySelector("button");
+		const button = target.querySelector('button');
 
-		const clickEvent = new window.MouseEvent("click");
+		const clickEvent = new window.MouseEvent('click');
 		await button.dispatchEvent(clickEvent);
 
 		assert.htmlEqual(
@@ -16,5 +16,5 @@ export default {
 			<button>Test</button>
 		`
 		);
-	},
+	}
 };
diff --git a/test/runtime/samples/each-blocks-assignment/_config.js b/test/runtime/samples/each-blocks-assignment/_config.js
index ac07ad1656..b651e3e02b 100644
--- a/test/runtime/samples/each-blocks-assignment/_config.js
+++ b/test/runtime/samples/each-blocks-assignment/_config.js
@@ -9,9 +9,9 @@ export default {
 	<button>Test</button>
 	`,
 	async test({ assert, component, target, window }) {
-		let [incrementBtn, ...buttons] = target.querySelectorAll("button");
+		let [incrementBtn, ...buttons] = target.querySelectorAll('button');
 
-		const clickEvent = new window.MouseEvent("click");
+		const clickEvent = new window.MouseEvent('click');
 		await buttons[0].dispatchEvent(clickEvent);
 
 		assert.htmlEqual(
@@ -75,7 +75,7 @@ export default {
 		`
 		);
 
-		[incrementBtn, ...buttons] = target.querySelectorAll("button");
+		[incrementBtn, ...buttons] = target.querySelectorAll('button');
 
 		await buttons[3].dispatchEvent(clickEvent);
 
@@ -93,5 +93,5 @@ export default {
 			<button>Test</button>
 		`
 		);		
-	},
+	}
 };
diff --git a/test/runtime/samples/each-blocks-expression/_config.js b/test/runtime/samples/each-blocks-expression/_config.js
index 239a18b6dc..9f14bd81ec 100644
--- a/test/runtime/samples/each-blocks-expression/_config.js
+++ b/test/runtime/samples/each-blocks-expression/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<p>a</p><p>b</p><p>c</p><!---->`
+	html: '<p>a</p><p>b</p><p>c</p><!---->'
 };
diff --git a/test/runtime/samples/each-blocks-nested-b/_config.js b/test/runtime/samples/each-blocks-nested-b/_config.js
index c44899e6fb..7b13d988b4 100644
--- a/test/runtime/samples/each-blocks-nested-b/_config.js
+++ b/test/runtime/samples/each-blocks-nested-b/_config.js
@@ -28,7 +28,7 @@ export default {
 			}
 		]
 	},
-	html: `<p>animals: aardvark</p><p>animals: buffalo</p><p>animals: chinchilla</p><!----><p>countries: albania</p><p>countries: brazil</p><p>countries: china</p><!----><p>people: alice</p><p>people: bob</p><p>people: carol</p><p>people: dave</p><!----><!---->`,
+	html: '<p>animals: aardvark</p><p>animals: buffalo</p><p>animals: chinchilla</p><!----><p>countries: albania</p><p>countries: brazil</p><p>countries: china</p><!----><p>people: alice</p><p>people: bob</p><p>people: carol</p><p>people: dave</p><!----><!---->',
 	test({ assert, component, target }) {
 		// TODO
 	}
diff --git a/test/runtime/samples/each-blocks-nested/_config.js b/test/runtime/samples/each-blocks-nested/_config.js
index 790ec9ced7..3318bc344d 100644
--- a/test/runtime/samples/each-blocks-nested/_config.js
+++ b/test/runtime/samples/each-blocks-nested/_config.js
@@ -4,7 +4,7 @@ export default {
 		rows: [ 1, 2, 3 ]
 	},
 
-	html: `<div>a, 1</div><div>a, 2</div><div>a, 3</div><!----><div>b, 1</div><div>b, 2</div><div>b, 3</div><!----><div>c, 1</div><div>c, 2</div><div>c, 3</div><!----><!---->`,
+	html: '<div>a, 1</div><div>a, 2</div><div>a, 3</div><!----><div>b, 1</div><div>b, 2</div><div>b, 3</div><!----><div>c, 1</div><div>c, 2</div><div>c, 3</div><!----><!---->',
 
 	test({ assert, component, target }) {
 		// TODO
diff --git a/test/runtime/samples/element-source-location/_config.js b/test/runtime/samples/element-source-location/_config.js
index 61ae36d107..101cc2cad1 100644
--- a/test/runtime/samples/element-source-location/_config.js
+++ b/test/runtime/samples/element-source-location/_config.js
@@ -23,4 +23,4 @@ export default {
 			char: 7
 		});
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/empty-dom/_config.js b/test/runtime/samples/empty-dom/_config.js
index e3e3d0ecd5..22dc25b41e 100644
--- a/test/runtime/samples/empty-dom/_config.js
+++ b/test/runtime/samples/empty-dom/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: '',
-};
\ No newline at end of file
+	html: ''
+};
diff --git a/test/runtime/samples/empty-style-block/_config.js b/test/runtime/samples/empty-style-block/_config.js
index 0375bad029..22dc25b41e 100644
--- a/test/runtime/samples/empty-style-block/_config.js
+++ b/test/runtime/samples/empty-style-block/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: '',
+	html: ''
 };
diff --git a/test/runtime/samples/escape-template-literals/_config.js b/test/runtime/samples/escape-template-literals/_config.js
index 1419d65679..9e50f94764 100644
--- a/test/runtime/samples/escape-template-literals/_config.js
+++ b/test/runtime/samples/escape-template-literals/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: '<code>`${foo}\\n`</code>\n<div title="`${foo}\\n`">foo</div>\n<div>`${foo}\\n`</div>',
+	html: '<code>`${foo}\\n`</code>\n<div title="`${foo}\\n`">foo</div>\n<div>`${foo}\\n`</div>'
 };
diff --git a/test/runtime/samples/event-handler-async/_config.js b/test/runtime/samples/event-handler-async/_config.js
index fab4d998b6..b483d039ed 100644
--- a/test/runtime/samples/event-handler-async/_config.js
+++ b/test/runtime/samples/event-handler-async/_config.js
@@ -1,5 +1,5 @@
 export default {
 	html: `
 		<button>nothing</button>
-	`,
+	`
 };
diff --git a/test/runtime/samples/event-handler-dynamic-2/_config.js b/test/runtime/samples/event-handler-dynamic-2/_config.js
index c996d8f2aa..5fded47855 100644
--- a/test/runtime/samples/event-handler-dynamic-2/_config.js
+++ b/test/runtime/samples/event-handler-dynamic-2/_config.js
@@ -29,5 +29,5 @@ export default {
 
 		await handler_b.dispatchEvent(event);
 		assert.equal(p.innerHTML, '2');
-	},
+	}
 };
diff --git a/test/runtime/samples/event-handler-dynamic-bound-var/_config.js b/test/runtime/samples/event-handler-dynamic-bound-var/_config.js
index c832127c09..c490db000a 100644
--- a/test/runtime/samples/event-handler-dynamic-bound-var/_config.js
+++ b/test/runtime/samples/event-handler-dynamic-bound-var/_config.js
@@ -16,5 +16,5 @@ export default {
 				Bye World
 			`
 		);
-	},
+	}
 };
diff --git a/test/runtime/samples/event-handler-dynamic-expression/_config.js b/test/runtime/samples/event-handler-dynamic-expression/_config.js
index c4d259a542..f479c9cef2 100644
--- a/test/runtime/samples/event-handler-dynamic-expression/_config.js
+++ b/test/runtime/samples/event-handler-dynamic-expression/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: `<button>bar</button>`,
+	html: '<button>bar</button>',
 
 	async test({ assert, component, target, window }) {
 		const [button] = target.querySelectorAll(
@@ -9,12 +9,12 @@ export default {
 		const event = new window.MouseEvent('click');
 
 		await button.dispatchEvent(event);
-		assert.htmlEqual(target.innerHTML, `<button>foo</button>`);
+		assert.htmlEqual(target.innerHTML, '<button>foo</button>');
 		
 		await button.dispatchEvent(event);
-		assert.htmlEqual(target.innerHTML, `<button>bar</button>`);
+		assert.htmlEqual(target.innerHTML, '<button>bar</button>');
 		
 		await button.dispatchEvent(event);
-		assert.htmlEqual(target.innerHTML, `<button>foo</button>`);
-	},
+		assert.htmlEqual(target.innerHTML, '<button>foo</button>');
+	}
 };
diff --git a/test/runtime/samples/event-handler-dynamic-hash/_config.js b/test/runtime/samples/event-handler-dynamic-hash/_config.js
index e60e561524..35f5fa103d 100644
--- a/test/runtime/samples/event-handler-dynamic-hash/_config.js
+++ b/test/runtime/samples/event-handler-dynamic-hash/_config.js
@@ -14,14 +14,14 @@ export default {
 		);
 
 		const event = new window.MouseEvent('click');
-		let err = "";
+		let err = '';
 		window.addEventListener('error', (e) => {
 			e.preventDefault();
 			err = e.message;
 		});
 
 		await button.dispatchEvent(event);
-		assert.equal(err, "", err);
+		assert.equal(err, '', err);
 		assert.htmlEqual(target.innerHTML, `
 			<p>
 				<button>set handler 1</button>
@@ -52,5 +52,5 @@ export default {
 			<p>2</p>
 			<button>click</button>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/event-handler-dynamic-invalid/_config.js b/test/runtime/samples/event-handler-dynamic-invalid/_config.js
index ba1777f945..0ed298c95a 100644
--- a/test/runtime/samples/event-handler-dynamic-invalid/_config.js
+++ b/test/runtime/samples/event-handler-dynamic-invalid/_config.js
@@ -9,7 +9,7 @@ export default {
 		);
 
 		const event = new window.MouseEvent('click');
-		let err = "";
+		let err = '';
 		window.addEventListener('error', (e) => {
 			e.preventDefault();
 			err = e.message;
@@ -17,12 +17,12 @@ export default {
 
 		// All three should not throw if proper checking is done in runtime code
 		await buttonUndef.dispatchEvent(event);
-		assert.equal(err, "", err);
+		assert.equal(err, '', err);
 
 		await buttonNull.dispatchEvent(event);
-		assert.equal(err, "", err);
+		assert.equal(err, '', err);
 
 		await buttonInvalid.dispatchEvent(event);
-		assert.equal(err, "", err);
-	},
+		assert.equal(err, '', err);
+	}
 };
diff --git a/test/runtime/samples/event-handler-dynamic-modifier-self/_config.js b/test/runtime/samples/event-handler-dynamic-modifier-self/_config.js
index 6d7d29e482..6bd96ba8aa 100644
--- a/test/runtime/samples/event-handler-dynamic-modifier-self/_config.js
+++ b/test/runtime/samples/event-handler-dynamic-modifier-self/_config.js
@@ -12,5 +12,5 @@ export default {
 		await button.dispatchEvent(event);
 
 		assert.ok(!component.inner_clicked);
-	},
+	}
 };
diff --git a/test/runtime/samples/event-handler-dynamic/_config.js b/test/runtime/samples/event-handler-dynamic/_config.js
index e60e561524..35f5fa103d 100644
--- a/test/runtime/samples/event-handler-dynamic/_config.js
+++ b/test/runtime/samples/event-handler-dynamic/_config.js
@@ -14,14 +14,14 @@ export default {
 		);
 
 		const event = new window.MouseEvent('click');
-		let err = "";
+		let err = '';
 		window.addEventListener('error', (e) => {
 			e.preventDefault();
 			err = e.message;
 		});
 
 		await button.dispatchEvent(event);
-		assert.equal(err, "", err);
+		assert.equal(err, '', err);
 		assert.htmlEqual(target.innerHTML, `
 			<p>
 				<button>set handler 1</button>
@@ -52,5 +52,5 @@ export default {
 			<p>2</p>
 			<button>click</button>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/event-handler-each-modifier/_config.js b/test/runtime/samples/event-handler-each-modifier/_config.js
index 702addd3c3..8274e22eec 100644
--- a/test/runtime/samples/event-handler-each-modifier/_config.js
+++ b/test/runtime/samples/event-handler-each-modifier/_config.js
@@ -2,21 +2,21 @@ export default {
 	async test({ assert, component, target, window }) {
 		// set first
 		await component.lists.update(() => [
-			{ text: "item1" },
-			{ text: "item2" },
-			{ text: "item3" }
+			{ text: 'item1' },
+			{ text: 'item2' },
+			{ text: 'item3' }
 		]);
 
 		await component.lists.update(() => [
-			{ text: "item3" },
-			{ text: "item2" },
-			{ text: "item1" }
+			{ text: 'item3' },
+			{ text: 'item2' },
+			{ text: 'item1' }
 		]);
 
 		await component.lists.update(() => [
-			{ text: "item1" },
-			{ text: "item2" },
-			{ text: "item3" }
+			{ text: 'item1' },
+			{ text: 'item2' },
+			{ text: 'item3' }
 		]);
 
 		assert.equal(component.updated, 4);
diff --git a/test/runtime/samples/event-handler-each-this/_config.js b/test/runtime/samples/event-handler-each-this/_config.js
index 3ab2d5acdc..7f6528977c 100644
--- a/test/runtime/samples/event-handler-each-this/_config.js
+++ b/test/runtime/samples/event-handler-each-this/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		items: ['foo', 'bar', 'baz'],
+		items: ['foo', 'bar', 'baz']
 	},
 
 	html: `
diff --git a/test/runtime/samples/event-handler-modifier-self/_config.js b/test/runtime/samples/event-handler-modifier-self/_config.js
index 6d7d29e482..6bd96ba8aa 100644
--- a/test/runtime/samples/event-handler-modifier-self/_config.js
+++ b/test/runtime/samples/event-handler-modifier-self/_config.js
@@ -12,5 +12,5 @@ export default {
 		await button.dispatchEvent(event);
 
 		assert.ok(!component.inner_clicked);
-	},
+	}
 };
diff --git a/test/runtime/samples/flush-before-bindings/_config.js b/test/runtime/samples/flush-before-bindings/_config.js
index 7bb6ebfc15..4f20299771 100644
--- a/test/runtime/samples/flush-before-bindings/_config.js
+++ b/test/runtime/samples/flush-before-bindings/_config.js
@@ -20,4 +20,4 @@ export default {
 		// TODO minimise the number of recomputations during oncreate
 		// assert.equal(counter.count, 1);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/flush-before-bindings/counter.js b/test/runtime/samples/flush-before-bindings/counter.js
index 63872cd6a2..f0fc271f84 100644
--- a/test/runtime/samples/flush-before-bindings/counter.js
+++ b/test/runtime/samples/flush-before-bindings/counter.js
@@ -1,3 +1,3 @@
 export default {
 	count: 0
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/fragment-trailing-whitespace/_config.js b/test/runtime/samples/fragment-trailing-whitespace/_config.js
index 2251d6dae8..549cb1be68 100644
--- a/test/runtime/samples/fragment-trailing-whitespace/_config.js
+++ b/test/runtime/samples/fragment-trailing-whitespace/_config.js
@@ -1,5 +1,5 @@
-const message = "the quick brown fox jumps over the lazy dog";
-const expected = [...message].map(c => `<span>${c + " "}</span>`).join("");
+const message = 'the quick brown fox jumps over the lazy dog';
+const expected = [...message].map(c => `<span>${c + ' '}</span>`).join('');
 
 export default {
 	props: {
diff --git a/test/runtime/samples/function-expression-inline/_config.js b/test/runtime/samples/function-expression-inline/_config.js
index 6916be45b1..a5dc3f7080 100644
--- a/test/runtime/samples/function-expression-inline/_config.js
+++ b/test/runtime/samples/function-expression-inline/_config.js
@@ -19,4 +19,4 @@ export default {
 			<p>6</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/function-in-expression/_config.js b/test/runtime/samples/function-in-expression/_config.js
index f8ddbe26a5..d3086863d3 100644
--- a/test/runtime/samples/function-in-expression/_config.js
+++ b/test/runtime/samples/function-in-expression/_config.js
@@ -8,6 +8,6 @@ export default {
 	test({ assert, component, target }) {
 		component.numbers = [10, 11, 12, 13, 14, 15, 16];
 
-		assert.htmlEqual(target.innerHTML, `11, 13, 15`);
+		assert.htmlEqual(target.innerHTML, '11, 13, 15');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/get-after-destroy/_config.js b/test/runtime/samples/get-after-destroy/_config.js
index 5d10bbe72a..5e3171d39a 100644
--- a/test/runtime/samples/get-after-destroy/_config.js
+++ b/test/runtime/samples/get-after-destroy/_config.js
@@ -3,7 +3,7 @@ export default {
 		foo: 1
 	},
 
-	html: `<div>1</div>`,
+	html: '<div>1</div>',
 
 	test({ assert, component }) {
 		component.$destroy();
diff --git a/test/runtime/samples/globals-not-overwritten-by-bindings/_config.js b/test/runtime/samples/globals-not-overwritten-by-bindings/_config.js
index d5f3def7f1..34cee8157c 100644
--- a/test/runtime/samples/globals-not-overwritten-by-bindings/_config.js
+++ b/test/runtime/samples/globals-not-overwritten-by-bindings/_config.js
@@ -37,17 +37,17 @@ export default {
 		todos: {
 			first: {
 				description: 'Buy some milk',
-				done: true,
+				done: true
 			},
 			second: {
 				description: 'Do the laundry',
-				done: true,
+				done: true
 			},
 			third: {
 				description: "Find life's true purpose",
-				done: false,
-			},
-		},
+				done: false
+			}
+		}
 	},
 
 	async test({ assert, component, target, window }) {
@@ -74,5 +74,5 @@ export default {
 				<input type="text">
 			</div>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/globals-shadowed-by-each-binding/_config.js b/test/runtime/samples/globals-shadowed-by-each-binding/_config.js
index f69e5e8b0e..50feb09bb6 100644
--- a/test/runtime/samples/globals-shadowed-by-each-binding/_config.js
+++ b/test/runtime/samples/globals-shadowed-by-each-binding/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: '<p>Alert1</p><p>Alert2</p>',
+	html: '<p>Alert1</p><p>Alert2</p>'
 };
diff --git a/test/runtime/samples/hash-in-attribute/_config.js b/test/runtime/samples/hash-in-attribute/_config.js
index 5e5726c48f..a6fe8eb909 100644
--- a/test/runtime/samples/hash-in-attribute/_config.js
+++ b/test/runtime/samples/hash-in-attribute/_config.js
@@ -23,4 +23,4 @@ export default {
 			<a href="x#f">x#f</a>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/head-title-dynamic-simple/_config.js b/test/runtime/samples/head-title-dynamic-simple/_config.js
index 682a841fcd..cc2301a2f9 100644
--- a/test/runtime/samples/head-title-dynamic-simple/_config.js
+++ b/test/runtime/samples/head-title-dynamic-simple/_config.js
@@ -9,4 +9,4 @@ export default {
 		component.foo = 'Also A Title';
 		assert.equal(window.document.title, 'Also A Title');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/head-title-dynamic/_config.js b/test/runtime/samples/head-title-dynamic/_config.js
index ddb04bf0a3..95d5f8debf 100644
--- a/test/runtime/samples/head-title-dynamic/_config.js
+++ b/test/runtime/samples/head-title-dynamic/_config.js
@@ -9,4 +9,4 @@ export default {
 		component.adjective = 'different';
 		assert.equal(window.document.title, 'a different title');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/head-title-empty/_config.js b/test/runtime/samples/head-title-empty/_config.js
index 497855156c..5b0785c797 100644
--- a/test/runtime/samples/head-title-empty/_config.js
+++ b/test/runtime/samples/head-title-empty/_config.js
@@ -2,4 +2,4 @@ export default {
 	test({ assert, window }) {
 		assert.equal(window.document.title, '');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/head-title-static/_config.js b/test/runtime/samples/head-title-static/_config.js
index e6d5d9aaff..ee9a0316b5 100644
--- a/test/runtime/samples/head-title-static/_config.js
+++ b/test/runtime/samples/head-title-static/_config.js
@@ -2,4 +2,4 @@ export default {
 	test({ assert, component, target, window }) {
 		assert.equal(window.document.title, 'changed');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/html-entities-inside-elements/_config.js b/test/runtime/samples/html-entities-inside-elements/_config.js
index a53af0a297..2537da2654 100644
--- a/test/runtime/samples/html-entities-inside-elements/_config.js
+++ b/test/runtime/samples/html-entities-inside-elements/_config.js
@@ -2,4 +2,4 @@ export default {
 	html: `
 		<p>this &lt;em&gt;should&lt;/em&gt; not be <span>&lt;strong&gt;bold&lt;/strong&gt;</span></p>
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/html-entities/_config.js b/test/runtime/samples/html-entities/_config.js
index c8c2de8403..ddcc318e28 100644
--- a/test/runtime/samples/html-entities/_config.js
+++ b/test/runtime/samples/html-entities/_config.js
@@ -11,4 +11,4 @@ export default {
 
 		<span>&amp;notanentity;</span>
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/html-non-entities-inside-elements/_config.js b/test/runtime/samples/html-non-entities-inside-elements/_config.js
index bc217d6d02..d8e128a117 100644
--- a/test/runtime/samples/html-non-entities-inside-elements/_config.js
+++ b/test/runtime/samples/html-non-entities-inside-elements/_config.js
@@ -2,4 +2,4 @@ export default {
 	html: `
 		<div>'foo'<span/></div>
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/if-block-component-store-function-conditionals/_config.js b/test/runtime/samples/if-block-component-store-function-conditionals/_config.js
index db171f2fd1..609765d225 100644
--- a/test/runtime/samples/if-block-component-store-function-conditionals/_config.js
+++ b/test/runtime/samples/if-block-component-store-function-conditionals/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: '<p>OK</p>',
+	html: '<p>OK</p>'
 };
diff --git a/test/runtime/samples/if-block-component-without-outro/_config.js b/test/runtime/samples/if-block-component-without-outro/_config.js
index 8106081c7c..fbcc328fa3 100644
--- a/test/runtime/samples/if-block-component-without-outro/_config.js
+++ b/test/runtime/samples/if-block-component-without-outro/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		foo: true,
+		foo: true
 	},
 
 	html: '<div>A wild component appears</div>',
@@ -8,5 +8,5 @@ export default {
 	test({ assert, component, target }) {
 		component.foo = false;
 		assert.htmlEqual(target.innerHTML, '');
-	},
+	}
 };
diff --git a/test/runtime/samples/if-block-compound-outro-no-dependencies/_config.js b/test/runtime/samples/if-block-compound-outro-no-dependencies/_config.js
index 58b0521022..bcc4e256a4 100644
--- a/test/runtime/samples/if-block-compound-outro-no-dependencies/_config.js
+++ b/test/runtime/samples/if-block-compound-outro-no-dependencies/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `blah blah blah blah`
+	html: 'blah blah blah blah'
 };
diff --git a/test/runtime/samples/if-block-conservative-update/_config.js b/test/runtime/samples/if-block-conservative-update/_config.js
index a71166ef81..f84ccb6b43 100644
--- a/test/runtime/samples/if-block-conservative-update/_config.js
+++ b/test/runtime/samples/if-block-conservative-update/_config.js
@@ -9,7 +9,7 @@ export default {
 		}
 	},
 
-	html: `<p>potato</p>`,
+	html: '<p>potato</p>',
 
 	test({ assert, component, target }) {
 		assert.equal(count, 1);
@@ -17,6 +17,6 @@ export default {
 		component.foo = 'soup';
 		assert.equal(count, 1);
 
-		assert.htmlEqual(target.innerHTML, `<p>soup</p>`);
+		assert.htmlEqual(target.innerHTML, '<p>soup</p>');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/if-block-else-conservative-update/_config.js b/test/runtime/samples/if-block-else-conservative-update/_config.js
index 5c90d2ad3a..da83385dd5 100644
--- a/test/runtime/samples/if-block-else-conservative-update/_config.js
+++ b/test/runtime/samples/if-block-else-conservative-update/_config.js
@@ -15,7 +15,7 @@ export default {
 		}
 	},
 
-	html: `<p>potato</p>`,
+	html: '<p>potato</p>',
 
 	test({ assert, component, target }) {
 		assert.equal(count_a, 1);
@@ -26,12 +26,12 @@ export default {
 		assert.equal(count_a, 2);
 		assert.equal(count_b, 1);
 
-		assert.htmlEqual(target.innerHTML, `<p>SOUP</p>`);
+		assert.htmlEqual(target.innerHTML, '<p>SOUP</p>');
 
 		component.foo = 'salad';
 		assert.equal(count_a, 3);
 		assert.equal(count_b, 1);
 
-		assert.htmlEqual(target.innerHTML, `<p>SALAD</p>`);
+		assert.htmlEqual(target.innerHTML, '<p>SALAD</p>');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/if-block-else-in-each/_config.js b/test/runtime/samples/if-block-else-in-each/_config.js
index 44268f32b9..e75dcb15ee 100644
--- a/test/runtime/samples/if-block-else-in-each/_config.js
+++ b/test/runtime/samples/if-block-else-in-each/_config.js
@@ -1,9 +1,9 @@
 export default {
 	props: {
-		array: [true, false],
+		array: [true, false]
 	},
 	html: `
 		<div>foo</div>
 		<div>bar</div>
-	`,
+	`
 };
diff --git a/test/runtime/samples/if-block-else-partial-outro/_config.js b/test/runtime/samples/if-block-else-partial-outro/_config.js
index a358680edf..ae58d25c23 100644
--- a/test/runtime/samples/if-block-else-partial-outro/_config.js
+++ b/test/runtime/samples/if-block-else-partial-outro/_config.js
@@ -1,7 +1,7 @@
 export default {
 	props: {
 		x: 1,
-		y: false,
+		y: false
 	},
 
 	html: `
@@ -13,5 +13,5 @@ export default {
 		assert.htmlEqual(target.innerHTML, `
 			<span>2</span>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/if-block-elseif-no-else/_config.js b/test/runtime/samples/if-block-elseif-no-else/_config.js
index ec3379737a..e9696e513c 100644
--- a/test/runtime/samples/if-block-elseif-no-else/_config.js
+++ b/test/runtime/samples/if-block-elseif-no-else/_config.js
@@ -14,6 +14,6 @@ export default {
 		`);
 
 		component.x = 6;
-		assert.htmlEqual(target.innerHTML, ``);
+		assert.htmlEqual(target.innerHTML, '');
 	}
 };
diff --git a/test/runtime/samples/if-block-no-outro-else-with-outro/_config.js b/test/runtime/samples/if-block-no-outro-else-with-outro/_config.js
index b2e71ea01f..da80f5be12 100644
--- a/test/runtime/samples/if-block-no-outro-else-with-outro/_config.js
+++ b/test/runtime/samples/if-block-no-outro-else-with-outro/_config.js
@@ -18,5 +18,5 @@ export default {
 			<p>y</p>
 			<input type=text>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/if-block-outro-unique-select-block-type/_config.js b/test/runtime/samples/if-block-outro-unique-select-block-type/_config.js
index b94da1a576..15213e19b3 100644
--- a/test/runtime/samples/if-block-outro-unique-select-block-type/_config.js
+++ b/test/runtime/samples/if-block-outro-unique-select-block-type/_config.js
@@ -2,5 +2,5 @@ export default {
 	html: `
 		<div></div>
 		<div></div>
-	`,
+	`
 };
diff --git a/test/runtime/samples/ignore-unchanged-attribute-compound/counter.js b/test/runtime/samples/ignore-unchanged-attribute-compound/counter.js
index 63872cd6a2..f0fc271f84 100644
--- a/test/runtime/samples/ignore-unchanged-attribute-compound/counter.js
+++ b/test/runtime/samples/ignore-unchanged-attribute-compound/counter.js
@@ -1,3 +1,3 @@
 export default {
 	count: 0
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/ignore-unchanged-attribute/counter.js b/test/runtime/samples/ignore-unchanged-attribute/counter.js
index 63872cd6a2..f0fc271f84 100644
--- a/test/runtime/samples/ignore-unchanged-attribute/counter.js
+++ b/test/runtime/samples/ignore-unchanged-attribute/counter.js
@@ -1,3 +1,3 @@
 export default {
 	count: 0
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/ignore-unchanged-raw/counter.js b/test/runtime/samples/ignore-unchanged-raw/counter.js
index 63872cd6a2..f0fc271f84 100644
--- a/test/runtime/samples/ignore-unchanged-raw/counter.js
+++ b/test/runtime/samples/ignore-unchanged-raw/counter.js
@@ -1,3 +1,3 @@
 export default {
 	count: 0
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/ignore-unchanged-tag/counter.js b/test/runtime/samples/ignore-unchanged-tag/counter.js
index 63872cd6a2..f0fc271f84 100644
--- a/test/runtime/samples/ignore-unchanged-tag/counter.js
+++ b/test/runtime/samples/ignore-unchanged-tag/counter.js
@@ -1,3 +1,3 @@
 export default {
 	count: 0
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/immutable-option/_config.js b/test/runtime/samples/immutable-option/_config.js
index 1224d0213a..4962d2d3b7 100644
--- a/test/runtime/samples/immutable-option/_config.js
+++ b/test/runtime/samples/immutable-option/_config.js
@@ -1,11 +1,11 @@
 export default {
 	immutable: true,
 
-	html: `<div><h3>Called 1 times.</h3></div>`,
+	html: '<div><h3>Called 1 times.</h3></div>',
 
 	test({ assert, component, target }) {
 		// eslint-disable-next-line no-self-assign
 		component.foo = component.foo;
-		assert.htmlEqual(target.innerHTML, `<div><h3>Called 1 times.</h3></div>`);
+		assert.htmlEqual(target.innerHTML, '<div><h3>Called 1 times.</h3></div>');
 	}
 };
diff --git a/test/runtime/samples/immutable-svelte-meta-false/_config.js b/test/runtime/samples/immutable-svelte-meta-false/_config.js
index 664f99f087..1506e79227 100644
--- a/test/runtime/samples/immutable-svelte-meta-false/_config.js
+++ b/test/runtime/samples/immutable-svelte-meta-false/_config.js
@@ -1,11 +1,11 @@
 export default {
 	immutable: true,
 
-	html: `<div><h3>Called 1 times.</h3></div>`,
+	html: '<div><h3>Called 1 times.</h3></div>',
 
 	test({ assert, component, target }) {
 		// eslint-disable-next-line no-self-assign
 		component.foo = component.foo;
-		assert.htmlEqual(target.innerHTML, `<div><h3>Called 2 times.</h3></div>`);
+		assert.htmlEqual(target.innerHTML, '<div><h3>Called 2 times.</h3></div>');
 	}
 };
diff --git a/test/runtime/samples/immutable-svelte-meta/_config.js b/test/runtime/samples/immutable-svelte-meta/_config.js
index 4e39f36224..2dfb6cd3db 100644
--- a/test/runtime/samples/immutable-svelte-meta/_config.js
+++ b/test/runtime/samples/immutable-svelte-meta/_config.js
@@ -1,9 +1,9 @@
 export default {
-	html: `<div><h3>Called 1 times.</h3></div>`,
+	html: '<div><h3>Called 1 times.</h3></div>',
 
 	test({ assert, component, target }) {
 		// eslint-disable-next-line no-self-assign
 		component.foo = component.foo;
-		assert.htmlEqual(target.innerHTML, `<div><h3>Called 1 times.</h3></div>`);
+		assert.htmlEqual(target.innerHTML, '<div><h3>Called 1 times.</h3></div>');
 	}
 };
diff --git a/test/runtime/samples/imported-renamed-components/_config.js b/test/runtime/samples/imported-renamed-components/_config.js
index 9a9e325b84..07683b05be 100644
--- a/test/runtime/samples/imported-renamed-components/_config.js
+++ b/test/runtime/samples/imported-renamed-components/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `OneTwo`
+	html: 'OneTwo'
 };
diff --git a/test/runtime/samples/initial-state-assign/_config.js b/test/runtime/samples/initial-state-assign/_config.js
index b4067fef80..95a1a5e068 100644
--- a/test/runtime/samples/initial-state-assign/_config.js
+++ b/test/runtime/samples/initial-state-assign/_config.js
@@ -3,5 +3,5 @@ export default {
 	html: `
 		"foo"
 		"bar"
-	`,
+	`
 };
diff --git a/test/runtime/samples/inline-style-important/_config.js b/test/runtime/samples/inline-style-important/_config.js
index b7c8d2c352..53f4e98db3 100644
--- a/test/runtime/samples/inline-style-important/_config.js
+++ b/test/runtime/samples/inline-style-important/_config.js
@@ -15,4 +15,4 @@ export default {
 		styles = window.getComputedStyle(p);
 		assert.equal(styles.color, 'green');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/inline-style-optimisation-bailout/_config.js b/test/runtime/samples/inline-style-optimisation-bailout/_config.js
index 836a3e2e6e..acc41e3160 100644
--- a/test/runtime/samples/inline-style-optimisation-bailout/_config.js
+++ b/test/runtime/samples/inline-style-optimisation-bailout/_config.js
@@ -17,4 +17,4 @@ export default {
 		assert.equal(styles.color, '');
 		assert.equal(styles.fontSize, '20px');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/innerhtml-interpolated-literal/_config.js b/test/runtime/samples/innerhtml-interpolated-literal/_config.js
index 022c70f717..d2f4d94a31 100644
--- a/test/runtime/samples/innerhtml-interpolated-literal/_config.js
+++ b/test/runtime/samples/innerhtml-interpolated-literal/_config.js
@@ -4,4 +4,4 @@ export default {
 			<span class="a/42"/>
 		</div>
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/innerhtml-with-comments/_config.js b/test/runtime/samples/innerhtml-with-comments/_config.js
index 95d4a6fa96..897d54c573 100644
--- a/test/runtime/samples/innerhtml-with-comments/_config.js
+++ b/test/runtime/samples/innerhtml-with-comments/_config.js
@@ -5,4 +5,4 @@ export default {
 			<a href="https://getbootstrap.com/" target="_blank">Bootstrap</a>.
 		</span>
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/instrumentation-auto-subscription-self-assignment/_config.js b/test/runtime/samples/instrumentation-auto-subscription-self-assignment/_config.js
index f70a80fe44..32cd6fc22d 100644
--- a/test/runtime/samples/instrumentation-auto-subscription-self-assignment/_config.js
+++ b/test/runtime/samples/instrumentation-auto-subscription-self-assignment/_config.js
@@ -1,8 +1,8 @@
 export default {
-	html: `[]`,
+	html: '[]',
 
 	async test({ assert, component, target }) {
 		await component.go();
-		assert.htmlEqual(target.innerHTML, `[42]`);
+		assert.htmlEqual(target.innerHTML, '[42]');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/instrumentation-script-destructuring/_config.js b/test/runtime/samples/instrumentation-script-destructuring/_config.js
index a0b2de9e77..2b677a8b3a 100644
--- a/test/runtime/samples/instrumentation-script-destructuring/_config.js
+++ b/test/runtime/samples/instrumentation-script-destructuring/_config.js
@@ -26,4 +26,4 @@ export default {
 			<p>x: 2</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/instrumentation-script-loop-scope/_config.js b/test/runtime/samples/instrumentation-script-loop-scope/_config.js
index 1195055c45..069114c523 100644
--- a/test/runtime/samples/instrumentation-script-loop-scope/_config.js
+++ b/test/runtime/samples/instrumentation-script-loop-scope/_config.js
@@ -14,4 +14,4 @@ export default {
 			<p>x: 42</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/instrumentation-script-multiple-assignments/_config.js b/test/runtime/samples/instrumentation-script-multiple-assignments/_config.js
index c5107e4964..1c4663938f 100644
--- a/test/runtime/samples/instrumentation-script-multiple-assignments/_config.js
+++ b/test/runtime/samples/instrumentation-script-multiple-assignments/_config.js
@@ -25,4 +25,4 @@ export default {
 			<p>bar: 2</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/instrumentation-script-update/_config.js b/test/runtime/samples/instrumentation-script-update/_config.js
index 4e97140faf..223904ad63 100644
--- a/test/runtime/samples/instrumentation-script-update/_config.js
+++ b/test/runtime/samples/instrumentation-script-update/_config.js
@@ -14,4 +14,4 @@ export default {
 			<p>x: 1</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/instrumentation-template-destructuring/_config.js b/test/runtime/samples/instrumentation-template-destructuring/_config.js
index a0b2de9e77..2b677a8b3a 100644
--- a/test/runtime/samples/instrumentation-template-destructuring/_config.js
+++ b/test/runtime/samples/instrumentation-template-destructuring/_config.js
@@ -26,4 +26,4 @@ export default {
 			<p>x: 2</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/instrumentation-template-loop-scope/_config.js b/test/runtime/samples/instrumentation-template-loop-scope/_config.js
index 1195055c45..069114c523 100644
--- a/test/runtime/samples/instrumentation-template-loop-scope/_config.js
+++ b/test/runtime/samples/instrumentation-template-loop-scope/_config.js
@@ -14,4 +14,4 @@ export default {
 			<p>x: 42</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/instrumentation-template-multiple-assignments/_config.js b/test/runtime/samples/instrumentation-template-multiple-assignments/_config.js
index c5107e4964..1c4663938f 100644
--- a/test/runtime/samples/instrumentation-template-multiple-assignments/_config.js
+++ b/test/runtime/samples/instrumentation-template-multiple-assignments/_config.js
@@ -25,4 +25,4 @@ export default {
 			<p>bar: 2</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/instrumentation-template-update/_config.js b/test/runtime/samples/instrumentation-template-update/_config.js
index 4e97140faf..223904ad63 100644
--- a/test/runtime/samples/instrumentation-template-update/_config.js
+++ b/test/runtime/samples/instrumentation-template-update/_config.js
@@ -14,4 +14,4 @@ export default {
 			<p>x: 1</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/invalidation-in-if-condition/_config.js b/test/runtime/samples/invalidation-in-if-condition/_config.js
index 27209c75c9..25e7811889 100644
--- a/test/runtime/samples/invalidation-in-if-condition/_config.js
+++ b/test/runtime/samples/invalidation-in-if-condition/_config.js
@@ -1,17 +1,17 @@
 export default {
-	html: `<button>false 0</button>`,
+	html: '<button>false 0</button>',
 
 	async test({ assert, target, window }) {
 		const button = target.querySelector('button');
 		const click = new window.MouseEvent('click');
 
 		await button.dispatchEvent(click);
-		assert.htmlEqual(target.innerHTML, `<button>true 1</button>`);
+		assert.htmlEqual(target.innerHTML, '<button>true 1</button>');
 
 		await button.dispatchEvent(click);
-		assert.htmlEqual(target.innerHTML, `<button>false 1</button>`);
+		assert.htmlEqual(target.innerHTML, '<button>false 1</button>');
 
 		await button.dispatchEvent(click);
-		assert.htmlEqual(target.innerHTML, `<button>true 2</button>`);
+		assert.htmlEqual(target.innerHTML, '<button>true 2</button>');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/isolated-text/_config.js b/test/runtime/samples/isolated-text/_config.js
index ec4332be5c..4dc29eb838 100644
--- a/test/runtime/samples/isolated-text/_config.js
+++ b/test/runtime/samples/isolated-text/_config.js
@@ -3,4 +3,4 @@ export default {
 		before
 		<h1>after</h1>
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/key-block-2/_config.js b/test/runtime/samples/key-block-2/_config.js
new file mode 100644
index 0000000000..9bbf1f199f
--- /dev/null
+++ b/test/runtime/samples/key-block-2/_config.js
@@ -0,0 +1,14 @@
+// with reactive content beside `key`
+export default {
+	html: '<div>00</div>',
+	async test({ assert, component, target, window }) {
+		const div = target.querySelector('div');
+		component.reactive = 2;
+		assert.htmlEqual(target.innerHTML, '<div>02</div>');
+		assert.strictEqual(div, target.querySelector('div'));
+
+		component.value = 5;
+		assert.htmlEqual(target.innerHTML, '<div>52</div>');
+		assert.notStrictEqual(div, target.querySelector('div'));
+	}
+};
diff --git a/test/runtime/samples/key-block-2/main.svelte b/test/runtime/samples/key-block-2/main.svelte
new file mode 100644
index 0000000000..466d20b10a
--- /dev/null
+++ b/test/runtime/samples/key-block-2/main.svelte
@@ -0,0 +1,8 @@
+<script>
+	export let value = 0;
+	export let reactive = 0;
+</script>
+
+{#key value}
+	<div>{value}{reactive}</div>
+{/key}
\ No newline at end of file
diff --git a/test/runtime/samples/key-block-3/_config.js b/test/runtime/samples/key-block-3/_config.js
new file mode 100644
index 0000000000..17b6146827
--- /dev/null
+++ b/test/runtime/samples/key-block-3/_config.js
@@ -0,0 +1,11 @@
+// key is not used in the template
+export default {
+	html: '<div></div>',
+	async test({ assert, component, target, window }) {
+		const div = target.querySelector('div');
+
+		component.value = 5;
+		assert.htmlEqual(target.innerHTML, '<div></div>');
+		assert.notStrictEqual(div, target.querySelector('div'));
+	}
+};
diff --git a/test/runtime/samples/key-block-3/main.svelte b/test/runtime/samples/key-block-3/main.svelte
new file mode 100644
index 0000000000..1ed185c732
--- /dev/null
+++ b/test/runtime/samples/key-block-3/main.svelte
@@ -0,0 +1,7 @@
+<script>
+	export let value = 0;
+</script>
+
+{#key value}
+	<div />
+{/key}
\ No newline at end of file
diff --git a/test/runtime/samples/key-block-array-immutable/_config.js b/test/runtime/samples/key-block-array-immutable/_config.js
new file mode 100644
index 0000000000..b1ffd6cd15
--- /dev/null
+++ b/test/runtime/samples/key-block-array-immutable/_config.js
@@ -0,0 +1,15 @@
+export default {
+	html: '<div>1</div>',
+	async test({ assert, component, target, window }) {
+		let div = target.querySelector('div');
+		await component.append(2);
+		assert.htmlEqual(target.innerHTML, '<div>1</div>');
+		assert.strictEqual(div, target.querySelector('div'));
+
+		div = target.querySelector('div');
+
+		component.array = [3, 4];
+		assert.htmlEqual(target.innerHTML, '<div>3,4</div>');
+		assert.notStrictEqual(div, target.querySelector('div'));
+	}
+};
diff --git a/test/runtime/samples/key-block-array-immutable/main.svelte b/test/runtime/samples/key-block-array-immutable/main.svelte
new file mode 100644
index 0000000000..e666275af4
--- /dev/null
+++ b/test/runtime/samples/key-block-array-immutable/main.svelte
@@ -0,0 +1,14 @@
+<svelte:options immutable />
+
+<script>
+	export let array = [1];
+
+	export function append(value) {
+		array.push(value);
+		array = array;
+	}
+</script>
+
+{#key array}
+	<div>{array.join(',')}</div>
+{/key}
\ No newline at end of file
diff --git a/test/runtime/samples/key-block-array/_config.js b/test/runtime/samples/key-block-array/_config.js
new file mode 100644
index 0000000000..374175177d
--- /dev/null
+++ b/test/runtime/samples/key-block-array/_config.js
@@ -0,0 +1,15 @@
+export default {
+	html: '<div>1</div>',
+	async test({ assert, component, target, window }) {
+		let div = target.querySelector('div');
+		await component.append(2);
+		assert.htmlEqual(target.innerHTML, '<div>1,2</div>');
+		assert.notStrictEqual(div, target.querySelector('div'));
+
+		div = target.querySelector('div');
+
+		component.array = [3, 4];
+		assert.htmlEqual(target.innerHTML, '<div>3,4</div>');
+		assert.notStrictEqual(div, target.querySelector('div'));
+	}
+};
diff --git a/test/runtime/samples/key-block-array/main.svelte b/test/runtime/samples/key-block-array/main.svelte
new file mode 100644
index 0000000000..5a4054b043
--- /dev/null
+++ b/test/runtime/samples/key-block-array/main.svelte
@@ -0,0 +1,12 @@
+<script>
+	export let array = [1];
+
+	export function append(value) {
+		array.push(value);
+		array = array;
+	}
+</script>
+
+{#key array}
+	<div>{array.join(',')}</div>
+{/key}
\ No newline at end of file
diff --git a/test/runtime/samples/key-block-expression-2/_config.js b/test/runtime/samples/key-block-expression-2/_config.js
new file mode 100644
index 0000000000..bab23d2a84
--- /dev/null
+++ b/test/runtime/samples/key-block-expression-2/_config.js
@@ -0,0 +1,18 @@
+export default {
+	html: '<div>3</div>',
+	async test({ assert, component, target, window }) {
+		const div = target.querySelector('div');
+
+		await component.mutate();
+		assert.htmlEqual(target.innerHTML, '<div>5</div>');
+		assert.strictEqual(div, target.querySelector('div'));
+
+		await component.reassign();
+		assert.htmlEqual(target.innerHTML, '<div>7</div>');
+		assert.strictEqual(div, target.querySelector('div'));
+
+		await component.changeKey();
+		assert.htmlEqual(target.innerHTML, '<div>7</div>');
+		assert.notStrictEqual(div, target.querySelector('div'));
+	}
+};
diff --git a/test/runtime/samples/key-block-expression-2/main.svelte b/test/runtime/samples/key-block-expression-2/main.svelte
new file mode 100644
index 0000000000..5525f63761
--- /dev/null
+++ b/test/runtime/samples/key-block-expression-2/main.svelte
@@ -0,0 +1,17 @@
+<script>
+	let obj = { key: 1, value: 3 };
+
+	export function mutate() {
+		obj.value = 5;
+	}
+	export function reassign() {
+		obj = { key: 1, value: 7 };
+	}
+	export function changeKey() {
+		obj.key = 3;
+	}
+</script>
+
+{#key obj.key}
+	<div>{obj.value}</div>
+{/key}
\ No newline at end of file
diff --git a/test/runtime/samples/key-block-expression/_config.js b/test/runtime/samples/key-block-expression/_config.js
new file mode 100644
index 0000000000..c04d55bd29
--- /dev/null
+++ b/test/runtime/samples/key-block-expression/_config.js
@@ -0,0 +1,28 @@
+export default {
+	html: '<div>000</div>',
+	async test({ assert, component, target, window }) {
+		let div = target.querySelector('div');
+		component.value = 2;
+		assert.htmlEqual(target.innerHTML, '<div>200</div>');
+		assert.notStrictEqual(div, target.querySelector('div'));
+
+		div = target.querySelector('div');
+
+		component.anotherValue = 5;
+		assert.htmlEqual(target.innerHTML, '<div>250</div>');
+		assert.notStrictEqual(div, target.querySelector('div'));
+
+		div = target.querySelector('div');
+
+		component.thirdValue = 9;
+		assert.htmlEqual(target.innerHTML, '<div>259</div>');
+		assert.strictEqual(div, target.querySelector('div'));
+
+		// make dirty while maintain the value of `value + anotherValue`
+		// should update the content, but not recreate the elements
+		await component.$set({ value: 4, anotherValue: 3 });
+
+		assert.htmlEqual(target.innerHTML, '<div>439</div>');
+		assert.strictEqual(div, target.querySelector('div'));
+	}
+};
diff --git a/test/runtime/samples/key-block-expression/main.svelte b/test/runtime/samples/key-block-expression/main.svelte
new file mode 100644
index 0000000000..dd752e8b8f
--- /dev/null
+++ b/test/runtime/samples/key-block-expression/main.svelte
@@ -0,0 +1,9 @@
+<script>
+	export let value = 0;
+	export let anotherValue = 0;
+	export let thirdValue = 0;
+</script>
+
+{#key value + anotherValue}
+	<div>{value}{anotherValue}{thirdValue}</div>
+{/key}
\ No newline at end of file
diff --git a/test/runtime/samples/key-block-static/_config.js b/test/runtime/samples/key-block-static/_config.js
new file mode 100644
index 0000000000..8323336615
--- /dev/null
+++ b/test/runtime/samples/key-block-static/_config.js
@@ -0,0 +1,9 @@
+export default {
+	html: '<div>00</div>',
+	async test({ assert, component, target, window }) {
+		const div = target.querySelector('div');
+		component.anotherValue = 2;
+		assert.htmlEqual(target.innerHTML, '<div>02</div>');
+		assert.strictEqual(div, target.querySelector('div'));
+	}
+};
diff --git a/test/runtime/samples/key-block-static/main.svelte b/test/runtime/samples/key-block-static/main.svelte
new file mode 100644
index 0000000000..e4ee6b5d71
--- /dev/null
+++ b/test/runtime/samples/key-block-static/main.svelte
@@ -0,0 +1,8 @@
+<script>
+	let value = 0;
+	export let anotherValue = 0;
+</script>
+
+{#key value}
+	<div>{value}{anotherValue}</div>
+{/key}
\ No newline at end of file
diff --git a/test/runtime/samples/key-block-transition/_config.js b/test/runtime/samples/key-block-transition/_config.js
new file mode 100644
index 0000000000..53de6b333c
--- /dev/null
+++ b/test/runtime/samples/key-block-transition/_config.js
@@ -0,0 +1,24 @@
+export default {
+	html: '<div>0</div>',
+	async test({ assert, component, target, window, raf }) {
+		component.value = 2;
+		
+		const [div1, div2] = target.querySelectorAll('div');
+
+		assert.htmlEqual(div1.outerHTML, '<div>0</div>');
+		assert.htmlEqual(div2.outerHTML, '<div>2</div>');
+
+		raf.tick(0);
+
+		assert.equal(div1.foo, 1);
+		assert.equal(div1.oof, 0);
+
+		assert.equal(div2.foo, 0);
+		assert.equal(div2.oof, 1);
+
+		raf.tick(200);
+
+		assert.htmlEqual(target.innerHTML, '<div>2</div>');
+		assert.equal(div2, target.querySelector('div'));
+	}
+};
diff --git a/test/runtime/samples/key-block-transition/main.svelte b/test/runtime/samples/key-block-transition/main.svelte
new file mode 100644
index 0000000000..d7fb6ec024
--- /dev/null
+++ b/test/runtime/samples/key-block-transition/main.svelte
@@ -0,0 +1,17 @@
+<script>
+	export let value = 0;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: (t, u) => {
+				node.foo = t;
+				node.oof = u;
+			}
+		};
+	}
+</script>
+
+{#key value}
+	<div transition:foo>{value}</div>
+{/key}
\ No newline at end of file
diff --git a/test/runtime/samples/key-block/_config.js b/test/runtime/samples/key-block/_config.js
new file mode 100644
index 0000000000..b25ca901f8
--- /dev/null
+++ b/test/runtime/samples/key-block/_config.js
@@ -0,0 +1,17 @@
+export default {
+	html: '<div>0</div><div>0</div>',
+	async test({ assert, component, target, window }) {
+		let [div1, div2] = target.querySelectorAll('div');
+
+		component.value = 5;
+		assert.htmlEqual(target.innerHTML, '<div>5</div><div>0</div>');
+		assert.notStrictEqual(div1, target.querySelectorAll('div')[0]);
+		assert.strictEqual(div2, target.querySelectorAll('div')[1]);
+		[div1, div2] = target.querySelectorAll('div');
+		
+		component.reactive = 10;
+		assert.htmlEqual(target.innerHTML, '<div>5</div><div>10</div>');
+		assert.strictEqual(div1, target.querySelectorAll('div')[0]);
+		assert.strictEqual(div2, target.querySelectorAll('div')[1]);
+	}
+};
diff --git a/test/runtime/samples/key-block/main.svelte b/test/runtime/samples/key-block/main.svelte
new file mode 100644
index 0000000000..ac3c340770
--- /dev/null
+++ b/test/runtime/samples/key-block/main.svelte
@@ -0,0 +1,10 @@
+<script>
+	export let value = 0;
+	export let reactive = 0;
+</script>
+
+{#key value}
+	<div>{value}</div>
+{/key}
+
+<div>{reactive}</div>
\ No newline at end of file
diff --git a/test/runtime/samples/keyed-each-dev-unique/_config.js b/test/runtime/samples/keyed-each-dev-unique/_config.js
index 8f46af9d52..81728d9c15 100644
--- a/test/runtime/samples/keyed-each-dev-unique/_config.js
+++ b/test/runtime/samples/keyed-each-dev-unique/_config.js
@@ -3,5 +3,5 @@ export default {
 		dev: true
 	},
 
-	error: `Cannot have duplicate keys in a keyed each`
+	error: 'Cannot have duplicate keys in a keyed each'
 };
diff --git a/test/runtime/samples/lifecycle-render-order-for-children/_config.js b/test/runtime/samples/lifecycle-render-order-for-children/_config.js
index 033b593aea..d182d5a97e 100644
--- a/test/runtime/samples/lifecycle-render-order-for-children/_config.js
+++ b/test/runtime/samples/lifecycle-render-order-for-children/_config.js
@@ -21,7 +21,7 @@ export default {
 				'3: onMount',
 				'3: afterUpdate',
 				'0: onMount',
-				'0: afterUpdate',
+				'0: afterUpdate'
 			]);
 		} else {
 			assert.deepEqual(order, [
@@ -40,10 +40,10 @@ export default {
 				'3: onMount',
 				'3: afterUpdate',
 				'0: onMount',
-				'0: afterUpdate',
+				'0: afterUpdate'
 			]);
 		}
 
 		order.length = 0;
-	},
+	}
 };
diff --git a/test/runtime/samples/lifecycle-render-order-for-children/order.js b/test/runtime/samples/lifecycle-render-order-for-children/order.js
index 109fa8b38c..d6d1738de6 100644
--- a/test/runtime/samples/lifecycle-render-order-for-children/order.js
+++ b/test/runtime/samples/lifecycle-render-order-for-children/order.js
@@ -1 +1 @@
-export default [];
\ No newline at end of file
+export default [];
diff --git a/test/runtime/samples/lifecycle-render-order/order.js b/test/runtime/samples/lifecycle-render-order/order.js
index 109fa8b38c..d6d1738de6 100644
--- a/test/runtime/samples/lifecycle-render-order/order.js
+++ b/test/runtime/samples/lifecycle-render-order/order.js
@@ -1 +1 @@
-export default [];
\ No newline at end of file
+export default [];
diff --git a/test/runtime/samples/loop-protect-generator-opt-out/_config.js b/test/runtime/samples/loop-protect-generator-opt-out/_config.js
index 9b6a24b513..0fe83a36db 100644
--- a/test/runtime/samples/loop-protect-generator-opt-out/_config.js
+++ b/test/runtime/samples/loop-protect-generator-opt-out/_config.js
@@ -1,6 +1,6 @@
 export default {
 	compileOptions: {
 		dev: true,
-		loopGuardTimeout: 1,
-	},
+		loopGuardTimeout: 1
+	}
 };
diff --git a/test/runtime/samples/loop-protect-inner-function/_config.js b/test/runtime/samples/loop-protect-inner-function/_config.js
index 862d4f4c0f..1b553e2475 100644
--- a/test/runtime/samples/loop-protect-inner-function/_config.js
+++ b/test/runtime/samples/loop-protect-inner-function/_config.js
@@ -2,6 +2,6 @@ export default {
 	html: '<div></div>',
 	compileOptions: {
 		dev: true,
-		loopGuardTimeout: 100,
+		loopGuardTimeout: 100
 	}
 };
diff --git a/test/runtime/samples/loop-protect/_config.js b/test/runtime/samples/loop-protect/_config.js
index 75f75c003d..230bbeb53d 100644
--- a/test/runtime/samples/loop-protect/_config.js
+++ b/test/runtime/samples/loop-protect/_config.js
@@ -2,6 +2,6 @@ export default {
 	error: 'Infinite loop detected',
 	compileOptions: {
 		dev: true,
-		loopGuardTimeout: 100,
+		loopGuardTimeout: 100
 	}
 };
diff --git a/test/runtime/samples/module-context-export/_config.js b/test/runtime/samples/module-context-export/_config.js
index 902501fdd4..4c4595483a 100644
--- a/test/runtime/samples/module-context-export/_config.js
+++ b/test/runtime/samples/module-context-export/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<p>(42)(99)</p>`
-};
\ No newline at end of file
+	html: '<p>(42)(99)</p>'
+};
diff --git a/test/runtime/samples/module-context-with-instance-script/_config.js b/test/runtime/samples/module-context-with-instance-script/_config.js
index 902501fdd4..4c4595483a 100644
--- a/test/runtime/samples/module-context-with-instance-script/_config.js
+++ b/test/runtime/samples/module-context-with-instance-script/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<p>(42)(99)</p>`
-};
\ No newline at end of file
+	html: '<p>(42)(99)</p>'
+};
diff --git a/test/runtime/samples/module-context/_config.js b/test/runtime/samples/module-context/_config.js
index 0ea26ee446..83138d08f9 100644
--- a/test/runtime/samples/module-context/_config.js
+++ b/test/runtime/samples/module-context/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<p>42</p>`
-};
\ No newline at end of file
+	html: '<p>42</p>'
+};
diff --git a/test/runtime/samples/mutation-tracking-across-sibling-scopes/_config.js b/test/runtime/samples/mutation-tracking-across-sibling-scopes/_config.js
index 038db6dbbb..8d51c61394 100644
--- a/test/runtime/samples/mutation-tracking-across-sibling-scopes/_config.js
+++ b/test/runtime/samples/mutation-tracking-across-sibling-scopes/_config.js
@@ -9,4 +9,4 @@ export default {
 
 		assert.htmlEqual(component.div.innerHTML, '<div>-</div><div>-</div>');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/names-deconflicted/_config.js b/test/runtime/samples/names-deconflicted/_config.js
index 07b337a1e8..9ce1010690 100644
--- a/test/runtime/samples/names-deconflicted/_config.js
+++ b/test/runtime/samples/names-deconflicted/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: `<p>1: foo</p><p>2: bar</p><p>3: baz</p>`,
+	html: '<p>1: foo</p><p>2: bar</p><p>3: baz</p>',
 
 	test({ assert, component, target }) {
 		component.widgets = [
@@ -7,6 +7,6 @@ export default {
 			{ name: 'bosh' }
 		];
 
-		assert.htmlEqual( target.innerHTML, `<p>1: bish</p><p>2: bosh</p>` );
+		assert.htmlEqual( target.innerHTML, '<p>1: bish</p><p>2: bosh</p>' );
 	}
 };
diff --git a/test/runtime/samples/nbsp/_config.js b/test/runtime/samples/nbsp/_config.js
index 6322725f98..5cfbc4ca35 100644
--- a/test/runtime/samples/nbsp/_config.js
+++ b/test/runtime/samples/nbsp/_config.js
@@ -1,8 +1,8 @@
 export default {
-	html: `<span>&nbsp;</span>`,
+	html: '<span>&nbsp;</span>',
 
 	test({ assert, component, target }) {
 		const text = target.querySelector( 'span' ).textContent;
 		assert.equal( text.charCodeAt( 0 ), 160 );
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/nested-transition-detach-each/_config.js b/test/runtime/samples/nested-transition-detach-each/_config.js
index e17fe1bc4d..41d32e597c 100644
--- a/test/runtime/samples/nested-transition-detach-each/_config.js
+++ b/test/runtime/samples/nested-transition-detach-each/_config.js
@@ -5,7 +5,7 @@ export default {
 		cols: ['a', 'b', 'c']
 	},
 
-	html: ``,
+	html: '',
 
 	compileOptions: {
 		dev: true
@@ -34,6 +34,6 @@ export default {
 		component.visible = false;
 		raf.tick(0);
 		raf.tick(100);
-		assert.htmlEqual(target.innerHTML, ``);
-	},
+		assert.htmlEqual(target.innerHTML, '');
+	}
 };
diff --git a/test/runtime/samples/nested-transition-detach-if-false/_config.js b/test/runtime/samples/nested-transition-detach-if-false/_config.js
index d2ae78ffe3..1d42094192 100644
--- a/test/runtime/samples/nested-transition-detach-if-false/_config.js
+++ b/test/runtime/samples/nested-transition-detach-if-false/_config.js
@@ -20,5 +20,5 @@ export default {
 				<span>a</span>
 			</li>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/nested-transition-if-block-not-remounted/_config.js b/test/runtime/samples/nested-transition-if-block-not-remounted/_config.js
index 6696389e6e..1f2d5561fe 100644
--- a/test/runtime/samples/nested-transition-if-block-not-remounted/_config.js
+++ b/test/runtime/samples/nested-transition-if-block-not-remounted/_config.js
@@ -11,14 +11,13 @@ export default {
 		</div>
 	`,
 
-	test({ assert, component, target, window, raf }) {
+	test({ component, target }) {
 		const div = target.querySelector('div');
-		const { appendChild, insertBefore } = div;
 
 		div.appendChild = div.insertBefore = () => {
 			throw new Error('DOM was mutated');
 		};
 
 		component.value = 'two';
-	},
+	}
 };
diff --git a/test/runtime/samples/noscript-removal/_config.js b/test/runtime/samples/noscript-removal/_config.js
index 35bdcefd96..709792c14a 100644
--- a/test/runtime/samples/noscript-removal/_config.js
+++ b/test/runtime/samples/noscript-removal/_config.js
@@ -5,5 +5,5 @@ export default {
 	<div>foo</div>
 
 	<div>foo<div>foo</div></div>
-`,
+`
 };
diff --git a/test/runtime/samples/numeric-seperator/_config.js b/test/runtime/samples/numeric-seperator/_config.js
new file mode 100644
index 0000000000..2b1b5168ee
--- /dev/null
+++ b/test/runtime/samples/numeric-seperator/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: '2048 2048'
+};
diff --git a/test/runtime/samples/numeric-seperator/main.svelte b/test/runtime/samples/numeric-seperator/main.svelte
new file mode 100644
index 0000000000..e491b8a107
--- /dev/null
+++ b/test/runtime/samples/numeric-seperator/main.svelte
@@ -0,0 +1,5 @@
+<script>
+	const num = 2_048;
+</script>
+
+{num} {2_048}
\ No newline at end of file
diff --git a/test/runtime/samples/observable-auto-subscribe/_config.js b/test/runtime/samples/observable-auto-subscribe/_config.js
index 289a3b51c6..5570413395 100644
--- a/test/runtime/samples/observable-auto-subscribe/_config.js
+++ b/test/runtime/samples/observable-auto-subscribe/_config.js
@@ -23,7 +23,7 @@ export default {
 		visible: false
 	},
 
-	html: ``,
+	html: '',
 
 	async test({ assert, component, target }) {
 		assert.equal(subscribers.length, 0);
@@ -46,4 +46,4 @@ export default {
 
 		assert.equal(subscribers.length, 0);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/ondestroy-before-cleanup/_config.js b/test/runtime/samples/ondestroy-before-cleanup/_config.js
index e9721f24b0..e33b154b64 100644
--- a/test/runtime/samples/ondestroy-before-cleanup/_config.js
+++ b/test/runtime/samples/ondestroy-before-cleanup/_config.js
@@ -4,10 +4,9 @@ export default {
 	test({ assert, component, target }) {
 		container.div = null;
 
-		const top = component.top;
 		const div = target.querySelector('div');
 
 		component.visible = false;
 		assert.equal(container.div, div);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/ondestroy-before-cleanup/container.js b/test/runtime/samples/ondestroy-before-cleanup/container.js
index 7c645e42fb..ff8b4c5632 100644
--- a/test/runtime/samples/ondestroy-before-cleanup/container.js
+++ b/test/runtime/samples/ondestroy-before-cleanup/container.js
@@ -1 +1 @@
-export default {};
\ No newline at end of file
+export default {};
diff --git a/test/runtime/samples/ondestroy-deep/_config.js b/test/runtime/samples/ondestroy-deep/_config.js
index 4431a2e163..3f82e8b601 100644
--- a/test/runtime/samples/ondestroy-deep/_config.js
+++ b/test/runtime/samples/ondestroy-deep/_config.js
@@ -7,4 +7,4 @@ export default {
 
 		reset();
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/ondestroy-deep/destroyed.js b/test/runtime/samples/ondestroy-deep/destroyed.js
index fe05c1d241..45845cbd83 100644
--- a/test/runtime/samples/ondestroy-deep/destroyed.js
+++ b/test/runtime/samples/ondestroy-deep/destroyed.js
@@ -1,3 +1,3 @@
 export const destroyed = [];
 
-export const reset = () => destroyed.length = 0;
\ No newline at end of file
+export const reset = () => destroyed.length = 0;
diff --git a/test/runtime/samples/onmount-fires-when-ready-nested/_config.js b/test/runtime/samples/onmount-fires-when-ready-nested/_config.js
index b7446c1d72..4f7ec9b051 100644
--- a/test/runtime/samples/onmount-fires-when-ready-nested/_config.js
+++ b/test/runtime/samples/onmount-fires-when-ready-nested/_config.js
@@ -1,5 +1,5 @@
 export default {
 	skip_if_ssr: true, // uses oncreate
 
-	html: `<div><p>true</p>\n<p>true</p></div>`
+	html: '<div><p>true</p>\n<p>true</p></div>'
 };
diff --git a/test/runtime/samples/onmount-fires-when-ready/_config.js b/test/runtime/samples/onmount-fires-when-ready/_config.js
index de095cbdb7..ca9f535c19 100644
--- a/test/runtime/samples/onmount-fires-when-ready/_config.js
+++ b/test/runtime/samples/onmount-fires-when-ready/_config.js
@@ -1,10 +1,10 @@
 export default {
 	skip_if_ssr: true, // uses oncreate
 
-	html: `<div><p>true</p></div>`,
+	html: '<div><p>true</p></div>',
 
 	test({ assert, component, target }) {
 		component.foo = true;
-		assert.htmlEqual(target.innerHTML, `<div><p>true</p>\n<p>true</p></div>`);
+		assert.htmlEqual(target.innerHTML, '<div><p>true</p>\n<p>true</p></div>');
 	}
 };
diff --git a/test/runtime/samples/onmount-get-current-component/_config.js b/test/runtime/samples/onmount-get-current-component/_config.js
new file mode 100644
index 0000000000..6c5c666cf0
--- /dev/null
+++ b/test/runtime/samples/onmount-get-current-component/_config.js
@@ -0,0 +1,4 @@
+export default {
+	skip_if_ssr: true,
+	html: '1'
+};
diff --git a/test/runtime/samples/onmount-get-current-component/main.svelte b/test/runtime/samples/onmount-get-current-component/main.svelte
new file mode 100644
index 0000000000..de64bc65fa
--- /dev/null
+++ b/test/runtime/samples/onmount-get-current-component/main.svelte
@@ -0,0 +1,16 @@
+<script>
+	import { onMount } from 'svelte';
+	import { get_current_component } from 'svelte/internal';
+
+	let gotException = 0;
+
+	onMount(() => {
+		try {
+			get_current_component();
+		} catch (error) {
+			gotException++;
+		}
+	});
+</script>
+
+{gotException}
diff --git a/test/runtime/samples/onmount-sibling-order/result.js b/test/runtime/samples/onmount-sibling-order/result.js
index 109fa8b38c..d6d1738de6 100644
--- a/test/runtime/samples/onmount-sibling-order/result.js
+++ b/test/runtime/samples/onmount-sibling-order/result.js
@@ -1 +1 @@
-export default [];
\ No newline at end of file
+export default [];
diff --git a/test/runtime/samples/option-without-select/_config.js b/test/runtime/samples/option-without-select/_config.js
index 48303961ad..9925069bb1 100644
--- a/test/runtime/samples/option-without-select/_config.js
+++ b/test/runtime/samples/option-without-select/_config.js
@@ -3,7 +3,7 @@ export default {
 		foo: 'hello'
 	},
 
-	html: `<option value='hello'>hello</option>`,
+	html: "<option value='hello'>hello</option>",
 
 	test({ assert, component, target }) {
 		component.foo = 'goodbye';
@@ -11,4 +11,4 @@ export default {
 			<option value='goodbye'>goodbye</option>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/paren-wrapped-expressions/_config.js b/test/runtime/samples/paren-wrapped-expressions/_config.js
index 0c757dc854..972dc51cb0 100644
--- a/test/runtime/samples/paren-wrapped-expressions/_config.js
+++ b/test/runtime/samples/paren-wrapped-expressions/_config.js
@@ -2,7 +2,7 @@ export default {
 	props: {
 		a: 'foo',
 		b: true,
-		c: [ 1, 2, 3 ],
+		c: [ 1, 2, 3 ]
 	},
 
 	html: `
diff --git a/test/runtime/samples/preload/_config.js b/test/runtime/samples/preload/_config.js
index 1b35ebbe74..d7d5fd0851 100644
--- a/test/runtime/samples/preload/_config.js
+++ b/test/runtime/samples/preload/_config.js
@@ -2,4 +2,4 @@ export default {
 	test({ assert, mod }) {
 		assert.deepEqual(mod.preload({ foo: 1 }), { bar: 2 });
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/prop-const/_config.js b/test/runtime/samples/prop-const/_config.js
index 489a48476f..991063a754 100644
--- a/test/runtime/samples/prop-const/_config.js
+++ b/test/runtime/samples/prop-const/_config.js
@@ -20,4 +20,4 @@ export default {
 			<p>b: 2</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/prop-exports/_config.js b/test/runtime/samples/prop-exports/_config.js
index e1620c015f..69a40c4fab 100644
--- a/test/runtime/samples/prop-exports/_config.js
+++ b/test/runtime/samples/prop-exports/_config.js
@@ -10,7 +10,7 @@ export default {
 		a2: 4,
 		a6: writable(29),
 		for: 'loop',
-		continue: '...',
+		continue: '...'
 	},
 
 	html: `
diff --git a/test/runtime/samples/prop-not-action/_config.js b/test/runtime/samples/prop-not-action/_config.js
index 17ab47b584..1f4ffa4749 100644
--- a/test/runtime/samples/prop-not-action/_config.js
+++ b/test/runtime/samples/prop-not-action/_config.js
@@ -6,4 +6,4 @@ export default {
 	html: `
 		<h1>Hello world!</h1>
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/prop-quoted/_config.js b/test/runtime/samples/prop-quoted/_config.js
index d982bc87cc..aa2f2ec329 100644
--- a/test/runtime/samples/prop-quoted/_config.js
+++ b/test/runtime/samples/prop-quoted/_config.js
@@ -3,10 +3,10 @@ export default {
 		foo: 1
 	},
 
-	html: `1`,
+	html: '1',
 
 	async test({ assert, component, target }) {
 		component.foo = 2;
-		assert.htmlEqual(target.innerHTML, `2`);
+		assert.htmlEqual(target.innerHTML, '2');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/prop-subscribable/_config.js b/test/runtime/samples/prop-subscribable/_config.js
index 84cde8c9af..fcd8fb8b07 100644
--- a/test/runtime/samples/prop-subscribable/_config.js
+++ b/test/runtime/samples/prop-subscribable/_config.js
@@ -8,4 +8,4 @@ export default {
 	html: `
 		42
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/prop-without-semicolon-b/_config.js b/test/runtime/samples/prop-without-semicolon-b/_config.js
index 7104dc2b2d..6cdc86c521 100644
--- a/test/runtime/samples/prop-without-semicolon-b/_config.js
+++ b/test/runtime/samples/prop-without-semicolon-b/_config.js
@@ -3,5 +3,5 @@ export default {
 		name: 'world'
 	},
 
-	html: `<h1>Hello world!</h1>`
-};
\ No newline at end of file
+	html: '<h1>Hello world!</h1>'
+};
diff --git a/test/runtime/samples/prop-without-semicolon/_config.js b/test/runtime/samples/prop-without-semicolon/_config.js
index 328d6cc2eb..26b3554f9f 100644
--- a/test/runtime/samples/prop-without-semicolon/_config.js
+++ b/test/runtime/samples/prop-without-semicolon/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<h1>Hello world!</h1>`
-};
\ No newline at end of file
+	html: '<h1>Hello world!</h1>'
+};
diff --git a/test/runtime/samples/props-reactive-b/_config.js b/test/runtime/samples/props-reactive-b/_config.js
index 43eaee23aa..541fd26e02 100644
--- a/test/runtime/samples/props-reactive-b/_config.js
+++ b/test/runtime/samples/props-reactive-b/_config.js
@@ -27,4 +27,4 @@ export default {
 			<p>c: 9</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/props-reactive-only-with-change/_config.js b/test/runtime/samples/props-reactive-only-with-change/_config.js
index 04170620c8..dcf12868f9 100644
--- a/test/runtime/samples/props-reactive-only-with-change/_config.js
+++ b/test/runtime/samples/props-reactive-only-with-change/_config.js
@@ -3,8 +3,8 @@ let callbacks = [];
 export default {
 	props: {
 		callback: (value) => callbacks.push(value),
-		val1: "1",
-		val2: "2",
+		val1: '1',
+		val2: '2'
 	},
 
 	before_test() {
@@ -15,16 +15,16 @@ export default {
 		assert.equal(callbacks.length, 2);
 		assert.equal(JSON.stringify(callbacks), '["1","2"]');
 
-		component.val1 = "3";
+		component.val1 = '3';
 		assert.equal(callbacks.length, 3);
 		assert.equal(JSON.stringify(callbacks), '["1","2","1"]');
 
-		component.val1 = "4";
+		component.val1 = '4';
 		assert.equal(callbacks.length, 4);
 		assert.equal(JSON.stringify(callbacks), '["1","2","1","1"]');
 
-		component.val2 = "5";
+		component.val2 = '5';
 		assert.equal(callbacks.length, 5);
 		assert.equal(JSON.stringify(callbacks), '["1","2","1","1","2"]');
-	},
+	}
 };
diff --git a/test/runtime/samples/props-reactive-slot/_config.js b/test/runtime/samples/props-reactive-slot/_config.js
index 286bba2f08..266f0fc8a8 100644
--- a/test/runtime/samples/props-reactive-slot/_config.js
+++ b/test/runtime/samples/props-reactive-slot/_config.js
@@ -5,8 +5,8 @@ export default {
 	`,
 
 	async test({ assert, component, target, window }) {
-		const btn = target.querySelector("button");
-		const clickEvent = new window.MouseEvent("click");
+		const btn = target.querySelector('button');
+		const clickEvent = new window.MouseEvent('click');
 
 		await btn.dispatchEvent(clickEvent);
 
@@ -17,5 +17,5 @@ export default {
 			<button>Change</button>
 		`
 		);
-	},
+	}
 };
diff --git a/test/runtime/samples/props-reactive/_config.js b/test/runtime/samples/props-reactive/_config.js
index a44687069e..4c27ac0618 100644
--- a/test/runtime/samples/props-reactive/_config.js
+++ b/test/runtime/samples/props-reactive/_config.js
@@ -17,4 +17,4 @@ export default {
 			<p>5</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/props/_config.js b/test/runtime/samples/props/_config.js
index fc3c71d6f0..64015cdc6b 100644
--- a/test/runtime/samples/props/_config.js
+++ b/test/runtime/samples/props/_config.js
@@ -14,4 +14,4 @@ export default {
 			<p>{"x":2}</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/raw-anchor-first-child/_config.js b/test/runtime/samples/raw-anchor-first-child/_config.js
index 32f948bcbb..02297675c5 100644
--- a/test/runtime/samples/raw-anchor-first-child/_config.js
+++ b/test/runtime/samples/raw-anchor-first-child/_config.js
@@ -1,12 +1,12 @@
 export default {
 	props: {
-		raw: `<span>foo</span>`
+		raw: '<span>foo</span>'
 	},
 
 	test({ assert, component, target }) {
 		const span = target.querySelector('span');
 		assert.ok(!span.previousSibling);
 
-		component.raw = `<span>bar</span>`;
+		component.raw = '<span>bar</span>';
 	}
 };
diff --git a/test/runtime/samples/raw-anchor-first-last-child/_config.js b/test/runtime/samples/raw-anchor-first-last-child/_config.js
index 31f8c343ed..30acfe4d0f 100644
--- a/test/runtime/samples/raw-anchor-first-last-child/_config.js
+++ b/test/runtime/samples/raw-anchor-first-last-child/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		raw: `<span>foo</span>`
+		raw: '<span>foo</span>'
 	},
 
 	test({ assert, component, target }) {
@@ -8,6 +8,6 @@ export default {
 		assert.ok(!span.previousSibling);
 		assert.ok(!span.nextSibling);
 
-		component.raw = `<span>bar</span>`;
+		component.raw = '<span>bar</span>';
 	}
 };
diff --git a/test/runtime/samples/raw-anchor-last-child/_config.js b/test/runtime/samples/raw-anchor-last-child/_config.js
index ea2217b4c1..dcc8ac6db6 100644
--- a/test/runtime/samples/raw-anchor-last-child/_config.js
+++ b/test/runtime/samples/raw-anchor-last-child/_config.js
@@ -1,12 +1,12 @@
 export default {
 	props: {
-		raw: `<span>foo</span>`
+		raw: '<span>foo</span>'
 	},
 
 	test({ assert, component, target }) {
 		const span = target.querySelector('span');
 		assert.ok(!span.nextSibling);
 
-		component.raw = `<span>bar</span>`;
+		component.raw = '<span>bar</span>';
 	}
 };
diff --git a/test/runtime/samples/raw-anchor-next-previous-sibling/_config.js b/test/runtime/samples/raw-anchor-next-previous-sibling/_config.js
index d28e84fc3b..c6d2b561c0 100644
--- a/test/runtime/samples/raw-anchor-next-previous-sibling/_config.js
+++ b/test/runtime/samples/raw-anchor-next-previous-sibling/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		raw: `<span>foo</span>`
+		raw: '<span>foo</span>'
 	},
 
 	test({ assert, component, target }) {
@@ -8,6 +8,6 @@ export default {
 		assert.equal(span.previousSibling.nodeName, 'BR');
 		assert.equal(span.nextSibling.nodeName, 'BR');
 
-		component.raw = `<span>bar</span>`;
+		component.raw = '<span>bar</span>';
 	}
 };
diff --git a/test/runtime/samples/raw-anchor-next-sibling/_config.js b/test/runtime/samples/raw-anchor-next-sibling/_config.js
index dc6ad98e2e..1982f28da5 100644
--- a/test/runtime/samples/raw-anchor-next-sibling/_config.js
+++ b/test/runtime/samples/raw-anchor-next-sibling/_config.js
@@ -1,12 +1,12 @@
 export default {
 	props: {
-		raw: `<span>foo</span>`
+		raw: '<span>foo</span>'
 	},
 
 	test({ assert, component, target }) {
 		const span = target.querySelector('span');
 		assert.equal(span.previousSibling.nodeName, 'BR');
 
-		component.raw = `<span>bar</span>`;
+		component.raw = '<span>bar</span>';
 	}
 };
diff --git a/test/runtime/samples/raw-anchor-previous-sibling/_config.js b/test/runtime/samples/raw-anchor-previous-sibling/_config.js
index dc6ad98e2e..1982f28da5 100644
--- a/test/runtime/samples/raw-anchor-previous-sibling/_config.js
+++ b/test/runtime/samples/raw-anchor-previous-sibling/_config.js
@@ -1,12 +1,12 @@
 export default {
 	props: {
-		raw: `<span>foo</span>`
+		raw: '<span>foo</span>'
 	},
 
 	test({ assert, component, target }) {
 		const span = target.querySelector('span');
 		assert.equal(span.previousSibling.nodeName, 'BR');
 
-		component.raw = `<span>bar</span>`;
+		component.raw = '<span>bar</span>';
 	}
 };
diff --git a/test/runtime/samples/raw-mustache-as-root/_config.js b/test/runtime/samples/raw-mustache-as-root/_config.js
index c87971a7f0..a38c0b1c81 100644
--- a/test/runtime/samples/raw-mustache-as-root/_config.js
+++ b/test/runtime/samples/raw-mustache-as-root/_config.js
@@ -5,8 +5,8 @@ export default {
 		<p>This line should be last.</p>
 	`,
 	async test({ assert, target, window }) {
-		const btn = target.querySelector("button");
-		const clickEvent = new window.MouseEvent("click");
+		const btn = target.querySelector('button');
+		const clickEvent = new window.MouseEvent('click');
 
 		await btn.dispatchEvent(clickEvent);
 
@@ -29,5 +29,5 @@ export default {
 				<p>This line should be last.</p>
 			`
 		);
-	},
+	}
 };
diff --git a/test/runtime/samples/raw-mustache-before-element/_config.js b/test/runtime/samples/raw-mustache-before-element/_config.js
index 61288cbb52..e00ca11a20 100644
--- a/test/runtime/samples/raw-mustache-before-element/_config.js
+++ b/test/runtime/samples/raw-mustache-before-element/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<p>x<span>baz</span></p>`
+	html: '<p>x<span>baz</span></p>'
 };
diff --git a/test/runtime/samples/raw-mustache-inside-head/_config.js b/test/runtime/samples/raw-mustache-inside-head/_config.js
index 4a84f5c01d..6d28a6e8c4 100644
--- a/test/runtime/samples/raw-mustache-inside-head/_config.js
+++ b/test/runtime/samples/raw-mustache-inside-head/_config.js
@@ -1,7 +1,7 @@
 export default {
 	async test({ assert, target, window }) {
-		const btn = target.querySelector("button");
-		const clickEvent = new window.MouseEvent("click");
+		const btn = target.querySelector('button');
+		const clickEvent = new window.MouseEvent('click');
 
 		assert.equal(window.document.head.innerHTML.includes('<style>body { color: blue; }</style><style>body { color: green; }</style>'), true);
 
@@ -12,5 +12,5 @@ export default {
 		await btn.dispatchEvent(clickEvent);
 
 		assert.equal(window.document.head.innerHTML.includes('<style>body { color: blue; }</style><style>body { color: green; }</style>'), true);
-	},
+	}
 };
diff --git a/test/runtime/samples/raw-mustache-inside-slot/_config.js b/test/runtime/samples/raw-mustache-inside-slot/_config.js
index c87971a7f0..a38c0b1c81 100644
--- a/test/runtime/samples/raw-mustache-inside-slot/_config.js
+++ b/test/runtime/samples/raw-mustache-inside-slot/_config.js
@@ -5,8 +5,8 @@ export default {
 		<p>This line should be last.</p>
 	`,
 	async test({ assert, target, window }) {
-		const btn = target.querySelector("button");
-		const clickEvent = new window.MouseEvent("click");
+		const btn = target.querySelector('button');
+		const clickEvent = new window.MouseEvent('click');
 
 		await btn.dispatchEvent(clickEvent);
 
@@ -29,5 +29,5 @@ export default {
 				<p>This line should be last.</p>
 			`
 		);
-	},
+	}
 };
diff --git a/test/runtime/samples/raw-mustaches-preserved/_config.js b/test/runtime/samples/raw-mustaches-preserved/_config.js
index 66b829f7cb..d4d57025d2 100644
--- a/test/runtime/samples/raw-mustaches-preserved/_config.js
+++ b/test/runtime/samples/raw-mustaches-preserved/_config.js
@@ -5,13 +5,13 @@ export default {
 		raw: '<p>does not change</p>'
 	},
 
-	html: `<div><p>does not change</p></div>`,
+	html: '<div><p>does not change</p></div>',
 
 	test({ assert, component, target }) {
 		const p = target.querySelector('p');
 
 		component.raw = '<p>does not change</p>';
-		assert.equal(target.innerHTML, `<div><p>does not change</p></div>`);
+		assert.equal(target.innerHTML, '<div><p>does not change</p></div>');
 		assert.strictEqual(target.querySelector('p'), p);
 	}
 };
diff --git a/test/runtime/samples/raw-mustaches-td-tr/_config.js b/test/runtime/samples/raw-mustaches-td-tr/_config.js
index dfcb1ce0f0..3b165bb65e 100644
--- a/test/runtime/samples/raw-mustaches-td-tr/_config.js
+++ b/test/runtime/samples/raw-mustaches-td-tr/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		raw: "<tr><td>1</td><td>2</td></tr>",
+		raw: '<tr><td>1</td><td>2</td></tr>'
 	},
 
 	html: `
@@ -14,5 +14,5 @@ export default {
 				</tr>
 			</tbody>
 		</table>
-	`,
+	`
 };
diff --git a/test/runtime/samples/raw-mustaches/_config.js b/test/runtime/samples/raw-mustaches/_config.js
index cc9999aa34..9eda8289ce 100644
--- a/test/runtime/samples/raw-mustaches/_config.js
+++ b/test/runtime/samples/raw-mustaches/_config.js
@@ -5,13 +5,13 @@ export default {
 		raw: '<span><em>raw html!!!\\o/</span></em>'
 	},
 
-	html: `before<span><em>raw html!!!\\o/</span></em>after`,
+	html: 'before<span><em>raw html!!!\\o/</span></em>after',
 
 	test({ assert, component, target }) {
 		component.raw = '';
-		assert.equal(target.innerHTML, `beforeafter`);
+		assert.equal(target.innerHTML, 'beforeafter');
 		component.raw = 'how about <strong>unclosed elements?';
-		assert.equal(target.innerHTML, `beforehow about <strong>unclosed elements?</strong>after`);
+		assert.equal(target.innerHTML, 'beforehow about <strong>unclosed elements?</strong>after');
 		component.$destroy();
 		assert.equal(target.innerHTML, '');
 	}
diff --git a/test/runtime/samples/reactive-assignment-in-assignment-rhs/_config.js b/test/runtime/samples/reactive-assignment-in-assignment-rhs/_config.js
index f0bf2cdc70..0402f34a2f 100644
--- a/test/runtime/samples/reactive-assignment-in-assignment-rhs/_config.js
+++ b/test/runtime/samples/reactive-assignment-in-assignment-rhs/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<h1>1 1</h1>`
-};
\ No newline at end of file
+	html: '<h1>1 1</h1>'
+};
diff --git a/test/runtime/samples/reactive-assignment-in-complex-declaration-with-store-2/_config.js b/test/runtime/samples/reactive-assignment-in-complex-declaration-with-store-2/_config.js
new file mode 100644
index 0000000000..a22aa878ff
--- /dev/null
+++ b/test/runtime/samples/reactive-assignment-in-complex-declaration-with-store-2/_config.js
@@ -0,0 +1,9 @@
+// destructure to store value
+export default {
+	skip_if_ssr: true, // pending https://github.com/sveltejs/svelte/issues/3582
+	html: '<h1>2 2 xxx 5 6 9 10 2</h1>',
+	async test({ assert, target, component }) {
+		await component.update();
+		assert.htmlEqual(target.innerHTML, '<h1>11 11 yyy 12 13 14 15 11</h1>');
+	}
+};
diff --git a/test/runtime/samples/reactive-assignment-in-complex-declaration-with-store-2/main.svelte b/test/runtime/samples/reactive-assignment-in-complex-declaration-with-store-2/main.svelte
new file mode 100644
index 0000000000..c1bf63d9cd
--- /dev/null
+++ b/test/runtime/samples/reactive-assignment-in-complex-declaration-with-store-2/main.svelte
@@ -0,0 +1,29 @@
+<script>
+	import { writable } from 'svelte/store';
+
+	let eid = writable(1);
+	let foo;
+	const u = writable(2);
+	const v = writable(3);
+	const w = writable(4);
+	const x = writable(5);
+	const y = writable(6);
+	[$u, $v, $w] = [
+		{id: eid = writable(foo = 2), name: 'xxx'},
+		5,
+		6
+	];
+	({ a: $x, b: $y } = { a: 9, b: 10 });
+	$: z = $u.id;
+
+	export function update() {
+		[$u, $v, $w] = [
+			{id: eid = writable(foo = 11), name: 'yyy'},
+			12,
+			13
+		];
+		({ a: $x, b: $y } = { a: 14, b: 15 });
+	}
+</script>
+
+<h1>{foo} {$eid} {$u.name} {$v} {$w} {$x} {$y} {$z}</h1>
diff --git a/test/runtime/samples/reactive-assignment-in-complex-declaration-with-store/_config.js b/test/runtime/samples/reactive-assignment-in-complex-declaration-with-store/_config.js
new file mode 100644
index 0000000000..6a613f73c4
--- /dev/null
+++ b/test/runtime/samples/reactive-assignment-in-complex-declaration-with-store/_config.js
@@ -0,0 +1,9 @@
+// destructure to store
+export default {
+	html: '<h1>2 2 xxx 5 6 9 10 2</h1>',
+	skip_if_ssr: true,
+	async test({ assert, target, component }) {
+		await component.update();
+		assert.htmlEqual(target.innerHTML, '<h1>11 11 yyy 12 13 14 15 11</h1>');
+	}
+};
diff --git a/test/runtime/samples/reactive-assignment-in-complex-declaration-with-store/main.svelte b/test/runtime/samples/reactive-assignment-in-complex-declaration-with-store/main.svelte
new file mode 100644
index 0000000000..cd49223535
--- /dev/null
+++ b/test/runtime/samples/reactive-assignment-in-complex-declaration-with-store/main.svelte
@@ -0,0 +1,29 @@
+<script>
+	import { writable } from 'svelte/store';
+
+	let eid = writable(1);
+	let foo;
+	let u;
+	let v;
+	let w;
+	let x;
+	let y;
+	[u, v, w] = [
+		{id: eid = writable(foo = 2), name: 'xxx'},
+		5,
+		writable(6)
+	];
+	({ a: x, b: y } = { a: writable(9), b: writable(10) });
+	$: z = u.id;
+
+	export function update() {
+		[u, v, w] = [
+			{id: eid = writable(foo = 11), name: 'yyy'},
+			12,
+			writable(13)
+		];
+		({ a: x, b: y } = { a: writable(14), b: writable(15) });
+	}
+</script>
+
+<h1>{foo} {$eid} {u.name} {v} {$w} {$x} {$y} {$z}</h1>
diff --git a/test/runtime/samples/reactive-assignment-in-complex-declaration/_config.js b/test/runtime/samples/reactive-assignment-in-complex-declaration/_config.js
index d17a81e052..0636620619 100644
--- a/test/runtime/samples/reactive-assignment-in-complex-declaration/_config.js
+++ b/test/runtime/samples/reactive-assignment-in-complex-declaration/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<h1>2 2</h1>`
-};
\ No newline at end of file
+	html: '<h1>2 2</h1>'
+};
diff --git a/test/runtime/samples/reactive-assignment-in-declaration/_config.js b/test/runtime/samples/reactive-assignment-in-declaration/_config.js
index f0bf2cdc70..0402f34a2f 100644
--- a/test/runtime/samples/reactive-assignment-in-declaration/_config.js
+++ b/test/runtime/samples/reactive-assignment-in-declaration/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<h1>1 1</h1>`
-};
\ No newline at end of file
+	html: '<h1>1 1</h1>'
+};
diff --git a/test/runtime/samples/reactive-assignment-in-declaration/main.svelte b/test/runtime/samples/reactive-assignment-in-declaration/main.svelte
index 8aa05964dd..edac4427bb 100644
--- a/test/runtime/samples/reactive-assignment-in-declaration/main.svelte
+++ b/test/runtime/samples/reactive-assignment-in-declaration/main.svelte
@@ -1,6 +1,9 @@
 <script>
 	let foo;
 	let bar = (foo = 1);
+	function a() {
+		bar = (foo = 1);
+	}
 </script>
 
 <h1>{foo} {bar}</h1>
diff --git a/test/runtime/samples/reactive-assignment-in-for-loop-head/_config.js b/test/runtime/samples/reactive-assignment-in-for-loop-head/_config.js
index df64f577df..8f57423d5c 100644
--- a/test/runtime/samples/reactive-assignment-in-for-loop-head/_config.js
+++ b/test/runtime/samples/reactive-assignment-in-for-loop-head/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<h1>0 0</h1>`
-};
\ No newline at end of file
+	html: '<h1>0 0</h1>'
+};
diff --git a/test/runtime/samples/reactive-assignment-in-for-loop-head/main.svelte b/test/runtime/samples/reactive-assignment-in-for-loop-head/main.svelte
index 1c24f364ac..b007f6fe8b 100644
--- a/test/runtime/samples/reactive-assignment-in-for-loop-head/main.svelte
+++ b/test/runtime/samples/reactive-assignment-in-for-loop-head/main.svelte
@@ -1,9 +1,14 @@
 <script>
-  let foo1;
-  let foo2;
-  for (let bar = (foo1 = 0); bar < 5; bar += 1) {
-    foo2 = foo1;
-  }
+	let foo1;
+	let foo2;
+	for (let bar = (foo1 = 0); bar < 5; bar += 1) {
+		foo2 = foo1;
+	}
+	function a() {
+		for (let bar = (foo1 = 0); bar < 5; bar += 1) {
+			foo2 = foo1;
+		}
+	}
 </script>
 
 <h1>{foo1} {foo2}</h1>
diff --git a/test/runtime/samples/reactive-block-break/_config.js b/test/runtime/samples/reactive-block-break/_config.js
index f2d3e6a8f5..e00bb9f480 100644
--- a/test/runtime/samples/reactive-block-break/_config.js
+++ b/test/runtime/samples/reactive-block-break/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<h1>1 2</h1>`
-};
\ No newline at end of file
+	html: '<h1>1 2</h1>'
+};
diff --git a/test/runtime/samples/reactive-function-called-reassigned/_config.js b/test/runtime/samples/reactive-function-called-reassigned/_config.js
index 317173f8eb..7b2a8b72fe 100644
--- a/test/runtime/samples/reactive-function-called-reassigned/_config.js
+++ b/test/runtime/samples/reactive-function-called-reassigned/_config.js
@@ -7,7 +7,7 @@ function callback(_value) {
 
 export default {
 	props: {
-		callback,
+		callback
 	},
 	async test({ assert, component, target, window }) {
 		assert.equal(called, 1);
diff --git a/test/runtime/samples/reactive-import-statement-2/_config.js b/test/runtime/samples/reactive-import-statement-2/_config.js
index ccc97cd076..fc6d8f008d 100644
--- a/test/runtime/samples/reactive-import-statement-2/_config.js
+++ b/test/runtime/samples/reactive-import-statement-2/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<p>prop value</p>`
+	html: '<p>prop value</p>'
 };
diff --git a/test/runtime/samples/reactive-import-statement/_config.js b/test/runtime/samples/reactive-import-statement/_config.js
index 7fb8097ca5..45a844afa0 100644
--- a/test/runtime/samples/reactive-import-statement/_config.js
+++ b/test/runtime/samples/reactive-import-statement/_config.js
@@ -11,7 +11,7 @@ export default {
 	before_test() {
 		delete require.cache[path.resolve(__dirname, 'data.js')];
 	},
-	async test({ assert, target, window, }) {
+	async test({ assert, target, window }) {
 		const btn = target.querySelector('button');
 		const clickEvent = new window.MouseEvent('click');
 
diff --git a/test/runtime/samples/reactive-import-statement/data.js b/test/runtime/samples/reactive-import-statement/data.js
index ad494c7cb0..22f2f374ab 100644
--- a/test/runtime/samples/reactive-import-statement/data.js
+++ b/test/runtime/samples/reactive-import-statement/data.js
@@ -1 +1 @@
-export const numbers = [1, 2, 3, 4];
\ No newline at end of file
+export const numbers = [1, 2, 3, 4];
diff --git a/test/runtime/samples/reactive-value-assign-property/_config.js b/test/runtime/samples/reactive-value-assign-property/_config.js
index 7b6c1d2965..b6d8bf51be 100644
--- a/test/runtime/samples/reactive-value-assign-property/_config.js
+++ b/test/runtime/samples/reactive-value-assign-property/_config.js
@@ -1,5 +1,5 @@
 export default {
 	html: `
 		<h1>Hello world!</h1>
-	`,
+	`
 };
diff --git a/test/runtime/samples/reactive-value-coerce/_config.js b/test/runtime/samples/reactive-value-coerce/_config.js
index 7d8bcb6b50..9cf9d7d8ee 100644
--- a/test/runtime/samples/reactive-value-coerce/_config.js
+++ b/test/runtime/samples/reactive-value-coerce/_config.js
@@ -1,10 +1,10 @@
 export default {
-	html: `1-1`,
+	html: '1-1',
 
 	test: ({ assert, component, target }) => {
 		component.a.b[0] = 2;
 		component.a = component.a; // eslint-disable-line no-self-assign
 
-		assert.htmlEqual(target.innerHTML, `2-2`);
+		assert.htmlEqual(target.innerHTML, '2-2');
 	}
 };
diff --git a/test/runtime/samples/reactive-value-function/_config.js b/test/runtime/samples/reactive-value-function/_config.js
index c2de1af713..2a84953576 100644
--- a/test/runtime/samples/reactive-value-function/_config.js
+++ b/test/runtime/samples/reactive-value-function/_config.js
@@ -1,9 +1,9 @@
 export default {
-	html: `1-2`,
+	html: '1-2',
 
 	async test({ assert, component, target }) {
 		await component.update();
 
-		assert.htmlEqual(target.innerHTML, `3-4`);
+		assert.htmlEqual(target.innerHTML, '3-4');
 	}
 };
diff --git a/test/runtime/samples/reactive-value-mutate/_config.js b/test/runtime/samples/reactive-value-mutate/_config.js
index e408816834..66979f1e31 100644
--- a/test/runtime/samples/reactive-value-mutate/_config.js
+++ b/test/runtime/samples/reactive-value-mutate/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `{"bar":42}`
+	html: '{"bar":42}'
 };
diff --git a/test/runtime/samples/script-style-non-top-level/_config.js b/test/runtime/samples/script-style-non-top-level/_config.js
index 86eddf4611..22186b345d 100644
--- a/test/runtime/samples/script-style-non-top-level/_config.js
+++ b/test/runtime/samples/script-style-non-top-level/_config.js
@@ -5,4 +5,4 @@ export default {
 			<script>alert(\`<>\`);</script>
 		</div>
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/select-no-whitespace/_config.js b/test/runtime/samples/select-no-whitespace/_config.js
index 7388527849..fbd4990317 100644
--- a/test/runtime/samples/select-no-whitespace/_config.js
+++ b/test/runtime/samples/select-no-whitespace/_config.js
@@ -3,4 +3,4 @@ export default {
 		const select = target.querySelector( 'select' );
 		assert.equal( select.childNodes.length, 3 );
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/self-reference-component/_config.js b/test/runtime/samples/self-reference-component/_config.js
index e3e0ad3a4f..c3456b59c2 100644
--- a/test/runtime/samples/self-reference-component/_config.js
+++ b/test/runtime/samples/self-reference-component/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: '5 4 3 2 1 0',
-};
\ No newline at end of file
+	html: '5 4 3 2 1 0'
+};
diff --git a/test/runtime/samples/self-reference-tree/_config.js b/test/runtime/samples/self-reference-tree/_config.js
index 581f03eade..cfa7528d31 100644
--- a/test/runtime/samples/self-reference-tree/_config.js
+++ b/test/runtime/samples/self-reference-tree/_config.js
@@ -62,4 +62,4 @@ export default {
 			</ul>
 		</article>
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/self-reference/_config.js b/test/runtime/samples/self-reference/_config.js
index 69be606bbe..1bcb660621 100644
--- a/test/runtime/samples/self-reference/_config.js
+++ b/test/runtime/samples/self-reference/_config.js
@@ -11,4 +11,4 @@ export default {
 		<span>1</span>
 		<span>0</span>
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/semicolon-hoisting/_config.js b/test/runtime/samples/semicolon-hoisting/_config.js
index 88d81cdc9e..22dc25b41e 100644
--- a/test/runtime/samples/semicolon-hoisting/_config.js
+++ b/test/runtime/samples/semicolon-hoisting/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: ``
-};
\ No newline at end of file
+	html: ''
+};
diff --git a/test/runtime/samples/set-after-destroy/_config.js b/test/runtime/samples/set-after-destroy/_config.js
index 9d79329546..063c133b87 100644
--- a/test/runtime/samples/set-after-destroy/_config.js
+++ b/test/runtime/samples/set-after-destroy/_config.js
@@ -7,4 +7,4 @@ export default {
 		component.$destroy();
 		component.x = 2;
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/set-null-text-node/_config.js b/test/runtime/samples/set-null-text-node/_config.js
index 6bc775f3b7..a106ee9069 100644
--- a/test/runtime/samples/set-null-text-node/_config.js
+++ b/test/runtime/samples/set-null-text-node/_config.js
@@ -10,4 +10,4 @@ export default {
 		component.foo = null;
 		assert.htmlEqual(target.innerHTML, 'foo is null');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/set-undefined-attr/_config.js b/test/runtime/samples/set-undefined-attr/_config.js
index b23f51dfc9..49c4216e57 100644
--- a/test/runtime/samples/set-undefined-attr/_config.js
+++ b/test/runtime/samples/set-undefined-attr/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: `<div draggable='false'></div>`,
+	html: "<div draggable='false'></div>",
 
-	ssrHtml: `<div foo='1' draggable='false'></div>`,
+	ssrHtml: "<div foo='1' draggable='false'></div>"
 };
diff --git a/test/runtime/samples/shorthand-method-in-template/_config.js b/test/runtime/samples/shorthand-method-in-template/_config.js
index ddd282644d..b097a46716 100644
--- a/test/runtime/samples/shorthand-method-in-template/_config.js
+++ b/test/runtime/samples/shorthand-method-in-template/_config.js
@@ -1,3 +1,3 @@
 export default {
 	html: '42'
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/sigil-component-prop/_config.js b/test/runtime/samples/sigil-component-prop/_config.js
index 2f467bb9d4..105f8b468c 100644
--- a/test/runtime/samples/sigil-component-prop/_config.js
+++ b/test/runtime/samples/sigil-component-prop/_config.js
@@ -3,5 +3,5 @@ export default {
 		dev: true
 	},
 	props: { foo: 'foo' },
-	html: `<div>foo @ foo # foo</div>`,
+	html: '<div>foo @ foo # foo</div>'
 };
diff --git a/test/runtime/samples/sigil-expression-function-body/_config.js b/test/runtime/samples/sigil-expression-function-body/_config.js
index fccd0db2d0..8d88d1fd08 100644
--- a/test/runtime/samples/sigil-expression-function-body/_config.js
+++ b/test/runtime/samples/sigil-expression-function-body/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `@foo`
+	html: '@foo'
 };
diff --git a/test/runtime/samples/sigil-static-#/_config.js b/test/runtime/samples/sigil-static-#/_config.js
index 747ddc2a94..3bf2601f70 100644
--- a/test/runtime/samples/sigil-static-#/_config.js
+++ b/test/runtime/samples/sigil-static-#/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `#foo`
-};
\ No newline at end of file
+	html: '#foo'
+};
diff --git a/test/runtime/samples/sigil-static-@/_config.js b/test/runtime/samples/sigil-static-@/_config.js
index ada3a602ab..8d88d1fd08 100644
--- a/test/runtime/samples/sigil-static-@/_config.js
+++ b/test/runtime/samples/sigil-static-@/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `@foo`
-};
\ No newline at end of file
+	html: '@foo'
+};
diff --git a/test/runtime/samples/slot-if-block-update-no-anchor/_config.js b/test/runtime/samples/slot-if-block-update-no-anchor/_config.js
index 060cbaa619..f05d79c265 100644
--- a/test/runtime/samples/slot-if-block-update-no-anchor/_config.js
+++ b/test/runtime/samples/slot-if-block-update-no-anchor/_config.js
@@ -1,7 +1,7 @@
 export default {
 	test({ assert, target, component }) {
-		assert.htmlEqual(target.innerHTML, `<span></span>`);
+		assert.htmlEqual(target.innerHTML, '<span></span>');
 		component.enabled = true;
-		assert.htmlEqual(target.innerHTML, `<span>enabled</span>`);
-	},
+		assert.htmlEqual(target.innerHTML, '<span>enabled</span>');
+	}
 };
diff --git a/test/runtime/samples/slot-in-custom-element/_config.js b/test/runtime/samples/slot-in-custom-element/_config.js
index f17cc9adcb..a0b97ec6d0 100644
--- a/test/runtime/samples/slot-in-custom-element/_config.js
+++ b/test/runtime/samples/slot-in-custom-element/_config.js
@@ -4,4 +4,4 @@ export default {
 			<header slot='header'>header header header</header>
 		</custom-element>
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/spread-component-2/_config.js b/test/runtime/samples/spread-component-2/_config.js
index 6d36e8e60d..e5441bc4b9 100644
--- a/test/runtime/samples/spread-component-2/_config.js
+++ b/test/runtime/samples/spread-component-2/_config.js
@@ -10,7 +10,7 @@ export default {
 			baz: 50 + 2,
 			qux: 1,
 			quux: 'quuxx'
-		}],
+		}]
 	},
 
 	html: `
diff --git a/test/runtime/samples/spread-component-dynamic-non-object-multiple-dependencies/_config.js b/test/runtime/samples/spread-component-dynamic-non-object-multiple-dependencies/_config.js
index c5e23a023c..d7ad47b01f 100644
--- a/test/runtime/samples/spread-component-dynamic-non-object-multiple-dependencies/_config.js
+++ b/test/runtime/samples/spread-component-dynamic-non-object-multiple-dependencies/_config.js
@@ -2,7 +2,7 @@ export default {
 	props: {
 		props: {
 			foo: 'lol',
-			baz: 40 + 2,
+			baz: 40 + 2
 		}
 	},
 
diff --git a/test/runtime/samples/spread-component-dynamic-non-object/_config.js b/test/runtime/samples/spread-component-dynamic-non-object/_config.js
index 094f2fbb9b..fa8de8ad94 100644
--- a/test/runtime/samples/spread-component-dynamic-non-object/_config.js
+++ b/test/runtime/samples/spread-component-dynamic-non-object/_config.js
@@ -2,7 +2,7 @@ export default {
 	props: {
 		props: {
 			foo: 'lol',
-			baz: 40 + 2,
+			baz: 40 + 2
 		}
 	},
 
diff --git a/test/runtime/samples/spread-component-dynamic-undefined/_config.js b/test/runtime/samples/spread-component-dynamic-undefined/_config.js
index 09e5f87c14..ba41df3e54 100644
--- a/test/runtime/samples/spread-component-dynamic-undefined/_config.js
+++ b/test/runtime/samples/spread-component-dynamic-undefined/_config.js
@@ -1,17 +1,17 @@
 export default {
 	props: {
 		props: {
-			a: 1,
-		},
+			a: 1
+		}
 	},
 
-	html: ``,
+	html: '',
 
 	test({ assert, component, target }) {
 		component.props = {
-			a: 2,
+			a: 2
 		};
 
-		assert.htmlEqual(target.innerHTML, ``);
-	},
+		assert.htmlEqual(target.innerHTML, '');
+	}
 };
diff --git a/test/runtime/samples/spread-component-dynamic/_config.js b/test/runtime/samples/spread-component-dynamic/_config.js
index a6bf952ae0..7992a30514 100644
--- a/test/runtime/samples/spread-component-dynamic/_config.js
+++ b/test/runtime/samples/spread-component-dynamic/_config.js
@@ -1,8 +1,8 @@
 export default {
 	props: {
 		props: {
-			a: 1,
-		},
+			a: 1
+		}
 	},
 
 	html: `
@@ -11,9 +11,9 @@ export default {
 
 	test({ assert, component, target }) {
 		component.props = {
-			a: 2,
+			a: 2
 		};
 
-		assert.htmlEqual(target.innerHTML, `<p>a: 2</p>`);
-	},
+		assert.htmlEqual(target.innerHTML, '<p>a: 2</p>');
+	}
 };
diff --git a/test/runtime/samples/spread-component-multiple-dependencies/_config.js b/test/runtime/samples/spread-component-multiple-dependencies/_config.js
index bc05f31130..ee2c0feda8 100644
--- a/test/runtime/samples/spread-component-multiple-dependencies/_config.js
+++ b/test/runtime/samples/spread-component-multiple-dependencies/_config.js
@@ -1,10 +1,10 @@
 export default {
-	html: `b baz`,
+	html: 'b baz',
 	test({ assert, component, target }) {
 		component.foo = true;
 		assert.htmlEqual(
 			target.innerHTML,
-			`a baz`
+			'a baz'
 		);
-	},
+	}
 };
diff --git a/test/runtime/samples/spread-each-component/_config.js b/test/runtime/samples/spread-each-component/_config.js
index bc4d8ee7a4..66d2381875 100644
--- a/test/runtime/samples/spread-each-component/_config.js
+++ b/test/runtime/samples/spread-each-component/_config.js
@@ -20,5 +20,5 @@ export default {
 			<div data-a="3" data-b="4"></div>
 			<div data-a="1" data-b="2"></div>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/spread-each-element/_config.js b/test/runtime/samples/spread-each-element/_config.js
index 5dbd82a892..579f840099 100644
--- a/test/runtime/samples/spread-each-element/_config.js
+++ b/test/runtime/samples/spread-each-element/_config.js
@@ -20,5 +20,5 @@ export default {
 			<div data-c="3" data-d="4"></div>
 			<div data-a="1" data-b="2"></div>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/spread-element-boolean/_config.js b/test/runtime/samples/spread-element-boolean/_config.js
index 3ee277eec4..3ceeb3f677 100644
--- a/test/runtime/samples/spread-element-boolean/_config.js
+++ b/test/runtime/samples/spread-element-boolean/_config.js
@@ -18,8 +18,8 @@ export default {
 
 		assert.htmlEqual(
 			target.innerHTML,
-			`<button>click me</button>`
+			'<button>click me</button>'
 		);
 		assert.ok(!button.disabled);
-	},
+	}
 };
diff --git a/test/runtime/samples/spread-element-class/_config.js b/test/runtime/samples/spread-element-class/_config.js
index 7fc3d49012..b699848210 100644
--- a/test/runtime/samples/spread-element-class/_config.js
+++ b/test/runtime/samples/spread-element-class/_config.js
@@ -1,7 +1,7 @@
 export default {
-	html: `<div class='foo bar'>hello</div>`,
+	html: "<div class='foo bar'>hello</div>",
 	test({ assert, component, target }) {
 		component.blah = 'goodbye';
-		assert.htmlEqual(target.innerHTML, `<div class='foo bar'>goodbye</div>`);
+		assert.htmlEqual(target.innerHTML, "<div class='foo bar'>goodbye</div>");
 	}
 };
diff --git a/test/runtime/samples/spread-element-input-bind-group-with-value-attr/_config.js b/test/runtime/samples/spread-element-input-bind-group-with-value-attr/_config.js
index 6e1b890351..4bbc9d278c 100644
--- a/test/runtime/samples/spread-element-input-bind-group-with-value-attr/_config.js
+++ b/test/runtime/samples/spread-element-input-bind-group-with-value-attr/_config.js
@@ -5,7 +5,7 @@ export default {
 		}
 	},
 
-	html: `<input data-foo="bar" type="radio" value="abc">`,
+	html: '<input data-foo="bar" type="radio" value="abc">',
 
 	async test({ assert, component, target, window }) {
 		const input = target.querySelector('input');
diff --git a/test/runtime/samples/spread-element-input-value-undefined/_config.js b/test/runtime/samples/spread-element-input-value-undefined/_config.js
new file mode 100644
index 0000000000..9a83dccd80
--- /dev/null
+++ b/test/runtime/samples/spread-element-input-value-undefined/_config.js
@@ -0,0 +1,12 @@
+export default {
+	async test({ assert, component, target, window }) {
+		const input = target.querySelector('input');
+		component.value = undefined;
+
+		assert.equal(input.value, 'undefined');
+
+		component.value = 'foobar';
+
+		assert.equal(input.value, 'foobar');
+	}
+};
diff --git a/test/runtime/samples/spread-element-input-value-undefined/main.svelte b/test/runtime/samples/spread-element-input-value-undefined/main.svelte
new file mode 100644
index 0000000000..5c9121dc03
--- /dev/null
+++ b/test/runtime/samples/spread-element-input-value-undefined/main.svelte
@@ -0,0 +1,5 @@
+<script>
+	export let value = '';
+</script>
+
+<input {value} {...{}} />
\ No newline at end of file
diff --git a/test/runtime/samples/spread-element-input-value/_config.js b/test/runtime/samples/spread-element-input-value/_config.js
index a07de82419..0df088159a 100644
--- a/test/runtime/samples/spread-element-input-value/_config.js
+++ b/test/runtime/samples/spread-element-input-value/_config.js
@@ -1,6 +1,6 @@
 export default {
 	async test({ assert, component, target, window }) {
-		const [input1, input2] = target.querySelectorAll("input");
+		const [input1, input2] = target.querySelectorAll('input');
 
 		// we are not able emulate user interaction in jsdom,
 		// therefore, jsdom could not validate minlength / maxlength
@@ -14,7 +14,7 @@ export default {
 		const spy1 = spyOnValueSetter(input1, input1.value);
 		const spy2 = spyOnValueSetter(input2, input2.value);
 		
-		const event = new window.Event("input");
+		const event = new window.Event('input');
 		
 		input1.value = '12345';
 		spy1.reset();
@@ -35,20 +35,20 @@ export default {
 		spy2.reset();
 		component.val2 = '56789';
 		assert.ok(spy2.isSetCalled());
-	},
+	}
 };
 
 function spyOnValueSetter(input, initialValue) {
 	let value = initialValue;
 	let isSet = false;
-	Object.defineProperty(input, "value", {
+	Object.defineProperty(input, 'value', {
 		get() {
 			return value;
 		},
 		set(_value) {
 			value = _value;
 			isSet = true;
-		},
+		}
 	});
 
 	return {
@@ -57,6 +57,6 @@ function spyOnValueSetter(input, initialValue) {
 		},
 		reset() {
 			isSet = false;
-		},
+		}
 	};
 }
diff --git a/test/runtime/samples/spread-element-input/_config.js b/test/runtime/samples/spread-element-input/_config.js
index 80685b9d20..2e68e9832f 100644
--- a/test/runtime/samples/spread-element-input/_config.js
+++ b/test/runtime/samples/spread-element-input/_config.js
@@ -5,5 +5,5 @@ export default {
 		}
 	},
 
-	html: `<input data-foo="bar">`
+	html: '<input data-foo="bar">'
 };
diff --git a/test/runtime/samples/spread-element-multiple-dependencies/_config.js b/test/runtime/samples/spread-element-multiple-dependencies/_config.js
index 69ef1f8ebe..6183e6bf6e 100644
--- a/test/runtime/samples/spread-element-multiple-dependencies/_config.js
+++ b/test/runtime/samples/spread-element-multiple-dependencies/_config.js
@@ -1,10 +1,10 @@
 export default {
-	html: `<div class='b' title='baz'></div>`,
+	html: "<div class='b' title='baz'></div>",
 	test({ assert, component, target }) {
 		component.foo = true;
 		assert.htmlEqual(
 			target.innerHTML,
-			`<div class='a' title='baz'></div>`
+			"<div class='a' title='baz'></div>"
 		);
-	},
+	}
 };
diff --git a/test/runtime/samples/spread-element-multiple/_config.js b/test/runtime/samples/spread-element-multiple/_config.js
index 641f74d727..38afe2fe8e 100644
--- a/test/runtime/samples/spread-element-multiple/_config.js
+++ b/test/runtime/samples/spread-element-multiple/_config.js
@@ -2,12 +2,12 @@ export default {
 	props: {
 		a: {
 			'data-one': 1,
-			'data-two': 2,
+			'data-two': 2
 		},
 		c: {
-			'data-b': 'overridden',
+			'data-b': 'overridden'
 		},
-		d: 'deeeeee',
+		d: 'deeeeee'
 	},
 
 	html: `
@@ -25,7 +25,7 @@ export default {
 
 		assert.htmlEqual(
 			target.innerHTML,
-			`<div data-one="10" data-b="b" data-c="new" data-d="DEEEEEE" >test</div>`
+			'<div data-one="10" data-b="b" data-c="new" data-d="DEEEEEE" >test</div>'
 		);
-	},
+	}
 };
diff --git a/test/runtime/samples/spread-element-readonly/_config.js b/test/runtime/samples/spread-element-readonly/_config.js
index 1d349fd76f..5e33acb0aa 100644
--- a/test/runtime/samples/spread-element-readonly/_config.js
+++ b/test/runtime/samples/spread-element-readonly/_config.js
@@ -1,6 +1,6 @@
 export default {
 	skip_if_ssr: true, // DOM and SSR output is different, a separate SSR test exists
-	html: `<input form="qux" list="quu" />`,
+	html: '<input form="qux" list="quu" />',
 
 	test({ assert, target }) {
 		const div = target.querySelector('input');
diff --git a/test/runtime/samples/spread-element-removal/_config.js b/test/runtime/samples/spread-element-removal/_config.js
index 270804170d..1fd2443369 100644
--- a/test/runtime/samples/spread-element-removal/_config.js
+++ b/test/runtime/samples/spread-element-removal/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<input>`
+	html: '<input>'
 };
diff --git a/test/runtime/samples/spread-element/_config.js b/test/runtime/samples/spread-element/_config.js
index 0763634b0f..2332891b67 100644
--- a/test/runtime/samples/spread-element/_config.js
+++ b/test/runtime/samples/spread-element/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: `<div data-named="value" data-foo="bar">red</div>`,
+	html: '<div data-named="value" data-foo="bar">red</div>',
 
 	test({ assert, component, target }) {
 		const div = target.querySelector( 'div' );
@@ -9,13 +9,13 @@ export default {
 
 		component.color = 'blue';
 		component.props = { 'data-foo': 'baz', 'data-named': 'qux' };
-		assert.htmlEqual( target.innerHTML, `<div data-named="value" data-foo="baz">blue</div>` );
+		assert.htmlEqual( target.innerHTML, '<div data-named="value" data-foo="baz">blue</div>' );
 		assert.equal( div.dataset.foo, 'baz' );
 		assert.equal( div.dataset.named, 'value' );
 
 		component.color = 'blue';
 		component.props = {};
-		assert.htmlEqual( target.innerHTML, `<div data-named="value">blue</div>` );
+		assert.htmlEqual( target.innerHTML, '<div data-named="value">blue</div>' );
 		assert.equal( div.dataset.foo, undefined );
 	}
 };
diff --git a/test/runtime/samples/spring/_config.js b/test/runtime/samples/spring/_config.js
index 49367ce08b..5fd33b2e51 100644
--- a/test/runtime/samples/spring/_config.js
+++ b/test/runtime/samples/spring/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<p>0</p>`
+	html: '<p>0</p>'
 };
diff --git a/test/runtime/samples/state-deconflicted/_config.js b/test/runtime/samples/state-deconflicted/_config.js
index 3258754400..ff1b10b481 100644
--- a/test/runtime/samples/state-deconflicted/_config.js
+++ b/test/runtime/samples/state-deconflicted/_config.js
@@ -49,4 +49,4 @@ export default {
 			</ul>
 		` );
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-assignment-updates-property/_config.js b/test/runtime/samples/store-assignment-updates-property/_config.js
new file mode 100644
index 0000000000..168f7d27a0
--- /dev/null
+++ b/test/runtime/samples/store-assignment-updates-property/_config.js
@@ -0,0 +1,32 @@
+export default {
+	html: `
+		<p>a: {"foo":3,"bar":2}</p>
+		<p>b: {"foo":3}</p>
+		<button></button>
+		<button></button>
+	`,
+	skip_if_ssr: true,
+
+	async test({ assert, component, target, window }) {
+		const [btn1, btn2] = target.querySelectorAll('button');
+		const click = new window.MouseEvent('click');
+
+		await btn1.dispatchEvent(click);
+
+		assert.htmlEqual(target.innerHTML, `
+			<p>a: {"foo":4,"bar":2}</p>
+			<p>b: {"foo":4,"baz":0}</p>
+			<button></button>
+			<button></button>
+		`);
+
+		await btn2.dispatchEvent(click);
+
+		assert.htmlEqual(target.innerHTML, `
+			<p>a: {"foo":5,"bar":2}</p>
+			<p>b: {"foo":5,"qux":0}</p>
+			<button></button>
+			<button></button>
+		`);
+	}
+};
diff --git a/test/runtime/samples/store-assignment-updates-property/main.svelte b/test/runtime/samples/store-assignment-updates-property/main.svelte
new file mode 100644
index 0000000000..c3196a278c
--- /dev/null
+++ b/test/runtime/samples/store-assignment-updates-property/main.svelte
@@ -0,0 +1,24 @@
+<script>
+	import { writable } from '../../../../store';
+
+	const a = writable({ foo: 1, bar: 2 });
+	$a.foo = 3;
+
+	const b = writable({ foo: 1, bar: 2 });
+	$b = { foo: 3 };
+
+	function update() {
+		$a.foo = $a.foo + 1;
+		$b = { foo: $b.foo + 1, qux: 0 };
+	}
+</script>
+
+<p>a: {JSON.stringify($a)}</p>
+<p>b: {JSON.stringify($b)}</p>
+
+<button on:click={() => {
+	$a.foo = $a.foo + 1;
+	$b = { foo: $b.foo + 1, baz: 0 };
+}} />
+
+<button on:click={update} />
\ No newline at end of file
diff --git a/test/runtime/samples/store-assignment-updates-reactive/_config.js b/test/runtime/samples/store-assignment-updates-reactive/_config.js
index e81b3bb180..a9606d9d68 100644
--- a/test/runtime/samples/store-assignment-updates-reactive/_config.js
+++ b/test/runtime/samples/store-assignment-updates-reactive/_config.js
@@ -39,4 +39,4 @@ export default {
 			<button>+1</button>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-assignment-updates/_config.js b/test/runtime/samples/store-assignment-updates/_config.js
index 1b36d92863..c4a09a978e 100644
--- a/test/runtime/samples/store-assignment-updates/_config.js
+++ b/test/runtime/samples/store-assignment-updates/_config.js
@@ -28,4 +28,4 @@ export default {
 			<p>doubled: 84</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-auto-subscribe-event-callback/_config.js b/test/runtime/samples/store-auto-subscribe-event-callback/_config.js
index 747ed3e4ad..7897036809 100644
--- a/test/runtime/samples/store-auto-subscribe-event-callback/_config.js
+++ b/test/runtime/samples/store-auto-subscribe-event-callback/_config.js
@@ -18,5 +18,5 @@ export default {
 		Dirty: true
 		Valid: true
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/store-auto-subscribe-immediate-multiple-vars/_config.js b/test/runtime/samples/store-auto-subscribe-immediate-multiple-vars/_config.js
index 9cfd765cde..fdaa951666 100644
--- a/test/runtime/samples/store-auto-subscribe-immediate-multiple-vars/_config.js
+++ b/test/runtime/samples/store-auto-subscribe-immediate-multiple-vars/_config.js
@@ -6,4 +6,4 @@ export default {
 	async test({ assert, component }) {
 		assert.equal(component.initial_foo, 42);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-auto-subscribe-immediate/_config.js b/test/runtime/samples/store-auto-subscribe-immediate/_config.js
index 9cfd765cde..fdaa951666 100644
--- a/test/runtime/samples/store-auto-subscribe-immediate/_config.js
+++ b/test/runtime/samples/store-auto-subscribe-immediate/_config.js
@@ -6,4 +6,4 @@ export default {
 	async test({ assert, component }) {
 		assert.equal(component.initial_foo, 42);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-auto-subscribe-implicit/_config.js b/test/runtime/samples/store-auto-subscribe-implicit/_config.js
index eca1f314ff..f132901bf0 100644
--- a/test/runtime/samples/store-auto-subscribe-implicit/_config.js
+++ b/test/runtime/samples/store-auto-subscribe-implicit/_config.js
@@ -25,4 +25,4 @@ export default {
 			<button>count 42</button>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-auto-subscribe-in-each/_config.js b/test/runtime/samples/store-auto-subscribe-in-each/_config.js
index a49dbab85c..8c8fa001d8 100644
--- a/test/runtime/samples/store-auto-subscribe-in-each/_config.js
+++ b/test/runtime/samples/store-auto-subscribe-in-each/_config.js
@@ -37,4 +37,4 @@ export default {
 			<button>c</button>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-auto-subscribe-in-reactive-declaration/_config.js b/test/runtime/samples/store-auto-subscribe-in-reactive-declaration/_config.js
index 2240425d91..cf1bdce68a 100644
--- a/test/runtime/samples/store-auto-subscribe-in-reactive-declaration/_config.js
+++ b/test/runtime/samples/store-auto-subscribe-in-reactive-declaration/_config.js
@@ -25,4 +25,4 @@ export default {
 			<button>double 84</button>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-auto-subscribe-in-script/_config.js b/test/runtime/samples/store-auto-subscribe-in-script/_config.js
index cfd4475240..7ea7eac87b 100644
--- a/test/runtime/samples/store-auto-subscribe-in-script/_config.js
+++ b/test/runtime/samples/store-auto-subscribe-in-script/_config.js
@@ -23,4 +23,4 @@ export default {
 		await count.set(42);
 		assert.equal(component.get_count(), 42);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-auto-subscribe-missing-global-script/_config.js b/test/runtime/samples/store-auto-subscribe-missing-global-script/_config.js
index c4eb72b553..f3df26c0de 100644
--- a/test/runtime/samples/store-auto-subscribe-missing-global-script/_config.js
+++ b/test/runtime/samples/store-auto-subscribe-missing-global-script/_config.js
@@ -1,3 +1,3 @@
 export default {
 	error: 'missingGlobal is not defined'
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-auto-subscribe-missing-global-template/_config.js b/test/runtime/samples/store-auto-subscribe-missing-global-template/_config.js
index c4eb72b553..f3df26c0de 100644
--- a/test/runtime/samples/store-auto-subscribe-missing-global-template/_config.js
+++ b/test/runtime/samples/store-auto-subscribe-missing-global-template/_config.js
@@ -1,3 +1,3 @@
 export default {
 	error: 'missingGlobal is not defined'
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-auto-subscribe/_config.js b/test/runtime/samples/store-auto-subscribe/_config.js
index eca1f314ff..f132901bf0 100644
--- a/test/runtime/samples/store-auto-subscribe/_config.js
+++ b/test/runtime/samples/store-auto-subscribe/_config.js
@@ -25,4 +25,4 @@ export default {
 			<button>count 42</button>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-contextual/_config.js b/test/runtime/samples/store-contextual/_config.js
index e06332a233..2a4f8fef8d 100644
--- a/test/runtime/samples/store-contextual/_config.js
+++ b/test/runtime/samples/store-contextual/_config.js
@@ -7,7 +7,7 @@ const todos = [
 ];
 
 export default {
-	error: `Stores must be declared at the top level of the component (this may change in a future version of Svelte)`,
+	error: 'Stores must be declared at the top level of the component (this may change in a future version of Svelte)',
 
 	props: {
 		todos
@@ -73,4 +73,4 @@ export default {
 			</label>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-dev-mode-error/_config.js b/test/runtime/samples/store-dev-mode-error/_config.js
index 70b24337fd..74f4189c36 100644
--- a/test/runtime/samples/store-dev-mode-error/_config.js
+++ b/test/runtime/samples/store-dev-mode-error/_config.js
@@ -7,5 +7,5 @@ export default {
 		count: 0
 	},
 
-	error: `'count' is not a store with a 'subscribe' method`
-};
\ No newline at end of file
+	error: "'count' is not a store with a 'subscribe' method"
+};
diff --git a/test/runtime/samples/store-each-binding-deep/_config.js b/test/runtime/samples/store-each-binding-deep/_config.js
new file mode 100644
index 0000000000..c5f2402ae2
--- /dev/null
+++ b/test/runtime/samples/store-each-binding-deep/_config.js
@@ -0,0 +1,14 @@
+export default {
+	async test({ assert, target, window }) {
+		const input = target.querySelector('input');
+
+		const event = new window.Event('input');
+		input.value = 'changed';
+		await input.dispatchEvent(event);
+
+		assert.htmlEqual(target.innerHTML, `
+			<input>
+			<p>changed</p>
+		`);
+	}
+};
diff --git a/test/runtime/samples/store-each-binding-deep/main.svelte b/test/runtime/samples/store-each-binding-deep/main.svelte
new file mode 100644
index 0000000000..8f1cabf5b8
--- /dev/null
+++ b/test/runtime/samples/store-each-binding-deep/main.svelte
@@ -0,0 +1,11 @@
+<script>
+	import { writable } from 'svelte/store';
+
+	let itemStore = writable({prop: {things: [{name: "item store"}]}});
+</script>
+
+{#each $itemStore.prop.things as thing }
+	<input bind:value={thing.name} >
+{/each}
+
+<p>{$itemStore.prop.things[0].name}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/store-each-binding-destructuring/_config.js b/test/runtime/samples/store-each-binding-destructuring/_config.js
index 70776940dd..c5f2402ae2 100644
--- a/test/runtime/samples/store-each-binding-destructuring/_config.js
+++ b/test/runtime/samples/store-each-binding-destructuring/_config.js
@@ -11,4 +11,4 @@ export default {
 			<p>changed</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-each-binding/_config.js b/test/runtime/samples/store-each-binding/_config.js
index 70776940dd..c5f2402ae2 100644
--- a/test/runtime/samples/store-each-binding/_config.js
+++ b/test/runtime/samples/store-each-binding/_config.js
@@ -11,4 +11,4 @@ export default {
 			<p>changed</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-imported-module-b/_config.js b/test/runtime/samples/store-imported-module-b/_config.js
index 8f75dcc493..f3c168e4c1 100644
--- a/test/runtime/samples/store-imported-module-b/_config.js
+++ b/test/runtime/samples/store-imported-module-b/_config.js
@@ -1,3 +1,3 @@
 export default {
-	error: `Cannot reference store value inside <script context="module">`
-};
\ No newline at end of file
+	error: 'Cannot reference store value inside <script context="module">'
+};
diff --git a/test/runtime/samples/store-imported-module-b/foo.js b/test/runtime/samples/store-imported-module-b/foo.js
index 5d15213c3a..72d8e95cb1 100644
--- a/test/runtime/samples/store-imported-module-b/foo.js
+++ b/test/runtime/samples/store-imported-module-b/foo.js
@@ -1,3 +1,3 @@
 import { writable } from '../../../../store';
 
-export default writable(42);
\ No newline at end of file
+export default writable(42);
diff --git a/test/runtime/samples/store-imported-module/_config.js b/test/runtime/samples/store-imported-module/_config.js
index c2d471a329..42605d128c 100644
--- a/test/runtime/samples/store-imported-module/_config.js
+++ b/test/runtime/samples/store-imported-module/_config.js
@@ -2,4 +2,4 @@ export default {
 	html: `
 		<p>42</p>
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-imported-module/foo.js b/test/runtime/samples/store-imported-module/foo.js
index 5d15213c3a..72d8e95cb1 100644
--- a/test/runtime/samples/store-imported-module/foo.js
+++ b/test/runtime/samples/store-imported-module/foo.js
@@ -1,3 +1,3 @@
 import { writable } from '../../../../store';
 
-export default writable(42);
\ No newline at end of file
+export default writable(42);
diff --git a/test/runtime/samples/store-imported/_config.js b/test/runtime/samples/store-imported/_config.js
index 251866e5ba..ca03c73b84 100644
--- a/test/runtime/samples/store-imported/_config.js
+++ b/test/runtime/samples/store-imported/_config.js
@@ -4,4 +4,4 @@ export default {
 	html: `
 		<p>42</p>
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-imported/foo.js b/test/runtime/samples/store-imported/foo.js
index 5d15213c3a..72d8e95cb1 100644
--- a/test/runtime/samples/store-imported/foo.js
+++ b/test/runtime/samples/store-imported/foo.js
@@ -1,3 +1,3 @@
 import { writable } from '../../../../store';
 
-export default writable(42);
\ No newline at end of file
+export default writable(42);
diff --git a/test/runtime/samples/store-imports-hoisted/_config.js b/test/runtime/samples/store-imports-hoisted/_config.js
index 251866e5ba..ca03c73b84 100644
--- a/test/runtime/samples/store-imports-hoisted/_config.js
+++ b/test/runtime/samples/store-imports-hoisted/_config.js
@@ -4,4 +4,4 @@ export default {
 	html: `
 		<p>42</p>
 	`
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-imports-hoisted/foo.js b/test/runtime/samples/store-imports-hoisted/foo.js
index 5d15213c3a..72d8e95cb1 100644
--- a/test/runtime/samples/store-imports-hoisted/foo.js
+++ b/test/runtime/samples/store-imports-hoisted/foo.js
@@ -1,3 +1,3 @@
 import { writable } from '../../../../store';
 
-export default writable(42);
\ No newline at end of file
+export default writable(42);
diff --git a/test/runtime/samples/store-increment-updates-reactive/_config.js b/test/runtime/samples/store-increment-updates-reactive/_config.js
index f919d724f8..04bf79d3a3 100644
--- a/test/runtime/samples/store-increment-updates-reactive/_config.js
+++ b/test/runtime/samples/store-increment-updates-reactive/_config.js
@@ -1,8 +1,8 @@
 export default {
-	html: `0`,
+	html: '0',
 
 	async test({ assert, component, target }) {
 		await component.increment();
-		assert.htmlEqual(target.innerHTML, `1`);
+		assert.htmlEqual(target.innerHTML, '1');
 	}
 };
diff --git a/test/runtime/samples/store-invalidation-while-update-1/_config.js b/test/runtime/samples/store-invalidation-while-update-1/_config.js
index d0361d2d23..6a931afeaf 100644
--- a/test/runtime/samples/store-invalidation-while-update-1/_config.js
+++ b/test/runtime/samples/store-invalidation-while-update-1/_config.js
@@ -41,4 +41,4 @@ export default {
 		<button>click me</button>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-invalidation-while-update-2/_config.js b/test/runtime/samples/store-invalidation-while-update-2/_config.js
index 422034bc11..6c2538e564 100644
--- a/test/runtime/samples/store-invalidation-while-update-2/_config.js
+++ b/test/runtime/samples/store-invalidation-while-update-2/_config.js
@@ -41,4 +41,4 @@ export default {
 		<button>click me</button>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-prevent-user-declarations/_config.js b/test/runtime/samples/store-prevent-user-declarations/_config.js
index ec099380e8..d79ced4e38 100644
--- a/test/runtime/samples/store-prevent-user-declarations/_config.js
+++ b/test/runtime/samples/store-prevent-user-declarations/_config.js
@@ -5,5 +5,5 @@ export default {
 		count: writable(0)
 	},
 
-	error: `The $ prefix is reserved, and cannot be used for variable and import names`
-};
\ No newline at end of file
+	error: 'The $ prefix is reserved, and cannot be used for variable and import names'
+};
diff --git a/test/runtime/samples/store-resubscribe-b/_config.js b/test/runtime/samples/store-resubscribe-b/_config.js
index d043bbcd87..b097a46716 100644
--- a/test/runtime/samples/store-resubscribe-b/_config.js
+++ b/test/runtime/samples/store-resubscribe-b/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `42`,
+	html: '42'
 };
diff --git a/test/runtime/samples/store-resubscribe-c/_config.js b/test/runtime/samples/store-resubscribe-c/_config.js
new file mode 100644
index 0000000000..756e39bcb0
--- /dev/null
+++ b/test/runtime/samples/store-resubscribe-c/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: '31 42'
+};
diff --git a/test/runtime/samples/store-resubscribe-c/main.svelte b/test/runtime/samples/store-resubscribe-c/main.svelte
new file mode 100644
index 0000000000..c52a5402bd
--- /dev/null
+++ b/test/runtime/samples/store-resubscribe-c/main.svelte
@@ -0,0 +1,16 @@
+<script>
+	import { writable } from 'svelte/store';
+	const context = {
+		store1: writable(31),
+		store2: writable(42)
+	};
+	let store1;
+	let store2;
+	({
+		store1,
+		store2
+	} = context);
+</script>
+
+{$store1}
+{$store2}
diff --git a/test/runtime/samples/store-resubscribe-export/_config.js b/test/runtime/samples/store-resubscribe-export/_config.js
index b6e6f11344..f6630aa045 100644
--- a/test/runtime/samples/store-resubscribe-export/_config.js
+++ b/test/runtime/samples/store-resubscribe-export/_config.js
@@ -1,19 +1,19 @@
-let subscribeCalled = false;
+let unsubscribeCalled = false;
 
 const fakeStore = val => ({
 	subscribe: cb => {
 		cb(val);
 		return {
 			unsubscribe: () => {
-				subscribeCalled = true;
-			},
+				unsubscribeCalled = true;
+			}
 		};
-	},
+	}
 });
 
 export default {
 	props: {
-		foo: fakeStore(1),
+		foo: fakeStore(1)
 	},
 	html: `
 		<h1>1</h1>
@@ -22,6 +22,8 @@ export default {
 	async test({ assert, component, target }) {
 		component.foo = fakeStore(5);
 
-		return assert.htmlEqual(target.innerHTML, `<h1>5</h1>`);
-	},
+		assert.htmlEqual(target.innerHTML, '<h1>5</h1>');
+
+		assert.ok(unsubscribeCalled);
+	}
 };
diff --git a/test/runtime/samples/store-resubscribe-observable/_config.js b/test/runtime/samples/store-resubscribe-observable/_config.js
index d043bbcd87..b097a46716 100644
--- a/test/runtime/samples/store-resubscribe-observable/_config.js
+++ b/test/runtime/samples/store-resubscribe-observable/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `42`,
+	html: '42'
 };
diff --git a/test/runtime/samples/store-resubscribe/_config.js b/test/runtime/samples/store-resubscribe/_config.js
index 6bde764a55..82d40f9add 100644
--- a/test/runtime/samples/store-resubscribe/_config.js
+++ b/test/runtime/samples/store-resubscribe/_config.js
@@ -33,4 +33,4 @@ export default {
 			<button>reset</button>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/store-shadow-scope/_config.js b/test/runtime/samples/store-shadow-scope/_config.js
index e2d6fc7808..a197325a2d 100644
--- a/test/runtime/samples/store-shadow-scope/_config.js
+++ b/test/runtime/samples/store-shadow-scope/_config.js
@@ -1,3 +1,3 @@
 export default {
-	error: `Stores must be declared at the top level of the component (this may change in a future version of Svelte)`
+	error: 'Stores must be declared at the top level of the component (this may change in a future version of Svelte)'
 };
diff --git a/test/runtime/samples/store-template-expression-scope/_config.js b/test/runtime/samples/store-template-expression-scope/_config.js
index e2d6fc7808..a197325a2d 100644
--- a/test/runtime/samples/store-template-expression-scope/_config.js
+++ b/test/runtime/samples/store-template-expression-scope/_config.js
@@ -1,3 +1,3 @@
 export default {
-	error: `Stores must be declared at the top level of the component (this may change in a future version of Svelte)`
+	error: 'Stores must be declared at the top level of the component (this may change in a future version of Svelte)'
 };
diff --git a/test/runtime/samples/store-unreferenced/_config.js b/test/runtime/samples/store-unreferenced/_config.js
index 0695edf8dc..e15f202492 100644
--- a/test/runtime/samples/store-unreferenced/_config.js
+++ b/test/runtime/samples/store-unreferenced/_config.js
@@ -1,12 +1,12 @@
 import { count } from './store.js';
 
 export default {
-	html: `<p>count: 0</p>`,
+	html: '<p>count: 0</p>',
 
 	async test({ assert, component, target }) {
 		await component.increment();
 
-		assert.htmlEqual(target.innerHTML, `<p>count: 1</p>`);
+		assert.htmlEqual(target.innerHTML, '<p>count: 1</p>');
 
 		count.set(0);
 	}
diff --git a/test/runtime/samples/store-unreferenced/store.js b/test/runtime/samples/store-unreferenced/store.js
index 99e27e5584..b799c0ffc4 100644
--- a/test/runtime/samples/store-unreferenced/store.js
+++ b/test/runtime/samples/store-unreferenced/store.js
@@ -1,3 +1,3 @@
 import { writable } from '../../../../store';
 
-export const count = writable(0);
\ No newline at end of file
+export const count = writable(0);
diff --git a/test/runtime/samples/svg-child-component-declared-namespace-shorthand/_config.js b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/_config.js
index e7f8397390..a3676db286 100644
--- a/test/runtime/samples/svg-child-component-declared-namespace-shorthand/_config.js
+++ b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/_config.js
@@ -6,7 +6,7 @@ export default {
 		height: 100
 	},
 
-	html: `<svg><rect x="0" y="0" width="100" height="100"></rect></svg>`,
+	html: '<svg><rect x="0" y="0" width="100" height="100"></rect></svg>',
 
 	test({ assert, component, target }) {
 		const svg = target.querySelector( 'svg' );
@@ -17,6 +17,6 @@ export default {
 
 		component.width = 150;
 		component.height = 50;
-		assert.equal( target.innerHTML, `<svg><rect x="0" y="0" width="150" height="50"></rect></svg>` );
+		assert.equal( target.innerHTML, '<svg><rect x="0" y="0" width="150" height="50"></rect></svg>' );
 	}
 };
diff --git a/test/runtime/samples/svg-child-component-declared-namespace/_config.js b/test/runtime/samples/svg-child-component-declared-namespace/_config.js
index e7f8397390..a3676db286 100644
--- a/test/runtime/samples/svg-child-component-declared-namespace/_config.js
+++ b/test/runtime/samples/svg-child-component-declared-namespace/_config.js
@@ -6,7 +6,7 @@ export default {
 		height: 100
 	},
 
-	html: `<svg><rect x="0" y="0" width="100" height="100"></rect></svg>`,
+	html: '<svg><rect x="0" y="0" width="100" height="100"></rect></svg>',
 
 	test({ assert, component, target }) {
 		const svg = target.querySelector( 'svg' );
@@ -17,6 +17,6 @@ export default {
 
 		component.width = 150;
 		component.height = 50;
-		assert.equal( target.innerHTML, `<svg><rect x="0" y="0" width="150" height="50"></rect></svg>` );
+		assert.equal( target.innerHTML, '<svg><rect x="0" y="0" width="150" height="50"></rect></svg>' );
 	}
 };
diff --git a/test/runtime/samples/svg-class/_config.js b/test/runtime/samples/svg-class/_config.js
index 3bb353cf58..36f5d06b1c 100644
--- a/test/runtime/samples/svg-class/_config.js
+++ b/test/runtime/samples/svg-class/_config.js
@@ -1,7 +1,7 @@
 // this looks like another JSDOM quirk — svg.className = 'foo' behaves
 // differently from browsers. So this test succeeds even when it should fail
 export default {
-	html: `<svg class='foo'></svg>`,
+	html: "<svg class='foo'></svg>",
 
 	test({ assert, component, target }) {
 		const svg = target.querySelector('svg');
diff --git a/test/runtime/samples/svg-tspan-preserve-space/_config.js b/test/runtime/samples/svg-tspan-preserve-space/_config.js
index 283af0a2b0..1042ba1821 100644
--- a/test/runtime/samples/svg-tspan-preserve-space/_config.js
+++ b/test/runtime/samples/svg-tspan-preserve-space/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<svg><text x=0 y=50><tspan>foo</tspan> bar<tspan>foo</tspan> bar</text></svg>`,
+	html: '<svg><text x=0 y=50><tspan>foo</tspan> bar<tspan>foo</tspan> bar</text></svg>'
 };
diff --git a/test/runtime/samples/svg-xmlns/_config.js b/test/runtime/samples/svg-xmlns/_config.js
index daf6ef03e4..5cec8da04a 100644
--- a/test/runtime/samples/svg-xmlns/_config.js
+++ b/test/runtime/samples/svg-xmlns/_config.js
@@ -8,7 +8,7 @@ export default {
 		height: 100
 	},
 
-	html: `<svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"></rect></svg>`,
+	html: '<svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"></rect></svg>',
 
 	test({ assert, component, target }) {
 		const svg = target.querySelector( 'svg' );
@@ -19,6 +19,6 @@ export default {
 
 		component.width = 150;
 		component.height = 50;
-		assert.equal( target.innerHTML, `<svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="150" height="50"></rect></svg>` );
+		assert.equal( target.innerHTML, '<svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="150" height="50"></rect></svg>' );
 	}
 };
diff --git a/test/runtime/samples/svg/_config.js b/test/runtime/samples/svg/_config.js
index e7f8397390..a3676db286 100644
--- a/test/runtime/samples/svg/_config.js
+++ b/test/runtime/samples/svg/_config.js
@@ -6,7 +6,7 @@ export default {
 		height: 100
 	},
 
-	html: `<svg><rect x="0" y="0" width="100" height="100"></rect></svg>`,
+	html: '<svg><rect x="0" y="0" width="100" height="100"></rect></svg>',
 
 	test({ assert, component, target }) {
 		const svg = target.querySelector( 'svg' );
@@ -17,6 +17,6 @@ export default {
 
 		component.width = 150;
 		component.height = 50;
-		assert.equal( target.innerHTML, `<svg><rect x="0" y="0" width="150" height="50"></rect></svg>` );
+		assert.equal( target.innerHTML, '<svg><rect x="0" y="0" width="150" height="50"></rect></svg>' );
 	}
 };
diff --git a/test/runtime/samples/template/_config.js b/test/runtime/samples/template/_config.js
index ccc04a1c91..fd9bb3af67 100644
--- a/test/runtime/samples/template/_config.js
+++ b/test/runtime/samples/template/_config.js
@@ -20,4 +20,4 @@ export default {
 			<div>foo</div>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/textarea-children/_config.js b/test/runtime/samples/textarea-children/_config.js
index 8f46370b07..f80b66df1f 100644
--- a/test/runtime/samples/textarea-children/_config.js
+++ b/test/runtime/samples/textarea-children/_config.js
@@ -5,13 +5,13 @@ export default {
 		foo: 42
 	},
 
-	html: `<textarea></textarea>`,
+	html: '<textarea></textarea>',
 
 	test({ assert, component, target }) {
 		const textarea = target.querySelector( 'textarea' );
-		assert.strictEqual( textarea.value, `\n\t<p>not actually an element. 42</p>\n` );
+		assert.strictEqual( textarea.value, '\n\t<p>not actually an element. 42</p>\n' );
 
 		component.foo = 43;
-		assert.strictEqual( textarea.value, `\n\t<p>not actually an element. 43</p>\n` );
+		assert.strictEqual( textarea.value, '\n\t<p>not actually an element. 43</p>\n' );
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/textarea-value/_config.js b/test/runtime/samples/textarea-value/_config.js
index 412754b51f..93079e5928 100644
--- a/test/runtime/samples/textarea-value/_config.js
+++ b/test/runtime/samples/textarea-value/_config.js
@@ -5,7 +5,7 @@ export default {
 		foo: 42
 	},
 
-	html: `<textarea></textarea>`,
+	html: '<textarea></textarea>',
 
 	test({ assert, component, target }) {
 		const textarea = target.querySelector( 'textarea' );
@@ -14,4 +14,4 @@ export default {
 		component.foo = 43;
 		assert.strictEqual( textarea.value, '43' );
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/this-in-function-expressions/_config.js b/test/runtime/samples/this-in-function-expressions/_config.js
index 4110d05a48..57f23a472b 100644
--- a/test/runtime/samples/this-in-function-expressions/_config.js
+++ b/test/runtime/samples/this-in-function-expressions/_config.js
@@ -1,10 +1,10 @@
 export default {
-	async test({ assert, component, target, window, raf }) {
-		const [_, btn] = target.querySelectorAll("button");
-		const clickEvent = new window.MouseEvent("click");
+	async test({ assert, target, window }) {
+		const [, btn] = target.querySelectorAll('button');
+		const clickEvent = new window.MouseEvent('click');
 
 		await btn.dispatchEvent(clickEvent);
 
 		assert.equal(btn.x, 1);
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-css-deferred-removal/_config.js b/test/runtime/samples/transition-css-deferred-removal/_config.js
index cd9dbfeb73..763f004835 100644
--- a/test/runtime/samples/transition-css-deferred-removal/_config.js
+++ b/test/runtime/samples/transition-css-deferred-removal/_config.js
@@ -20,5 +20,5 @@ export default {
 			outer.style.animation,
 			inner.style.animation
 		], animations);
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-css-duration/_config.js b/test/runtime/samples/transition-css-duration/_config.js
index 28a78944bb..a448c3f164 100644
--- a/test/runtime/samples/transition-css-duration/_config.js
+++ b/test/runtime/samples/transition-css-duration/_config.js
@@ -9,5 +9,5 @@ export default {
 
 		raf.tick(26);
 		assert.ok(~div.style.animation.indexOf('25ms'));
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-css-iframe/_config.js b/test/runtime/samples/transition-css-iframe/_config.js
index 507efe44f4..612ee8e5ba 100644
--- a/test/runtime/samples/transition-css-iframe/_config.js
+++ b/test/runtime/samples/transition-css-iframe/_config.js
@@ -14,5 +14,5 @@ export default {
 
 		raf.tick(26);
 		assert.ok(~div.style.animation.indexOf('25ms'));
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-css-in-out-in/_config.js b/test/runtime/samples/transition-css-in-out-in/_config.js
index 10719280e9..cd7ae14ce8 100644
--- a/test/runtime/samples/transition-css-in-out-in/_config.js
+++ b/test/runtime/samples/transition-css-in-out-in/_config.js
@@ -3,18 +3,18 @@ export default {
 		component.visible = true;
 		const div = target.querySelector('div');
 
-		assert.equal(div.style.animation, `__svelte_3809512021_0 100ms linear 0ms 1 both`);
+		assert.equal(div.style.animation, '__svelte_3809512021_0 100ms linear 0ms 1 both');
 
 		raf.tick(50);
 		component.visible = false;
 
 		// both in and out styles
-		assert.equal(div.style.animation, `__svelte_3809512021_0 100ms linear 0ms 1 both, __svelte_3750847757_0 100ms linear 0ms 1 both`);
+		assert.equal(div.style.animation, '__svelte_3809512021_0 100ms linear 0ms 1 both, __svelte_3750847757_0 100ms linear 0ms 1 both');
 
 		raf.tick(75);
 		component.visible = true;
 
 		// reset original styles
-		assert.equal(div.style.animation, `__svelte_3809512021_1 100ms linear 0ms 1 both`);
-	},
+		assert.equal(div.style.animation, '__svelte_3809512021_1 100ms linear 0ms 1 both');
+	}
 };
diff --git a/test/runtime/samples/transition-js-aborted-outro-in-each/_config.js b/test/runtime/samples/transition-js-aborted-outro-in-each/_config.js
index e78862e86c..75843d624e 100644
--- a/test/runtime/samples/transition-js-aborted-outro-in-each/_config.js
+++ b/test/runtime/samples/transition-js-aborted-outro-in-each/_config.js
@@ -35,5 +35,5 @@ export default {
 		assert.equal(spans[0].foo, 1);
 		assert.equal(spans[1].foo, 1);
 		assert.equal(spans[2].foo, 1);
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-aborted-outro/_config.js b/test/runtime/samples/transition-js-aborted-outro/_config.js
index d61407e1bd..7ecc212739 100644
--- a/test/runtime/samples/transition-js-aborted-outro/_config.js
+++ b/test/runtime/samples/transition-js-aborted-outro/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		visible: true,
+		visible: true
 	},
 
 	test({ assert, component, target, raf }) {
@@ -20,5 +20,5 @@ export default {
 		assert.htmlEqual(target.innerHTML, `
 			<span>hello</span>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-args-dynamic/_config.js b/test/runtime/samples/transition-js-args-dynamic/_config.js
new file mode 100644
index 0000000000..513a17486a
--- /dev/null
+++ b/test/runtime/samples/transition-js-args-dynamic/_config.js
@@ -0,0 +1,15 @@
+export default {
+	test({ assert, component, target, window, raf }) {
+		component.visible = true;
+
+		const div = target.querySelector('div');
+
+		assert.equal(div.value, 0);
+
+		raf.tick(200);
+
+		div.value = 'test';
+		component.visible = false;
+		assert.equal(div.value, 'test');
+	}
+};
diff --git a/test/runtime/samples/transition-js-args-dynamic/main.svelte b/test/runtime/samples/transition-js-args-dynamic/main.svelte
new file mode 100644
index 0000000000..1bb149de32
--- /dev/null
+++ b/test/runtime/samples/transition-js-args-dynamic/main.svelte
@@ -0,0 +1,17 @@
+<script>
+	export let visible = false;
+	export let value = 0;
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: () => {
+				node.value = value;
+			}
+		};
+	}
+</script>
+
+{#if visible}
+	<div transition:foo={{value}}></div>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-await-block/_config.js b/test/runtime/samples/transition-js-await-block/_config.js
index 80546ae6b8..696a2dd5d4 100644
--- a/test/runtime/samples/transition-js-await-block/_config.js
+++ b/test/runtime/samples/transition-js-await-block/_config.js
@@ -1,9 +1,7 @@
 let fulfil;
-let reject;
 
-const promise = new Promise((f, r) => {
+const promise = new Promise((f) => {
 	fulfil = f;
-	reject = r;
 });
 
 export default {
diff --git a/test/runtime/samples/transition-js-deferred-b/_config.js b/test/runtime/samples/transition-js-deferred-b/_config.js
index 05929964cd..031943f6e3 100644
--- a/test/runtime/samples/transition-js-deferred-b/_config.js
+++ b/test/runtime/samples/transition-js-deferred-b/_config.js
@@ -9,5 +9,5 @@ export default {
 			raf.tick(50);
 			assert.equal(div.foo, 0.5);
 		});
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-deferred/_config.js b/test/runtime/samples/transition-js-deferred/_config.js
index 9d6833d2f4..9e4c0e82bb 100644
--- a/test/runtime/samples/transition-js-deferred/_config.js
+++ b/test/runtime/samples/transition-js-deferred/_config.js
@@ -9,5 +9,5 @@ export default {
 			raf.tick(50);
 			assert.equal(div.foo, 0.5);
 		});
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-delay-in-out/_config.js b/test/runtime/samples/transition-js-delay-in-out/_config.js
index fb77fca015..bb00604dd9 100644
--- a/test/runtime/samples/transition-js-delay-in-out/_config.js
+++ b/test/runtime/samples/transition-js-delay-in-out/_config.js
@@ -19,4 +19,4 @@ export default {
 		raf.tick(300);
 		assert.equal(div.bar, 0);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-delay/_config.js b/test/runtime/samples/transition-js-delay/_config.js
index a0613737b2..4567573661 100644
--- a/test/runtime/samples/transition-js-delay/_config.js
+++ b/test/runtime/samples/transition-js-delay/_config.js
@@ -24,4 +24,4 @@ export default {
 		raf.tick(250);
 		assert.equal(div.foo, 0);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-destroyed-before-end/_config.js b/test/runtime/samples/transition-js-destroyed-before-end/_config.js
index 7cedf8519a..59615bd7a5 100644
--- a/test/runtime/samples/transition-js-destroyed-before-end/_config.js
+++ b/test/runtime/samples/transition-js-destroyed-before-end/_config.js
@@ -13,5 +13,5 @@ export default {
 		component.$destroy();
 
 		raf.tick(100);
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-dynamic-component/_config.js b/test/runtime/samples/transition-js-dynamic-component/_config.js
index c7affda071..e8104a67e5 100644
--- a/test/runtime/samples/transition-js-dynamic-component/_config.js
+++ b/test/runtime/samples/transition-js-dynamic-component/_config.js
@@ -1,6 +1,6 @@
 export default {
 	props: {
-		x: true,
+		x: true
 	},
 
 	html: `
@@ -31,4 +31,4 @@ export default {
 			<div>b</div>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-dynamic-if-block-bidi/_config.js b/test/runtime/samples/transition-js-dynamic-if-block-bidi/_config.js
index aa0bd9e1aa..95fe7b01f3 100644
--- a/test/runtime/samples/transition-js-dynamic-if-block-bidi/_config.js
+++ b/test/runtime/samples/transition-js-dynamic-if-block-bidi/_config.js
@@ -33,4 +33,4 @@ export default {
 
 		raf.tick(225);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-each-block-intro-outro/_config.js b/test/runtime/samples/transition-js-each-block-intro-outro/_config.js
index 3a764c5612..9b83a1a1d3 100644
--- a/test/runtime/samples/transition-js-each-block-intro-outro/_config.js
+++ b/test/runtime/samples/transition-js-each-block-intro-outro/_config.js
@@ -38,4 +38,4 @@ export default {
 		assert.equal(divs[1].bar, 1);
 		assert.equal(divs[2].bar, 1);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-each-block-intro/_config.js b/test/runtime/samples/transition-js-each-block-intro/_config.js
index 3d143ea514..42d69665cf 100644
--- a/test/runtime/samples/transition-js-each-block-intro/_config.js
+++ b/test/runtime/samples/transition-js-each-block-intro/_config.js
@@ -29,4 +29,4 @@ export default {
 		assert.equal(divs[2].foo, 0.75);
 		assert.equal(divs[3].foo, 0.25);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-each-block-keyed-intro-outro/_config.js b/test/runtime/samples/transition-js-each-block-keyed-intro-outro/_config.js
index 083752cbd9..9927289ee5 100644
--- a/test/runtime/samples/transition-js-each-block-keyed-intro-outro/_config.js
+++ b/test/runtime/samples/transition-js-each-block-keyed-intro-outro/_config.js
@@ -60,4 +60,4 @@ export default {
 		assert.equal(divs[1].foo, 1);
 		assert.equal(divs[2].foo, 1);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-each-block-keyed-intro/_config.js b/test/runtime/samples/transition-js-each-block-keyed-intro/_config.js
index 5886cc5c6f..c37cb8101d 100644
--- a/test/runtime/samples/transition-js-each-block-keyed-intro/_config.js
+++ b/test/runtime/samples/transition-js-each-block-keyed-intro/_config.js
@@ -44,4 +44,4 @@ export default {
 		assert.equal(divs[2].foo, 0.75);
 		assert.equal(divs[3].foo, 0.75);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-each-block-keyed-outro/_config.js b/test/runtime/samples/transition-js-each-block-keyed-outro/_config.js
index 03e8c147cb..1c98ec3198 100644
--- a/test/runtime/samples/transition-js-each-block-keyed-outro/_config.js
+++ b/test/runtime/samples/transition-js-each-block-keyed-outro/_config.js
@@ -25,4 +25,4 @@ export default {
 		assert.equal( divs[1].foo, 0.5 );
 		assert.equal( divs[2].foo, undefined );
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-each-block-outro/_config.js b/test/runtime/samples/transition-js-each-block-outro/_config.js
index f8d4410e99..e9a7644383 100644
--- a/test/runtime/samples/transition-js-each-block-outro/_config.js
+++ b/test/runtime/samples/transition-js-each-block-outro/_config.js
@@ -16,4 +16,4 @@ export default {
 		raf.tick( 100 );
 		assert.htmlEqual(target.innerHTML, '<div>a</div>');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-each-else-block-intro-outro/_config.js b/test/runtime/samples/transition-js-each-else-block-intro-outro/_config.js
index 13d0cf0b23..d51fdecb2e 100644
--- a/test/runtime/samples/transition-js-each-else-block-intro-outro/_config.js
+++ b/test/runtime/samples/transition-js-each-else-block-intro-outro/_config.js
@@ -51,4 +51,4 @@ export default {
 
 		raf.tick(2000);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-each-else-block-intro/_config.js b/test/runtime/samples/transition-js-each-else-block-intro/_config.js
index f061e312ff..dccfbd1a03 100644
--- a/test/runtime/samples/transition-js-each-else-block-intro/_config.js
+++ b/test/runtime/samples/transition-js-each-else-block-intro/_config.js
@@ -19,4 +19,4 @@ export default {
 
 		raf.tick(500);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-each-else-block-outro/_config.js b/test/runtime/samples/transition-js-each-else-block-outro/_config.js
index 863753b34a..163cbbd08d 100644
--- a/test/runtime/samples/transition-js-each-else-block-outro/_config.js
+++ b/test/runtime/samples/transition-js-each-else-block-outro/_config.js
@@ -17,4 +17,4 @@ export default {
 
 		raf.tick(500);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-each-keyed-unchanged/_config.js b/test/runtime/samples/transition-js-each-keyed-unchanged/_config.js
index b3a1882196..a36b1a4610 100644
--- a/test/runtime/samples/transition-js-each-keyed-unchanged/_config.js
+++ b/test/runtime/samples/transition-js-each-keyed-unchanged/_config.js
@@ -22,4 +22,4 @@ export default {
 		assert.equal(divs1[3].foo, undefined);
 		assert.equal(divs1[4].foo, undefined);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-each-unchanged/_config.js b/test/runtime/samples/transition-js-each-unchanged/_config.js
index 9bd2206211..671aa2af74 100644
--- a/test/runtime/samples/transition-js-each-unchanged/_config.js
+++ b/test/runtime/samples/transition-js-each-unchanged/_config.js
@@ -22,4 +22,4 @@ export default {
 		assert.equal(divs1[3].foo, undefined);
 		assert.equal(divs1[4].foo, undefined);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-events-in-out/_config.js b/test/runtime/samples/transition-js-events-in-out/_config.js
index 854e7e2f4b..588a4edbd7 100644
--- a/test/runtime/samples/transition-js-events-in-out/_config.js
+++ b/test/runtime/samples/transition-js-events-in-out/_config.js
@@ -68,4 +68,4 @@ export default {
 			<p>d</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-events/_config.js b/test/runtime/samples/transition-js-events/_config.js
index 00d83cb275..54b068dace 100644
--- a/test/runtime/samples/transition-js-events/_config.js
+++ b/test/runtime/samples/transition-js-events/_config.js
@@ -67,4 +67,4 @@ export default {
 			<p>d</p>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-if-block-bidi/_config.js b/test/runtime/samples/transition-js-if-block-bidi/_config.js
index a070f978e2..1587a92ad6 100644
--- a/test/runtime/samples/transition-js-if-block-bidi/_config.js
+++ b/test/runtime/samples/transition-js-if-block-bidi/_config.js
@@ -25,4 +25,4 @@ export default {
 
 		raf.tick(900);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/_config.js b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/_config.js
index 338586636b..fb885b0826 100644
--- a/test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/_config.js
+++ b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/_config.js
@@ -25,4 +25,4 @@ export default {
 			<div>4</div>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/_config.js b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/_config.js
index 04df38a09c..09511fe976 100644
--- a/test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/_config.js
+++ b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/_config.js
@@ -30,4 +30,4 @@ export default {
 			<div>5</div>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-if-block-in-each-block-bidi/_config.js b/test/runtime/samples/transition-js-if-block-in-each-block-bidi/_config.js
index 4c75e3ef06..712be980aa 100644
--- a/test/runtime/samples/transition-js-if-block-in-each-block-bidi/_config.js
+++ b/test/runtime/samples/transition-js-if-block-in-each-block-bidi/_config.js
@@ -42,4 +42,4 @@ export default {
 			<div>3</div>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-if-block-intro-outro/_config.js b/test/runtime/samples/transition-js-if-block-intro-outro/_config.js
index e6512c93ed..06f72653e4 100644
--- a/test/runtime/samples/transition-js-if-block-intro-outro/_config.js
+++ b/test/runtime/samples/transition-js-if-block-intro-outro/_config.js
@@ -41,4 +41,4 @@ export default {
 
 		raf.tick(2000);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-if-block-intro/_config.js b/test/runtime/samples/transition-js-if-block-intro/_config.js
index 93ef8391f5..8be3b718f8 100644
--- a/test/runtime/samples/transition-js-if-block-intro/_config.js
+++ b/test/runtime/samples/transition-js-if-block-intro/_config.js
@@ -12,4 +12,4 @@ export default {
 
 		raf.tick(500);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-if-block-outro-timeout/_config.js b/test/runtime/samples/transition-js-if-block-outro-timeout/_config.js
index 5c6e103a5a..3ead1ad6b4 100644
--- a/test/runtime/samples/transition-js-if-block-outro-timeout/_config.js
+++ b/test/runtime/samples/transition-js-if-block-outro-timeout/_config.js
@@ -16,4 +16,4 @@ export default {
 		assert.equal(component.div, undefined);
 		assert.equal(target.querySelector('div'), undefined);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-if-else-block-dynamic-outro/_config.js b/test/runtime/samples/transition-js-if-else-block-dynamic-outro/_config.js
index c15b3ac9c9..4985d39850 100644
--- a/test/runtime/samples/transition-js-if-else-block-dynamic-outro/_config.js
+++ b/test/runtime/samples/transition-js-if-else-block-dynamic-outro/_config.js
@@ -18,4 +18,4 @@ export default {
 
 		raf.tick(100);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-if-else-block-intro/_config.js b/test/runtime/samples/transition-js-if-else-block-intro/_config.js
index c5eccf50e5..1f3b6fd118 100644
--- a/test/runtime/samples/transition-js-if-else-block-intro/_config.js
+++ b/test/runtime/samples/transition-js-if-else-block-intro/_config.js
@@ -18,4 +18,4 @@ export default {
 
 		raf.tick(1000);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-if-else-block-outro/_config.js b/test/runtime/samples/transition-js-if-else-block-outro/_config.js
index 4332ce82aa..1dc5af8f6c 100644
--- a/test/runtime/samples/transition-js-if-else-block-outro/_config.js
+++ b/test/runtime/samples/transition-js-if-else-block-outro/_config.js
@@ -14,4 +14,4 @@ export default {
 
 		raf.tick(100);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-if-elseif-block-outro/_config.js b/test/runtime/samples/transition-js-if-elseif-block-outro/_config.js
index f8886f889d..b11f33e7c1 100644
--- a/test/runtime/samples/transition-js-if-elseif-block-outro/_config.js
+++ b/test/runtime/samples/transition-js-if-elseif-block-outro/_config.js
@@ -20,4 +20,4 @@ export default {
 
 		raf.tick(100);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-if-outro-unrelated-component-binding-update/_config.js b/test/runtime/samples/transition-js-if-outro-unrelated-component-binding-update/_config.js
index 8a6269ad60..3f1b714a7c 100644
--- a/test/runtime/samples/transition-js-if-outro-unrelated-component-binding-update/_config.js
+++ b/test/runtime/samples/transition-js-if-outro-unrelated-component-binding-update/_config.js
@@ -1,9 +1,9 @@
 export default {
 	async test({ assert, target, window, raf }) {
-		const button = target.querySelector("button");
-		const event = new window.MouseEvent("click");
+		const button = target.querySelector('button');
+		const event = new window.MouseEvent('click');
 		await button.dispatchEvent(event);
 		raf.tick(500);
-		assert.htmlEqual(target.innerHTML, "");
-	},
+		assert.htmlEqual(target.innerHTML, '');
+	}
 };
diff --git a/test/runtime/samples/transition-js-if-outro-unrelated-component-store-update/_config.js b/test/runtime/samples/transition-js-if-outro-unrelated-component-store-update/_config.js
index 41d28fabf0..beea5d4a77 100644
--- a/test/runtime/samples/transition-js-if-outro-unrelated-component-store-update/_config.js
+++ b/test/runtime/samples/transition-js-if-outro-unrelated-component-store-update/_config.js
@@ -2,6 +2,6 @@ export default {
 	async test({ assert, target, component, raf }) {
 		await component.condition.set(false);
 		raf.tick(500);
-		assert.htmlEqual(target.innerHTML, "");
-	},
+		assert.htmlEqual(target.innerHTML, '');
+	}
 };
diff --git a/test/runtime/samples/transition-js-intro-enabled-by-option/_config.js b/test/runtime/samples/transition-js-intro-enabled-by-option/_config.js
index 4b5f1cf987..af8e957b19 100644
--- a/test/runtime/samples/transition-js-intro-enabled-by-option/_config.js
+++ b/test/runtime/samples/transition-js-intro-enabled-by-option/_config.js
@@ -9,5 +9,5 @@ export default {
 
 		raf.tick(50);
 		assert.equal(div.foo, 0.5);
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-intro-skipped-by-default-nested/_config.js b/test/runtime/samples/transition-js-intro-skipped-by-default-nested/_config.js
index 26bf248d57..e209e0a80c 100644
--- a/test/runtime/samples/transition-js-intro-skipped-by-default-nested/_config.js
+++ b/test/runtime/samples/transition-js-intro-skipped-by-default-nested/_config.js
@@ -5,5 +5,5 @@ export default {
 
 		raf.tick(50);
 		assert.equal(div.foo, undefined);
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-intro-skipped-by-default/_config.js b/test/runtime/samples/transition-js-intro-skipped-by-default/_config.js
index 26bf248d57..e209e0a80c 100644
--- a/test/runtime/samples/transition-js-intro-skipped-by-default/_config.js
+++ b/test/runtime/samples/transition-js-intro-skipped-by-default/_config.js
@@ -5,5 +5,5 @@ export default {
 
 		raf.tick(50);
 		assert.equal(div.foo, undefined);
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-local-and-global/_config.js b/test/runtime/samples/transition-js-local-and-global/_config.js
index b7f8baa7ee..09aefb6913 100644
--- a/test/runtime/samples/transition-js-local-and-global/_config.js
+++ b/test/runtime/samples/transition-js-local-and-global/_config.js
@@ -63,5 +63,5 @@ export default {
 
 		raf.tick(400);
 		assert.htmlEqual(target.innerHTML, '');
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-local-nested-each-keyed/_config.js b/test/runtime/samples/transition-js-local-nested-each-keyed/_config.js
index 0595e67013..14ad247187 100644
--- a/test/runtime/samples/transition-js-local-nested-each-keyed/_config.js
+++ b/test/runtime/samples/transition-js-local-nested-each-keyed/_config.js
@@ -26,5 +26,5 @@ export default {
 
 		component.x = false;
 		assert.htmlEqual(target.innerHTML, '');
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-local-nested-each/_config.js b/test/runtime/samples/transition-js-local-nested-each/_config.js
index 0595e67013..14ad247187 100644
--- a/test/runtime/samples/transition-js-local-nested-each/_config.js
+++ b/test/runtime/samples/transition-js-local-nested-each/_config.js
@@ -26,5 +26,5 @@ export default {
 
 		component.x = false;
 		assert.htmlEqual(target.innerHTML, '');
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-local-nested-if/_config.js b/test/runtime/samples/transition-js-local-nested-if/_config.js
index d1550c0cff..9f4e5a0bb0 100644
--- a/test/runtime/samples/transition-js-local-nested-if/_config.js
+++ b/test/runtime/samples/transition-js-local-nested-if/_config.js
@@ -36,5 +36,5 @@ export default {
 
 		raf.tick(200);
 		assert.htmlEqual(target.innerHTML, '');
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-local/_config.js b/test/runtime/samples/transition-js-local/_config.js
index fa8a55bfcd..5f9cf9048a 100644
--- a/test/runtime/samples/transition-js-local/_config.js
+++ b/test/runtime/samples/transition-js-local/_config.js
@@ -36,5 +36,5 @@ export default {
 
 		raf.tick(200);
 		assert.htmlEqual(target.innerHTML, '');
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-nested-each-keyed-2/_config.js b/test/runtime/samples/transition-js-nested-each-keyed-2/_config.js
index d6566ba61c..c2d782c0f2 100644
--- a/test/runtime/samples/transition-js-nested-each-keyed-2/_config.js
+++ b/test/runtime/samples/transition-js-nested-each-keyed-2/_config.js
@@ -7,5 +7,5 @@ export default {
 	test({ assert, component, target, window, raf }) {
 		component.x = false;
 		assert.htmlEqual(target.innerHTML, '');
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-nested-each-keyed/_config.js b/test/runtime/samples/transition-js-nested-each-keyed/_config.js
index 3d2fe3c32e..5ec416afd9 100644
--- a/test/runtime/samples/transition-js-nested-each-keyed/_config.js
+++ b/test/runtime/samples/transition-js-nested-each-keyed/_config.js
@@ -21,5 +21,5 @@ export default {
 
 		raf.tick(200);
 		assert.htmlEqual(target.innerHTML, '');
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-nested-each/_config.js b/test/runtime/samples/transition-js-nested-each/_config.js
index c21024dd69..a74aba5610 100644
--- a/test/runtime/samples/transition-js-nested-each/_config.js
+++ b/test/runtime/samples/transition-js-nested-each/_config.js
@@ -21,5 +21,5 @@ export default {
 
 		raf.tick(200);
 		assert.htmlEqual(target.innerHTML, '');
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-nested-if/_config.js b/test/runtime/samples/transition-js-nested-if/_config.js
index 2fdd17da93..7d48077aca 100644
--- a/test/runtime/samples/transition-js-nested-if/_config.js
+++ b/test/runtime/samples/transition-js-nested-if/_config.js
@@ -21,5 +21,5 @@ export default {
 
 		raf.tick(200);
 		assert.htmlEqual(target.innerHTML, '');
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-nested-intro/_config.js b/test/runtime/samples/transition-js-nested-intro/_config.js
index 9072e885fc..9c23290b1a 100644
--- a/test/runtime/samples/transition-js-nested-intro/_config.js
+++ b/test/runtime/samples/transition-js-nested-intro/_config.js
@@ -16,4 +16,4 @@ export default {
 		raf.tick(150);
 		assert.equal(div.foo, 1);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/transition-js-parameterised-with-state/_config.js b/test/runtime/samples/transition-js-parameterised-with-state/_config.js
index 64e40dc63d..b143e8fdd6 100644
--- a/test/runtime/samples/transition-js-parameterised-with-state/_config.js
+++ b/test/runtime/samples/transition-js-parameterised-with-state/_config.js
@@ -15,5 +15,5 @@ export default {
 		assert.equal(div.foo, 200);
 
 		raf.tick(101);
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-parameterised/_config.js b/test/runtime/samples/transition-js-parameterised/_config.js
index 1370905547..6655cd374d 100644
--- a/test/runtime/samples/transition-js-parameterised/_config.js
+++ b/test/runtime/samples/transition-js-parameterised/_config.js
@@ -11,5 +11,5 @@ export default {
 		assert.equal(div.foo, 200);
 
 		raf.tick(101);
-	},
+	}
 };
diff --git a/test/runtime/samples/transition-js-slot/_config.js b/test/runtime/samples/transition-js-slot/_config.js
index a32e4bda72..e4d1c85a9f 100644
--- a/test/runtime/samples/transition-js-slot/_config.js
+++ b/test/runtime/samples/transition-js-slot/_config.js
@@ -23,4 +23,4 @@ export default {
 		raf.tick(100);
 		assert.equal(p.foo, 0);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/unchanged-expression-escape/_config.js b/test/runtime/samples/unchanged-expression-escape/_config.js
index 11a54c0fe9..38c5728a06 100644
--- a/test/runtime/samples/unchanged-expression-escape/_config.js
+++ b/test/runtime/samples/unchanged-expression-escape/_config.js
@@ -3,5 +3,5 @@ export default {
 		<p>Hello world, what's up? this & that</p>
 		<p>Hello world, what's up? this & that</p>
 		<p>Hello world, what's up?<span></span> this & that</p>
-	`,
+	`
 };
diff --git a/test/runtime/samples/unchanged-expression-xss/_config.js b/test/runtime/samples/unchanged-expression-xss/_config.js
index fa5453dbf3..4b9f1deff2 100644
--- a/test/runtime/samples/unchanged-expression-xss/_config.js
+++ b/test/runtime/samples/unchanged-expression-xss/_config.js
@@ -1,3 +1,3 @@
 export default {
-	html: `<p>&lt;b\nstyle='color:\nred;'&gt;RED?!?&lt;/b&gt;</p>`,
+	html: "<p>&lt;b\nstyle='color:\nred;'&gt;RED?!?&lt;/b&gt;</p>"
 };
diff --git a/test/runtime/samples/whitespace-each-block/_config.js b/test/runtime/samples/whitespace-each-block/_config.js
index 5913ec41cc..269e21781b 100644
--- a/test/runtime/samples/whitespace-each-block/_config.js
+++ b/test/runtime/samples/whitespace-each-block/_config.js
@@ -6,7 +6,7 @@ export default {
 	test({ assert, component, target }) {
 		assert.equal(
 			target.textContent,
-			`a b c `
+			'a b c '
 		);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/whitespace-list/_config.js b/test/runtime/samples/whitespace-list/_config.js
index 0b96503508..1ba852726c 100644
--- a/test/runtime/samples/whitespace-list/_config.js
+++ b/test/runtime/samples/whitespace-list/_config.js
@@ -18,5 +18,5 @@ export default {
 		const ul = target.querySelector('ul');
 
 		assert.equal(ul.childNodes.length, 5);
-	},
+	}
 };
diff --git a/test/runtime/samples/whitespace-normal/_config.js b/test/runtime/samples/whitespace-normal/_config.js
index e6716b46a8..9b82576c06 100644
--- a/test/runtime/samples/whitespace-normal/_config.js
+++ b/test/runtime/samples/whitespace-normal/_config.js
@@ -6,7 +6,7 @@ export default {
 	test({ assert, component, target }) {
 		assert.equal(
 			target.textContent,
-			`Hello world! How are you?`
+			'Hello world! How are you?'
 		);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/window-bind-scroll-update/_config.js b/test/runtime/samples/window-bind-scroll-update/_config.js
index cb13ea11c2..ac6f54ad55 100644
--- a/test/runtime/samples/window-bind-scroll-update/_config.js
+++ b/test/runtime/samples/window-bind-scroll-update/_config.js
@@ -1,4 +1,4 @@
-import { env, useFakeTimers } from "../../../helpers";
+import { env, useFakeTimers } from '../../../helpers';
 
 let clock;
 
@@ -33,5 +33,5 @@ export default {
 
 		clock.flush();
 		assert.equal(window.pageYOffset, 100);
-	},
+	}
 };
diff --git a/test/runtime/samples/window-binding-resize/_config.js b/test/runtime/samples/window-binding-resize/_config.js
index 1429f67db8..c396666014 100644
--- a/test/runtime/samples/window-binding-resize/_config.js
+++ b/test/runtime/samples/window-binding-resize/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: `<div>1024x768</div>`,
+	html: '<div>1024x768</div>',
 
 	before_test() {
 		Object.defineProperties(window, {
@@ -36,4 +36,4 @@ export default {
 			<div>567x456</div>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/window-binding-scroll-store/_config.js b/test/runtime/samples/window-binding-scroll-store/_config.js
index dbab4b36ac..0ce87efee0 100644
--- a/test/runtime/samples/window-binding-scroll-store/_config.js
+++ b/test/runtime/samples/window-binding-scroll-store/_config.js
@@ -4,8 +4,8 @@ export default {
 		Object.defineProperties(window, {
 			pageYOffset: {
 				value: 0,
-				configurable: true,
-			},
+				configurable: true
+			}
 		});
 	},
 	async test({ assert, component, target, window }) {
@@ -15,15 +15,15 @@ export default {
 		Object.defineProperties(window, {
 			pageYOffset: {
 				value: 234,
-				configurable: true,
-			},
+				configurable: true
+			}
 		});
 
 		await window.dispatchEvent(event);
 
 		assert.htmlEqual(
 			target.innerHTML,
-			`<p style="position: fixed; top: 1em; left: 1em;">scroll\ny\nis\n234.\n234\n*\n234\n=\n54756</p><div style="height: 9999px;"></div>`
+			'<p style="position: fixed; top: 1em; left: 1em;">scroll\ny\nis\n234.\n234\n*\n234\n=\n54756</p><div style="height: 9999px;"></div>'
 		);
-	},
+	}
 };
diff --git a/test/runtime/samples/window-event-context/_config.js b/test/runtime/samples/window-event-context/_config.js
index 458a15719f..c07dd811b5 100644
--- a/test/runtime/samples/window-event-context/_config.js
+++ b/test/runtime/samples/window-event-context/_config.js
@@ -3,7 +3,7 @@ export default {
 		foo: true
 	},
 
-	html: `true`,
+	html: 'true',
 
 	skip: /^v4/.test(process.version), // node 4 apparently does some dumb stuff
 	skip_if_ssr: true, // there's some kind of weird bug with this test... it compiles with the wrong require.extensions hook for some bizarre reason
@@ -13,10 +13,10 @@ export default {
 
 		await window.dispatchEvent(event);
 		assert.equal(component.foo, false);
-		assert.htmlEqual(target.innerHTML, `false`);
+		assert.htmlEqual(target.innerHTML, 'false');
 
 		await window.dispatchEvent(event);
 		assert.equal(component.foo, true);
-		assert.htmlEqual(target.innerHTML, `true`);
+		assert.htmlEqual(target.innerHTML, 'true');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/window-event-custom/_config.js b/test/runtime/samples/window-event-custom/_config.js
index 1c1075c0de..15644bc8e8 100644
--- a/test/runtime/samples/window-event-custom/_config.js
+++ b/test/runtime/samples/window-event-custom/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: `<p>escaped: false</p>`,
+	html: '<p>escaped: false</p>',
 
 	async test({ assert, component, target, window }) {
 		const event = new window.KeyboardEvent('keydown', {
@@ -11,5 +11,5 @@ export default {
 		assert.htmlEqual(target.innerHTML, `
 			<p>escaped: true</p>
 		`);
-	},
+	}
 };
diff --git a/test/runtime/samples/window-event/_config.js b/test/runtime/samples/window-event/_config.js
index bd09487f5e..90c6562f95 100644
--- a/test/runtime/samples/window-event/_config.js
+++ b/test/runtime/samples/window-event/_config.js
@@ -1,5 +1,5 @@
 export default {
-	html: `<div>undefinedxundefined</div>`,
+	html: '<div>undefinedxundefined</div>',
 
 	skip_if_ssr: true, // there's some kind of weird bug with this test... it compiles with the wrong require.extensions hook for some bizarre reason
 
@@ -23,4 +23,4 @@ export default {
 			<div>567x456</div>
 		`);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/server-side-rendering/index.js b/test/server-side-rendering/index.ts
similarity index 85%
rename from test/server-side-rendering/index.js
rename to test/server-side-rendering/index.ts
index 2d539782ff..ef2a88ecbe 100644
--- a/test/server-side-rendering/index.js
+++ b/test/server-side-rendering/index.ts
@@ -1,9 +1,9 @@
-import * as assert from "assert";
-import * as fs from "fs";
-import * as path from "path";
-import * as glob from 'tiny-glob/sync.js';
+import * as fs from 'fs';
+import * as path from 'path';
+import glob from 'tiny-glob/sync.js';
 
 import {
+	assert,
 	showOutput,
 	loadConfig,
 	loadSvelte,
@@ -12,13 +12,13 @@ import {
 	cleanRequireCache,
 	shouldUpdateExpected,
 	mkdirp
-} from "../helpers.js";
+} from '../helpers';
 
 function tryToReadFile(file) {
 	try {
-		return fs.readFileSync(file, "utf-8");
+		return fs.readFileSync(file, 'utf-8');
 	} catch (err) {
-		if (err.code !== "ENOENT") throw err;
+		if (err.code !== 'ENOENT') throw err;
 		return null;
 	}
 }
@@ -26,7 +26,7 @@ function tryToReadFile(file) {
 const sveltePath = process.cwd().split('\\').join('/');
 let compile = null;
 
-describe("ssr", () => {
+describe('ssr', () => {
 	before(() => {
 		compile = loadSvelte(true).compile;
 
@@ -34,7 +34,7 @@ describe("ssr", () => {
 	});
 
 	fs.readdirSync(`${__dirname}/samples`).forEach(dir => {
-		if (dir[0] === ".") return;
+		if (dir[0] === '.') return;
 
 		const config = loadConfig(`${__dirname}/samples/${dir}/_config.js`);
 
@@ -44,7 +44,7 @@ describe("ssr", () => {
 		const show = /\.show/.test(dir);
 
 		if (solo && process.env.CI) {
-			throw new Error("Forgot to remove `solo: true` from test");
+			throw new Error('Forgot to remove `solo: true` from test');
 		}
 
 		(solo ? it.only : it)(dir, () => {
@@ -59,13 +59,13 @@ describe("ssr", () => {
 				format: 'cjs'
 			};
 
-			require("../../register")(compileOptions);
+			require('../../register')(compileOptions);
 
 			try {
 				const Component = require(`${dir}/main.svelte`).default;
 
 				const expectedHtml = tryToReadFile(`${dir}/_expected.html`);
-				const expectedCss = tryToReadFile(`${dir}/_expected.css`) || "";
+				const expectedCss = tryToReadFile(`${dir}/_expected.css`) || '';
 
 				const props = tryToLoadJson(`${dir}/data.json`) || undefined;
 
@@ -88,8 +88,8 @@ describe("ssr", () => {
 
 				try {
 					assert.equal(
-						css.code.replace(/^\s+/gm, "").replace(/[\r\n]/g, ""),
-						expectedCss.replace(/^\s+/gm, "").replace(/[\r\n]/g, "")
+						css.code.replace(/^\s+/gm, '').replace(/[\r\n]/g, ''),
+						expectedCss.replace(/^\s+/gm, '').replace(/[\r\n]/g, '')
 					);
 				} catch (error) {
 					if (shouldUpdateExpected()) {
@@ -128,20 +128,20 @@ describe("ssr", () => {
 	});
 
 	// duplicate client-side tests, as far as possible
-	fs.readdirSync("test/runtime/samples").forEach(dir => {
-		if (dir[0] === ".") return;
+	fs.readdirSync('test/runtime/samples').forEach(dir => {
+		if (dir[0] === '.') return;
 
 		const config = loadConfig(`./runtime/samples/${dir}/_config.js`);
 		const solo = config.solo || /\.solo/.test(dir);
 
 		if (solo && process.env.CI) {
-			throw new Error("Forgot to remove `solo: true` from test");
+			throw new Error('Forgot to remove `solo: true` from test');
 		}
 
 		if (config.skip_if_ssr) return;
 
 		(config.skip ? it.skip : solo ? it.only : it)(dir, () => {
-			const cwd = path.resolve("test/runtime/samples", dir);
+			const cwd = path.resolve('test/runtime/samples', dir);
 
 			cleanRequireCache();
 
@@ -154,7 +154,7 @@ describe("ssr", () => {
 				format: 'cjs'
 			};
 
-			require("../../register")(compileOptions);
+			require('../../register')(compileOptions);
 
 			glob('**/*.svelte', { cwd }).forEach(file => {
 				if (file[0] === '_') return;
diff --git a/test/sourcemaps/index.js b/test/sourcemaps/index.js
deleted file mode 100644
index 0b0424a764..0000000000
--- a/test/sourcemaps/index.js
+++ /dev/null
@@ -1,73 +0,0 @@
-import * as fs from "fs";
-import * as path from "path";
-import * as assert from "assert";
-import { svelte } from "../helpers.js";
-import { SourceMapConsumer } from "source-map";
-import { getLocator } from "locate-character";
-
-describe("sourcemaps", () => {
-	fs.readdirSync(`${__dirname}/samples`).forEach(dir => {
-		if (dir[0] === ".") return;
-
-		// add .solo to a sample directory name to only run that test
-		const solo = /\.solo/.test(dir);
-		const skip = /\.skip/.test(dir);
-
-		if (solo && process.env.CI) {
-			throw new Error("Forgot to remove `solo: true` from test");
-		}
-
-		(solo ? it.only : skip ? it.skip : it)(dir, async () => {
-			const filename = path.resolve(
-				`${__dirname}/samples/${dir}/input.svelte`
-			);
-			const outputFilename = path.resolve(
-				`${__dirname}/samples/${dir}/output`
-			);
-
-			const input = fs.readFileSync(filename, "utf-8").replace(/\s+$/, "");
-			const { js, css } = svelte.compile(input, {
-				filename,
-				outputFilename: `${outputFilename}.js`,
-				cssOutputFilename: `${outputFilename}.css`
-			});
-
-			const _code = js.code.replace(/Svelte v\d+\.\d+\.\d+/, match => match.replace(/\d/g, 'x'));
-
-			fs.writeFileSync(
-				`${outputFilename}.js`,
-				`${_code}\n//# sourceMappingURL=output.js.map`
-			);
-			fs.writeFileSync(
-				`${outputFilename}.js.map`,
-				JSON.stringify(js.map, null, "  ")
-			);
-
-			if (css.code) {
-				fs.writeFileSync(
-					`${outputFilename}.css`,
-					`${css.code}\n/*# sourceMappingURL=output.css.map */`
-				);
-				fs.writeFileSync(
-					`${outputFilename}.css.map`,
-					JSON.stringify(css.map, null, "  ")
-				);
-			}
-
-			assert.deepEqual(js.map.sources, ["input.svelte"]);
-			if (css.map) assert.deepEqual(css.map.sources, ["input.svelte"]);
-
-			const { test } = require(`./samples/${dir}/test.js`);
-
-			const locateInSource = getLocator(input);
-
-			const smc = await new SourceMapConsumer(js.map);
-			const locateInGenerated = getLocator(_code);
-
-			const smcCss = css.map && await new SourceMapConsumer(css.map);
-			const locateInGeneratedCss = getLocator(css.code || '');
-
-			test({ assert, code: _code, map: js.map, smc, smcCss, locateInSource, locateInGenerated, locateInGeneratedCss });
-		});
-	});
-});
diff --git a/test/sourcemaps/index.ts b/test/sourcemaps/index.ts
new file mode 100644
index 0000000000..7659948744
--- /dev/null
+++ b/test/sourcemaps/index.ts
@@ -0,0 +1,113 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import * as assert from 'assert';
+import { loadConfig, svelte } from '../helpers';
+// keep source-map at version 0.7.x
+// https://github.com/mozilla/source-map/issues/400
+import { getLocator } from 'locate-character';
+import { SourceMapConsumer } from 'source-map';
+
+
+describe('sourcemaps', () => {
+	fs.readdirSync(`${__dirname}/samples`).forEach(dir => {
+		if (dir[0] === '.') return;
+
+		const config = loadConfig(`${__dirname}/samples/${dir}/_config.js`);
+
+		// add .solo to a sample directory name to only run that test
+		const solo = config.solo || /\.solo/.test(dir);
+		const skip = config.skip || /\.skip/.test(dir);
+
+		if (solo && process.env.CI) {
+			throw new Error('Forgot to remove `solo: true` from test');
+		}
+
+		(solo ? it.only : skip ? it.skip : it)(dir, async () => {
+			const { test } = require(`./samples/${dir}/test.js`);
+			const inputFile = path.resolve(`${__dirname}/samples/${dir}/input.svelte`);
+			const outputName = '_actual';
+			const outputBase = path.resolve(`${__dirname}/samples/${dir}/${outputName}`);
+
+			const inputCode = fs.readFileSync(inputFile, 'utf-8');
+			const input = {
+				code: inputCode,
+				locate: getLocator(inputCode)
+			};
+
+			const preprocessed = await svelte.preprocess(
+				input.code,
+				config.preprocess || {},
+				{
+					filename: 'input.svelte'
+				}
+			);
+	
+			const { js, css } = svelte.compile(
+				preprocessed.code, {
+				filename: 'input.svelte',
+				// filenames for sourcemaps
+				outputFilename: `${outputName}.js`,
+				cssOutputFilename: `${outputName}.css`
+			});
+
+			js.code = js.code.replace(
+				/generated by Svelte v\d+\.\d+\.\d+/,
+				match => match.replace(/\d/g, 'x')
+			);
+
+			fs.writeFileSync(`${outputBase}.svelte`, preprocessed.code);
+			if (preprocessed.map) {
+				fs.writeFileSync(
+					`${outputBase}.svelte.map`,
+					// TODO encode mappings for output - svelte.preprocess returns decoded mappings
+					JSON.stringify(preprocessed.map, null, 2)
+				);
+			}
+			fs.writeFileSync(
+				`${outputBase}.js`,
+				`${js.code}\n//# sourceMappingURL=${outputName}.js.map`
+			);
+			fs.writeFileSync(
+				`${outputBase}.js.map`,
+				JSON.stringify(js.map, null, 2)
+			);
+			if (css.code) {
+				fs.writeFileSync(
+					`${outputBase}.css`,
+					`${css.code}\n/*# sourceMappingURL=${outputName}.css.map */`
+				);
+				fs.writeFileSync(
+					`${outputBase}.css.map`,
+					JSON.stringify(css.map, null, '  ')
+				);
+			}
+
+			assert.deepEqual(
+				js.map.sources.slice().sort(),
+				(config.js_map_sources || ['input.svelte']).sort()
+			);
+			if (css.map) {
+				assert.deepEqual(
+					css.map.sources.slice().sort(),
+					(config.css_map_sources || ['input.svelte']).sort()
+				);
+			}
+
+			// use locate_1 with mapConsumer:
+			// lines are one-based, columns are zero-based
+
+			preprocessed.mapConsumer = preprocessed.map && await new SourceMapConsumer(preprocessed.map);
+			preprocessed.locate = getLocator(preprocessed.code);
+			preprocessed.locate_1 = getLocator(preprocessed.code, { offsetLine: 1 });
+
+			js.mapConsumer = js.map && await new SourceMapConsumer(js.map);
+			js.locate = getLocator(js.code);
+			js.locate_1 = getLocator(js.code, { offsetLine: 1 });
+
+			css.mapConsumer = css.map && await new SourceMapConsumer(css.map);
+			css.locate = getLocator(css.code || '');
+			css.locate_1 = getLocator(css.code || '', { offsetLine: 1 });
+			test({ assert, input, preprocessed, js, css });
+		});
+	});
+});
diff --git a/test/sourcemaps/samples/basic/test.js b/test/sourcemaps/samples/basic/test.js
index 7059761674..34c619c128 100644
--- a/test/sourcemaps/samples/basic/test.js
+++ b/test/sourcemaps/samples/basic/test.js
@@ -1,12 +1,12 @@
-export function test({ assert, smc, locateInSource, locateInGenerated }) {
-	const expected = locateInSource('foo.bar.baz');
+export function test({ assert, input, js }) {
+	const expected = input.locate('foo.bar.baz');
 
 	let start;
 	let actual;
 
-	start = locateInGenerated('ctx[0].bar.baz');
+	start = js.locate('ctx[0].bar.baz');
 
-	actual = smc.originalPositionFor({
+	actual = js.mapConsumer.originalPositionFor({
 		line: start.line + 1,
 		column: start.column
 	});
@@ -18,9 +18,9 @@ export function test({ assert, smc, locateInSource, locateInGenerated }) {
 		column: expected.column
 	});
 
-	start = locateInGenerated('ctx[0].bar.baz', start.character + 1);
+	start = js.locate('ctx[0].bar.baz', start.character + 1);
 
-	actual = smc.originalPositionFor({
+	actual = js.mapConsumer.originalPositionFor({
 		line: start.line + 1,
 		column: start.column
 	});
diff --git a/test/sourcemaps/samples/binding-shorthand.skip/test.js b/test/sourcemaps/samples/binding-shorthand.skip/test.js
index cdfbbdc091..13ecdbf889 100644
--- a/test/sourcemaps/samples/binding-shorthand.skip/test.js
+++ b/test/sourcemaps/samples/binding-shorthand.skip/test.js
@@ -1,13 +1,14 @@
-export function test({ assert, smc, locateInSource, locateInGenerated }) {
-	const expected = locateInSource('potato');
+export function test({ assert, input, js }) {
+	const expected = input.locate('potato');
 
 	let start;
 
-	start = locateInGenerated('potato');
-	start = locateInGenerated('potato', start.character + 1);
-	start = locateInGenerated('potato', start.character + 1); // we need the third instance of 'potato'
+	start = js.locate('potato');
+	start = js.locate('potato', start.character + 1);
+	start = js.locate('potato', start.character + 1);
+	// we need the third instance of 'potato'
 
-	const actual = smc.originalPositionFor({
+	const actual = js.mapConsumer.originalPositionFor({
 		line: start.line + 1,
 		column: start.column
 	});
diff --git a/test/sourcemaps/samples/binding/test.js b/test/sourcemaps/samples/binding/test.js
index 31c0e98442..3cb3246e50 100644
--- a/test/sourcemaps/samples/binding/test.js
+++ b/test/sourcemaps/samples/binding/test.js
@@ -1,12 +1,12 @@
-export function test({ assert, smc, locateInSource, locateInGenerated }) {
-	const expected = locateInSource('bar.baz');
+export function test({ assert, input, js }) {
+	const expected = input.locate('bar.baz');
 
 	let start;
 	let actual;
 
-	start = locateInGenerated('bar.baz');
+	start = js.locate('bar.baz');
 
-	actual = smc.originalPositionFor({
+	actual = js.mapConsumer.originalPositionFor({
 		line: start.line + 1,
 		column: start.column
 	});
@@ -18,9 +18,9 @@ export function test({ assert, smc, locateInSource, locateInGenerated }) {
 		column: expected.column
 	});
 
-	start = locateInGenerated('bar.baz', start.character + 1);
+	start = js.locate('bar.baz', start.character + 1);
 
-	actual = smc.originalPositionFor({
+	actual = js.mapConsumer.originalPositionFor({
 		line: start.line + 1,
 		column: start.column
 	});
diff --git a/test/sourcemaps/samples/css/test.js b/test/sourcemaps/samples/css/test.js
index 54082bd4ee..1e0dda1dff 100644
--- a/test/sourcemaps/samples/css/test.js
+++ b/test/sourcemaps/samples/css/test.js
@@ -1,14 +1,14 @@
-export function test({ assert, smcCss, locateInSource, locateInGeneratedCss }) {
-	const expected = locateInSource( '.foo' );
+export function test({ assert, input, css }) {
+	const expected = input.locate('.foo');
 
-	const start = locateInGeneratedCss( '.foo' );
+	const start = css.locate('.foo');
 
-	const actual = smcCss.originalPositionFor({
+	const actual = css.mapConsumer.originalPositionFor({
 		line: start.line + 1,
 		column: start.column
 	});
 
-	assert.deepEqual( actual, {
+	assert.deepEqual(actual, {
 		source: 'input.svelte',
 		name: null,
 		line: expected.line + 1,
diff --git a/test/sourcemaps/samples/each-block/test.js b/test/sourcemaps/samples/each-block/test.js
index 35479986a5..08b37686a4 100644
--- a/test/sourcemaps/samples/each-block/test.js
+++ b/test/sourcemaps/samples/each-block/test.js
@@ -1,10 +1,10 @@
-export function test({ assert, code, smc, map, locateInSource, locateInGenerated }) {
-	const startIndex = code.indexOf('create_main_fragment');
+export function test({ assert, input, js }) {
+	const startIndex = js.code.indexOf('create_main_fragment');
 
-	const expected = locateInSource('each');
-	const start = locateInGenerated('length', startIndex);
+	const expected = input.locate('each');
+	const start = js.locate('length', startIndex);
 
-	const actual = smc.originalPositionFor({
+	const actual = js.mapConsumer.originalPositionFor({
 		line: start.line + 1,
 		column: start.column
 	});
diff --git a/test/sourcemaps/samples/script-after-comment/test.js b/test/sourcemaps/samples/script-after-comment/test.js
index b473970112..06ecc46929 100644
--- a/test/sourcemaps/samples/script-after-comment/test.js
+++ b/test/sourcemaps/samples/script-after-comment/test.js
@@ -1,13 +1,13 @@
-export function test({ assert, smc, locateInSource, locateInGenerated }) {
-	const expected = locateInSource( 'assertThisLine' );
-	const start = locateInGenerated( 'assertThisLine' );
+export function test({ assert, input, js }) {
+	const expected = input.locate('assertThisLine');
+	const start = js.locate('assertThisLine');
 
-	const actual = smc.originalPositionFor({
+	const actual = js.mapConsumer.originalPositionFor({
 		line: start.line + 1,
 		column: start.column
 	});
 
-	assert.deepEqual( actual, {
+	assert.deepEqual(actual, {
 		source: 'input.svelte',
 		name: null,
 		line: expected.line + 1,
diff --git a/test/sourcemaps/samples/script/test.js b/test/sourcemaps/samples/script/test.js
index 73971ef487..e6a91f51e1 100644
--- a/test/sourcemaps/samples/script/test.js
+++ b/test/sourcemaps/samples/script/test.js
@@ -1,8 +1,8 @@
-export function test({ assert, smc, locateInSource, locateInGenerated }) {
-	const expected = locateInSource( '42' );
-	const start = locateInGenerated( '42' );
+export function test({ assert, input, js }) {
+	const expected = input.locate('42');
+	const start = js.locate('42');
 
-	const actual = smc.originalPositionFor({
+	const actual = js.mapConsumer.originalPositionFor({
 		line: start.line + 1,
 		column: start.column
 	});
diff --git a/test/sourcemaps/samples/static-no-script/test.js b/test/sourcemaps/samples/static-no-script/test.js
index a8f4d89ab8..c683c94d6b 100644
--- a/test/sourcemaps/samples/static-no-script/test.js
+++ b/test/sourcemaps/samples/static-no-script/test.js
@@ -1,9 +1,9 @@
-const fs = require( 'fs' );
-const path = require( 'path' );
+const fs = require('fs');
+const path = require('path');
 
-export function test({ assert, map }) {
-	assert.deepEqual( map.sources, [ 'input.svelte' ]);
-	assert.deepEqual( map.sourcesContent, [
-		fs.readFileSync( path.join( __dirname, 'input.svelte' ), 'utf-8' )
+export function test({ assert, js }) {
+	assert.deepEqual(js.map.sources, ['input.svelte']);
+	assert.deepEqual(js.map.sourcesContent, [
+		fs.readFileSync(path.join(__dirname, 'input.svelte'), 'utf-8')
 	]);
 }
diff --git a/test/sourcemaps/samples/two-scripts/test.js b/test/sourcemaps/samples/two-scripts/test.js
index b473970112..70901af8c9 100644
--- a/test/sourcemaps/samples/two-scripts/test.js
+++ b/test/sourcemaps/samples/two-scripts/test.js
@@ -1,8 +1,8 @@
-export function test({ assert, smc, locateInSource, locateInGenerated }) {
-	const expected = locateInSource( 'assertThisLine' );
-	const start = locateInGenerated( 'assertThisLine' );
+export function test({ assert, input, js }) {
+	const expected = input.locate( 'assertThisLine' );
+	const start = js.locate( 'assertThisLine' );
 
-	const actual = smc.originalPositionFor({
+	const actual = js.mapConsumer.originalPositionFor({
 		line: start.line + 1,
 		column: start.column
 	});
diff --git a/test/stats/index.js b/test/stats/index.ts
similarity index 95%
rename from test/stats/index.js
rename to test/stats/index.ts
index acea7a4663..a6efd93d22 100644
--- a/test/stats/index.js
+++ b/test/stats/index.ts
@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import * as assert from 'assert';
-import { svelte, loadConfig, tryToLoadJson } from '../helpers.js';
+import { svelte, loadConfig, tryToLoadJson } from '../helpers';
 
 describe('stats', () => {
 	fs.readdirSync(`${__dirname}/samples`).forEach(dir => {
diff --git a/test/stats/samples/basic/_config.js b/test/stats/samples/basic/_config.js
index 434e11bd76..7f1d557d23 100644
--- a/test/stats/samples/basic/_config.js
+++ b/test/stats/samples/basic/_config.js
@@ -3,4 +3,4 @@ export default {
 		assert.equal(typeof stats.timings, 'object');
 		assert.equal(typeof stats.timings.total, 'number');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/test.js b/test/test.ts
similarity index 84%
rename from test/test.js
rename to test/test.ts
index 6ea4bd60ab..181e9351c1 100644
--- a/test/test.js
+++ b/test/test.ts
@@ -3,12 +3,12 @@ const glob = require('tiny-glob/sync.js');
 require('./setup');
 
 // bind internal to jsdom
-require('./helpers');
+require('./helpers.ts');
 require('../internal');
 
 console.clear();
 
-const test_folders = glob('*/index.js', { cwd: 'test' });
+const test_folders = glob('*/index.ts', { cwd: 'test' });
 const solo_folders = test_folders.filter(folder => /\.solo/.test(folder));
 
 if (solo_folders.length) {
diff --git a/test/validator/index.js b/test/validator/index.ts
similarity index 71%
rename from test/validator/index.js
rename to test/validator/index.ts
index 433e1a94ae..1709b7a706 100644
--- a/test/validator/index.js
+++ b/test/validator/index.ts
@@ -1,23 +1,23 @@
-import * as fs from "fs";
-import * as assert from "assert";
-import { svelte, loadConfig, tryToLoadJson } from "../helpers.js";
+import * as fs from 'fs';
+import * as assert from 'assert';
+import { svelte, loadConfig, tryToLoadJson } from '../helpers';
 
-describe("validate", () => {
+describe('validate', () => {
 	fs.readdirSync(`${__dirname}/samples`).forEach(dir => {
-		if (dir[0] === ".") return;
+		if (dir[0] === '.') return;
 
 		// add .solo to a sample directory name to only run that test
 		const solo = /\.solo/.test(dir);
 		const skip = /\.skip/.test(dir);
 
 		if (solo && process.env.CI) {
-			throw new Error("Forgot to remove `solo: true` from test");
+			throw new Error('Forgot to remove `solo: true` from test');
 		}
 
 		(solo ? it.only : skip ? it.skip : it)(dir, () => {
 			const config = loadConfig(`${__dirname}/samples/${dir}/_config.js`);
 
-			const input = fs.readFileSync(`${__dirname}/samples/${dir}/input.svelte`, "utf-8").replace(/\s+$/, "").replace(/\r/g, "");
+			const input = fs.readFileSync(`${__dirname}/samples/${dir}/input.svelte`, 'utf-8').replace(/\s+$/, '').replace(/\r/g, '');
 			const expected_warnings = tryToLoadJson(`${__dirname}/samples/${dir}/warnings.json`) || [];
 			const expected_errors = tryToLoadJson(`${__dirname}/samples/${dir}/errors.json`);
 			const options = tryToLoadJson(`${__dirname}/samples/${dir}/options.json`);
@@ -30,7 +30,7 @@ describe("validate", () => {
 					legacy: config.legacy,
 					generate: false,
 					customElement: config.customElement,
-					...options,
+					...options
 				});
 
 				assert.deepEqual(warnings.map(w => ({
@@ -69,18 +69,18 @@ describe("validate", () => {
 		});
 	});
 
-	it("errors if options.name is illegal", () => {
+	it('errors if options.name is illegal', () => {
 		assert.throws(() => {
-			svelte.compile("<div></div>", {
-				name: "not.valid",
+			svelte.compile('<div></div>', {
+				name: 'not.valid',
 				generate: false
 			});
 		}, /options\.name must be a valid identifier/);
 	});
 
-	it("warns if options.name is not capitalised", () => {
-		const { warnings } = svelte.compile("<div></div>", {
-			name: "lowercase",
+	it('warns if options.name is not capitalised', () => {
+		const { warnings } = svelte.compile('<div></div>', {
+			name: 'lowercase',
 			generate: false
 		});
 
@@ -88,14 +88,14 @@ describe("validate", () => {
 			code: w.code,
 			message: w.message
 		})), [{
-			code: `options-lowercase-name`,
-			message: "options.name should be capitalised"
+			code: 'options-lowercase-name',
+			message: 'options.name should be capitalised'
 		}]);
 	});
 
-	it("does not warn if options.name begins with non-alphabetic character", () => {
-		const { warnings } = svelte.compile("<div></div>", {
-			name: "_",
+	it('does not warn if options.name begins with non-alphabetic character', () => {
+		const { warnings } = svelte.compile('<div></div>', {
+			name: '_',
 			generate: false
 		});
 
diff --git a/test/validator/samples/action-object/input.svelte b/test/validator/samples/action-object/input.svelte
new file mode 100644
index 0000000000..e0962fa594
--- /dev/null
+++ b/test/validator/samples/action-object/input.svelte
@@ -0,0 +1,11 @@
+<script>
+	const obj = {
+		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
diff --git a/test/validator/samples/action-object/warnings.json b/test/validator/samples/action-object/warnings.json
new file mode 100644
index 0000000000..e1ccbb55a2
--- /dev/null
+++ b/test/validator/samples/action-object/warnings.json
@@ -0,0 +1,17 @@
+[
+	{
+		"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/component-name-lowercase/input.svelte b/test/validator/samples/component-name-lowercase/input.svelte
new file mode 100644
index 0000000000..ebd7cf3481
--- /dev/null
+++ b/test/validator/samples/component-name-lowercase/input.svelte
@@ -0,0 +1,7 @@
+<script>
+	import thisShouldWarnMe from './MyComponent.svelte';
+	let i;
+</script>
+
+<thisShouldWarnMe />
+<i />
\ No newline at end of file
diff --git a/test/validator/samples/component-name-lowercase/warnings.json b/test/validator/samples/component-name-lowercase/warnings.json
new file mode 100644
index 0000000000..37765b423d
--- /dev/null
+++ b/test/validator/samples/component-name-lowercase/warnings.json
@@ -0,0 +1,17 @@
+[
+	{
+		"code": "component-name-lowercase",
+		"message": "<thisShouldWarnMe> will be treated as an HTML element unless it begins with a capital letter",
+		"pos": 82,
+		"start": {
+			"character": 82,
+			"column": 0,
+			"line": 6
+		},
+		"end": {
+			"character": 102,
+			"column": 20,
+			"line": 6
+		}
+	}
+]
diff --git a/test/validator/samples/each-block-multiple-children/_config.js b/test/validator/samples/each-block-multiple-children/_config.js
index e26996239d..083edcd210 100644
--- a/test/validator/samples/each-block-multiple-children/_config.js
+++ b/test/validator/samples/each-block-multiple-children/_config.js
@@ -1,3 +1,3 @@
 export default {
 	dev: true
-};
\ 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
new file mode 100644
index 0000000000..a7e5a2a76c
--- /dev/null
+++ b/test/validator/samples/event-modifiers-invalid-nonpassive/errors.json
@@ -0,0 +1,15 @@
+[{
+	"message": "The 'passive' and 'nonpassive' modifiers cannot be used together",
+	"code": "invalid-event-modifier",
+	"start": {
+		"line": 1,
+		"column": 5,
+		"character": 5
+	},
+	"end": {
+		"line": 1,
+		"column": 51,
+		"character": 51
+	},
+	"pos": 5
+}]
diff --git a/test/validator/samples/event-modifiers-invalid-nonpassive/input.svelte b/test/validator/samples/event-modifiers-invalid-nonpassive/input.svelte
new file mode 100644
index 0000000000..3557aa4b1d
--- /dev/null
+++ b/test/validator/samples/event-modifiers-invalid-nonpassive/input.svelte
@@ -0,0 +1,3 @@
+<div on:touchstart|nonpassive|passive={handleWheel}>
+	oops
+</div>
\ No newline at end of file
diff --git a/test/validator/samples/event-modifiers-invalid/errors.json b/test/validator/samples/event-modifiers-invalid/errors.json
index 8be2ca7348..59a142d632 100644
--- a/test/validator/samples/event-modifiers-invalid/errors.json
+++ b/test/validator/samples/event-modifiers-invalid/errors.json
@@ -1,5 +1,5 @@
 [{
-	"message": "Valid event modifiers are preventDefault, stopPropagation, capture, once, passive or self",
+	"message": "Valid event modifiers are preventDefault, stopPropagation, capture, once, passive, nonpassive or self",
 	"code": "invalid-event-modifier",
 	"start": {
 		"line": 1,
diff --git a/test/validator/samples/event-modifiers-legacy/_config.js b/test/validator/samples/event-modifiers-legacy/_config.js
index 0179e05ec4..52f59c8767 100644
--- a/test/validator/samples/event-modifiers-legacy/_config.js
+++ b/test/validator/samples/event-modifiers-legacy/_config.js
@@ -1,3 +1,3 @@
 export default {
 	legacy: true
-};
\ No newline at end of file
+};
diff --git a/test/validator/samples/import-meta/errors.json b/test/validator/samples/import-meta/errors.json
new file mode 100644
index 0000000000..0637a088a0
--- /dev/null
+++ b/test/validator/samples/import-meta/errors.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/test/validator/samples/import-meta/input.svelte b/test/validator/samples/import-meta/input.svelte
new file mode 100644
index 0000000000..a5ce32dd77
--- /dev/null
+++ b/test/validator/samples/import-meta/input.svelte
@@ -0,0 +1,6 @@
+<script>
+	const url = import.meta.url;
+</script>
+
+{url}
+{import.meta.url}
diff --git a/test/validator/samples/non-empty-block-dev/_config.js b/test/validator/samples/non-empty-block-dev/_config.js
index e26996239d..083edcd210 100644
--- a/test/validator/samples/non-empty-block-dev/_config.js
+++ b/test/validator/samples/non-empty-block-dev/_config.js
@@ -1,3 +1,3 @@
 export default {
 	dev: true
-};
\ No newline at end of file
+};
diff --git a/test/vars/index.js b/test/vars/index.ts
similarity index 95%
rename from test/vars/index.js
rename to test/vars/index.ts
index a12ac177f2..4cebf7fbb4 100644
--- a/test/vars/index.js
+++ b/test/vars/index.ts
@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import * as assert from 'assert';
-import { svelte, loadConfig, tryToLoadJson } from '../helpers.js';
+import { svelte, loadConfig, tryToLoadJson } from '../helpers';
 
 describe('vars', () => {
 	fs.readdirSync(`${__dirname}/samples`).forEach(dir => {
diff --git a/test/vars/samples/$$props-logicless/_config.js b/test/vars/samples/$$props-logicless/_config.js
index 20f9b99466..05bbe7e0b2 100644
--- a/test/vars/samples/$$props-logicless/_config.js
+++ b/test/vars/samples/$$props-logicless/_config.js
@@ -14,4 +14,4 @@ export default {
 			}
 		]);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/vars/samples/$$props/_config.js b/test/vars/samples/$$props/_config.js
index 20f9b99466..05bbe7e0b2 100644
--- a/test/vars/samples/$$props/_config.js
+++ b/test/vars/samples/$$props/_config.js
@@ -14,4 +14,4 @@ export default {
 			}
 		]);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/vars/samples/assumed-global/_config.js b/test/vars/samples/assumed-global/_config.js
index 2b84e83f12..782760bb8b 100644
--- a/test/vars/samples/assumed-global/_config.js
+++ b/test/vars/samples/assumed-global/_config.js
@@ -1,5 +1,5 @@
 export default {
 	test(assert, vars) {
 		assert.deepEqual(vars, []);
-	},
+	}
 };
diff --git a/test/vars/samples/component-namespaced/_config.js b/test/vars/samples/component-namespaced/_config.js
index a801c52780..8ed4872355 100644
--- a/test/vars/samples/component-namespaced/_config.js
+++ b/test/vars/samples/component-namespaced/_config.js
@@ -14,4 +14,4 @@ export default {
 			}
 		]);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/vars/samples/duplicate-globals/_config.js b/test/vars/samples/duplicate-globals/_config.js
index 2b84e83f12..782760bb8b 100644
--- a/test/vars/samples/duplicate-globals/_config.js
+++ b/test/vars/samples/duplicate-globals/_config.js
@@ -1,5 +1,5 @@
 export default {
 	test(assert, vars) {
 		assert.deepEqual(vars, []);
-	},
+	}
 };
diff --git a/test/vars/samples/duplicate-non-hoistable/_config.js b/test/vars/samples/duplicate-non-hoistable/_config.js
index 4ebc5b00cf..bd70e29800 100644
--- a/test/vars/samples/duplicate-non-hoistable/_config.js
+++ b/test/vars/samples/duplicate-non-hoistable/_config.js
@@ -13,5 +13,5 @@ export default {
 				writable: true
 			}
 		]);
-	},
+	}
 };
diff --git a/test/vars/samples/duplicate-vars/_config.js b/test/vars/samples/duplicate-vars/_config.js
index eb10c44a9a..749a0c59af 100644
--- a/test/vars/samples/duplicate-vars/_config.js
+++ b/test/vars/samples/duplicate-vars/_config.js
@@ -24,5 +24,5 @@ export default {
 				writable: true
 			}
 		]);
-	},
+	}
 };
diff --git a/test/vars/samples/implicit-reactive/_config.js b/test/vars/samples/implicit-reactive/_config.js
index 770de590e6..a8bf261d4f 100644
--- a/test/vars/samples/implicit-reactive/_config.js
+++ b/test/vars/samples/implicit-reactive/_config.js
@@ -24,5 +24,5 @@ export default {
 				writable: true
 			}
 		]);
-	},
+	}
 };
diff --git a/test/vars/samples/imports/_config.js b/test/vars/samples/imports/_config.js
index ecf120c7d6..47e8c0c5d9 100644
--- a/test/vars/samples/imports/_config.js
+++ b/test/vars/samples/imports/_config.js
@@ -36,4 +36,4 @@ export default {
 			}
 		]);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/vars/samples/modules-vars/_config.js b/test/vars/samples/modules-vars/_config.js
index e178941db6..52b8940148 100644
--- a/test/vars/samples/modules-vars/_config.js
+++ b/test/vars/samples/modules-vars/_config.js
@@ -2,7 +2,7 @@ export default {
 	test(assert, vars) {
 		assert.deepEqual(vars, [
 			{
-				name: "a",
+				name: 'a',
 				export_name: null,
 				injected: false,
 				module: true,
@@ -13,7 +13,7 @@ export default {
 				writable: true
 			},
 			{
-				name: "b",
+				name: 'b',
 				export_name: null,
 				injected: false,
 				module: true,
@@ -24,7 +24,7 @@ export default {
 				writable: true
 			},
 			{
-				name: "c",
+				name: 'c',
 				export_name: null,
 				injected: false,
 				module: true,
@@ -35,7 +35,7 @@ export default {
 				writable: true
 			},
 			{
-				name: "d",
+				name: 'd',
 				export_name: null,
 				injected: false,
 				module: true,
@@ -46,7 +46,7 @@ export default {
 				writable: true
 			},
 			{
-				name: "c",
+				name: 'c',
 				export_name: null,
 				injected: false,
 				module: false,
@@ -57,7 +57,7 @@ export default {
 				writable: true
 			},
 			{
-				name: "foo",
+				name: 'foo',
 				export_name: null,
 				injected: false,
 				module: false,
diff --git a/test/vars/samples/mutated-vs-reassigned-bindings/_config.js b/test/vars/samples/mutated-vs-reassigned-bindings/_config.js
index ba499674d2..65c7d5cc90 100644
--- a/test/vars/samples/mutated-vs-reassigned-bindings/_config.js
+++ b/test/vars/samples/mutated-vs-reassigned-bindings/_config.js
@@ -25,4 +25,4 @@ export default {
 			}
 		]);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/vars/samples/mutated-vs-reassigned/_config.js b/test/vars/samples/mutated-vs-reassigned/_config.js
index ba499674d2..65c7d5cc90 100644
--- a/test/vars/samples/mutated-vs-reassigned/_config.js
+++ b/test/vars/samples/mutated-vs-reassigned/_config.js
@@ -25,4 +25,4 @@ export default {
 			}
 		]);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/vars/samples/props/_config.js b/test/vars/samples/props/_config.js
index a51c93fb03..d5f5d1cc2b 100644
--- a/test/vars/samples/props/_config.js
+++ b/test/vars/samples/props/_config.js
@@ -47,4 +47,4 @@ export default {
 			}
 		]);
 	}
-};
\ No newline at end of file
+};
diff --git a/test/vars/samples/referenced-from-script/_config.js b/test/vars/samples/referenced-from-script/_config.js
index 191a52f8cc..ec068cb1d7 100644
--- a/test/vars/samples/referenced-from-script/_config.js
+++ b/test/vars/samples/referenced-from-script/_config.js
@@ -10,7 +10,7 @@ export default {
 				reassigned: false,
 				referenced: false,
 				writable: false,
-				referenced_from_script: false,
+				referenced_from_script: false
 			},
 			{
 				name: 'j',
@@ -21,7 +21,7 @@ export default {
 				reassigned: false,
 				referenced: false,
 				writable: false,
-				referenced_from_script: false,
+				referenced_from_script: false
 			},
 			{
 				name: 'k',
@@ -32,7 +32,7 @@ export default {
 				reassigned: false,
 				referenced: false,
 				writable: false,
-				referenced_from_script: false,
+				referenced_from_script: false
 			},
 			{
 				name: 'a',
@@ -43,7 +43,7 @@ export default {
 				reassigned: true,
 				referenced: false,
 				writable: true,
-				referenced_from_script: true,
+				referenced_from_script: true
 			},
 			{
 				name: 'b',
@@ -54,7 +54,7 @@ export default {
 				reassigned: false,
 				referenced: false,
 				writable: true,
-				referenced_from_script: true,
+				referenced_from_script: true
 			},
 			{
 				name: 'c',
@@ -65,7 +65,7 @@ export default {
 				reassigned: false,
 				referenced: false,
 				writable: true,
-				referenced_from_script: true,
+				referenced_from_script: true
 			},
 			{
 				name: 'd',
@@ -76,7 +76,7 @@ export default {
 				reassigned: false,
 				referenced: false,
 				writable: true,
-				referenced_from_script: true,
+				referenced_from_script: true
 			},
 			{
 				name: 'e',
@@ -87,7 +87,7 @@ export default {
 				reassigned: false,
 				referenced: false,
 				writable: true,
-				referenced_from_script: false,
+				referenced_from_script: false
 			},
 			{
 				name: 'f',
@@ -98,7 +98,7 @@ export default {
 				reassigned: false,
 				referenced: false,
 				writable: true,
-				referenced_from_script: false,
+				referenced_from_script: false
 			},
 			{
 				name: 'g',
@@ -109,7 +109,7 @@ export default {
 				reassigned: false,
 				referenced: false,
 				writable: true,
-				referenced_from_script: true,
+				referenced_from_script: true
 			},
 			{
 				name: 'h',
@@ -120,7 +120,7 @@ export default {
 				reassigned: true,
 				referenced: false,
 				writable: true,
-				referenced_from_script: true,
+				referenced_from_script: true
 			},
 			{
 				name: 'foo',
@@ -131,7 +131,7 @@ export default {
 				reassigned: false,
 				referenced: false,
 				writable: false,
-				referenced_from_script: false,
+				referenced_from_script: false
 			},
 			{
 				name: 'l',
@@ -142,7 +142,7 @@ export default {
 				reassigned: false,
 				referenced: false,
 				referenced_from_script: true,
-				writable: false,
+				writable: false
 			},
 			{
 				name: 'bar',
@@ -153,8 +153,8 @@ export default {
 				reassigned: false,
 				referenced: false,
 				writable: false,
-				referenced_from_script: false,
-			},
+				referenced_from_script: false
+			}
 		]);
-	},
+	}
 };
diff --git a/test/vars/samples/template-references/_config.js b/test/vars/samples/template-references/_config.js
index 674e351517..34c07e19e0 100644
--- a/test/vars/samples/template-references/_config.js
+++ b/test/vars/samples/template-references/_config.js
@@ -10,7 +10,7 @@ export default {
 				reassigned: false,
 				referenced: true,
 				referenced_from_script: false,
-				writable: false,
+				writable: false
 			},
 			{
 				export_name: null,
@@ -21,7 +21,7 @@ export default {
 				reassigned: false,
 				referenced: true,
 				referenced_from_script: false,
-				writable: true,
+				writable: true
 			},
 			{
 				export_name: null,
@@ -32,8 +32,8 @@ export default {
 				reassigned: false,
 				referenced: true,
 				referenced_from_script: false,
-				writable: true,
-			},
+				writable: true
+			}
 		]);
-	},
+	}
 };
diff --git a/test/vars/samples/undeclared/_config.js b/test/vars/samples/undeclared/_config.js
index 2b84e83f12..782760bb8b 100644
--- a/test/vars/samples/undeclared/_config.js
+++ b/test/vars/samples/undeclared/_config.js
@@ -1,5 +1,5 @@
 export default {
 	test(assert, vars) {
 		assert.deepEqual(vars, []);
-	},
+	}
 };