diff --git a/.eslintignore b/.eslintignore
index 4a113378ce..97a855e951 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,7 +1,3 @@
-src/shared
-shared.js
-store.js
-test/test.js
-test/setup.js
 **/_actual.js
-**/expected.js
\ No newline at end of file
+**/expected.js
+test/*/samples/*/output.js
diff --git a/.eslintrc.json b/.eslintrc.json
index 7e8c26382a..c821993c40 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,44 +1,76 @@
 {
-	"root": true,
-	"rules": {
-		"indent": [2, "tab", { "SwitchCase": 1 }],
-		"semi": [2, "always"],
-		"keyword-spacing": [2, { "before": true, "after": true }],
-		"space-before-blocks": [2, "always"],
-		"no-mixed-spaces-and-tabs": [2, "smart-tabs"],
-		"no-cond-assign": 0,
-		"no-unused-vars": 2,
-		"object-shorthand": [2, "always"],
-		"no-const-assign": 2,
-		"no-class-assign": 2,
-		"no-this-before-super": 2,
-		"no-var": 2,
-		"no-unreachable": 2,
-		"valid-typeof": 2,
-		"quote-props": [2, "as-needed"],
-		"one-var": [2, "never"],
-		"prefer-arrow-callback": 2,
-		"prefer-const": [2, { "destructuring": "all" }],
-		"arrow-spacing": 2,
-		"no-inner-declarations": 0
-	},
-	"env": {
-		"es6": true,
-		"browser": true,
-		"node": true,
-		"mocha": true
-	},
-	"extends": [
-		"eslint:recommended",
-		"plugin:import/errors",
-		"plugin:import/warnings"
-	],
-	"parserOptions": {
-		"ecmaVersion": 9,
-		"sourceType": "module"
-	},
-	"settings": {
-		"import/core-modules": ["svelte"],
-		"svelte3/extensions": ["html"]
-	}
+  "root": true,
+  "rules": {
+    "indent": "off",
+    "no-unused-vars": "off",
+    "semi": [2, "always"],
+    "keyword-spacing": [2, { "before": true, "after": true }],
+    "space-before-blocks": [2, "always"],
+    "no-mixed-spaces-and-tabs": [2, "smart-tabs"],
+    "no-cond-assign": 0,
+    "object-shorthand": [2, "always"],
+    "no-const-assign": 2,
+    "no-class-assign": 2,
+    "no-this-before-super": 2,
+    "no-var": 2,
+    "no-unreachable": 2,
+    "valid-typeof": 2,
+    "quote-props": [2, "as-needed"],
+    "one-var": [2, "never"],
+    "prefer-arrow-callback": 2,
+    "prefer-const": [2, { "destructuring": "all" }],
+    "arrow-spacing": 2,
+    "no-inner-declarations": 0,
+    "@typescript-eslint/indent": ["error", "tab", {
+      "SwitchCase": 1,
+      "ignoredNodes": ["TemplateLiteral"]
+    }],
+    "@typescript-eslint/camelcase": "off",
+    "@typescript-eslint/no-use-before-define": "off",
+    "@typescript-eslint/array-type": ["error", "array-simple"],
+    "@typescript-eslint/explicit-function-return-type": "off",
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/explicit-member-accessibility": "off",
+    "@typescript-eslint/no-unused-vars": ["error", {
+      "argsIgnorePattern": "^_"
+    }],
+    "@typescript-eslint/no-object-literal-type-assertion": ["error", {
+      "allowAsParameter": true
+    }],
+    "@typescript-eslint/no-unused-vars": "off"
+  },
+  "env": {
+    "es6": true,
+    "browser": true,
+    "node": true,
+    "mocha": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:import/errors",
+    "plugin:import/warnings",
+    "plugin:import/typescript",
+    "plugin:@typescript-eslint/recommended"
+  ],
+  "parserOptions": {
+    "ecmaVersion": 9,
+    "sourceType": "module"
+  },
+  "settings": {
+    "import/core-modules": [
+      "svelte",
+      "svelte/internal",
+      "svelte/store",
+      "svelte/easing",
+      "estree"
+    ]
+  },
+  "overrides": [
+    {
+      "files": ["*.js"],
+      "rules": {
+        "@typescript-eslint/no-var-requires": "off"
+      }
+    }
+  ]
 }
diff --git a/.flowconfig b/.flowconfig
index 2ed2b0c713..c1961b7a6b 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -1,5 +1,5 @@
 [ignore]
-<PROJECT_ROOT>/dist/.*
+<PROJECT_ROOT>/types/.*
 
 [include]
 
diff --git a/.gitignore b/.gitignore
index 06671edc2b..4d7bbc7ac3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,17 @@
+.idea
 .DS_Store
 .nyc_output
 node_modules
 *.map
-/src/compile/internal-exports.ts
-/compiler.js
-/index.js
-/internal.*
-/store.js
-/easing.js
-/motion.*
-/transition.js
-/animate.js
+/src/compiler/compile/internal-exports.ts
+/compiler.*js
+/index.*js
+/internal
+/store
+/easing
+/motion
+/transition
+/animate
 /scratch/
 /coverage/
 /coverage.lcov/
@@ -20,6 +21,7 @@ node_modules
 /test/sourcemaps/samples/*/output.css.map
 /yarn-error.log
 _actual*.*
+/types
 
 /site/cypress/screenshots/
 /site/__sapper__/
@@ -27,5 +29,6 @@ _actual*.*
 /site/.sessions
 /site/static/svelte-app.json
 /site/static/contributors.jpg
+/site/static/workers
 /site/scripts/svelte-app
 /site/src/routes/_contributors.js
diff --git a/.travis.yml b/.travis.yml
index aeadd48f8d..a4603a26e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
 language: node_js
 node_js:
-  - "node"
-
+  - "8"
+  - "10"
+  - "12"
 env:
   global:
     - BUILD_TIMEOUT=20000
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a509bd0f47..766a1634e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,57 @@
 # Svelte changelog
 
+## 3.4.4
+
+* Publish type declaration files ([#2874](https://github.com/sveltejs/svelte/issues/2874))
+* Don't trigger updates for unreferenced values ([#2865](https://github.com/sveltejs/svelte/pull/2865))
+* Omit readonly bindings from SSR output ([#2339](https://github.com/sveltejs/svelte/issues/2339))
+* Prevent outdated animation CSS ([#2871](https://github.com/sveltejs/svelte/issues/2871))
+* Repair dynamic `{@html ...}` in head ([#2880](https://github.com/sveltejs/svelte/pull/2880))
+* Don't create unknown prop warnings for internal props, or if component has `$$props` ([#2881](https://github.com/sveltejs/svelte/pull/2881))
+
+
+## 3.4.3
+
+* Add type declaration files for everything ([#2842](https://github.com/sveltejs/svelte/pull/2842))
+* Prevent `svelte/store` being bundled ([#2786](https://github.com/sveltejs/svelte/issues/2786))
+* Warn on unknown props in dev mode ([#2840](https://github.com/sveltejs/svelte/pull/2840))
+* Treat `requestAnimationFrame` as a no-op on the server ([#2856](https://github.com/sveltejs/svelte/pull/2856))
+* Add `raw` property to AST's `Text` nodes ([#2714](https://github.com/sveltejs/svelte/issues/2714))
+* Add `<details bind:open>` ([#2854](https://github.com/sveltejs/svelte/issues/2854))
+
+## 3.4.2
+
+* Use empty string for empty data attributes ([#2804](https://github.com/sveltejs/svelte/pull/2804))
+* Support `customElement: true` with no `<svelte:options>` ([#2821](https://github.com/sveltejs/svelte/issues/2821))
+* Add docstrings to `svelte/store` ([#2795](https://github.com/sveltejs/svelte/pull/2795))
+
+## 3.4.1
+
+* Handle non-falsy non-function return values from derivers ([#2780](https://github.com/sveltejs/svelte/issues/2780))
+* Allow `spring` to work server-side ([#2773](https://github.com/sveltejs/svelte/issues/2773))
+
+## 3.4.0
+
+* Allow custom element to be defined without a `tag` ([#2417](https://github.com/sveltejs/svelte/issues/2417))
+* Fix parsing of quote marks inside attribute values ([#2715](https://github.com/sveltejs/svelte/pull/2754))
+* Convert `svelte/store` to TypeScript ([#2733](https://github.com/sveltejs/svelte/pull/2733))
+* Allow `debug` tags to include hoisted values ([#2764](https://github.com/sveltejs/svelte/issues/2764))
+* Parse error if attribute name is missing `=` ([#1513](https://github.com/sveltejs/svelte/pull/2770))
+* Allow reactive declarations to depend on mutated `const` values ([#2728](https://github.com/sveltejs/svelte/issues/2728))
+
+## 3.3.0
+
+* Allow multiple event listeners on a single node ([#2688](https://github.com/sveltejs/svelte/issues/2688))
+* Allow derivers to return a cleanup function ([#2553](https://github.com/sveltejs/svelte/issues/2553))
+* Support namespaced components (`<Foo.Bar/>`) ([#2743](https://github.com/sveltejs/svelte/pull/2743))
+
+## 3.2.2
+
+* Add `window` and `document` to expected globals ([#2722](https://github.com/sveltejs/svelte/pull/2722))
+* Prevent hoisting of functions that depend on reactive state ([#2703](https://github.com/sveltejs/svelte/pull/2703))
+* Generate correct code when slot has no changes ([#2697](https://github.com/sveltejs/svelte/issues/2697))
+* Prevent `Object.prototype`-related bugs ([#2696](https://github.com/sveltejs/svelte/pull/2696))
+
 ## 3.2.1
 
 * Use same comparison logic for `derived` as for other stores ([#2644](https://github.com/sveltejs/svelte/issues/2644))
diff --git a/README.md b/README.md
index bcda0501ad..7d0af8ac2e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,24 @@
-<p align="center">
+<p>
   <a href="https://svelte.dev">
 	<img alt="Cybernetically enhanced web apps: Svelte" src="https://svelte-assets.surge.sh/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://packagephobia.now.sh/result?p=svelte">
+    <img src="https://packagephobia.now.sh/badge?p=svelte" alt="install size">
+  </a>
+
+  <a href="https://travis-ci.org/sveltejs/svelte">
+    <img src="https://api.travis-ci.org/sveltejs/svelte.svg?branch=master"
+         alt="build status">
+  </a>
+
+  <a href="https://github.com/sveltejs/svelte/blob/master/LICENSE">
+    <img src="https://img.shields.io/npm/l/svelte.svg" alt="license">
+  </a>
 </p>
 
 
@@ -9,7 +26,7 @@
 
 Svelte is a new way to build web applications. It's a compiler that takes your declarative components and converts them into efficient JavaScript that surgically updates the DOM.
 
-Learn more at the [Svelte website](https://svelte.dev), or stop by the [Discord chatroom](https://discord.gg/yy75DKs).
+Learn more at the [Svelte website](https://svelte.dev), or stop by the [Discord chatroom](https://svelte.dev/chat).
 
 
 ## Development
@@ -19,7 +36,7 @@ Pull requests are encouraged and always welcome. [Pick an issue](https://github.
 To install and work on Svelte locally:
 
 ```bash
-git clone git@github.com:sveltejs/svelte.git
+git clone https://github.com/sveltejs/svelte.git
 cd svelte
 npm install
 ```
diff --git a/animate.mjs b/animate.mjs
deleted file mode 100644
index f22fabe401..0000000000
--- a/animate.mjs
+++ /dev/null
@@ -1,25 +0,0 @@
-import { cubicOut } from './easing';
-import { is_function } from './internal';
-
-export function flip(node, animation, params) {
-	const style = getComputedStyle(node);
-	const transform = style.transform === 'none' ? '' : style.transform;
-
-	const dx = animation.from.left - animation.to.left;
-	const dy = animation.from.top - animation.to.top;
-
-	const d = Math.sqrt(dx * dx + dy * dy);
-
-	const {
-		delay = 0,
-		duration = d => Math.sqrt(d) * 120,
-		easing = cubicOut
-	} = params;
-
-	return {
-		delay,
-		duration: is_function(duration) ? duration(d) : duration,
-		easing,
-		css: (t, u) => `transform: ${transform} translate(${u * dx}px, ${u * dy}px);`
-	};
-}
\ No newline at end of file
diff --git a/compiler.d.ts b/compiler.d.ts
new file mode 100644
index 0000000000..e2a3820bc5
--- /dev/null
+++ b/compiler.d.ts
@@ -0,0 +1 @@
+export * from './types/compiler';
diff --git a/package-lock.json b/package-lock.json
index 7c7363db2e..f1e8bf1d32 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "3.1.0",
+  "version": "3.4.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -64,6 +64,60 @@
       "integrity": "sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==",
       "dev": true
     },
+    "@typescript-eslint/eslint-plugin": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.9.0.tgz",
+      "integrity": "sha512-FOgfBorxjlBGpDIw+0LaZIXRX6GEEUfzj8LXwaQIUCp+gDOvkI+1WgugJ7SmWiISqK9Vj5r8S7NDKO/LB+6X9A==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/experimental-utils": "1.9.0",
+        "@typescript-eslint/parser": "1.9.0",
+        "eslint-utils": "^1.3.1",
+        "functional-red-black-tree": "^1.0.1",
+        "regexpp": "^2.0.1",
+        "requireindex": "^1.2.0",
+        "tsutils": "^3.7.0"
+      }
+    },
+    "@typescript-eslint/experimental-utils": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-1.9.0.tgz",
+      "integrity": "sha512-1s2dY9XxBwtS9IlSnRIlzqILPyeMly5tz1bfAmQ84Ul687xBBve5YsH5A5EKeIcGurYYqY2w6RkHETXIwnwV0A==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/typescript-estree": "1.9.0"
+      }
+    },
+    "@typescript-eslint/parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-1.9.0.tgz",
+      "integrity": "sha512-CWgC1XrQ34H/+LwAU7vY5xteZDkNqeAkeidEpJnJgkKu0yqQ3ZhQ7S+dI6MX4vmmM1TKRbOrKuXc6W0fIHhdbA==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/experimental-utils": "1.9.0",
+        "@typescript-eslint/typescript-estree": "1.9.0",
+        "eslint-scope": "^4.0.0",
+        "eslint-visitor-keys": "^1.0.0"
+      }
+    },
+    "@typescript-eslint/typescript-estree": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-1.9.0.tgz",
+      "integrity": "sha512-7Eg0TEQpCkTsEwsl1lIzd6i7L3pJLQFWesV08dS87bNz0NeSjbL78gNAP1xCKaCejkds4PhpLnZkaAjx9SU8OA==",
+      "dev": true,
+      "requires": {
+        "lodash.unescape": "4.0.1",
+        "semver": "5.5.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+          "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+          "dev": true
+        }
+      }
+    },
     "abab": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz",
@@ -148,9 +202,9 @@
       }
     },
     "ansi-escapes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
-      "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
       "dev": true
     },
     "ansi-regex": {
@@ -213,6 +267,16 @@
       "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
       "dev": true
     },
+    "array-includes": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
+      "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.7.0"
+      }
+    },
     "arrify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
@@ -246,15 +310,6 @@
       "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
       "dev": true
     },
-    "async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
-      "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.11"
-      }
-    },
     "async-limiter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
@@ -493,9 +548,9 @@
       }
     },
     "callsites": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.0.0.tgz",
-      "integrity": "sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true
     },
     "caseless": {
@@ -521,12 +576,6 @@
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
       "dev": true
     },
-    "circular-json": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-      "dev": true
-    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -808,6 +857,15 @@
       "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
       "dev": true
     },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
     "define-property": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
@@ -874,38 +932,14 @@
       "dev": true
     },
     "doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
       "requires": {
         "esutils": "^2.0.2"
       }
     },
-    "dom-serializer": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
-      "dev": true,
-      "requires": {
-        "domelementtype": "~1.1.1",
-        "entities": "~1.1.1"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
-          "dev": true
-        }
-      }
-    },
-    "domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true
-    },
     "domexception": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
@@ -915,25 +949,6 @@
         "webidl-conversions": "^4.0.2"
       }
     },
-    "domhandler": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "1"
-      }
-    },
-    "domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dev": true,
-      "requires": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -944,6 +959,12 @@
         "safer-buffer": "^2.1.0"
       }
     },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
     "end-of-stream": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
@@ -953,12 +974,6 @@
         "once": "^1.4.0"
       }
     },
-    "entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true
-    },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -968,6 +983,31 @@
         "is-arrayish": "^0.2.1"
       }
     },
+    "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==",
+      "dev": true,
+      "requires": {
+        "es-to-primitive": "^1.2.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "is-callable": "^1.1.4",
+        "is-regex": "^1.0.4",
+        "object-keys": "^1.0.12"
+      }
+    },
+    "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==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
     "es6-promise": {
       "version": "4.2.6",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz",
@@ -1011,48 +1051,61 @@
       }
     },
     "eslint": {
-      "version": "5.12.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.12.1.tgz",
-      "integrity": "sha512-54NV+JkTpTu0d8+UYSA8mMKAG4XAsaOrozA9rCW7tgneg1mevcL7wIotPC+fZ0SkWwdhNqoXoxnQCTBp7UvTsg==",
+      "version": "5.16.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
+      "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "ajv": "^6.5.3",
+        "ajv": "^6.9.1",
         "chalk": "^2.1.0",
         "cross-spawn": "^6.0.5",
         "debug": "^4.0.1",
-        "doctrine": "^2.1.0",
-        "eslint-scope": "^4.0.0",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^4.0.3",
         "eslint-utils": "^1.3.1",
         "eslint-visitor-keys": "^1.0.0",
-        "espree": "^5.0.0",
+        "espree": "^5.0.1",
         "esquery": "^1.0.1",
         "esutils": "^2.0.2",
-        "file-entry-cache": "^2.0.0",
+        "file-entry-cache": "^5.0.1",
         "functional-red-black-tree": "^1.0.1",
         "glob": "^7.1.2",
         "globals": "^11.7.0",
         "ignore": "^4.0.6",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
-        "inquirer": "^6.1.0",
-        "js-yaml": "^3.12.0",
+        "inquirer": "^6.2.2",
+        "js-yaml": "^3.13.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.3.0",
-        "lodash": "^4.17.5",
+        "lodash": "^4.17.11",
         "minimatch": "^3.0.4",
         "mkdirp": "^0.5.1",
         "natural-compare": "^1.4.0",
         "optionator": "^0.8.2",
         "path-is-inside": "^1.0.2",
-        "pluralize": "^7.0.0",
         "progress": "^2.0.0",
         "regexpp": "^2.0.1",
         "semver": "^5.5.1",
         "strip-ansi": "^4.0.0",
         "strip-json-comments": "^2.0.1",
-        "table": "^5.0.2",
+        "table": "^5.2.3",
         "text-table": "^0.2.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        }
       }
     },
     "eslint-import-resolver-node": {
@@ -1083,9 +1136,9 @@
       }
     },
     "eslint-module-utils": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.3.0.tgz",
-      "integrity": "sha512-lmDJgeOOjk8hObTysjqH7wyMi+nsHwwvfBykwfhjR1LNdd7C2uFJBvx4OpWYpXOw4df1yE1cDEVd1yLHitk34w==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz",
+      "integrity": "sha512-14tltLm38Eu3zS+mt0KvILC3q8jyIAH518MlG+HO0p+yK885Lb1UHTY/UgR91eOyGdmxAPb+OLoW4znqIT6Ndw==",
       "dev": true,
       "requires": {
         "debug": "^2.6.8",
@@ -1109,31 +1162,23 @@
         }
       }
     },
-    "eslint-plugin-html": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-5.0.0.tgz",
-      "integrity": "sha512-f7p/7YQdgQUFVAX3nB4dnMQbrDeTalcA01PDhuvTLk0ZadCwM4Pb+639SRuqEf1zMkIxckLY+ckCr0hVP5zl6A==",
-      "dev": true,
-      "requires": {
-        "htmlparser2": "^3.10.0"
-      }
-    },
     "eslint-plugin-import": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.15.0.tgz",
-      "integrity": "sha512-LEHqgR+RcnpGqYW7h9WMkPb/tP+ekKxWdQDztfTtZeV43IHF+X8lXU+1HOCcR4oXD24qRgEwNSxIweD5uNKGVg==",
+      "version": "2.17.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.17.3.tgz",
+      "integrity": "sha512-qeVf/UwXFJbeyLbxuY8RgqDyEKCkqV7YC+E5S5uOjAp4tOc8zj01JP3ucoBM8JcEqd1qRasJSg6LLlisirfy0Q==",
       "dev": true,
       "requires": {
+        "array-includes": "^3.0.3",
         "contains-path": "^0.1.0",
         "debug": "^2.6.9",
         "doctrine": "1.5.0",
         "eslint-import-resolver-node": "^0.3.2",
-        "eslint-module-utils": "^2.3.0",
+        "eslint-module-utils": "^2.4.0",
         "has": "^1.0.3",
         "lodash": "^4.17.11",
         "minimatch": "^3.0.4",
         "read-pkg-up": "^2.0.0",
-        "resolve": "^1.9.0"
+        "resolve": "^1.11.0"
       },
       "dependencies": {
         "debug": {
@@ -1160,13 +1205,22 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
+        },
+        "resolve": {
+          "version": "1.11.1",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
+          "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
+          "dev": true,
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
         }
       }
     },
     "eslint-scope": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-      "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.1.0",
@@ -1186,12 +1240,12 @@
       "dev": true
     },
     "espree": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.0.tgz",
-      "integrity": "sha512-1MpUfwsdS9MMoN7ZXqAr9e9UKdVHDcvrJpyx7mm1WuQlx/ygErEQBzgi5Nh5qBHIoYweprhtMkTCb9GhcAIcsA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
+      "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
       "dev": true,
       "requires": {
-        "acorn": "^6.0.2",
+        "acorn": "^6.0.7",
         "acorn-jsx": "^5.0.0",
         "eslint-visitor-keys": "^1.0.0"
       }
@@ -1227,9 +1281,9 @@
       "dev": true
     },
     "estree-walker": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.0.tgz",
-      "integrity": "sha512-peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw==",
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
+      "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
       "dev": true
     },
     "esutils": {
@@ -1363,13 +1417,12 @@
       }
     },
     "file-entry-cache": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
       "dev": true,
       "requires": {
-        "flat-cache": "^1.2.1",
-        "object-assign": "^4.0.1"
+        "flat-cache": "^2.0.1"
       }
     },
     "find-up": {
@@ -1382,17 +1435,22 @@
       }
     },
     "flat-cache": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
-      "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
       "dev": true,
       "requires": {
-        "circular-json": "^0.3.1",
-        "graceful-fs": "^4.1.2",
-        "rimraf": "~2.6.2",
-        "write": "^0.2.1"
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
       }
     },
+    "flatted": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz",
+      "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==",
+      "dev": true
+    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -1520,9 +1578,9 @@
       }
     },
     "globals": {
-      "version": "11.10.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.10.0.tgz",
-      "integrity": "sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ==",
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true
     },
     "globalyzer": {
@@ -1550,12 +1608,12 @@
       "dev": true
     },
     "handlebars": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.0.tgz",
-      "integrity": "sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz",
+      "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==",
       "dev": true,
       "requires": {
-        "async": "^2.5.0",
+        "neo-async": "^2.6.0",
         "optimist": "^0.6.1",
         "source-map": "^0.6.1",
         "uglify-js": "^3.1.4"
@@ -1592,6 +1650,12 @@
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true
     },
+    "has-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
+      "dev": true
+    },
     "has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -1673,20 +1737,6 @@
         "whatwg-encoding": "^1.0.1"
       }
     },
-    "htmlparser2": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.0.tgz",
-      "integrity": "sha512-J1nEUGv+MkXS0weHNWVKJJ+UrLfePxRWpN3C9bEi9fLxL2+ggW94DQvgYVXsaT30PGwYRIZKNZXuyMhp3Di4bQ==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^1.3.0",
-        "domhandler": "^2.3.0",
-        "domutils": "^1.5.1",
-        "entities": "^1.1.1",
-        "inherits": "^2.0.1",
-        "readable-stream": "^3.0.6"
-      }
-    },
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -1776,39 +1826,39 @@
       "dev": true
     },
     "inquirer": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz",
-      "integrity": "sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.3.1.tgz",
+      "integrity": "sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==",
       "dev": true,
       "requires": {
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.0",
+        "ansi-escapes": "^3.2.0",
+        "chalk": "^2.4.2",
         "cli-cursor": "^2.1.0",
         "cli-width": "^2.0.0",
-        "external-editor": "^3.0.0",
+        "external-editor": "^3.0.3",
         "figures": "^2.0.0",
-        "lodash": "^4.17.10",
+        "lodash": "^4.17.11",
         "mute-stream": "0.0.7",
         "run-async": "^2.2.0",
-        "rxjs": "^6.1.0",
+        "rxjs": "^6.4.0",
         "string-width": "^2.1.0",
-        "strip-ansi": "^5.0.0",
+        "strip-ansi": "^5.1.0",
         "through": "^2.3.6"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-          "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
         "strip-ansi": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-          "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.0.0"
+            "ansi-regex": "^4.1.0"
           }
         }
       }
@@ -1849,6 +1899,12 @@
         "builtin-modules": "^1.0.0"
       }
     },
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "dev": true
+    },
     "is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -1858,6 +1914,12 @@
         "kind-of": "^3.0.2"
       }
     },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true
+    },
     "is-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -1927,12 +1989,30 @@
         "@types/estree": "0.0.39"
       }
     },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.1"
+      }
+    },
     "is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
       "dev": true
     },
+    "is-symbol": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.0"
+      }
+    },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -1996,9 +2076,9 @@
       "dev": true
     },
     "js-yaml": {
-      "version": "3.12.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz",
-      "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==",
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
@@ -2166,6 +2246,12 @@
       "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
       "dev": true
     },
+    "lodash.unescape": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz",
+      "integrity": "sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=",
+      "dev": true
+    },
     "lru-cache": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
@@ -2448,6 +2534,12 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
+    "neo-async": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
+      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
+      "dev": true
+    },
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -2527,6 +2619,12 @@
         }
       }
     },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
+    },
     "object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -2671,9 +2769,9 @@
       "dev": true
     },
     "parent-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.0.tgz",
-      "integrity": "sha512-8Mf5juOMmiE4FcmzYc4IaiS9L3+9paz2KOiXzkRviCP6aDmN49Hz6EMWz0lGNp9pX80GvvAuLADtyGfW/Em3TA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
       "requires": {
         "callsites": "^3.0.0"
@@ -2775,12 +2873,6 @@
         "find-up": "^2.1.0"
       }
     },
-    "pluralize": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
-      "dev": true
-    },
     "pn": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
@@ -2888,17 +2980,6 @@
         "read-pkg": "^2.0.0"
       }
     },
-    "readable-stream": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-      "integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      }
-    },
     "regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
@@ -2987,6 +3068,12 @@
       "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
       "dev": true
     },
+    "requireindex": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
+      "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
+      "dev": true
+    },
     "resolve": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
@@ -3440,9 +3527,9 @@
       }
     },
     "rxjs": {
-      "version": "6.3.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-      "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz",
+      "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==",
       "dev": true,
       "requires": {
         "tslib": "^1.9.0"
@@ -3535,9 +3622,9 @@
       "dev": true
     },
     "slice-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.0.0.tgz",
-      "integrity": "sha512-4j2WTWjp3GsZ+AOagyzVbzp4vWGtZ0hEZ/gDY/uTvm6MTxUfTUIsnMIFb1bn8o0RuXiqUw15H1bue8f22Vw2oQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
       "dev": true,
       "requires": {
         "ansi-styles": "^3.2.0",
@@ -3816,15 +3903,6 @@
         "strip-ansi": "^4.0.0"
       }
     },
-    "string_decoder": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
-      "integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
-      "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",
@@ -3888,15 +3966,55 @@
       "dev": true
     },
     "table": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.2.1.tgz",
-      "integrity": "sha512-qmhNs2GEHNqY5fd2Mo+8N1r2sw/rvTAAvBZTaTx+Y7PHLypqyrxr1MdIu0pLw6Xvl/Gi4ONu/sdceP8vvUjkyA==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.0.tgz",
+      "integrity": "sha512-nHFDrxmbrkU7JAFKqKbDJXfzrX2UBsWmrieXFTGxiI5e4ncg3VqsZeI4EzNmX0ncp4XNGVeoxIWJXfCIXwrsvw==",
       "dev": true,
       "requires": {
-        "ajv": "^6.6.1",
+        "ajv": "^6.9.1",
         "lodash": "^4.17.11",
-        "slice-ansi": "2.0.0",
-        "string-width": "^2.1.1"
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
       }
     },
     "test-exclude": {
@@ -4151,6 +4269,15 @@
       "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
       "dev": true
     },
+    "tsutils": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.14.0.tgz",
+      "integrity": "sha512-SmzGbB0l+8I0QwsPgjooFRaRvHLBLNYM8SeQ0k6rtNDru5sCGeLJcZdwilNndN+GysuFjF5EIYgN8GfFG6UeUw==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.8.1"
+      }
+    },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -4182,26 +4309,26 @@
       "dev": true
     },
     "typescript": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz",
-      "integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==",
+      "version": "3.4.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.5.tgz",
+      "integrity": "sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==",
       "dev": true
     },
     "uglify-js": {
-      "version": "3.4.9",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
-      "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
+      "version": "3.5.12",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.12.tgz",
+      "integrity": "sha512-KeQesOpPiZNgVwJj8Ge3P4JYbQHUdZzpx6Fahy6eKAYRSV4zhVmLXoC+JtOeYxcHCHTve8RG1ZGdTvpeOUM26Q==",
       "dev": true,
       "optional": true,
       "requires": {
-        "commander": "~2.17.1",
+        "commander": "~2.20.0",
         "source-map": "~0.6.1"
       },
       "dependencies": {
         "commander": {
-          "version": "2.17.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+          "version": "2.20.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
           "dev": true,
           "optional": true
         }
@@ -4470,9 +4597,9 @@
       "dev": true
     },
     "write": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
       "dev": true,
       "requires": {
         "mkdirp": "^0.5.1"
diff --git a/package.json b/package.json
index b9f70f547a..5004c27cfb 100644
--- a/package.json
+++ b/package.json
@@ -1,22 +1,27 @@
 {
   "name": "svelte",
-  "version": "3.2.1",
+  "version": "3.4.4",
   "description": "Cybernetically enhanced web apps",
   "module": "index.mjs",
   "main": "index",
   "files": [
-    "compiler.js",
+    "types",
+    "compiler.*",
     "register.js",
     "index.*",
-    "internal.*",
-    "store.*",
-    "animate.*",
-    "transition.*",
-    "easing.*",
-    "motion.*",
+    "internal",
+    "store",
+    "animate",
+    "transition",
+    "easing",
+    "motion",
     "svelte",
     "README.md"
   ],
+  "engines": {
+    "node": ">= 8"
+  },
+  "types": "types/runtime",
   "scripts": {
     "test": "mocha --opts mocha.opts",
     "test:unit": "mocha --require sucrase/register --recursive ./**/__test__.ts",
@@ -25,13 +30,16 @@
     "coverage": "c8 report --reporter=text-lcov > coverage.lcov && c8 report --reporter=html",
     "codecov": "codecov",
     "precodecov": "npm run coverage",
-    "lint": "eslint src test/*.js",
     "build": "rollup -c",
-    "prepare": "npm run build",
+    "prepare": "npm run build && npm run tsd",
     "dev": "rollup -cw",
     "pretest": "npm run build",
-    "posttest": "agadoo src/internal/index.js",
-    "prepublishOnly": "export PUBLISH=true && npm run lint && npm test"
+    "posttest": "agadoo internal/index.mjs",
+    "prepublishOnly": "export PUBLISH=true && npm test && npm run create-stubs",
+    "create-stubs": "node scripts/create-stubs.js",
+    "tsd": "tsc -p . --emitDeclarationOnly",
+    "typecheck": "tsc -p . --noEmit",
+    "lint": "eslint \"{src,test}/**/*.{ts,js}\""
   },
   "repository": {
     "type": "git",
@@ -53,16 +61,17 @@
     "@sveltejs/svelte-repl": "0.0.5",
     "@types/mocha": "^5.2.0",
     "@types/node": "^10.5.5",
+    "@typescript-eslint/eslint-plugin": "^1.9.0",
+    "@typescript-eslint/parser": "^1.9.0",
     "acorn": "^6.1.1",
     "acorn-dynamic-import": "^4.0.0",
     "agadoo": "^1.0.1",
     "c8": "^3.4.0",
     "codecov": "^3.0.0",
     "css-tree": "1.0.0-alpha22",
-    "eslint": "^5.3.0",
-    "eslint-plugin-html": "^5.0.0",
-    "eslint-plugin-import": "^2.11.0",
-    "estree-walker": "^0.6.0",
+    "eslint": "^5.16.0",
+    "eslint-plugin-import": "^2.17.3",
+    "estree-walker": "^0.6.1",
     "is-reference": "^1.1.1",
     "jsdom": "^12.2.0",
     "kleur": "^3.0.0",
@@ -83,7 +92,7 @@
     "tiny-glob": "^0.2.1",
     "ts-node": "^8.0.2",
     "tslib": "^1.8.0",
-    "typescript": "^3.0.1"
+    "typescript": "^3.4.0"
   },
   "nyc": {
     "include": [
diff --git a/register.js b/register.js
index f5cbeb5063..3278c1cbf5 100644
--- a/register.js
+++ b/register.js
@@ -25,8 +25,7 @@ function deregisterExtension(extension) {
 
 function registerExtension(extension) {
 	require.extensions[extension] = function(module, filename) {
-		const name = path.basename(filename)
-			.slice(0, -path.extname(filename).length)
+		const name = path.parse(filename).name
 			.replace(/^\d/, '_$&')
 			.replace(/[^a-zA-Z0-9_$]/g, '');
 
@@ -46,4 +45,4 @@ function registerExtension(extension) {
 registerExtension('.svelte');
 registerExtension('.html');
 
-module.exports = register;
\ No newline at end of file
+module.exports = register;
diff --git a/rollup.config.js b/rollup.config.js
index f7b2d07d4b..8907ae4e6c 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -9,36 +9,70 @@ import pkg from './package.json';
 
 const is_publish = !!process.env.PUBLISH;
 
+const ts_plugin = is_publish
+	? typescript({
+		include: 'src/**',
+		typescript: require('typescript')
+	})
+	: sucrase({
+		transforms: ['typescript']
+	});
+
+const external = id => id.startsWith('svelte/');
+
 export default [
-	/* internal.[m]js */
+	/* runtime */
 	{
-		input: `src/internal/index.js`,
+		input: `src/runtime/index.ts`,
 		output: [
 			{
-				file: `internal.mjs`,
+				file: `index.mjs`,
 				format: 'esm',
-				paths: id => id.startsWith('svelte/') && id.replace('svelte', '.')
+				paths: id => id.startsWith('svelte/') && `${id.replace('svelte', '.')}`
 			},
 			{
-				file: `internal.js`,
+				file: `index.js`,
 				format: 'cjs',
-				paths: id => id.startsWith('svelte/') && id.replace('svelte', '.')
+				paths: id => id.startsWith('svelte/') && `${id.replace('svelte', '.')}`
 			}
 		],
-		external: id => id.startsWith('svelte/'),
-		plugins: [{
-			generateBundle(options, bundle) {
-				const mod = bundle['internal.mjs'];
-				if (mod) {
-					fs.writeFileSync('src/compile/internal-exports.ts', `// This file is automatically generated\nexport default new Set(${JSON.stringify(mod.exports)});`);
-				}
-			}
-		}]
+		external,
+		plugins: [ts_plugin]
 	},
 
+	...fs.readdirSync('src/runtime')
+		.filter(dir => fs.statSync(`src/runtime/${dir}`).isDirectory())
+		.map(dir => ({
+			input: `src/runtime/${dir}/index.ts`,
+			output: [
+				{
+					file: `${dir}/index.mjs`,
+					format: 'esm',
+					paths: id => id.startsWith('svelte/') && `${id.replace('svelte', '..')}`
+				},
+				{
+					file: `${dir}/index.js`,
+					format: 'cjs',
+					paths: id => id.startsWith('svelte/') && `${id.replace('svelte', '..')}`
+				}
+			],
+			external,
+			plugins: [
+				ts_plugin,
+				dir === 'internal' && {
+					generateBundle(options, bundle) {
+						const mod = bundle['index.mjs'];
+						if (mod) {
+							fs.writeFileSync('src/compiler/compile/internal-exports.ts', `// This file is automatically generated\nexport default new Set(${JSON.stringify(mod.exports)});`);
+						}
+					}
+				}
+			]
+		})),
+
 	/* compiler.js */
 	{
-		input: 'src/index.ts',
+		input: 'src/compiler/index.ts',
 		plugins: [
 			replace({
 				__VERSION__: pkg.version
@@ -48,15 +82,7 @@ export default [
 				include: ['node_modules/**']
 			}),
 			json(),
-			is_publish
-				? typescript({
-					include: 'src/**',
-					exclude: 'src/internal/**',
-					typescript: require('typescript')
-				})
-				: sucrase({
-					transforms: ['typescript']
-				})
+			ts_plugin
 		],
 		output: {
 			file: 'compiler.js',
@@ -67,34 +93,5 @@ export default [
 		external: is_publish
 			? []
 			: id => id === 'acorn' || id === 'magic-string' || id.startsWith('css-tree')
-	},
-
-	/* motion.mjs */
-	{
-		input: `src/motion/index.js`,
-		output: [
-			{
-				file: `motion.mjs`,
-				format: 'esm',
-				paths: id => id.startsWith('svelte/') && id.replace('svelte', '.')
-			},
-			{
-				file: `motion.js`,
-				format: 'cjs',
-				paths: id => id.startsWith('svelte/') && id.replace('svelte', '.')
-			}
-		],
-		external: id => id.startsWith('svelte/')
-	},
-
-	// everything else
-	...['index', 'store', 'easing', 'transition', 'animate'].map(name => ({
-		input: `${name}.mjs`,
-		output: {
-			file: `${name}.js`,
-			format: 'cjs',
-			paths: id => id.startsWith('svelte/') && id.replace('svelte', '.')
-		},
-		external: id => id !== `${name}.mjs`
-	}))
+	}
 ];
diff --git a/scripts/create-stubs.js b/scripts/create-stubs.js
new file mode 100644
index 0000000000..191b86cbfd
--- /dev/null
+++ b/scripts/create-stubs.js
@@ -0,0 +1,12 @@
+const fs = require('fs');
+
+fs.readdirSync('src/runtime')
+	.filter(dir => fs.statSync(`src/runtime/${dir}`).isDirectory())
+	.forEach(dir => {
+		fs.writeFileSync(`${dir}/package.json`, JSON.stringify({
+			main: './index.js',
+			module: './index.mjs'
+		}, null, '  '));
+
+		fs.writeFileSync(`${dir}/index.d.ts`, `export * from '../types/runtime/${dir}/index.d.ts';`);
+	});
\ No newline at end of file
diff --git a/site/Dockerfile b/site/Dockerfile
index f53e6a0c4a..c2a65122d9 100644
--- a/site/Dockerfile
+++ b/site/Dockerfile
@@ -1,4 +1,4 @@
-FROM mhart/alpine-node:11.14
+FROM mhart/alpine-node:12
 
 # install dependencies
 WORKDIR /app
@@ -9,7 +9,7 @@ RUN npm ci --production
 # Only copy over the Node pieces we need
 # ~> Saves 35MB
 ###
-FROM mhart/alpine-node:base-11.14
+FROM mhart/alpine-node:slim-12
 
 WORKDIR /app
 COPY --from=0 /app .
diff --git a/site/README.md b/site/README.md
index c438bda5ca..59380feffc 100644
--- a/site/README.md
+++ b/site/README.md
@@ -13,7 +13,11 @@ Start the server with `npm run dev`, and navigate to [localhost:3000](http://loc
 
 ## Using a local copy of Svelte
 
-By default, the REPL will fetch the most recent version of Svelte from https://unpkg.com/svelte. To use the local copy of the compiler and runtime from this repo, you can navigate to [localhost:3000/repl?version=local](http://localhost:3000/repl?version=local). To produce the proper browser-compatible UMD build, you will need to run `npm run build` with the `PUBLISH` environment variable set (to any non-empty string).
+By default, the REPL will fetch the most recent version of Svelte from https://unpkg.com/svelte. When running the site locally, you can also use your local copy of Svelte.
+
+To produce the proper browser-compatible UMD build of the compiler, you will need to run `npm run build` (or `npm run dev`) in the root of this repository with the `PUBLISH` environment variable set to any non-empty string.
+
+Then visit the REPL at [localhost:3000/repl?version=local](http://localhost:3000/repl?version=local).
 
 ## REPL GitHub integration
 
diff --git a/site/content/blog/2017-08-07-the-easiest-way-to-get-started.md b/site/content/blog/2017-08-07-the-easiest-way-to-get-started.md
index e91166430c..9d4c661615 100644
--- a/site/content/blog/2017-08-07-the-easiest-way-to-get-started.md
+++ b/site/content/blog/2017-08-07-the-easiest-way-to-get-started.md
@@ -44,9 +44,11 @@ In the terminal, you can instantly create a new project like so:
 npx degit sveltejs/template my-svelte-project
 cd my-svelte-project
 npm install
-npm run dev & open http://localhost:5000
+npm run dev
 ```
 
+This will create a new project in the `my-svelte-project` directory, install its dependencies, and start a server on http://localhost:5000.
+
 Once you've tinkered a bit and understood how everything fits together, you can fork [sveltejs/template](https://github.com/sveltejs/template) and start doing this instead:
 
 ```bash
@@ -55,4 +57,4 @@ npx degit your-name/template my-new-project
 
 And that's it! Do `npm run build` to create a production-ready version of your app, and check the project template's [README](https://github.com/sveltejs/template/blob/master/README.md) for instructions on how to easily deploy your app to the web with [Now](https://zeit.co/now) or [Surge](http://surge.sh/).
 
-You're not restricted to using Rollup — there are also integrations for [webpack](https://github.com/sveltejs/svelte-loader), [Browserify](https://github.com/tehshrike/sveltify) and others, or you can use the [Svelte CLI](https://github.com/sveltejs/svelte-cli) (Update from 2019: with Svelte 3 the CLI was deprecated and we now use [sirv-cli](https://www.npmjs.com/package/sirv-cli) in our template. Feel free to use whatever tool you like!) or the [API](https://github.com/sveltejs/svelte/tree/v2#api) directly. If you make a project template using one of these tools, please share it with the [Svelte Discord chatroom](https://discord.gg/yy75DKs), or via [@sveltejs](https://twitter.com/sveltejs) on Twitter!
+You're not restricted to using Rollup — there are also integrations for [webpack](https://github.com/sveltejs/svelte-loader), [Browserify](https://github.com/tehshrike/sveltify) and others, or you can use the [Svelte CLI](https://github.com/sveltejs/svelte-cli) (Update from 2019: with Svelte 3 the CLI was deprecated and we now use [sirv-cli](https://www.npmjs.com/package/sirv-cli) in our template. Feel free to use whatever tool you like!) or the [API](https://github.com/sveltejs/svelte/tree/v2#api) directly. If you make a project template using one of these tools, please share it with the [Svelte Discord chatroom](chat), or via [@sveltejs](https://twitter.com/sveltejs) on Twitter!
diff --git a/site/content/blog/2017-12-31-sapper-towards-the-ideal-web-app-framework.md b/site/content/blog/2017-12-31-sapper-towards-the-ideal-web-app-framework.md
index 040e95a8c3..8799fdacce 100644
--- a/site/content/blog/2017-12-31-sapper-towards-the-ideal-web-app-framework.md
+++ b/site/content/blog/2017-12-31-sapper-towards-the-ideal-web-app-framework.md
@@ -81,4 +81,4 @@ I believe the next frontier of web performance is 'whole-app optimisation'. Curr
 
 Speaking of Glimmer, the idea of compiling components to bytecode is one that we'll probably steal in 2018. A framework like Sapper could conceivably determine which compilation mode to use based on the characteristics of your app. It could even serve JavaScript for the initial route for the fastest possible startup time, then lazily serve a bytecode interpreter for subsequent routes, resulting in the optimal combination of startup size and total app size.
 
-Mostly, though, we want the direction of Sapper to be determined by its users. If you're the kind of developer who enjoys life on the bleeding edge and would like to help shape the future of how we build web apps, please join us on [GitHub](https://github.com/sveltejs/svelte) and [Discord](https://discord.gg/yy75DKs).
+Mostly, though, we want the direction of Sapper to be determined by its users. If you're the kind of developer who enjoys life on the bleeding edge and would like to help shape the future of how we build web apps, please join us on [GitHub](https://github.com/sveltejs/svelte) and [Discord](chat).
diff --git a/site/content/blog/2018-04-18-version-2.md b/site/content/blog/2018-04-18-version-2.md
index 778d703b1d..900debc0fb 100644
--- a/site/content/blog/2018-04-18-version-2.md
+++ b/site/content/blog/2018-04-18-version-2.md
@@ -12,7 +12,7 @@ Almost a year after we first started talking about version 2 on the Svelte issue
 
 ## tl;dr
 
-Each of these items is described in more depth below. If you get stuck, ask for help in our friendly [Discord chatroom](https://discord.gg/yy75DKs).
+Each of these items is described in more depth below. If you get stuck, ask for help in our friendly [Discord chatroom](chat).
 
 - Install Svelte v2 from npm
 - Upgrade your templates with [svelte-upgrade](https://github.com/sveltejs/svelte-upgrade)
@@ -201,4 +201,4 @@ Before, there was a `svelte.validate` method which checked your component was va
 
 ## My app is broken! Help!
 
-Hopefully this covers everything, and the update should be easier for you than it was for us. But if you find bugs, or discover things that aren't mentioned here, swing by [Discord chatroom](https://discord.gg/yy75DKs) or raise an issue on the [tracker](https://github.com/sveltejs/svelte/issues).
+Hopefully this covers everything, and the update should be easier for you than it was for us. But if you find bugs, or discover things that aren't mentioned here, swing by [Discord chatroom](chat) or raise an issue on the [tracker](https://github.com/sveltejs/svelte/issues).
diff --git a/site/content/blog/2019-01-31-svelte-on-the-changelog.md b/site/content/blog/2019-01-31-svelte-on-the-changelog.md
index 936c50240e..0b8e1894e4 100644
--- a/site/content/blog/2019-01-31-svelte-on-the-changelog.md
+++ b/site/content/blog/2019-01-31-svelte-on-the-changelog.md
@@ -14,9 +14,8 @@ Earlier this month, I had the privilege of appearing on [The Changelog](https://
 
 ...and, most importantly, Svelte 3.
 
-Unless you hang out in our [Discord server](https://discord.gg/yy75DKs) or follow [@sveltejs](https://twitter.com/sveltejs) on Twitter, you might not know that Svelte 3 is just around the corner, and it's going to be a huge release. We've rethought the developer experience from the ground up, and while it *will* be a nuisance if you need to upgrade a Svelte 2 app (more on that soon) we think you're going to love it.
+Unless you hang out in our [Discord server](chat) or follow [@sveltejs](https://twitter.com/sveltejs) on Twitter, you might not know that Svelte 3 is just around the corner, and it's going to be a huge release. We've rethought the developer experience from the ground up, and while it *will* be a nuisance if you need to upgrade a Svelte 2 app (more on that soon) we think you're going to love it.
 
 On the podcast [Adam](https://twitter.com/adamstac), [Jerod](https://twitter.com/jerodsanto) and I talk about some of the changes and why we're making them. You can listen here or on the [podcast page](https://changelog.com/podcast/332).
 
 <audio data-theme="night" style="width: 100%" data-src="https://changelog.com/podcast/332/embed" src="https://cdn.changelog.com/uploads/podcast/332/the-changelog-332.mp3" preload="none" class="changelog-episode" controls></audio><p><a href="https://changelog.com/podcast/332">The Changelog 332: A UI framework without the framework</a> – Listen on <a href="https://changelog.com/">Changelog.com</a></p><script async src="//cdn.changelog.com/embed.js"></script>
-
diff --git a/site/content/blog/2019-04-22-svelte-3-rethinking-reactivity.md b/site/content/blog/2019-04-22-svelte-3-rethinking-reactivity.md
index 0721c09692..3ae0085e86 100644
--- a/site/content/blog/2019-04-22-svelte-3-rethinking-reactivity.md
+++ b/site/content/blog/2019-04-22-svelte-3-rethinking-reactivity.md
@@ -94,4 +94,4 @@ We don't take this lightly: hopefully once you've experienced Svelte 3 you'll un
 
 As grueling as this release has been, we're nowhere near finished. We have a ton of ideas for generating smarter, more compact code, and a long feature wish-list. [Sapper](https://sapper.svelte.dev), our Next.js-style app framework, is still in the middle of being updated to use Svelte 3. The [Svelte Native](https://svelte-native.technology/) community project, which allows you to write Android and iOS apps in Svelte, is making solid progress but deserves more complete support from core. We don't yet have the bounty of editor extensions, syntax highlighters, component kits, devtools and so on that other frameworks have, and we should fix that. We *really* want to add first-class TypeScript support.
 
-But in the meantime we think Svelte 3 is the best way to build web apps yet. Take an hour to go through the [tutorial](tutorial) and we hope to convince you of the same. Either way, we'd love to see you in our [Discord chatroom](https://discord.gg/yy75DKs) and on [GitHub](https://github.com/sveltejs/svelte) — everyone is welcome, especially you.
\ No newline at end of file
+But in the meantime we think Svelte 3 is the best way to build web apps yet. Take an hour to go through the [tutorial](tutorial) and we hope to convince you of the same. Either way, we'd love to see you in our [Discord chatroom](chat) and on [GitHub](https://github.com/sveltejs/svelte) — everyone is welcome, especially you.
\ No newline at end of file
diff --git a/site/content/docs/00-introduction.md b/site/content/docs/00-introduction.md
index c218cdfb5f..2456b85f9c 100644
--- a/site/content/docs/00-introduction.md
+++ b/site/content/docs/00-introduction.md
@@ -2,7 +2,7 @@
 title: Before we begin
 ---
 
-> Temporary note: This document is a work-in-progress. Please forgive any missing or misleading parts, and don't be shy about asking for help in the [Discord chatroom](https://discord.gg/yy75DKs). The [tutorial](tutorial) is more complete; start there.
+> Temporary note: This document is a work-in-progress. Please forgive any missing or misleading parts, and don't be shy about asking for help in the [Discord chatroom](chat). The [tutorial](tutorial) is more complete; start there.
 
 This page contains detailed API reference documentation. It's intended to be a resource for people who already have some familiarity with Svelte.
 
diff --git a/site/content/docs/01-component-format.md b/site/content/docs/01-component-format.md
index 356fa1170d..ddd2667075 100644
--- a/site/content/docs/01-component-format.md
+++ b/site/content/docs/01-component-format.md
@@ -47,11 +47,14 @@ Svelte uses the `export` keyword to mark a variable declaration as a *property*
 	// Values that are passed in as props
 	// are immediately available
 	console.log(foo, bar);
-
-	// function declarations cannot be set externally,
-	// but can be accessed from outside
-	export function instanceMethod() {
-		alert(foo);
+	
+	// Function expressions can also be props
+	export let format = (number) => (number.toFixed(2));
+
+	// Function declarations are added as methods
+	// on the component, rather than props
+	export function greetMethod() {
+		alert(`I'm a <${this.constructor.name}>!`);
 	}
 
 	// you can also use export { ... as ... } to have
@@ -89,7 +92,7 @@ Because Svelte's reactivity is based on assignments, using array methods like `.
 
 ---
 
-Any top-level statement (i.e. not inside a block or a function) can be made reactive by prefixing it with the `$:` label. Reactive statements run immediately before the component updates, whenever the values that they depend on have changed.
+Any top-level statement (i.e. not inside a block or a function) can be made reactive by prefixing it with the `$:` [JS label syntax](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/label). Reactive statements run immediately before the component updates, whenever the values that they depend on have changed.
 
 ```html
 <script>
diff --git a/site/content/docs/02-template-syntax.md b/site/content/docs/02-template-syntax.md
index 917673a7b0..aad7e3fc19 100644
--- a/site/content/docs/02-template-syntax.md
+++ b/site/content/docs/02-template-syntax.md
@@ -7,7 +7,7 @@ title: Template syntax
 
 ---
 
-A lowercase tag, like `<div>`, denotes a regular HTML element. A capitalised tag, such as `<Widget>`, indicates a *component*.
+A lowercase tag, like `<div>`, denotes a regular HTML element. A capitalised tag, such as `<Widget>` or `<Namespace.Widget>`, indicates a *component*.
 
 ```html
 <script>
@@ -351,6 +351,24 @@ If the `on:` directive is used without a value, the component will *forward* the
 </button>
 ```
 
+---
+
+It's possible to have multiple event listeners for the same event:
+
+```html
+<script>
+	let counter = 0;
+	function increment() {
+		counter = counter + 1;
+	}
+
+	function track(event) {
+		trackEvent(event)
+	}
+</script>
+
+<button on:click={increment} on:click={track}>Click me!</button>
+```
 
 ### Component events
 
@@ -575,12 +593,12 @@ You can bind to component props using the same mechanism.
 
 Components also support `bind:this`, allowing you to interact with component instances programmatically.
 
-> Note that we can do `{cart.empty}` rather than `{() => cart.empty()}`, since component methods are closures. You don't need to worry about the value of `this` when calling them.
+> Note that we can't do `{cart.empty}` since `cart` is `undefined` when the button is first rendered and throws an error.
 
 ```html
 <ShoppingCart bind:this={cart}/>
 
-<button on:click={cart.empty}>
+<button on:click={() => cart.empty()}>
 	Empty shopping cart
 </button>
 ```
@@ -895,7 +913,138 @@ Local transitions only play when the block they belong to is created or destroye
 
 ### Animations
 
-TODO i can't remember how any of this works
+```sv
+animate:name
+```
+
+```sv
+animate:name={params}
+```
+
+```js
+animation = (node: HTMLElement, { from: DOMRect, to: DOMRect } , params: any) => {
+	delay?: number,
+	duration?: number,
+	easing?: (t: number) => number,
+	css?: (t: number, u: number) => string,
+	tick?: (t: number, u: number) => void
+}
+```
+
+```js
+DOMRect {
+	bottom: number,
+	height: number,
+	​​left: number,
+	right: number,
+	​top: number,
+	width: number,
+	x: number,
+	y:number
+}
+```
+
+---
+
+An animation is triggered when the contents of a [keyed each block](docs#Each_blocks) are re-ordered. Animations do not run when an element is removed, only when the each block's data is reordered. Animate directives must be on an element that is an *immediate* child of a keyed each block.
+
+Animations can be used with Svelte's [built-in animation functions](docs#svelte_animate) or [custom animation functions](docs#Custom_animation_functions).
+
+```html
+<!-- When `list` is reordered the animation will run-->
+{#each list as item, index (item)}
+	<li animate:flip>{item}</li>
+{/each}
+```
+
+#### Animation Parameters
+
+---
+
+As with actions and transitions, animations can have parameters.
+
+(The double `{{curlies}}` aren't a special syntax; this is an object literal inside an expression tag.)
+
+```html
+{#each list as item, index (item)}
+	<li animate:flip="{{ delay: 500 }}">{item}</li>
+{/each}
+```
+
+#### Custom animation functions
+
+---
+
+Animations can use custom functions that provide the `node`, an `animation` object and any `paramaters` as arguments. The `animation` parameter is an object containing `from` and `to` properties each containing a [DOMRect](https://developer.mozilla.org/en-US/docs/Web/API/DOMRect#Properties) describing the geometry of the element in its `start` and `end` positions. The `from` property is the DOMRect of the element in its starting position, the `to` property is the DOMRect of the element in its final position after the list has been reordered and the DOM updated.
+
+If the returned object has a `css` method, Svelte will create a CSS animation that plays on the element.
+
+The `t` argument passed to `css` is a value that goes from `0` and `1` after the `easing` function has been applied. The `u` argument is equal to `1 - t`.
+
+The function is called repeatedly *before* the animation begins, with different `t` and `u` arguments.
+
+
+```html
+<script>
+	import { cubicOut } from 'svelte/easing';
+
+	function whizz(node, { from, to }, params) {
+
+		const dx = from.left - to.left;
+		const dy = from.top - to.top;
+
+		const d = Math.sqrt(dx * dx + dy * dy);
+
+		return {
+			delay: 0,
+			duration: Math.sqrt(d) * 120,
+			easing: cubicOut,
+			css: (t, u) =>
+				`transform: translate(${u * dx}px, ${u * dy}px) rotate(${t*360}deg);`
+		};
+	}
+</script>
+
+{#each list as item, index (item)}
+	<div animate:whizz>{item}</div>
+{/each}
+```
+
+---
+
+
+A custom animation function can also return a `tick` function, which is called *during* the animation with the same `t` and `u` arguments.
+
+> If it's possible to use `css` instead of `tick`, do so — CSS animations can run off the main thread, preventing jank on slower devices.
+
+```html
+<script>
+	import { cubicOut } from 'svelte/easing';
+
+	function whizz(node, { from, to }, params) {
+
+		const dx = from.left - to.left;
+		const dy = from.top - to.top;
+
+		const d = Math.sqrt(dx * dx + dy * dy);
+
+		return {
+		delay: 0,
+		duration: Math.sqrt(d) * 120,
+		easing: cubicOut,
+		tick: (t, u) =>
+			Object.assign(node.style, {
+				color: t > 0.5 ? 'Pink' : 'Blue'
+			});
+	};
+	}
+</script>
+
+{#each list as item, index (item)}
+	<div animate:whizz>{item}</div>
+{/each}
+```
+
 
 
 ### Slots
@@ -1130,3 +1279,50 @@ The `<svelte:options>` element provides a place to specify per-component compile
 ```html
 <svelte:options tag="my-custom-element"/>
 ```
+
+
+### @debug
+
+```sv
+{@debug}
+```
+```sv
+{@debug var1, var2, ..., varN}
+```
+
+---
+
+The `{@debug ...}` tag offers an alternative to `console.log(...)`. It logs the values of specific variables whenever they change, and pauses code execution if you have devtools open.
+
+It accepts a comma-separated list of variable names (not arbitrary expressions).
+
+```html
+<script>
+	let user = {
+		firstname: 'Ada',
+		lastname: 'Lovelace'
+	};
+</script>
+
+{@debug user}
+
+<h1>Hello {user.firstname}!</h1>
+```
+
+---
+
+`{@debug ...}` accepts a comma-separated list of variable names (not arbitrary expressions).
+
+```html
+<!-- Compiles -->
+{@debug user}
+{@debug user1, user2, user3}
+
+<!-- WON'T compile -->
+{@debug user.firstname}
+{@debug myArray[0]}
+{@debug !isReady}
+{@debug typeof user === 'object'}
+```
+
+The `{@debug}` tag without any arguments will insert a `debugger` statement that gets triggered when *any* state changes, as opposed to the specified variables.
diff --git a/site/content/docs/03-run-time.md b/site/content/docs/03-run-time.md
index dfb270dc97..6db20b5d14 100644
--- a/site/content/docs/03-run-time.md
+++ b/site/content/docs/03-run-time.md
@@ -324,13 +324,13 @@ const time = readable(new Date(), set => {
 store = derived(a, callback: (a: any) => any)
 ```
 ```js
-store = derived(a, callback: (a: any, set: (value: any) => void) => void, initial_value: any)
+store = derived(a, callback: (a: any, set: (value: any) => void) => void | () => void, initial_value: any)
 ```
 ```js
 store = derived([a, ...b], callback: ([a: any, ...b: any[]]) => any)
 ```
 ```js
-store = derived([a, ...b], callback: ([a: any, ...b: any[]], set: (value: any) => void) => void, initial_value: any)
+store = derived([a, ...b], callback: ([a: any, ...b: any[]], set: (value: any) => void) => void | () => void, initial_value: any)
 ```
 
 ---
@@ -359,6 +359,20 @@ const delayed = derived(a, ($a, set) => {
 }, 'one moment...');
 ```
 
+If you return a function from the callback, it will be called when a) the callback runs again, or b) the last subscriber unsubscribes:
+
+```js
+import { derived } from 'svelte/store';
+
+const tick = derived(frequency, ($frequency, set) => {
+	const interval = setInterval(() => set(Date.now()), 1000 / frequency);
+
+	return () => {
+		clearInterval(interval);
+	}
+}, 'one moment...');
+```
+
 ---
 
 In both cases, an array of arguments can be passed as the first argument instead of a single store.
@@ -503,10 +517,204 @@ Both `set` and `update` can take a second argument — an object with `hard` or
 
 ### `svelte/transition`
 
-TODO
+The `svelte/transition` module exports six functions: `fade`, `fly`, `slide`, `scale`, `draw` and `crossfade`. They are for use with svelte [`transitions`](docs#Transitions).
+
+#### `fade`
+
+```sv
+transition:fade={params}
+```
+```sv
+in:fade={params}
+```
+```sv
+out:fade={params}
+```
+
+---
+
+Animates the opacity of an element from 0 to the current opacity for `in` transitions and from the current opacity to 0 for `out` transitions.
+
+`fade` accepts the following parameters:
+
+* `delay` (`number`, default 0) — milliseconds before starting
+* `duration` (`number`, default 400) — milliseconds the transition lasts
+
+You can see the `fade` transition in action in the [transition tutorial](tutorial/transition).
+
+```html
+<script>
+	import { fade } from 'svelte/transition';
+</script>
+
+{#if condition}
+	<div transition:fade="{{delay: 250, duration: 300}}">
+		fades in and out
+	</div>
+{/if}
+```
+
+#### `fly`
+
+```sv
+transition:fly={params}
+```
+```sv
+in:fly={params}
+```
+```sv
+out:fly={params}
+```
+
+---
+
+Animates the x and y positions and the opacity of an element. `in` transitions animate from an element's current (default) values to the provided values, passed as parameters. `out` transitions animate from the provided values to an element's default values.
+
+`fly` accepts the following parameters:
+
+* `delay` (`number`, default 0) — milliseconds before starting
+* `duration` (`number`, default 400) — milliseconds the transition lasts
+* `easing` (`function`, default `cubicOut`) — an [easing function](docs#svelte_easing)
+* `x` (`number`, default 0) - the x offset to animate out to and in from
+* `y` (`number`, default 0) - the y offset to animate out to and in from
+* `opacity` (`number`, default 0) - the opacity value to animate out to and in from
+
+You can see the `fly` transition in action in the [transition tutorial](tutorial/adding-parameters-to-transitions).
+
+```html
+<script>
+	import { fly } from 'svelte/transition';
+	import { quintOut } from 'svelte/easing';
+</script>
+
+{#if condition}
+	<div transition:fly="{{delay: 250, duration: 300, x: 100, y: 500, opacity: 0.5, easing: quintOut}}">
+		flies in and out
+	</div>
+{/if}
+```
+
+#### `slide`
+
+```sv
+transition:slide={params}
+```
+```sv
+in:slide={params}
+```
+```sv
+out:slide={params}
+```
+
+---
+
+Slides an element in and out.
+
+`slide` accepts the following parameters:
+
+* `delay` (`number`, default 0) — milliseconds before starting
+* `duration` (`number`, default 400) — milliseconds the transition lasts
+* `easing` (`function`, default `cubicOut`) — an [easing function](docs#svelte_easing)
+
+```html
+<script>
+	import { slide } from 'svelte/transition';
+	import { quintOut } from 'svelte/easing';
+</script>
+
+{#if condition}
+	<div transition:slide="{{delay: 250, duration: 300, easing: quintOut }}">
+		slides in and out
+	</div>
+{/if}
+```
+
+#### `scale`
+
+```sv
+transition:scale={params}
+```
+```sv
+in:scale={params}
+```
+```sv
+out:scale={params}
+```
+
+---
+
+Animates the opacity and scale of an element. `in` transitions animate from an element's current (default) values to the provided values, passed as parameters. `out` transitions animate from the provided values to an element's default values.
+
+`scale` accepts the following parameters:
+
+* `delay` (`number`, default 0) — milliseconds before starting
+* `duration` (`number`, default 400) — milliseconds the transition lasts
+* `easing` (`function`, default `cubicOut`) — an [easing function](docs#svelte_easing)
+* `start` (`number`, default 0) - the scale value to animate out to and in from
+* `opacity` (`number`, default 0) - the opacity value to animate out to and in from
+
+```html
+<script>
+	import { scale } from 'svelte/transition';
+	import { quintOut } from 'svelte/easing';
+</script>
+
+{#if condition}
+	<div transition:scale="{{duration: 500, delay: 500, opacity: 0.5, start: 0.5, easing: quintOut}}">
+		scales in and out
+	</div>
+{/if}
+```
+
+#### `draw`
+
+```sv
+transition:draw={params}
+```
+```sv
+in:draw={params}
+```
+```sv
+out:draw={params}
+```
+
+---
+
+Animates the stroke of an SVG element, like a snake in a tube. `in` transitions begin with the path invisible and draw the path to the screen over time. `out` transitions start in a visible state and gradually erase the path. `draw` only works with elements that have a `getTotalLength` method, like `<path>` and `<polyline>`.
+
+`scale` accepts the following parameters:
+
+* `delay` (`number`, default 0) — milliseconds before starting
+* `speed` (`number`, default undefined) - the speed of the animation, see below.
+* `duration` (`number` | `function`, default 800) — milliseconds the transition lasts
+* `easing` (`function`, default `cubicInOut`) — an [easing function](docs#svelte_easing)
+
+The `speed` parameter is a means of setting the duration of the transition relative to the path's length. It is modifier that is applied to the length of the path: `duration = length / speed`. A path that is 1000 pixels with a speed of 1 will have a duration of `1000ms`, setting the speed to `0.5` will halve that duration and setting it to `2` will double it.
+
+```html
+<script>
+	import { draw } from 'svelte/transition';
+	import { quintOut } from 'svelte/easing';
+</script>
+
+<svg viewBox="0 0 5 5" xmlns="http://www.w3.org/2000/svg">
+	{#if condition}
+		<path transition:draw="{{duration: 5000, delay: 500, easing: quintOut}}"
+					d="M2 1 h1 v1 h1 v1 h-1 v1 h-1 v-1 h-1 v-1 h1 z"
+					fill="none"
+					stroke="cornflowerblue"
+					stroke-width="0.1px"
+					stroke-linejoin="round"
+		/>
+	{/if}
+</svg>
+
+```
+
+
+<!-- Crossfade is coming soon... -->
+
 
-* fade, fly, slide, scale, draw
-* crossfade...
 
 ### `svelte/animate`
 
diff --git a/site/content/docs/04-compile-time.md b/site/content/docs/04-compile-time.md
index b019b9437b..c219bae497 100644
--- a/site/content/docs/04-compile-time.md
+++ b/site/content/docs/04-compile-time.md
@@ -308,8 +308,8 @@ const { code } = svelte.preprocess(source, [
 
 ```js
 walk(ast: Node, {
-	enter(node: Node, parent: Node)?: void,
-	leave(node: Node, parent: Node)?: void
+	enter(node: Node, parent: Node, prop: string, index: number)?: void,
+	leave(node: Node, parent: Node, prop: string, index: number)?: void
 })
 ```
 
@@ -323,13 +323,13 @@ The walker takes an abstract syntax tree to walk and an object with two optional
 ```js
 const svelte = require('svelte/compiler');
 svelte.walk(ast, {
-	enter(node, parent) {
+	enter(node, parent, prop, index) {
 		do_something(node);
 		if (should_skip_children(node)) {
 			this.skip();
 		}
 	},
-	leave(node, parent) {
+	leave(node, parent, prop, index) {
 		do_something_else(node);
 	}
 });
diff --git a/site/content/examples/06-lifecycle/02-update/App.svelte b/site/content/examples/06-lifecycle/02-update/App.svelte
index 373b6dcb6a..3eb2dceb52 100644
--- a/site/content/examples/06-lifecycle/02-update/App.svelte
+++ b/site/content/examples/06-lifecycle/02-update/App.svelte
@@ -1,5 +1,5 @@
 <script>
-	import Eliza from 'elizanode';
+	import Eliza from 'elizabot';
 	import { beforeUpdate, afterUpdate } from 'svelte';
 
 	let div;
diff --git a/site/content/examples/10-animations/00-animate/App.svelte b/site/content/examples/10-animations/00-animate/App.svelte
index c46096c204..faba1dd062 100644
--- a/site/content/examples/10-animations/00-animate/App.svelte
+++ b/site/content/examples/10-animations/00-animate/App.svelte
@@ -1,8 +1,9 @@
 <script>
 	import { quintOut } from 'svelte/easing';
-	import crossfade from './crossfade.js'; // TODO put this in svelte/transition!
+	import { crossfade } from 'svelte/transition';
+	import { flip } from 'svelte/animate';
 
-	const { send, receive } = crossfade({
+	const [send, receive] = crossfade({
 		fallback(node, params) {
 			const style = getComputedStyle(node);
 			const transform = style.transform === 'none' ? '' : style.transform;
@@ -43,12 +44,6 @@
 	function remove(todo) {
 		todos = todos.filter(t => t !== todo);
 	}
-
-	function handleKeydown(event) {
-		if (event.which === 13) {
-			addTodo(event.target);
-		}
-	}
 </script>
 
 <style>
@@ -114,7 +109,7 @@
 </style>
 
 <div class='board'>
-	<input class="new-todo" placeholder="what needs to be done?" on:enter={add}>
+	<input class="new-todo" placeholder="what needs to be done?" on:keydown="{event => event.which === 13 && add(this)}">
 
 	<div class='left'>
 		<h2>todo</h2>
@@ -122,6 +117,7 @@
 			<label
 				in:receive="{{key: todo.id}}"
 				out:send="{{key: todo.id}}"
+				animate:flip
 			>
 				<input type=checkbox bind:checked={todo.done}>
 				{todo.description}
@@ -136,6 +132,7 @@
 			<label
 				in:receive="{{key: todo.id}}"
 				out:send="{{key: todo.id}}"
+				animate:flip
 			>
 				<input type=checkbox bind:checked={todo.done}>
 				{todo.description}
@@ -143,4 +140,4 @@
 			</label>
 		{/each}
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/site/content/examples/10-animations/00-animate/crossfade.js b/site/content/examples/10-animations/00-animate/crossfade.js
deleted file mode 100644
index e11e18b60e..0000000000
--- a/site/content/examples/10-animations/00-animate/crossfade.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import { quintOut } from 'svelte/easing';
-
-export default function crossfade({ send, receive, fallback }) {
-	let requested = new Map();
-	let provided = new Map();
-
-	function crossfade(from, node) {
-		const to = node.getBoundingClientRect();
-		const dx = from.left - to.left;
-		const dy = from.top - to.top;
-
-		const style = getComputedStyle(node);
-		const transform = style.transform === 'none' ? '' : style.transform;
-
-		return {
-			duration: 400,
-			easing: quintOut,
-			css: (t, u) => `
-				opacity: ${t};
-				transform: ${transform} translate(${u * dx}px,${u * dy}px);
-			`
-		};
-	}
-
-	return {
-		send(node, params) {
-			provided.set(params.key, {
-				rect: node.getBoundingClientRect()
-			});
-
-			return () => {
-				if (requested.has(params.key)) {
-					const { rect } = requested.get(params.key);
-					requested.delete(params.key);
-
-					return crossfade(rect, node);
-				}
-
-				// if the node is disappearing altogether
-				// (i.e. wasn't claimed by the other list)
-				// then we need to supply an outro
-				provided.delete(params.key);
-				return fallback(node, params);
-			};
-		},
-
-		receive(node, params) {
-			requested.set(params.key, {
-				rect: node.getBoundingClientRect()
-			});
-
-			return () => {
-				if (provided.has(params.key)) {
-					const { rect } = provided.get(params.key);
-					provided.delete(params.key);
-
-					return crossfade(rect, node);
-				}
-
-				requested.delete(params.key);
-				return fallback(node, params);
-			};
-		}
-	};
-}
\ No newline at end of file
diff --git a/site/content/examples/19-7guis/05-7guis-crud/App.svelte b/site/content/examples/19-7guis/05-7guis-crud/App.svelte
index 1f39fe6642..a0d6ef7f3e 100644
--- a/site/content/examples/19-7guis/05-7guis-crud/App.svelte
+++ b/site/content/examples/19-7guis/05-7guis-crud/App.svelte
@@ -30,10 +30,7 @@
 
 	$: selected = filteredPeople[i];
 
-	$: {
-		first = selected ? selected.first : '';
-		last = selected ? selected.last : '';
-	}
+	$: reset_inputs(selected);
 
 	function create() {
 		people = people.concat({ first, last });
@@ -53,7 +50,8 @@
 	}
 
 	function reset_inputs(person) {
-		({ first, last } = person);
+		first = person ? person.first : '';
+		last = person ? person.last : '';
 	}
 </script>
 
diff --git a/site/content/examples/20-miscellaneous/02-immutable-data/flash.js b/site/content/examples/20-miscellaneous/02-immutable-data/flash.js
index 8dff9cbe2f..c788cc6d35 100644
--- a/site/content/examples/20-miscellaneous/02-immutable-data/flash.js
+++ b/site/content/examples/20-miscellaneous/02-immutable-data/flash.js
@@ -1,11 +1,13 @@
 export default function flash(element) {
-	element.style.transition = 'none';
-	element.style.color = 'rgba(255,62,0,1)';
-	element.style.backgroundColor = 'rgba(255,62,0,0.2)';
+	requestAnimationFrame(() => {
+		element.style.transition = 'none';
+		element.style.color = 'rgba(255,62,0,1)';
+		element.style.backgroundColor = 'rgba(255,62,0,0.2)';
 
-	setTimeout(() => {
-		element.style.transition = 'color 1s, background 1s';
-		element.style.color = '';
-		element.style.backgroundColor = '';
+		setTimeout(() => {
+			element.style.transition = 'color 1s, background 1s';
+			element.style.color = '';
+			element.style.backgroundColor = '';
+		});
 	});
 }
\ No newline at end of file
diff --git a/site/content/tutorial/01-introduction/03-dynamic-attributes/app-b/App.svelte b/site/content/tutorial/01-introduction/03-dynamic-attributes/app-b/App.svelte
index 6a12752e1a..e61b4d48e0 100644
--- a/site/content/tutorial/01-introduction/03-dynamic-attributes/app-b/App.svelte
+++ b/site/content/tutorial/01-introduction/03-dynamic-attributes/app-b/App.svelte
@@ -3,4 +3,4 @@
 	let name = 'Rick Astley';
 </script>
 
-<img {src} alt="{name} dancing">
\ No newline at end of file
+<img {src} alt="{name} dances.">
diff --git a/site/content/tutorial/01-introduction/03-dynamic-attributes/text.md b/site/content/tutorial/01-introduction/03-dynamic-attributes/text.md
index 6deaad5837..c503b4f548 100644
--- a/site/content/tutorial/01-introduction/03-dynamic-attributes/text.md
+++ b/site/content/tutorial/01-introduction/03-dynamic-attributes/text.md
@@ -16,13 +16,13 @@ That's better. But Svelte is giving us a warning:
 
 When building web apps, it's important to make sure that they're *accessible* to the broadest possible userbase, including people with (for example) impaired vision or motion, or people without powerful hardware or good internet connections. Accessibility (shortened to a11y) isn't always easy to get right, but Svelte will help by warning you if you write inaccessible markup.
 
-In this case, we're missing the `alt` tag that describes the image for people using screenreaders, or people with slow or flaky internet connections that can't download the image. Let's add one:
+In this case, we're missing the `alt` attribute that describes the image for people using screenreaders, or people with slow or flaky internet connections that can't download the image. Let's add one:
 
 ```html
-<img src={src} alt="A man dancing">
+<img src={src} alt="A man dances.">
 ```
 
-We can use curly braces *inside* attributes. Try changing it to `"{name} dancing"` — remember to declare a `name` variable in the `<script>` block.
+We can use curly braces *inside* attributes. Try changing it to `"{name} dances."` — remember to declare a `name` variable in the `<script>` block.
 
 
 ## Shorthand attributes
@@ -30,6 +30,6 @@ We can use curly braces *inside* attributes. Try changing it to `"{name} dancing
 It's not uncommon to have an attribute where the name and value are the same, like `src={src}`. Svelte gives us a convenient shorthand for these cases:
 
 ```html
-<img {src} alt="A man dancing">
+<img {src} alt="A man dances.">
 ```
 
diff --git a/site/content/tutorial/03-props/02-default-values/text.md b/site/content/tutorial/03-props/02-default-values/text.md
index dda6a370fe..1532407380 100644
--- a/site/content/tutorial/03-props/02-default-values/text.md
+++ b/site/content/tutorial/03-props/02-default-values/text.md
@@ -10,9 +10,9 @@ We can easily specify default values for props:
 </script>
 ```
 
-If we now instantiate the component without an `answer` prop, it will fall back to the default:
+If we now add a second component *without* an `answer` prop, it will fall back to the default:
 
 ```html
 <Nested answer={42}/>
 <Nested/>
-```
\ No newline at end of file
+```
diff --git a/site/content/tutorial/06-bindings/01-text-inputs/text.md b/site/content/tutorial/06-bindings/01-text-inputs/text.md
index 0082586133..7bcbc96fa6 100644
--- a/site/content/tutorial/06-bindings/01-text-inputs/text.md
+++ b/site/content/tutorial/06-bindings/01-text-inputs/text.md
@@ -4,7 +4,7 @@ title: Text inputs
 
 As a general rule, data flow in Svelte is *top down* — a parent component can set props on a child component, and a component can set attributes on an element, but not the other way around.
 
-Sometimes it's useful to break that rule. Take the case of the `<input>` element in this component — we *could* add an `on:input` event handler that set the value of `name` to `event.target.value`, but it's a bit... boilerplatey. It gets even worse with other kinds of form element, as we'll see.
+Sometimes it's useful to break that rule. Take the case of the `<input>` element in this component — we *could* add an `on:input` event handler that set the value of `name` to `event.target.value`, but it's a bit... boilerplatey. It gets even worse with other form elements, as we'll see.
 
 Instead, we can use the `bind:value` directive:
 
@@ -12,4 +12,4 @@ Instead, we can use the `bind:value` directive:
 <input bind:value={name}>
 ```
 
-This means that not only will changes to the value of `name` update the input value, but changes to the input value will update `name`.
\ No newline at end of file
+This means that not only will changes to the value of `name` update the input value, but changes to the input value will update `name`.
diff --git a/site/content/tutorial/07-lifecycle/03-update/app-a/App.svelte b/site/content/tutorial/07-lifecycle/03-update/app-a/App.svelte
index 2081b6ab8c..75fce63ca2 100644
--- a/site/content/tutorial/07-lifecycle/03-update/app-a/App.svelte
+++ b/site/content/tutorial/07-lifecycle/03-update/app-a/App.svelte
@@ -1,5 +1,5 @@
 <script>
-	import Eliza from 'elizanode';
+	import Eliza from 'elizabot';
 	import { beforeUpdate, afterUpdate } from 'svelte';
 
 	let div;
diff --git a/site/content/tutorial/07-lifecycle/03-update/app-b/App.svelte b/site/content/tutorial/07-lifecycle/03-update/app-b/App.svelte
index 373b6dcb6a..3eb2dceb52 100644
--- a/site/content/tutorial/07-lifecycle/03-update/app-b/App.svelte
+++ b/site/content/tutorial/07-lifecycle/03-update/app-b/App.svelte
@@ -1,5 +1,5 @@
 <script>
-	import Eliza from 'elizanode';
+	import Eliza from 'elizabot';
 	import { beforeUpdate, afterUpdate } from 'svelte';
 
 	let div;
diff --git a/site/content/tutorial/10-transitions/03-in-and-out/text.md b/site/content/tutorial/10-transitions/03-in-and-out/text.md
index 21cb221342..1f1ac2c80b 100644
--- a/site/content/tutorial/10-transitions/03-in-and-out/text.md
+++ b/site/content/tutorial/10-transitions/03-in-and-out/text.md
@@ -2,7 +2,13 @@
 title: In and out
 ---
 
-Instead of the `transition` directive, an element can have an `in` or an `out` directive, or both together:
+Instead of the `transition` directive, an element can have an `in` or an `out` directive, or both together. Import `fade` alongside `fly`...
+
+```js
+import { fade, fly } from 'svelte/transition';
+```
+
+...then replace the `transition` directive with separate `in` and `out` directives:
 
 ```html
 <p in:fly="{{ y: 200, duration: 2000 }}" out:fade>
diff --git a/site/content/tutorial/12-actions/01-actions/text.md b/site/content/tutorial/12-actions/01-actions/text.md
index 279dc3123f..38de8f9a65 100644
--- a/site/content/tutorial/12-actions/01-actions/text.md
+++ b/site/content/tutorial/12-actions/01-actions/text.md
@@ -27,7 +27,7 @@ import { pannable } from './pannable.js';
 ></div>
 ```
 
-Open the `pannable.js` file. Like transition functions, an action function receives a `node` and some optional parameters, and returns an action object. That object must have a `destroy` function, which is called when the element is unmounted.
+Open the `pannable.js` file. Like transition functions, an action function receives a `node` and some optional parameters, and returns an action object. That object can have a `destroy` function, which is called when the element is unmounted.
 
 We want to fire `panstart` event when the user mouses down on the element, `panmove` events (with `dx` and `dy` properties showing how far the mouse moved) when they drag it, and `panend` events when they mouse up. One possible implementation looks like this:
 
@@ -84,4 +84,3 @@ export function pannable(node) {
 Update the `pannable` function and try moving the box around.
 
 > This implementation is for demonstration purposes — a more complete one would also consider touch events.
-
diff --git a/site/content/tutorial/16-special-elements/07-svelte-options/app-a/flash.js b/site/content/tutorial/16-special-elements/07-svelte-options/app-a/flash.js
index 8dff9cbe2f..c788cc6d35 100644
--- a/site/content/tutorial/16-special-elements/07-svelte-options/app-a/flash.js
+++ b/site/content/tutorial/16-special-elements/07-svelte-options/app-a/flash.js
@@ -1,11 +1,13 @@
 export default function flash(element) {
-	element.style.transition = 'none';
-	element.style.color = 'rgba(255,62,0,1)';
-	element.style.backgroundColor = 'rgba(255,62,0,0.2)';
+	requestAnimationFrame(() => {
+		element.style.transition = 'none';
+		element.style.color = 'rgba(255,62,0,1)';
+		element.style.backgroundColor = 'rgba(255,62,0,0.2)';
 
-	setTimeout(() => {
-		element.style.transition = 'color 1s, background 1s';
-		element.style.color = '';
-		element.style.backgroundColor = '';
+		setTimeout(() => {
+			element.style.transition = 'color 1s, background 1s';
+			element.style.color = '';
+			element.style.backgroundColor = '';
+		});
 	});
 }
\ No newline at end of file
diff --git a/site/content/tutorial/16-special-elements/07-svelte-options/app-b/flash.js b/site/content/tutorial/16-special-elements/07-svelte-options/app-b/flash.js
index 8dff9cbe2f..c788cc6d35 100644
--- a/site/content/tutorial/16-special-elements/07-svelte-options/app-b/flash.js
+++ b/site/content/tutorial/16-special-elements/07-svelte-options/app-b/flash.js
@@ -1,11 +1,13 @@
 export default function flash(element) {
-	element.style.transition = 'none';
-	element.style.color = 'rgba(255,62,0,1)';
-	element.style.backgroundColor = 'rgba(255,62,0,0.2)';
+	requestAnimationFrame(() => {
+		element.style.transition = 'none';
+		element.style.color = 'rgba(255,62,0,1)';
+		element.style.backgroundColor = 'rgba(255,62,0,0.2)';
 
-	setTimeout(() => {
-		element.style.transition = 'color 1s, background 1s';
-		element.style.color = '';
-		element.style.backgroundColor = '';
+		setTimeout(() => {
+			element.style.transition = 'color 1s, background 1s';
+			element.style.color = '';
+			element.style.backgroundColor = '';
+		});
 	});
 }
\ No newline at end of file
diff --git a/site/content/tutorial/19-next-steps/01-congratulations/text.md b/site/content/tutorial/19-next-steps/01-congratulations/text.md
index e513989afe..c4436113bc 100644
--- a/site/content/tutorial/19-next-steps/01-congratulations/text.md
+++ b/site/content/tutorial/19-next-steps/01-congratulations/text.md
@@ -8,4 +8,4 @@ To get set up in your local development environment, check out [the quickstart g
 
 If you're looking for a more expansive framework that includes routing, server-side rendering and everything else, take a look at [Sapper](https://sapper.svelte.dev).
 
-Most importantly: since you're now a member of the Svelte community, you should [join our friendly Discord chatroom](https://discord.gg/yy75DKs). That's where you'll find fellow Svelte users, and it's where we plan the future of the framework.
\ No newline at end of file
+Most importantly: since you're now a member of the Svelte community, you should [join our friendly Discord chatroom](chat). That's where you'll find fellow Svelte users, and it's where we plan the future of the framework.
\ No newline at end of file
diff --git a/site/package-lock.json b/site/package-lock.json
index b0899b1779..b4cbd4f13a 100644
--- a/site/package-lock.json
+++ b/site/package-lock.json
@@ -33,23 +33,6 @@
         "resolve": "^1.3.2",
         "semver": "^5.4.1",
         "source-map": "^0.5.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
-        }
       }
     },
     "@babel/generator": {
@@ -808,23 +791,6 @@
         "debug": "^4.1.0",
         "globals": "^11.1.0",
         "lodash": "^4.17.11"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
-        }
       }
     },
     "@babel/types": {
@@ -1366,14 +1332,14 @@
       "integrity": "sha512-ym6ooqMr09+cV+y52p5kszJ0jYcX+nJfm8POrQb7QYowvpPPuneZ71EclHrQSB7a50lcytgR/xtL6AUFdvyEkg=="
     },
     "@polka/send": {
-      "version": "1.0.0-next.2",
-      "resolved": "https://registry.npmjs.org/@polka/send/-/send-1.0.0-next.2.tgz",
-      "integrity": "sha512-eq8gUzykpYPuOMrnyAzsL4KunhQXZKFiNsbThAwh19PrBAz2v8mECsj3YnxjYYifbB1w1vhR74nsXQWDi80oAg=="
+      "version": "1.0.0-next.3",
+      "resolved": "https://registry.npmjs.org/@polka/send/-/send-1.0.0-next.3.tgz",
+      "integrity": "sha512-54ftOGSZQMx8Xh8pnPgAj4499wppAEHQ892A7WacYOJ7ySuCWVgFmpODmXC2hU7qD9Scbi0iAu8rZls3ld+Eyg=="
     },
     "@polka/url": {
-      "version": "1.0.0-next.1",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.1.tgz",
-      "integrity": "sha512-6d8YbKW4hjJMnU6ZJSDLtALWiB4J//OIPaP885ruf5U8MLZHigocDxhjgvLwbV6bGkikhllgTjD9eWioKWAQdA=="
+      "version": "1.0.0-next.3",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.3.tgz",
+      "integrity": "sha512-Uom7l6OeP6vcf85lMImelYu5WKVWjXyhkpi9WsRdRzlJFJFPVhjBtBCktgDUj7dk1N5FURUdegSZ5XOjxf8JZg=="
     },
     "@sindresorhus/slugify": {
       "version": "0.9.1",
@@ -1396,13 +1362,15 @@
       }
     },
     "@sveltejs/svelte-repl": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/@sveltejs/svelte-repl/-/svelte-repl-0.0.10.tgz",
-      "integrity": "sha512-PYXCN8OC2q3WzwtMcbFinLGzFI7RlD3cHqjkUuQWDaIMHriKYuALun4H/FxP8w3B3hNe9OBprgGmBzlkPuGEJw==",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@sveltejs/svelte-repl/-/svelte-repl-0.1.5.tgz",
+      "integrity": "sha512-gk7Ny/i19g3njob9lGGV5JzDed8eAaFphHidxquFGW5QgMCScEu+YgweBo+tRkRE0sJObFzMz3MjudH5o+KdIw==",
       "dev": true,
       "requires": {
         "codemirror": "^5.45.0",
-        "sourcemap-codec": "^1.4.4"
+        "estree-walker": "^0.6.0",
+        "sourcemap-codec": "^1.4.4",
+        "yootils": "0.0.15"
       }
     },
     "@types/estree": {
@@ -1412,9 +1380,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "11.13.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-11.13.8.tgz",
-      "integrity": "sha512-szA3x/3miL90ZJxUCzx9haNbK5/zmPieGraZEe4WI+3srN0eGLiT22NXeMHmyhNEopn+IrxqMc7wdVwvPl8meg==",
+      "version": "12.0.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.2.tgz",
+      "integrity": "sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA==",
       "dev": true
     },
     "@types/pg": {
@@ -1660,14 +1628,14 @@
       "dev": true
     },
     "browserslist": {
-      "version": "4.5.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.6.tgz",
-      "integrity": "sha512-o/hPOtbU9oX507lIqon+UvPYqpx3mHc8cV3QemSBTXwkG8gSQSK6UKvXcE/DcleU3+A59XTUHyCvZ5qGy8xVAg==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.0.tgz",
+      "integrity": "sha512-Jk0YFwXBuMOOol8n6FhgkDzn3mY9PYLYGk29zybF05SbRTsMgPqmTNeQQhOghCxq5oFqAXE3u4sYddr4C0uRhg==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000963",
-        "electron-to-chromium": "^1.3.127",
-        "node-releases": "^1.1.17"
+        "caniuse-lite": "^1.0.30000967",
+        "electron-to-chromium": "^1.3.133",
+        "node-releases": "^1.1.19"
       }
     },
     "buffer": {
@@ -1742,9 +1710,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30000963",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000963.tgz",
-      "integrity": "sha512-n4HUiullc7Lw0LyzpeLa2ffP8KxFBGdxqD/8G3bSL6oB758hZ2UE2CVK+tQN958tJIi0/tfpjAc67aAtoHgnrQ==",
+      "version": "1.0.30000967",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz",
+      "integrity": "sha512-rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ==",
       "dev": true
     },
     "chalk": {
@@ -1833,9 +1801,9 @@
       "dev": true
     },
     "codemirror": {
-      "version": "5.46.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.46.0.tgz",
-      "integrity": "sha512-3QpMge0vg4QEhHW3hBAtCipJEWjTJrqLLXdIaWptJOblf1vHFeXLNtFhPai/uX2lnFCehWNk4yOdaMR853Z02w==",
+      "version": "5.47.0",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.47.0.tgz",
+      "integrity": "sha512-kV49Fr+NGFHFc/Imsx6g180hSlkGhuHxTSDDmDHOuyln0MQYFLixDY4+bFkBVeCEiepYfDimAF/e++9jPJk4QA==",
       "dev": true
     },
     "collection-visit": {
@@ -1970,12 +1938,12 @@
       }
     },
     "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
       "dev": true,
       "requires": {
-        "ms": "2.0.0"
+        "ms": "^2.1.1"
       }
     },
     "decamelize": {
@@ -2096,9 +2064,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.3.129",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.129.tgz",
-      "integrity": "sha512-puirJsgZnedlFEmRa7WEUIaS8ZgHHn7d7inph+RiapCc0x80hdoDyEEpR9z3aRUSZy4fGxOTOFcxnGmySlrmhA==",
+      "version": "1.3.134",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.134.tgz",
+      "integrity": "sha512-C3uK2SrtWg/gSWaluLHWSHjyebVZCe4ZC0NVgTAoTq8tCR9FareRK5T7R7AS/nPZShtlEcjVMX1kQ8wi4nU68w==",
       "dev": true
     },
     "emoji-regex": {
@@ -2157,9 +2125,9 @@
       "dev": true
     },
     "eslint-plugin-svelte3": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-svelte3/-/eslint-plugin-svelte3-1.0.0.tgz",
-      "integrity": "sha512-lsKUKPrzsjB4JAwmGhfg/Xssc/+L4KU8oL5WNZ0q/D3DkYkIVE4XpT/j8TY6oEFLd31Sznm7itw8Q7RsK6g0cA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-svelte3/-/eslint-plugin-svelte3-1.2.0.tgz",
+      "integrity": "sha512-7tuYh8YdwE9PP96U9qNJUSVMaxxUS/HZEZtEDlNGSAe0g40xd12pJo6lrc5wGxOmXpR6adGy5DnkSSF1UXGDKg==",
       "dev": true
     },
     "esm": {
@@ -2222,6 +2190,15 @@
         "to-regex": "^3.0.1"
       },
       "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -2239,6 +2216,12 @@
           "requires": {
             "is-extendable": "^0.1.0"
           }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         }
       }
     },
@@ -2373,14 +2356,6 @@
       "dev": true,
       "requires": {
         "is-buffer": "~2.0.3"
-      },
-      "dependencies": {
-        "is-buffer": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
-          "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==",
-          "dev": true
-        }
       }
     },
     "for-each": {
@@ -2408,9 +2383,9 @@
       }
     },
     "fs-minipass": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
-      "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz",
+      "integrity": "sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==",
       "dev": true,
       "requires": {
         "minipass": "^2.2.1"
@@ -2450,9 +2425,9 @@
       "dev": true
     },
     "glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
       "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
@@ -2547,6 +2522,12 @@
         "kind-of": "^4.0.0"
       },
       "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
@@ -2577,26 +2558,18 @@
       "dev": true
     },
     "html-minifier": {
-      "version": "3.5.21",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
-      "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
-      "dev": true,
-      "requires": {
-        "camel-case": "3.0.x",
-        "clean-css": "4.2.x",
-        "commander": "2.17.x",
-        "he": "1.2.x",
-        "param-case": "2.1.x",
-        "relateurl": "0.2.x",
-        "uglify-js": "3.4.x"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.17.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-          "dev": true
-        }
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz",
+      "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==",
+      "dev": true,
+      "requires": {
+        "camel-case": "^3.0.0",
+        "clean-css": "^4.2.1",
+        "commander": "^2.19.0",
+        "he": "^1.2.0",
+        "param-case": "^2.1.1",
+        "relateurl": "^0.2.7",
+        "uglify-js": "^3.5.1"
       }
     },
     "http-link-header": {
@@ -2606,9 +2579,9 @@
       "dev": true
     },
     "httpie": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/httpie/-/httpie-1.1.1.tgz",
-      "integrity": "sha512-KYgUXOhxVPo5mYuFPqnKW14fP5goMGkLc9CRz0WD6b1TCED9nl9wzj4jqr+8LY+AhPJQ/LdCQLRfF2JrBEja5Q=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/httpie/-/httpie-1.1.2.tgz",
+      "integrity": "sha512-VQ82oXG95oY1fQw/XecHuvcFBA+lZQ9Vwj1RfLcO8a7HpDd4cc2ukwpJt+TUlFaLUAzZErylxWu6wclJ1rUhUQ=="
     },
     "ieee754": {
       "version": "1.1.13",
@@ -2662,6 +2635,12 @@
         "kind-of": "^3.0.2"
       },
       "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -2680,9 +2659,9 @@
       "dev": true
     },
     "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
+      "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==",
       "dev": true
     },
     "is-callable": {
@@ -2700,6 +2679,12 @@
         "kind-of": "^3.0.2"
       },
       "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -2769,6 +2754,12 @@
         "kind-of": "^3.0.2"
       },
       "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -2949,13 +2940,6 @@
         "lodash.once": "^4.0.0",
         "ms": "^2.1.1",
         "semver": "^5.6.0"
-      },
-      "dependencies": {
-        "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=="
-        }
       }
     },
     "jwa": {
@@ -3195,9 +3179,9 @@
       }
     },
     "mime": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.2.tgz",
-      "integrity": "sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg=="
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz",
+      "integrity": "sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw=="
     },
     "mimic-fn": {
       "version": "2.1.0",
@@ -3326,11 +3310,19 @@
             "ms": "^2.1.1"
           }
         },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
+        "glob": {
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "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"
+          }
         },
         "supports-color": {
           "version": "6.0.0",
@@ -3356,10 +3348,9 @@
       "dev": true
     },
     "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -3412,9 +3403,9 @@
       "dev": true
     },
     "node-pg-migrate": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/node-pg-migrate/-/node-pg-migrate-3.19.0.tgz",
-      "integrity": "sha512-IIiiP6oHR9JDOqlIpaRFTnIedPIMXsYiMOkCPCSCGA2e+ZuDn/VS07CbDwVwKA+sBfwR0g5KIBx7QZGAS6sesQ==",
+      "version": "3.20.0",
+      "resolved": "https://registry.npmjs.org/node-pg-migrate/-/node-pg-migrate-3.20.0.tgz",
+      "integrity": "sha512-7crNxFNueGgLVYw74FIi0MFowbXlVVpK2ZVM0RvJkhlA0da0Gt+pLmQYFkAuCl2cdfcvK72yUEvtXiw0Uei5CQ==",
       "dev": true,
       "requires": {
         "@types/pg": "^7.4.0",
@@ -3426,9 +3417,9 @@
       }
     },
     "node-releases": {
-      "version": "1.1.17",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.17.tgz",
-      "integrity": "sha512-/SCjetyta1m7YXLgtACZGDYJdCSIBAWorDWkGCGZlydP2Ll7J48l7j/JxNYZ+xsgSPbWfdulVS/aY+GdjUsQ7Q==",
+      "version": "1.1.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.19.tgz",
+      "integrity": "sha512-SH/B4WwovHbulIALsQllAVwqZZD1kPmKCqrhGfR29dXjLAVZMHvBjD3S6nL9D/J9QkmZ1R92/0wCMDKXUUvyyA==",
       "dev": true,
       "requires": {
         "semver": "^5.3.0"
@@ -3498,6 +3489,12 @@
             "is-descriptor": "^0.1.0"
           }
         },
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -3725,9 +3722,9 @@
       }
     },
     "pg": {
-      "version": "7.10.0",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-7.10.0.tgz",
-      "integrity": "sha512-aE6FZomsyn3OeGv1oM50v7Xu5zR75c15LXdOCwA9GGrfjXsQjzwYpbcTS6OwEMhYfZQS6m/FVU/ilPLiPzJDCw==",
+      "version": "7.11.0",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-7.11.0.tgz",
+      "integrity": "sha512-YO4V7vCmEMGoF390LJaFaohWNKaA2ayoQOEZmiHVcAUF+YsRThpf/TaKCgSvsSE7cDm37Q/Cy3Gz41xiX/XjTw==",
       "requires": {
         "buffer-writer": "2.0.0",
         "packet-reader": "1.0.0",
@@ -3814,12 +3811,12 @@
       "dev": true
     },
     "polka": {
-      "version": "1.0.0-next.2",
-      "resolved": "https://registry.npmjs.org/polka/-/polka-1.0.0-next.2.tgz",
-      "integrity": "sha512-y82w42/8IA7bc4YwGwAmnbrXj8ZWWDGvnfwq1b0eCtFielZSSSJv7OXUIKQuc/vw5OCCM1hPIgrYsNPzbwDaJw==",
+      "version": "1.0.0-next.3",
+      "resolved": "https://registry.npmjs.org/polka/-/polka-1.0.0-next.3.tgz",
+      "integrity": "sha512-VmCsJK2uAqyjtV8e6ujEhgehibh+lvgdlrIgkTGsL+EKrCS/+BmGq57NV7yvkeGKI4XhsCw/J1YSeejmNfhbig==",
       "requires": {
-        "@polka/url": "^1.0.0-next.1",
-        "trouter": "^3.0.1"
+        "@polka/url": "^1.0.0-next.3",
+        "trouter": "^3.0.2"
       }
     },
     "posix-character-classes": {
@@ -3929,9 +3926,9 @@
       "dev": true
     },
     "regenerate-unicode-properties": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz",
-      "integrity": "sha512-SbA/iNrBUf6Pv2zU8Ekv1Qbhv92yxL4hiDa2siuxs4KKn4oOoMDHXjAf7+Nz9qinUQ46B1LcWEi/PhJfPWpZWQ==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz",
+      "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
       "dev": true,
       "requires": {
         "regenerate": "^1.4.0"
@@ -4047,9 +4044,9 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.1.tgz",
-      "integrity": "sha512-KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
+      "integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==",
       "dev": true,
       "requires": {
         "path-parse": "^1.0.6"
@@ -4077,9 +4074,9 @@
       }
     },
     "rollup": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.11.2.tgz",
-      "integrity": "sha512-H5sS7GZ/Rn0t119Et8mw0QXtg5HTOI/1FL57EKHk5oduRmGaraOf3KcEt6j+dXJ9tXxWQkG+/FBjPS4dzxo6EA==",
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.11.3.tgz",
+      "integrity": "sha512-81MR7alHcFKxgWzGfG7jSdv+JQxSOIOD/Fa3iNUmpzbd7p+V19e1l9uffqT8/7YAHgGOzmoPGN3Fx3L2ptOf5g==",
       "dev": true,
       "requires": {
         "@types/estree": "0.0.39",
@@ -4127,9 +4124,9 @@
       }
     },
     "rollup-plugin-node-resolve": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.2.3.tgz",
-      "integrity": "sha512-r+WaesPzdGEynpLZLALFEDugA4ACa5zn7bc/+LVX4vAXQQ8IgDHv0xfsSvJ8tDXUtprfBtrDtRFg27ifKjcJTg==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.2.4.tgz",
+      "integrity": "sha512-t/64I6l7fZ9BxqD3XlX4ZeO6+5RLKyfpwE2CiPNUKa+GocPlQhf/C208ou8y3AwtNsc6bjSk/8/6y/YAyxCIvw==",
       "dev": true,
       "requires": {
         "@types/resolve": "0.0.8",
@@ -4172,9 +4169,9 @@
       }
     },
     "rollup-pluginutils": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.6.0.tgz",
-      "integrity": "sha512-aGQwspEF8oPKvg37u3p7h0cYNwmJR1sCBMZGZ5b9qy8HGtETknqjzcxrDRrcAnJNXN18lBH4Q9vZYth/p4n8jQ==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.7.0.tgz",
+      "integrity": "sha512-FoP6L1YnMYTAR06Dpq5LE3jJtMwPE6H4VEOqFU23yoziZnqNRSiWcVy6YgEY5PdQB4G7278+8c4TvB0JKS1csA==",
       "dev": true,
       "requires": {
         "estree-walker": "^0.6.0",
@@ -4207,24 +4204,16 @@
       }
     },
     "sapper": {
-      "version": "0.26.0",
-      "resolved": "https://registry.npmjs.org/sapper/-/sapper-0.26.0.tgz",
-      "integrity": "sha512-KdouvzoCeCLirGwlf6U1KwT8GDTFNtK9KEQRFV8bQvNJQzwqS7+QyPAK8Z2MnR7gamluo+bDx84cTtnHD9I/mQ==",
+      "version": "0.27.1",
+      "resolved": "https://registry.npmjs.org/sapper/-/sapper-0.27.1.tgz",
+      "integrity": "sha512-RH0K1uQ3zJ1IXvowxr2SuboGXV69q22KaPMhhoM5VNDv9fsUlVHtluZE8WTcGxckiO2L1xFfgM7v/aINkSZpcw==",
       "dev": true,
       "requires": {
-        "html-minifier": "^3.5.21",
+        "html-minifier": "^4.0.0",
         "http-link-header": "^1.0.2",
         "shimport": "^1.0.0",
         "sourcemap-codec": "^1.4.4",
         "string-hash": "^1.1.3"
-      },
-      "dependencies": {
-        "shimport": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/shimport/-/shimport-1.0.0.tgz",
-          "integrity": "sha512-XKd+39voZT1rFR1ct+pr8sFSYAW6IvM3LeF87FrgcGHc/uSZ4GfOZVA42LE5LXFOpTWgmDC5sS8DNDtiV4Vd4Q==",
-          "dev": true
-        }
       }
     },
     "sax": {
@@ -4317,6 +4306,12 @@
         "rechoir": "^0.6.2"
       }
     },
+    "shimport": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shimport/-/shimport-1.0.0.tgz",
+      "integrity": "sha512-XKd+39voZT1rFR1ct+pr8sFSYAW6IvM3LeF87FrgcGHc/uSZ4GfOZVA42LE5LXFOpTWgmDC5sS8DNDtiV4Vd4Q==",
+      "dev": true
+    },
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
@@ -4324,9 +4319,9 @@
       "dev": true
     },
     "sirv": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/sirv/-/sirv-0.4.0.tgz",
-      "integrity": "sha512-k/dcRW7Ry2VgERDiLyyq3peGZEnqP2EcTcG5646QjoLwz7lnDA50i20m/3Rn7J4FLtimyoKQsG4E2BItctwjhg==",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-0.4.2.tgz",
+      "integrity": "sha512-dQbZnsMaIiTQPZmbGmktz+c74zt/hyrJEB4tdp2Jj0RNv9J6B/OWR5RyrZEvIn9fyh9Zlg2OlE2XzKz6wMKGAw==",
       "requires": {
         "@polka/url": "^0.5.0",
         "mime": "^2.3.1"
@@ -4355,6 +4350,15 @@
         "use": "^3.1.0"
       },
       "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
         "define-property": {
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
@@ -4372,6 +4376,12 @@
           "requires": {
             "is-extendable": "^0.1.0"
           }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         }
       }
     },
@@ -4435,6 +4445,12 @@
         "kind-of": "^3.2.0"
       },
       "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -4655,9 +4671,9 @@
       }
     },
     "svelte": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.2.0.tgz",
-      "integrity": "sha512-i/FSWUcqVw9JBo9bY69/ZI89WCCpyhdWjvAroOroI4qnQboh0WGlgjnFOEKOTvlv1XONd8cVpRGbOYYE3Ec6TQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.3.0.tgz",
+      "integrity": "sha512-iJYkIJDvAak1kizEYnE4b4eJ17D25fU0adW7GjDgO0klbjcAFlqtWEGFJa9kpJOlUtNLilcF09k4Y9TDmK/vjg==",
       "dev": true
     },
     "tar": {
@@ -4732,6 +4748,12 @@
         "kind-of": "^3.0.2"
       },
       "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -4772,29 +4794,23 @@
       "dev": true
     },
     "trouter": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trouter/-/trouter-3.0.1.tgz",
-      "integrity": "sha512-9IBGrlL5bW65xhWufCCf4AsZyxGVIxv7Jy+PTwNtfPHJo+8hAp4wvt/+ersAHE//0Lgjy7obPROfgasNocoYuA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/trouter/-/trouter-3.0.2.tgz",
+      "integrity": "sha512-wzUcM3oKmF8Fx5pd+3IxZj5LBugqW+hSQHm6cTHkpiZHL8w6YeZSzo3LPw0UdhlwaGPms3OxT7N4GEOIRTw+jw==",
       "requires": {
         "regexparam": "^1.2.0"
       }
     },
     "uglify-js": {
-      "version": "3.4.10",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
-      "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
+      "version": "3.5.14",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.14.tgz",
+      "integrity": "sha512-dgyjIw8KFK6AyVl5vm2tEqPewv5TKGEiiVFLI1LbF+oHua/Njd8tZk3lIbF1AWU1rNdEg7scaceADb4zqCcWXg==",
       "dev": true,
       "requires": {
-        "commander": "~2.19.0",
+        "commander": "~2.20.0",
         "source-map": "~0.6.1"
       },
       "dependencies": {
-        "commander": {
-          "version": "2.19.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
diff --git a/site/package.json b/site/package.json
index cc593634da..3f7172b8a8 100644
--- a/site/package.json
+++ b/site/package.json
@@ -3,16 +3,18 @@
   "version": "1.0.0",
   "description": "Docs and examples for Svelte",
   "scripts": {
-    "dev": "sapper dev",
+    "dev": "npm run copy-workers && sapper dev",
+    "copy-workers": "rm -rf static/workers && cp -r node_modules/@sveltejs/svelte-repl/workers static",
     "migrate": "node-pg-migrate -r dotenv/config",
-    "sapper": "sapper build --legacy",
+    "sapper": "npm run copy-workers && sapper build --legacy",
     "update_shimport": "cp node_modules/shimport/index.js __sapper__/build/client/shimport@0.0.14.js",
     "update": "node scripts/update_template.js && node scripts/get-contributors.js",
     "start": "node __sapper__/build",
     "cy:run": "cypress run",
     "cy:open": "cypress open",
     "test": "run-p --race dev cy:run",
-    "testsrc": "mocha -r esm test/**"
+    "testsrc": "mocha -r esm test/**",
+    "deploy": "make deploy"
   },
   "dependencies": {
     "@polka/redirect": "^1.0.0-next.0",
@@ -37,7 +39,7 @@
     "@babel/runtime": "^7.4.4",
     "@sindresorhus/slugify": "^0.9.1",
     "@sveltejs/site-kit": "^1.0.4",
-    "@sveltejs/svelte-repl": "0.0.10",
+    "@sveltejs/svelte-repl": "^0.1.5",
     "degit": "^2.1.3",
     "dotenv": "^8.0.0",
     "eslint-plugin-svelte3": "^1.0.0",
@@ -47,7 +49,7 @@
     "node-fetch": "^2.3.0",
     "node-pg-migrate": "^3.18.1",
     "npm-run-all": "^4.1.5",
-    "rollup": "^1.11.2",
+    "rollup": "^1.11.3",
     "rollup-plugin-babel": "^4.3.2",
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-json": "^4.0.0",
@@ -55,7 +57,7 @@
     "rollup-plugin-replace": "^2.2.0",
     "rollup-plugin-svelte": "^5.0.3",
     "rollup-plugin-terser": "^4.0.4",
-    "sapper": "^0.26.0",
+    "sapper": "^0.27.1",
     "shelljs": "^0.8.3",
     "svelte": "^3.0.0"
   },
diff --git a/site/scripts/build-svelte-app-json.js b/site/scripts/build-svelte-app-json.js
deleted file mode 100644
index 59a4b4a07b..0000000000
--- a/site/scripts/build-svelte-app-json.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const fs = require('fs');
-
-const files = [];
-
-for (const path of process.argv.slice(2)) {
-	if (!path.includes('/.')) {
-		files.push({ path: path.slice(19), data: fs.readFileSync(path).toString() });
-	}
-}
-
-fs.writeFileSync('static/svelte-app.json', JSON.stringify(files));
diff --git a/site/scripts/update_template.js b/site/scripts/update_template.js
index 814d402f5e..9d897c064f 100644
--- a/site/scripts/update_template.js
+++ b/site/scripts/update_template.js
@@ -1,7 +1,7 @@
 const sh = require('shelljs');
 const fs = require('fs');
 
-sh.cd(__dirname+'/../');
+sh.cd(__dirname + '/../');
 
 // fetch svelte app
 sh.rm('-rf','scripts/svelte-app');
@@ -16,7 +16,10 @@ const appPath = 'scripts/svelte-app';
 const files = [];
 
 for (const path of sh.find(appPath).filter(p => fs.lstatSync(p).isFile()) ) {
-	files.push({ path: path.slice(appPath.length + 1), data: fs.readFileSync(path).toString() });
+	const bytes = fs.readFileSync(path);
+	const string = bytes.toString();
+	const data = bytes.compare(Buffer.from(string)) === 0 ? string : [...bytes];
+	files.push({ path: path.slice(appPath.length + 1), data });
 }
 
 fs.writeFileSync('static/svelte-app.json', JSON.stringify(files));
\ No newline at end of file
diff --git a/site/src/components/Repl/ReplWidget.svelte b/site/src/components/Repl/ReplWidget.svelte
index 07a5814010..9d06fb7868 100644
--- a/site/src/components/Repl/ReplWidget.svelte
+++ b/site/src/components/Repl/ReplWidget.svelte
@@ -116,6 +116,7 @@
 		{#if process.browser}
 			<Repl
 				bind:this={repl}
+				workersUrl="workers"
 				fixed={mobile}
 				{svelteUrl}
 				{rollupUrl}
diff --git a/site/src/routes/_components/WhosUsingSvelte.svelte b/site/src/routes/_components/WhosUsingSvelte.svelte
index 1700312055..98a2696f64 100644
--- a/site/src/routes/_components/WhosUsingSvelte.svelte
+++ b/site/src/routes/_components/WhosUsingSvelte.svelte
@@ -18,15 +18,16 @@
 	a {
 		height: 40px;
 		margin: 0 0.5em 0.5em 0;
+		display: flex;
+		align-items: center;
 		border: 2px solid var(--second);
 		padding: 5px 10px;
 		border-radius: 20px;
+		color: var(--text);
 	}
 
 	.add-yourself {
-		display: flex;
-		align-items: center;
-		border: 2px solid var(--second);
+		color: var(--prime);
 	}
 
 	img {
@@ -52,7 +53,12 @@
 	<a target="_blank" rel="noopener" href="http://mustlab.ru"><img src="organisations/mustlab.png" alt="Mustlab logo"></a>
 	<a target="_blank" rel="noopener" href="https://www.nesta.org.uk"><img src="organisations/nesta.svg" alt="Nesta logo"></a>
 	<a target="_blank" rel="noopener" href="https://nytimes.com"><img src="organisations/nyt.svg" alt="The New York Times logo"></a>
+	<a target="_blank" rel="noopener" href="https://openstate.eu"><img src="organisations/open-state-foundation.svg" alt="Open State Foundation logo"></a>
 	<a target="_blank" rel="noopener" href="https://razorpay.com"><img src="organisations/razorpay.svg" alt="Razorpay logo"></a>
+	<a target="_blank" rel="noopener" href="https://sp.nl"><img src="organisations/socialist-party.svg" alt="Socialist Party logo"></a>
 	<a target="_blank" rel="noopener" href="https://www.stone.co"><img src="organisations/stone.svg" alt="Stone Payments logo"></a>
+	<a target="_blank" rel="noopener" href="https://www.strixengine.com"><img src="organisations/strixcloud.svg" alt="Strix Cloud logo"><span>Strix Cloud</span></a>
+	<a target="_blank" rel="noopener" href="https://thunderdome.dev"><img src="organisations/thunderdome.svg" alt="Thunderdome logo"></a>
+	<a target="_blank" rel="noopener" href="https://m.tokopedia.com"><img src="organisations/tokopedia.png" alt="Tokopedia logo"></a>
 	<a target="_blank" rel="noopener" href="https://github.com/sveltejs/svelte/blob/master/site/src/routes/_components/WhosUsingSvelte.svelte" class="add-yourself"><span>+ your company?</span></a>
 </div>
diff --git a/site/src/routes/_error.svelte b/site/src/routes/_error.svelte
index 282980a2ad..c23805166b 100644
--- a/site/src/routes/_error.svelte
+++ b/site/src/routes/_error.svelte
@@ -61,7 +61,7 @@
 				<p>Please try reloading the page.</p>
 			{/if}
 
-			<p>If the error persists, please drop by <a href="https://discord.gg/yy75DKs">Discord chatroom</a> and let us know, or raise an issue on <a href="https://github.com/sveltejs/svelte">GitHub</a>. Thanks!</p>
+			<p>If the error persists, please drop by <a href="chat">Discord chatroom</a> and let us know, or raise an issue on <a href="https://github.com/sveltejs/svelte">GitHub</a>. Thanks!</p>
 		{/if}
 	{:else}
 		<h1>It looks like you're offline</h1>
diff --git a/site/src/routes/_layout.svelte b/site/src/routes/_layout.svelte
index bc557fb4da..18c1d2a8b7 100644
--- a/site/src/routes/_layout.svelte
+++ b/site/src/routes/_layout.svelte
@@ -24,7 +24,7 @@
 
 		<NavItem external="https://sapper.svelte.dev">Sapper</NavItem>
 
-		<NavItem external="https://discord.gg/yy75DKs" title="Discord Chat">
+		<NavItem external="chat" title="Discord Chat">
 			<Icon name="message-square"/>
 		</NavItem>
 
diff --git a/site/src/routes/chat.js b/site/src/routes/chat.js
new file mode 100644
index 0000000000..2fdeda2675
--- /dev/null
+++ b/site/src/routes/chat.js
@@ -0,0 +1,4 @@
+export function get(req, res) {
+	res.writeHead(302, { Location: 'https://discord.gg/yy75DKs' });
+	res.end();
+}
\ No newline at end of file
diff --git a/site/src/routes/examples/index.svelte b/site/src/routes/examples/index.svelte
index a5c816561b..9fd783f950 100644
--- a/site/src/routes/examples/index.svelte
+++ b/site/src/routes/examples/index.svelte
@@ -39,6 +39,10 @@
 	let isLoading = false;
 	const cache = {};
 
+	function showExampleCodeOnChange() {
+		offset = 1;
+	}
+
 	$: title = title_by_slug[active_slug] || '';
 	$: first_slug = sections[0].examples[0].slug;
 	$: mobile = width < 768; // note: same as per media query below
@@ -46,7 +50,7 @@
 	$: if (repl && active_slug) {
 		if (active_slug in cache) {
 			repl.set({ components: cache[active_slug] });
-			offset = 1;
+			showExampleCodeOnChange();
 		} else {
 			isLoading = true;
 			fetch(`examples/${active_slug}.json`)
@@ -59,7 +63,7 @@
 				.then(components => {
 					cache[active_slug] = components;
 					repl.set({components});
-					offset = 1;
+					showExampleCodeOnChange();
 					isLoading = false;
 				})
 				.catch(() => {
@@ -102,6 +106,7 @@
 		<div class="repl-container" class:loading={isLoading}>
 			<Repl
 				bind:this={repl}
+				workersUrl="workers"
 				{svelteUrl}
 				{rollupUrl}
 				orientation={replOrientation}
diff --git a/site/src/routes/faq.js b/site/src/routes/faq.js
new file mode 100644
index 0000000000..6263494a4c
--- /dev/null
+++ b/site/src/routes/faq.js
@@ -0,0 +1,4 @@
+export function get(req, res) {
+	res.writeHead(302, { Location: 'https://github.com/sveltejs/svelte/wiki/FAQ' });
+	res.end();
+}
\ No newline at end of file
diff --git a/site/src/routes/index.svelte b/site/src/routes/index.svelte
index 539f522b4e..cbbdf43e95 100644
--- a/site/src/routes/index.svelte
+++ b/site/src/routes/index.svelte
@@ -89,7 +89,7 @@ npx degit sveltejs/template my-svelte-project
 cd my-svelte-project
 
 npm install
-npm run dev & open http://localhost:5000
+npm run dev
 		</pre>
 
 		<p style="flex: 1">See the <a href="blog/the-easiest-way-to-get-started">quickstart guide</a> for more information.</p>
diff --git a/site/src/routes/repl/[id]/index.svelte b/site/src/routes/repl/[id]/index.svelte
index 4c5a22d6da..f2a3c02173 100644
--- a/site/src/routes/repl/[id]/index.svelte
+++ b/site/src/routes/repl/[id]/index.svelte
@@ -206,6 +206,7 @@
 		<div class="viewport" class:offset={checked}>
 			<Repl
 				bind:this={repl}
+				workersUrl="workers"
 				{svelteUrl}
 				{rollupUrl}
 				{relaxed}
diff --git a/site/src/routes/repl/local/[file].js b/site/src/routes/repl/local/[...file].js
similarity index 63%
rename from site/src/routes/repl/local/[file].js
rename to site/src/routes/repl/local/[...file].js
index 20d9f509cb..7bd1c6a82c 100644
--- a/site/src/routes/repl/local/[file].js
+++ b/site/src/routes/repl/local/[...file].js
@@ -1,12 +1,13 @@
 import { createReadStream } from 'fs';
 
 export function get(req, res) {
-	if (process.env.NODE_ENV !== 'development' || !/^[a-z.]+$/.test(req.params.file)) {
+	const path = req.params.file.join('/');
+	if (process.env.NODE_ENV !== 'development' || ('/' + path).includes('/.')) {
 		res.writeHead(403);
 		res.end();
 		return;
 	}
-	createReadStream('../' + req.params.file)
+	createReadStream('../' + path)
 		.on('error', () => {
 			res.writeHead(403);
 			res.end();
diff --git a/site/src/routes/tutorial/[slug]/index.svelte b/site/src/routes/tutorial/[slug]/index.svelte
index 34c9d38f79..1f166d70bf 100644
--- a/site/src/routes/tutorial/[slug]/index.svelte
+++ b/site/src/routes/tutorial/[slug]/index.svelte
@@ -302,6 +302,7 @@
 		<div class="tutorial-repl">
 			<Repl
 				bind:this={repl}
+				workersUrl="workers"
 				{svelteUrl}
 				{rollupUrl}
 				orientation={mobile ? 'columns' : 'rows'}
diff --git a/site/src/server.js b/site/src/server.js
index 45f3e16dae..2adf3c5ad1 100644
--- a/site/src/server.js
+++ b/site/src/server.js
@@ -2,11 +2,12 @@ import sirv from 'sirv';
 import * as sapper from '@sapper/server';
 import { API } from './backend/auth';
 
-const { PORT=3000 } = process.env;
+const { PORT = 3000 } = process.env;
 
 API()
 	.use(
 		sirv('static', {
+			dev: process.env.NODE_ENV === 'development',
 			setHeaders(res) {
 				res.setHeader('Access-Control-Allow-Origin', '*');
 				res.hasHeader('Cache-Control') || res.setHeader('Cache-Control', 'max-age=600'); // 10min default
diff --git a/site/static/organisations/open-state-foundation.svg b/site/static/organisations/open-state-foundation.svg
new file mode 100644
index 0000000000..8e27e20d21
--- /dev/null
+++ b/site/static/organisations/open-state-foundation.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="338.41" height="73.575" version="1.1" viewBox="0 0 338.40898 73.574781" xmlns="http://www.w3.org/2000/svg"><path d="m117.93 21.04-44.5 44.49a31.51 31.51 0 0 0 44.5 -44.49" fill="#035c6e"/><path d="m126 8.0001-44.49 44.49a31.51 31.51 0 0 1 44.49 -44.49" fill="#7dd0e3"/><path d="m54.949 21.04-44.49 44.49a31.51 31.51 0 0 0 44.49 -44.49" fill="#035c6e"/><path d="m52.469 18.55-44.5 44.5a31.52 31.52 0 0 1 44.5 -44.5" fill="#7dd0e3"/><path d="m322.28 64.71h3.26v-14.13h0.05l8.68 14.13h4.14v-18.28h-3.26v13.68h-0.05l-8.5-13.68h-4.32zm-21.33-11.83a6.23 6.23 0 0 1 1.28 -2.12 5.81 5.81 0 0 1 2 -1.42 6.15 6.15 0 0 1 2.57 -0.52 6.24 6.24 0 0 1 2.59 0.52 5.8 5.8 0 0 1 2 1.42 6.57 6.57 0 0 1 1.28 2.12 7.45 7.45 0 0 1 0.45 2.63 7.8 7.8 0 0 1 -0.45 2.7 6.39 6.39 0 0 1 -1.3 2.13 5.81 5.81 0 0 1 -2 1.41 6.29 6.29 0 0 1 -2.56 0.5 6.16 6.16 0 0 1 -2.54 -0.5 5.87 5.87 0 0 1 -2 -1.41 6.21 6.21 0 0 1 -1.29 -2.13 7.8 7.8 0 0 1 -0.46 -2.7 7.45 7.45 0 0 1 0.46 -2.63m-3.31 6.55a9 9 0 0 0 5.14 5 10.43 10.43 0 0 0 3.92 0.71 10.55 10.55 0 0 0 3.94 -0.71 9.15 9.15 0 0 0 3.13 -2 8.92 8.92 0 0 0 2 -3 10.14 10.14 0 0 0 0.74 -3.92 10.29 10.29 0 0 0 -0.74 -4 8.61 8.61 0 0 0 -2 -3 9.28 9.28 0 0 0 -3.13 -1.89 11.18 11.18 0 0 0 -3.95 -0.67 11.05 11.05 0 0 0 -3.92 0.67 9.24 9.24 0 0 0 -3.1 1.91 8.72 8.72 0 0 0 -2 3 10.29 10.29 0 0 0 -0.74 4 10.14 10.14 0 0 0 0.71 3.9m-9.69 5.28h3.25v-18.28h-3.25zm-13.5 0h3.25v-15.45h5.61v-2.83h-14.45v2.84h5.61zm-18.46-7 2.87-7.44 2.81 7.44zm-6.41 7h3.64l1.66-4.19h7.93l1.71 4.19h3.72l-7.87-18.28h-2.81zm-15.9-2.84v-12.66h2.71a12.77 12.77 0 0 1 2.53 0.25 6.4 6.4 0 0 1 2.29 1 5.2 5.2 0 0 1 1.66 1.94 6.8 6.8 0 0 1 0.65 3.2 6.42 6.42 0 0 1 -0.65 3.08 5.29 5.29 0 0 1 -1.66 1.92 6.49 6.49 0 0 1 -2.29 1 10.93 10.93 0 0 1 -2.53 0.3zm-3.26 2.84h6.49a12.9 12.9 0 0 0 3.59 -0.53 9.77 9.77 0 0 0 3.25 -1.64 8.39 8.39 0 0 0 2.35 -2.84 8.78 8.78 0 0 0 0.91 -4.14 9.28 9.28 0 0 0 -0.91 -4.33 7.92 7.92 0 0 0 -2.33 -2.8 9.2 9.2 0 0 0 -3.25 -1.54 14.43 14.43 0 0 0 -3.59 -0.46h-6.49zm-22.74 0h3.26v-14.13h0.05l8.68 14.13h4.14v-18.28h-3.26v13.68h-0.05l-8.48-13.68h-4.32zm-6.47-18.28h-3.25v11.43a6.09 6.09 0 0 1 -0.21 1.59 4 4 0 0 1 -0.68 1.41 3.58 3.58 0 0 1 -1.27 1 4.4 4.4 0 0 1 -1.95 0.38 4.35 4.35 0 0 1 -2 -0.38 3.58 3.58 0 0 1 -1.27 -1 3.85 3.85 0 0 1 -0.68 -1.41 6.09 6.09 0 0 1 -0.21 -1.59v-11.43h-3.26v11.56a7.73 7.73 0 0 0 0.56 3 6.55 6.55 0 0 0 1.65 2.25 7 7 0 0 0 2.34 1.43 8.78 8.78 0 0 0 5.84 0 6.86 6.86 0 0 0 2.32 -1.43 6.55 6.55 0 0 0 1.5 -2.26 7.55 7.55 0 0 0 0.57 -3zm-35.87 6.45a6.4 6.4 0 0 1 1.3 -2.12 5.81 5.81 0 0 1 2 -1.42 6.15 6.15 0 0 1 2.57 -0.52 6.24 6.24 0 0 1 2.59 0.52 5.8 5.8 0 0 1 2 1.42 6.4 6.4 0 0 1 1.28 2.12 7.45 7.45 0 0 1 0.45 2.63 7.8 7.8 0 0 1 -0.45 2.7 6.37 6.37 0 0 1 -1.29 2.13 5.85 5.85 0 0 1 -2 1.41 6.29 6.29 0 0 1 -2.56 0.5 6.19 6.19 0 0 1 -2.54 -0.5 5.87 5.87 0 0 1 -2 -1.41 6.21 6.21 0 0 1 -1.29 -2.13 7.8 7.8 0 0 1 -0.45 -2.7 7.45 7.45 0 0 1 0.45 -2.63m-3.32 6.55a9 9 0 0 0 5.14 5 11.26 11.26 0 0 0 7.87 0 9.15 9.15 0 0 0 3.13 -2 8.92 8.92 0 0 0 2 -3 10.14 10.14 0 0 0 0.74 -3.92 10.29 10.29 0 0 0 -0.74 -4 8.61 8.61 0 0 0 -2 -3 9.28 9.28 0 0 0 -3.13 -1.91 11.89 11.89 0 0 0 -7.87 0 9.24 9.24 0 0 0 -3.1 1.91 8.72 8.72 0 0 0 -2 3 10.29 10.29 0 0 0 -0.73 4 10.14 10.14 0 0 0 0.73 3.92m-16.93 5.28h3.26v-7.7h8.06v-2.74h-8.06v-5h8.55v-2.84h-11.85z" fill="#035c6e"/><path d="m258.67 20.05a9.16 9.16 0 0 0 -3.23 -1.92 10.74 10.74 0 0 0 -3.62 -0.65 11.65 11.65 0 0 0 -2.93 0.37 8 8 0 0 0 -2.6 1.16 6.27 6.27 0 0 0 -1.86 2 6 6 0 0 0 -0.71 3 5.66 5.66 0 0 0 0.46 2.41 5.17 5.17 0 0 0 1.21 1.68 6.72 6.72 0 0 0 1.71 1.14 19.61 19.61 0 0 0 2 0.77c0.69 0.21 1.3 0.41 1.85 0.6a7.16 7.16 0 0 1 1.35 0.62 2.9 2.9 0 0 1 0.85 0.76 1.71 1.71 0 0 1 0.29 1 2.3 2.3 0 0 1 -0.23 1.06 1.84 1.84 0 0 1 -0.64 0.71 2.77 2.77 0 0 1 -0.93 0.39 4.92 4.92 0 0 1 -1.09 0.11 5.54 5.54 0 0 1 -2.5 -0.63 6 6 0 0 1 -2 -1.58l-3.38 3.38a9.16 9.16 0 0 0 3.48 2.23 12.39 12.39 0 0 0 4.35 0.78 11 11 0 0 0 3 -0.41 7.73 7.73 0 0 0 2.57 -1.27 6.21 6.21 0 0 0 1.79 -2.17 6.9 6.9 0 0 0 0.66 -3.12 5 5 0 0 0 -0.62 -2.62 6 6 0 0 0 -1.56 -1.76 8.16 8.16 0 0 0 -2.1 -1.13c-0.77-0.29-1.51-0.55-2.22-0.79-0.49-0.15-0.93-0.31-1.33-0.45a6.07 6.07 0 0 1 -1 -0.49 2.15 2.15 0 0 1 -0.65 -0.62 1.72 1.72 0 0 1 -0.22 -0.89 1.8 1.8 0 0 1 0.28 -1 2.42 2.42 0 0 1 0.7 -0.65 2.71 2.71 0 0 1 0.93 -0.34 5.86 5.86 0 0 1 1 -0.09 4.86 4.86 0 0 1 2 0.49 4.61 4.61 0 0 1 1.7 1.32z" fill="#035c6e"/><path d="m159.67 31a6.21 6.21 0 0 1 -1.24 2 5.66 5.66 0 0 1 -1.93 1.43 6.25 6.25 0 0 1 -4.83 0 5.48 5.48 0 0 1 -1.87 -1.34 6 6 0 0 1 -1.23 -2 7.39 7.39 0 0 1 -0.44 -2.62 7.56 7.56 0 0 1 0.42 -2.54 5.8 5.8 0 0 1 1.23 -2 5.63 5.63 0 0 1 1.89 -1.44 5.82 5.82 0 0 1 2.42 -0.49 5.91 5.91 0 0 1 2.44 0.49 5.44 5.44 0 0 1 1.89 1.33 6.12 6.12 0 0 1 1.23 2 7.33 7.33 0 0 1 0.42 2.61 7.62 7.62 0 0 1 -0.44 2.62m5-7.15a9.91 9.91 0 0 0 -2.39 -3.47 10.55 10.55 0 0 0 -3.57 -2.21 13.77 13.77 0 0 0 -9.08 0 10.7 10.7 0 0 0 -3.66 2.21 10 10 0 0 0 -2.37 3.45 11.33 11.33 0 0 0 -0.89 4.55 11.52 11.52 0 0 0 0.86 4.54 10.27 10.27 0 0 0 2.4 3.46 10.57 10.57 0 0 0 3.61 2.26 13.28 13.28 0 0 0 9.08 0 10.43 10.43 0 0 0 3.62 -2.26 10.15 10.15 0 0 0 2.43 -3.51 11.7 11.7 0 0 0 0.86 -4.54 11.5 11.5 0 0 0 -0.86 -4.53" fill="#035c6e"/><path d="m338.41 38.93v-4.31h-9.74v-4.35h8.69v-4.05h-8.69v-3.95h9.19v-4.26h-14.05v20.92zm-19.4-16.61v-4.31h-16.88v4.31h5.91v16.61h5.06v-16.61zm-25.9 8.45h-5.26l2.66-7.17zm8.63 8.16-8.69-20.92h-4.9l-8.78 20.92h5.5l1.54-4.11h8.09l1.63 4.11zm-22.78-16.61v-4.31h-16.87v4.31h5.91v16.61h5.05v-16.61z" fill="#035c6e"/><path d="m230.84 38.93v-20.92h-4.9l0.11 13.65h-0.08l-8.4-13.65h-5.76v20.92h4.91l-0.12-13.68h0.07l8.42 13.68zm-25.2 0v-4.31h-9.72v-4.35h8.68v-4.05h-8.68v-4h9.19v-4.21h-14.07v20.92z" fill="#035c6e"/><path d="m181.01 25.71a2.33 2.33 0 0 1 -0.81 0.78 3.69 3.69 0 0 1 -1.17 0.41 7.48 7.48 0 0 1 -1.36 0.12h-2.13v-4.93h2.22a9.54 9.54 0 0 1 1.32 0.09 3.33 3.33 0 0 1 1.13 0.35 2 2 0 0 1 0.8 0.74 2.21 2.21 0 0 1 0.3 1.21 2.34 2.34 0 0 1 -0.3 1.23m4.71-4.28a5.36 5.36 0 0 0 -1.74 -2 7.72 7.72 0 0 0 -2.6 -1.09 14.18 14.18 0 0 0 -3.21 -0.34h-7.68v20.93h5.05v-7.89h2.52a14 14 0 0 0 3.13 -0.35 8.07 8.07 0 0 0 2.66 -1.13 5.48 5.48 0 0 0 1.83 -2 7.43 7.43 0 0 0 0 -6.12" fill="#035c6e"/></svg>
\ No newline at end of file
diff --git a/site/static/organisations/socialist-party.svg b/site/static/organisations/socialist-party.svg
new file mode 100644
index 0000000000..6fc8348b0b
--- /dev/null
+++ b/site/static/organisations/socialist-party.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="136.5" height="76.6" version="1.1" viewBox="0 0 136.5 76.599998" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-20.6,-7)" fill="#ec1b23"><path d="m36.4 57.2v5.2c0 4.2 1.4 7.9 6.8 7.9 4 0 5.7-3.6 5.7-7.3 0-6.1-5.1-8.5-9.5-11.2-5.3-3-9.7-5.8-12.9-9.5-3.1-3.7-5-8.2-5-14.6 0-13.7 8.3-20.7 21.5-20.7 14.9 0 22.5 9.9 21.7 23.7h-15.8c-0.2-4.3 0-10.1-5.6-10.5-3.5-0.3-5.5 1.7-5.9 4.9-0.5 4.4 1.8 6.6 5.2 9 6.4 4.1 12 6.6 16 10.3s6.3 8.6 6.3 17.4c0 14-7.8 21.8-22 21.8-15.7 0-22.3-8.8-22.3-18.4v-7.8h15.8z"/><path d="m72.8 81.6v-73h20.3c6.6 0 16.2 0.6 20.9 6 4 4.5 4.8 9.9 4.8 15.9 0 7.9-1.8 16.7-9.6 20.3-5.9 2.9-12.8 2-19.3 2.3v28.4h-17.1zm17.1-41.5c3.2-0.1 6.9 0.3 9.6-1.8 1.8-1.9 2.1-4.9 2.1-7.4 0-2.8-0.3-7.1-3.2-8.5-1.7-0.6-4-0.6-6.7-0.6h-1.8z"/><path d="m152.1 54.5c-2.2-2.2-4.8-3.3-7.7-3.3-2.5 0-4.2 0.8-5.3 1.4-0.2 0.1-0.2 0.3-0.2 0.5l0.7 2c0.1 0.2 0.2 0.3 0.4 0.3h4.3c0.2 0 0.3 0.1 0.4 0.3s0 0.3-0.1 0.4l-3.4 2.5c-0.1 0.1-0.2 0.3-0.1 0.4l1.3 4.1c0.1 0.2 0 0.3-0.1 0.4s-0.3 0.1-0.4 0l-3.9-2.5c-0.1-0.1-0.3-0.1-0.4 0l-3.5 2.5c-0.1 0.1-0.3 0.1-0.4 0s-0.2-0.3-0.1-0.4l1.3-4.1c0.1-0.2 0-0.3-0.1-0.4l-3.4-2.5c-0.1-0.1-0.2-0.3-0.1-0.4 0.1-0.2 0.2-0.3 0.4-0.3h4.3c0.2 0 0.3-0.1 0.4-0.3l0.7-2c0.1-0.2 0-0.4-0.2-0.5-1.1-0.6-2.8-1.4-5.3-1.4-2.9 0-5.6 1.1-7.7 3.3-2.9 2.9-4.6 7.3-4.6 11.9 0 9.4 8.5 17 18.9 17s18.9-7.6 18.9-17c-0.4-4.6-2.1-9.1-5-11.9z"/></g></svg>
\ No newline at end of file
diff --git a/site/static/organisations/strixcloud.svg b/site/static/organisations/strixcloud.svg
new file mode 100644
index 0000000000..49fe96b061
--- /dev/null
+++ b/site/static/organisations/strixcloud.svg
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="77.812546"
+   height="65.824883"
+   version="1.1"
+   viewBox="0 0 20.587969 17.416218"
+   id="svg3851"
+   sodipodi:docname="strix-logo-web.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <metadata
+     id="metadata3855">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1373"
+     id="namedview3853"
+     showgrid="false"
+     inkscape:zoom="12.474013"
+     inkscape:cx="9.5353719"
+     inkscape:cy="29.397461"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g3849"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <defs
+     id="defs3783">
+    <linearGradient
+       id="SVGID_1_"
+       x1="675.27002"
+       x2="707.73999"
+       y1="88.300003"
+       y2="88.300003"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.26458,0,0,0.26458,-179.34646,261.28646)">
+      <stop
+         stop-color="#565756"
+         offset="0"
+         id="stop3778"
+         style="stop-color:#ff4081;stop-opacity:0.94117647" />
+      <stop
+         stop-color="#131313"
+         offset="1"
+         id="stop3780" />
+    </linearGradient>
+    <linearGradient
+       id="2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.71308228,0,0,0.71691205,-280.60594,-94.816757)"
+       x1="396.64001"
+       y1="546.10999"
+       x2="394.41"
+       y2="538.60999">
+      <stop
+         stop-color="#b7d7e1"
+         id="stop5184" />
+      <stop
+         offset="1"
+         stop-color="#fff"
+         id="stop5186" />
+    </linearGradient>
+    <linearGradient
+       id="1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.45111156,0,0,0.45353436,-179.31551,50.009071)"
+       x1="393.82999"
+       y1="549.46002"
+       x2="390.45001"
+       y2="542.88">
+      <stop
+         stop-color="#c3e6ee"
+         id="stop5179" />
+      <stop
+         offset="1"
+         stop-color="#fff"
+         id="stop5181" />
+    </linearGradient>
+    <linearGradient
+       id="0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.59937345,0,0,0.60259335,245.86106,-30.678204)"
+       x1="393.82999"
+       y1="549.46002"
+       x2="395.79001"
+       y2="542.83002">
+      <stop
+         stop-color="#c8e1e8"
+         id="stop5174" />
+      <stop
+         offset="1"
+         stop-color="#fff"
+         id="stop5176" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SVGID_1_"
+       id="linearGradient5276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.26458,0,0,0.26458,-179.34646,261.28646)"
+       x1="675.27002"
+       y1="88.300003"
+       x2="707.73999"
+       y2="88.300003" />
+  </defs>
+  <g
+     transform="translate(5.7515037,-283.32597)"
+     id="g3849">
+    <path
+       id="path5191"
+       d="m -1.1904367,292.97168 c -0.299931,-0.23541 -0.6770741,-0.37577 -1.0861321,-0.37577 -0.96362,0 -1.7477619,0.77728 -1.7724709,1.7457 -0.994505,0.37715 -1.702464,1.34763 -1.702464,2.48489 0,1.34386 0.987985,2.45401 2.2693799,2.62937 v 0.024 H 5.595054 v -0.004 c 1.265609,-0.0741 2.2693798,-1.13555 2.2693798,-2.4341 0,-1.25223 -0.9334208,-2.2838 -2.1352008,-2.42278 0.0048,-0.0762 0.0076,-0.1534 0.0076,-0.23095 0,-1.94063 -1.6194168,-3.51372 -3.6166637,-3.51372 -1.47837401,0 -2.74878801,0.86205 -3.310556,2.09677"
+       inkscape:connector-curvature="0"
+       style="fill:url(#2);stroke-width:0.34316954" />
+    <g
+       id="g5271"
+       transform="translate(0.795721,0.02191)">
+      <polygon
+         transform="matrix(0.26458,0,0,0.26458,-179.32,261.26)"
+         class="st9"
+         points="671.3,126.2 671.8,120.3 674.2,125.4 673.7,131.3 "
+         id="polygon3805"
+         style="fill:#567b03" />
+      <polygon
+         transform="matrix(0.26458,0,0,0.26458,-179.32,261.26)"
+         class="st10"
+         points="671.3,126.2 671.8,120.3 674.2,125.4 673.7,131.3 "
+         id="polygon3807"
+         style="fill:#231815" />
+      <g
+         transform="matrix(0.26458,0,0,0.26458,-179.32,261.26)"
+         class="st11"
+         id="g3813"
+         style="enable-background:new">
+        <path
+           class="st9"
+           d="m 670.8,127.3 -2.4,-5.1 c 0.3,-1.9 6.9,-37.6 6.8,-37.9 l 2.4,5.1 c 0.2,0.4 -6.4,36.1 -6.8,37.9"
+           id="path3809"
+           inkscape:connector-curvature="0"
+           style="fill:#567b03" />
+        <path
+           class="st10"
+           d="m 670.8,127.3 -2.4,-5.1 c 0.3,-1.9 6.9,-37.6 6.8,-37.9 l 2.4,5.1 c 0.2,0.4 -6.4,36.1 -6.8,37.9"
+           id="path3811"
+           inkscape:connector-curvature="0"
+           style="fill:#580024;fill-opacity:0.94117647" />
+      </g>
+      <path
+         sodipodi:nodetypes="ccccccccccc"
+         class="st12"
+         d="m 9.695952,294.54416 -0.899572,-0.44978 0.13229,1.56102 c -1.45519,0.13229 -5.000562,0.52916 -5.000562,1.95789 0,-1.42873 -3.545372,-1.58748 -5.000562,-1.61394 l 0.13229,-1.56102 -0.899572,0.52916 c 0.079374,-0.5027 1.82185242,-9.98946 1.79539442,-10.06883 0.52916,0.92603 2.72892358,1.12603 3.97244958,1.07311 1.243526,-0.0529 3.43954,-0.34395 3.9687,-1.29644 0,0.0794 1.71977,9.39259 1.799144,9.86883 z"
+         id="path3815"
+         inkscape:connector-curvature="0"
+         style="fill:#ff4081;fill-opacity:1;stroke-width:0.26458001" />
+      <path
+         class="st13"
+         d="m -0.040592,284.93991 -0.634992,-1.34936 c 0.52916,0.92603 2.725174,1.08478 3.9687,1.03187 1.243526,-0.0529 3.43954,-0.34396 3.9687,-1.29645 l 0.634992,1.34936 c -0.52916,0.97895 -2.725174,1.26999 -3.9687,1.29644 -1.243526,0.0529 -3.43954,-0.10583 -3.9687,-1.03186 z"
+         id="path3817"
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient5276);stroke-width:0.26458001" />
+      <path
+         class="st6"
+         d="m 5.727252,286.8978 c -1.005404,0 -1.825602,0.8202 -1.825602,1.8256 0,-1.0054 -0.820198,-1.8256 -1.799144,-1.8256 -0.978946,0 -1.799144,0.8202 -1.799144,1.8256 0,1.00541 0.820198,1.82561 1.799144,1.82561 0.502702,0 0.952488,-0.21167 1.296442,-0.52916 l 0.52916,1.69331 0.52916,-1.69331 c 0.317496,0.34395 0.79374,0.52916 1.296442,0.52916 1.005404,0 1.825602,-0.8202 1.825602,-1.82561 -0.026458,-1.03186 -0.846656,-1.8256 -1.85206,-1.8256 z"
+         id="path3829"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;stroke-width:0.26458001" />
+      <g
+         transform="matrix(0.26458,0,0,0.26458,-179.32,261.26)"
+         id="g3835"
+         style="fill:#231815">
+        <circle
+           class="st10"
+           cx="699.40002"
+           cy="103.7"
+           r="4.0999999"
+           id="circle3831" />
+        <circle
+           class="st10"
+           cx="685.70001"
+           cy="103.7"
+           r="4.0999999"
+           id="circle3833" />
+      </g>
+      <g
+         transform="matrix(0.26458,0,0,0.26458,-179.32,261.26)"
+         id="g3841"
+         style="fill:#ffffff">
+        <path
+           class="st6"
+           d="m 699.7,122.7 -3.3,3.3 -3.3,-3.3 c -0.2,-0.2 -0.6,-0.2 -0.8,0 l -3.3,3.3 -3.3,-3.3 c -0.2,-0.2 -0.6,-0.2 -0.8,0 -0.2,0.2 -0.2,0.6 0,0.8 l 3.7,3.7 c 0.2,0.2 0.6,0.2 0.8,0 l 3.3,-3.3 3.3,3.3 c 0.1,0.1 0.3,0.2 0.4,0.2 0.2,0 0.3,-0.1 0.4,-0.2 l 3.7,-3.7 c 0.2,-0.2 0.2,-0.6 0,-0.8 -0.2,-0.2 -0.6,-0.2 -0.8,0 z"
+           id="path3837"
+           inkscape:connector-curvature="0" />
+        <path
+           class="st6"
+           d="m 704.2,116.4 c -0.2,-0.2 -0.6,-0.2 -0.8,0 l -3.3,3.3 -3.3,-3.3 c -0.2,-0.2 -0.6,-0.2 -0.8,0 l -3.3,3.3 -3.3,-3.3 c -0.2,-0.2 -0.6,-0.2 -0.8,0 l -3.3,3.3 -3.3,-3.3 c -0.2,-0.2 -0.6,-0.2 -0.8,0 -0.2,0.2 -0.2,0.6 0,0.8 l 3.7,3.7 c 0.2,0.2 0.6,0.2 0.8,0 l 3.3,-3.3 3.3,3.3 c 0.1,0.1 0.3,0.2 0.4,0.2 0.2,0 0.3,-0.1 0.4,-0.2 l 3.3,-3.3 3.3,3.3 c 0.2,0.2 0.6,0.2 0.8,0 l 3.7,-3.7 c 0.2,-0.2 0.2,-0.5 0,-0.8 z"
+           id="path3839"
+           inkscape:connector-curvature="0" />
+      </g>
+      <circle
+         class="st16"
+         cx="5.7272587"
+         cy="288.69696"
+         r="1.5874799"
+         id="circle3843"
+         style="fill:none;stroke-width:0.26458001" />
+    </g>
+    <path
+       id="path5193"
+       d="m -2.5511142,295.33257 c -0.189742,-0.14893 -0.428331,-0.23772 -0.68711,-0.23772 -0.6096081,0 -1.105673,0.49172 -1.121304,1.10437 -0.629146,0.23859 -1.077017,0.85253 -1.077017,1.57199 0,0.85015 0.625021,1.55246 1.4356599,1.6634 v 0.0152 h 5.7424231 v -0.003 c 0.800652,-0.0469 1.435659,-0.71837 1.435659,-1.53986 0,-0.79219 -0.590502,-1.44478 -1.350775,-1.53271 0.003,-0.0482 0.0048,-0.097 0.0048,-0.1461 0,-1.22768 -1.024479,-2.22285 -2.28798204,-2.22285 -0.93525196,0 -1.73894386,0.54534 -2.09433096,1.32646"
+       inkscape:connector-curvature="0"
+       style="fill:url(#1);stroke-width:0.21709661" />
+    <path
+       id="path5195"
+       d="m 11.002773,295.27147 c 0.252287,-0.1981 0.570045,-0.31578 0.912918,-0.31578 0.809914,0 1.468852,0.6533 1.489735,1.46744 0.836159,0.3172 1.431037,1.13163 1.431037,2.08885 0,1.1288 -0.830233,2.06288 -1.907391,2.20991 v 0.0203 H 5.298379 v -0.004 c -1.063895,-0.0624 -1.907391,-0.9544 -1.907391,-2.04595 0,-1.05261 0.784516,-1.91953 1.794793,-2.03608 -0.0042,-0.0641 -0.0065,-0.12896 -0.0065,-0.19415 0,-1.63112 1.361052,-2.95351 3.040143,-2.95351 1.2428086,0 2.311219,0.72441 2.782776,1.76234"
+       inkscape:connector-curvature="0"
+       style="fill:url(#0);stroke-width:0.28220019" />
+  </g>
+</svg>
diff --git a/site/static/organisations/thunderdome.svg b/site/static/organisations/thunderdome.svg
new file mode 100644
index 0000000000..c8cbdaf039
--- /dev/null
+++ b/site/static/organisations/thunderdome.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg1459"
+   version="1.1"
+   viewBox="0 0 274.77133 60.298889"
+   height="60.298889mm"
+   width="274.77133mm">
+  <defs
+     id="defs1453" />
+  <metadata
+     id="metadata1456">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-42.531001,-116.41603)"
+     id="layer1">
+    <g
+       transform="translate(93.750421,-1.9345242)"
+       id="g997">
+      <g
+         id="g958"
+         transform="matrix(0.45367544,0,0,0.45367544,-70.17869,66.227085)">
+        <path
+           d="m 178.30147,211.4295 c 0,0 -41.87399,-81.14294 -120.817617,-67.37697 m -5.94379,67.68201 c 0,0 45.783,-83.2982 122.198207,-66.72283 m -58.28473,-25.96854 v 124.35097 m 45.89507,-84.33553 a 46.124953,39.331358 0 0 1 -46.12495,39.33136 46.124953,39.331358 0 0 1 -46.124947,-39.33136 46.124953,39.331358 0 0 1 46.124947,-39.33135 46.124953,39.331358 0 0 1 46.12495,39.33135 z m 26.30592,22.47508 a 72.482072,61.806418 0 0 1 -72.48207,61.80641 72.482072,61.806418 0 0 1 -72.482077,-61.80641 72.482072,61.806418 0 0 1 72.482077,-61.80643 72.482072,61.806418 0 0 1 72.48207,61.80643 z"
+           style="fill:none;stroke:#646464;stroke-width:1.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path4645-2-8" />
+        <circle
+           r="3.9503546"
+           cy="198.46136"
+           cx="115.33445"
+           id="path4563-1-1-5-2"
+           style="opacity:1;fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:1.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <circle
+           r="3.9503546"
+           cy="179.61028"
+           cx="154.28223"
+           id="path4563-1-1-4-0-7"
+           style="opacity:1;fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:1.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <circle
+           r="3.9503546"
+           cy="211.14809"
+           cx="178.06921"
+           id="path4563-1-1-40-7-8"
+           style="opacity:1;fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:1.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <circle
+           r="3.9503546"
+           cy="242.95314"
+           cx="115.79539"
+           id="path4563-1-1-8-5-8"
+           style="opacity:1;fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:1.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <circle
+           r="3.9503546"
+           cy="211.14809"
+           cx="52.719795"
+           id="path4563-1-1-85-6-5"
+           style="opacity:1;fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:1.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <circle
+           r="3.9503546"
+           cy="142.72708"
+           cx="157.48947"
+           id="path4563-1-1-6-5-4"
+           style="opacity:1;fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:1.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <circle
+           r="3.9503546"
+           cy="151.54697"
+           cx="115.2609"
+           id="path4563-1-1-7-4-9"
+           style="opacity:1;fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:1.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <circle
+           r="3.9503546"
+           cy="119.7419"
+           cx="115.2609"
+           id="path4563-1-1-3-7-6"
+           style="opacity:1;fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:1.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <circle
+           r="3.9503546"
+           cy="142.19254"
+           cx="73.834099"
+           id="path4563-1-1-2-7-6"
+           style="opacity:1;fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:1.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <circle
+           r="3.9503546"
+           cy="178.80847"
+           cx="76.506798"
+           id="path4563-1-1-34-5-3"
+           style="opacity:1;fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:1.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+      <g
+         aria-label="THUNDERDOME"
+         transform="matrix(0.22880747,0,0,0.22880747,0.22823691,-38.584587)"
+         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:3.25098467;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="flowRoot4650-39-9">
+        <path
+           d="m 99.216,745.60469 -7.296,25.92 h 18.624 v 113.28 h 28.416 v -113.28 h 18.624 l -6.912,-25.92 z"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;font-family:'American Captain';-inkscape-font-specification:'American Captain';fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:3.25098467;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path4889-2" />
+        <path
+           d="m 237.135,745.60469 h -28.416 v 59.52 h -15.168 v -59.52 h -28.416 v 139.2 h 28.416 v -55.68 h 15.168 v 55.68 h 28.416 z"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;font-family:'American Captain';-inkscape-font-specification:'American Captain';fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:3.25098467;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path4891-4" />
+        <path
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;font-family:'American Captain';-inkscape-font-specification:'American Captain';fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:2.68477941;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -814.90625,747.83984 v 0.0137 h -15.81836 v 97.19726 c 0,12.68484 4.7555,17.75977 17.91602,17.75977 h 23.62695 c 13.16052,0 17.91601,-5.07493 17.91602,-17.75977 v -97.19726 h -16.49805 v -0.0137 l -11.50586,40.55664 h 19.56055 l -29.33985,55.51563 7.76758,-41.70899 h -16.9707 l 14.60742,-54.36328 z"
+           transform="matrix(1.2108945,0,0,1.2108945,1254.6805,-159.96715)"
+           id="path4893-9" />
+        <path
+           d="m 332.385,884.80469 h 25.728 v -58.176 l 14.976,58.176 h 28.608 v -139.2 h -28.608 v 55.872 l -14.208,-55.872 h -26.496 z"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;font-family:'American Captain';-inkscape-font-specification:'American Captain';fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:3.25098467;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path4895-2" />
+        <path
+           d="m 454.281,769.98869 c 1.92,0 2.496,0.96 2.496,2.688 v 84.864 c 0,2.112 -0.384,2.88 -2.688,2.88 h -13.056 v -90.432 z m 30.144,-7.488 c 0,-10.176 -5.568,-16.896 -16.512,-16.896 h -54.528 v 139.2 h 49.344 c 15.936,0 21.696,-6.144 21.696,-21.504 z"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;font-family:'American Captain';-inkscape-font-specification:'American Captain';fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:3.25098467;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path4897-8" />
+        <path
+           d="m 495.885,884.80469 h 52.992 l 4.8,-25.92 h -29.184 v -30.336 h 23.04 v -24 h -23.04 v -33.024 h 30.336 l -4.8,-25.92 h -54.144 z"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;font-family:'American Captain';-inkscape-font-specification:'American Captain';fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:3.25098467;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path4899-5" />
+        <path
+           d="m 605.982,769.98869 c 1.92,0 2.688,1.152 2.688,2.88 v 42.24 c 0,2.112 -0.576,2.88 -2.688,2.88 H 592.35 v -48 z m 30.144,-6.336 c 0,-10.944 -5.76,-18.048 -18.816,-18.048 h -52.8 v 139.2 h 27.84 v -44.352 h 3.648 l 13.44,44.352 h 28.8 l -14.592,-44.352 c 8.064,0 12.48,-6.144 12.48,-12.288 z"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;font-family:'American Captain';-inkscape-font-specification:'American Captain';fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:3.25098467;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path4901-1" />
+        <path
+           d="m 689.031,769.98869 c 1.92,0 2.496,0.96 2.496,2.688 v 84.864 c 0,2.112 -0.384,2.88 -2.688,2.88 h -13.056 v -90.432 z m 30.144,-7.488 c 0,-10.176 -5.568,-16.896 -16.512,-16.896 h -54.528 v 139.2 h 49.344 c 15.936,0 21.696,-6.144 21.696,-21.504 z"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;font-family:'American Captain';-inkscape-font-specification:'American Captain';fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:3.25098467;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path4903-4" />
+        <path
+           d="m 772.107,769.98869 c 1.92,0 2.496,0.96 2.496,2.688 v 84.864 c 0,2.112 -0.384,2.88 -2.688,2.88 h -10.56 c -2.304,0 -2.688,-0.768 -2.688,-2.88 v -84.864 c 0,-1.728 0.576,-2.688 2.496,-2.688 z m 30.72,-6.336 c 0,-10.944 -5.76,-18.048 -18.816,-18.048 h -34.56 c -13.056,0 -18.816,7.104 -18.816,18.048 v 101.376 c 0,10.56 4.416,19.776 19.968,19.776 h 32.256 c 15.552,0 19.968,-9.216 19.968,-19.776 z"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;font-family:'American Captain';-inkscape-font-specification:'American Captain';fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:3.25098467;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path4905-7" />
+        <path
+           d="m 858.804,874.82069 17.664,-55.68 v 65.664 h 27.072 v -139.2 h -29.568 l -15.168,58.752 -15.168,-58.752 H 814.26 v 139.2 h 27.072 v -65.664 z"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;font-family:'American Captain';-inkscape-font-specification:'American Captain';fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:3.25098467;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path4907-8" />
+        <path
+           d="m 915.135,884.80469 h 52.992 l 4.8,-25.92 h -29.184 v -30.336 h 23.04 v -24 h -23.04 v -33.024 h 30.336 l -4.8,-25.92 h -54.144 z"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:192px;font-family:'American Captain';-inkscape-font-specification:'American Captain';fill:#ffdd57;fill-opacity:1;stroke:#646464;stroke-width:3.25098467;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path4909-9" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/site/static/organisations/tokopedia.png b/site/static/organisations/tokopedia.png
new file mode 100644
index 0000000000..bc5231cd5a
Binary files /dev/null and b/site/static/organisations/tokopedia.png differ
diff --git a/src/compile/nodes/MustacheTag.ts b/src/compile/nodes/MustacheTag.ts
deleted file mode 100644
index e668987a9c..0000000000
--- a/src/compile/nodes/MustacheTag.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import Tag from './shared/Tag';
-
-export default class MustacheTag extends Tag {}
\ No newline at end of file
diff --git a/src/compile/nodes/RawMustacheTag.ts b/src/compile/nodes/RawMustacheTag.ts
deleted file mode 100644
index ada3123410..0000000000
--- a/src/compile/nodes/RawMustacheTag.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import Tag from './shared/Tag';
-
-export default class RawMustacheTag extends Tag {}
\ No newline at end of file
diff --git a/src/compile/render-ssr/handlers/Comment.ts b/src/compile/render-ssr/handlers/Comment.ts
deleted file mode 100644
index 4517faace5..0000000000
--- a/src/compile/render-ssr/handlers/Comment.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import Renderer from '../Renderer';
-import { CompileOptions } from '../../../interfaces';
-
-export default function(node, renderer: Renderer, options: CompileOptions) {
-	if (options.preserveComments) {
-		renderer.append(`<!--${node.data}-->`);
-	}
-}
\ No newline at end of file
diff --git a/src/compile/render-ssr/handlers/Head.ts b/src/compile/render-ssr/handlers/Head.ts
deleted file mode 100644
index 656759af3c..0000000000
--- a/src/compile/render-ssr/handlers/Head.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function(node, renderer, options) {
-	renderer.append('${($$result.head += `');
-
-	renderer.render(node.children, options);
-
-	renderer.append('`, "")}');
-}
\ No newline at end of file
diff --git a/src/compile/render-ssr/handlers/HtmlTag.ts b/src/compile/render-ssr/handlers/HtmlTag.ts
deleted file mode 100644
index 7562186a4b..0000000000
--- a/src/compile/render-ssr/handlers/HtmlTag.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { snip } from '../../utils/snip';
-
-export default function(node, renderer, options) {
-	renderer.append('${' + snip(node.expression) + '}');
-}
\ No newline at end of file
diff --git a/src/compile/render-ssr/handlers/Title.ts b/src/compile/render-ssr/handlers/Title.ts
deleted file mode 100644
index 456d4215f1..0000000000
--- a/src/compile/render-ssr/handlers/Title.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function(node, renderer, options) {
-	renderer.append(`<title>`);
-
-	renderer.render(node.children, options);
-
-	renderer.append(`</title>`);
-}
\ No newline at end of file
diff --git a/src/compile/utils/add_to_set.ts b/src/compile/utils/add_to_set.ts
deleted file mode 100644
index 262d7d32e7..0000000000
--- a/src/compile/utils/add_to_set.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default function add_to_set(a: Set<any>, b: Set<any>) {
-	b.forEach(item => {
-		a.add(item);
-	});
-}
\ No newline at end of file
diff --git a/src/Stats.ts b/src/compiler/Stats.ts
similarity index 98%
rename from src/Stats.ts
rename to src/compiler/Stats.ts
index c54f1e8ea9..200fa448e9 100644
--- a/src/Stats.ts
+++ b/src/compiler/Stats.ts
@@ -5,7 +5,7 @@ const now = (typeof process !== 'undefined' && process.hrtime)
 	}
 	: () => self.performance.now();
 
-type Timing = {
+interface Timing {
 	label: string;
 	start: number;
 	end: number;
diff --git a/src/compile/Component.ts b/src/compiler/compile/Component.ts
similarity index 91%
rename from src/compile/Component.ts
rename to src/compiler/compile/Component.ts
index 9ecd23e699..89c1e6b4f6 100644
--- a/src/compile/Component.ts
+++ b/src/compiler/compile/Component.ts
@@ -1,4 +1,5 @@
 import MagicString, { Bundle } from 'magic-string';
+// @ts-ignore
 import { walk, childKeys } from 'estree-walker';
 import { getLocator } from 'locate-character';
 import Stats from '../Stats';
@@ -21,14 +22,15 @@ import { remove_indentation, add_indentation } from '../utils/indentation';
 import get_object from './utils/get_object';
 import unwrap_parens from './utils/unwrap_parens';
 import Slot from './nodes/Slot';
+import { Node as ESTreeNode } from 'estree';
 
-type ComponentOptions = {
+interface ComponentOptions {
 	namespace?: string;
 	tag?: string;
 	immutable?: boolean;
 	accessors?: boolean;
 	preserveWhitespace?: boolean;
-};
+}
 
 // We need to tell estree-walker that it should always
 // look for an `else` block, otherwise it might get
@@ -95,7 +97,7 @@ export default class Component {
 	node_for_declaration: Map<string, Node> = new Map();
 	partly_hoisted: string[] = [];
 	fully_hoisted: string[] = [];
-	reactive_declarations: Array<{ assignees: Set<string>, dependencies: Set<string>, node: Node, declaration: Node }> = [];
+	reactive_declarations: Array<{ assignees: Set<string>; dependencies: Set<string>; node: Node; declaration: Node }> = [];
 	reactive_declaration_nodes: Set<Node> = new Set();
 	has_reactive_assignments = false;
 	injected_reactive_declaration_vars: Set<string> = new Set();
@@ -104,12 +106,12 @@ export default class Component {
 	indirect_dependencies: Map<string, Set<string>> = new Map();
 
 	file: string;
-	locate: (c: number) => { line: number, column: number };
+	locate: (c: number) => { line: number; column: number };
 
 	// TODO this does the same as component.locate! remove one or the other
 	locator: (search: number, startIndex?: number) => {
-		line: number,
-		column: number
+		line: number;
+		column: number;
 	};
 
 	stylesheet: Stylesheet;
@@ -138,6 +140,7 @@ export default class Component {
 		this.compile_options = compile_options;
 
 		this.file = compile_options.filename && (
+			// eslint-disable-next-line no-useless-escape
 			typeof process !== 'undefined' ? compile_options.filename.replace(process.cwd(), '').replace(/^[\/\\]/, '') : compile_options.filename
 		);
 		this.locate = getLocator(this.source);
@@ -152,10 +155,14 @@ export default class Component {
 		this.namespace = namespaces[this.component_options.namespace] || this.component_options.namespace;
 
 		if (compile_options.customElement) {
-			this.tag = this.component_options.tag || compile_options.tag;
-			if (!this.tag) {
-				throw new Error(`Cannot compile to a custom element without specifying a tag name via options.tag or <svelte:options>`);
+			if (this.component_options.tag === undefined && compile_options.tag === undefined) {
+				const svelteOptions = ast.html.children.find(child => child.name === 'svelte:options') || { 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}/>`
+				});
 			}
+			this.tag = this.component_options.tag || compile_options.tag;
 		} else {
 			this.tag = this.name;
 		}
@@ -242,7 +249,7 @@ export default class Component {
 
 			result = result
 				.replace(/__svelte:self__/g, this.name)
-				.replace(compile_options.generate === 'ssr' ? /(@+|#+)(\w*(?:-\w*)?)/g : /(@+)(\w*(?:-\w*)?)/g, (match: string, sigil: string, name: string) => {
+				.replace(compile_options.generate === 'ssr' ? /(@+|#+)(\w*(?:-\w*)?)/g : /(@+)(\w*(?:-\w*)?)/g, (_match: string, sigil: string, name: string) => {
 					if (sigil === '@') {
 						if (internal_exports.has(name)) {
 							if (compile_options.dev && internal_exports.has(`${name}Dev`)) name = `${name}Dev`;
@@ -373,7 +380,7 @@ export default class Component {
 
 		reserved.forEach(add);
 		internal_exports.forEach(add);
-		this.var_lookup.forEach((value, key) => add(key));
+		this.var_lookup.forEach((_value, key) => add(key));
 
 		return (name: string) => {
 			if (test) name = `${name}$`;
@@ -392,12 +399,12 @@ export default class Component {
 
 	error(
 		pos: {
-			start: number,
-			end: number
+			start: number;
+			end: number;
 		},
-		e : {
-			code: string,
-			message: string
+		e: {
+			code: string;
+			message: string;
 		}
 	) {
 		error(e.message, {
@@ -412,12 +419,12 @@ export default class Component {
 
 	warn(
 		pos: {
-			start: number,
-			end: number
+			start: number;
+			end: number;
 		},
 		warning: {
-			code: string,
-			message: string
+			code: string;
+			message: string;
 		}
 	) {
 		if (!this.locator) {
@@ -521,7 +528,7 @@ export default class Component {
 
 		let result = '';
 
-		script.content.body.forEach((node, i) => {
+		script.content.body.forEach((node) => {
 			if (this.hoistable_nodes.has(node) || this.reactive_declaration_nodes.has(node)) {
 				if (a !== b) result += `[✂${a}-${b}✂]`;
 				a = node.end;
@@ -558,7 +565,7 @@ export default class Component {
 
 		this.add_sourcemap_locations(script.content);
 
-		let { scope, globals } = create_scopes(script.content);
+		const { scope, globals } = create_scopes(script.content);
 		this.module_scope = scope;
 
 		scope.declarations.forEach((node, name) => {
@@ -582,7 +589,7 @@ export default class Component {
 				this.error(node, {
 					code: 'illegal-subscription',
 					message: `Cannot reference store value inside <script context="module">`
-				})
+				});
 			} else {
 				this.add_var({
 					name,
@@ -618,7 +625,7 @@ export default class Component {
 			});
 		});
 
-		let { scope: instance_scope, map, globals } = create_scopes(script.content);
+		const { scope: instance_scope, map, globals } = create_scopes(script.content);
 		this.instance_scope = instance_scope;
 		this.instance_scope_map = map;
 
@@ -640,7 +647,7 @@ export default class Component {
 			this.node_for_declaration.set(name, node);
 		});
 
-		globals.forEach((node, name) => {
+		globals.forEach((_node, name) => {
 			if (this.var_lookup.has(name)) return;
 
 			if (this.injected_reactive_declaration_vars.has(name)) {
@@ -699,7 +706,7 @@ export default class Component {
 		let scope = instance_scope;
 
 		walk(this.ast.instance.content, {
-			enter(node, parent) {
+			enter(node) {
 				if (map.has(node)) {
 					scope = map.get(node);
 				}
@@ -732,7 +739,7 @@ export default class Component {
 					scope = scope.parent;
 				}
 			}
-		})
+		});
 	}
 
 	extract_reactive_store_references() {
@@ -754,12 +761,12 @@ export default class Component {
 					});
 				}
 
-				if (is_reference(node, parent)) {
+				if (is_reference(node as ESTreeNode, parent as ESTreeNode)) {
 					const object = get_object(node);
 					const { name } = object;
 
 					if (name[0] === '$' && !scope.has(name)) {
-						component.warn_if_undefined(object, null);
+						component.warn_if_undefined(name, object, null);
 					}
 				}
 			},
@@ -772,7 +779,7 @@ export default class Component {
 		});
 	}
 
-	invalidate(name, value) {
+	invalidate(name, value?) {
 		const variable = this.var_lookup.get(name);
 
 		if (variable && (variable.subscribable && variable.reassigned)) {
@@ -780,7 +787,11 @@ export default class Component {
 		}
 
 		if (name[0] === '$' && name[1] !== '$') {
-			return `${name.slice(1)}.set(${name})`
+			return `${name.slice(1)}.set(${name})`;
+		}
+
+		if (variable && !variable.referenced && !variable.is_reactive_dependency && !variable.export_name && !name.startsWith('$$')) {
+			return value || name;
 		}
 
 		if (value) {
@@ -878,13 +889,13 @@ export default class Component {
 								}
 
 								if (variable.writable && variable.name !== variable.export_name) {
-									code.prependRight(declarator.id.start, `${variable.export_name}: `)
+									code.prependRight(declarator.id.start, `${variable.export_name}: `);
 								}
 
 								if (next) {
-									const next_variable = component.var_lookup.get(next.id.name)
+									const next_variable = component.var_lookup.get(next.id.name);
 									const new_declaration = !next_variable.export_name
-										|| (current_group.insert && next_variable.subscribable)
+										|| (current_group.insert && next_variable.subscribable);
 
 									if (new_declaration) {
 										code.overwrite(declarator.end, next.start, ` ${node.kind} `);
@@ -894,7 +905,7 @@ export default class Component {
 								current_group = null;
 
 								if (variable.subscribable) {
-									let insert = get_insert(variable);
+									const insert = get_insert(variable);
 
 									if (next) {
 										code.overwrite(declarator.end, next.start, `; ${insert}; ${node.kind} `);
@@ -955,7 +966,7 @@ export default class Component {
 		// reference instance variables other than other
 		// hoistable functions. TODO others?
 
-		const { hoistable_nodes, var_lookup } = this;
+		const { hoistable_nodes, var_lookup, injected_reactive_declaration_vars } = this;
 
 		const top_level_function_declarations = new Map();
 
@@ -965,9 +976,9 @@ export default class Component {
 					if (!d.init) return false;
 					if (d.init.type !== 'Literal') return false;
 
-					const v = this.var_lookup.get(d.id.name)
-					if (v.reassigned) return false
-					if (v.export_name) return false
+					const v = this.var_lookup.get(d.id.name);
+					if (v.reassigned) return false;
+					if (v.export_name) return false;
 
 					if (this.var_lookup.get(d.id.name).reassigned) return false;
 					if (this.vars.find(variable => variable.name === d.id.name && variable.module)) return false;
@@ -996,7 +1007,7 @@ export default class Component {
 		});
 
 		const checked = new Set();
-		let walking = new Set();
+		const walking = new Set();
 
 		const is_hoistable = fn_declaration => {
 			if (fn_declaration.type === 'ExportNamedDeclaration') {
@@ -1005,7 +1016,7 @@ export default class Component {
 
 			const instance_scope = this.instance_scope;
 			let scope = this.instance_scope;
-			let map = this.instance_scope_map;
+			const map = this.instance_scope_map;
 
 			let hoistable = true;
 
@@ -1018,15 +1029,15 @@ export default class Component {
 						scope = map.get(node);
 					}
 
-					if (is_reference(node, parent)) {
+					if (is_reference(node as ESTreeNode, parent as ESTreeNode)) {
 						const { name } = flatten_reference(node);
 						const owner = scope.find_owner(name);
 
-						if (name[0] === '$' && !owner) {
+						if (node.type === 'Identifier' && injected_reactive_declaration_vars.has(name)) {
 							hoistable = false;
-						}
-
-						else if (owner === instance_scope) {
+						} else if (name[0] === '$' && !owner) {
+							hoistable = false;
+						} else if (owner === instance_scope) {
 							if (name === fn_declaration.id.name) return;
 
 							const variable = var_lookup.get(name);
@@ -1041,7 +1052,7 @@ export default class Component {
 									hoistable = false;
 								} else if (!is_hoistable(other_declaration)) {
 									hoistable = false;
-                }
+								}
 							}
 
 							else {
@@ -1093,7 +1104,7 @@ export default class Component {
 				const dependencies = new Set();
 
 				let scope = this.instance_scope;
-				let map = this.instance_scope_map;
+				const map = this.instance_scope_map;
 
 				walk(node.body, {
 					enter(node, parent) {
@@ -1109,14 +1120,17 @@ export default class Component {
 						} else if (node.type === 'UpdateExpression') {
 							const identifier = get_object(node.argument);
 							assignees.add(identifier.name);
-						} else if (is_reference(node, parent)) {
+						} else if (is_reference(node as ESTreeNode, parent as ESTreeNode)) {
 							const identifier = get_object(node);
 							if (!assignee_nodes.has(identifier)) {
 								const { name } = identifier;
 								const owner = scope.find_owner(name);
+								const variable = component.var_lookup.get(name);
+								if (variable) variable.is_reactive_dependency = true;
+								const is_writable_or_mutated = variable && (variable.writable || variable.mutated);
 								if (
 									(!owner || owner === component.instance_scope) &&
-									(name[0] === '$' || component.var_lookup.has(name) && component.var_lookup.get(name).writable)
+									(name[0] === '$' || is_writable_or_mutated)
 								) {
 									dependencies.add(name);
 								}
@@ -1202,9 +1216,7 @@ export default class Component {
 		return `ctx.${name}`;
 	}
 
-	warn_if_undefined(node, template_scope: TemplateScope) {
-		let { name } = node;
-
+	warn_if_undefined(name: string, node, template_scope: TemplateScope) {
 		if (name[0] === '$') {
 			name = name.slice(1);
 			this.has_reactive_assignments = true; // TODO does this belong here?
@@ -1267,9 +1279,9 @@ function process_component_options(component: Component, nodes) {
 						const message = `'tag' must be a string literal`;
 						const tag = get_value(attribute, code, message);
 
-						if (typeof tag !== 'string') component.error(attribute, { code, message });
+						if (typeof tag !== 'string' && tag !== null) component.error(attribute, { code, message });
 
-						if (!/^[a-zA-Z][a-zA-Z0-9]*-[a-zA-Z0-9-]+$/.test(tag)) {
+						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`
@@ -1309,14 +1321,16 @@ function process_component_options(component: Component, nodes) {
 					case 'accessors':
 					case 'immutable':
 					case 'preserveWhitespace':
+					{
 						const code = `invalid-${name}-value`;
-						const message = `${name} attribute must be true or false`
+						const message = `${name} attribute must be true or false`;
 						const value = get_value(attribute, code, message);
 
 						if (typeof value !== 'boolean') component.error(attribute, { code, message });
 
 						component_options[name] = value;
 						break;
+					}
 
 					default:
 						component.error(attribute, {
diff --git a/src/compile/create_module.ts b/src/compiler/compile/create_module.ts
similarity index 93%
rename from src/compile/create_module.ts
rename to src/compiler/compile/create_module.ts
index ae5232021d..54b891d4ac 100644
--- a/src/compile/create_module.ts
+++ b/src/compiler/compile/create_module.ts
@@ -5,10 +5,10 @@ import { stringify_props } from './utils/stringify_props';
 
 const wrappers = { esm, cjs };
 
-type Export = {
+interface Export {
 	name: string;
 	as: string;
-};
+}
 
 export default function create_module(
 	code: string,
@@ -16,7 +16,7 @@ export default function create_module(
 	name: string,
 	banner: string,
 	sveltePath = 'svelte',
-	helpers: { name: string, alias: string }[],
+	helpers: Array<{ name: string; alias: string }>,
 	imports: Node[],
 	module_exports: Export[],
 	source: string
@@ -44,7 +44,7 @@ function esm(
 	banner: string,
 	sveltePath: string,
 	internal_path: string,
-	helpers: { name: string, alias: string }[],
+	helpers: Array<{ name: string; alias: string }>,
 	imports: Node[],
 	module_exports: Export[],
 	source: string
@@ -84,7 +84,7 @@ function cjs(
 	banner: string,
 	sveltePath: string,
 	internal_path: string,
-	helpers: { name: string, alias: string }[],
+	helpers: Array<{ name: string; alias: string }>,
 	imports: Node[],
 	module_exports: Export[]
 ) {
@@ -115,7 +115,7 @@ function cjs(
 
 		const source = edit_source(node.source.value, sveltePath);
 
-		return `const ${lhs} = require("${source}");`
+		return `const ${lhs} = require("${source}");`;
 	});
 
 	const exports = [`exports.default = ${name};`].concat(
@@ -131,5 +131,5 @@ function cjs(
 
 		${code}
 
-		${exports}`
-}
\ No newline at end of file
+		${exports}`;
+}
diff --git a/src/compile/css/Selector.ts b/src/compiler/compile/css/Selector.ts
similarity index 97%
rename from src/compile/css/Selector.ts
rename to src/compiler/compile/css/Selector.ts
index 713b035efe..bb4a29ebe3 100644
--- a/src/compile/css/Selector.ts
+++ b/src/compiler/compile/css/Selector.ts
@@ -73,7 +73,7 @@ export default class Selector {
 			}
 		}
 
-		this.blocks.forEach((block, i) => {
+		this.blocks.forEach((block) => {
 			if (block.global) {
 				const selector = block.selectors[0];
 				const first = selector.children[0];
@@ -238,8 +238,8 @@ function attribute_matches(node: Node, name: string, expected_value: string, ope
 }
 
 function class_matches(node, name: string) {
-	return node.classes.some(function(class_directive) {
-		return class_directive.name === name;
+	return node.classes.some((class_directive) => {
+		return new RegExp(`\\b${name}\\b`).test(class_directive.name);
 	});
 }
 
@@ -287,7 +287,7 @@ function group_selectors(selector: Node) {
 
 	const blocks = [block];
 
-	selector.children.forEach((child: Node, i: number) => {
+	selector.children.forEach((child: Node) => {
 		if (child.type === 'WhiteSpace' || child.type === 'Combinator') {
 			block = new Block(child);
 			blocks.push(block);
diff --git a/src/compile/css/Stylesheet.ts b/src/compiler/compile/css/Stylesheet.ts
similarity index 97%
rename from src/compile/css/Stylesheet.ts
rename to src/compiler/compile/css/Stylesheet.ts
index 3b1dedc467..2aead635b2 100644
--- a/src/compile/css/Stylesheet.ts
+++ b/src/compiler/compile/css/Stylesheet.ts
@@ -43,11 +43,11 @@ class Rule {
 		return this.selectors.some(s => s.used);
 	}
 
-	minify(code: MagicString, dev: boolean) {
+	minify(code: MagicString, _dev: boolean) {
 		let c = this.node.start;
 		let started = false;
 
-		this.selectors.forEach((selector, i) => {
+		this.selectors.forEach((selector) => {
 			if (selector.used) {
 				const separator = started ? ',' : '';
 				if ((selector.node.start - c) > separator.length) {
@@ -140,7 +140,7 @@ class Declaration {
 
 class Atrule {
 	node: Node;
-	children: (Atrule|Rule)[];
+	children: Array<Atrule|Rule>;
 
 	constructor(node: Node) {
 		this.node = node;
@@ -163,7 +163,7 @@ class Atrule {
 		}
 	}
 
-	is_used(dev: boolean) {
+	is_used(_dev: boolean) {
 		return true; // TODO
 	}
 
@@ -253,7 +253,7 @@ export default class Stylesheet {
 	has_styles: boolean;
 	id: string;
 
-	children: (Rule|Atrule)[] = [];
+	children: Array<Rule|Atrule> = [];
 	keyframes: Map<string, string> = new Map();
 
 	nodes_with_css_class: Set<Node> = new Set();
@@ -269,7 +269,7 @@ export default class Stylesheet {
 
 			this.has_styles = true;
 
-			const stack: (Rule | Atrule)[] = [];
+			const stack: Array<Rule | Atrule> = [];
 			let current_atrule: Atrule = null;
 
 			walk(ast.css, {
diff --git a/src/compile/css/gather_possible_values.ts b/src/compiler/compile/css/gather_possible_values.ts
similarity index 100%
rename from src/compile/css/gather_possible_values.ts
rename to src/compiler/compile/css/gather_possible_values.ts
diff --git a/src/compile/index.ts b/src/compiler/compile/index.ts
similarity index 90%
rename from src/compile/index.ts
rename to src/compiler/compile/index.ts
index e80a937932..3f4a3eeb32 100644
--- a/src/compile/index.ts
+++ b/src/compiler/compile/index.ts
@@ -1,9 +1,9 @@
-import { assign } from '../internal';
+import { assign } from '../../runtime/internal/index';
 import Stats from '../Stats';
 import parse from '../parse/index';
 import render_dom from './render-dom/index';
 import render_ssr from './render-ssr/index';
-import { CompileOptions, Ast, Warning } from '../interfaces';
+import { CompileOptions, Warning } from '../interfaces';
 import Component from './Component';
 import fuzzymatch from '../utils/fuzzymatch';
 
@@ -55,8 +55,9 @@ function validate_options(options: CompileOptions, warnings: Warning[]) {
 	}
 }
 
-function get_name(filename) {
+function get_name(filename: string) {
 	if (!filename) return null;
+	// eslint-disable-next-line no-useless-escape
 	const parts = filename.split(/[\/\\]/);
 
 	if (parts.length > 1 && /^index\.\w+/.test(parts[parts.length - 1])) {
@@ -79,12 +80,10 @@ export default function compile(source: string, options: CompileOptions = {}) {
 	const stats = new Stats();
 	const warnings = [];
 
-	let ast: Ast;
-
 	validate_options(options, warnings);
 
 	stats.start('parse');
-	ast = parse(source, options);
+	const ast = parse(source, options);
 	stats.stop('parse');
 
 	stats.start('create component');
@@ -105,4 +104,4 @@ export default function compile(source: string, options: CompileOptions = {}) {
 			: render_dom(component, options);
 
 	return component.generate(js);
-}
\ No newline at end of file
+}
diff --git a/src/compile/nodes/Action.ts b/src/compiler/compile/nodes/Action.ts
similarity index 91%
rename from src/compile/nodes/Action.ts
rename to src/compiler/compile/nodes/Action.ts
index feec3fada8..77b9e3c846 100644
--- a/src/compile/nodes/Action.ts
+++ b/src/compiler/compile/nodes/Action.ts
@@ -11,7 +11,7 @@ export default class Action extends Node {
 	constructor(component: Component, parent, scope, info) {
 		super(component, parent, scope, info);
 
-		component.warn_if_undefined(info, scope);
+		component.warn_if_undefined(info.name, info, scope);
 
 		this.name = info.name;
 		component.qualify(info.name);
diff --git a/src/compile/nodes/Animation.ts b/src/compiler/compile/nodes/Animation.ts
similarity index 94%
rename from src/compile/nodes/Animation.ts
rename to src/compiler/compile/nodes/Animation.ts
index 638a88b169..6ccdbb0803 100644
--- a/src/compile/nodes/Animation.ts
+++ b/src/compiler/compile/nodes/Animation.ts
@@ -10,7 +10,7 @@ export default class Animation extends Node {
 	constructor(component: Component, parent, scope, info) {
 		super(component, parent, scope, info);
 
-		component.warn_if_undefined(info, scope);
+		component.warn_if_undefined(info.name, info, scope);
 
 		this.name = info.name;
 		component.qualify(info.name);
diff --git a/src/compile/nodes/Attribute.ts b/src/compiler/compile/nodes/Attribute.ts
similarity index 90%
rename from src/compile/nodes/Attribute.ts
rename to src/compiler/compile/nodes/Attribute.ts
index c07960ce47..ef413c31a2 100644
--- a/src/compile/nodes/Attribute.ts
+++ b/src/compiler/compile/nodes/Attribute.ts
@@ -21,7 +21,7 @@ export default class Attribute extends Node {
 	is_synthetic: boolean;
 	should_cache: boolean;
 	expression?: Expression;
-	chunks: (Text | Expression)[];
+	chunks: Array<Text | Expression>;
 	dependencies: Set<string>;
 
 	constructor(component, parent, scope, info) {
@@ -67,6 +67,7 @@ export default class Attribute extends Node {
 
 			this.should_cache = this.is_dynamic
 				? this.chunks.length === 1
+					// @ts-ignore todo: probably error
 					? this.chunks[0].node.type !== 'Identifier' || scope.names.has(this.chunks[0].node.name)
 					: true
 				: false;
@@ -91,8 +92,10 @@ export default class Attribute extends Node {
 		if (this.chunks.length === 0) return `""`;
 
 		if (this.chunks.length === 1) {
+
 			return this.chunks[0].type === 'Text'
-				? stringify(this.chunks[0].data)
+				? stringify((this.chunks[0] as Text).data)
+				// @ts-ignore todo: probably error
 				: this.chunks[0].render(block);
 		}
 
@@ -102,6 +105,7 @@ export default class Attribute extends Node {
 					if (chunk.type === 'Text') {
 						return stringify(chunk.data);
 					} else {
+						// @ts-ignore todo: probably error
 						return chunk.get_precedence() <= 13 ? `(${chunk.render()})` : chunk.render();
 					}
 				})
@@ -114,7 +118,8 @@ export default class Attribute extends Node {
 		return this.is_true
 			? true
 			: this.chunks[0]
-				? this.chunks[0].data
+				// method should be called only when `is_static = true`
+				? (this.chunks[0] as Text).data
 				: '';
 	}
 }
diff --git a/src/compile/nodes/AwaitBlock.ts b/src/compiler/compile/nodes/AwaitBlock.ts
similarity index 97%
rename from src/compile/nodes/AwaitBlock.ts
rename to src/compiler/compile/nodes/AwaitBlock.ts
index f8e6896b5d..cd57750d29 100644
--- a/src/compile/nodes/AwaitBlock.ts
+++ b/src/compiler/compile/nodes/AwaitBlock.ts
@@ -5,6 +5,7 @@ import CatchBlock from './CatchBlock';
 import Expression from './shared/Expression';
 
 export default class AwaitBlock extends Node {
+	type: 'AwaitBlock';
 	expression: Expression;
 	value: string;
 	error: string;
diff --git a/src/compile/nodes/Binding.ts b/src/compiler/compile/nodes/Binding.ts
similarity index 78%
rename from src/compile/nodes/Binding.ts
rename to src/compiler/compile/nodes/Binding.ts
index b03eba0c36..e099f4405a 100644
--- a/src/compile/nodes/Binding.ts
+++ b/src/compiler/compile/nodes/Binding.ts
@@ -3,13 +3,24 @@ 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";
+
+// TODO this should live in a specific binding
+const read_only_media_attributes = new Set([
+	'duration',
+	'buffered',
+	'seekable',
+	'played'
+]);
 
 export default class Binding extends Node {
+	type: 'Binding';
 	name: string;
 	expression: Expression;
 	is_contextual: boolean;
 	obj: string;
 	prop: string;
+	is_readonly: boolean;
 
 	constructor(component: Component, parent, scope: TemplateScope, info) {
 		super(component, parent, scope, info);
@@ -63,5 +74,17 @@ export default class Binding extends Node {
 
 		this.obj = obj;
 		this.prop = prop;
+
+		const type = parent.get_static_attribute_value('type');
+
+		this.is_readonly = (
+			dimensions.test(this.name) ||
+			(parent.is_media_node && parent.is_media_node() && read_only_media_attributes.has(this.name)) ||
+			(parent.name === 'input' && type === 'file') // TODO others?
+		);
+	}
+
+	is_readonly_media_attribute() {
+		return read_only_media_attributes.has(this.name);
 	}
 }
diff --git a/src/compile/nodes/Body.ts b/src/compiler/compile/nodes/Body.ts
similarity index 100%
rename from src/compile/nodes/Body.ts
rename to src/compiler/compile/nodes/Body.ts
diff --git a/src/compile/nodes/CatchBlock.ts b/src/compiler/compile/nodes/CatchBlock.ts
similarity index 96%
rename from src/compile/nodes/CatchBlock.ts
rename to src/compiler/compile/nodes/CatchBlock.ts
index 23c08a494c..0edc0f76d8 100644
--- a/src/compile/nodes/CatchBlock.ts
+++ b/src/compiler/compile/nodes/CatchBlock.ts
@@ -3,6 +3,7 @@ import TemplateScope from './shared/TemplateScope';
 import AbstractBlock from './shared/AbstractBlock';
 
 export default class CatchBlock extends AbstractBlock {
+	type: 'CatchBlock';
 	scope: TemplateScope;
 
 	constructor(component, parent, scope, info) {
diff --git a/src/compile/nodes/Class.ts b/src/compiler/compile/nodes/Class.ts
similarity index 100%
rename from src/compile/nodes/Class.ts
rename to src/compiler/compile/nodes/Class.ts
diff --git a/src/compile/nodes/Comment.ts b/src/compiler/compile/nodes/Comment.ts
similarity index 100%
rename from src/compile/nodes/Comment.ts
rename to src/compiler/compile/nodes/Comment.ts
diff --git a/src/compile/nodes/DebugTag.ts b/src/compiler/compile/nodes/DebugTag.ts
similarity index 94%
rename from src/compile/nodes/DebugTag.ts
rename to src/compiler/compile/nodes/DebugTag.ts
index 4d2c3f6ae4..0fbfa592ad 100644
--- a/src/compile/nodes/DebugTag.ts
+++ b/src/compiler/compile/nodes/DebugTag.ts
@@ -2,6 +2,7 @@ import Node from './shared/Node';
 import Expression from './shared/Expression';
 
 export default class DebugTag extends Node {
+	type: 'DebugTag';
 	expressions: Expression[];
 
 	constructor(component, parent, scope, info) {
@@ -11,4 +12,4 @@ export default class DebugTag extends Node {
 			return new Expression(component, parent, scope, node);
 		});
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compile/nodes/EachBlock.ts b/src/compiler/compile/nodes/EachBlock.ts
similarity index 89%
rename from src/compile/nodes/EachBlock.ts
rename to src/compiler/compile/nodes/EachBlock.ts
index b58c023ac9..adaa46b8db 100644
--- a/src/compile/nodes/EachBlock.ts
+++ b/src/compiler/compile/nodes/EachBlock.ts
@@ -6,8 +6,15 @@ import TemplateScope from './shared/TemplateScope';
 import AbstractBlock from './shared/AbstractBlock';
 import { Node as INode } from '../../interfaces';
 import { new_tail } from '../utils/tail';
+import Element from './Element';
 
-function unpack_destructuring(contexts: Array<{ name: string, tail: string }>, node: INode, tail: string) {
+interface Context {
+	key: INode;
+	name?: string;
+	tail: string;
+}
+
+function unpack_destructuring(contexts: Context[], node: INode, tail: string) {
 	if (!node) return;
 
 	if (node.type === 'Identifier' || node.type === 'RestIdentifier') {
@@ -18,7 +25,7 @@ function unpack_destructuring(contexts: Array<{ name: string, tail: string }>, n
 	} else if (node.type === 'ArrayPattern') {
 		node.elements.forEach((element, i) => {
 			if (element && element.type === 'RestIdentifier') {
-				unpack_destructuring(contexts, element, `${tail}.slice(${i})`)
+				unpack_destructuring(contexts, element, `${tail}.slice(${i})`);
 			} else {
 				unpack_destructuring(contexts, element, `${tail}[${i}]`);
 			}
@@ -53,7 +60,7 @@ export default class EachBlock extends AbstractBlock {
 	context: string;
 	key: Expression;
 	scope: TemplateScope;
-	contexts: Array<{ name: string, tail: string }>;
+	contexts: Context[];
 	has_animation: boolean;
 	has_binding = false;
 
@@ -82,7 +89,7 @@ export default class EachBlock extends AbstractBlock {
 
 		if (this.index) {
 			// index can only change if this is a keyed each block
-			const dependencies = this.key ? this.expression.dependencies : [];
+			const dependencies = this.key ? this.expression.dependencies : new Set([]);
 			this.scope.add(this.index, dependencies, this);
 		}
 
@@ -92,8 +99,8 @@ export default class EachBlock extends AbstractBlock {
 
 		if (this.has_animation) {
 			if (this.children.length !== 1) {
-				const child = this.children.find(child => !!child.animation);
-				component.error(child.animation, {
+				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`
 				});
diff --git a/src/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
similarity index 96%
rename from src/compile/nodes/Element.ts
rename to src/compiler/compile/nodes/Element.ts
index ac2b81b3e7..da5f67a55a 100644
--- a/src/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -15,6 +15,7 @@ import fuzzymatch from '../../utils/fuzzymatch';
 import list from '../../utils/list';
 import Let from './Let';
 import TemplateScope from './shared/TemplateScope';
+import { INode } from './interfaces';
 
 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)$/;
 
@@ -53,7 +54,7 @@ const a11y_required_content = new Set([
 	'h4',
 	'h5',
 	'h6'
-])
+]);
 
 const invisible_elements = new Set(['meta', 'html', 'script', 'style']);
 
@@ -101,7 +102,7 @@ export default class Element extends Node {
 	intro?: Transition = null;
 	outro?: Transition = null;
 	animation?: Animation = null;
-	children: Node[];
+	children: INode[];
 	namespace: string;
 
 	constructor(component, parent, scope, info: any) {
@@ -136,7 +137,7 @@ export default class Element extends Node {
 			// Special case — treat these the same way:
 			//   <option>{foo}</option>
 			//   <option value={foo}>{foo}</option>
-			const value_attribute = info.attributes.find((attribute: Node) => attribute.name === 'value');
+			const value_attribute = info.attributes.find(attribute => attribute.name === 'value');
 
 			if (!value_attribute) {
 				info.attributes.push({
@@ -179,10 +180,12 @@ export default class Element extends Node {
 					break;
 
 				case 'Transition':
+				{
 					const transition = new Transition(component, this, scope, node);
 					if (node.intro) this.intro = transition;
 					if (node.outro) this.outro = transition;
 					break;
+				}
 
 				case 'Animation':
 					this.animation = new Animation(component, this, scope, node);
@@ -228,7 +231,7 @@ export default class Element extends Node {
 			let is_figure_parent = false;
 
 			while (parent) {
-				if (parent.name === 'figure') {
+				if ((parent as Element).name === 'figure') {
 					is_figure_parent = true;
 					break;
 				}
@@ -253,7 +256,7 @@ export default class Element extends Node {
 				return true;
 			});
 
-			const index = children.findIndex(child => child.name === 'figcaption');
+			const index = children.findIndex(child => (child as Element).name === 'figcaption');
 
 			if (index !== -1 && (index !== 0 && index !== children.length - 1)) {
 				this.component.warn(children[index], {
@@ -320,7 +323,9 @@ export default class Element extends Node {
 				}
 
 				const value = attribute.get_static_value();
+				// @ts-ignore
 				if (value && !aria_role_set.has(value)) {
+					// @ts-ignore
 					const match = fuzzymatch(value, aria_roles);
 					let message = `A11y: Unknown role '${value}'`;
 					if (match) message += ` (did you mean '${match}'?)`;
@@ -359,6 +364,7 @@ export default class Element extends Node {
 			// tabindex-no-positive
 			if (name === 'tabindex') {
 				const value = attribute.get_static_value();
+				// @ts-ignore todo is tabindex=true correct case?
 				if (!isNaN(value) && +value > 0) {
 					component.warn(attribute, {
 						code: `a11y-positive-tabindex`,
@@ -544,7 +550,7 @@ export default class Element extends Node {
 						message: `'group' binding can only be used with <input type="checkbox"> or <input type="radio">`
 					});
 				}
-			} else if (name == 'files') {
+			} else if (name === 'files') {
 				if (this.name !== 'input') {
 					component.error(binding, {
 						code: `invalid-binding`,
@@ -560,6 +566,14 @@ export default class Element extends Node {
 						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`,
+						message: `'${name}' binding can only be used with <details>`
+					});
+				}
 			} else if (
 				name === 'currentTime' ||
 				name === 'duration' ||
@@ -675,7 +689,7 @@ export default class Element extends Node {
 			if (class_attribute.chunks.length === 1 && class_attribute.chunks[0].type === 'Text') {
 				(class_attribute.chunks[0] as Text).data += ` ${class_name}`;
 			} else {
-				(<Node[]>class_attribute.chunks).push(
+				(class_attribute.chunks as Node[]).push(
 					new Text(this.component, this, this.scope, {
 						type: 'Text',
 						data: ` ${class_name}`
diff --git a/src/compile/nodes/ElseBlock.ts b/src/compiler/compile/nodes/ElseBlock.ts
similarity index 77%
rename from src/compile/nodes/ElseBlock.ts
rename to src/compiler/compile/nodes/ElseBlock.ts
index 61c1aa5455..5f3aa29529 100644
--- a/src/compile/nodes/ElseBlock.ts
+++ b/src/compiler/compile/nodes/ElseBlock.ts
@@ -1,10 +1,11 @@
 import map_children from './shared/map_children';
 import AbstractBlock from './shared/AbstractBlock';
+import Component from '../Component';
 
 export default class ElseBlock extends AbstractBlock {
 	type: 'ElseBlock';
 
-	constructor(component, parent, scope, info) {
+	constructor(component: Component, parent, scope, info) {
 		super(component, parent, scope, info);
 		this.children = map_children(component, this, scope, info.children);
 
diff --git a/src/compile/nodes/EventHandler.ts b/src/compiler/compile/nodes/EventHandler.ts
similarity index 98%
rename from src/compile/nodes/EventHandler.ts
rename to src/compiler/compile/nodes/EventHandler.ts
index f5e7e0e898..dab60858d5 100644
--- a/src/compile/nodes/EventHandler.ts
+++ b/src/compiler/compile/nodes/EventHandler.ts
@@ -5,6 +5,7 @@ import deindent from '../utils/deindent';
 import Block from '../render-dom/Block';
 
 export default class EventHandler extends Node {
+	type: 'EventHandler';
 	name: string;
 	modifiers: Set<string>;
 	expression: Expression;
@@ -65,4 +66,4 @@ export default class EventHandler extends Node {
 		// this.component.add_reference(this.handler_name);
 		return `ctx.${this.handler_name}`;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compile/nodes/Fragment.ts b/src/compiler/compile/nodes/Fragment.ts
similarity index 86%
rename from src/compile/nodes/Fragment.ts
rename to src/compiler/compile/nodes/Fragment.ts
index ec25d41a1c..6025b036a6 100644
--- a/src/compile/nodes/Fragment.ts
+++ b/src/compiler/compile/nodes/Fragment.ts
@@ -3,10 +3,12 @@ import Component from '../Component';
 import map_children from './shared/map_children';
 import Block from '../render-dom/Block';
 import TemplateScope from './shared/TemplateScope';
+import { INode } from './interfaces';
 
 export default class Fragment extends Node {
+	type: 'Fragment';
 	block: Block;
-	children: Node[];
+	children: INode[];
 	scope: TemplateScope;
 
 	constructor(component: Component, info: any) {
@@ -16,4 +18,4 @@ export default class Fragment extends Node {
 		this.scope = scope;
 		this.children = map_children(component, this, scope, info.children);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compile/nodes/Head.ts b/src/compiler/compile/nodes/Head.ts
similarity index 93%
rename from src/compile/nodes/Head.ts
rename to src/compiler/compile/nodes/Head.ts
index bc6e9bde40..2c08dcd595 100644
--- a/src/compile/nodes/Head.ts
+++ b/src/compiler/compile/nodes/Head.ts
@@ -1,5 +1,4 @@
 import Node from './shared/Node';
-import Block from '../render-dom/Block';
 import map_children from './shared/map_children';
 
 export default class Head extends Node {
diff --git a/src/compile/nodes/IfBlock.ts b/src/compiler/compile/nodes/IfBlock.ts
similarity index 100%
rename from src/compile/nodes/IfBlock.ts
rename to src/compiler/compile/nodes/IfBlock.ts
diff --git a/src/compile/nodes/InlineComponent.ts b/src/compiler/compile/nodes/InlineComponent.ts
similarity index 89%
rename from src/compile/nodes/InlineComponent.ts
rename to src/compiler/compile/nodes/InlineComponent.ts
index 0d8801aad1..2c8265ade1 100644
--- a/src/compile/nodes/InlineComponent.ts
+++ b/src/compiler/compile/nodes/InlineComponent.ts
@@ -7,6 +7,7 @@ import Expression from './shared/Expression';
 import Component from '../Component';
 import Let from './Let';
 import TemplateScope from './shared/TemplateScope';
+import { INode } from './interfaces';
 
 export default class InlineComponent extends Node {
 	type: 'InlineComponent';
@@ -16,15 +17,16 @@ export default class InlineComponent extends Node {
 	bindings: Binding[] = [];
 	handlers: EventHandler[] = [];
 	lets: Let[] = [];
-	children: Node[];
+	children: INode[];
 	scope: TemplateScope;
 
 	constructor(component: Component, parent, scope, info) {
 		super(component, parent, scope, info);
 
 		if (info.name !== 'svelte:component' && info.name !== 'svelte:self') {
-			component.warn_if_undefined(info, scope);
-			component.add_reference(info.name);
+			const name = info.name.split('.')[0]; // accommodate namespaces
+			component.warn_if_undefined(name, info, scope);
+			component.add_reference(name);
 		}
 
 		this.name = info.name;
@@ -34,6 +36,7 @@ export default class InlineComponent extends Node {
 			: null;
 
 		info.attributes.forEach(node => {
+			/* eslint-disable no-fallthrough */
 			switch (node.type) {
 				case 'Action':
 					component.error(node, {
@@ -80,6 +83,7 @@ export default class InlineComponent extends Node {
 				default:
 					throw new Error(`Not implemented: ${node.type}`);
 			}
+			/* eslint-enable no-fallthrough */
 		});
 
 		if (this.lets.length > 0) {
diff --git a/src/compile/nodes/Let.ts b/src/compiler/compile/nodes/Let.ts
similarity index 100%
rename from src/compile/nodes/Let.ts
rename to src/compiler/compile/nodes/Let.ts
diff --git a/src/compiler/compile/nodes/MustacheTag.ts b/src/compiler/compile/nodes/MustacheTag.ts
new file mode 100644
index 0000000000..ac6688d503
--- /dev/null
+++ b/src/compiler/compile/nodes/MustacheTag.ts
@@ -0,0 +1,5 @@
+import Tag from './shared/Tag';
+
+export default class MustacheTag extends Tag {
+	type: 'MustacheTag';
+}
diff --git a/src/compile/nodes/Options.ts b/src/compiler/compile/nodes/Options.ts
similarity index 100%
rename from src/compile/nodes/Options.ts
rename to src/compiler/compile/nodes/Options.ts
diff --git a/src/compile/nodes/PendingBlock.ts b/src/compiler/compile/nodes/PendingBlock.ts
similarity index 94%
rename from src/compile/nodes/PendingBlock.ts
rename to src/compiler/compile/nodes/PendingBlock.ts
index 0fd71c0221..44ee4a3a10 100644
--- a/src/compile/nodes/PendingBlock.ts
+++ b/src/compiler/compile/nodes/PendingBlock.ts
@@ -2,7 +2,7 @@ import map_children from './shared/map_children';
 import AbstractBlock from './shared/AbstractBlock';
 
 export default class PendingBlock extends AbstractBlock {
-
+	type: 'PendingBlock';
 	constructor(component, parent, scope, info) {
 		super(component, parent, scope, info);
 		this.children = map_children(component, parent, scope, info.children);
diff --git a/src/compiler/compile/nodes/RawMustacheTag.ts b/src/compiler/compile/nodes/RawMustacheTag.ts
new file mode 100644
index 0000000000..fc63885942
--- /dev/null
+++ b/src/compiler/compile/nodes/RawMustacheTag.ts
@@ -0,0 +1,5 @@
+import Tag from './shared/Tag';
+
+export default class RawMustacheTag extends Tag {
+	type: 'RawMustacheTag'
+}
diff --git a/src/compile/nodes/Slot.ts b/src/compiler/compile/nodes/Slot.ts
similarity index 92%
rename from src/compile/nodes/Slot.ts
rename to src/compiler/compile/nodes/Slot.ts
index dbb502b41a..a03fe8c026 100644
--- a/src/compile/nodes/Slot.ts
+++ b/src/compiler/compile/nodes/Slot.ts
@@ -1,17 +1,17 @@
-import Node from './shared/Node';
 import Element from './Element';
 import Attribute from './Attribute';
 import Component from '../Component';
 import TemplateScope from './shared/TemplateScope';
+import { INode } from './interfaces';
 
 export default class Slot extends Element {
 	type: 'Element';
 	name: string;
-	children: Node[];
+	children: INode[];
 	slot_name: string;
 	values: Map<string, Attribute> = new Map();
 
-	constructor(component: Component, parent: Node, scope: TemplateScope, info: any) {
+	constructor(component: Component, parent: INode, scope: TemplateScope, info: any) {
 		super(component, parent, scope, info);
 
 		info.attributes.forEach(attr => {
@@ -68,4 +68,4 @@ export default class Slot extends Element {
 
 		component.slots.set(this.slot_name, this);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compile/nodes/Text.ts b/src/compiler/compile/nodes/Text.ts
similarity index 81%
rename from src/compile/nodes/Text.ts
rename to src/compiler/compile/nodes/Text.ts
index 1c31c9d83d..7500f5ff30 100644
--- a/src/compile/nodes/Text.ts
+++ b/src/compiler/compile/nodes/Text.ts
@@ -1,13 +1,14 @@
 import Node from './shared/Node';
 import Component from '../Component';
 import TemplateScope from './shared/TemplateScope';
+import { INode } from './interfaces';
 
 export default class Text extends Node {
 	type: 'Text';
 	data: string;
 	use_space = false;
 
-	constructor(component: Component, parent: Node, scope: TemplateScope, info: any) {
+	constructor(component: Component, parent: INode, scope: TemplateScope, info: any) {
 		super(component, parent, scope, info);
 		this.data = info.data;
 
@@ -23,4 +24,4 @@ export default class Text extends Node {
 			this.use_space = true;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compile/nodes/ThenBlock.ts b/src/compiler/compile/nodes/ThenBlock.ts
similarity index 96%
rename from src/compile/nodes/ThenBlock.ts
rename to src/compiler/compile/nodes/ThenBlock.ts
index 7e4ed0e5da..7f9bbde0f0 100644
--- a/src/compile/nodes/ThenBlock.ts
+++ b/src/compiler/compile/nodes/ThenBlock.ts
@@ -3,6 +3,7 @@ import TemplateScope from './shared/TemplateScope';
 import AbstractBlock from './shared/AbstractBlock';
 
 export default class ThenBlock extends AbstractBlock {
+	type: 'ThenBlock';
 	scope: TemplateScope;
 
 	constructor(component, parent, scope, info) {
diff --git a/src/compile/nodes/Title.ts b/src/compiler/compile/nodes/Title.ts
similarity index 81%
rename from src/compile/nodes/Title.ts
rename to src/compiler/compile/nodes/Title.ts
index fd58d3043d..6ac0848053 100644
--- a/src/compile/nodes/Title.ts
+++ b/src/compiler/compile/nodes/Title.ts
@@ -1,12 +1,13 @@
 import Node from './shared/Node';
-import map_children from './shared/map_children';
+import map_children, { Children } from './shared/map_children';
+import Component from '../Component';
 
 export default class Title extends Node {
 	type: 'Title';
-	children: any[]; // TODO
+	children: Children;
 	should_cache: boolean;
 
-	constructor(component, parent, scope, info) {
+	constructor(component: Component, parent, scope, info) {
 		super(component, parent, scope, info);
 		this.children = map_children(component, parent, scope, info.children);
 
@@ -33,4 +34,4 @@ export default class Title extends Node {
 			)
 			: true;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compile/nodes/Transition.ts b/src/compiler/compile/nodes/Transition.ts
similarity index 95%
rename from src/compile/nodes/Transition.ts
rename to src/compiler/compile/nodes/Transition.ts
index c3f22d888e..82eb578f0f 100644
--- a/src/compile/nodes/Transition.ts
+++ b/src/compiler/compile/nodes/Transition.ts
@@ -12,7 +12,7 @@ export default class Transition extends Node {
 	constructor(component: Component, parent, scope, info) {
 		super(component, parent, scope, info);
 
-		component.warn_if_undefined(info, scope);
+		component.warn_if_undefined(info.name, info, scope);
 
 		this.name = info.name;
 		component.qualify(info.name);
diff --git a/src/compile/nodes/Window.ts b/src/compiler/compile/nodes/Window.ts
similarity index 95%
rename from src/compile/nodes/Window.ts
rename to src/compiler/compile/nodes/Window.ts
index 7ddf109ab3..d1e61fb1fc 100644
--- a/src/compile/nodes/Window.ts
+++ b/src/compiler/compile/nodes/Window.ts
@@ -44,8 +44,8 @@ export default class Window extends Node {
 				if (!~valid_bindings.indexOf(node.name)) {
 					const match = (
 						node.name === 'width' ? 'innerWidth' :
-						node.name === 'height' ? 'innerHeight' :
-						fuzzymatch(node.name, valid_bindings)
+							node.name === 'height' ? 'innerHeight' :
+								fuzzymatch(node.name, valid_bindings)
 					);
 
 					const message = `'${node.name}' is not a valid binding on <svelte:window>`;
diff --git a/src/compiler/compile/nodes/interfaces.ts b/src/compiler/compile/nodes/interfaces.ts
new file mode 100644
index 0000000000..752168a49d
--- /dev/null
+++ b/src/compiler/compile/nodes/interfaces.ts
@@ -0,0 +1,64 @@
+import Tag from './shared/Tag';
+
+import Action from './Action';
+import Animation from './Animation';
+import Attribute from './Attribute';
+import AwaitBlock from './AwaitBlock';
+import Binding from './Binding';
+import Body from './Body';
+import CatchBlock from './CatchBlock';
+import Class from './Class';
+import Comment from './Comment';
+import DebugTag from './DebugTag';
+import EachBlock from './EachBlock';
+import Element from './Element';
+import ElseBlock from './ElseBlock';
+import EventHandler from './EventHandler';
+import Fragment from './Fragment';
+import Head from './Head';
+import IfBlock from './IfBlock';
+import InlineComponent from './InlineComponent';
+import Let from './Let';
+import MustacheTag from './MustacheTag';
+import Options from './Options';
+import PendingBlock from './PendingBlock';
+import RawMustacheTag from './RawMustacheTag';
+import Slot from './Slot';
+import Text from './Text';
+import ThenBlock from './ThenBlock';
+import Title from './Title';
+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
+export type INode = Action
+| Animation
+| Attribute
+| AwaitBlock
+| Binding
+| Body
+| CatchBlock
+| Class
+| Comment
+| DebugTag
+| EachBlock
+| Element
+| ElseBlock
+| EventHandler
+| Fragment
+| Head
+| IfBlock
+| InlineComponent
+| Let
+| MustacheTag
+| Options
+| PendingBlock
+| RawMustacheTag
+| Slot
+| Tag
+| Text
+| ThenBlock
+| Title
+| Transition
+| Window;
diff --git a/src/compile/nodes/shared/AbstractBlock.ts b/src/compiler/compile/nodes/shared/AbstractBlock.ts
similarity index 84%
rename from src/compile/nodes/shared/AbstractBlock.ts
rename to src/compiler/compile/nodes/shared/AbstractBlock.ts
index 1dfebd51f0..931dd4d82d 100644
--- a/src/compile/nodes/shared/AbstractBlock.ts
+++ b/src/compiler/compile/nodes/shared/AbstractBlock.ts
@@ -1,10 +1,11 @@
 import Block from '../../render-dom/Block';
-import Component from './../../Component';
+import Component from '../../Component';
 import Node from './Node';
+import { INode } from '../interfaces';
 
 export default class AbstractBlock extends Node {
 	block: Block;
-	children: Node[];
+	children: INode[];
 
 	constructor(component: Component, parent, scope, info: any) {
 		super(component, parent, scope, info);
diff --git a/src/compile/nodes/shared/Expression.ts b/src/compiler/compile/nodes/shared/Expression.ts
similarity index 96%
rename from src/compile/nodes/shared/Expression.ts
rename to src/compiler/compile/nodes/shared/Expression.ts
index 22cb403f75..004ae716b9 100644
--- a/src/compile/nodes/shared/Expression.ts
+++ b/src/compiler/compile/nodes/shared/Expression.ts
@@ -4,14 +4,15 @@ import is_reference from 'is-reference';
 import flatten_reference from '../../utils/flatten_reference';
 import { create_scopes, Scope, extract_names } from '../../utils/scope';
 import { Node } from '../../../interfaces';
-import { globals } from '../../../utils/names';
+import { globals , sanitize } from '../../../utils/names';
 import deindent from '../../utils/deindent';
 import Wrapper from '../../render-dom/wrappers/shared/Wrapper';
-import { sanitize } from '../../../utils/names';
+
 import TemplateScope from './TemplateScope';
 import get_object from '../../utils/get_object';
 import { nodes_match } from '../../../utils/nodes_match';
 import Block from '../../render-dom/Block';
+import { INode } from '../interfaces';
 
 const binary_operators: Record<string, number> = {
 	'**': 15,
@@ -27,8 +28,8 @@ const binary_operators: Record<string, number> = {
 	'<=': 11,
 	'>': 11,
 	'>=': 11,
-	'in': 11,
-	'instanceof': 11,
+	in: 11,
+	instanceof: 11,
 	'==': 10,
 	'!=': 10,
 	'===': 10,
@@ -61,10 +62,12 @@ const precedence: Record<string, (node?: Node) => number> = {
 	SequenceExpression: () => 0
 };
 
+type Owner = Wrapper | INode;
+
 export default class Expression {
-	type = 'Expression';
+	type: 'Expression' = 'Expression';
 	component: Component;
-	owner: Wrapper;
+	owner: Owner;
 	node: any;
 	snippet: string;
 	references: Set<string>;
@@ -81,7 +84,8 @@ export default class Expression {
 
 	rendered: string;
 
-	constructor(component: Component, owner: Wrapper, template_scope: TemplateScope, info) {
+	// todo: owner type
+	constructor(component: Component, owner: Owner, template_scope: TemplateScope, info) {
 		// TODO revert to direct property access in prod?
 		Object.defineProperties(this, {
 			component: {
@@ -92,6 +96,7 @@ export default class Expression {
 		this.node = info;
 		this.template_scope = template_scope;
 		this.owner = owner;
+		// @ts-ignore
 		this.is_synthetic = owner.is_synthetic;
 
 		const { dependencies, contextual_dependencies } = this;
@@ -149,7 +154,7 @@ export default class Expression {
 						}
 
 						component.add_reference(name);
-						component.warn_if_undefined(nodes[0], template_scope);
+						component.warn_if_undefined(name, nodes[0], template_scope);
 					}
 
 					this.skip();
@@ -218,7 +223,7 @@ export default class Expression {
 	}
 
 	// TODO move this into a render-dom wrapper?
-	render(block: Block) {
+	render(block?: Block) {
 		if (this.rendered) return this.rendered;
 
 		const {
@@ -485,7 +490,7 @@ export default class Expression {
 	}
 }
 
-function get_function_name(node, parent) {
+function get_function_name(_node, parent) {
 	if (parent.type === 'EventHandler') {
 		return `${parent.name}_handler`;
 	}
@@ -510,4 +515,4 @@ function is_contextual(component: Component, scope: TemplateScope, name: string)
 
 	// assume contextual
 	return true;
-}
\ No newline at end of file
+}
diff --git a/src/compile/nodes/shared/Node.ts b/src/compiler/compile/nodes/shared/Node.ts
similarity index 78%
rename from src/compile/nodes/shared/Node.ts
rename to src/compiler/compile/nodes/shared/Node.ts
index b6eaf9965d..7435f1eab8 100644
--- a/src/compile/nodes/shared/Node.ts
+++ b/src/compiler/compile/nodes/shared/Node.ts
@@ -1,21 +1,23 @@
-import Attribute from './../Attribute';
-import Component from './../../Component';
+import Attribute from '../Attribute';
+import Component from '../../Component';
+import { INode } from '../interfaces';
+import Text from '../Text';
 
 export default class Node {
 	readonly start: number;
 	readonly end: number;
 	readonly component: Component;
-	readonly parent: Node;
+	readonly parent: INode;
 	readonly type: string;
 
-	prev?: Node;
-	next?: Node;
+	prev?: INode;
+	next?: INode;
 
 	can_use_innerhtml: boolean;
 	var: string;
 	attributes: Attribute[];
 
-	constructor(component: Component, parent, scope, info: any) {
+	constructor(component: Component, parent, _scope, info: any) {
 		this.start = info.start;
 		this.end = info.end;
 		this.type = info.type;
@@ -45,7 +47,7 @@ export default class Node {
 	}
 
 	get_static_attribute_value(name: string) {
-		const attribute = this.attributes.find(
+		const attribute = this.attributes && this.attributes.find(
 			(attr: Attribute) => attr.type === 'Attribute' && attr.name.toLowerCase() === name
 		);
 
@@ -55,7 +57,7 @@ export default class Node {
 		if (attribute.chunks.length === 0) return '';
 
 		if (attribute.chunks.length === 1 && attribute.chunks[0].type === 'Text') {
-			return attribute.chunks[0].data;
+			return (attribute.chunks[0] as Text).data;
 		}
 
 		return null;
diff --git a/src/compile/nodes/shared/Tag.ts b/src/compiler/compile/nodes/shared/Tag.ts
similarity index 91%
rename from src/compile/nodes/shared/Tag.ts
rename to src/compiler/compile/nodes/shared/Tag.ts
index 94971bef11..bc826458d9 100644
--- a/src/compile/nodes/shared/Tag.ts
+++ b/src/compiler/compile/nodes/shared/Tag.ts
@@ -2,6 +2,7 @@ import Node from './Node';
 import Expression from './Expression';
 
 export default class Tag extends Node {
+	type: 'MustacheTag' | 'RawMustacheTag';
 	expression: Expression;
 	should_cache: boolean;
 
@@ -14,4 +15,4 @@ export default class Tag extends Node {
 			(this.expression.dependencies.size && scope.names.has(info.expression.name))
 		);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compile/nodes/shared/TemplateScope.ts b/src/compiler/compile/nodes/shared/TemplateScope.ts
similarity index 97%
rename from src/compile/nodes/shared/TemplateScope.ts
rename to src/compiler/compile/nodes/shared/TemplateScope.ts
index abd366642e..5f30d0c883 100644
--- a/src/compile/nodes/shared/TemplateScope.ts
+++ b/src/compiler/compile/nodes/shared/TemplateScope.ts
@@ -2,6 +2,7 @@ import EachBlock from '../EachBlock';
 import ThenBlock from '../ThenBlock';
 import CatchBlock from '../CatchBlock';
 import InlineComponent from '../InlineComponent';
+import Element from '../Element';
 
 type NodeWithScope = EachBlock | ThenBlock | CatchBlock | InlineComponent | Element;
 
@@ -41,4 +42,4 @@ export default class TemplateScope {
 		const owner = this.get_owner(name);
 		return owner && (owner.type === 'Element' || owner.type === 'InlineComponent');
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compile/nodes/shared/map_children.ts b/src/compiler/compile/nodes/shared/map_children.ts
similarity index 90%
rename from src/compile/nodes/shared/map_children.ts
rename to src/compiler/compile/nodes/shared/map_children.ts
index b903853016..71d764a889 100644
--- a/src/compile/nodes/shared/map_children.ts
+++ b/src/compiler/compile/nodes/shared/map_children.ts
@@ -14,9 +14,11 @@ import Slot from '../Slot';
 import Text from '../Text';
 import Title from '../Title';
 import Window from '../Window';
-import Node from './Node';
+import { Node } from '../../../interfaces';
 
-function get_constructor(type): typeof Node {
+export type Children = ReturnType<typeof map_children>;
+
+function get_constructor(type) {
 	switch (type) {
 		case 'AwaitBlock': return AwaitBlock;
 		case 'Body': return Body;
@@ -38,7 +40,7 @@ function get_constructor(type): typeof Node {
 	}
 }
 
-export default function map_children(component, parent, scope, children: any[]) {
+export default function map_children(component, parent, scope, children: Node[]) {
 	let last = null;
 	return children.map(child => {
 		const constructor = get_constructor(child.type);
diff --git a/src/compile/render-dom/Block.ts b/src/compiler/compile/render-dom/Block.ts
similarity index 95%
rename from src/compile/render-dom/Block.ts
rename to src/compiler/compile/render-dom/Block.ts
index e40b3ceb55..0c585c5bf0 100644
--- a/src/compile/render-dom/Block.ts
+++ b/src/compiler/compile/render-dom/Block.ts
@@ -9,7 +9,7 @@ export interface BlockOptions {
 	renderer?: Renderer;
 	comment?: string;
 	key?: string;
-	bindings?: Map<string, () => { object: string, property: string, snippet: string }>;
+	bindings?: Map<string, { object: string; property: string; snippet: string }>;
 	dependencies?: Set<string>;
 }
 
@@ -26,7 +26,7 @@ export default class Block {
 
 	dependencies: Set<string>;
 
-	bindings: Map<string, { object: string, property: string, snippet: string }>;
+	bindings: Map<string, { object: string; property: string; snippet: string }>;
 
 	builders: {
 		init: CodeBuilder;
@@ -164,7 +164,7 @@ export default class Block {
 
 		if (parent_node) {
 			this.builders.mount.add_line(`@append(${parent_node}, ${name});`);
-			if (parent_node === 'document.head') this.builders.destroy.add_line(`@detach(${name});`);
+			if (parent_node === 'document.head' && !no_detach) this.builders.destroy.add_line(`@detach(${name});`);
 		} else {
 			this.builders.mount.add_line(`@insert(#target, ${name}, anchor);`);
 			if (!no_detach) this.builders.destroy.add_conditional('detaching', `@detach(${name});`);
@@ -357,6 +357,7 @@ export default class Block {
 			`);
 		}
 
+		/* eslint-disable @typescript-eslint/indent,indent */
 		return deindent`
 			${this.variables.size > 0 &&
 				`var ${Array.from(this.variables.keys())
@@ -371,9 +372,10 @@ export default class Block {
 			return {
 				${properties}
 			};
-		`.replace(/(#+)(\w*)/g, (match: string, sigil: string, name: string) => {
+		`.replace(/(#+)(\w*)/g, (_match: string, sigil: string, name: string) => {
 			return sigil === '#' ? this.alias(name) : sigil.slice(1) + name;
 		});
+		/* eslint-enable @typescript-eslint/indent,indent */
 	}
 
 	render_listeners(chunk: string = '') {
@@ -387,7 +389,7 @@ export default class Block {
 
 				this.builders.destroy.add_line(
 					`#dispose${chunk}();`
-				)
+				);
 			} else {
 				this.builders.hydrate.add_block(deindent`
 					#dispose${chunk} = [
diff --git a/src/compile/render-dom/Renderer.ts b/src/compiler/compile/render-dom/Renderer.ts
similarity index 93%
rename from src/compile/render-dom/Renderer.ts
rename to src/compiler/compile/render-dom/Renderer.ts
index 1d766c6345..4c61594aa8 100644
--- a/src/compile/render-dom/Renderer.ts
+++ b/src/compiler/compile/render-dom/Renderer.ts
@@ -3,13 +3,12 @@ import { CompileOptions } from '../../interfaces';
 import Component from '../Component';
 import FragmentWrapper from './wrappers/Fragment';
 import CodeBuilder from '../utils/CodeBuilder';
-import SlotWrapper from './wrappers/Slot';
 
 export default class Renderer {
 	component: Component; // TODO Maybe Renderer shouldn't know about Component?
 	options: CompileOptions;
 
-	blocks: (Block | string)[] = [];
+	blocks: Array<Block | string> = [];
 	readonly: Set<string> = new Set();
 	meta_bindings: CodeBuilder = new CodeBuilder(); // initial values for e.g. window.innerWidth, if there's a <svelte:window> meta tag
 	binding_groups: string[] = [];
@@ -18,6 +17,7 @@ export default class Renderer {
 	fragment: FragmentWrapper;
 
 	file_var: string;
+	locate: (c: number) => { line: number; column: number };
 
 	constructor(component: Component, options: CompileOptions) {
 		this.component = component;
@@ -58,4 +58,4 @@ export default class Renderer {
 
 		this.fragment.render(this.block, null, 'nodes');
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compile/render-dom/index.ts b/src/compiler/compile/render-dom/index.ts
similarity index 92%
rename from src/compile/render-dom/index.ts
rename to src/compiler/compile/render-dom/index.ts
index 0a0743b2a0..46aa705bfb 100644
--- a/src/compile/render-dom/index.ts
+++ b/src/compiler/compile/render-dom/index.ts
@@ -74,18 +74,20 @@ export default function dom(
 	const props = component.vars.filter(variable => !variable.module && variable.export_name);
 	const writable_props = props.filter(variable => variable.writable);
 
+	/* eslint-disable @typescript-eslint/indent,indent */
 	const set = (uses_props || writable_props.length > 0 || component.slots.size > 0)
 		? deindent`
 			${$$props} => {
 				${uses_props && component.invalidate('$$props', `$$props = @assign(@assign({}, $$props), $$new_props)`)}
 				${writable_props.map(prop =>
-				`if ('${prop.export_name}' in $$props) ${component.invalidate(prop.name, `${prop.name} = $$props.${prop.export_name}`)};`
+					`if ('${prop.export_name}' in $$props) ${component.invalidate(prop.name, `${prop.name} = $$props.${prop.export_name}`)};`
 				)}
 				${component.slots.size > 0 &&
 				`if ('$$scope' in ${$$props}) ${component.invalidate('$$scope', `$$scope = ${$$props}.$$scope`)};`}
 			}
 		`
 		: null;
+	/* eslint-enable @typescript-eslint/indent,indent */
 
 	const body = [];
 
@@ -134,7 +136,6 @@ export default function dom(
 	});
 
 	if (component.compile_options.dev) {
-		// TODO check no uunexpected props were passed, as well as
 		// checking that expected ones were passed
 		const expected = props.filter(prop => !prop.initialised);
 
@@ -153,12 +154,12 @@ export default function dom(
 	// instrument assignments
 	if (component.ast.instance) {
 		let scope = component.instance_scope;
-		let map = component.instance_scope_map;
+		const map = component.instance_scope_map;
 
 		let pending_assignments = new Set();
 
 		walk(component.ast.instance.content, {
-			enter: (node, parent) => {
+			enter: (node) => {
 				if (map.has(node)) {
 					scope = map.get(node);
 				}
@@ -204,8 +205,10 @@ export default function dom(
 							if (variable && (variable.hoistable || variable.global || variable.module)) return;
 
 							if (single && !(variable.subscribable && variable.reassigned)) {
-								code.prependRight(node.start, `$$invalidate('${name}', `);
-								code.appendLeft(node.end, `)`);
+								if (variable.referenced || variable.is_reactive_dependency || variable.export_name) {
+									code.prependRight(node.start, `$$invalidate('${name}', `);
+									code.appendLeft(node.end, `)`);
+								}
 							} else {
 								pending_assignments.add(name);
 							}
@@ -364,7 +367,7 @@ export default function dom(
 						}
 
 						const variable = component.var_lookup.get(n);
-						return variable && variable.writable;
+						return variable && (variable.writable || variable.mutated);
 					})
 					.map(n => `$$dirty.${n}`).join(' || ');
 
@@ -389,12 +392,22 @@ export default function dom(
 
 			const store = component.var_lookup.get(name);
 			if (store && store.reassigned) {
-				return `${$name}, $$unsubscribe_${name} = @noop, $$subscribe_${name} = () => { $$unsubscribe_${name}(); $$unsubscribe_${name} = ${name}.subscribe($$value => { ${$name} = $$value; $$invalidate('${$name}', ${$name}); }) }`
+				return `${$name}, $$unsubscribe_${name} = @noop, $$subscribe_${name} = () => { $$unsubscribe_${name}(); $$unsubscribe_${name} = ${name}.subscribe($$value => { ${$name} = $$value; $$invalidate('${$name}', ${$name}); }) }`;
 			}
 
 			return $name;
 		});
 
+		let unknown_props_check;
+		if (component.compile_options.dev && !component.var_lookup.has('$$props') && writable_props.length) {
+			unknown_props_check = deindent`
+				const writable_props = [${writable_props.map(prop => `'${prop.export_name}'`).join(', ')}];
+				Object.keys($$props).forEach(key => {
+					if (!writable_props.includes(key) && !key.startsWith('$$')) console.warn(\`<${component.tag}> was created with unknown prop '\${key}'\`);
+				});
+			`;
+		}
+
 		builder.add_block(deindent`
 			function ${definition}(${args.join(', ')}) {
 				${reactive_store_declarations.length > 0 && `let ${reactive_store_declarations.join(', ')};`}
@@ -405,6 +418,8 @@ export default function dom(
 
 				${component.javascript}
 
+				${unknown_props_check}
+
 				${component.slots.size && `let { $$slots = {}, $$scope } = $$props;`}
 
 				${renderer.binding_groups.length > 0 && `const $$binding_groups = [${renderer.binding_groups.map(_ => `[]`).join(', ')}];`}
@@ -462,9 +477,13 @@ export default function dom(
 
 				${body.length > 0 && body.join('\n\n')}
 			}
-
-			customElements.define("${component.tag}", ${name});
 		`);
+
+		if (component.tag != null) {
+			builder.add_block(deindent`
+				customElements.define("${component.tag}", ${name});
+			`);
+		}
 	} else {
 		const superclass = options.dev ? 'SvelteComponentDev' : 'SvelteComponent';
 
diff --git a/src/compile/render-dom/wrappers/AwaitBlock.ts b/src/compiler/compile/render-dom/wrappers/AwaitBlock.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/AwaitBlock.ts
rename to src/compiler/compile/render-dom/wrappers/AwaitBlock.ts
diff --git a/src/compile/render-dom/wrappers/Body.ts b/src/compiler/compile/render-dom/wrappers/Body.ts
similarity index 88%
rename from src/compile/render-dom/wrappers/Body.ts
rename to src/compiler/compile/render-dom/wrappers/Body.ts
index ca6c9df43f..04e677a090 100644
--- a/src/compile/render-dom/wrappers/Body.ts
+++ b/src/compiler/compile/render-dom/wrappers/Body.ts
@@ -6,7 +6,7 @@ import Body from '../../nodes/Body';
 export default class BodyWrapper extends Wrapper {
 	node: Body;
 
-	render(block: Block, parent_node: string, parent_nodes: string) {
+	render(block: Block, _parent_node: string, _parent_nodes: string) {
 		this.node.handlers.forEach(handler => {
 			const snippet = handler.render(block);
 
diff --git a/src/compile/render-dom/wrappers/DebugTag.ts b/src/compiler/compile/render-dom/wrappers/DebugTag.ts
similarity index 69%
rename from src/compile/render-dom/wrappers/DebugTag.ts
rename to src/compiler/compile/render-dom/wrappers/DebugTag.ts
index 06fef90a62..713113921d 100644
--- a/src/compile/render-dom/wrappers/DebugTag.ts
+++ b/src/compiler/compile/render-dom/wrappers/DebugTag.ts
@@ -13,19 +13,19 @@ export default class DebugTagWrapper extends Wrapper {
 		block: Block,
 		parent: Wrapper,
 		node: DebugTag,
-		strip_whitespace: boolean,
-		next_sibling: Wrapper
+		_strip_whitespace: boolean,
+		_next_sibling: Wrapper
 	) {
 		super(renderer, block, parent, node);
 	}
 
-	render(block: Block, parent_node: string, parent_nodes: string) {
+	render(block: Block, _parent_node: string, _parent_nodes: string) {
 		const { renderer } = this;
 		const { component } = renderer;
 
 		if (!renderer.options.dev) return;
 
-		const { code } = component;
+		const { code, var_lookup } = component;
 
 		if (this.node.expressions.length === 0) {
 			// Debug all
@@ -50,23 +50,30 @@ export default class DebugTagWrapper extends Wrapper {
 
 			const condition = Array.from(dependencies).map(d => `changed.${d}`).join(' || ');
 
-			const identifiers = this.node.expressions.map(e => e.node.name).join(', ');
+			const ctx_identifiers = this.node.expressions
+				.filter(e => {
+					const looked_up_var = var_lookup.get(e.node.name);
+					return !(looked_up_var && looked_up_var.hoistable);
+				})
+				.map(e => e.node.name)
+				.join(', ');
+			const logged_identifiers = this.node.expressions.map(e => e.node.name).join(', ');
 
 			block.builders.update.add_block(deindent`
 				if (${condition}) {
-					const { ${identifiers} } = ctx;
-					console.${log}({ ${identifiers} });
+					const { ${ctx_identifiers} } = ctx;
+					console.${log}({ ${logged_identifiers} });
 					debugger;
 				}
 			`);
 
 			block.builders.create.add_block(deindent`
 				{
-					const { ${identifiers} } = ctx;
-					console.${log}({ ${identifiers} });
+					const { ${ctx_identifiers} } = ctx;
+					console.${log}({ ${logged_identifiers} });
 					debugger;
 				}
 			`);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compile/render-dom/wrappers/EachBlock.ts b/src/compiler/compile/render-dom/wrappers/EachBlock.ts
similarity index 97%
rename from src/compile/render-dom/wrappers/EachBlock.ts
rename to src/compiler/compile/render-dom/wrappers/EachBlock.ts
index fe5d5746e5..a1a875a12f 100644
--- a/src/compile/render-dom/wrappers/EachBlock.ts
+++ b/src/compiler/compile/render-dom/wrappers/EachBlock.ts
@@ -8,7 +8,7 @@ import deindent from '../../utils/deindent';
 import ElseBlock from '../../nodes/ElseBlock';
 import { attach_head } from '../../utils/tail';
 
-class ElseBlockWrapper extends Wrapper {
+export class ElseBlockWrapper extends Wrapper {
 	node: ElseBlock;
 	block: Block;
 	fragment: FragmentWrapper;
@@ -83,6 +83,7 @@ export default class EachBlockWrapper extends Wrapper {
 		this.block = block.child({
 			comment: create_debugging_comment(this.node, this.renderer.component),
 			name: renderer.component.get_unique_name('create_each_block'),
+			// @ts-ignore todo: probably error
 			key: node.key as string,
 
 			bindings: new Map(block.bindings)
@@ -310,7 +311,9 @@ export default class EachBlockWrapper extends Wrapper {
 		}
 
 		block.builders.init.add_block(deindent`
-			const ${get_key} = ctx => ${this.node.key.render()};
+			const ${get_key} = ctx => ${
+			// @ts-ignore todo: probably error
+			this.node.key.render()};
 
 			for (var #i = 0; #i < ${this.vars.each_block_value}.${length}; #i += 1) {
 				let child_ctx = ${this.vars.get_each_context}(ctx, ${this.vars.each_block_value}, #i);
@@ -340,7 +343,9 @@ export default class EachBlockWrapper extends Wrapper {
 		const dynamic = this.block.has_update_method;
 
 		const destroy = this.node.has_animation
-			? `@fix_and_outro_and_destroy_block`
+			? (this.block.has_outros
+				? `@fix_and_outro_and_destroy_block`
+				: `@fix_and_destroy_block`)
 			: this.block.has_outros
 				? `@outro_and_destroy_block`
 				: `@destroy_block`;
@@ -420,7 +425,7 @@ export default class EachBlockWrapper extends Wrapper {
 			all_dependencies.add(dependency);
 		});
 
-		const outro_block = this.block.has_outros && block.get_unique_name('outro_block')
+		const outro_block = this.block.has_outros && block.get_unique_name('outro_block');
 		if (outro_block) {
 			block.builders.init.add_block(deindent`
 				function ${outro_block}(i, detaching, local) {
@@ -505,7 +510,7 @@ export default class EachBlockWrapper extends Wrapper {
 		if (outro_block) {
 			block.builders.outro.add_block(deindent`
 				${iterations} = ${iterations}.filter(Boolean);
-				for (let #i = 0; #i < ${view_length}; #i += 1) ${outro_block}(#i, 0);`
+				for (let #i = 0; #i < ${view_length}; #i += 1) ${outro_block}(#i, 0, 0);`
 			);
 		}
 
diff --git a/src/compile/render-dom/wrappers/Element/Attribute.ts b/src/compiler/compile/render-dom/wrappers/Element/Attribute.ts
similarity index 96%
rename from src/compile/render-dom/wrappers/Element/Attribute.ts
rename to src/compiler/compile/render-dom/wrappers/Element/Attribute.ts
index 9841f4e85d..669a3774e3 100644
--- a/src/compile/render-dom/wrappers/Element/Attribute.ts
+++ b/src/compiler/compile/render-dom/wrappers/Element/Attribute.ts
@@ -4,6 +4,7 @@ import fix_attribute_casing from './fix_attribute_casing';
 import ElementWrapper from './index';
 import { stringify } from '../../../utils/stringify';
 import deindent from '../../../utils/deindent';
+import Expression from '../../../nodes/shared/Expression';
 
 export default class AttributeWrapper {
 	node: Attribute;
@@ -21,7 +22,9 @@ export default class AttributeWrapper {
 			// 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')) select = select.parent;
+				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 => {
@@ -47,9 +50,9 @@ export default class AttributeWrapper {
 			(element.node.name === 'option' || // TODO check it's actually bound
 				(element.node.name === 'input' &&
 					element.node.bindings.find(
-						(binding: Binding) =>
+						(binding) =>
 							/checked|group/.test(binding.name)
-						)));
+					)));
 
 		const property_name = is_indirectly_bound_value
 			? '__value'
@@ -67,7 +70,7 @@ export default class AttributeWrapper {
 		const is_legacy_input_type = element.renderer.component.compile_options.legacy && name === 'type' && this.parent.node.name === 'input';
 
 		const is_dataset = /^data-/.test(name) && !element.renderer.component.compile_options.legacy && !element.node.namespace;
-		const camel_case_name = is_dataset ? name.replace('data-', '').replace(/(-\w)/g, function (m) {
+		const camel_case_name = is_dataset ? name.replace('data-', '').replace(/(-\w)/g, (m) => {
 			return m[1].toUpperCase();
 		}) : name;
 
@@ -78,13 +81,13 @@ export default class AttributeWrapper {
 			// DRY it out if that's possible without introducing crazy indirection
 			if (this.node.chunks.length === 1) {
 				// single {tag} — may be a non-string
-				value = this.node.chunks[0].render(block);
+				value = (this.node.chunks[0] as Expression).render(block);
 			} else {
 				// '{foo} {bar}' — treat as string concatenation
 				value =
 					(this.node.chunks[0].type === 'Text' ? '' : `"" + `) +
 					this.node.chunks
-						.map((chunk: Node) => {
+						.map((chunk) => {
 							if (chunk.type === 'Text') {
 								return stringify(chunk.data);
 							} else {
@@ -187,7 +190,7 @@ export default class AttributeWrapper {
 					: property_name
 						? `${element.var}.${property_name} = ${value};`
 						: is_dataset
-							? `${element.var}.dataset.${camel_case_name} = ${value};`
+							? `${element.var}.dataset.${camel_case_name} = ${value === true ? '""' : value};`
 							: `${method}(${element.var}, "${name}", ${value === true ? '""' : value});`
 			);
 
@@ -216,7 +219,7 @@ export default class AttributeWrapper {
 		return `="${value.map(chunk => {
 			return chunk.type === 'Text'
 				? chunk.data.replace(/"/g, '\\"')
-				: `\${${chunk.render()}}`
+				: `\${${chunk.render()}}`;
 		})}"`;
 	}
 }
diff --git a/src/compile/render-dom/wrappers/Element/Binding.ts b/src/compiler/compile/render-dom/wrappers/Element/Binding.ts
similarity index 90%
rename from src/compile/render-dom/wrappers/Element/Binding.ts
rename to src/compiler/compile/render-dom/wrappers/Element/Binding.ts
index a34a9466fc..2c8f3e14c2 100644
--- a/src/compile/render-dom/wrappers/Element/Binding.ts
+++ b/src/compiler/compile/render-dom/wrappers/Element/Binding.ts
@@ -1,6 +1,5 @@
 import Binding from '../../../nodes/Binding';
-import ElementWrapper from '.';
-import { dimensions } from '../../../../utils/patterns';
+import ElementWrapper from '../Element';
 import get_object from '../../../utils/get_object';
 import Block from '../../Block';
 import Node from '../../../nodes/shared/Node';
@@ -9,14 +8,6 @@ import flatten_reference from '../../../utils/flatten_reference';
 import EachBlock from '../../../nodes/EachBlock';
 import { Node as INode } from '../../../../interfaces';
 
-// TODO this should live in a specific binding
-const read_only_media_attributes = new Set([
-	'duration',
-	'buffered',
-	'seekable',
-	'played'
-]);
-
 function get_tail(node: INode) {
 	const end = node.end;
 	while (node.type === 'MemberExpression') node = node.object;
@@ -31,8 +22,8 @@ export default class BindingWrapper {
 	handler: {
 		uses_context: boolean;
 		mutation: string;
-		contextual_dependencies: Set<string>,
-		snippet?: string
+		contextual_dependencies: Set<string>;
+		snippet?: string;
 	};
 	snippet: string;
 	is_readonly: boolean;
@@ -74,13 +65,7 @@ export default class BindingWrapper {
 
 		this.snippet = this.node.expression.render(block);
 
-		const type = parent.node.get_static_attribute_value('type');
-
-		this.is_readonly = (
-			dimensions.test(this.node.name) ||
-			(parent.node.is_media_node() && read_only_media_attributes.has(this.node.name)) ||
-			(parent.node.name === 'input' && type === 'file') // TODO others?
-		);
+		this.is_readonly = this.node.is_readonly;
 
 		this.needs_lock = this.node.name === 'currentTime'; // TODO others?
 	}
@@ -101,7 +86,7 @@ export default class BindingWrapper {
 	}
 
 	is_readonly_media_attribute() {
-		return read_only_media_attributes.has(this.node.name);
+		return this.node.is_readonly_media_attribute();
 	}
 
 	render(block: Block, lock: string) {
@@ -109,23 +94,23 @@ export default class BindingWrapper {
 
 		const { parent } = this;
 
-		let update_conditions: string[] = this.needs_lock ? [`!${lock}`] : [];
+		const update_conditions: string[] = this.needs_lock ? [`!${lock}`] : [];
 
 		const dependency_array = [...this.node.expression.dependencies];
 
 		if (dependency_array.length === 1) {
-			update_conditions.push(`changed.${dependency_array[0]}`)
+			update_conditions.push(`changed.${dependency_array[0]}`);
 		} else if (dependency_array.length > 1) {
 			update_conditions.push(
 				`(${dependency_array.map(prop => `changed.${prop}`).join(' || ')})`
-			)
+			);
 		}
 
 		if (parent.node.name === 'input') {
 			const type = parent.node.get_static_attribute_value('type');
 
 			if (type === null || type === "" || type === "text") {
-				update_conditions.push(`(${parent.var}.${this.node.name} !== ${this.snippet})`)
+				update_conditions.push(`(${parent.var}.${this.node.name} !== ${this.snippet})`);
 			}
 		}
 
@@ -135,6 +120,7 @@ export default class BindingWrapper {
 		// special cases
 		switch (this.node.name) {
 			case 'group':
+			{
 				const binding_group = get_binding_group(parent.renderer, this.node.expression.node);
 
 				block.builders.hydrate.add_line(
@@ -145,6 +131,7 @@ export default class BindingWrapper {
 					`ctx.$$binding_groups[${binding_group}].splice(ctx.$$binding_groups[${binding_group}].indexOf(${parent.var}), 1);`
 				);
 				break;
+			}
 
 			case 'currentTime':
 			case 'playbackRate':
@@ -153,6 +140,7 @@ export default class BindingWrapper {
 				break;
 
 			case 'paused':
+			{
 				// this is necessary to prevent audio restarting by itself
 				const last = block.get_unique_name(`${parent.var}_is_paused`);
 				block.add_variable(last, 'true');
@@ -160,6 +148,7 @@ export default class BindingWrapper {
 				update_conditions.push(`${last} !== (${last} = ${this.snippet})`);
 				update_dom = `${parent.var}[${last} ? "pause" : "play"]();`;
 				break;
+			}
 
 			case 'value':
 				if (parent.node.get_static_attribute_value('type') === 'file') {
@@ -206,7 +195,7 @@ function get_dom_updater(
 			? `~${binding.snippet}.indexOf(${element.var}.__value)`
 			: `${element.var}.__value === ${binding.snippet}`;
 
-		return `${element.var}.checked = ${condition};`
+		return `${element.var}.checked = ${condition};`;
 	}
 
 	return `${element.var}.${binding.node.name} = ${binding.snippet};`;
@@ -318,7 +307,7 @@ function get_value_from_dom(
 	}
 
 	if ((name === 'buffered' || name === 'seekable' || name === 'played')) {
-		return `@time_ranges_to_array(this.${name})`
+		return `@time_ranges_to_array(this.${name})`;
 	}
 
 	// everything else
diff --git a/src/compile/render-dom/wrappers/Element/StyleAttribute.ts b/src/compiler/compile/render-dom/wrappers/Element/StyleAttribute.ts
similarity index 82%
rename from src/compile/render-dom/wrappers/Element/StyleAttribute.ts
rename to src/compiler/compile/render-dom/wrappers/Element/StyleAttribute.ts
index b0a3663c63..ab764a8583 100644
--- a/src/compile/render-dom/wrappers/Element/StyleAttribute.ts
+++ b/src/compiler/compile/render-dom/wrappers/Element/StyleAttribute.ts
@@ -1,14 +1,15 @@
 import Attribute from '../../../nodes/Attribute';
 import Block from '../../Block';
 import AttributeWrapper from './Attribute';
-import Node from '../../../nodes/shared/Node';
-import ElementWrapper from '.';
+import ElementWrapper from '../Element';
 import { stringify } from '../../../utils/stringify';
 import add_to_set from '../../../utils/add_to_set';
+import Expression from '../../../nodes/shared/Expression';
+import Text from '../../../nodes/Text';
 
 export interface StyleProp {
 	key: string;
-	value: Node[];
+	value: Array<Text|Expression>;
 }
 
 export default class StyleAttributeWrapper extends AttributeWrapper {
@@ -28,7 +29,7 @@ export default class StyleAttributeWrapper extends AttributeWrapper {
 				value =
 					((prop.value.length === 1 || prop.value[0].type === 'Text') ? '' : `"" + `) +
 					prop.value
-						.map((chunk: Node) => {
+						.map((chunk) => {
 							if (chunk.type === 'Text') {
 								return stringify(chunk.data);
 							} else {
@@ -54,7 +55,7 @@ export default class StyleAttributeWrapper extends AttributeWrapper {
 					);
 				}
 			} else {
-				value = stringify(prop.value[0].data);
+				value = stringify((prop.value[0] as Text).data);
 			}
 
 			block.builders.hydrate.add_line(
@@ -64,8 +65,8 @@ export default class StyleAttributeWrapper extends AttributeWrapper {
 	}
 }
 
-function optimize_style(value: Node[]) {
-	const props: { key: string, value: Node[] }[] = [];
+function optimize_style(value: Array<Text|Expression>) {
+	const props: StyleProp[] = [];
 	let chunks = value.slice();
 
 	while (chunks.length) {
@@ -82,18 +83,19 @@ function optimize_style(value: Node[]) {
 		const remaining_data = chunk.data.slice(offset);
 
 		if (remaining_data) {
+			/* eslint-disable @typescript-eslint/no-object-literal-type-assertion */
 			chunks[0] = {
 				start: chunk.start + offset,
 				end: chunk.end,
 				type: 'Text',
 				data: remaining_data
-			};
+			} as Text;
+			/* eslint-enable @typescript-eslint/no-object-literal-type-assertion */
 		} else {
 			chunks.shift();
 		}
 
 		const result = get_style_value(chunks);
-		if (!result) return null;
 
 		props.push({ key, value: result.value });
 		chunks = result.chunks;
@@ -102,8 +104,8 @@ function optimize_style(value: Node[]) {
 	return props;
 }
 
-function get_style_value(chunks: Node[]) {
-	const value: Node[] = [];
+function get_style_value(chunks: Array<Text | Expression>) {
+	const value: Array<Text|Expression> = [];
 
 	let in_url = false;
 	let quote_mark = null;
@@ -122,7 +124,7 @@ function get_style_value(chunks: Node[]) {
 				} else if (char === '\\') {
 					escaped = true;
 				} else if (char === quote_mark) {
-					quote_mark === null;
+					quote_mark = null;
 				} else if (char === '"' || char === "'") {
 					quote_mark = char;
 				} else if (char === ')' && in_url) {
@@ -142,7 +144,7 @@ function get_style_value(chunks: Node[]) {
 					start: chunk.start,
 					end: chunk.start + c,
 					data: chunk.data.slice(0, c)
-				});
+				} as Text);
 			}
 
 			while (/[;\s]/.test(chunk.data[c])) c += 1;
@@ -154,7 +156,7 @@ function get_style_value(chunks: Node[]) {
 					end: chunk.end,
 					type: 'Text',
 					data: remaining_data
-				});
+				} as Text);
 
 				break;
 			}
@@ -171,6 +173,6 @@ function get_style_value(chunks: Node[]) {
 	};
 }
 
-function is_dynamic(value: Node[]) {
+function is_dynamic(value: Array<Text|Expression>) {
 	return value.length > 1 || value[0].type !== 'Text';
-}
\ No newline at end of file
+}
diff --git a/src/compile/render-dom/wrappers/Element/fix_attribute_casing.ts b/src/compiler/compile/render-dom/wrappers/Element/fix_attribute_casing.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/Element/fix_attribute_casing.ts
rename to src/compiler/compile/render-dom/wrappers/Element/fix_attribute_casing.ts
diff --git a/src/compile/render-dom/wrappers/Element/index.ts b/src/compiler/compile/render-dom/wrappers/Element/index.ts
similarity index 91%
rename from src/compile/render-dom/wrappers/Element/index.ts
rename to src/compiler/compile/render-dom/wrappers/Element/index.ts
index 22ea7a78cd..488dc01504 100644
--- a/src/compile/render-dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render-dom/wrappers/Element/index.ts
@@ -2,7 +2,6 @@ import Renderer from '../../Renderer';
 import Element from '../../../nodes/Element';
 import Wrapper from '../shared/Wrapper';
 import Block from '../../Block';
-import Node from '../../../nodes/shared/Node';
 import { is_void, quote_prop_if_necessary, quote_name_if_necessary, sanitize } from '../../../../utils/names';
 import FragmentWrapper from '../Fragment';
 import { stringify, escape_html, escape } from '../../../utils/stringify';
@@ -20,30 +19,29 @@ import add_event_handlers from '../shared/add_event_handlers';
 import add_actions from '../shared/add_actions';
 import create_debugging_comment from '../shared/create_debugging_comment';
 import { get_context_merger } from '../shared/get_context_merger';
-import Slot from '../../../nodes/Slot';
 
 const events = [
 	{
 		event_names: ['input'],
-		filter: (node: Element, name: string) =>
+		filter: (node: Element, _name: string) =>
 			node.name === 'textarea' ||
-			node.name === 'input' && !/radio|checkbox|range/.test(node.get_static_attribute_value('type'))
+			node.name === 'input' && !/radio|checkbox|range/.test(node.get_static_attribute_value('type') as string)
 	},
 	{
 		event_names: ['change'],
-		filter: (node: Element, name: string) =>
+		filter: (node: Element, _name: string) =>
 			node.name === 'select' ||
-			node.name === 'input' && /radio|checkbox/.test(node.get_static_attribute_value('type'))
+			node.name === 'input' && /radio|checkbox/.test(node.get_static_attribute_value('type') as string)
 	},
 	{
 		event_names: ['change', 'input'],
-		filter: (node: Element, name: string) =>
+		filter: (node: Element, _name: string) =>
 			node.name === 'input' && node.get_static_attribute_value('type') === 'range'
 	},
 
 	{
 		event_names: ['resize'],
-		filter: (node: Element, name: string) =>
+		filter: (_node: Element, name: string) =>
 			dimensions.test(name)
 	},
 
@@ -91,6 +89,12 @@ const events = [
 			name === 'playbackRate'
 	},
 
+	// details event
+	{
+		event_names: ['toggle'],
+		filter: (node: Element, _name: string) =>
+			node.name === 'details'
+	},
 ];
 
 export default class ElementWrapper extends Wrapper {
@@ -114,7 +118,7 @@ export default class ElementWrapper extends Wrapper {
 		next_sibling: Wrapper
 	) {
 		super(renderer, block, parent, node);
-		this.var = node.name.replace(/[^a-zA-Z0-9_$]/g, '_')
+		this.var = node.name.replace(/[^a-zA-Z0-9_$]/g, '_');
 
 		this.class_dependencies = [];
 
@@ -135,7 +139,7 @@ export default class ElementWrapper extends Wrapper {
 				}
 
 				if (owner && owner.node.type === 'InlineComponent') {
-					const name = attribute.get_static_value();
+					const name = attribute.get_static_value() as string;
 
 					if (!(owner as InlineComponentWrapper).slots.has(name)) {
 						const child_block = block.child({
@@ -234,7 +238,7 @@ export default class ElementWrapper extends Wrapper {
 		}
 
 		const node = this.var;
-		const nodes = parent_nodes && block.get_unique_name(`${this.var}_nodes`) // if we're in unclaimable territory, i.e. <head>, parent_nodes is null
+		const nodes = parent_nodes && block.get_unique_name(`${this.var}_nodes`); // if we're in unclaimable territory, i.e. <head>, parent_nodes is null
 
 		block.add_variable(node);
 		const render_statement = this.get_render_statement();
@@ -275,6 +279,7 @@ export default class ElementWrapper extends Wrapper {
 		if (!this.node.namespace && this.can_use_innerhtml && this.fragment.nodes.length > 0) {
 			if (this.fragment.nodes.length === 1 && this.fragment.nodes[0].node.type === 'Text') {
 				block.builders.create.add_line(
+					 // @ts-ignore todo: should it be this.fragment.nodes[0].node.data instead?
 					`${node}.textContent = ${stringify(this.fragment.nodes[0].data)};`
 				);
 			} else {
@@ -324,7 +329,7 @@ export default class ElementWrapper extends Wrapper {
 
 		function to_html(wrapper: ElementWrapper | TextWrapper) {
 			if (wrapper.node.type === 'Text') {
-				const { parent } = wrapper.node;
+				const parent = wrapper.node.parent as Element;
 
 				const raw = parent && (
 					parent.name === 'script' ||
@@ -344,12 +349,12 @@ export default class ElementWrapper extends Wrapper {
 			let open = `<${wrapper.node.name}`;
 
 			(wrapper as ElementWrapper).attributes.forEach((attr: AttributeWrapper) => {
-				open += ` ${fix_attribute_casing(attr.node.name)}${attr.stringify()}`
+				open += ` ${fix_attribute_casing(attr.node.name)}${attr.stringify()}`;
 			});
 
 			if (is_void(wrapper.node.name)) return open + '>';
 
-			return `${open}>${wrapper.fragment.nodes.map(to_html).join('')}</${wrapper.node.name}>`;
+			return `${open}>${(wrapper as ElementWrapper).fragment.nodes.map(to_html).join('')}</${wrapper.node.name}>`;
 		}
 
 		if (renderer.options.dev) {
@@ -376,8 +381,8 @@ export default class ElementWrapper extends Wrapper {
 
 	get_claim_statement(nodes: string) {
 		const attributes = this.node.attributes
-			.filter((attr: Node) => attr.type === 'Attribute')
-			.map((attr: Node) => `${quote_name_if_necessary(attr.name)}: true`)
+			.filter((attr) => attr.type === 'Attribute')
+			.map((attr) => `${quote_name_if_necessary(attr.name)}: true`)
 			.join(', ');
 
 		const name = this.node.namespace
@@ -455,7 +460,7 @@ export default class ElementWrapper extends Wrapper {
 					function ${handler}() {
 						${animation_frame && deindent`
 						cancelAnimationFrame(${animation_frame});
-						if (!${this.var}.paused) ${animation_frame} = requestAnimationFrame(${handler});`}
+						if (!${this.var}.paused) ${animation_frame} = @raf(${handler});`}
 						${needs_lock && `${lock} = true;`}
 						ctx.${handler}.call(${this.var}${contextual_dependencies.size > 0 ? ', ctx' : ''});
 					}
@@ -553,12 +558,13 @@ export default class ElementWrapper extends Wrapper {
 	}
 
 	add_attributes(block: Block) {
+		// @ts-ignore todo:
 		if (this.node.attributes.find(attr => attr.type === 'Spread')) {
 			this.add_spread_attributes(block);
 			return;
 		}
 
-		this.attributes.forEach((attribute: Attribute) => {
+		this.attributes.forEach((attribute) => {
 			if (attribute.node.name === 'class' && attribute.node.is_dynamic) {
 				this.class_dependencies.push(...attribute.node.dependencies);
 			}
@@ -737,7 +743,7 @@ export default class ElementWrapper extends Wrapper {
 					${outro_name} = @create_out_transition(${this.var}, ${fn}, ${snippet});
 				`;
 
-				if (outro_block) {
+				if (outro.is_local) {
 					outro_block = deindent`
 						if (#local) {
 							${outro_block}
@@ -756,6 +762,7 @@ export default class ElementWrapper extends Wrapper {
 		if (!this.node.animation) return;
 
 		const { component } = this.renderer;
+		const { outro } = this.node;
 
 		const rect = block.get_unique_name('rect');
 		const stop_animation = block.get_unique_name('stop_animation');
@@ -770,6 +777,7 @@ export default class ElementWrapper extends Wrapper {
 		block.builders.fix.add_block(deindent`
 			@fix_position(${this.var});
 			${stop_animation}();
+			${outro && `@add_transform(${this.var}, ${rect});`}
 		`);
 
 		const params = this.node.animation.expression ? this.node.animation.expression.render(block) : '{}';
@@ -789,7 +797,8 @@ export default class ElementWrapper extends Wrapper {
 	add_classes(block: Block) {
 		this.node.classes.forEach(class_directive => {
 			const { expression, name } = class_directive;
-			let snippet, dependencies;
+			let snippet;
+			let dependencies;
 			if (expression) {
 				snippet = expression.render(block);
 				dependencies = expression.dependencies;
@@ -814,27 +823,28 @@ export default class ElementWrapper extends Wrapper {
 		});
 	}
 
-	add_css_class(class_name = this.component.stylesheet.id) {
-		const class_attribute = this.attributes.find(a => a.name === 'class');
-		if (class_attribute && !class_attribute.is_true) {
-			if (class_attribute.chunks.length === 1 && class_attribute.chunks[0].type === 'Text') {
-				(class_attribute.chunks[0] as Text).data += ` ${class_name}`;
-			} else {
-				(class_attribute.chunks as Node[]).push(
-					new Text(this.component, this, this.scope, {
-						type: 'Text',
-						data: ` ${class_name}`
-					})
-				);
-			}
-		} else {
-			this.attributes.push(
-				new Attribute(this.component, this, this.scope, {
-					type: 'Attribute',
-					name: 'class',
-					value: [{ type: 'Text', data: class_name }]
-				})
-			);
-		}
-	}
+	// todo: looks to be dead code copypasted from Element.add_css_class in src/compile/nodes/Element.ts
+	// add_css_class(class_name = this.component.stylesheet.id) {
+	// 	const class_attribute = this.attributes.find(a => a.name === 'class');
+	// 	if (class_attribute && !class_attribute.is_true) {
+	// 		if (class_attribute.chunks.length === 1 && class_attribute.chunks[0].type === 'Text') {
+	// 			(class_attribute.chunks[0] as Text).data += ` ${class_name}`;
+	// 		} else {
+	// 			(class_attribute.chunks as Node[]).push(
+	// 				new Text(this.component, this, this.scope, {
+	// 					type: 'Text',
+	// 					data: ` ${class_name}`
+	// 				})
+	// 			);
+	// 		}
+	// 	} else {
+	// 		this.attributes.push(
+	// 			new Attribute(this.component, this, this.scope, {
+	// 				type: 'Attribute',
+	// 				name: 'class',
+	// 				value: [{ type: 'Text', data: class_name }]
+	// 			})
+	// 		);
+	// 	}
+	// }
 }
diff --git a/src/compile/render-dom/wrappers/Fragment.ts b/src/compiler/compile/render-dom/wrappers/Fragment.ts
similarity index 90%
rename from src/compile/render-dom/wrappers/Fragment.ts
rename to src/compiler/compile/render-dom/wrappers/Fragment.ts
index 8d955b6d01..f2e2ab7a7a 100644
--- a/src/compile/render-dom/wrappers/Fragment.ts
+++ b/src/compiler/compile/render-dom/wrappers/Fragment.ts
@@ -13,8 +13,7 @@ import Slot from './Slot';
 import Text from './Text';
 import Title from './Title';
 import Window from './Window';
-import Node from '../../nodes/shared/Node';
-import TextWrapper from './Text';
+import { INode } from '../../nodes/interfaces';
 import Renderer from '../Renderer';
 import Block from '../Block';
 import { trim_start, trim_end } from '../../../utils/trim';
@@ -49,7 +48,7 @@ export default class FragmentWrapper {
 	constructor(
 		renderer: Renderer,
 		block: Block,
-		nodes: Node[],
+		nodes: INode[],
 		parent: Wrapper,
 		strip_whitespace: boolean,
 		next_sibling: Wrapper
@@ -64,7 +63,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)) {
@@ -85,6 +84,7 @@ export default class FragmentWrapper {
 				// *unless* there is no whitespace between this node and its next sibling
 				if (this.nodes.length === 0) {
 					const should_trim = (
+						// @ts-ignore todo: probably error, should it be next_sibling.node.data?
 						next_sibling ? (next_sibling.node.type === 'Text' && /^\s/.test(next_sibling.data)) : !child.has_ancestor('EachBlock')
 					);
 
@@ -96,11 +96,12 @@ export default class FragmentWrapper {
 
 				// glue text nodes (which could e.g. be separated by comments) together
 				if (last_child && last_child.node.type === 'Text') {
+					// @ts-ignore todo: probably error, should it be last_child.node.data?
 					last_child.data = data + last_child.data;
 					continue;
 				}
 
-				const wrapper = new TextWrapper(renderer, block, parent, child, data);
+				const wrapper = new Text(renderer, block, parent, child, data);
 				if (wrapper.skip) continue;
 
 				this.nodes.unshift(wrapper);
@@ -118,7 +119,7 @@ export default class FragmentWrapper {
 		}
 
 		if (strip_whitespace) {
-			const first = this.nodes[0] as TextWrapper;
+			const first = this.nodes[0] as Text;
 
 			if (first && first.node.type === 'Text') {
 				first.data = trim_start(first.data);
diff --git a/src/compile/render-dom/wrappers/Head.ts b/src/compiler/compile/render-dom/wrappers/Head.ts
similarity index 82%
rename from src/compile/render-dom/wrappers/Head.ts
rename to src/compiler/compile/render-dom/wrappers/Head.ts
index 9eb1369b6a..d942a69dc2 100644
--- a/src/compile/render-dom/wrappers/Head.ts
+++ b/src/compiler/compile/render-dom/wrappers/Head.ts
@@ -29,7 +29,7 @@ export default class HeadWrapper extends Wrapper {
 		);
 	}
 
-	render(block: Block, parent_node: string, parent_nodes: string) {
-		this.fragment.render(block, 'document.head', null);
+	render(block: Block, _parent_node: string, _parent_nodes: string) {
+		this.fragment.render(block, 'document.head', 'nodes');
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compile/render-dom/wrappers/IfBlock.ts b/src/compiler/compile/render-dom/wrappers/IfBlock.ts
similarity index 93%
rename from src/compile/render-dom/wrappers/IfBlock.ts
rename to src/compiler/compile/render-dom/wrappers/IfBlock.ts
index f3b5c7f2b2..46f17653a1 100644
--- a/src/compile/render-dom/wrappers/IfBlock.ts
+++ b/src/compiler/compile/render-dom/wrappers/IfBlock.ts
@@ -96,7 +96,7 @@ export default class IfBlockWrapper extends Wrapper {
 			if (branch.block.has_outros) has_outros = true;
 
 			if (is_else_if(node.else)) {
-				create_branches(node.else.children[0]);
+				create_branches(node.else.children[0] as IfBlock);
 			} else if (node.else) {
 				const branch = new IfBlockBranch(
 					renderer,
@@ -154,16 +154,18 @@ export default class IfBlockWrapper extends Wrapper {
 
 		const vars = { name, anchor, if_name, has_else, has_transitions };
 
+		const detaching = (parent_node && parent_node !== 'document.head') ? '' : 'detaching';
+
 		if (this.node.else) {
 			if (has_outros) {
-				this.render_compound_with_outros(block, parent_node, parent_nodes, dynamic, vars);
+				this.render_compound_with_outros(block, parent_node, parent_nodes, dynamic, vars, detaching);
 
 				block.builders.outro.add_line(`if (${name}) ${name}.o();`);
 			} else {
-				this.render_compound(block, parent_node, parent_nodes, dynamic, vars);
+				this.render_compound(block, parent_node, parent_nodes, dynamic, vars, detaching);
 			}
 		} else {
-			this.render_simple(block, parent_node, parent_nodes, dynamic, vars);
+			this.render_simple(block, parent_node, parent_nodes, dynamic, vars, detaching);
 
 			if (has_outros) {
 				block.builders.outro.add_line(`if (${name}) ${name}.o();`);
@@ -199,14 +201,16 @@ export default class IfBlockWrapper extends Wrapper {
 	render_compound(
 		block: Block,
 		parent_node: string,
-		parent_nodes: string,
+		_parent_nodes: string,
 		dynamic,
-		{ name, anchor, has_else, if_name, has_transitions }
+		{ name, anchor, has_else, if_name, 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 current_block_type_and = has_else ? '' : `${current_block_type} && `;
 
+		/* eslint-disable @typescript-eslint/indent,indent */
 		block.builders.init.add_block(deindent`
 			function ${select_block_type}(ctx) {
 				${this.branches
@@ -214,6 +218,7 @@ export default class IfBlockWrapper extends Wrapper {
 					.join('\n')}
 			}
 		`);
+		/* eslint-enable @typescript-eslint/indent,indent */
 
 		block.builders.init.add_block(deindent`
 			var ${current_block_type} = ${select_block_type}(ctx);
@@ -254,7 +259,7 @@ export default class IfBlockWrapper extends Wrapper {
 			`);
 		}
 
-		block.builders.destroy.add_line(`${if_name}${name}.d(${parent_node ? '' : 'detaching'});`);
+		block.builders.destroy.add_line(`${if_name}${name}.d(${detaching});`);
 	}
 
 	// if any of the siblings have outros, we need to keep references to the blocks
@@ -262,9 +267,10 @@ export default class IfBlockWrapper extends Wrapper {
 	render_compound_with_outros(
 		block: Block,
 		parent_node: string,
-		parent_nodes: string,
+		_parent_nodes: string,
 		dynamic,
-		{ name, anchor, has_else, has_transitions }
+		{ name, anchor, has_else, has_transitions },
+		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`);
@@ -279,6 +285,7 @@ export default class IfBlockWrapper extends Wrapper {
 		block.add_variable(current_block_type_index);
 		block.add_variable(name);
 
+		/* eslint-disable @typescript-eslint/indent,indent */
 		block.builders.init.add_block(deindent`
 			var ${if_block_creators} = [
 				${this.branches.map(branch => branch.block.name).join(',\n')}
@@ -293,6 +300,7 @@ export default class IfBlockWrapper extends Wrapper {
 				${!has_else && `return -1;`}
 			}
 		`);
+		/* eslint-enable @typescript-eslint/indent,indent */
 
 		if (has_else) {
 			block.builders.init.add_block(deindent`
@@ -375,16 +383,17 @@ export default class IfBlockWrapper extends Wrapper {
 		}
 
 		block.builders.destroy.add_line(deindent`
-			${if_current_block_type_index}${if_blocks}[${current_block_type_index}].d(${parent_node ? '' : 'detaching'});
+			${if_current_block_type_index}${if_blocks}[${current_block_type_index}].d(${detaching});
 		`);
 	}
 
 	render_simple(
 		block: Block,
 		parent_node: string,
-		parent_nodes: string,
+		_parent_nodes: string,
 		dynamic,
-		{ name, anchor, if_name, has_transitions }
+		{ name, anchor, if_name, has_transitions },
+		detaching
 	) {
 		const branch = this.branches[0];
 
@@ -450,6 +459,6 @@ export default class IfBlockWrapper extends Wrapper {
 			}
 		`);
 
-		block.builders.destroy.add_line(`${if_name}${name}.d(${parent_node ? '' : 'detaching'});`);
+		block.builders.destroy.add_line(`${if_name}${name}.d(${detaching});`);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compile/render-dom/wrappers/InlineComponent/index.ts b/src/compiler/compile/render-dom/wrappers/InlineComponent/index.ts
similarity index 97%
rename from src/compile/render-dom/wrappers/InlineComponent/index.ts
rename to src/compiler/compile/render-dom/wrappers/InlineComponent/index.ts
index c696f4813c..d2d76b41de 100644
--- a/src/compile/render-dom/wrappers/InlineComponent/index.ts
+++ b/src/compiler/compile/render-dom/wrappers/InlineComponent/index.ts
@@ -17,7 +17,7 @@ import TemplateScope from '../../../nodes/shared/TemplateScope';
 
 export default class InlineComponentWrapper extends Wrapper {
 	var: string;
-	slots: Map<string, { block: Block, scope: TemplateScope, fn?: string }> = new Map();
+	slots: Map<string, { block: Block; scope: TemplateScope; fn?: string }> = new Map();
 	node: InlineComponent;
 	fragment: FragmentWrapper;
 
@@ -62,8 +62,8 @@ export default class InlineComponentWrapper extends Wrapper {
 
 		this.var = (
 			this.node.name === 'svelte:self' ? renderer.component.name :
-			this.node.name === 'svelte:component' ? 'switch_instance' :
-			this.node.name
+				this.node.name === 'svelte:component' ? 'switch_instance' :
+					sanitize(this.node.name)
 		).toLowerCase();
 
 		if (this.node.children.length) {
@@ -142,7 +142,7 @@ export default class InlineComponentWrapper extends Wrapper {
 		if (this.fragment) {
 			const default_slot = this.slots.get('default');
 
-			this.fragment.nodes.forEach((child: Wrapper) => {
+			this.fragment.nodes.forEach((child) => {
 				child.render(default_slot.block, null, 'nodes');
 			});
 		}
@@ -232,14 +232,16 @@ export default class InlineComponentWrapper extends Wrapper {
 					.filter((attribute: Attribute) => attribute.is_dynamic)
 					.forEach((attribute: Attribute) => {
 						if (attribute.dependencies.size > 0) {
+							/* eslint-disable @typescript-eslint/indent,indent */
 							updates.push(deindent`
 								if (${[...attribute.dependencies]
 									.map(dependency => `changed.${dependency}`)
 									.join(' || ')}) ${name_changes}${quote_prop_if_necessary(attribute.name)} = ${attribute.get_value(block)};
 							`);
+							/* eslint-enable @typescript-eslint/indent,indent */
 						}
 					});
-				}
+			}
 		}
 
 		if (non_let_dependencies.length > 0) {
@@ -265,7 +267,7 @@ export default class InlineComponentWrapper extends Wrapper {
 					// bind:x={y} — we can't just do `y = x`, we need to
 					// to `array[index] = x;
 					const { name } = binding.expression.node;
-					const { object, property, snippet } = block.bindings.get(name);
+					const { snippet } = block.bindings.get(name);
 					lhs = snippet;
 
 					// TODO we need to invalidate... something
@@ -505,4 +507,4 @@ export default class InlineComponentWrapper extends Wrapper {
 			);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compile/render-dom/wrappers/MustacheTag.ts b/src/compiler/compile/render-dom/wrappers/MustacheTag.ts
similarity index 81%
rename from src/compile/render-dom/wrappers/MustacheTag.ts
rename to src/compiler/compile/render-dom/wrappers/MustacheTag.ts
index f42d0c1de0..71faf91cb2 100644
--- a/src/compile/render-dom/wrappers/MustacheTag.ts
+++ b/src/compiler/compile/render-dom/wrappers/MustacheTag.ts
@@ -1,13 +1,14 @@
 import Renderer from '../Renderer';
 import Block from '../Block';
-import Node from '../../nodes/shared/Node';
 import Tag from './shared/Tag';
 import Wrapper from './shared/Wrapper';
+import MustacheTag from '../../nodes/MustacheTag';
+import RawMustacheTag from '../../nodes/RawMustacheTag';
 
 export default class MustacheTagWrapper extends Tag {
 	var = 't';
 
-	constructor(renderer: Renderer, block: Block, parent: Wrapper, node: Node) {
+	constructor(renderer: Renderer, block: Block, parent: Wrapper, node: MustacheTag | RawMustacheTag) {
 		super(renderer, block, parent, node);
 		this.cannot_use_innerhtml();
 	}
@@ -25,4 +26,4 @@ export default class MustacheTagWrapper extends Tag {
 			parent_node
 		);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compile/render-dom/wrappers/RawMustacheTag.ts b/src/compiler/compile/render-dom/wrappers/RawMustacheTag.ts
similarity index 85%
rename from src/compile/render-dom/wrappers/RawMustacheTag.ts
rename to src/compiler/compile/render-dom/wrappers/RawMustacheTag.ts
index eb71e16de9..15a7d41861 100644
--- a/src/compile/render-dom/wrappers/RawMustacheTag.ts
+++ b/src/compiler/compile/render-dom/wrappers/RawMustacheTag.ts
@@ -1,9 +1,10 @@
 import Renderer from '../Renderer';
 import Block from '../Block';
-import Node from '../../nodes/shared/Node';
 import Tag from './shared/Tag';
-import Wrapper from './shared/wrapper';
+import Wrapper from './shared/Wrapper';
 import deindent from '../../utils/deindent';
+import MustacheTag from '../../nodes/MustacheTag';
+import RawMustacheTag from '../../nodes/RawMustacheTag';
 
 export default class RawMustacheTagWrapper extends Tag {
 	var = 'raw';
@@ -12,7 +13,7 @@ export default class RawMustacheTagWrapper extends Tag {
 		renderer: Renderer,
 		block: Block,
 		parent: Wrapper,
-		node: Node
+		node: MustacheTag | RawMustacheTag
 	) {
 		super(renderer, block, parent, node);
 		this.cannot_use_innerhtml();
@@ -21,9 +22,18 @@ export default class RawMustacheTagWrapper extends Tag {
 	render(block: Block, parent_node: string, parent_nodes: string) {
 		const name = this.var;
 
+		const in_head = parent_node === 'document.head';
+		const needs_anchors = !parent_node || in_head;
+
+		// if in head always needs anchors
+		if (in_head) {
+			this.prev = null;
+			this.next = null;
+		}
+
 		// TODO use is_dom_node instead of type === 'Element'?
-		const needs_anchor_before = this.prev ? this.prev.node.type !== 'Element' : !parent_node;
-		const needs_anchor_after = this.next ? this.next.node.type !== 'Element' : !parent_node;
+		const needs_anchor_before = this.prev ? this.prev.node.type !== 'Element' : needs_anchors;
+		const needs_anchor_after = this.next ? this.next.node.type !== 'Element' : needs_anchors;
 
 		const anchor_before = needs_anchor_before
 			? block.get_unique_name(`${name}_before`)
@@ -89,7 +99,7 @@ export default class RawMustacheTagWrapper extends Tag {
 
 		block.builders.mount.add_line(insert(init));
 
-		if (!parent_node) {
+		if (needs_anchors) {
 			block.builders.destroy.add_conditional('detaching', needs_anchor_before
 				? `${detach}\n@detach(${anchor_before});`
 				: detach);
@@ -100,4 +110,4 @@ export default class RawMustacheTagWrapper extends Tag {
 			add_anchor_after();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compile/render-dom/wrappers/Slot.ts b/src/compiler/compile/render-dom/wrappers/Slot.ts
similarity index 97%
rename from src/compile/render-dom/wrappers/Slot.ts
rename to src/compiler/compile/render-dom/wrappers/Slot.ts
index ec1b7d4b59..5347b87de4 100644
--- a/src/compile/render-dom/wrappers/Slot.ts
+++ b/src/compiler/compile/render-dom/wrappers/Slot.ts
@@ -9,7 +9,6 @@ import add_to_set from '../../utils/add_to_set';
 import get_slot_data from '../../utils/get_slot_data';
 import { stringify_props } from '../../utils/stringify_props';
 import Expression from '../../nodes/shared/Expression';
-import Attribute from '../../nodes/Attribute';
 
 export default class SlotWrapper extends Wrapper {
 	node: Slot;
@@ -79,7 +78,7 @@ export default class SlotWrapper extends Wrapper {
 				});
 
 				if (attribute.dependencies.size > 0) {
-					changes_props.push(`${attribute.name}: ${[...attribute.dependencies].join(' || ')}`)
+					changes_props.push(`${attribute.name}: ${[...attribute.dependencies].join(' || ')}`);
 				}
 			});
 
@@ -90,6 +89,7 @@ export default class SlotWrapper extends Wrapper {
 				const ${get_slot_context} = (${arg}) => (${stringify_props(context_props)});
 			`);
 		} else {
+			get_slot_changes = 'null';
 			get_slot_context = 'null';
 		}
 
@@ -101,7 +101,7 @@ export default class SlotWrapper extends Wrapper {
 			const ${slot} = @create_slot(${slot_definition}, ctx, ${get_slot_context});
 		`);
 
-		let mount_before = block.builders.mount.toString();
+		const mount_before = block.builders.mount.toString();
 
 		block.builders.create.push_condition(`!${slot}`);
 		block.builders.claim.push_condition(`!${slot}`);
diff --git a/src/compile/render-dom/wrappers/Text.ts b/src/compiler/compile/render-dom/wrappers/Text.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/Text.ts
rename to src/compiler/compile/render-dom/wrappers/Text.ts
diff --git a/src/compile/render-dom/wrappers/Title.ts b/src/compiler/compile/render-dom/wrappers/Title.ts
similarity index 83%
rename from src/compile/render-dom/wrappers/Title.ts
rename to src/compiler/compile/render-dom/wrappers/Title.ts
index eff1d2523b..75dbc44202 100644
--- a/src/compile/render-dom/wrappers/Title.ts
+++ b/src/compiler/compile/render-dom/wrappers/Title.ts
@@ -4,6 +4,7 @@ import Block from '../Block';
 import Title from '../../nodes/Title';
 import { stringify } from '../../utils/stringify';
 import add_to_set from '../../utils/add_to_set';
+import Text from '../../nodes/Text';
 
 export default class TitleWrapper extends Wrapper {
 	node: Title;
@@ -13,13 +14,13 @@ export default class TitleWrapper extends Wrapper {
 		block: Block,
 		parent: Wrapper,
 		node: Title,
-		strip_whitespace: boolean,
-		next_sibling: Wrapper
+		_strip_whitespace: boolean,
+		_next_sibling: Wrapper
 	) {
 		super(renderer, block, parent, node);
 	}
 
-	render(block: Block, parent_node: string, parent_nodes: string) {
+	render(block: Block, _parent_node: string, _parent_nodes: string) {
 		const is_dynamic = !!this.node.children.find(node => node.type !== 'Text');
 
 		if (is_dynamic) {
@@ -31,6 +32,7 @@ export default class TitleWrapper extends Wrapper {
 			// DRY it out if that's possible without introducing crazy indirection
 			if (this.node.children.length === 1) {
 				// single {tag} — may be a non-string
+				// @ts-ignore todo: check this
 				const { expression } = this.node.children[0];
 				value = expression.render(block);
 				add_to_set(all_dependencies, expression.dependencies);
@@ -39,16 +41,18 @@ export default class TitleWrapper extends Wrapper {
 				value =
 					(this.node.children[0].type === 'Text' ? '' : `"" + `) +
 					this.node.children
-						.map((chunk: Node) => {
+						.map((chunk) => {
 							if (chunk.type === 'Text') {
 								return stringify(chunk.data);
 							} else {
+								// @ts-ignore todo: check this
 								const snippet = chunk.expression.render(block);
-
+								// @ts-ignore todo: check this
 								chunk.expression.dependencies.forEach(d => {
 									all_dependencies.add(d);
 								});
 
+								// @ts-ignore todo: check this
 								return chunk.expression.get_precedence() <= 13 ? `(${snippet})` : snippet;
 							}
 						})
@@ -61,13 +65,12 @@ export default class TitleWrapper extends Wrapper {
 
 			if (this.node.should_cache) block.add_variable(last);
 
-			let updater;
 			const init = this.node.should_cache ? `${last} = ${value}` : value;
 
 			block.builders.init.add_line(
 				`document.title = ${init};`
 			);
-			updater = `document.title = ${this.node.should_cache ? last : value};`;
+			const updater = `document.title = ${this.node.should_cache ? last : value};`;
 
 			if (all_dependencies.size) {
 				const dependencies = Array.from(all_dependencies);
@@ -88,8 +91,8 @@ export default class TitleWrapper extends Wrapper {
 				);
 			}
 		} else {
-			const value = stringify(this.node.children[0].data);
+			const value = stringify((this.node.children[0] as Text).data);
 			block.builders.hydrate.add_line(`document.title = ${value};`);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compile/render-dom/wrappers/Window.ts b/src/compiler/compile/render-dom/wrappers/Window.ts
similarity index 96%
rename from src/compile/render-dom/wrappers/Window.ts
rename to src/compiler/compile/render-dom/wrappers/Window.ts
index 2b58153d95..585864664a 100644
--- a/src/compile/render-dom/wrappers/Window.ts
+++ b/src/compiler/compile/render-dom/wrappers/Window.ts
@@ -1,11 +1,11 @@
 import Renderer from '../Renderer';
 import Block from '../Block';
-import Node from '../../nodes/shared/Node';
 import Wrapper from './shared/Wrapper';
 import deindent from '../../utils/deindent';
 import add_event_handlers from './shared/add_event_handlers';
 import Window from '../../nodes/Window';
 import add_actions from './shared/add_actions';
+import { INode } from '../../nodes/interfaces';
 
 const associated_events = {
 	innerWidth: 'resize',
@@ -33,11 +33,11 @@ const readonly = new Set([
 export default class WindowWrapper extends Wrapper {
 	node: Window;
 
-	constructor(renderer: Renderer, block: Block, parent: Wrapper, node: Node) {
+	constructor(renderer: Renderer, block: Block, parent: Wrapper, node: INode) {
 		super(renderer, block, parent, node);
 	}
 
-	render(block: Block, parent_node: string, parent_nodes: string) {
+	render(block: Block, _parent_node: string, _parent_nodes: string) {
 		const { renderer } = this;
 		const { component } = renderer;
 
@@ -87,7 +87,7 @@ export default class WindowWrapper extends Wrapper {
 					bindings.scrollY && `"${bindings.scrollY}" in this._state`
 				].filter(Boolean).join(' || ');
 
- 				const x = bindings.scrollX && `this._state.${bindings.scrollX}`;
+				const x = bindings.scrollX && `this._state.${bindings.scrollX}`;
 				const y = bindings.scrollY && `this._state.${bindings.scrollY}`;
 
 				renderer.meta_bindings.add_block(deindent`
diff --git a/src/compile/render-dom/wrappers/shared/Tag.ts b/src/compiler/compile/render-dom/wrappers/shared/Tag.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/shared/Tag.ts
rename to src/compiler/compile/render-dom/wrappers/shared/Tag.ts
diff --git a/src/compile/render-dom/wrappers/shared/Wrapper.ts b/src/compiler/compile/render-dom/wrappers/shared/Wrapper.ts
similarity index 88%
rename from src/compile/render-dom/wrappers/shared/Wrapper.ts
rename to src/compiler/compile/render-dom/wrappers/shared/Wrapper.ts
index 2a9394415f..60c4a4187b 100644
--- a/src/compile/render-dom/wrappers/shared/Wrapper.ts
+++ b/src/compiler/compile/render-dom/wrappers/shared/Wrapper.ts
@@ -1,11 +1,11 @@
 import Renderer from '../../Renderer';
-import Node from '../../../nodes/shared/Node';
 import Block from '../../Block';
+import { INode } from '../../../nodes/interfaces';
 
 export default class Wrapper {
 	renderer: Renderer;
 	parent: Wrapper;
-	node: Node;
+	node: INode;
 
 	prev: Wrapper | null;
 	next: Wrapper | null;
@@ -17,7 +17,7 @@ export default class Wrapper {
 		renderer: Renderer,
 		block: Block,
 		parent: Wrapper,
-		node: Node
+		node: INode
 	) {
 		this.node = node;
 
@@ -75,4 +75,8 @@ export default class Wrapper {
 			this.node.type === 'MustacheTag'
 		);
 	}
-}
\ No newline at end of file
+
+	render(_block: Block, _parent_node: string, _parent_nodes: string) {
+		throw Error('Wrapper class is not renderable');
+	}
+}
diff --git a/src/compile/render-dom/wrappers/shared/add_actions.ts b/src/compiler/compile/render-dom/wrappers/shared/add_actions.ts
similarity index 97%
rename from src/compile/render-dom/wrappers/shared/add_actions.ts
rename to src/compiler/compile/render-dom/wrappers/shared/add_actions.ts
index 5ae5810e9f..260058f2be 100644
--- a/src/compile/render-dom/wrappers/shared/add_actions.ts
+++ b/src/compiler/compile/render-dom/wrappers/shared/add_actions.ts
@@ -10,7 +10,8 @@ export default function add_actions(
 ) {
 	actions.forEach(action => {
 		const { expression } = action;
-		let snippet, dependencies;
+		let snippet;
+		let dependencies;
 
 		if (expression) {
 			snippet = expression.render(block);
@@ -44,4 +45,4 @@ export default function add_actions(
 			`if (${name} && typeof ${name}.destroy === 'function') ${name}.destroy();`
 		);
 	});
-}
\ No newline at end of file
+}
diff --git a/src/compile/render-dom/wrappers/shared/add_event_handlers.ts b/src/compiler/compile/render-dom/wrappers/shared/add_event_handlers.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/shared/add_event_handlers.ts
rename to src/compiler/compile/render-dom/wrappers/shared/add_event_handlers.ts
diff --git a/src/compile/render-dom/wrappers/shared/create_debugging_comment.ts b/src/compiler/compile/render-dom/wrappers/shared/create_debugging_comment.ts
similarity index 90%
rename from src/compile/render-dom/wrappers/shared/create_debugging_comment.ts
rename to src/compiler/compile/render-dom/wrappers/shared/create_debugging_comment.ts
index b32d25c1a4..df1ae9ff8e 100644
--- a/src/compile/render-dom/wrappers/shared/create_debugging_comment.ts
+++ b/src/compiler/compile/render-dom/wrappers/shared/create_debugging_comment.ts
@@ -1,8 +1,8 @@
 import Component from '../../../Component';
-import { Node } from '../../../../interfaces';
+import { INode } from '../../../nodes/interfaces';
 
 export default function create_debugging_comment(
-	node: Node,
+	node: INode,
 	component: Component
 ) {
 	const { locate, source } = component;
@@ -19,6 +19,7 @@ export default function create_debugging_comment(
 		d = node.children.length ? node.children[0].start : node.start;
 		while (source[d - 1] !== '>') d -= 1;
 	} else {
+		// @ts-ignore
 		d = node.expression ? node.expression.node.end : c;
 		while (source[d] !== '}') d += 1;
 		while (source[d] === '}') d += 1;
diff --git a/src/compile/render-dom/wrappers/shared/get_context_merger.ts b/src/compiler/compile/render-dom/wrappers/shared/get_context_merger.ts
similarity index 100%
rename from src/compile/render-dom/wrappers/shared/get_context_merger.ts
rename to src/compiler/compile/render-dom/wrappers/shared/get_context_merger.ts
diff --git a/src/compile/render-ssr/Renderer.ts b/src/compiler/compile/render-ssr/Renderer.ts
similarity index 86%
rename from src/compile/render-ssr/Renderer.ts
rename to src/compiler/compile/render-ssr/Renderer.ts
index c97965de14..9680866349 100644
--- a/src/compile/render-ssr/Renderer.ts
+++ b/src/compiler/compile/render-ssr/Renderer.ts
@@ -12,10 +12,11 @@ import Tag from './handlers/Tag';
 import Text from './handlers/Text';
 import Title from './handlers/Title';
 import { AppendTarget, CompileOptions } from '../../interfaces';
+import { INode } from '../nodes/interfaces';
 
 type Handler = (node: any, renderer: Renderer, options: CompileOptions) => void;
 
-function noop(){}
+function noop() {}
 
 const handlers: Record<string, Handler> = {
 	AwaitBlock,
@@ -36,6 +37,10 @@ const handlers: Record<string, Handler> = {
 	Window: noop
 };
 
+export interface RenderOptions extends CompileOptions{
+	locate: (c: number) => { line: number; column: number };
+}
+
 export default class Renderer {
 	has_bindings = false;
 	code = '';
@@ -51,7 +56,7 @@ export default class Renderer {
 		}
 	}
 
-	render(nodes, options) {
+	render(nodes: INode[], options: RenderOptions) {
 		nodes.forEach(node => {
 			const handler = handlers[node.type];
 
diff --git a/src/compile/render-ssr/handlers/AwaitBlock.ts b/src/compiler/compile/render-ssr/handlers/AwaitBlock.ts
similarity index 66%
rename from src/compile/render-ssr/handlers/AwaitBlock.ts
rename to src/compiler/compile/render-ssr/handlers/AwaitBlock.ts
index bbc4a15e05..85bf7b3135 100644
--- a/src/compile/render-ssr/handlers/AwaitBlock.ts
+++ b/src/compiler/compile/render-ssr/handlers/AwaitBlock.ts
@@ -1,8 +1,8 @@
-import Renderer from '../Renderer';
-import { CompileOptions } from '../../../interfaces';
+import Renderer, { RenderOptions } from '../Renderer';
 import { snip } from '../../utils/snip';
+import AwaitBlock from '../../nodes/AwaitBlock';
 
-export default function(node, renderer: Renderer, options: CompileOptions) {
+export default function(node: AwaitBlock, renderer: Renderer, options: RenderOptions) {
 	renderer.append('${(function(__value) { if(@is_promise(__value)) return `');
 
 	renderer.render(node.pending.children, options);
@@ -13,4 +13,4 @@ export default function(node, renderer: Renderer, options: CompileOptions) {
 
 	const snippet = snip(node.expression);
 	renderer.append(`\`;}(__value);}(${snippet})) }`);
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/render-ssr/handlers/Comment.ts b/src/compiler/compile/render-ssr/handlers/Comment.ts
new file mode 100644
index 0000000000..237c260230
--- /dev/null
+++ b/src/compiler/compile/render-ssr/handlers/Comment.ts
@@ -0,0 +1,8 @@
+import Renderer, { RenderOptions } from '../Renderer';
+import Comment from '../../nodes/Comment';
+
+export default function(node: Comment, renderer: Renderer, options: RenderOptions) {
+	if (options.preserveComments) {
+		renderer.append(`<!--${node.data}-->`);
+	}
+}
diff --git a/src/compile/render-ssr/handlers/DebugTag.ts b/src/compiler/compile/render-ssr/handlers/DebugTag.ts
similarity index 62%
rename from src/compile/render-ssr/handlers/DebugTag.ts
rename to src/compiler/compile/render-ssr/handlers/DebugTag.ts
index b04d541105..3fd7584d57 100644
--- a/src/compile/render-ssr/handlers/DebugTag.ts
+++ b/src/compiler/compile/render-ssr/handlers/DebugTag.ts
@@ -1,9 +1,10 @@
 import { stringify } from '../../utils/stringify';
-
-export default function(node, renderer, options) {
+import DebugTag from '../../nodes/DebugTag';
+import Renderer, { RenderOptions } from '../Renderer';
+export default function(node: DebugTag, renderer: Renderer, options: RenderOptions) {
 	if (!options.dev) return;
 
-	const filename = options.file || null;
+	const filename = options.filename || null;
 	const { line, column } = options.locate(node.start + 1);
 
 	const obj = node.expressions.length === 0
@@ -15,4 +16,4 @@ export default function(node, renderer, options) {
 	const str = '${@debug(' + `${filename && stringify(filename)}, ${line}, ${column}, ${obj})}`;
 
 	renderer.append(str);
-}
\ No newline at end of file
+}
diff --git a/src/compile/render-ssr/handlers/EachBlock.ts b/src/compiler/compile/render-ssr/handlers/EachBlock.ts
similarity index 71%
rename from src/compile/render-ssr/handlers/EachBlock.ts
rename to src/compiler/compile/render-ssr/handlers/EachBlock.ts
index 3731093a9b..d44c404603 100644
--- a/src/compile/render-ssr/handlers/EachBlock.ts
+++ b/src/compiler/compile/render-ssr/handlers/EachBlock.ts
@@ -1,13 +1,15 @@
 import { snip } from '../../utils/snip';
+import Renderer, { RenderOptions } from '../Renderer';
+import EachBlock from '../../nodes/EachBlock';
 
-export default function(node, renderer, options) {
+export default function(node: EachBlock, renderer: Renderer, options: RenderOptions) {
 	const snippet = snip(node.expression);
 
 	const { start, end } = node.context_node;
 
 	const ctx = node.index
 		? `([✂${start}-${end}✂], ${node.index})`
-		: `([✂${start}-${end}✂])`
+		: `([✂${start}-${end}✂])`;
 
 	const open = `\${${node.else ? `${snippet}.length ? ` : ''}@each(${snippet}, ${ctx} => \``;
 	renderer.append(open);
@@ -24,4 +26,4 @@ export default function(node, renderer, options) {
 	}
 
 	renderer.append('}');
-}
\ No newline at end of file
+}
diff --git a/src/compile/render-ssr/handlers/Element.ts b/src/compiler/compile/render-ssr/handlers/Element.ts
similarity index 88%
rename from src/compile/render-ssr/handlers/Element.ts
rename to src/compiler/compile/render-ssr/handlers/Element.ts
index 7717be48e3..c0faf2d18f 100644
--- a/src/compile/render-ssr/handlers/Element.ts
+++ b/src/compiler/compile/render-ssr/handlers/Element.ts
@@ -1,10 +1,12 @@
 import { is_void, quote_prop_if_necessary, quote_name_if_necessary } from '../../../utils/names';
 import Attribute from '../../nodes/Attribute';
 import Class from '../../nodes/Class';
-import Node from '../../nodes/shared/Node';
 import { snip } from '../../utils/snip';
 import { stringify_attribute } from '../../utils/stringify_attribute';
 import { get_slot_scope } from './shared/get_slot_scope';
+import Renderer, { RenderOptions } from '../Renderer';
+import Element from '../../nodes/Element';
+import Text from '../../nodes/Text';
 
 // source: https://gist.github.com/ArjanSchouten/0b8574a6ad7f5065a5e7
 const boolean_attributes = new Set([
@@ -47,15 +49,17 @@ const boolean_attributes = new Set([
 	'translate'
 ]);
 
-export default function(node, renderer, options) {
+export default function(node: Element, renderer: Renderer, options: RenderOptions & {
+	slot_scopes: Map<any, any>;
+}) {
 	let opening_tag = `<${node.name}`;
 	let textarea_contents; // awkward special case
 
 	const slot = node.get_static_attribute_value('slot');
 	const component = node.find_nearest(/InlineComponent/);
 	if (slot && component) {
-		const slot = node.attributes.find((attribute: Node) => attribute.name === 'slot');
-		const slot_name = slot.chunks[0].data;
+		const slot = node.attributes.find((attribute) => attribute.name === 'slot');
+		const slot_name = (slot.chunks[0] as Text).data;
 		const target = renderer.targets[renderer.targets.length - 1];
 		target.slot_stack.push(slot_name);
 		target.slots[slot_name] = '';
@@ -135,8 +139,15 @@ export default function(node, renderer, options) {
 	node.bindings.forEach(binding => {
 		const { name, expression } = binding;
 
+		if (binding.is_readonly) {
+			return;
+		}
+
 		if (name === 'group') {
 			// TODO server-render group bindings
+		} else if (binding.name === 'value' && node.name === 'textarea') {
+			const snippet = snip(expression);
+			textarea_contents='${(' + snippet + ') || ""}';
 		} else {
 			const snippet = snip(expression);
 			opening_tag += ' ${(v => v ? ("' + name + '" + (v === true ? "" : "=" + JSON.stringify(v))) : "")(' + snippet + ')}';
@@ -160,4 +171,4 @@ export default function(node, renderer, options) {
 	if (!is_void(node.name)) {
 		renderer.append(`</${node.name}>`);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/render-ssr/handlers/Head.ts b/src/compiler/compile/render-ssr/handlers/Head.ts
new file mode 100644
index 0000000000..ecd32cc0ef
--- /dev/null
+++ b/src/compiler/compile/render-ssr/handlers/Head.ts
@@ -0,0 +1,10 @@
+import Renderer, { RenderOptions } from '../Renderer';
+import Head from '../../nodes/Head';
+
+export default function(node: Head, renderer: Renderer, options: RenderOptions) {
+	renderer.append('${($$result.head += `');
+
+	renderer.render(node.children, options);
+
+	renderer.append('`, "")}');
+}
diff --git a/src/compiler/compile/render-ssr/handlers/HtmlTag.ts b/src/compiler/compile/render-ssr/handlers/HtmlTag.ts
new file mode 100644
index 0000000000..ee62a4defc
--- /dev/null
+++ b/src/compiler/compile/render-ssr/handlers/HtmlTag.ts
@@ -0,0 +1,7 @@
+import { snip } from '../../utils/snip';
+import Renderer, { RenderOptions } from '../Renderer';
+import RawMustacheTag from '../../nodes/RawMustacheTag';
+
+export default function(node: RawMustacheTag, renderer: Renderer, _options: RenderOptions) {
+	renderer.append('${' + snip(node.expression) + '}');
+}
diff --git a/src/compile/render-ssr/handlers/IfBlock.ts b/src/compiler/compile/render-ssr/handlers/IfBlock.ts
similarity index 61%
rename from src/compile/render-ssr/handlers/IfBlock.ts
rename to src/compiler/compile/render-ssr/handlers/IfBlock.ts
index cbe505fef8..c841f1d593 100644
--- a/src/compile/render-ssr/handlers/IfBlock.ts
+++ b/src/compiler/compile/render-ssr/handlers/IfBlock.ts
@@ -1,6 +1,7 @@
 import { snip } from '../../utils/snip';
-
-export default function(node, renderer, options) {
+import IfBlock from '../../nodes/IfBlock';
+import Renderer, { RenderOptions } from '../Renderer';
+export default function(node: IfBlock, renderer: Renderer, options: RenderOptions) {
 	const snippet = snip(node.expression);
 
 	renderer.append('${ ' + snippet + ' ? `');
@@ -14,4 +15,4 @@ export default function(node, renderer, options) {
 	}
 
 	renderer.append('` }');
-}
\ No newline at end of file
+}
diff --git a/src/compile/render-ssr/handlers/InlineComponent.ts b/src/compiler/compile/render-ssr/handlers/InlineComponent.ts
similarity index 87%
rename from src/compile/render-ssr/handlers/InlineComponent.ts
rename to src/compiler/compile/render-ssr/handlers/InlineComponent.ts
index bc58be5df9..94fdcfd434 100644
--- a/src/compile/render-ssr/handlers/InlineComponent.ts
+++ b/src/compiler/compile/render-ssr/handlers/InlineComponent.ts
@@ -1,14 +1,17 @@
 import { escape, escape_template, stringify } from '../../utils/stringify';
 import { quote_name_if_necessary } from '../../../utils/names';
 import { snip } from '../../utils/snip';
-import Renderer from '../Renderer';
+import Renderer, { RenderOptions } from '../Renderer';
 import { stringify_props } from '../../utils/stringify_props';
 import { get_slot_scope } from './shared/get_slot_scope';
 import { AppendTarget } from '../../../interfaces';
+import InlineComponent from '../../nodes/InlineComponent';
+import { INode } from '../../nodes/interfaces';
+import Text from '../../nodes/Text';
 
-function stringify_attribute(chunk: Node) {
+function stringify_attribute(chunk: INode) {
 	if (chunk.type === 'Text') {
-		return escape_template(escape(chunk.data));
+		return escape_template(escape((chunk as Text).data));
 	}
 
 	return '${@escape(' + snip(chunk) + ')}';
@@ -30,7 +33,7 @@ function get_attribute_value(attribute) {
 	return '`' + attribute.chunks.map(stringify_attribute).join('') + '`';
 }
 
-export default function(node, renderer: Renderer, options) {
+export default function(node: InlineComponent, renderer: Renderer, options: RenderOptions) {
 	const binding_props = [];
 	const binding_fns = [];
 
diff --git a/src/compile/render-ssr/handlers/Slot.ts b/src/compiler/compile/render-ssr/handlers/Slot.ts
similarity index 71%
rename from src/compile/render-ssr/handlers/Slot.ts
rename to src/compiler/compile/render-ssr/handlers/Slot.ts
index b2e67f9e79..087519979b 100644
--- a/src/compile/render-ssr/handlers/Slot.ts
+++ b/src/compiler/compile/render-ssr/handlers/Slot.ts
@@ -1,7 +1,9 @@
 import { quote_prop_if_necessary } from '../../../utils/names';
 import get_slot_data from '../../utils/get_slot_data';
+import Renderer, { RenderOptions } from '../Renderer';
+import Slot from '../../nodes/Slot';
 
-export default function(node, renderer, options) {
+export default function(node: Slot, renderer: Renderer, options: RenderOptions) {
 	const prop = quote_prop_if_necessary(node.slot_name);
 
 	const slot_data = get_slot_data(node.values, true);
@@ -13,4 +15,4 @@ export default function(node, renderer, options) {
 	renderer.render(node.children, options);
 
 	renderer.append(`\`}`);
-}
\ No newline at end of file
+}
diff --git a/src/compile/render-ssr/handlers/Tag.ts b/src/compiler/compile/render-ssr/handlers/Tag.ts
similarity index 65%
rename from src/compile/render-ssr/handlers/Tag.ts
rename to src/compiler/compile/render-ssr/handlers/Tag.ts
index eb887b8688..353939049d 100644
--- a/src/compile/render-ssr/handlers/Tag.ts
+++ b/src/compiler/compile/render-ssr/handlers/Tag.ts
@@ -1,6 +1,6 @@
 import { snip } from '../../utils/snip';
-
-export default function(node, renderer, options) {
+import Renderer, { RenderOptions } from '../Renderer';
+export default function(node, renderer: Renderer, _options: RenderOptions) {
 	const snippet = snip(node.expression);
 
 	renderer.append(
@@ -10,4 +10,4 @@ export default function(node, renderer, options) {
 			? '${' + snippet + '}'
 			: '${@escape(' + snippet + ')}'
 	);
-}
\ No newline at end of file
+}
diff --git a/src/compile/render-ssr/handlers/Text.ts b/src/compiler/compile/render-ssr/handlers/Text.ts
similarity index 51%
rename from src/compile/render-ssr/handlers/Text.ts
rename to src/compiler/compile/render-ssr/handlers/Text.ts
index e794025370..5e56952f13 100644
--- a/src/compile/render-ssr/handlers/Text.ts
+++ b/src/compiler/compile/render-ssr/handlers/Text.ts
@@ -1,14 +1,17 @@
 import { escape_html, escape_template, escape } from '../../utils/stringify';
+import Renderer, { RenderOptions } from '../Renderer';
+import Text from '../../nodes/Text';
+import Element from '../../nodes/Element';
 
-export default function(node, renderer, options) {
+export default function(node: Text, renderer: Renderer, _options: RenderOptions) {
 	let text = node.data;
 	if (
 		!node.parent ||
 		node.parent.type !== 'Element' ||
-		(node.parent.name !== 'script' && node.parent.name !== 'style')
+		((node.parent as Element).name !== 'script' && (node.parent as Element).name !== 'style')
 	) {
 		// unless this Text node is inside a <script> or <style> element, escape &,<,>
 		text = escape_html(text);
 	}
 	renderer.append(escape(escape_template(text)));
-}
\ No newline at end of file
+}
diff --git a/src/compiler/compile/render-ssr/handlers/Title.ts b/src/compiler/compile/render-ssr/handlers/Title.ts
new file mode 100644
index 0000000000..e5792ec81f
--- /dev/null
+++ b/src/compiler/compile/render-ssr/handlers/Title.ts
@@ -0,0 +1,10 @@
+import Renderer, { RenderOptions } from '../Renderer';
+import Title from '../../nodes/Title';
+
+export default function(node: Title, renderer: Renderer, options: RenderOptions) {
+	renderer.append(`<title>`);
+
+	renderer.render(node.children, options);
+
+	renderer.append(`</title>`);
+}
diff --git a/src/compile/render-ssr/handlers/shared/get_slot_scope.ts b/src/compiler/compile/render-ssr/handlers/shared/get_slot_scope.ts
similarity index 100%
rename from src/compile/render-ssr/handlers/shared/get_slot_scope.ts
rename to src/compiler/compile/render-ssr/handlers/shared/get_slot_scope.ts
diff --git a/src/compile/render-ssr/index.ts b/src/compiler/compile/render-ssr/index.ts
similarity index 96%
rename from src/compile/render-ssr/index.ts
rename to src/compiler/compile/render-ssr/index.ts
index 10f82beb5e..c63bd5d457 100644
--- a/src/compile/render-ssr/index.ts
+++ b/src/compiler/compile/render-ssr/index.ts
@@ -4,6 +4,8 @@ import { CompileOptions } from '../../interfaces';
 import { stringify } from '../utils/stringify';
 import Renderer from './Renderer';
 import { extract_names } from '../utils/scope';
+import { INode } from '../nodes/interfaces';
+import Text from '../nodes/Text';
 
 export default function ssr(
 	component: Component,
@@ -151,10 +153,10 @@ export default function ssr(
 	`).trim();
 }
 
-function trim(nodes) {
+function trim(nodes: INode[]) {
 	let start = 0;
 	for (; start < nodes.length; start += 1) {
-		const node = nodes[start];
+		const node = nodes[start] as Text;
 		if (node.type !== 'Text') break;
 
 		node.data = node.data.replace(/^\s+/, '');
@@ -163,7 +165,7 @@ function trim(nodes) {
 
 	let end = nodes.length;
 	for (; end > start; end -= 1) {
-		const node = nodes[end - 1];
+		const node = nodes[end - 1] as Text;
 		if (node.type !== 'Text') break;
 
 		node.data = node.data.replace(/\s+$/, '');
diff --git a/src/compile/utils/CodeBuilder.ts b/src/compiler/compile/utils/CodeBuilder.ts
similarity index 100%
rename from src/compile/utils/CodeBuilder.ts
rename to src/compiler/compile/utils/CodeBuilder.ts
diff --git a/src/compile/utils/__test__.ts b/src/compiler/compile/utils/__test__.ts
similarity index 100%
rename from src/compile/utils/__test__.ts
rename to src/compiler/compile/utils/__test__.ts
diff --git a/src/compiler/compile/utils/add_to_set.ts b/src/compiler/compile/utils/add_to_set.ts
new file mode 100644
index 0000000000..530a7fe2ca
--- /dev/null
+++ b/src/compiler/compile/utils/add_to_set.ts
@@ -0,0 +1,6 @@
+export default function add_to_set<T>(a: Set<T>, b: Set<T> | T[]) {
+	// @ts-ignore
+	b.forEach(item => {
+		a.add(item);
+	});
+}
diff --git a/src/compile/utils/deindent.ts b/src/compiler/compile/utils/deindent.ts
similarity index 100%
rename from src/compile/utils/deindent.ts
rename to src/compiler/compile/utils/deindent.ts
diff --git a/src/compile/utils/flatten_reference.ts b/src/compiler/compile/utils/flatten_reference.ts
similarity index 100%
rename from src/compile/utils/flatten_reference.ts
rename to src/compiler/compile/utils/flatten_reference.ts
diff --git a/src/compile/utils/get_object.ts b/src/compiler/compile/utils/get_object.ts
similarity index 100%
rename from src/compile/utils/get_object.ts
rename to src/compiler/compile/utils/get_object.ts
diff --git a/src/compile/utils/get_slot_data.ts b/src/compiler/compile/utils/get_slot_data.ts
similarity index 100%
rename from src/compile/utils/get_slot_data.ts
rename to src/compiler/compile/utils/get_slot_data.ts
diff --git a/src/compile/utils/scope.ts b/src/compiler/compile/utils/scope.ts
similarity index 93%
rename from src/compile/utils/scope.ts
rename to src/compiler/compile/utils/scope.ts
index 6488986d83..6bf3f9eaf4 100644
--- a/src/compile/utils/scope.ts
+++ b/src/compiler/compile/utils/scope.ts
@@ -1,6 +1,7 @@
 import { walk } from 'estree-walker';
 import is_reference from 'is-reference';
 import { Node } from '../../interfaces';
+import { Node as ESTreeNode } from 'estree';
 
 export function create_scopes(expression: Node) {
 	const map = new WeakMap();
@@ -9,7 +10,7 @@ export function create_scopes(expression: Node) {
 	let scope = new Scope(null, false);
 
 	walk(expression, {
-		enter(node: Node, parent: Node) {
+		enter(node, parent) {
 			if (node.type === 'ImportDeclaration') {
 				node.specifiers.forEach(specifier => {
 					scope.declarations.set(specifier.local.name, specifier);
@@ -25,7 +26,7 @@ export function create_scopes(expression: Node) {
 					if (node.id) scope.declarations.set(node.id.name, node);
 				}
 
-				node.params.forEach((param: Node) => {
+				node.params.forEach((param) => {
 					extract_names(param).forEach(name => {
 						scope.declarations.set(name, node);
 					});
@@ -38,7 +39,7 @@ export function create_scopes(expression: Node) {
 				map.set(node, scope);
 			} else if (/(Class|Variable)Declaration/.test(node.type)) {
 				scope.add_declaration(node);
-			} else if (node.type === 'Identifier' && is_reference(node, parent)) {
+			} else if (node.type === 'Identifier' && is_reference(node as ESTreeNode, parent as ESTreeNode)) {
 				if (!scope.has(node.name) && !globals.has(node.name)) {
 					globals.set(node.name, node);
 				}
@@ -49,10 +50,10 @@ export function create_scopes(expression: Node) {
 			if (map.has(node)) {
 				scope = scope.parent;
 			}
-		},
+		}
 	});
 
-	scope.declarations.forEach((node, name) => {
+	scope.declarations.forEach((_node, name) => {
 		globals.delete(name);
 	});
 
diff --git a/src/compile/utils/snip.ts b/src/compiler/compile/utils/snip.ts
similarity index 100%
rename from src/compile/utils/snip.ts
rename to src/compiler/compile/utils/snip.ts
diff --git a/src/compile/utils/stringify.ts b/src/compiler/compile/utils/stringify.ts
similarity index 100%
rename from src/compile/utils/stringify.ts
rename to src/compiler/compile/utils/stringify.ts
diff --git a/src/compile/utils/stringify_attribute.ts b/src/compiler/compile/utils/stringify_attribute.ts
similarity index 86%
rename from src/compile/utils/stringify_attribute.ts
rename to src/compiler/compile/utils/stringify_attribute.ts
index 9df2d18344..ee3450edbb 100644
--- a/src/compile/utils/stringify_attribute.ts
+++ b/src/compiler/compile/utils/stringify_attribute.ts
@@ -1,11 +1,10 @@
 import Attribute from '../nodes/Attribute';
-import Node from '../nodes/shared/Node';
 import { escape_template, escape } from './stringify';
 import { snip } from './snip';
 
 export function stringify_attribute(attribute: Attribute, is_ssr: boolean) {
 	return attribute.chunks
-		.map((chunk: Node) => {
+		.map((chunk) => {
 			if (chunk.type === 'Text') {
 				return escape_template(escape(chunk.data).replace(/"/g, '&quot;'));
 			}
@@ -15,4 +14,4 @@ export function stringify_attribute(attribute: Attribute, is_ssr: boolean) {
 				: '${' + snip(chunk) + '}';
 		})
 		.join('');
-}
\ No newline at end of file
+}
diff --git a/src/compile/utils/stringify_props.ts b/src/compiler/compile/utils/stringify_props.ts
similarity index 100%
rename from src/compile/utils/stringify_props.ts
rename to src/compiler/compile/utils/stringify_props.ts
diff --git a/src/compile/utils/tail.ts b/src/compiler/compile/utils/tail.ts
similarity index 100%
rename from src/compile/utils/tail.ts
rename to src/compiler/compile/utils/tail.ts
diff --git a/src/compile/utils/unwrap_parens.ts b/src/compiler/compile/utils/unwrap_parens.ts
similarity index 100%
rename from src/compile/utils/unwrap_parens.ts
rename to src/compiler/compile/utils/unwrap_parens.ts
diff --git a/src/config.ts b/src/compiler/config.ts
similarity index 100%
rename from src/config.ts
rename to src/compiler/config.ts
diff --git a/src/index.ts b/src/compiler/index.ts
similarity index 100%
rename from src/index.ts
rename to src/compiler/index.ts
diff --git a/src/interfaces.ts b/src/compiler/interfaces.ts
similarity index 66%
rename from src/interfaces.ts
rename to src/compiler/interfaces.ts
index 68fef7472e..d63194edcd 100644
--- a/src/interfaces.ts
+++ b/src/compiler/interfaces.ts
@@ -1,16 +1,57 @@
-export interface Node {
+interface BaseNode {
 	start: number;
 	end: number;
 	type: string;
+	children?: Node[];
 	[prop_name: string]: any;
 }
 
+export interface Text extends BaseNode {
+	type: 'Text';
+	data: string;
+}
+
+export interface MustacheTag extends BaseNode {
+	type: 'MustacheTag';
+	expression: Node;
+}
+
+export type DirectiveType = 'Action'
+| 'Animation'
+| 'Binding'
+| 'Class'
+| 'EventHandler'
+| 'Let'
+| 'Ref'
+| 'Transition';
+
+interface BaseDirective extends BaseNode {
+	type: DirectiveType;
+	expression: null|Node;
+	name: string;
+	modifiers: string[];
+}
+
+export interface Transition extends BaseDirective{
+	type: 'Transition';
+	intro: boolean;
+	outro: boolean;
+}
+
+export type Directive = BaseDirective | Transition;
+
+export type Node = Text
+| MustacheTag
+| BaseNode
+| Directive
+| Transition;
+
 export interface Parser {
 	readonly template: string;
 	readonly filename?: string;
 
 	index: number;
-	stack: Array<Node>;
+	stack: Node[];
 
 	html: Node;
 	css: Node;
@@ -27,7 +68,7 @@ export interface Ast {
 
 export interface Warning {
 	start?: { line: number; column: number; pos?: number };
-	end?: { line: number; column: number; };
+	end?: { line: number; column: number };
 	pos?: number;
 	code: string;
 	message: string;
@@ -73,7 +114,7 @@ export interface Visitor {
 
 export interface AppendTarget {
 	slots: Record<string, string>;
-	slot_stack: string[]
+	slot_stack: string[];
 }
 
 export interface Var {
@@ -92,4 +133,5 @@ export interface Var {
 	initialised?: boolean;
 	hoistable?: boolean;
 	subscribable?: boolean;
+	is_reactive_dependency?: boolean;
 }
\ No newline at end of file
diff --git a/src/parse/acorn.ts b/src/compiler/parse/acorn.ts
similarity index 100%
rename from src/parse/acorn.ts
rename to src/compiler/parse/acorn.ts
diff --git a/src/parse/index.ts b/src/compiler/parse/index.ts
similarity index 98%
rename from src/parse/index.ts
rename to src/compiler/parse/index.ts
index a9c3950425..2110df7280 100644
--- a/src/parse/index.ts
+++ b/src/compiler/parse/index.ts
@@ -14,7 +14,7 @@ export class Parser {
 	readonly customElement: boolean;
 
 	index = 0;
-	stack: Array<Node> = [];
+	stack: Node[] = [];
 
 	html: Node;
 	css: Node[] = [];
@@ -89,7 +89,7 @@ export class Parser {
 		}, err.pos);
 	}
 
-	error({ code, message }: { code: string, message: string }, index = this.index) {
+	error({ code, message }: { code: string; message: string }, index = this.index) {
 		error(message, {
 			name: 'ParseError',
 			code,
diff --git a/src/parse/read/context.ts b/src/compiler/parse/read/context.ts
similarity index 97%
rename from src/parse/read/context.ts
rename to src/compiler/parse/read/context.ts
index ac47f164dd..0db0c676a3 100644
--- a/src/parse/read/context.ts
+++ b/src/compiler/parse/read/context.ts
@@ -1,13 +1,13 @@
 import { Parser } from '../index';
 
-type Identifier = {
+interface Identifier {
 	start: number;
 	end: number;
 	type: 'Identifier';
 	name: string;
-};
+}
 
-type Property = {
+interface Property {
 	start: number;
 	end: number;
 	type: 'Property';
@@ -15,9 +15,9 @@ type Property = {
 	shorthand: boolean;
 	key: Identifier;
 	value: Context;
-};
+}
 
-type Context = {
+interface Context {
 	start: number;
 	end: number;
 	type: 'Identifier' | 'ArrayPattern' | 'ObjectPattern' | 'RestIdentifier';
@@ -91,7 +91,7 @@ export default function read_context(parser: Parser) {
 					end: parser.index,
 					type: 'Identifier',
 					name
-				}
+				};
 				const property: Property = {
 					start,
 					end: parser.index,
@@ -100,7 +100,7 @@ export default function read_context(parser: Parser) {
 					shorthand: true,
 					key,
 					value: key
-				}
+				};
 
 				context.properties.push(property);
 
diff --git a/src/parse/read/expression.ts b/src/compiler/parse/read/expression.ts
similarity index 66%
rename from src/parse/read/expression.ts
rename to src/compiler/parse/read/expression.ts
index 4d1de89fe7..78a28ba72b 100644
--- a/src/parse/read/expression.ts
+++ b/src/compiler/parse/read/expression.ts
@@ -1,9 +1,10 @@
 import { parse_expression_at } from '../acorn';
 import { Parser } from '../index';
+import { Identifier, Node, SimpleLiteral } from 'estree';
 
 const literals = new Map([['true', true], ['false', false], ['null', null]]);
 
-export default function read_expression(parser: Parser) {
+export default function read_expression(parser: Parser): Node {
 	const start = parser.index;
 
 	const name = parser.read_until(/\s*}/);
@@ -11,21 +12,23 @@ export default function read_expression(parser: Parser) {
 		const end = start + name.length;
 
 		if (literals.has(name)) {
+			// eslint-disable-next-line @typescript-eslint/no-object-literal-type-assertion
 			return {
 				type: 'Literal',
 				start,
 				end,
 				value: literals.get(name),
 				raw: name,
-			};
+			} as SimpleLiteral;
 		}
 
+		// eslint-disable-next-line @typescript-eslint/no-object-literal-type-assertion
 		return {
 			type: 'Identifier',
 			start,
 			end: start + name.length,
 			name,
-		};
+		} as Identifier;
 	}
 
 	parser.index = start;
@@ -34,7 +37,7 @@ export default function read_expression(parser: Parser) {
 		const node = parse_expression_at(parser.template, parser.index);
 		parser.index = node.end;
 
-		return node;
+		return node as Node;
 	} catch (err) {
 		parser.acorn_error(err);
 	}
diff --git a/src/parse/read/script.ts b/src/compiler/parse/read/script.ts
similarity index 100%
rename from src/parse/read/script.ts
rename to src/compiler/parse/read/script.ts
diff --git a/src/parse/read/style.ts b/src/compiler/parse/read/style.ts
similarity index 100%
rename from src/parse/read/style.ts
rename to src/compiler/parse/read/style.ts
diff --git a/src/parse/state/fragment.ts b/src/compiler/parse/state/fragment.ts
similarity index 100%
rename from src/parse/state/fragment.ts
rename to src/compiler/parse/state/fragment.ts
diff --git a/src/parse/state/mustache.ts b/src/compiler/parse/state/mustache.ts
similarity index 99%
rename from src/parse/state/mustache.ts
rename to src/compiler/parse/state/mustache.ts
index b4d0c6ad8d..4abd506984 100644
--- a/src/parse/state/mustache.ts
+++ b/src/compiler/parse/state/mustache.ts
@@ -295,7 +295,7 @@ export default function mustache(parser: Parser) {
 			}
 		}
 
-		let await_block_shorthand = type === 'AwaitBlock' && parser.eat('then');
+		const await_block_shorthand = type === 'AwaitBlock' && parser.eat('then');
 		if (await_block_shorthand) {
 			parser.require_whitespace();
 			block.value = parser.read_identifier();
diff --git a/src/parse/state/tag.ts b/src/compiler/parse/state/tag.ts
similarity index 90%
rename from src/parse/state/tag.ts
rename to src/compiler/parse/state/tag.ts
index 3747d2d482..2fb82b4d2e 100644
--- a/src/parse/state/tag.ts
+++ b/src/compiler/parse/state/tag.ts
@@ -4,10 +4,11 @@ import read_style from '../read/style';
 import { decode_character_references } from '../utils/html';
 import { is_void } from '../../utils/names';
 import { Parser } from '../index';
-import { Node } from '../../interfaces';
+import { Directive, DirectiveType, Node, Text } from '../../interfaces';
 import fuzzymatch from '../../utils/fuzzymatch';
 import list from '../../utils/list';
 
+// eslint-disable-next-line no-useless-escape
 const valid_tag_name = /^\!?[a-zA-Z]{1,}:?[a-zA-Z0-9\-]*/;
 
 const meta_tags = new Map([
@@ -36,7 +37,9 @@ const specials = new Map([
 	],
 ]);
 
+// eslint-disable-next-line no-useless-escape
 const SELF = /^svelte:self(?=[\s\/>])/;
+// eslint-disable-next-line no-useless-escape
 const COMPONENT = /^svelte:component(?=[\s\/>])/;
 
 // based on http://developers.whatwg.org/syntax.html#syntax-tag-omission
@@ -131,8 +134,8 @@ export default function tag(parser: Parser) {
 	const type = meta_tags.has(name)
 		? meta_tags.get(name)
 		: (/[A-Z]/.test(name[0]) || name === 'svelte:self' || name === 'svelte:component') ? 'InlineComponent'
-		: name === 'title' && parent_is_head(parser.stack) ? 'Title'
-		: name === 'slot' && !parser.customElement ? 'Slot' : 'Element';
+			: name === 'title' && parent_is_head(parser.stack) ? 'Title'
+				: name === 'slot' && !parser.customElement ? 'Slot' : 'Element';
 
 	const element: Node = {
 		start,
@@ -358,16 +361,9 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
 		}
 	}
 
-	let name = parser.read_until(/(\s|=|\/|>)/);
+	// eslint-disable-next-line no-useless-escape
+	const name = parser.read_until(/[\s=\/>"']/);
 	if (!name) return null;
-	if (unique_names.has(name)) {
-		parser.error({
-			code: `duplicate-attribute`,
-			message: 'Attributes need to be unique'
-		}, start);
-	}
-
-	unique_names.add(name);
 
 	let end = parser.index;
 
@@ -376,10 +372,26 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
 	const colon_index = name.indexOf(':');
 	const type = colon_index !== -1 && get_directive_type(name.slice(0, colon_index));
 
+	if (unique_names.has(name)) {
+		parser.error({
+			code: `duplicate-attribute`,
+			message: 'Attributes need to be unique'
+		}, start);
+	}
+
+	if (type !== "EventHandler") {
+		unique_names.add(name);
+	}
+
 	let value: any[] | true = true;
 	if (parser.eat('=')) {
 		value = read_attribute_value(parser);
 		end = parser.index;
+	} else if (parser.match_regex(/["']/)) {
+		parser.error({
+			code: `unexpected-token`,
+			message: `Expected =`
+		}, parser.index);
 	}
 
 	if (type) {
@@ -393,7 +405,7 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
 		}
 
 		if (value[0]) {
-			if (value.length > 1 || value[0].type === 'Text') {
+			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`
@@ -401,7 +413,7 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
 			}
 		}
 
-		const directive = {
+		const directive: Directive = {
 			start,
 			end,
 			type,
@@ -437,7 +449,7 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
 	};
 }
 
-function get_directive_type(name) {
+function get_directive_type(name: string): DirectiveType {
 	if (name === 'use') return 'Action';
 	if (name === 'animate') return 'Animation';
 	if (name === 'bind') return 'Binding';
@@ -453,8 +465,8 @@ function read_attribute_value(parser: Parser) {
 
 	const regex = (
 		quote_mark === `'` ? /'/ :
-		quote_mark === `"` ? /"/ :
-		/(\/>|[\s"'=<>`])/
+			quote_mark === `"` ? /"/ :
+				/(\/>|[\s"'=<>`])/
 	);
 
 	const value = read_sequence(parser, () => !!parser.match_regex(regex));
@@ -463,35 +475,33 @@ function read_attribute_value(parser: Parser) {
 	return value;
 }
 
-function read_sequence(parser: Parser, done: () => boolean) {
-	let current_chunk: Node = {
+function read_sequence(parser: Parser, done: () => boolean): Node[] {
+	let current_chunk: Text = {
 		start: parser.index,
 		end: null,
 		type: 'Text',
-		data: '',
+		raw: '',
+		data: null
 	};
 
-	const chunks = [];
+	function flush() {
+		if (current_chunk.raw) {
+			current_chunk.data = decode_character_references(current_chunk.raw);
+			current_chunk.end = parser.index;
+			chunks.push(current_chunk);
+		}
+	}
+
+	const chunks: Node[] = [];
 
 	while (parser.index < parser.template.length) {
 		const index = parser.index;
 
 		if (done()) {
-			current_chunk.end = parser.index;
-
-			if (current_chunk.data) chunks.push(current_chunk);
-
-			chunks.forEach(chunk => {
-				if (chunk.type === 'Text')
-					chunk.data = decode_character_references(chunk.data);
-			});
-
+			flush();
 			return chunks;
 		} else if (parser.eat('{')) {
-			if (current_chunk.data) {
-				current_chunk.end = index;
-				chunks.push(current_chunk);
-			}
+			flush();
 
 			parser.allow_whitespace();
 			const expression = read_expression(parser);
@@ -509,10 +519,11 @@ function read_sequence(parser: Parser, done: () => boolean) {
 				start: parser.index,
 				end: null,
 				type: 'Text',
-				data: '',
+				raw: '',
+				data: null
 			};
 		} else {
-			current_chunk.data += parser.template[parser.index++];
+			current_chunk.raw += parser.template[parser.index++];
 		}
 	}
 
diff --git a/src/parse/state/text.ts b/src/compiler/parse/state/text.ts
similarity index 85%
rename from src/parse/state/text.ts
rename to src/compiler/parse/state/text.ts
index f739c8cc9e..56be592ca9 100644
--- a/src/parse/state/text.ts
+++ b/src/compiler/parse/state/text.ts
@@ -14,10 +14,13 @@ export default function text(parser: Parser) {
 		data += parser.template[parser.index++];
 	}
 
-	parser.current().children.push({
+	const node = {
 		start,
 		end: parser.index,
 		type: 'Text',
+		raw: data,
 		data: decode_character_references(data),
-	});
+	};
+
+	parser.current().children.push(node);
 }
diff --git a/src/parse/utils/entities.ts b/src/compiler/parse/utils/entities.ts
similarity index 100%
rename from src/parse/utils/entities.ts
rename to src/compiler/parse/utils/entities.ts
diff --git a/src/parse/utils/html.ts b/src/compiler/parse/utils/html.ts
similarity index 100%
rename from src/parse/utils/html.ts
rename to src/compiler/parse/utils/html.ts
diff --git a/src/preprocess/index.ts b/src/compiler/preprocess/index.ts
similarity index 87%
rename from src/preprocess/index.ts
rename to src/compiler/preprocess/index.ts
index 2666e5fb7f..8543a56d18 100644
--- a/src/preprocess/index.ts
+++ b/src/compiler/preprocess/index.ts
@@ -2,18 +2,18 @@ import { SourceMap } from 'magic-string';
 
 export interface PreprocessorGroup {
 	markup?: (options: {
-		content: string,
-		filename: string
-	}) => { code: string, map?: SourceMap | string, dependencies?: string[] };
+		content: string;
+		filename: string;
+	}) => { code: string; map?: SourceMap | string; dependencies?: string[] };
 	style?: Preprocessor;
 	script?: Preprocessor;
 }
 
 export type Preprocessor = (options: {
-	content: string,
-	attributes: Record<string, string | boolean>,
-	filename?: string
-}) => { code: string, map?: SourceMap | string, dependencies?: string[] };
+	content: string;
+	attributes: Record<string, string | boolean>;
+	filename?: string;
+}) => { code: string; map?: SourceMap | string; dependencies?: string[] };
 
 interface Processed {
 	code: string;
@@ -43,16 +43,16 @@ interface Replacement {
 }
 
 async function replace_async(str: string, re: RegExp, func: (...any) => Promise<string>) {
-	const replacements: Promise<Replacement>[] = [];
+	const replacements: Array<Promise<Replacement>> = [];
 	str.replace(re, (...args) => {
 		replacements.push(
 			func(...args).then(
-				res =>
-					<Replacement>({
+				res => // eslint-disable-next-line @typescript-eslint/no-object-literal-type-assertion
+					({
 						offset: args[args.length - 2],
 						length: args[0].length,
 						replacement: res,
-					})
+					}) as Replacement
 			)
 		);
 		return '';
@@ -74,6 +74,7 @@ export default async function preprocess(
 	preprocessor: PreprocessorGroup | PreprocessorGroup[],
 	options?: { filename?: string }
 ) {
+	// @ts-ignore todo: doublecheck
 	const filename = (options && options.filename) || preprocessor.filename; // legacy
 	const dependencies = [];
 
diff --git a/src/utils/error.ts b/src/compiler/utils/error.ts
similarity index 76%
rename from src/utils/error.ts
rename to src/compiler/utils/error.ts
index f89cc3d721..d13222578a 100644
--- a/src/utils/error.ts
+++ b/src/compiler/utils/error.ts
@@ -1,10 +1,10 @@
 import { locate } from 'locate-character';
-import get_code_frame from '../utils/get_code_frame';
+import get_code_frame from './get_code_frame';
 
 class CompileError extends Error {
 	code: string;
-	start: { line: number, column: number };
-	end: { line: number, column: number };
+	start: { line: number; column: number };
+	end: { line: number; column: number };
 	pos: number;
 	filename: string;
 	frame: string;
@@ -15,12 +15,12 @@ class CompileError extends Error {
 }
 
 export default function error(message: string, props: {
-	name: string,
-	code: string,
-	source: string,
-	filename: string,
-	start: number,
-	end?: number
+	name: string;
+	code: string;
+	source: string;
+	filename: string;
+	start: number;
+	end?: number;
 }) {
 	const error = new CompileError(message);
 	error.name = props.name;
diff --git a/src/utils/full_char_code_at.ts b/src/compiler/utils/full_char_code_at.ts
similarity index 83%
rename from src/utils/full_char_code_at.ts
rename to src/compiler/utils/full_char_code_at.ts
index e0c15588c7..b5187693eb 100644
--- a/src/utils/full_char_code_at.ts
+++ b/src/compiler/utils/full_char_code_at.ts
@@ -2,9 +2,9 @@
 // Reproduced under MIT License https://github.com/acornjs/acorn/blob/master/LICENSE
 
 export default function full_char_code_at(str: string, i: number): number {
-	let code = str.charCodeAt(i)
+	const code = str.charCodeAt(i);
 	if (code <= 0xd7ff || code >= 0xe000) return code;
 
-	let next = str.charCodeAt(i + 1);
+	const next = str.charCodeAt(i + 1);
 	return (code << 10) + next - 0x35fdc00;
 }
\ No newline at end of file
diff --git a/src/utils/fuzzymatch.ts b/src/compiler/utils/fuzzymatch.ts
similarity index 99%
rename from src/utils/fuzzymatch.ts
rename to src/compiler/utils/fuzzymatch.ts
index 89d98fe1c1..2efadc3847 100644
--- a/src/utils/fuzzymatch.ts
+++ b/src/compiler/utils/fuzzymatch.ts
@@ -144,7 +144,7 @@ class FuzzySet {
 		items[index] = [vector_normal, normalized_value];
 		this.items[gram_size] = items;
 		this.exact_set[normalized_value] = value;
-	};
+	}
 
 	get(value: string) {
 		const normalized_value = value.toLowerCase();
@@ -232,5 +232,5 @@ class FuzzySet {
 		}
 
 		return new_results;
-	};
-}
\ No newline at end of file
+	}
+}
diff --git a/src/utils/get_code_frame.ts b/src/compiler/utils/get_code_frame.ts
similarity index 100%
rename from src/utils/get_code_frame.ts
rename to src/compiler/utils/get_code_frame.ts
diff --git a/src/utils/indentation.ts b/src/compiler/utils/indentation.ts
similarity index 99%
rename from src/utils/indentation.ts
rename to src/compiler/utils/indentation.ts
index 765a62bfbf..54ededc37d 100644
--- a/src/utils/indentation.ts
+++ b/src/compiler/utils/indentation.ts
@@ -54,4 +54,4 @@ export function add_indentation(code: MagicString, node: Node, levels = 1) {
 
 		code.appendLeft(index + 1, indent);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/utils/list.ts b/src/compiler/utils/list.ts
similarity index 100%
rename from src/utils/list.ts
rename to src/compiler/utils/list.ts
diff --git a/src/utils/names.ts b/src/compiler/utils/names.ts
similarity index 98%
rename from src/utils/names.ts
rename to src/compiler/utils/names.ts
index 2eafdf06a3..f1413548aa 100644
--- a/src/utils/names.ts
+++ b/src/compiler/utils/names.ts
@@ -10,6 +10,7 @@ export const globals = new Set([
 	'Date',
 	'decodeURI',
 	'decodeURIComponent',
+	'document',
 	'encodeURI',
 	'encodeURIComponent',
 	'Infinity',
@@ -31,6 +32,7 @@ export const globals = new Set([
 	'Set',
 	'String',
 	'undefined',
+	'window',
 ]);
 
 export const reserved = new Set([
diff --git a/src/utils/namespaces.ts b/src/compiler/utils/namespaces.ts
similarity index 100%
rename from src/utils/namespaces.ts
rename to src/compiler/utils/namespaces.ts
diff --git a/src/utils/nodes_match.ts b/src/compiler/utils/nodes_match.ts
similarity index 100%
rename from src/utils/nodes_match.ts
rename to src/compiler/utils/nodes_match.ts
diff --git a/src/utils/patterns.ts b/src/compiler/utils/patterns.ts
similarity index 100%
rename from src/utils/patterns.ts
rename to src/compiler/utils/patterns.ts
diff --git a/src/utils/repeat.ts b/src/compiler/utils/repeat.ts
similarity index 100%
rename from src/utils/repeat.ts
rename to src/compiler/utils/repeat.ts
diff --git a/src/utils/trim.ts b/src/compiler/utils/trim.ts
similarity index 100%
rename from src/utils/trim.ts
rename to src/compiler/utils/trim.ts
diff --git a/src/internal/animations.js b/src/internal/animations.js
deleted file mode 100644
index 388110babb..0000000000
--- a/src/internal/animations.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import { identity as linear, noop } from './utils.js';
-import { loop } from './loop.js';
-import { create_rule, delete_rule } from './style_manager.js';
-
-export function create_animation(node, from, fn, params) {
-	if (!from) return noop;
-
-	const to = node.getBoundingClientRect();
-	if (from.left === to.left && from.right === to.right && from.top === to.top && from.bottom === to.bottom) return noop;
-
-	const {
-		delay = 0,
-		duration = 300,
-		easing = linear,
-		start: start_time = window.performance.now() + delay,
-		end = start_time + duration,
-		tick = noop,
-		css
-	} = fn(node, { from, to }, params);
-
-	let running = true;
-	let started = false;
-	let name;
-
-	const css_text = node.style.cssText;
-
-	function start() {
-		if (css) {
-			if (delay) node.style.cssText = css_text; // TODO create delayed animation instead?
-			name = create_rule(node, 0, 1, duration, 0, easing, css);
-		}
-
-		started = true;
-	}
-
-	function stop() {
-		if (css) delete_rule(node, name);
-		running = false;
-	}
-
-	loop(now => {
-		if (!started && now >= start_time) {
-			start();
-		}
-
-		if (started && now >= end) {
-			tick(1, 0);
-			stop();
-		}
-
-		if (!running) {
-			return false;
-		}
-
-		if (started) {
-			const p = now - start_time;
-			const t = 0 + 1 * easing(p / duration);
-			tick(t, 1 - t);
-		}
-
-		return true;
-	});
-
-	if (delay) {
-		if (css) node.style.cssText += css(0, 1);
-	} else {
-		start();
-	}
-
-	tick(0, 1);
-
-	return stop;
-}
-
-export function fix_position(node) {
-	const style = getComputedStyle(node);
-
-	if (style.position !== 'absolute' && style.position !== 'fixed') {
-		const { width, height } = style;
-		const a = node.getBoundingClientRect();
-		node.style.position = 'absolute';
-		node.style.width = width;
-		node.style.height = height;
-		const b = node.getBoundingClientRect();
-
-		if (a.left !== b.left || a.top !== b.top) {
-			const style = getComputedStyle(node);
-			const transform = style.transform === 'none' ? '' : style.transform;
-
-			node.style.transform = `${transform} translate(${a.left - b.left}px, ${a.top - b.top}px)`;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/internal/index.js b/src/internal/index.js
deleted file mode 100644
index f3654f6b77..0000000000
--- a/src/internal/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export * from './animations.js';
-export * from './await-block.js';
-export * from './dom.js';
-export * from './keyed-each.js';
-export * from './lifecycle.js';
-export * from './loop.js';
-export * from './scheduler.js';
-export * from './spread.js';
-export * from './ssr.js';
-export * from './transitions.js';
-export * from './utils.js';
-export * from './Component.js';
\ No newline at end of file
diff --git a/src/motion/index.js b/src/motion/index.js
deleted file mode 100644
index e0e9bcf1ae..0000000000
--- a/src/motion/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './spring.js';
-export * from './tweened.js';
\ No newline at end of file
diff --git a/src/runtime/animate/index.ts b/src/runtime/animate/index.ts
new file mode 100644
index 0000000000..d00d23c98d
--- /dev/null
+++ b/src/runtime/animate/index.ts
@@ -0,0 +1,40 @@
+import { cubicOut } from 'svelte/easing';
+import { is_function } from 'svelte/internal';
+
+// todo: same as Transition, should it be shared?
+export interface AnimationConfig {
+	delay?: number;
+	duration?: number;
+	easing?: (t: number) => number;
+	css?: (t: number, u: number) => string;
+	tick?: (t: number, u: number) => void;
+}
+
+interface FlipParams {
+	delay: number;
+	duration: number | ((len: number) => number);
+	easing: (t: number) => number;
+}
+
+export function flip(node: Element, animation: { from: DOMRect; to: DOMRect }, params: FlipParams): AnimationConfig {
+	const style = getComputedStyle(node);
+	const transform = style.transform === 'none' ? '' : style.transform;
+
+	const dx = animation.from.left - animation.to.left;
+	const dy = animation.from.top - animation.to.top;
+
+	const d = Math.sqrt(dx * dx + dy * dy);
+
+	const {
+		delay = 0,
+		duration = d => Math.sqrt(d) * 120,
+		easing = cubicOut
+	} = params;
+
+	return {
+		delay,
+		duration: is_function(duration) ? duration(d) : duration,
+		easing,
+		css: (_t, u) => `transform: ${transform} translate(${u * dx}px, ${u * dy}px);`
+	};
+}
diff --git a/easing.mjs b/src/runtime/easing/index.ts
similarity index 68%
rename from easing.mjs
rename to src/runtime/easing/index.ts
index 4fc625c24f..c23019b320 100644
--- a/easing.mjs
+++ b/src/runtime/easing/index.ts
@@ -3,25 +3,25 @@ Adapted from https://github.com/mattdesl
 Distributed under MIT License https://github.com/mattdesl/eases/blob/master/LICENSE.md
 */
 
-export { identity as linear } from './internal';
+export { identity as linear } from 'svelte/internal';
 
-export function backInOut(t) {
+export function backInOut(t: number) {
 	const s = 1.70158 * 1.525;
 	if ((t *= 2) < 1) return 0.5 * (t * t * ((s + 1) * t - s));
 	return 0.5 * ((t -= 2) * t * ((s + 1) * t + s) + 2);
 }
 
-export function backIn(t) {
+export function backIn(t: number) {
 	const s = 1.70158;
 	return t * t * ((s + 1) * t - s);
 }
 
-export function backOut(t) {
+export function backOut(t: number) {
 	const s = 1.70158;
 	return --t * t * ((s + 1) * t + s) + 1;
 }
 
-export function bounceOut(t) {
+export function bounceOut(t: number) {
 	const a = 4.0 / 11.0;
 	const b = 8.0 / 11.0;
 	const c = 9.0 / 10.0;
@@ -41,43 +41,43 @@ export function bounceOut(t) {
 				: 10.8 * t * t - 20.52 * t + 10.72;
 }
 
-export function bounceInOut(t) {
+export function bounceInOut(t: number) {
 	return t < 0.5
 		? 0.5 * (1.0 - bounceOut(1.0 - t * 2.0))
 		: 0.5 * bounceOut(t * 2.0 - 1.0) + 0.5;
 }
 
-export function bounceIn(t) {
+export function bounceIn(t: number) {
 	return 1.0 - bounceOut(1.0 - t);
 }
 
-export function circInOut(t) {
+export function circInOut(t: number) {
 	if ((t *= 2) < 1) return -0.5 * (Math.sqrt(1 - t * t) - 1);
 	return 0.5 * (Math.sqrt(1 - (t -= 2) * t) + 1);
 }
 
-export function circIn(t) {
+export function circIn(t: number) {
 	return 1.0 - Math.sqrt(1.0 - t * t);
 }
 
-export function circOut(t) {
+export function circOut(t: number) {
 	return Math.sqrt(1 - --t * t);
 }
 
-export function cubicInOut(t) {
+export function cubicInOut(t: number) {
 	return t < 0.5 ? 4.0 * t * t * t : 0.5 * Math.pow(2.0 * t - 2.0, 3.0) + 1.0;
 }
 
-export function cubicIn(t) {
+export function cubicIn(t: number) {
 	return t * t * t;
 }
 
-export function cubicOut(t) {
+export function cubicOut(t: number) {
 	const f = t - 1.0;
 	return f * f * f + 1.0;
 }
 
-export function elasticInOut(t) {
+export function elasticInOut(t: number) {
 	return t < 0.5
 		? 0.5 *
 				Math.sin(((+13.0 * Math.PI) / 2) * 2.0 * t) *
@@ -88,17 +88,17 @@ export function elasticInOut(t) {
 				1.0;
 }
 
-export function elasticIn(t) {
+export function elasticIn(t: number) {
 	return Math.sin((13.0 * t * Math.PI) / 2) * Math.pow(2.0, 10.0 * (t - 1.0));
 }
 
-export function elasticOut(t) {
+export function elasticOut(t: number) {
 	return (
 		Math.sin((-13.0 * (t + 1.0) * Math.PI) / 2) * Math.pow(2.0, -10.0 * t) + 1.0
 	);
 }
 
-export function expoInOut(t) {
+export function expoInOut(t: number) {
 	return t === 0.0 || t === 1.0
 		? t
 		: t < 0.5
@@ -106,66 +106,66 @@ export function expoInOut(t) {
 			: -0.5 * Math.pow(2.0, 10.0 - t * 20.0) + 1.0;
 }
 
-export function expoIn(t) {
+export function expoIn(t: number) {
 	return t === 0.0 ? t : Math.pow(2.0, 10.0 * (t - 1.0));
 }
 
-export function expoOut(t) {
+export function expoOut(t: number) {
 	return t === 1.0 ? t : 1.0 - Math.pow(2.0, -10.0 * t);
 }
 
-export function quadInOut(t) {
+export function quadInOut(t: number) {
 	t /= 0.5;
 	if (t < 1) return 0.5 * t * t;
 	t--;
 	return -0.5 * (t * (t - 2) - 1);
 }
 
-export function quadIn(t) {
+export function quadIn(t: number) {
 	return t * t;
 }
 
-export function quadOut(t) {
+export function quadOut(t: number) {
 	return -t * (t - 2.0);
 }
 
-export function quartInOut(t) {
+export function quartInOut(t: number) {
 	return t < 0.5
 		? +8.0 * Math.pow(t, 4.0)
 		: -8.0 * Math.pow(t - 1.0, 4.0) + 1.0;
 }
 
-export function quartIn(t) {
+export function quartIn(t: number) {
 	return Math.pow(t, 4.0);
 }
 
-export function quartOut(t) {
+export function quartOut(t: number) {
 	return Math.pow(t - 1.0, 3.0) * (1.0 - t) + 1.0;
 }
 
-export function quintInOut(t) {
+export function quintInOut(t: number) {
 	if ((t *= 2) < 1) return 0.5 * t * t * t * t * t;
 	return 0.5 * ((t -= 2) * t * t * t * t + 2);
 }
 
-export function quintIn(t) {
+export function quintIn(t: number) {
 	return t * t * t * t * t;
 }
 
-export function quintOut(t) {
+export function quintOut(t: number) {
 	return --t * t * t * t * t + 1;
 }
 
-export function sineInOut(t) {
+export function sineInOut(t: number) {
 	return -0.5 * (Math.cos(Math.PI * t) - 1);
 }
 
-export function sineIn(t) {
+export function sineIn(t: number) {
 	const v = Math.cos(t * Math.PI * 0.5);
 	if (Math.abs(v) < 1e-14) return 1;
 	else return 1 - v;
 }
 
-export function sineOut(t) {
+export function sineOut(t: number) {
 	return Math.sin((t * Math.PI) / 2);
 }
diff --git a/index.mjs b/src/runtime/index.ts
similarity index 81%
rename from index.mjs
rename to src/runtime/index.ts
index ee5b575171..40928da8a0 100644
--- a/index.mjs
+++ b/src/runtime/index.ts
@@ -7,4 +7,4 @@ export {
 	getContext,
 	tick,
 	createEventDispatcher
-} from './internal';
+} from 'svelte/internal';
diff --git a/src/internal/Component.js b/src/runtime/internal/Component.ts
similarity index 83%
rename from src/internal/Component.js
rename to src/runtime/internal/Component.ts
index 530a48da59..7624d5c829 100644
--- a/src/internal/Component.js
+++ b/src/runtime/internal/Component.ts
@@ -1,7 +1,24 @@
-import { add_render_callback, flush, schedule_update, dirty_components } from './scheduler.js';
-import { current_component, set_current_component } from './lifecycle.js';
-import { blank_object, is_function, run, run_all, noop } from './utils.js';
-import { children } from './dom.js';
+import { add_render_callback, flush, schedule_update, dirty_components } from './scheduler';
+import { current_component, set_current_component } from './lifecycle';
+import { blank_object, is_function, run, run_all, noop } from './utils';
+import { children } from './dom';
+
+// eslint-disable-next-line @typescript-eslint/class-name-casing
+interface T$$ {
+	dirty: null;
+	ctx: null|any;
+	bound: any;
+	update: () => void;
+	callbacks: any;
+	after_render: any[];
+	props: any;
+	fragment: null|any;
+	not_equal: any;
+	before_render: any[];
+	context: Map<any, any>;
+	on_mount: any[];
+	on_destroy: any[];
+}
 
 export function bind(component, name, callback) {
 	if (component.$$.props.indexOf(name) === -1) return;
@@ -48,7 +65,7 @@ function make_dirty(component, key) {
 	if (!component.$$.dirty) {
 		dirty_components.push(component);
 		schedule_update();
-		component.$$.dirty = {};
+		component.$$.dirty = blank_object();
 	}
 	component.$$.dirty[key] = true;
 }
@@ -59,7 +76,7 @@ export function init(component, options, instance, create_fragment, not_equal, p
 
 	const props = options.props || {};
 
-	const $$ = component.$$ = {
+	const $$: T$$ = component.$$ = {
 		fragment: null,
 		ctx: null,
 
@@ -99,9 +116,11 @@ export function init(component, options, instance, create_fragment, not_equal, p
 
 	if (options.target) {
 		if (options.hydrate) {
-			$$.fragment.l(children(options.target));
+			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+			$$.fragment!.l(children(options.target));
 		} else {
-			$$.fragment.c();
+			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+			$$.fragment!.c();
 		}
 
 		if (options.intro && component.$$.fragment.i) component.$$.fragment.i();
@@ -115,18 +134,21 @@ export function init(component, options, instance, create_fragment, not_equal, p
 export let SvelteElement;
 if (typeof HTMLElement !== 'undefined') {
 	SvelteElement = class extends HTMLElement {
+		$$: T$$;
 		constructor() {
 			super();
 			this.attachShadow({ mode: 'open' });
 		}
 
 		connectedCallback() {
+			// @ts-ignore todo: improve typings
 			for (const key in this.$$.slotted) {
+				// @ts-ignore todo: improve typings
 				this.appendChild(this.$$.slotted[key]);
 			}
 		}
 
-		attributeChangedCallback(attr, oldValue, newValue) {
+		attributeChangedCallback(attr, _oldValue, newValue) {
 			this[attr] = newValue;
 		}
 
@@ -153,6 +175,8 @@ if (typeof HTMLElement !== 'undefined') {
 }
 
 export class SvelteComponent {
+	$$: T$$;
+
 	$destroy() {
 		destroy(this, true);
 		this.$destroy = noop;
@@ -188,4 +212,4 @@ export class SvelteComponentDev extends SvelteComponent {
 			console.warn(`Component was already destroyed`); // eslint-disable-line no-console
 		};
 	}
-}
\ No newline at end of file
+}
diff --git a/src/runtime/internal/animations.ts b/src/runtime/internal/animations.ts
new file mode 100644
index 0000000000..77c86aff0e
--- /dev/null
+++ b/src/runtime/internal/animations.ts
@@ -0,0 +1,102 @@
+import { identity as linear, noop, now } from './utils';
+import { loop } from './loop';
+import { create_rule, delete_rule } from './style_manager';
+import { AnimationConfig } from '../animate';
+
+
+//todo: documentation says it is DOMRect, but in IE it would be ClientRect
+type PositionRect = DOMRect|ClientRect;
+
+type AnimationFn = (node: Element, { from, to }: { from: PositionRect; to: PositionRect }, params: any) => AnimationConfig;
+
+export function create_animation(node: Element & ElementCSSInlineStyle, from: PositionRect, fn: AnimationFn, params) {
+	if (!from) return noop;
+
+	const to = node.getBoundingClientRect();
+	if (from.left === to.left && from.right === to.right && from.top === to.top && from.bottom === to.bottom) return noop;
+
+
+	const {
+		delay = 0,
+		duration = 300,
+		easing = linear,
+		// @ts-ignore todo: should this be separated from destructuring? Or start/end added to public api and documentation?
+		start: start_time = now() + delay,
+		// @ts-ignore todo:
+		end = start_time + duration,
+		tick = noop,
+		css
+	} = fn(node, { from, to }, params);
+
+	let running = true;
+	let started = false;
+	let name;
+
+	function start() {
+		if (css) {
+			name = create_rule(node, 0, 1, duration, delay, easing, css);
+		}
+
+		if (!delay) {
+			started = true;
+		}
+	}
+
+	function stop() {
+		if (css) delete_rule(node, name);
+		running = false;
+	}
+
+	loop(now => {
+		if (!started && now >= start_time) {
+			started = true;
+		}
+
+		if (started && now >= end) {
+			tick(1, 0);
+			stop();
+		}
+
+		if (!running) {
+			return false;
+		}
+
+		if (started) {
+			const p = now - start_time;
+			const t = 0 + 1 * easing(p / duration);
+			tick(t, 1 - t);
+		}
+
+		return true;
+	});
+
+	start();
+
+	tick(0, 1);
+
+	return stop;
+}
+
+export function fix_position(node: Element & ElementCSSInlineStyle) {
+	const style = getComputedStyle(node);
+
+	if (style.position !== 'absolute' && style.position !== 'fixed') {
+		const { width, height } = style;
+		const a = node.getBoundingClientRect();
+		node.style.position = 'absolute';
+		node.style.width = width;
+		node.style.height = height;
+		add_transform(node, a);
+	}
+}
+
+export function add_transform(node: Element & ElementCSSInlineStyle, a: PositionRect) {
+	const b = node.getBoundingClientRect();
+
+	if (a.left !== b.left || a.top !== b.top) {
+		const style = getComputedStyle(node);
+		const transform = style.transform === 'none' ? '' : style.transform;
+
+		node.style.transform = `${transform} translate(${a.left - b.left}px, ${a.top - b.top}px)`;
+	}
+}
diff --git a/src/internal/await-block.js b/src/runtime/internal/await-block.ts
similarity index 89%
rename from src/internal/await-block.js
rename to src/runtime/internal/await-block.ts
index 9e14c50342..9527b000ca 100644
--- a/src/internal/await-block.js
+++ b/src/runtime/internal/await-block.ts
@@ -1,11 +1,11 @@
-import { assign, is_promise } from './utils.js';
-import { check_outros, group_outros, on_outro } from './transitions.js';
-import { flush } from '../internal/scheduler.js';
+import { assign, is_promise } from './utils';
+import { check_outros, group_outros, on_outro } from './transitions';
+import { flush } from '../internal/scheduler';
 
 export function handle_promise(promise, info) {
 	const token = info.token = {};
 
-	function update(type, index, key, value) {
+	function update(type, index, key?, value?) {
 		if (info.token !== token) return;
 
 		info.resolved = key && { [key]: value };
@@ -61,4 +61,4 @@ export function handle_promise(promise, info) {
 
 		info.resolved = { [info.value]: promise };
 	}
-}
\ No newline at end of file
+}
diff --git a/src/internal/dom.js b/src/runtime/internal/dom.ts
similarity index 77%
rename from src/internal/dom.js
rename to src/runtime/internal/dom.ts
index 46ffaa8472..f65d07117c 100644
--- a/src/internal/dom.js
+++ b/src/runtime/internal/dom.ts
@@ -1,28 +1,28 @@
-export function append(target, node) {
+export function append(target: Node, node: Node) {
 	target.appendChild(node);
 }
 
-export function insert(target, node, anchor) {
+export function insert(target: Node, node: Node, anchor?: Node) {
 	target.insertBefore(node, anchor || null);
 }
 
-export function detach(node) {
+export function detach(node: Node) {
 	node.parentNode.removeChild(node);
 }
 
-export function detach_between(before, after) {
+export function detach_between(before: Node, after: Node) {
 	while (before.nextSibling && before.nextSibling !== after) {
 		before.parentNode.removeChild(before.nextSibling);
 	}
 }
 
-export function detach_before(after) {
+export function detach_before(after: Node) {
 	while (after.previousSibling) {
 		after.parentNode.removeChild(after.previousSibling);
 	}
 }
 
-export function detach_after(before) {
+export function detach_after(before: Node) {
 	while (before.nextSibling) {
 		before.parentNode.removeChild(before.nextSibling);
 	}
@@ -34,25 +34,31 @@ export function destroy_each(iterations, detaching) {
 	}
 }
 
-export function element(name) {
-	return document.createElement(name);
+export function element<K extends keyof HTMLElementTagNameMap>(name: K) {
+	return document.createElement<K>(name);
 }
 
-export function object_without_properties(obj, exclude) {
-	const target = {};
+export function object_without_properties<T, K extends keyof T>(obj: T, exclude: K[]) {
+	// eslint-disable-next-line @typescript-eslint/no-object-literal-type-assertion
+	const target = {} as Pick<T, Exclude<keyof T, K>>;
 	for (const k in obj) {
-		if (Object.prototype.hasOwnProperty.call(obj, k) && exclude.indexOf(k) === -1) {
+		if (
+			Object.prototype.hasOwnProperty.call(obj, k)
+			// @ts-ignore
+			&& exclude.indexOf(k) === -1
+		) {
+			// @ts-ignore
 			target[k] = obj[k];
 		}
 	}
 	return target;
 }
 
-export function svg_element(name) {
-	return document.createElementNS('http://www.w3.org/2000/svg', name);
+export function svg_element<K extends keyof SVGElementTagNameMap>(name: K): SVGElement {
+	return document.createElementNS<K>('http://www.w3.org/2000/svg', name);
 }
 
-export function text(data) {
+export function text(data: string) {
 	return document.createTextNode(data);
 }
 
@@ -64,7 +70,7 @@ export function empty() {
 	return text('');
 }
 
-export function listen(node, event, handler, options) {
+export function listen(node: Node, event: string, handler: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions | EventListenerOptions) {
 	node.addEventListener(event, handler, options);
 	return () => node.removeEventListener(event, handler, options);
 }
@@ -72,6 +78,7 @@ export function listen(node, event, handler, options) {
 export function prevent_default(fn) {
 	return function(event) {
 		event.preventDefault();
+		// @ts-ignore
 		return fn.call(this, event);
 	};
 }
@@ -79,16 +86,17 @@ export function prevent_default(fn) {
 export function stop_propagation(fn) {
 	return function(event) {
 		event.stopPropagation();
+		// @ts-ignore
 		return fn.call(this, event);
 	};
 }
 
-export function attr(node, attribute, value) {
+export function attr(node: Element, attribute: string, value?: string) {
 	if (value == null) node.removeAttribute(attribute);
 	else node.setAttribute(attribute, value);
 }
 
-export function set_attributes(node, attributes) {
+export function set_attributes(node: Element & ElementCSSInlineStyle, attributes: { [x: string]: string }) {
 	for (const key in attributes) {
 		if (key === 'style') {
 			node.style.cssText = attributes[key];
@@ -243,8 +251,8 @@ export function toggle_class(element, name, toggle) {
 	element.classList[toggle ? 'add' : 'remove'](name);
 }
 
-export function custom_event(type, detail) {
-	const e = document.createEvent('CustomEvent');
+export function custom_event<T=any>(type: string, detail?: T) {
+	const e: CustomEvent<T> = document.createEvent('CustomEvent');
 	e.initCustomEvent(type, false, false, detail);
 	return e;
 }
diff --git a/src/runtime/internal/index.ts b/src/runtime/internal/index.ts
new file mode 100644
index 0000000000..6487f04525
--- /dev/null
+++ b/src/runtime/internal/index.ts
@@ -0,0 +1,12 @@
+export * from './animations';
+export * from './await-block';
+export * from './dom';
+export * from './keyed-each';
+export * from './lifecycle';
+export * from './loop';
+export * from './scheduler';
+export * from './spread';
+export * from './ssr';
+export * from './transitions';
+export * from './utils';
+export * from './Component';
diff --git a/src/internal/keyed-each.js b/src/runtime/internal/keyed-each.ts
similarity index 94%
rename from src/internal/keyed-each.js
rename to src/runtime/internal/keyed-each.ts
index c40a1cc00b..f13c858897 100644
--- a/src/internal/keyed-each.js
+++ b/src/runtime/internal/keyed-each.ts
@@ -1,4 +1,4 @@
-import { on_outro } from './transitions.js';
+import { on_outro } from './transitions';
 
 export function destroy_block(block, lookup) {
 	block.d(1);
@@ -13,6 +13,11 @@ export function outro_and_destroy_block(block, lookup) {
 	block.o(1);
 }
 
+export function fix_and_destroy_block(block, lookup) {
+	block.f();
+	destroy_block(block, lookup);
+}
+
 export function fix_and_outro_and_destroy_block(block, lookup) {
 	block.f();
 	outro_and_destroy_block(block, lookup);
@@ -110,4 +115,4 @@ export function measure(blocks) {
 	let i = blocks.length;
 	while (i--) rects[blocks[i].key] = blocks[i].node.getBoundingClientRect();
 	return rects;
-}
\ No newline at end of file
+}
diff --git a/src/internal/lifecycle.js b/src/runtime/internal/lifecycle.ts
similarity index 100%
rename from src/internal/lifecycle.js
rename to src/runtime/internal/lifecycle.ts
diff --git a/src/internal/loop.js b/src/runtime/internal/loop.ts
similarity index 61%
rename from src/internal/loop.js
rename to src/runtime/internal/loop.ts
index fd75f9b1a6..cc6161105d 100644
--- a/src/internal/loop.js
+++ b/src/runtime/internal/loop.ts
@@ -1,16 +1,20 @@
+import { now, raf } from './utils';
+
+export interface Task { abort(): void; promise: Promise<void> }
+
 const tasks = new Set();
 let running = false;
 
 function run_tasks() {
 	tasks.forEach(task => {
-		if (!task[0](window.performance.now())) {
+		if (!task[0](now())) {
 			tasks.delete(task);
 			task[1]();
 		}
 	});
 
 	running = tasks.size > 0;
-	if (running) requestAnimationFrame(run_tasks);
+	if (running) raf(run_tasks);
 }
 
 export function clear_loops() {
@@ -19,20 +23,20 @@ export function clear_loops() {
 	running = false;
 }
 
-export function loop(fn) {
+export function loop(fn: (number) => void): Task {
 	let task;
 
 	if (!running) {
 		running = true;
-		requestAnimationFrame(run_tasks);
+		raf(run_tasks);
 	}
 
 	return {
-		promise: new Promise(fulfil => {
+		promise: new Promise<void>(fulfil => {
 			tasks.add(task = [fn, fulfil]);
 		}),
 		abort() {
 			tasks.delete(task);
 		}
 	};
-}
\ No newline at end of file
+}
diff --git a/src/internal/scheduler.js b/src/runtime/internal/scheduler.ts
similarity index 94%
rename from src/internal/scheduler.js
rename to src/runtime/internal/scheduler.ts
index 749c3971dc..a26a4f8c33 100644
--- a/src/internal/scheduler.js
+++ b/src/runtime/internal/scheduler.ts
@@ -1,5 +1,5 @@
-import { run_all } from './utils.js';
-import { set_current_component } from './lifecycle.js';
+import { run_all } from './utils';
+import { set_current_component } from './lifecycle';
 
 export const dirty_components = [];
 export const intros = { enabled: false };
diff --git a/src/internal/spread.js b/src/runtime/internal/spread.ts
similarity index 100%
rename from src/internal/spread.js
rename to src/runtime/internal/spread.ts
diff --git a/src/internal/ssr.js b/src/runtime/internal/ssr.ts
similarity index 94%
rename from src/internal/ssr.js
rename to src/runtime/internal/ssr.ts
index e8d96c609c..c80b4d9f45 100644
--- a/src/internal/ssr.js
+++ b/src/runtime/internal/ssr.ts
@@ -1,5 +1,6 @@
-import { set_current_component, current_component } from './lifecycle.js';
-import { run_all, blank_object } from './utils.js';
+import { set_current_component, current_component } from './lifecycle';
+import { run_all, blank_object } from './utils';
+import { Readable } from 'svelte/store';
 
 export const invalid_attribute_name_character = /[\s'">/=\u{FDD0}-\u{FDEF}\u{FFFE}\u{FFFF}\u{1FFFE}\u{1FFFF}\u{2FFFE}\u{2FFFF}\u{3FFFE}\u{3FFFF}\u{4FFFE}\u{4FFFF}\u{5FFFE}\u{5FFFF}\u{6FFFE}\u{6FFFF}\u{7FFFE}\u{7FFFF}\u{8FFFE}\u{8FFFF}\u{9FFFE}\u{9FFFF}\u{AFFFE}\u{AFFFF}\u{BFFFE}\u{BFFFF}\u{CFFFE}\u{CFFFF}\u{DFFFE}\u{DFFFF}\u{EFFFE}\u{EFFFF}\u{FFFFE}\u{FFFFF}\u{10FFFE}\u{10FFFF}]/u;
 // https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
@@ -113,8 +114,8 @@ export function create_ssr_component(fn) {
 	};
 }
 
-export function get_store_value(store) {
+export function get_store_value<T>(store: Readable<T>): T | undefined {
 	let value;
 	store.subscribe(_ => value = _)();
 	return value;
-}
\ No newline at end of file
+}
diff --git a/src/internal/style_manager.js b/src/runtime/internal/style_manager.ts
similarity index 78%
rename from src/internal/style_manager.js
rename to src/runtime/internal/style_manager.ts
index d71e922f01..2721200627 100644
--- a/src/internal/style_manager.js
+++ b/src/runtime/internal/style_manager.ts
@@ -1,11 +1,12 @@
-import { element } from './dom.js';
+import { element } from './dom';
+import { raf } from './utils';
 
 let stylesheet;
 let active = 0;
 let current_rules = {};
 
 // https://github.com/darkskyapp/string-hash/blob/master/index.js
-function hash(str) {
+function hash(str: string) {
 	let hash = 5381;
 	let i = str.length;
 
@@ -13,7 +14,7 @@ function hash(str) {
 	return hash >>> 0;
 }
 
-export function create_rule(node, a, b, duration, delay, ease, fn, uid = 0) {
+export function create_rule(node: Element & ElementCSSInlineStyle, a: number, b: number, duration: number, delay: number, ease: (t: number) => number, fn: (t: number, u: number) => string, uid: number = 0) {
 	const step = 16.666 / duration;
 	let keyframes = '{\n';
 
@@ -43,7 +44,7 @@ export function create_rule(node, a, b, duration, delay, ease, fn, uid = 0) {
 	return name;
 }
 
-export function delete_rule(node, name) {
+export function delete_rule(node: Element & ElementCSSInlineStyle, name?: string) {
 	node.style.animation = (node.style.animation || '')
 		.split(', ')
 		.filter(name
@@ -56,10 +57,10 @@ export function delete_rule(node, name) {
 }
 
 export function clear_rules() {
-	requestAnimationFrame(() => {
+	raf(() => {
 		if (active) return;
 		let i = stylesheet.cssRules.length;
 		while (i--) stylesheet.deleteRule(i);
 		current_rules = {};
 	});
-}
\ No newline at end of file
+}
diff --git a/src/internal/transitions.js b/src/runtime/internal/transitions.ts
similarity index 79%
rename from src/internal/transitions.js
rename to src/runtime/internal/transitions.ts
index 09064c25cb..c2ac4b78cb 100644
--- a/src/internal/transitions.js
+++ b/src/runtime/internal/transitions.ts
@@ -1,10 +1,11 @@
-import { identity as linear, noop, run_all } from './utils.js';
-import { loop } from './loop.js';
-import { create_rule, delete_rule } from './style_manager.js';
-import { custom_event } from './dom.js';
-import { add_render_callback } from './scheduler.js';
+import { identity as linear, is_function, noop, now, run_all } from './utils';
+import { loop } from './loop';
+import { create_rule, delete_rule } from './style_manager';
+import { custom_event } from './dom';
+import { add_render_callback } from './scheduler';
+import { TransitionConfig } from '../transition';
 
-let promise;
+let promise: Promise<void>|null;
 
 function wait() {
 	if (!promise) {
@@ -17,7 +18,7 @@ function wait() {
 	return promise;
 }
 
-function dispatch(node, direction, kind) {
+function dispatch(node: Element, direction: boolean, kind: 'start' | 'end') {
 	node.dispatchEvent(custom_event(`${direction ? 'intro' : 'outro'}${kind}`));
 }
 
@@ -44,8 +45,9 @@ export function check_outros() {
 export function on_outro(callback) {
 	outros.callbacks.push(callback);
 }
+type TransitionFn = (node: Element, params: any) => TransitionConfig;
 
-export function create_in_transition(node, fn, params) {
+export function create_in_transition(node: Element & ElementCSSInlineStyle, fn: TransitionFn, params: any) {
 	let config = fn(node, params);
 	let running = false;
 	let animation_name;
@@ -68,16 +70,21 @@ export function create_in_transition(node, fn, params) {
 		if (css) animation_name = create_rule(node, 0, 1, duration, delay, easing, css, uid++);
 		tick(0, 1);
 
-		const start_time = window.performance.now() + delay;
+		const start_time = now() + delay;
 		const end_time = start_time + duration;
 
 		if (task) task.abort();
 		running = true;
 
+		add_render_callback(() => dispatch(node, true, 'start'));
+
 		task = loop(now => {
 			if (running) {
 				if (now >= end_time) {
 					tick(1, 0);
+
+					dispatch(node, true, 'end');
+
 					cleanup();
 					return running = false;
 				}
@@ -100,7 +107,7 @@ export function create_in_transition(node, fn, params) {
 
 			delete_rule(node);
 
-			if (typeof config === 'function') {
+			if (is_function(config)) {
 				config = config();
 				wait().then(go);
 			} else {
@@ -121,7 +128,7 @@ export function create_in_transition(node, fn, params) {
 	};
 }
 
-export function create_out_transition(node, fn, params) {
+export function create_out_transition(node: Element & ElementCSSInlineStyle, fn: TransitionFn, params: any) {
 	let config = fn(node, params);
 	let running = true;
 	let animation_name;
@@ -141,14 +148,18 @@ export function create_out_transition(node, fn, params) {
 
 		if (css) animation_name = create_rule(node, 1, 0, duration, delay, easing, css);
 
-		const start_time = window.performance.now() + delay;
+		const start_time = now() + delay;
 		const end_time = start_time + duration;
 
+		add_render_callback(() => dispatch(node, false, 'start'));
+
 		loop(now => {
 			if (running) {
 				if (now >= end_time) {
 					tick(0, 1);
 
+					dispatch(node, false, 'end');
+
 					if (!--group.remaining) {
 						// this will result in `end()` being called,
 						// so we don't need to clean up here
@@ -168,8 +179,9 @@ export function create_out_transition(node, fn, params) {
 		});
 	}
 
-	if (typeof config === 'function') {
+	if (is_function(config)) {
 		wait().then(() => {
+			// @ts-ignore
 			config = config();
 			go();
 		});
@@ -191,7 +203,7 @@ export function create_out_transition(node, fn, params) {
 	};
 }
 
-export function create_bidirectional_transition(node, fn, params, intro) {
+export function create_bidirectional_transition(node: Element & ElementCSSInlineStyle, fn: TransitionFn, params: any, intro: boolean) {
 	let config = fn(node, params);
 
 	let t = intro ? 0 : 1;
@@ -229,11 +241,12 @@ export function create_bidirectional_transition(node, fn, params, intro) {
 		} = config;
 
 		const program = {
-			start: window.performance.now() + delay,
+			start: now() + delay,
 			b
 		};
 
 		if (!b) {
+			// @ts-ignore todo: improve typings
 			program.group = outros;
 			outros.remaining += 1;
 		}
@@ -299,8 +312,9 @@ export function create_bidirectional_transition(node, fn, params, intro) {
 
 	return {
 		run(b) {
-			if (typeof config === 'function') {
+			if (is_function(config)) {
 				wait().then(() => {
+					// @ts-ignore
 					config = config();
 					go(b);
 				});
@@ -314,4 +328,4 @@ export function create_bidirectional_transition(node, fn, params, intro) {
 			running_program = pending_program = null;
 		}
 	};
-}
\ No newline at end of file
+}
diff --git a/src/internal/utils.js b/src/runtime/internal/utils.ts
similarity index 73%
rename from src/internal/utils.js
rename to src/runtime/internal/utils.ts
index 3ae62e375f..7802c69b20 100644
--- a/src/internal/utils.js
+++ b/src/runtime/internal/utils.ts
@@ -2,13 +2,14 @@ export function noop() {}
 
 export const identity = x => x;
 
-export function assign(tar, src) {
+export function assign<T, S>(tar: T, src: S): T & S {
+	// @ts-ignore
 	for (const k in src) tar[k] = src[k];
-	return tar;
+	return tar as T & S;
 }
 
-export function is_promise(value) {
-	return value && typeof value.then === 'function';
+export function is_promise<T = any>(value: any): value is PromiseLike<T> {
+	return value && typeof value === 'object' && typeof value.then === 'function';
 }
 
 export function add_location(element, file, line, column, char) {
@@ -29,7 +30,7 @@ export function run_all(fns) {
 	fns.forEach(run);
 }
 
-export function is_function(thing) {
+export function is_function(thing: any): thing is Function {
 	return typeof thing === 'function';
 }
 
@@ -79,3 +80,20 @@ export function exclude_internal_props(props) {
 	for (const k in props) if (k[0] !== '$') result[k] = props[k];
 	return result;
 }
+
+const is_client = typeof window !== 'undefined';
+
+export let now: () => number = is_client
+	? () => window.performance.now()
+	: () => Date.now();
+
+export let raf = is_client ? requestAnimationFrame : noop;
+
+// used internally for testing
+export function set_now(fn) {
+	now = fn;
+}
+
+export function set_raf(fn) {
+	raf = fn;
+}
diff --git a/src/runtime/motion/index.ts b/src/runtime/motion/index.ts
new file mode 100644
index 0000000000..ea6c646dd9
--- /dev/null
+++ b/src/runtime/motion/index.ts
@@ -0,0 +1,2 @@
+export * from './spring';
+export * from './tweened';
diff --git a/src/motion/spring.js b/src/runtime/motion/spring.ts
similarity index 62%
rename from src/motion/spring.js
rename to src/runtime/motion/spring.ts
index 7c3d287ef8..7742dd4106 100644
--- a/src/motion/spring.js
+++ b/src/runtime/motion/spring.ts
@@ -1,10 +1,19 @@
-import { writable } from 'svelte/store'; // eslint-disable-line import/no-unresolved
-import { loop } from 'svelte/internal'; // eslint-disable-line import/no-unresolved
-import { is_date } from './utils.js';
+import { Readable, writable } from 'svelte/store';
+import { loop, now, Task } from 'svelte/internal';
+import { is_date } from './utils';
+
+interface TickContext<T> {
+	inv_mass: number;
+	dt: number;
+	opts: Spring<T>;
+	settled: boolean;
+}
 
-function tick_spring(ctx, last_value, current_value, target_value) {
+function tick_spring<T>(ctx: TickContext<T>, last_value: T, current_value: T, target_value: T): T {
 	if (typeof current_value === 'number' || is_date(current_value)) {
+		// @ts-ignore
 		const delta = target_value - current_value;
+		// @ts-ignore
 		const velocity = (current_value - last_value) / (ctx.dt||1/60); // guard div by 0
 		const spring = ctx.opts.stiffness * delta;
 		const damper = ctx.opts.damping * velocity;
@@ -15,43 +24,69 @@ function tick_spring(ctx, last_value, current_value, target_value) {
 			return target_value; // settled
 		} else {
 			ctx.settled = false; // signal loop to keep ticking
+			// @ts-ignore
 			return is_date(current_value) ?
 				new Date(current_value.getTime() + d) : current_value + d;
 		}
 	} else if (Array.isArray(current_value)) {
+		// @ts-ignore
 		return current_value.map((_, i) =>
 			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)
+			// @ts-ignore
 			next_value[k] = tick_spring(ctx, last_value[k], current_value[k], target_value[k]);
+		// @ts-ignore
 		return next_value;
 	} else {
-		throw new Error(`Cannot spring ${typeof value} values`);
+		throw new Error(`Cannot spring ${typeof current_value} values`);
 	}
 }
 
-export function spring(value, opts = {}) {
+interface SpringOpts {
+	stiffness?: number;
+	damping?: number;
+	precision?: number;
+}
+
+interface SpringUpdateOpts {
+	hard?: any;
+	soft?: string | number | boolean;
+}
+
+type Updater<T> = (target_value: T, value: T) => T;
+
+interface Spring<T> extends Readable<T>{
+	set: (new_value: T, opts?: SpringUpdateOpts) => Promise<void>;
+	update: (fn: Updater<T>, opts?: SpringUpdateOpts) => Promise<void>;
+	precision: number;
+	damping: number;
+	stiffness: number;
+}
+
+export function spring<T=any>(value: T, opts: SpringOpts = {}): Spring<T> {
 	const store = writable(value);
 	const { stiffness = 0.15, damping = 0.8, precision = 0.01 } = opts;
 
-	let last_time;
-	let task;
-	let current_token;
-	let last_value = value;
-	let target_value = value;
+	let last_time: number;
+	let task: Task;
+	let current_token: object;
+	let last_value: T = value;
+	let target_value: T = value;
 
 	let inv_mass = 1;
 	let inv_mass_recovery_rate = 0;
 	let cancel_task = false;
 
-	function set(new_value, opts = {}) {
+	/* eslint-disable @typescript-eslint/no-use-before-define */
+	function set(new_value: T, opts: SpringUpdateOpts={}): Promise<void> {
 		target_value = new_value;
 		const token = current_token = {};
 
 		if (opts.hard || (spring.stiffness >= 1 && spring.damping >= 1)) {
 			cancel_task = true; // cancel any running animation
-			last_time = window.performance.now();
+			last_time = now();
 			last_value = value;
 			store.set(value = target_value);
 			return new Promise(f => f()); // fulfil immediately
@@ -62,7 +97,7 @@ export function spring(value, opts = {}) {
 		}
 
 		if (!task) {
-			last_time = window.performance.now();
+			last_time = now();
 			cancel_task = false;
 
 			task = loop(now => {
@@ -75,7 +110,7 @@ export function spring(value, opts = {}) {
 
 				inv_mass = Math.min(inv_mass + inv_mass_recovery_rate, 1);
 
-				const ctx = {
+				const ctx: TickContext<T> = {
 					inv_mass,
 					opts: spring,
 					settled: true, // tick_spring may signal false
@@ -99,10 +134,11 @@ export function spring(value, opts = {}) {
 			});
 		});
 	}
+	/* eslint-enable @typescript-eslint/no-use-before-define */
 
-	const spring = {
+	const spring: Spring<T> = {
 		set,
-		update: (fn, opts) => set(fn(target_value, value), opts),
+		update: (fn, opts: SpringUpdateOpts) => set(fn(target_value, value), opts),
 		subscribe: store.subscribe,
 		stiffness,
 		damping,
diff --git a/src/motion/tweened.js b/src/runtime/motion/tweened.ts
similarity index 69%
rename from src/motion/tweened.js
rename to src/runtime/motion/tweened.ts
index a3b5f7331e..7159c17eb5 100644
--- a/src/motion/tweened.js
+++ b/src/runtime/motion/tweened.ts
@@ -1,7 +1,7 @@
-import { writable } from 'svelte/store'; // eslint-disable-line import/no-unresolved
-import { assign, loop } from 'svelte/internal'; // eslint-disable-line import/no-unresolved
-import { linear } from 'svelte/easing'; // eslint-disable-line import/no-unresolved
-import { is_date } from './utils.js';
+import { Readable, writable } from 'svelte/store';
+import { assign, loop, now, Task } from 'svelte/internal';
+import { linear } from 'svelte/easing';
+import { is_date } from './utils';
 
 function get_interpolator(a, b) {
 	if (a === b || a !== a) return () => a;
@@ -54,13 +54,28 @@ function get_interpolator(a, b) {
 	throw new Error(`Cannot interpolate ${type} values`);
 }
 
-export function tweened(value, defaults = {}) {
+interface Options<T> {
+	delay?: number;
+	duration?: number | ((from: T, to: T) => number);
+	easing?: (t: number) => number;
+	interpolate?: (a: T, b: T) => (t: number) => T;
+}
+
+type Updater<T> = (target_value: T, value: T) => T;
+
+interface Tweened<T> extends Readable<T> {
+	set(value: T, opts: Options<T>): Promise<void>;
+
+	update(updater: Updater<T>, opts: Options<T>): Promise<void>;
+}
+
+export function tweened<T>(value: T, defaults: Options<T> = {}): Tweened<T> {
 	const store = writable(value);
 
-	let task;
+	let task: Task;
 	let target_value = value;
 
-	function set(new_value, opts) {
+	function set(new_value: T, opts: Options<T>) {
 		target_value = new_value;
 
 		let previous_task = task;
@@ -73,7 +88,7 @@ export function tweened(value, defaults = {}) {
 			interpolate = get_interpolator
 		} = assign(assign({}, defaults), opts);
 
-		const start = window.performance.now() + delay;
+		const start = now() + delay;
 		let fn;
 
 		task = loop(now => {
@@ -97,6 +112,7 @@ export function tweened(value, defaults = {}) {
 				return false;
 			}
 
+			// @ts-ignore
 			store.set(value = fn(easing(elapsed / duration)));
 			return true;
 		});
@@ -106,7 +122,7 @@ export function tweened(value, defaults = {}) {
 
 	return {
 		set,
-		update: (fn, opts) => set(fn(target_value, value), opts),
+		update: (fn, opts: Options<T>) => set(fn(target_value, value), opts),
 		subscribe: store.subscribe
 	};
-}
\ No newline at end of file
+}
diff --git a/src/motion/utils.js b/src/runtime/motion/utils.ts
similarity index 56%
rename from src/motion/utils.js
rename to src/runtime/motion/utils.ts
index 97a764bf46..2eab8baa2f 100644
--- a/src/motion/utils.js
+++ b/src/runtime/motion/utils.ts
@@ -1,3 +1,3 @@
-export function is_date(obj) {
+export function is_date(obj: any): obj is Date {
 	return Object.prototype.toString.call(obj) === '[object Date]';
-}
\ No newline at end of file
+}
diff --git a/src/runtime/store/index.ts b/src/runtime/store/index.ts
new file mode 100644
index 0000000000..1842124735
--- /dev/null
+++ b/src/runtime/store/index.ts
@@ -0,0 +1,200 @@
+import { run_all, noop, safe_not_equal, is_function } from 'svelte/internal';
+
+/** Callback to inform of a value updates. */
+type Subscriber<T> = (value: T) => void;
+
+/** Unsubscribes from value updates. */
+type Unsubscriber = () => void;
+
+/** Callback to update a value. */
+type Updater<T> = (value: T) => T;
+
+/** Cleanup logic callback. */
+type Invalidator<T> = (value?: T) => void;
+
+/** Start and stop notification callbacks. */
+type StartStopNotifier<T> = (set: Subscriber<T>) => Unsubscriber | void;
+
+/** Readable interface for subscribing. */
+export interface Readable<T> {
+	/**
+	 * Subscribe on value changes.
+	 * @param run subscription callback
+	 * @param invalidate cleanup callback
+	 */
+	subscribe(run: Subscriber<T>, invalidate?: Invalidator<T>): Unsubscriber;
+}
+
+/** Writable interface for both updating and subscribing. */
+export interface Writable<T> extends Readable<T> {
+	/**
+	 * Set value and inform subscribers.
+	 * @param value to set
+	 */
+	set(value: T): void;
+
+	/**
+	 * Update value using callback and inform subscribers.
+	 * @param updater callback
+	 */
+	update(updater: Updater<T>): void;
+}
+
+/** Pair of subscriber and invalidator. */
+type SubscribeInvalidateTuple<T> = [Subscriber<T>, Invalidator<T>];
+
+/**
+ * Creates a `Readable` store that allows reading by subscription.
+ * @param value initial value
+ * @param {StartStopNotifier}start start and stop notifications for subscriptions
+ */
+export function readable<T>(value: T, start: StartStopNotifier<T>): Readable<T> {
+	return {
+		subscribe: writable(value, start).subscribe,
+	};
+}
+
+/**
+ * Create a `Writable` store that allows both updating and reading by subscription.
+ * @param {*=}value initial value
+ * @param {StartStopNotifier=}start start and stop notifications for subscriptions
+ */
+export function writable<T>(value: T, start: StartStopNotifier<T> = noop): Writable<T> {
+	let stop: Unsubscriber;
+	const subscribers: Array<SubscribeInvalidateTuple<T>> = [];
+
+	function set(new_value: T): void {
+		if (safe_not_equal(value, new_value)) {
+			value = new_value;
+			if (!stop) {
+				return; // not ready
+			}
+			subscribers.forEach((s) => s[1]());
+			subscribers.forEach((s) => s[0](value));
+		}
+	}
+
+	function update(fn: Updater<T>): void {
+		set(fn(value));
+	}
+
+	function subscribe(run: Subscriber<T>, invalidate: Invalidator<T> = noop): Unsubscriber {
+		const subscriber: SubscribeInvalidateTuple<T> = [run, invalidate];
+		subscribers.push(subscriber);
+		if (subscribers.length === 1) {
+			stop = start(set) || noop;
+		}
+		run(value);
+
+		return () => {
+			const index = subscribers.indexOf(subscriber);
+			if (index !== -1) {
+				subscribers.splice(index, 1);
+			}
+			if (subscribers.length === 0) {
+				stop();
+			}
+		};
+	}
+
+	return { set, update, subscribe };
+}
+
+/** One or more `Readable`s. */
+type Stores = Readable<any> | [Readable<any>, ...Array<Readable<any>>];
+
+/** One or more values from `Readable` stores. */
+type StoresValues<T> = T extends Readable<infer U> ? U :
+	{ [K in keyof T]: T[K] extends Readable<infer U> ? U : never };
+
+/**
+ * Derived value store by synchronizing one or more readable stores and
+ * applying an aggregation function over its input values.
+ * @param {Stores} stores input stores
+ * @param {function(Stores=, function(*)=):*}fn function callback that aggregates the values
+ * @param {*=}initial_value when used asynchronously
+ */
+export function derived<T, S extends Stores>(
+	stores: S,
+	fn: (values: StoresValues<S>, set?: Subscriber<T>) => T | Unsubscriber | void,
+	initial_value?: T,
+): Readable<T> {
+
+	const single = !Array.isArray(stores);
+	const stores_array: Array<Readable<any>> = single
+		? [stores as Readable<any>]
+		: stores as Array<Readable<any>>;
+
+	const auto = fn.length < 2;
+
+	const invalidators: Array<Invalidator<T>> = [];
+
+	const store = readable(initial_value, (set) => {
+		let inited = false;
+		const values: StoresValues<S> = [] as StoresValues<S>;
+
+		let pending = 0;
+		let cleanup = noop;
+
+		const sync = () => {
+			if (pending) {
+				return;
+			}
+			cleanup();
+			const result = fn(single ? values[0] : values, set);
+			if (auto) {
+				set(result as T);
+			} else {
+				cleanup = is_function(result) ? result as Unsubscriber : noop;
+			}
+		};
+
+		const unsubscribers = stores_array.map((store, i) => store.subscribe(
+			(value) => {
+				values[i] = value;
+				pending &= ~(1 << i);
+				if (inited) {
+					sync();
+				}
+			},
+			() => {
+				run_all(invalidators);
+				pending |= (1 << i);
+			}),
+		);
+
+		inited = true;
+		sync();
+
+		return function stop() {
+			run_all(unsubscribers);
+			cleanup();
+		};
+	});
+
+	return {
+		subscribe(run: Subscriber<T>, invalidate: Invalidator<T> = noop): Unsubscriber {
+			invalidators.push(invalidate);
+
+			const unsubscribe = store.subscribe(run, invalidate);
+
+			return () => {
+				const index = invalidators.indexOf(invalidate);
+				if (index !== -1) {
+					invalidators.splice(index, 1);
+				}
+				unsubscribe();
+			};
+		}
+	};
+}
+
+/**
+ * Get the current value from a store by subscribing and immediately unsubscribing.
+ * @param store readable
+ */
+export function get<T>(store: Readable<T>): T {
+	let value: T | undefined;
+	store.subscribe((_: T) => value = _)();
+	return value as T;
+}
diff --git a/transition.mjs b/src/runtime/transition/index.ts
similarity index 64%
rename from transition.mjs
rename to src/runtime/transition/index.ts
index 857fd03165..3aaa19ef3b 100644
--- a/transition.mjs
+++ b/src/runtime/transition/index.ts
@@ -1,10 +1,23 @@
-import { cubicOut, cubicInOut } from './easing';
-import { assign, is_function } from './internal';
+import { cubicOut, cubicInOut } from 'svelte/easing';
+import { assign, is_function } from 'svelte/internal';
+
+export interface TransitionConfig {
+	delay?: number;
+	duration?: number;
+	easing?: (t: number) => number;
+	css?: (t: number, u: number) => string;
+	tick?: (t: number, u: number) => void;
+}
+
+interface FadeParams {
+	delay: number;
+	duration: number;
+}
 
-export function fade(node, {
+export function fade(node: Element, {
 	delay = 0,
 	duration = 400
-}) {
+}: FadeParams): TransitionConfig {
 	const o = +getComputedStyle(node).opacity;
 
 	return {
@@ -14,14 +27,23 @@ export function fade(node, {
 	};
 }
 
-export function fly(node, {
+interface FlyParams {
+	delay: number;
+	duration: number;
+	easing: (t: number) => number;
+	x: number;
+	y: number;
+	opacity: number;
+}
+
+export function fly(node: Element, {
 	delay = 0,
 	duration = 400,
 	easing = cubicOut,
 	x = 0,
 	y = 0,
 	opacity = 0
-}) {
+}: FlyParams): TransitionConfig {
 	const style = getComputedStyle(node);
 	const target_opacity = +style.opacity;
 	const transform = style.transform === 'none' ? '' : style.transform;
@@ -38,11 +60,17 @@ export function fly(node, {
 	};
 }
 
-export function slide(node, {
+interface SlideParams {
+	delay: number;
+	duration: number;
+	easing: (t: number) => number;
+}
+
+export function slide(node: Element, {
 	delay = 0,
 	duration = 400,
 	easing = cubicOut
-}) {
+}: SlideParams): TransitionConfig {
 	const style = getComputedStyle(node);
 	const opacity = +style.opacity;
 	const height = parseFloat(style.height);
@@ -70,13 +98,21 @@ export function slide(node, {
 	};
 }
 
-export function scale(node, {
+interface ScaleParams {
+	delay: number;
+	duration: number;
+	easing: (t: number) => number;
+	start: number;
+	opacity: number;
+}
+
+export function scale(node: Element, {
 	delay = 0,
 	duration = 400,
 	easing = cubicOut,
 	start = 0,
 	opacity = 0
-}) {
+}: ScaleParams): TransitionConfig {
 	const style = getComputedStyle(node);
 	const target_opacity = +style.opacity;
 	const transform = style.transform === 'none' ? '' : style.transform;
@@ -88,19 +124,26 @@ export function scale(node, {
 		delay,
 		duration,
 		easing,
-		css: (t, u) => `
+		css: (_t, u) => `
 			transform: ${transform} scale(${1 - (sd * u)});
 			opacity: ${target_opacity - (od * u)}
 		`
 	};
 }
 
-export function draw(node, {
+interface DrawParams {
+	delay: number;
+	speed: number;
+	duration: number | ((len: number) => number);
+	easing: (t: number) => number;
+}
+
+export function draw(node: SVGElement & { getTotalLength(): number }, {
 	delay = 0,
 	speed,
 	duration,
 	easing = cubicInOut
-}) {
+}: DrawParams): TransitionConfig {
 	const len = node.getTotalLength();
 
 	if (duration === undefined) {
@@ -121,11 +164,21 @@ export function draw(node, {
 	};
 }
 
-export function crossfade({ fallback, ...defaults }) {
-	const to_receive = new Map();
-	const to_send = new Map();
+interface CrossfadeParams {
+	delay: number;
+	duration: number | ((len: number) => number);
+	easing: (t: number) => number;
+}
+
+type ClientRectMap = Map<any, { rect: ClientRect }>;
 
-	function crossfade(from, node, params) {
+export function crossfade({ fallback, ...defaults }: CrossfadeParams & {
+	fallback: (node: Element, params: CrossfadeParams, intro: boolean) => TransitionConfig;
+}) {
+	const to_receive: ClientRectMap = new Map();
+	const to_send: ClientRectMap = new Map();
+
+	function crossfade(from: ClientRect, node: Element, params: CrossfadeParams): TransitionConfig {
 		const {
 			delay = 0,
 			duration = d => Math.sqrt(d) * 30,
@@ -152,8 +205,8 @@ export function crossfade({ fallback, ...defaults }) {
 		};
 	}
 
-	function transition(items, counterparts, intro) {
-		return (node, params) => {
+	function transition(items: ClientRectMap, counterparts: ClientRectMap, intro: boolean) {
+		return (node: Element, params: CrossfadeParams & { key: any }) => {
 			items.set(params.key, {
 				rect: node.getBoundingClientRect()
 			});
@@ -179,4 +232,4 @@ export function crossfade({ fallback, ...defaults }) {
 		transition(to_send, to_receive, false),
 		transition(to_receive, to_send, true)
 	];
-}
\ No newline at end of file
+}
diff --git a/store.mjs b/store.mjs
deleted file mode 100644
index bc9bc46ed1..0000000000
--- a/store.mjs
+++ /dev/null
@@ -1,81 +0,0 @@
-import { run_all, noop, get_store_value, safe_not_equal } from './internal';
-
-export function readable(value, start) {
-	return {
-		subscribe: writable(value, start).subscribe
-	};
-}
-
-export function writable(value, start = noop) {
-	let stop;
-	const subscribers = [];
-
-	function set(new_value) {
-		if (safe_not_equal(value, new_value)) {
-			value = new_value;
-			if (!stop) return; // not ready
-			subscribers.forEach(s => s[1]());
-			subscribers.forEach(s => s[0](value));
-		}
-	}
-
-	function update(fn) {
-		set(fn(value));
-	}
-
-	function subscribe(run, invalidate = noop) {
-		const subscriber = [run, invalidate];
-		subscribers.push(subscriber);
-		if (subscribers.length === 1) stop = start(set) || noop;
-		run(value);
-
-		return () => {
-			const index = subscribers.indexOf(subscriber);
-			if (index !== -1) subscribers.splice(index, 1);
-			if (subscribers.length === 0) stop();
-		};
-	}
-
-	return { set, update, subscribe };
-}
-
-export function derived(stores, fn, initial_value) {
-	const single = !Array.isArray(stores);
-	if (single) stores = [stores];
-
-	const auto = fn.length < 2;
-	let value = {};
-
-	return readable(initial_value, set => {
-		let inited = false;
-		const values = [];
-
-		let pending = 0;
-
-		const sync = () => {
-			if (pending) return;
-			const result = fn(single ? values[0] : values, set);
-			if (auto) set(result);
-		};
-
-		const unsubscribers = stores.map((store, i) => store.subscribe(
-			value => {
-				values[i] = value;
-				pending &= ~(1 << i);
-				if (inited) sync();
-			},
-			() => {
-				pending |= (1 << i);
-			})
-		);
-
-		inited = true;
-		sync();
-
-		return function stop() {
-			run_all(unsubscribers);
-		};
-	});
-}
-
-export { get_store_value as get };
diff --git a/test/.eslintrc.json b/test/.eslintrc.json
new file mode 100644
index 0000000000..d5ba8f9d9c
--- /dev/null
+++ b/test/.eslintrc.json
@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "no-console": "off"
+  }
+}
diff --git a/test/css/samples/directive-special-character/expected.css b/test/css/samples/directive-special-character/expected.css
new file mode 100644
index 0000000000..8b25d59d2e
--- /dev/null
+++ b/test/css/samples/directive-special-character/expected.css
@@ -0,0 +1 @@
+.foo\:bar.svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/directive-special-character/expected.html b/test/css/samples/directive-special-character/expected.html
new file mode 100644
index 0000000000..40eff4ca21
--- /dev/null
+++ b/test/css/samples/directive-special-character/expected.html
@@ -0,0 +1 @@
+<div class="svelte-xyz foo:bar">Hello world</div>
\ No newline at end of file
diff --git a/test/css/samples/directive-special-character/input.svelte b/test/css/samples/directive-special-character/input.svelte
new file mode 100644
index 0000000000..8f95fe1355
--- /dev/null
+++ b/test/css/samples/directive-special-character/input.svelte
@@ -0,0 +1,11 @@
+<script>
+	const enabled = true;
+</script>
+
+<div class:foo:bar={enabled}>Hello world</div>
+
+<style>
+	.foo\:bar {
+		color: red;
+	}
+</style>
diff --git a/test/custom-elements/index.js b/test/custom-elements/index.js
index 32e95266ec..9255d33c0e 100644
--- a/test/custom-elements/index.js
+++ b/test/custom-elements/index.js
@@ -5,6 +5,7 @@ import { rollup } from 'rollup';
 import * as virtual from 'rollup-plugin-virtual';
 import * as puppeteer from 'puppeteer';
 import { addLineNumbers, loadConfig, loadSvelte } from "../helpers.js";
+import { deepEqual } from 'assert';
 
 const page = `
 <body>
@@ -57,18 +58,20 @@ describe('custom-elements', function() {
 
 		const solo = /\.solo$/.test(dir);
 		const skip = /\.skip$/.test(dir);
-		const internal = path.resolve('internal.mjs');
+		const internal = path.resolve('internal/index.mjs');
 		const index = path.resolve('index.mjs');
+		const warnings = [];
 
 		(solo ? it.only : skip ? it.skip : it)(dir, async () => {
 			const config = loadConfig(`./custom-elements/samples/${dir}/_config.js`);
+			const expected_warnings = config.warnings || [];
 
 			const bundle = await rollup({
 				input: `test/custom-elements/samples/${dir}/test.js`,
 				plugins: [
 					{
 						resolveId(importee) {
-							if (importee === 'svelte/internal') {
+							if (importee === 'svelte/internal' || importee === './internal') {
 								return internal;
 							}
 
@@ -84,6 +87,8 @@ describe('custom-elements', function() {
 									dev: config.dev
 								});
 
+								compiled.warnings.forEach(w => warnings.push(w));
+
 								return compiled.js;
 							}
 						}
@@ -112,6 +117,16 @@ describe('custom-elements', function() {
 			} catch (err) {
 				console.log(addLineNumbers(code));
 				throw err;
+			} finally {
+				if (expected_warnings) {
+					deepEqual(warnings.map(w => ({
+						code: w.code,
+						message: w.message,
+						pos: w.pos,
+						start: w.start,
+						end: w.end
+					})), expected_warnings);
+				}
 			}
 		});
 	});
diff --git a/test/custom-elements/samples/no-svelte-options/_config.js b/test/custom-elements/samples/no-svelte-options/_config.js
new file mode 100644
index 0000000000..e45582a127
--- /dev/null
+++ b/test/custom-elements/samples/no-svelte-options/_config.js
@@ -0,0 +1,17 @@
+export default {
+	warnings: [{
+		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: {
+			character: 0,
+			column: 0,
+			line: 1
+		},
+		end: {
+			character: 0,
+			column: 0,
+			line: 1
+		}
+	}]
+};
diff --git a/test/custom-elements/samples/no-svelte-options/main.svelte b/test/custom-elements/samples/no-svelte-options/main.svelte
new file mode 100644
index 0000000000..538dc970e9
--- /dev/null
+++ b/test/custom-elements/samples/no-svelte-options/main.svelte
@@ -0,0 +1,5 @@
+<script>
+	export let name;
+</script>
+
+<h1>Hello {name}!</h1>
diff --git a/test/custom-elements/samples/no-svelte-options/test.js b/test/custom-elements/samples/no-svelte-options/test.js
new file mode 100644
index 0000000000..c77f035088
--- /dev/null
+++ b/test/custom-elements/samples/no-svelte-options/test.js
@@ -0,0 +1,12 @@
+import * as assert from 'assert';
+import CustomElement from './main.svelte';
+
+export default function (target) {
+	customElements.define('no-tag', CustomElement);
+	target.innerHTML = `<no-tag name="world"></no-tag>`;
+
+	const el = target.querySelector('no-tag');
+	const h1 = el.shadowRoot.querySelector('h1');
+
+	assert.equal(h1.textContent, 'Hello world!');
+}
diff --git a/test/custom-elements/samples/no-tag-warning/_config.js b/test/custom-elements/samples/no-tag-warning/_config.js
new file mode 100644
index 0000000000..7cdfdbaec6
--- /dev/null
+++ b/test/custom-elements/samples/no-tag-warning/_config.js
@@ -0,0 +1,17 @@
+export default {
+	warnings: [{
+		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: {
+			character: 0,
+			column: 0,
+			line: 1
+		},
+		end: {
+			character: 18,
+			column: 18,
+			line: 1
+		}
+	}]
+};
diff --git a/test/custom-elements/samples/no-tag-warning/main.svelte b/test/custom-elements/samples/no-tag-warning/main.svelte
new file mode 100644
index 0000000000..4f7cdc52ca
--- /dev/null
+++ b/test/custom-elements/samples/no-tag-warning/main.svelte
@@ -0,0 +1,7 @@
+<svelte:options />
+
+<script>
+	export let name;
+</script>
+
+<h1>Hello {name}!</h1>
diff --git a/test/custom-elements/samples/no-tag-warning/test.js b/test/custom-elements/samples/no-tag-warning/test.js
new file mode 100644
index 0000000000..c77f035088
--- /dev/null
+++ b/test/custom-elements/samples/no-tag-warning/test.js
@@ -0,0 +1,12 @@
+import * as assert from 'assert';
+import CustomElement from './main.svelte';
+
+export default function (target) {
+	customElements.define('no-tag', CustomElement);
+	target.innerHTML = `<no-tag name="world"></no-tag>`;
+
+	const el = target.querySelector('no-tag');
+	const h1 = el.shadowRoot.querySelector('h1');
+
+	assert.equal(h1.textContent, 'Hello world!');
+}
diff --git a/test/custom-elements/samples/no-tag/_config.js b/test/custom-elements/samples/no-tag/_config.js
new file mode 100644
index 0000000000..c81f1a9f82
--- /dev/null
+++ b/test/custom-elements/samples/no-tag/_config.js
@@ -0,0 +1,3 @@
+export default {
+	warnings: []
+};
diff --git a/test/custom-elements/samples/no-tag/main.svelte b/test/custom-elements/samples/no-tag/main.svelte
new file mode 100644
index 0000000000..031bd93694
--- /dev/null
+++ b/test/custom-elements/samples/no-tag/main.svelte
@@ -0,0 +1,7 @@
+<svelte:options tag={null} />
+
+<script>
+	export let name;
+</script>
+
+<h1>Hello {name}!</h1>
diff --git a/test/custom-elements/samples/no-tag/test.js b/test/custom-elements/samples/no-tag/test.js
new file mode 100644
index 0000000000..c77f035088
--- /dev/null
+++ b/test/custom-elements/samples/no-tag/test.js
@@ -0,0 +1,12 @@
+import * as assert from 'assert';
+import CustomElement from './main.svelte';
+
+export default function (target) {
+	customElements.define('no-tag', CustomElement);
+	target.innerHTML = `<no-tag name="world"></no-tag>`;
+
+	const el = target.querySelector('no-tag');
+	const h1 = el.shadowRoot.querySelector('h1');
+
+	assert.equal(h1.textContent, 'Hello world!');
+}
diff --git a/test/js/samples/bind-open/expected.js b/test/js/samples/bind-open/expected.js
new file mode 100644
index 0000000000..7f739aec8b
--- /dev/null
+++ b/test/js/samples/bind-open/expected.js
@@ -0,0 +1,69 @@
+/* generated by Svelte vX.Y.Z */
+import {
+	SvelteComponent,
+	detach,
+	element,
+	init,
+	insert,
+	listen,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
+
+function create_fragment(ctx) {
+	var details, dispose;
+
+	return {
+		c() {
+			details = element("details");
+			details.innerHTML = `<summary>summary</summary>content
+			`;
+			dispose = listen(details, "toggle", ctx.details_toggle_handler);
+		},
+
+		m(target, anchor) {
+			insert(target, details, anchor);
+
+			details.open = ctx.open;
+		},
+
+		p(changed, ctx) {
+			if (changed.open) details.open = ctx.open;
+		},
+
+		i: noop,
+		o: noop,
+
+		d(detaching) {
+			if (detaching) {
+				detach(details);
+			}
+
+			dispose();
+		}
+	};
+}
+
+function instance($$self, $$props, $$invalidate) {
+	let { open } = $$props;
+
+	function details_toggle_handler() {
+		open = this.open;
+		$$invalidate('open', open);
+	}
+
+	$$self.$set = $$props => {
+		if ('open' in $$props) $$invalidate('open', open = $$props.open);
+	};
+
+	return { open, details_toggle_handler };
+}
+
+class Component extends SvelteComponent {
+	constructor(options) {
+		super();
+		init(this, options, instance, create_fragment, safe_not_equal, ["open"]);
+	}
+}
+
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/bind-open/input.svelte b/test/js/samples/bind-open/input.svelte
new file mode 100644
index 0000000000..3dd2b03a73
--- /dev/null
+++ b/test/js/samples/bind-open/input.svelte
@@ -0,0 +1,7 @@
+<script>
+	export let open;
+</script>
+
+<details bind:open={open}>
+	<summary>summary</summary>content
+</details>
diff --git a/test/js/samples/debug-empty/expected.js b/test/js/samples/debug-empty/expected.js
index 98c2837ab7..6f07993590 100644
--- a/test/js/samples/debug-empty/expected.js
+++ b/test/js/samples/debug-empty/expected.js
@@ -65,6 +65,11 @@ function create_fragment(ctx) {
 function instance($$self, $$props, $$invalidate) {
 	let { name } = $$props;
 
+	const writable_props = ['name'];
+	Object.keys($$props).forEach(key => {
+		if (!writable_props.includes(key) && !key.startsWith('$$')) console.warn(`<Component> was created with unknown prop '${key}'`);
+	});
+
 	$$self.$set = $$props => {
 		if ('name' in $$props) $$invalidate('name', name = $$props.name);
 	};
diff --git a/test/js/samples/debug-foo-bar-baz-things/expected.js b/test/js/samples/debug-foo-bar-baz-things/expected.js
index c1391475b2..eea35d5ba7 100644
--- a/test/js/samples/debug-foo-bar-baz-things/expected.js
+++ b/test/js/samples/debug-foo-bar-baz-things/expected.js
@@ -151,6 +151,11 @@ function create_fragment(ctx) {
 function instance($$self, $$props, $$invalidate) {
 	let { things, foo, bar, baz } = $$props;
 
+	const writable_props = ['things', 'foo', 'bar', 'baz'];
+	Object.keys($$props).forEach(key => {
+		if (!writable_props.includes(key) && !key.startsWith('$$')) console.warn(`<Component> was created with unknown prop '${key}'`);
+	});
+
 	$$self.$set = $$props => {
 		if ('things' in $$props) $$invalidate('things', things = $$props.things);
 		if ('foo' in $$props) $$invalidate('foo', foo = $$props.foo);
diff --git a/test/js/samples/debug-foo/expected.js b/test/js/samples/debug-foo/expected.js
index f5daa7dad7..5b931d9464 100644
--- a/test/js/samples/debug-foo/expected.js
+++ b/test/js/samples/debug-foo/expected.js
@@ -151,6 +151,11 @@ function create_fragment(ctx) {
 function instance($$self, $$props, $$invalidate) {
 	let { things, foo } = $$props;
 
+	const writable_props = ['things', 'foo'];
+	Object.keys($$props).forEach(key => {
+		if (!writable_props.includes(key) && !key.startsWith('$$')) console.warn(`<Component> was created with unknown prop '${key}'`);
+	});
+
 	$$self.$set = $$props => {
 		if ('things' in $$props) $$invalidate('things', things = $$props.things);
 		if ('foo' in $$props) $$invalidate('foo', foo = $$props.foo);
diff --git a/test/js/samples/debug-hoisted/_config.js b/test/js/samples/debug-hoisted/_config.js
new file mode 100644
index 0000000000..414b026a97
--- /dev/null
+++ b/test/js/samples/debug-hoisted/_config.js
@@ -0,0 +1,5 @@
+export default {
+	options: {
+		dev: true
+	}
+};
diff --git a/test/js/samples/debug-hoisted/expected.js b/test/js/samples/debug-hoisted/expected.js
new file mode 100644
index 0000000000..51d8bf63a3
--- /dev/null
+++ b/test/js/samples/debug-hoisted/expected.js
@@ -0,0 +1,56 @@
+/* generated by Svelte vX.Y.Z */
+import {
+	SvelteComponentDev,
+	init,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
+
+const file = undefined;
+
+function create_fragment(ctx) {
+	return {
+		c: function create() {
+			{
+				const { obj } = ctx;
+				console.log({ obj, kobzol });
+				debugger;
+			}
+		},
+
+		l: function claim(nodes) {
+			throw new Error("options.hydrate only works if the component was compiled with the `hydratable: true` option");
+		},
+
+		m: noop,
+
+		p: function update(changed, ctx) {
+			if (changed.obj || changed.kobzol) {
+				const { obj } = ctx;
+				console.log({ obj, kobzol });
+				debugger;
+			}
+		},
+
+		i: noop,
+		o: noop,
+		d: noop
+	};
+}
+
+let kobzol = 5;
+
+function instance($$self) {
+	let obj = { x: 5 };
+
+	return { obj };
+}
+
+class Component extends SvelteComponentDev {
+	constructor(options) {
+		super(options);
+		init(this, options, instance, create_fragment, safe_not_equal, []);
+	}
+}
+
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/debug-hoisted/input.svelte b/test/js/samples/debug-hoisted/input.svelte
new file mode 100644
index 0000000000..94d584ccac
--- /dev/null
+++ b/test/js/samples/debug-hoisted/input.svelte
@@ -0,0 +1,6 @@
+<script>
+	let obj = { x: 5 };
+	let kobzol = 5;
+</script>
+
+{@debug obj, kobzol}
diff --git a/test/js/samples/dev-warning-missing-data-computed/expected.js b/test/js/samples/dev-warning-missing-data-computed/expected.js
index 12e8a983d0..5c4b2ece1b 100644
--- a/test/js/samples/dev-warning-missing-data-computed/expected.js
+++ b/test/js/samples/dev-warning-missing-data-computed/expected.js
@@ -65,6 +65,11 @@ function instance($$self, $$props, $$invalidate) {
 
 	let bar;
 
+	const writable_props = ['foo'];
+	Object.keys($$props).forEach(key => {
+		if (!writable_props.includes(key) && !key.startsWith('$$')) console.warn(`<Component> was created with unknown prop '${key}'`);
+	});
+
 	$$self.$set = $$props => {
 		if ('foo' in $$props) $$invalidate('foo', foo = $$props.foo);
 	};
diff --git a/test/js/samples/each-block-keyed-animated/expected.js b/test/js/samples/each-block-keyed-animated/expected.js
index d18c569fa1..ec28e60d5f 100644
--- a/test/js/samples/each-block-keyed-animated/expected.js
+++ b/test/js/samples/each-block-keyed-animated/expected.js
@@ -6,7 +6,7 @@ import {
 	detach,
 	element,
 	empty,
-	fix_and_outro_and_destroy_block,
+	fix_and_destroy_block,
 	fix_position,
 	init,
 	insert,
@@ -100,7 +100,7 @@ function create_fragment(ctx) {
 		p(changed, ctx) {
 			const each_value = ctx.things;
 			for (let i = 0; i < each_blocks.length; i += 1) each_blocks[i].r();
-			each_blocks = update_keyed_each(each_blocks, changed, get_key, 1, ctx, each_value, each_1_lookup, each_1_anchor.parentNode, fix_and_outro_and_destroy_block, create_each_block, each_1_anchor, get_each_context);
+			each_blocks = update_keyed_each(each_blocks, changed, get_key, 1, ctx, each_value, each_1_lookup, each_1_anchor.parentNode, fix_and_destroy_block, create_each_block, each_1_anchor, get_each_context);
 			for (let i = 0; i < each_blocks.length; i += 1) each_blocks[i].a();
 		},
 
diff --git a/test/js/samples/media-bindings/expected.js b/test/js/samples/media-bindings/expected.js
index 8a193f698b..f45f9ce8db 100644
--- a/test/js/samples/media-bindings/expected.js
+++ b/test/js/samples/media-bindings/expected.js
@@ -8,6 +8,7 @@ import {
 	insert,
 	listen,
 	noop,
+	raf,
 	run_all,
 	safe_not_equal,
 	time_ranges_to_array
@@ -18,7 +19,7 @@ function create_fragment(ctx) {
 
 	function audio_timeupdate_handler() {
 		cancelAnimationFrame(audio_animationframe);
-		if (!audio.paused) audio_animationframe = requestAnimationFrame(audio_timeupdate_handler);
+		if (!audio.paused) audio_animationframe = raf(audio_timeupdate_handler);
 		audio_updating = true;
 		ctx.audio_timeupdate_handler.call(audio);
 	}
diff --git a/test/js/samples/reactive-values-non-topologically-ordered/expected.js b/test/js/samples/reactive-values-non-topologically-ordered/expected.js
index 2f729362b0..b5e2b04f75 100644
--- a/test/js/samples/reactive-values-non-topologically-ordered/expected.js
+++ b/test/js/samples/reactive-values-non-topologically-ordered/expected.js
@@ -29,7 +29,7 @@ function instance($$self, $$props, $$invalidate) {
 
 	$$self.$$.update = ($$dirty = { x: 1, b: 1 }) => {
 		if ($$dirty.x) { $$invalidate('b', b = x); }
-		if ($$dirty.b) { $$invalidate('a', a = b); }
+		if ($$dirty.b) { a = b; }
 	};
 
 	return { x };
diff --git a/test/js/samples/reactive-values-non-writable-dependencies/expected.js b/test/js/samples/reactive-values-non-writable-dependencies/expected.js
index 62057cc6f0..8958f1ffbc 100644
--- a/test/js/samples/reactive-values-non-writable-dependencies/expected.js
+++ b/test/js/samples/reactive-values-non-writable-dependencies/expected.js
@@ -17,26 +17,25 @@ function create_fragment(ctx) {
 	};
 }
 
-let a = 1;
-
-let b = 2;
-
 function instance($$self, $$props, $$invalidate) {
-	
+	let { a = 1, b = 2 } = $$props;
 
-	let max;
+	$$self.$set = $$props => {
+		if ('a' in $$props) $$invalidate('a', a = $$props.a);
+		if ('b' in $$props) $$invalidate('b', b = $$props.b);
+	};
 
 	$$self.$$.update = ($$dirty = { a: 1, b: 1 }) => {
-		if ($$dirty.a || $$dirty.b) { $$invalidate('max', max = Math.max(a, b)); }
+		if ($$dirty.a || $$dirty.b) { console.log('max', Math.max(a, b)); }
 	};
 
-	return {};
+	return { a, b };
 }
 
 class Component extends SvelteComponent {
 	constructor(options) {
 		super();
-		init(this, options, instance, create_fragment, safe_not_equal, []);
+		init(this, options, instance, create_fragment, safe_not_equal, ["a", "b"]);
 	}
 }
 
diff --git a/test/js/samples/reactive-values-non-writable-dependencies/input.svelte b/test/js/samples/reactive-values-non-writable-dependencies/input.svelte
index 8e3397e40d..3fb70d5e8f 100644
--- a/test/js/samples/reactive-values-non-writable-dependencies/input.svelte
+++ b/test/js/samples/reactive-values-non-writable-dependencies/input.svelte
@@ -1,7 +1,6 @@
 <script>
-	let a = 1;
-	let b = 2;
+	export let a = 1;
+	export let b = 2;
 
-	let max;
-	$: max = Math.max(a, b);
+	$: console.log('max', Math.max(a, b));
 </script>
\ No newline at end of file
diff --git a/test/js/samples/unreferenced-state-not-invalidated/expected.js b/test/js/samples/unreferenced-state-not-invalidated/expected.js
new file mode 100644
index 0000000000..17b5638a84
--- /dev/null
+++ b/test/js/samples/unreferenced-state-not-invalidated/expected.js
@@ -0,0 +1,78 @@
+/* generated by Svelte vX.Y.Z */
+import {
+	SvelteComponent,
+	append,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	set_data,
+	text
+} from "svelte/internal";
+import { onMount } from "svelte";
+
+function create_fragment(ctx) {
+	var p, t;
+
+	return {
+		c() {
+			p = element("p");
+			t = text(ctx.y);
+		},
+
+		m(target, anchor) {
+			insert(target, p, anchor);
+			append(p, t);
+		},
+
+		p(changed, ctx) {
+			if (changed.y) {
+				set_data(t, ctx.y);
+			}
+		},
+
+		i: noop,
+		o: noop,
+
+		d(detaching) {
+			if (detaching) {
+				detach(p);
+			}
+		}
+	};
+}
+
+function instance($$self, $$props, $$invalidate) {
+	let a, b, c;
+
+	onMount(() => {
+		const interval = setInterval(() => {
+			$$invalidate('b', b += 1);
+			c += 1;
+
+			console.log(b, c);
+		}, 1000);
+
+		return () => clearInterval(interval);
+	});
+
+	let x, y;
+
+	$$self.$$.update = ($$dirty = { a: 1, b: 1 }) => {
+		if ($$dirty.a) { x = a * 2; }
+		if ($$dirty.b) { $$invalidate('y', y = b * 2); }
+	};
+
+	return { y };
+}
+
+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/unreferenced-state-not-invalidated/input.svelte b/test/js/samples/unreferenced-state-not-invalidated/input.svelte
new file mode 100644
index 0000000000..fff60f181d
--- /dev/null
+++ b/test/js/samples/unreferenced-state-not-invalidated/input.svelte
@@ -0,0 +1,21 @@
+<script>
+	import { onMount } from 'svelte';
+
+	let a, b, c;
+
+	onMount(() => {
+		const interval = setInterval(() => {
+			b += 1;
+			c += 1;
+
+			console.log(b, c);
+		}, 1000);
+
+		return () => clearInterval(interval);
+	});
+
+	$: x = a * 2;
+	$: y = b * 2;
+</script>
+
+<p>{y}</p>
\ No newline at end of file
diff --git a/test/parser/samples/action-with-call/output.json b/test/parser/samples/action-with-call/output.json
index d6aaa72892..e910f0b49f 100644
--- a/test/parser/samples/action-with-call/output.json
+++ b/test/parser/samples/action-with-call/output.json
@@ -41,8 +41,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/action-with-identifier/output.json b/test/parser/samples/action-with-identifier/output.json
index d58b9097b7..435aee4444 100644
--- a/test/parser/samples/action-with-identifier/output.json
+++ b/test/parser/samples/action-with-identifier/output.json
@@ -27,8 +27,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/action-with-literal/output.json b/test/parser/samples/action-with-literal/output.json
index 4a6f596d10..01a6b67549 100644
--- a/test/parser/samples/action-with-literal/output.json
+++ b/test/parser/samples/action-with-literal/output.json
@@ -28,8 +28,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/action/output.json b/test/parser/samples/action/output.json
index 2f553b5efa..9828e200dd 100644
--- a/test/parser/samples/action/output.json
+++ b/test/parser/samples/action/output.json
@@ -22,8 +22,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/animation/output.json b/test/parser/samples/animation/output.json
index 8332b3ad04..f4d183eb5c 100644
--- a/test/parser/samples/animation/output.json
+++ b/test/parser/samples/animation/output.json
@@ -35,6 +35,7 @@
 								"start": 51,
 								"end": 56,
 								"type": "Text",
+								"raw": "flips",
 								"data": "flips"
 							}
 						]
@@ -54,8 +55,5 @@
 				}
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-containing-solidus/output.json b/test/parser/samples/attribute-containing-solidus/output.json
index 95372bd77d..f1158b4f50 100644
--- a/test/parser/samples/attribute-containing-solidus/output.json
+++ b/test/parser/samples/attribute-containing-solidus/output.json
@@ -20,6 +20,7 @@
 								"start": 8,
 								"end": 30,
 								"type": "Text",
+								"raw": "https://www.google.com",
 								"data": "https://www.google.com"
 							}
 						]
@@ -30,13 +31,11 @@
 						"start": 31,
 						"end": 37,
 						"type": "Text",
+						"raw": "Google",
 						"data": "Google"
 					}
 				]
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic-boolean/output.json b/test/parser/samples/attribute-dynamic-boolean/output.json
index 81a19f49b9..478144152a 100644
--- a/test/parser/samples/attribute-dynamic-boolean/output.json
+++ b/test/parser/samples/attribute-dynamic-boolean/output.json
@@ -33,8 +33,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic-reserved/output.json b/test/parser/samples/attribute-dynamic-reserved/output.json
index 3a830d448f..22be3c9087 100644
--- a/test/parser/samples/attribute-dynamic-reserved/output.json
+++ b/test/parser/samples/attribute-dynamic-reserved/output.json
@@ -33,8 +33,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic/output.json b/test/parser/samples/attribute-dynamic/output.json
index 50d8ec60a5..a48f376876 100644
--- a/test/parser/samples/attribute-dynamic/output.json
+++ b/test/parser/samples/attribute-dynamic/output.json
@@ -18,8 +18,9 @@
 						"value": [
 							{
 								"start": 12,
-								"end": 19,
+								"end": 20,
 								"type": "Text",
+								"raw": "color: ",
 								"data": "color: "
 							},
 							{
@@ -37,6 +38,7 @@
 								"start": 26,
 								"end": 27,
 								"type": "Text",
+								"raw": ";",
 								"data": ";"
 							}
 						]
@@ -57,8 +59,5 @@
 				]
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-escaped/output.json b/test/parser/samples/attribute-escaped/output.json
index 6a4143e674..e60a8c2531 100644
--- a/test/parser/samples/attribute-escaped/output.json
+++ b/test/parser/samples/attribute-escaped/output.json
@@ -20,6 +20,7 @@
 								"start": 15,
 								"end": 33,
 								"type": "Text",
+								"raw": "&quot;quoted&quot;",
 								"data": "\"quoted\""
 							}
 						]
@@ -28,8 +29,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-multiple/output.json b/test/parser/samples/attribute-multiple/output.json
index 668409c0ef..c4be13e6ee 100644
--- a/test/parser/samples/attribute-multiple/output.json
+++ b/test/parser/samples/attribute-multiple/output.json
@@ -20,6 +20,7 @@
 								"start": 9,
 								"end": 10,
 								"type": "Text",
+								"raw": "x",
 								"data": "x"
 							}
 						]
@@ -34,6 +35,7 @@
 								"start": 19,
 								"end": 20,
 								"type": "Text",
+								"raw": "y",
 								"data": "y"
 							}
 						]
@@ -42,8 +44,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-shorthand/output.json b/test/parser/samples/attribute-shorthand/output.json
index 08ddf5eda9..f23e62b04e 100644
--- a/test/parser/samples/attribute-shorthand/output.json
+++ b/test/parser/samples/attribute-shorthand/output.json
@@ -33,8 +33,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-static-boolean/output.json b/test/parser/samples/attribute-static-boolean/output.json
index f63b5734e0..7d635004c1 100644
--- a/test/parser/samples/attribute-static-boolean/output.json
+++ b/test/parser/samples/attribute-static-boolean/output.json
@@ -21,8 +21,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-static/output.json b/test/parser/samples/attribute-static/output.json
index 3185e48736..37b41d9a89 100644
--- a/test/parser/samples/attribute-static/output.json
+++ b/test/parser/samples/attribute-static/output.json
@@ -20,6 +20,7 @@
 								"start": 12,
 								"end": 15,
 								"type": "Text",
+								"raw": "foo",
 								"data": "foo"
 							}
 						]
@@ -28,8 +29,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-unquoted/output.json b/test/parser/samples/attribute-unquoted/output.json
index c7556f2eba..11fa397819 100644
--- a/test/parser/samples/attribute-unquoted/output.json
+++ b/test/parser/samples/attribute-unquoted/output.json
@@ -20,6 +20,7 @@
 								"start": 11,
 								"end": 14,
 								"type": "Text",
+								"raw": "foo",
 								"data": "foo"
 							}
 						]
@@ -28,8 +29,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/await-then-catch/output.json b/test/parser/samples/await-then-catch/output.json
index f62ad16574..ac598a403a 100644
--- a/test/parser/samples/await-then-catch/output.json
+++ b/test/parser/samples/await-then-catch/output.json
@@ -19,13 +19,13 @@
 				"pending": {
 					"start": 19,
 					"end": 39,
-					"skip": false,
 					"type": "PendingBlock",
 					"children": [
 						{
 							"start": 19,
 							"end": 21,
 							"type": "Text",
+							"raw": "\n\t",
 							"data": "\n\t"
 						},
 						{
@@ -39,6 +39,7 @@
 									"start": 24,
 									"end": 34,
 									"type": "Text",
+									"raw": "loading...",
 									"data": "loading..."
 								}
 							]
@@ -47,20 +48,22 @@
 							"start": 38,
 							"end": 39,
 							"type": "Text",
+							"raw": "\n",
 							"data": "\n"
 						}
-					]
+					],
+					"skip": false
 				},
 				"then": {
 					"start": 39,
 					"end": 88,
-					"skip": false,
 					"type": "ThenBlock",
 					"children": [
 						{
 							"start": 55,
 							"end": 57,
 							"type": "Text",
+							"raw": "\n\t",
 							"data": "\n\t"
 						},
 						{
@@ -74,6 +77,7 @@
 									"start": 60,
 									"end": 73,
 									"type": "Text",
+									"raw": "the value is ",
 									"data": "the value is "
 								},
 								{
@@ -93,20 +97,22 @@
 							"start": 87,
 							"end": 88,
 							"type": "Text",
+							"raw": "\n",
 							"data": "\n"
 						}
-					]
+					],
+					"skip": false
 				},
 				"catch": {
 					"start": 88,
 					"end": 140,
-					"skip": false,
 					"type": "CatchBlock",
 					"children": [
 						{
 							"start": 105,
 							"end": 107,
 							"type": "Text",
+							"raw": "\n\t",
 							"data": "\n\t"
 						},
 						{
@@ -120,6 +126,7 @@
 									"start": 110,
 									"end": 117,
 									"type": "Text",
+									"raw": "oh no! ",
 									"data": "oh no! "
 								},
 								{
@@ -151,14 +158,13 @@
 							"start": 139,
 							"end": 140,
 							"type": "Text",
+							"raw": "\n",
 							"data": "\n"
 						}
-					]
+					],
+					"skip": false
 				}
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
-}
+	}
+}
\ No newline at end of file
diff --git a/test/parser/samples/binding-shorthand/output.json b/test/parser/samples/binding-shorthand/output.json
index 8f92101042..7fe7acb5b3 100644
--- a/test/parser/samples/binding-shorthand/output.json
+++ b/test/parser/samples/binding-shorthand/output.json
@@ -8,6 +8,7 @@
 				"start": 28,
 				"end": 30,
 				"type": "Text",
+				"raw": "\n\n",
 				"data": "\n\n"
 			},
 			{
diff --git a/test/parser/samples/binding/output.json b/test/parser/samples/binding/output.json
index d084050617..72ad60202c 100644
--- a/test/parser/samples/binding/output.json
+++ b/test/parser/samples/binding/output.json
@@ -8,6 +8,7 @@
 				"start": 29,
 				"end": 31,
 				"type": "Text",
+				"raw": "\n\n",
 				"data": "\n\n"
 			},
 			{
diff --git a/test/parser/samples/comment/output.json b/test/parser/samples/comment/output.json
index 89295c188a..2a57c4fa5d 100644
--- a/test/parser/samples/comment/output.json
+++ b/test/parser/samples/comment/output.json
@@ -11,8 +11,5 @@
 				"data": " a comment "
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/component-dynamic/output.json b/test/parser/samples/component-dynamic/output.json
index c2e4e3ee79..77837d1ca9 100644
--- a/test/parser/samples/component-dynamic/output.json
+++ b/test/parser/samples/component-dynamic/output.json
@@ -36,8 +36,5 @@
 				}
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/convert-entities-in-element/output.json b/test/parser/samples/convert-entities-in-element/output.json
index fb0f5b288e..c830c276de 100644
--- a/test/parser/samples/convert-entities-in-element/output.json
+++ b/test/parser/samples/convert-entities-in-element/output.json
@@ -15,13 +15,11 @@
 						"start": 3,
 						"end": 20,
 						"type": "Text",
+						"raw": "Hello &amp; World",
 						"data": "Hello & World"
 					}
 				]
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/convert-entities/output.json b/test/parser/samples/convert-entities/output.json
index ca1c1356f8..f4cc1a6662 100644
--- a/test/parser/samples/convert-entities/output.json
+++ b/test/parser/samples/convert-entities/output.json
@@ -8,11 +8,9 @@
 				"start": 0,
 				"end": 17,
 				"type": "Text",
+				"raw": "Hello &amp; World",
 				"data": "Hello & World"
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/css/output.json b/test/parser/samples/css/output.json
index 3127e01c71..12d74ae7f8 100644
--- a/test/parser/samples/css/output.json
+++ b/test/parser/samples/css/output.json
@@ -15,6 +15,7 @@
 						"start": 5,
 						"end": 8,
 						"type": "Text",
+						"raw": "foo",
 						"data": "foo"
 					}
 				]
@@ -23,6 +24,7 @@
 				"start": 14,
 				"end": 16,
 				"type": "Text",
+				"raw": "\n\n",
 				"data": "\n\n"
 			}
 		]
@@ -90,7 +92,5 @@
 			"end": 48,
 			"styles": "\n\tdiv {\n\t\tcolor: red;\n\t}\n"
 		}
-	},
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/dynamic-import/output.json b/test/parser/samples/dynamic-import/output.json
index c0d4a45e0d..fa1acf7d9b 100644
--- a/test/parser/samples/dynamic-import/output.json
+++ b/test/parser/samples/dynamic-import/output.json
@@ -5,7 +5,6 @@
 		"type": "Fragment",
 		"children": []
 	},
-	"css": null,
 	"instance": {
 		"start": 0,
 		"end": 146,
@@ -66,8 +65,8 @@
 								"start": 54,
 								"end": 134,
 								"id": null,
-								"generator": false,
 								"expression": false,
+								"generator": false,
 								"async": false,
 								"params": [],
 								"body": {
@@ -120,8 +119,8 @@
 														"start": 88,
 														"end": 129,
 														"id": null,
-														"generator": false,
 														"expression": false,
+														"generator": false,
 														"async": false,
 														"params": [
 															{
diff --git a/test/parser/samples/each-block-destructured/output.json b/test/parser/samples/each-block-destructured/output.json
index 0c4b1a5c54..6368b445d6 100644
--- a/test/parser/samples/each-block-destructured/output.json
+++ b/test/parser/samples/each-block-destructured/output.json
@@ -37,6 +37,7 @@
 								"start": 50,
 								"end": 52,
 								"type": "Text",
+								"raw": ": ",
 								"data": ": "
 							},
 							{
@@ -80,8 +81,5 @@
 				}
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
-}
+	}
+}
\ No newline at end of file
diff --git a/test/parser/samples/each-block-else/output.json b/test/parser/samples/each-block-else/output.json
index aefc8c2f39..1e8ac455e6 100644
--- a/test/parser/samples/each-block-else/output.json
+++ b/test/parser/samples/each-block-else/output.json
@@ -58,6 +58,7 @@
 									"start": 55,
 									"end": 65,
 									"type": "Text",
+									"raw": "no animals",
 									"data": "no animals"
 								}
 							]
@@ -66,8 +67,5 @@
 				}
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/each-block-indexed/output.json b/test/parser/samples/each-block-indexed/output.json
index 7518652468..77417ba67a 100644
--- a/test/parser/samples/each-block-indexed/output.json
+++ b/test/parser/samples/each-block-indexed/output.json
@@ -37,6 +37,7 @@
 								"start": 36,
 								"end": 38,
 								"type": "Text",
+								"raw": ": ",
 								"data": ": "
 							},
 							{
@@ -62,8 +63,5 @@
 				"index": "i"
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/each-block-keyed/output.json b/test/parser/samples/each-block-keyed/output.json
index fe893bcdb9..11cdd45ff1 100644
--- a/test/parser/samples/each-block-keyed/output.json
+++ b/test/parser/samples/each-block-keyed/output.json
@@ -62,8 +62,5 @@
 				}
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/each-block/output.json b/test/parser/samples/each-block/output.json
index c16a71ad5d..6a60823952 100644
--- a/test/parser/samples/each-block/output.json
+++ b/test/parser/samples/each-block/output.json
@@ -44,8 +44,5 @@
 				}
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/element-with-mustache/output.json b/test/parser/samples/element-with-mustache/output.json
index c8a386d681..f7c2e9936b 100644
--- a/test/parser/samples/element-with-mustache/output.json
+++ b/test/parser/samples/element-with-mustache/output.json
@@ -15,6 +15,7 @@
 						"start": 4,
 						"end": 10,
 						"type": "Text",
+						"raw": "hello ",
 						"data": "hello "
 					},
 					{
@@ -32,13 +33,11 @@
 						"start": 16,
 						"end": 17,
 						"type": "Text",
+						"raw": "!",
 						"data": "!"
 					}
 				]
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/element-with-text/output.json b/test/parser/samples/element-with-text/output.json
index 70f6163c93..b0e0f5c6cc 100644
--- a/test/parser/samples/element-with-text/output.json
+++ b/test/parser/samples/element-with-text/output.json
@@ -15,13 +15,11 @@
 						"start": 6,
 						"end": 10,
 						"type": "Text",
+						"raw": "test",
 						"data": "test"
 					}
 				]
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/elements/output.json b/test/parser/samples/elements/output.json
index d216f7f5d8..75548c20f0 100644
--- a/test/parser/samples/elements/output.json
+++ b/test/parser/samples/elements/output.json
@@ -21,8 +21,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/event-handler/output.json b/test/parser/samples/event-handler/output.json
index b1fe89fc2a..f792ffadcc 100644
--- a/test/parser/samples/event-handler/output.json
+++ b/test/parser/samples/event-handler/output.json
@@ -21,8 +21,8 @@
 							"start": 19,
 							"end": 43,
 							"id": null,
-							"generator": false,
 							"expression": true,
+							"generator": false,
 							"async": false,
 							"params": [],
 							"body": {
@@ -58,6 +58,7 @@
 						"start": 46,
 						"end": 52,
 						"type": "Text",
+						"raw": "toggle",
 						"data": "toggle"
 					}
 				]
@@ -66,6 +67,7 @@
 				"start": 61,
 				"end": 63,
 				"type": "Text",
+				"raw": "\n\n",
 				"data": "\n\n"
 			},
 			{
@@ -90,6 +92,7 @@
 								"start": 81,
 								"end": 87,
 								"type": "Text",
+								"raw": "hello!",
 								"data": "hello!"
 							}
 						]
@@ -97,8 +100,5 @@
 				]
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/if-block-else/output.json b/test/parser/samples/if-block-else/output.json
index dedf2797c4..8b22cfa26b 100644
--- a/test/parser/samples/if-block-else/output.json
+++ b/test/parser/samples/if-block-else/output.json
@@ -26,6 +26,7 @@
 								"start": 14,
 								"end": 17,
 								"type": "Text",
+								"raw": "foo",
 								"data": "foo"
 							}
 						]
@@ -47,6 +48,7 @@
 									"start": 34,
 									"end": 41,
 									"type": "Text",
+									"raw": "not foo",
 									"data": "not foo"
 								}
 							]
@@ -55,8 +57,5 @@
 				}
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/if-block-elseif/output.json b/test/parser/samples/if-block-elseif/output.json
index 188b57aaad..54fb53dacb 100644
--- a/test/parser/samples/if-block-elseif/output.json
+++ b/test/parser/samples/if-block-elseif/output.json
@@ -39,6 +39,7 @@
 								"start": 17,
 								"end": 37,
 								"type": "Text",
+								"raw": "x is greater than 10",
 								"data": "x is greater than 10"
 							}
 						]
@@ -85,6 +86,7 @@
 											"start": 63,
 											"end": 79,
 											"type": "Text",
+											"raw": "x is less than 5",
 											"data": "x is less than 5"
 										}
 									]
diff --git a/test/parser/samples/if-block/output.json b/test/parser/samples/if-block/output.json
index d560824766..1714bb7141 100644
--- a/test/parser/samples/if-block/output.json
+++ b/test/parser/samples/if-block/output.json
@@ -19,13 +19,11 @@
 						"start": 9,
 						"end": 12,
 						"type": "Text",
+						"raw": "bar",
 						"data": "bar"
 					}
 				]
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/implicitly-closed-li/output.json b/test/parser/samples/implicitly-closed-li/output.json
index caf69d7109..f46a2b1a26 100644
--- a/test/parser/samples/implicitly-closed-li/output.json
+++ b/test/parser/samples/implicitly-closed-li/output.json
@@ -15,6 +15,7 @@
 						"start": 4,
 						"end": 6,
 						"type": "Text",
+						"raw": "\n\t",
 						"data": "\n\t"
 					},
 					{
@@ -28,6 +29,7 @@
 								"start": 10,
 								"end": 13,
 								"type": "Text",
+								"raw": "a\n\t",
 								"data": "a\n\t"
 							}
 						]
@@ -43,6 +45,7 @@
 								"start": 17,
 								"end": 20,
 								"type": "Text",
+								"raw": "b\n\t",
 								"data": "b\n\t"
 							}
 						]
@@ -58,6 +61,7 @@
 								"start": 24,
 								"end": 26,
 								"type": "Text",
+								"raw": "c\n",
 								"data": "c\n"
 							}
 						]
@@ -65,8 +69,5 @@
 				]
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/nbsp/output.json b/test/parser/samples/nbsp/output.json
index 4fa318ce48..044de64cba 100644
--- a/test/parser/samples/nbsp/output.json
+++ b/test/parser/samples/nbsp/output.json
@@ -15,13 +15,11 @@
 						"start": 6,
 						"end": 12,
 						"type": "Text",
+						"raw": "&nbsp;",
 						"data": " "
 					}
 				]
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/raw-mustaches/output.json b/test/parser/samples/raw-mustaches/output.json
index 1d92b21c85..1b3d9b7a9c 100644
--- a/test/parser/samples/raw-mustaches/output.json
+++ b/test/parser/samples/raw-mustaches/output.json
@@ -15,6 +15,7 @@
 						"start": 3,
 						"end": 4,
 						"type": "Text",
+						"raw": " ",
 						"data": " "
 					},
 					{
@@ -32,6 +33,7 @@
 						"start": 16,
 						"end": 17,
 						"type": "Text",
+						"raw": " ",
 						"data": " "
 					},
 					{
@@ -49,13 +51,11 @@
 						"start": 29,
 						"end": 30,
 						"type": "Text",
+						"raw": " ",
 						"data": " "
 					}
 				]
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/refs/output.json b/test/parser/samples/refs/output.json
index d15753b0a2..e09383f9b6 100644
--- a/test/parser/samples/refs/output.json
+++ b/test/parser/samples/refs/output.json
@@ -8,6 +8,7 @@
 				"start": 28,
 				"end": 30,
 				"type": "Text",
+				"raw": "\n\n",
 				"data": "\n\n"
 			},
 			{
diff --git a/test/parser/samples/script-comment-only/output.json b/test/parser/samples/script-comment-only/output.json
index 95ca769b20..ba28434318 100644
--- a/test/parser/samples/script-comment-only/output.json
+++ b/test/parser/samples/script-comment-only/output.json
@@ -8,6 +8,7 @@
 				"start": 43,
 				"end": 45,
 				"type": "Text",
+				"raw": "\n\n",
 				"data": "\n\n"
 			},
 			{
diff --git a/test/parser/samples/script-comment-trailing-multiline/output.json b/test/parser/samples/script-comment-trailing-multiline/output.json
index d4a45911a1..7d01599efa 100644
--- a/test/parser/samples/script-comment-trailing-multiline/output.json
+++ b/test/parser/samples/script-comment-trailing-multiline/output.json
@@ -8,6 +8,7 @@
 				"start": 77,
 				"end": 79,
 				"type": "Text",
+				"raw": "\n\n",
 				"data": "\n\n"
 			},
 			{
@@ -21,6 +22,7 @@
 						"start": 83,
 						"end": 89,
 						"type": "Text",
+						"raw": "Hello ",
 						"data": "Hello "
 					},
 					{
@@ -38,6 +40,7 @@
 						"start": 95,
 						"end": 96,
 						"type": "Text",
+						"raw": "!",
 						"data": "!"
 					}
 				]
diff --git a/test/parser/samples/script-comment-trailing/output.json b/test/parser/samples/script-comment-trailing/output.json
index 92d431b558..bc8f3e4e67 100644
--- a/test/parser/samples/script-comment-trailing/output.json
+++ b/test/parser/samples/script-comment-trailing/output.json
@@ -8,6 +8,7 @@
 				"start": 66,
 				"end": 68,
 				"type": "Text",
+				"raw": "\n\n",
 				"data": "\n\n"
 			},
 			{
@@ -21,6 +22,7 @@
 						"start": 72,
 						"end": 78,
 						"type": "Text",
+						"raw": "Hello ",
 						"data": "Hello "
 					},
 					{
@@ -38,6 +40,7 @@
 						"start": 84,
 						"end": 85,
 						"type": "Text",
+						"raw": "!",
 						"data": "!"
 					}
 				]
diff --git a/test/parser/samples/script/output.json b/test/parser/samples/script/output.json
index 95966f5dc6..75aa0a7d2c 100644
--- a/test/parser/samples/script/output.json
+++ b/test/parser/samples/script/output.json
@@ -8,6 +8,7 @@
 				"start": 39,
 				"end": 41,
 				"type": "Text",
+				"raw": "\n\n",
 				"data": "\n\n"
 			},
 			{
@@ -21,6 +22,7 @@
 						"start": 45,
 						"end": 51,
 						"type": "Text",
+						"raw": "Hello ",
 						"data": "Hello "
 					},
 					{
@@ -38,6 +40,7 @@
 						"start": 57,
 						"end": 58,
 						"type": "Text",
+						"raw": "!",
 						"data": "!"
 					}
 				]
diff --git a/test/parser/samples/self-closing-element/output.json b/test/parser/samples/self-closing-element/output.json
index 47eea2f333..63ff17a466 100644
--- a/test/parser/samples/self-closing-element/output.json
+++ b/test/parser/samples/self-closing-element/output.json
@@ -13,8 +13,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/self-reference/output.json b/test/parser/samples/self-reference/output.json
index de5112a087..92dfdfe4d0 100644
--- a/test/parser/samples/self-reference/output.json
+++ b/test/parser/samples/self-reference/output.json
@@ -72,8 +72,5 @@
 				]
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/space-between-mustaches/output.json b/test/parser/samples/space-between-mustaches/output.json
index c89409daeb..9a367bd2c1 100644
--- a/test/parser/samples/space-between-mustaches/output.json
+++ b/test/parser/samples/space-between-mustaches/output.json
@@ -15,6 +15,7 @@
 						"start": 3,
 						"end": 4,
 						"type": "Text",
+						"raw": " ",
 						"data": " "
 					},
 					{
@@ -32,6 +33,7 @@
 						"start": 7,
 						"end": 8,
 						"type": "Text",
+						"raw": " ",
 						"data": " "
 					},
 					{
@@ -49,6 +51,7 @@
 						"start": 11,
 						"end": 14,
 						"type": "Text",
+						"raw": " : ",
 						"data": " : "
 					},
 					{
@@ -66,13 +69,11 @@
 						"start": 17,
 						"end": 20,
 						"type": "Text",
+						"raw": " : ",
 						"data": " : "
 					}
 				]
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/spread/output.json b/test/parser/samples/spread/output.json
index 3986da3578..73a0dc9777 100644
--- a/test/parser/samples/spread/output.json
+++ b/test/parser/samples/spread/output.json
@@ -25,8 +25,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/textarea-children/output.json b/test/parser/samples/textarea-children/output.json
index 3b403458fc..90f31f3caf 100644
--- a/test/parser/samples/textarea-children/output.json
+++ b/test/parser/samples/textarea-children/output.json
@@ -16,8 +16,9 @@
 						"value": [
 							{
 								"start": 10,
-								"end": 40,
+								"end": 41,
 								"type": "Text",
+								"raw": "\n\t<p>not actually an element. ",
 								"data": "\n\t<p>not actually an element. "
 							},
 							{
@@ -35,6 +36,7 @@
 								"start": 45,
 								"end": 50,
 								"type": "Text",
+								"raw": "</p>\n",
 								"data": "</p>\n"
 							}
 						]
@@ -43,8 +45,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/transition-intro-no-params/output.json b/test/parser/samples/transition-intro-no-params/output.json
index edb15457e6..91b50f3ec8 100644
--- a/test/parser/samples/transition-intro-no-params/output.json
+++ b/test/parser/samples/transition-intro-no-params/output.json
@@ -26,13 +26,11 @@
 						"start": 13,
 						"end": 21,
 						"type": "Text",
+						"raw": "fades in",
 						"data": "fades in"
 					}
 				]
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/transition-intro/output.json b/test/parser/samples/transition-intro/output.json
index 5583dd89bc..418bb97e16 100644
--- a/test/parser/samples/transition-intro/output.json
+++ b/test/parser/samples/transition-intro/output.json
@@ -54,13 +54,11 @@
 						"start": 31,
 						"end": 39,
 						"type": "Text",
+						"raw": "fades in",
 						"data": "fades in"
 					}
 				]
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/unusual-identifier/output.json b/test/parser/samples/unusual-identifier/output.json
index c0d4ecc3ff..e4a2a18619 100644
--- a/test/parser/samples/unusual-identifier/output.json
+++ b/test/parser/samples/unusual-identifier/output.json
@@ -44,8 +44,5 @@
 				}
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/whitespace-leading-trailing/output.json b/test/parser/samples/whitespace-leading-trailing/output.json
index f164af01ba..e4f387856e 100644
--- a/test/parser/samples/whitespace-leading-trailing/output.json
+++ b/test/parser/samples/whitespace-leading-trailing/output.json
@@ -8,6 +8,7 @@
 				"start": 0,
 				"end": 6,
 				"type": "Text",
+				"raw": "\n\n\t\t\t\t",
 				"data": "\n\n\t\t\t\t"
 			},
 			{
@@ -21,13 +22,11 @@
 						"start": 9,
 						"end": 32,
 						"type": "Text",
+						"raw": "just chillin' over here",
 						"data": "just chillin' over here"
 					}
 				]
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/whitespace-normal/output.json b/test/parser/samples/whitespace-normal/output.json
index e4ce956331..acbae7ae17 100644
--- a/test/parser/samples/whitespace-normal/output.json
+++ b/test/parser/samples/whitespace-normal/output.json
@@ -15,6 +15,7 @@
 						"start": 4,
 						"end": 10,
 						"type": "Text",
+						"raw": "Hello ",
 						"data": "Hello "
 					},
 					{
@@ -39,6 +40,7 @@
 								"start": 24,
 								"end": 26,
 								"type": "Text",
+								"raw": "! ",
 								"data": "! "
 							}
 						]
@@ -54,6 +56,7 @@
 								"start": 41,
 								"end": 53,
 								"type": "Text",
+								"raw": "How are you?",
 								"data": "How are you?"
 							}
 						]
@@ -61,8 +64,5 @@
 				]
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/yield/output.json b/test/parser/samples/yield/output.json
index 16ea79d8e8..b2e4b9430f 100644
--- a/test/parser/samples/yield/output.json
+++ b/test/parser/samples/yield/output.json
@@ -16,8 +16,5 @@
 				}
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }
\ No newline at end of file
diff --git a/test/runtime/index.js b/test/runtime/index.js
index 579dc665c6..77879edc1f 100644
--- a/test/runtime/index.js
+++ b/test/runtime/index.js
@@ -3,7 +3,7 @@ import * as path from "path";
 import * as fs from "fs";
 import { rollup } from 'rollup';
 import * as virtual from 'rollup-plugin-virtual';
-import { clear_loops } from "../../internal.js";
+import { clear_loops, set_now, set_raf } from "../../internal";
 
 import {
 	showOutput,
@@ -20,7 +20,7 @@ let compileOptions = null;
 let compile = null;
 
 const sveltePath = process.cwd().split('\\').join('/');
-const internal = `${sveltePath}/internal.js`;
+const internal = `${sveltePath}/internal`;
 
 describe("runtime", () => {
 	before(() => {
@@ -75,7 +75,7 @@ describe("runtime", () => {
 			compileOptions.accessors = 'accessors' in config ? config.accessors : true;
 
 			Object.keys(require.cache)
-				.filter(x => x.endsWith(".svelte"))
+				.filter(x => x.endsWith('.svelte'))
 				.forEach(file => {
 					delete require.cache[file];
 				});
@@ -100,8 +100,8 @@ describe("runtime", () => {
 							if (raf.callback) raf.callback();
 						}
 					};
-					window.performance.now = () => raf.time;
-					global.requestAnimationFrame = cb => {
+					set_now(() => raf.time);
+					set_raf(cb => {
 						let called = false;
 						raf.callback = () => {
 							if (!called) {
@@ -109,7 +109,7 @@ describe("runtime", () => {
 								cb();
 							}
 						};
-					};
+					});
 
 					try {
 						mod = require(`./samples/${dir}/main.svelte`);
@@ -223,7 +223,7 @@ describe("runtime", () => {
 				{
 					resolveId: (importee, importer) => {
 						if (importee.startsWith('svelte/')) {
-							return importee.replace('svelte', process.cwd()) + '.mjs';
+							return importee.replace('svelte', process.cwd()) + '/index.mjs';
 						}
 					}
 				}
diff --git a/test/runtime/samples/animation-css/_config.js b/test/runtime/samples/animation-css/_config.js
index 544c6378ff..201a282e58 100644
--- a/test/runtime/samples/animation-css/_config.js
+++ b/test/runtime/samples/animation-css/_config.js
@@ -29,9 +29,9 @@ export default {
 					right: 100,
 					top,
 					bottom: top + 20
-				}
+				};
 			};
-		})
+		});
 
 		component.things = [
 			{ id: 5, name: 'e' },
diff --git a/test/runtime/samples/animation-js-delay/_config.js b/test/runtime/samples/animation-js-delay/_config.js
index faed25ecaa..6bd02d17e6 100644
--- a/test/runtime/samples/animation-js-delay/_config.js
+++ b/test/runtime/samples/animation-js-delay/_config.js
@@ -29,9 +29,9 @@ export default {
 					right: 100,
 					top,
 					bottom: top + 20
-				}
+				};
 			};
-		})
+		});
 
 		component.things = [
 			{ id: 5, name: 'e' },
diff --git a/test/runtime/samples/animation-js-easing/_config.js b/test/runtime/samples/animation-js-easing/_config.js
index a31825c3f9..415af042a9 100644
--- a/test/runtime/samples/animation-js-easing/_config.js
+++ b/test/runtime/samples/animation-js-easing/_config.js
@@ -29,9 +29,9 @@ export default {
 					right: 100,
 					top,
 					bottom: top + 20
-				}
+				};
 			};
-		})
+		});
 
 		component.things = [
 			{ id: 5, name: 'e' },
diff --git a/test/runtime/samples/animation-js/_config.js b/test/runtime/samples/animation-js/_config.js
index d5991a915a..521753633d 100644
--- a/test/runtime/samples/animation-js/_config.js
+++ b/test/runtime/samples/animation-js/_config.js
@@ -29,7 +29,7 @@ export default {
 					right: 100,
 					top,
 					bottom: top + 20
-				}
+				};
 			};
 		});
 
diff --git a/test/runtime/samples/attribute-dataset-without-value/_config.js b/test/runtime/samples/attribute-dataset-without-value/_config.js
new file mode 100644
index 0000000000..934f44eb06
--- /dev/null
+++ b/test/runtime/samples/attribute-dataset-without-value/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: '<div data-potato=""></div>',
+};
diff --git a/test/runtime/samples/attribute-dataset-without-value/main.svelte b/test/runtime/samples/attribute-dataset-without-value/main.svelte
new file mode 100644
index 0000000000..ed7d532652
--- /dev/null
+++ b/test/runtime/samples/attribute-dataset-without-value/main.svelte
@@ -0,0 +1 @@
+<div data-potato></div>
diff --git a/test/runtime/samples/attribute-url/_config.js b/test/runtime/samples/attribute-url/_config.js
new file mode 100644
index 0000000000..28bc1bcb0c
--- /dev/null
+++ b/test/runtime/samples/attribute-url/_config.js
@@ -0,0 +1,8 @@
+export default {
+	test({ assert, target }) {
+		const div = target.querySelector( 'div' );
+
+		assert.equal( div.style.backgroundImage, 'url(https://example.com/foo.jpg)');
+		assert.equal( div.style.color, 'red' );
+	}
+};
diff --git a/test/runtime/samples/attribute-url/main.svelte b/test/runtime/samples/attribute-url/main.svelte
new file mode 100644
index 0000000000..357a352aaa
--- /dev/null
+++ b/test/runtime/samples/attribute-url/main.svelte
@@ -0,0 +1,6 @@
+<script>
+	let bgImage = 'https://example.com/foo.jpg';
+	let color = 'red';
+</script>
+
+<div style="background-image: url('{bgImage}'); color: {color};">{color}</div>
diff --git a/test/runtime/samples/await-containing-if/_config.js b/test/runtime/samples/await-containing-if/_config.js
index 9e24e4f614..cd83585cc1 100644
--- a/test/runtime/samples/await-containing-if/_config.js
+++ b/test/runtime/samples/await-containing-if/_config.js
@@ -1,6 +1,6 @@
 let fulfil;
 
-let thePromise = new Promise(f => {
+const thePromise = new Promise(f => {
 	fulfil = f;
 });
 
diff --git a/test/runtime/samples/await-in-each/_config.js b/test/runtime/samples/await-in-each/_config.js
index b1a232e4bd..6c7da69ee3 100644
--- a/test/runtime/samples/await-in-each/_config.js
+++ b/test/runtime/samples/await-in-each/_config.js
@@ -1,6 +1,6 @@
 let fulfil;
 
-let thePromise = new Promise(f => {
+const thePromise = new Promise(f => {
 	fulfil = f;
 });
 
diff --git a/test/runtime/samples/await-then-catch-order/_config.js b/test/runtime/samples/await-then-catch-order/_config.js
index 5c4eb530e9..f972520904 100644
--- a/test/runtime/samples/await-then-catch-order/_config.js
+++ b/test/runtime/samples/await-then-catch-order/_config.js
@@ -1,6 +1,6 @@
 let fulfil;
 
-let thePromise = new Promise(f => {
+const thePromise = new Promise(f => {
 	fulfil = f;
 });
 
diff --git a/test/runtime/samples/await-with-components/_config.js b/test/runtime/samples/await-with-components/_config.js
index ffef7441ff..a0a558782a 100644
--- a/test/runtime/samples/await-with-components/_config.js
+++ b/test/runtime/samples/await-with-components/_config.js
@@ -1,6 +1,7 @@
 export default {
 	async test({ assert, component, target }) {
-		let resolve, reject;
+		let resolve;
+		let reject;
 		let promise = new Promise(ok => resolve = ok);
 
 		component.promise = promise;
diff --git a/test/runtime/samples/binding-details-open/_config.js b/test/runtime/samples/binding-details-open/_config.js
new file mode 100644
index 0000000000..cf2459c3f1
--- /dev/null
+++ b/test/runtime/samples/binding-details-open/_config.js
@@ -0,0 +1,25 @@
+export default {
+	html: `
+		<details><summary>toggle</summary></details>
+	`,
+
+	async test({ assert, component, target, window }) {
+		const details = target.querySelector('details');
+		const event = new window.Event('toggle');
+
+		details.open = true;
+		await details.dispatchEvent(event);
+		assert.equal(component.visible, true);
+		assert.htmlEqual(target.innerHTML, `
+			<details open><summary>toggle</summary></details>
+			<p>hello!</p>
+		`);
+
+		details.open = false;
+		await details.dispatchEvent(event);
+		assert.equal(component.visible, false);
+		assert.htmlEqual(target.innerHTML, `
+			<details><summary>toggle</summary></details>
+		`);
+	}
+};
diff --git a/test/runtime/samples/binding-details-open/main.svelte b/test/runtime/samples/binding-details-open/main.svelte
new file mode 100644
index 0000000000..3a7a08e121
--- /dev/null
+++ b/test/runtime/samples/binding-details-open/main.svelte
@@ -0,0 +1,9 @@
+<script>
+	export let visible;
+</script>
+
+<details bind:open={visible}><summary>toggle</summary></details>
+
+{#if visible}
+	<p>hello!</p>
+{/if}
diff --git a/test/runtime/samples/binding-textarea/_config.js b/test/runtime/samples/binding-textarea/_config.js
index c09256e059..ac092096e6 100644
--- a/test/runtime/samples/binding-textarea/_config.js
+++ b/test/runtime/samples/binding-textarea/_config.js
@@ -9,7 +9,7 @@ export default {
 	`,
 
 	ssrHtml: `
-		<textarea value="some text"></textarea>
+		<textarea>some text</textarea>
 		<p>some text</p>
 	`,
 
diff --git a/test/runtime/samples/component-namespaced/Foo.svelte b/test/runtime/samples/component-namespaced/Foo.svelte
new file mode 100644
index 0000000000..67ab955233
--- /dev/null
+++ b/test/runtime/samples/component-namespaced/Foo.svelte
@@ -0,0 +1,5 @@
+<script>
+	export let foo;
+</script>
+
+<p>foo {foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-namespaced/_config.js b/test/runtime/samples/component-namespaced/_config.js
new file mode 100644
index 0000000000..b91795d6c8
--- /dev/null
+++ b/test/runtime/samples/component-namespaced/_config.js
@@ -0,0 +1,22 @@
+import * as path from 'path';
+
+export default {
+	props: {
+		a: 1
+	},
+
+	html: `
+		<p>foo 1</p>
+	`,
+
+	before_test() {
+		delete require.cache[path.resolve(__dirname, 'components.js')];
+	},
+
+	test({ assert, component, target }) {
+		component.a = 2;
+		assert.htmlEqual(target.innerHTML, `
+			<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
new file mode 100644
index 0000000000..832d2412ee
--- /dev/null
+++ b/test/runtime/samples/component-namespaced/components.js
@@ -0,0 +1,3 @@
+import Foo from './Foo.svelte';
+
+export default { Foo };
\ No newline at end of file
diff --git a/test/runtime/samples/component-namespaced/main.svelte b/test/runtime/samples/component-namespaced/main.svelte
new file mode 100644
index 0000000000..541b68e47e
--- /dev/null
+++ b/test/runtime/samples/component-namespaced/main.svelte
@@ -0,0 +1,7 @@
+<script>
+	import Components from './components.js';
+
+	export let a;
+</script>
+
+<Components.Foo foo={a}/>
\ No newline at end of file
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 212c57308a..a07a1482bc 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
+};
\ No newline at end of file
diff --git a/test/runtime/samples/dev-warning-unknown-props-with-$$props/Foo.svelte b/test/runtime/samples/dev-warning-unknown-props-with-$$props/Foo.svelte
new file mode 100644
index 0000000000..9e5c62339d
--- /dev/null
+++ b/test/runtime/samples/dev-warning-unknown-props-with-$$props/Foo.svelte
@@ -0,0 +1,7 @@
+<script>
+	export let foo = undefined;
+
+</script>
+
+<div>{foo}</div>
+<div>{JSON.stringify($$props)}</div>
diff --git a/test/runtime/samples/dev-warning-unknown-props-with-$$props/_config.js b/test/runtime/samples/dev-warning-unknown-props-with-$$props/_config.js
new file mode 100644
index 0000000000..62ad08624d
--- /dev/null
+++ b/test/runtime/samples/dev-warning-unknown-props-with-$$props/_config.js
@@ -0,0 +1,7 @@
+export default {
+	compileOptions: {
+		dev: true
+	},
+
+	warnings: []
+};
diff --git a/test/runtime/samples/dev-warning-unknown-props-with-$$props/main.svelte b/test/runtime/samples/dev-warning-unknown-props-with-$$props/main.svelte
new file mode 100644
index 0000000000..1566cf3e41
--- /dev/null
+++ b/test/runtime/samples/dev-warning-unknown-props-with-$$props/main.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Foo from './Foo.svelte';
+</script>
+
+<Foo fo="sho"/>
diff --git a/test/runtime/samples/dev-warning-unknown-props-with-$$scope/Foo.svelte b/test/runtime/samples/dev-warning-unknown-props-with-$$scope/Foo.svelte
new file mode 100644
index 0000000000..b9f7feec24
--- /dev/null
+++ b/test/runtime/samples/dev-warning-unknown-props-with-$$scope/Foo.svelte
@@ -0,0 +1,6 @@
+<script>
+	export let answer;
+</script>
+
+<h1>{answer}</h1>
+<div><slot></slot></div>
diff --git a/test/runtime/samples/dev-warning-unknown-props-with-$$scope/_config.js b/test/runtime/samples/dev-warning-unknown-props-with-$$scope/_config.js
new file mode 100644
index 0000000000..62ad08624d
--- /dev/null
+++ b/test/runtime/samples/dev-warning-unknown-props-with-$$scope/_config.js
@@ -0,0 +1,7 @@
+export default {
+	compileOptions: {
+		dev: true
+	},
+
+	warnings: []
+};
diff --git a/test/runtime/samples/dev-warning-unknown-props-with-$$scope/main.svelte b/test/runtime/samples/dev-warning-unknown-props-with-$$scope/main.svelte
new file mode 100644
index 0000000000..a1656e86e0
--- /dev/null
+++ b/test/runtime/samples/dev-warning-unknown-props-with-$$scope/main.svelte
@@ -0,0 +1,7 @@
+<script>
+	import Foo from './Foo.svelte';
+</script>
+
+<Foo answer={42}>
+	bar
+</Foo>
diff --git a/test/runtime/samples/dev-warning-unknown-props/Foo.svelte b/test/runtime/samples/dev-warning-unknown-props/Foo.svelte
new file mode 100644
index 0000000000..cebe5fd571
--- /dev/null
+++ b/test/runtime/samples/dev-warning-unknown-props/Foo.svelte
@@ -0,0 +1,5 @@
+<script>
+	export let foo = undefined;
+</script>
+
+<div>{foo}</div>
diff --git a/test/runtime/samples/dev-warning-unknown-props/_config.js b/test/runtime/samples/dev-warning-unknown-props/_config.js
new file mode 100644
index 0000000000..9bff4a2a74
--- /dev/null
+++ b/test/runtime/samples/dev-warning-unknown-props/_config.js
@@ -0,0 +1,9 @@
+export default {
+	compileOptions: {
+		dev: true
+	},
+
+	warnings: [
+		`<Foo> was created with unknown prop 'fo'`
+	]
+};
diff --git a/test/runtime/samples/dev-warning-unknown-props/main.svelte b/test/runtime/samples/dev-warning-unknown-props/main.svelte
new file mode 100644
index 0000000000..1566cf3e41
--- /dev/null
+++ b/test/runtime/samples/dev-warning-unknown-props/main.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Foo from './Foo.svelte';
+</script>
+
+<Foo fo="sho"/>
diff --git a/test/runtime/samples/element-invalid-name/_config.js b/test/runtime/samples/element-invalid-name/_config.js
index af6e4933ce..d70c920a19 100644
--- a/test/runtime/samples/element-invalid-name/_config.js
+++ b/test/runtime/samples/element-invalid-name/_config.js
@@ -2,4 +2,4 @@ export default {
 	html: `
 		<foo-bar>Hello</foo-bar>
 	`
-}
+};
diff --git a/test/runtime/samples/event-handler-multiple/_config.js b/test/runtime/samples/event-handler-multiple/_config.js
new file mode 100644
index 0000000000..cf17c61f60
--- /dev/null
+++ b/test/runtime/samples/event-handler-multiple/_config.js
@@ -0,0 +1,14 @@
+export default {
+	html: `
+		<button>click me</button>
+	`,
+
+	async test({ assert, component, target, window }) {
+		const button = target.querySelector('button');
+		const event = new window.MouseEvent('click');
+
+		await button.dispatchEvent(event);
+		assert.equal(component.clickHandlerOne, 1);
+		assert.equal(component.clickHandlerTwo, 1);
+	}
+};
diff --git a/test/runtime/samples/event-handler-multiple/main.svelte b/test/runtime/samples/event-handler-multiple/main.svelte
new file mode 100644
index 0000000000..f327a7fd2a
--- /dev/null
+++ b/test/runtime/samples/event-handler-multiple/main.svelte
@@ -0,0 +1,6 @@
+<script>
+	export let clickHandlerOne = 0;
+	export let clickHandlerTwo = 0;
+</script>
+
+<button on:click='{() => clickHandlerOne++}' on:click='{() => clickHandlerTwo++}'>click me</button>
diff --git a/test/runtime/samples/export-function-hoisting/_config.js b/test/runtime/samples/export-function-hoisting/_config.js
index c56851d065..f01c8b4841 100644
--- a/test/runtime/samples/export-function-hoisting/_config.js
+++ b/test/runtime/samples/export-function-hoisting/_config.js
@@ -1,3 +1,3 @@
 export default {
-  html: 'Compile plz'
-}
+	html: 'Compile plz'
+};
diff --git a/test/runtime/samples/function-hoisting/_config.js b/test/runtime/samples/function-hoisting/_config.js
index 5a22ffaf0b..91492d8c38 100644
--- a/test/runtime/samples/function-hoisting/_config.js
+++ b/test/runtime/samples/function-hoisting/_config.js
@@ -1,7 +1,7 @@
 export default {
-  props: {
-    greeting: 'Good day'
-  },
+	props: {
+		greeting: 'Good day'
+	},
 
-  html: '<h1>Good day, world</h1>'
-}
+	html: '<h1>Good day, world</h1>'
+};
diff --git a/test/runtime/samples/get-after-destroy/_config.js b/test/runtime/samples/get-after-destroy/_config.js
index bf4d8e90ba..5d10bbe72a 100644
--- a/test/runtime/samples/get-after-destroy/_config.js
+++ b/test/runtime/samples/get-after-destroy/_config.js
@@ -10,4 +10,4 @@ export default {
 		const { foo } = component;
 		assert.equal(foo, undefined);
 	}
-}
\ No newline at end of file
+};
diff --git a/test/runtime/samples/head-if-block/_config.js b/test/runtime/samples/head-if-block/_config.js
index 26e1457be7..439ed2cb1b 100644
--- a/test/runtime/samples/head-if-block/_config.js
+++ b/test/runtime/samples/head-if-block/_config.js
@@ -9,4 +9,4 @@ export default {
 		component.condition = true;
 		assert.equal(window.document.title, 'woo!!!');
 	}
-};
\ No newline at end of file
+};
diff --git a/test/runtime/samples/head-if-block/main.svelte b/test/runtime/samples/head-if-block/main.svelte
index a6b115bf28..1656278b9e 100644
--- a/test/runtime/samples/head-if-block/main.svelte
+++ b/test/runtime/samples/head-if-block/main.svelte
@@ -6,4 +6,4 @@
 	{#if condition}
 		<title>woo!!!</title>
 	{/if}
-</svelte:head>
\ No newline at end of file
+</svelte:head>
diff --git a/test/runtime/samples/head-if-else-block/_config.js b/test/runtime/samples/head-if-else-block/_config.js
new file mode 100644
index 0000000000..7665bfe90b
--- /dev/null
+++ b/test/runtime/samples/head-if-else-block/_config.js
@@ -0,0 +1,14 @@
+export default {
+	props: {
+		condition: false
+	},
+
+	test({ assert, component, target, window }) {
+		assert.equal(window.document.title, '');
+		assert.equal(Boolean(window.document.getElementById('meta')), true);
+
+		component.condition = true;
+		assert.equal(window.document.title, 'woo!!!');
+		assert.equal(window.document.getElementById('meta'), null);
+	}
+};
diff --git a/test/runtime/samples/head-if-else-block/main.svelte b/test/runtime/samples/head-if-else-block/main.svelte
new file mode 100644
index 0000000000..a31bdf3330
--- /dev/null
+++ b/test/runtime/samples/head-if-else-block/main.svelte
@@ -0,0 +1,11 @@
+<script>
+	export let condition;
+</script>
+
+<svelte:head>
+	{#if condition}
+		<title>woo!!!</title>
+	{:else}
+		<meta id="meta" name="title" content="woo!!!"/>
+	{/if}
+</svelte:head>
diff --git a/test/runtime/samples/head-if-else-raw-dynamic/_config.js b/test/runtime/samples/head-if-else-raw-dynamic/_config.js
new file mode 100644
index 0000000000..b6da617cb9
--- /dev/null
+++ b/test/runtime/samples/head-if-else-raw-dynamic/_config.js
@@ -0,0 +1,19 @@
+const foo = '<script type="application/json">{ "foo": "true" }</script>';
+const bar = '<script type="application/json">{ "bar": "true" }</script>';
+
+export default {
+	props: {
+		condition: false,
+		foo,
+		bar
+	},
+
+	test({ assert, component, window }) {
+		assert.equal(window.document.head.innerHTML.includes(foo), false);
+		assert.equal(window.document.head.innerHTML.includes(bar), true);
+
+		component.condition = true;
+		assert.equal(window.document.head.innerHTML.includes(foo), true);
+		assert.equal(window.document.head.innerHTML.includes(bar), false);
+	}
+};
diff --git a/test/runtime/samples/head-if-else-raw-dynamic/main.svelte b/test/runtime/samples/head-if-else-raw-dynamic/main.svelte
new file mode 100644
index 0000000000..ca322dad83
--- /dev/null
+++ b/test/runtime/samples/head-if-else-raw-dynamic/main.svelte
@@ -0,0 +1,11 @@
+<script>
+	export let condition, foo, bar;
+</script>
+
+<svelte:head>
+	{#if condition}
+		{@html foo}
+	{:else}
+		{@html bar}
+	{/if}
+</svelte:head>
diff --git a/test/runtime/samples/head-raw-dynamic/Bar.svelte b/test/runtime/samples/head-raw-dynamic/Bar.svelte
new file mode 100644
index 0000000000..11e5cb9ee8
--- /dev/null
+++ b/test/runtime/samples/head-raw-dynamic/Bar.svelte
@@ -0,0 +1,11 @@
+<script>
+	export let bar;
+</script>
+
+<svelte:head>
+	<meta id="meta" name="title" content="bar!!!"/>
+	{#if true}
+		{@html bar}
+	{/if}
+	<title>bar!!!</title>
+</svelte:head>
diff --git a/test/runtime/samples/head-raw-dynamic/Foo.svelte b/test/runtime/samples/head-raw-dynamic/Foo.svelte
new file mode 100644
index 0000000000..f4fd5741ac
--- /dev/null
+++ b/test/runtime/samples/head-raw-dynamic/Foo.svelte
@@ -0,0 +1,7 @@
+<script>
+	export let foo;
+</script>
+
+<svelte:head>
+	{@html foo}
+</svelte:head>
diff --git a/test/runtime/samples/head-raw-dynamic/_config.js b/test/runtime/samples/head-raw-dynamic/_config.js
new file mode 100644
index 0000000000..61e86727ff
--- /dev/null
+++ b/test/runtime/samples/head-raw-dynamic/_config.js
@@ -0,0 +1,26 @@
+const foo = '<script type="application/json">{ "foo": "true" }</script>';
+const bar = '<script type="application/json">{ "bar": "true" }</script>';
+
+export default {
+	props: {
+		condition: 1,
+		foo,
+		bar
+	},
+
+	test({ assert, component, window }) {
+		assert.equal(window.document.head.innerHTML.includes(foo), true);
+
+		component.condition = false;
+		assert.equal(window.document.head.innerHTML.includes(foo), false);
+
+		component.condition = 2;
+		assert.equal(window.document.title, 'bar!!!');
+		assert.equal(window.document.head.innerHTML.includes(bar), true);
+		assert.equal(Boolean(window.document.getElementById('meta')), true);
+
+		component.condition = false;
+		assert.equal(window.document.head.innerHTML.includes(bar), false);
+		assert.equal(window.document.getElementById('meta'), null);
+	}
+};
diff --git a/test/runtime/samples/head-raw-dynamic/main.svelte b/test/runtime/samples/head-raw-dynamic/main.svelte
new file mode 100644
index 0000000000..69f341ae36
--- /dev/null
+++ b/test/runtime/samples/head-raw-dynamic/main.svelte
@@ -0,0 +1,12 @@
+<script>
+	import Foo from './Foo.svelte';
+	import Bar from './Bar.svelte';
+
+	export let condition, foo, bar;
+</script>
+
+{#if condition === 1}
+	<Foo {foo} />
+{:else if condition === 2}
+	<Bar {bar} />
+{/if}
diff --git a/test/runtime/samples/immutable-nested/Nested.svelte b/test/runtime/samples/immutable-nested/Nested.svelte
index 45385e9b0b..acb0b480a4 100644
--- a/test/runtime/samples/immutable-nested/Nested.svelte
+++ b/test/runtime/samples/immutable-nested/Nested.svelte
@@ -1,7 +1,7 @@
 <script>
 	import { beforeUpdate, onMount } from 'svelte';
 
-	let mounted;
+	let mounted = false;
 	export let count = 0;
 	export let foo = { bar: 'baz' };
 
@@ -14,4 +14,5 @@
 	});
 </script>
 
-<h3>Called {count} times.</h3>
\ No newline at end of file
+<h3>Called {count} times.</h3>
+<p>{foo.bar} {mounted}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/immutable-nested/_config.js b/test/runtime/samples/immutable-nested/_config.js
index e5c515fc78..8b1dd7e68a 100644
--- a/test/runtime/samples/immutable-nested/_config.js
+++ b/test/runtime/samples/immutable-nested/_config.js
@@ -1,16 +1,36 @@
 export default {
 	immutable: true,
 
-	html: `<div><h3>Called 1 times.</h3></div>`,
+	html: `
+		<div>
+			<h3>Called 1 times.</h3>
+			<p>baz true</p>
+		</div>
+	`,
 
-	ssrHtml: `<div><h3>Called 0 times.</h3></div>`,
+	ssrHtml: `
+		<div>
+			<h3>Called 0 times.</h3>
+			<p>baz false</p>
+		</div>`,
 
-	test({ assert, component, target, window }) {
-		var nested = component.nested;
+	test({ assert, component, target }) {
+		const nested = component.nested;
 
-		assert.htmlEqual(target.innerHTML, `<div><h3>Called 1 times.</h3></div>`);
+		assert.htmlEqual(target.innerHTML, `
+			<div>
+				<h3>Called 1 times.</h3>
+				<p>baz true</p>
+			</div>
+		`);
 
+		// eslint-disable-next-line no-self-assign
 		nested.foo = nested.foo;
-		assert.htmlEqual(target.innerHTML, `<div><h3>Called 1 times.</h3></div>`);
+		assert.htmlEqual(target.innerHTML, `
+			<div>
+				<h3>Called 1 times.</h3>
+				<p>baz true</p>
+			</div>
+		`);
 	}
 };
diff --git a/test/runtime/samples/immutable-nested/main.svelte b/test/runtime/samples/immutable-nested/main.svelte
index e50055be0c..4ccf7008cd 100644
--- a/test/runtime/samples/immutable-nested/main.svelte
+++ b/test/runtime/samples/immutable-nested/main.svelte
@@ -5,5 +5,5 @@
 </script>
 
 <div>
-  <Nested bind:this={nested} />
+	<Nested bind:this={nested} />
 </div>
diff --git a/test/runtime/samples/immutable-option/_config.js b/test/runtime/samples/immutable-option/_config.js
index 0aaa742fbe..1224d0213a 100644
--- a/test/runtime/samples/immutable-option/_config.js
+++ b/test/runtime/samples/immutable-option/_config.js
@@ -4,6 +4,7 @@ export default {
 	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>`);
 	}
diff --git a/test/runtime/samples/immutable-svelte-meta-false/_config.js b/test/runtime/samples/immutable-svelte-meta-false/_config.js
index 933c151d6b..664f99f087 100644
--- a/test/runtime/samples/immutable-svelte-meta-false/_config.js
+++ b/test/runtime/samples/immutable-svelte-meta-false/_config.js
@@ -4,6 +4,7 @@ export default {
 	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>`);
 	}
diff --git a/test/runtime/samples/immutable-svelte-meta/_config.js b/test/runtime/samples/immutable-svelte-meta/_config.js
index 9bd32dbd11..4e39f36224 100644
--- a/test/runtime/samples/immutable-svelte-meta/_config.js
+++ b/test/runtime/samples/immutable-svelte-meta/_config.js
@@ -2,6 +2,7 @@ export default {
 	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>`);
 	}
diff --git a/test/runtime/samples/internal-state/_config.js b/test/runtime/samples/internal-state/_config.js
index 09ea61a8eb..6b8440aaf3 100644
--- a/test/runtime/samples/internal-state/_config.js
+++ b/test/runtime/samples/internal-state/_config.js
@@ -1,18 +1,18 @@
 export default {
-    html: `
-        <p>internal: 1</p>
-        <button>click me</button>
-    `,
+	html: `
+		<p>internal: 1</p>
+		<button>click me</button>
+	`,
 
-    async test({ assert, target, window }) {
-        const button = target.querySelector('button');
-        const click = new window.MouseEvent('click');
+	async test({ assert, target, window }) {
+		const button = target.querySelector('button');
+		const click = new window.MouseEvent('click');
 
-        await button.dispatchEvent(click);
+		await button.dispatchEvent(click);
 
-        assert.htmlEqual(target.innerHTML, `
-            <p>internal: 1</p>
-            <button>click me</button>
-        `);
-    }
-};
\ No newline at end of file
+		assert.htmlEqual(target.innerHTML, `
+			<p>internal: 1</p>
+			<button>click me</button>
+		`);
+	}
+};
diff --git a/test/runtime/samples/mixed-let-export/_config.js b/test/runtime/samples/mixed-let-export/_config.js
index 5ac8585742..f3da4215d9 100644
--- a/test/runtime/samples/mixed-let-export/_config.js
+++ b/test/runtime/samples/mixed-let-export/_config.js
@@ -1,9 +1,9 @@
 export default {
-  props: {
-    a: 42
-  },
+	props: {
+		a: 42
+	},
 
-  html: `
-    42
-  `
-}
+	html: `
+		42
+	`
+};
diff --git a/test/runtime/samples/prop-exports/_config.js b/test/runtime/samples/prop-exports/_config.js
index 631c9eb0ad..e1620c015f 100644
--- a/test/runtime/samples/prop-exports/_config.js
+++ b/test/runtime/samples/prop-exports/_config.js
@@ -2,29 +2,29 @@ import { writable } from '../../../../store';
 
 export default {
 	props: {
-    s1: writable(42),
-    s2: writable(43),
-    p1: 2,
-    p3: 3,
-    a1: writable(1),
-    a2: 4,
-    a6: writable(29),
-    for: 'loop',
-    continue: '...',
+		s1: writable(42),
+		s2: writable(43),
+		p1: 2,
+		p3: 3,
+		a1: writable(1),
+		a2: 4,
+		a6: writable(29),
+		for: 'loop',
+		continue: '...',
 	},
 
 	html: `
-    $s1=42
-    $s2=43
-    p1=2
-    p3=3
-    $v1=1
-    v2=4
-    vi1=4
-    $vs1=1
-    vl0=hello
-    vl1=test
-    $s3=29
-    loop...
-  `
-}
+		$s1=42
+		$s2=43
+		p1=2
+		p3=3
+		$v1=1
+		v2=4
+		vi1=4
+		$vs1=1
+		vl0=hello
+		vl1=test
+		$s3=29
+		loop...
+	`
+};
diff --git a/test/runtime/samples/prop-subscribable/_config.js b/test/runtime/samples/prop-subscribable/_config.js
index 69f8104fab..84cde8c9af 100644
--- a/test/runtime/samples/prop-subscribable/_config.js
+++ b/test/runtime/samples/prop-subscribable/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	props: {
diff --git a/test/runtime/samples/reactive-value-function-hoist/_config.js b/test/runtime/samples/reactive-value-function-hoist/_config.js
new file mode 100644
index 0000000000..6198a57ef6
--- /dev/null
+++ b/test/runtime/samples/reactive-value-function-hoist/_config.js
@@ -0,0 +1,15 @@
+export default {
+	html: `
+		<button>Click me</button>
+	`,
+
+	async test({ assert, target, window }) {
+		const event = new window.MouseEvent('click');
+		const button = target.querySelector('button');
+
+		await button.dispatchEvent(event);
+		assert.htmlEqual(target.innerHTML, `
+			<button>4</button>
+		`);
+	}
+};
diff --git a/test/runtime/samples/reactive-value-function-hoist/main.svelte b/test/runtime/samples/reactive-value-function-hoist/main.svelte
new file mode 100644
index 0000000000..0f2dadb561
--- /dev/null
+++ b/test/runtime/samples/reactive-value-function-hoist/main.svelte
@@ -0,0 +1,10 @@
+<script>
+	let num = 2;
+	$: square = num * num;
+
+	function onClick() {
+		this.innerHTML = square;
+	}
+</script>
+
+<button on:click={onClick}>Click me</button>
diff --git a/test/runtime/samples/reactive-value-mutate-const/_config.js b/test/runtime/samples/reactive-value-mutate-const/_config.js
new file mode 100644
index 0000000000..da0a19dd28
--- /dev/null
+++ b/test/runtime/samples/reactive-value-mutate-const/_config.js
@@ -0,0 +1,17 @@
+export default {
+	html: `
+		<button>Mutate a</button>
+		<div>{}</div>
+	`,
+
+	async test({ assert, target }) {
+		const button = target.querySelector('button');
+		const click = new window.MouseEvent('click');
+
+		await button.dispatchEvent(click);
+		assert.htmlEqual(target.innerHTML, `
+			<button>Mutate a</button>
+			<div>{"foo":42}</div>
+		`);
+	}
+};
diff --git a/test/runtime/samples/reactive-value-mutate-const/main.svelte b/test/runtime/samples/reactive-value-mutate-const/main.svelte
new file mode 100644
index 0000000000..403544e5f1
--- /dev/null
+++ b/test/runtime/samples/reactive-value-mutate-const/main.svelte
@@ -0,0 +1,9 @@
+<script>
+	const a = {};
+	const b = {};
+	$: b.foo = a.foo;
+</script>
+
+<button on:click={() => a.foo = 42}>Mutate a</button>
+<div>{JSON.stringify(b)}</div>
+
diff --git a/test/runtime/samples/spring/_config.js b/test/runtime/samples/spring/_config.js
new file mode 100644
index 0000000000..49367ce08b
--- /dev/null
+++ b/test/runtime/samples/spring/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: `<p>0</p>`
+};
diff --git a/test/runtime/samples/spring/main.svelte b/test/runtime/samples/spring/main.svelte
new file mode 100644
index 0000000000..39c9afde1d
--- /dev/null
+++ b/test/runtime/samples/spring/main.svelte
@@ -0,0 +1,8 @@
+<script>
+	import { spring } from 'svelte/motion';
+
+	const x = spring(0);
+	x.set(1);
+</script>
+
+<p>{$x}</p>
\ 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 a7439bde5c..e81b3bb180 100644
--- a/test/runtime/samples/store-assignment-updates-reactive/_config.js
+++ b/test/runtime/samples/store-assignment-updates-reactive/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 const c = writable(0);
 
diff --git a/test/runtime/samples/store-assignment-updates-reactive/main.svelte b/test/runtime/samples/store-assignment-updates-reactive/main.svelte
index 18ec3bd7a7..9975ea87b8 100644
--- a/test/runtime/samples/store-assignment-updates-reactive/main.svelte
+++ b/test/runtime/samples/store-assignment-updates-reactive/main.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { writable } from '../../../../store.js';
+	import { writable } from '../../../../store';
 
 	const a = writable();
 	const b = writable();
diff --git a/test/runtime/samples/store-assignment-updates/_config.js b/test/runtime/samples/store-assignment-updates/_config.js
index 27f0ce274b..1b36d92863 100644
--- a/test/runtime/samples/store-assignment-updates/_config.js
+++ b/test/runtime/samples/store-assignment-updates/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	props: {
diff --git a/test/runtime/samples/store-auto-subscribe-implicit/_config.js b/test/runtime/samples/store-auto-subscribe-implicit/_config.js
index b8203f2a68..eca1f314ff 100644
--- a/test/runtime/samples/store-auto-subscribe-implicit/_config.js
+++ b/test/runtime/samples/store-auto-subscribe-implicit/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	props: {
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 969f9a9b74..a49dbab85c 100644
--- a/test/runtime/samples/store-auto-subscribe-in-each/_config.js
+++ b/test/runtime/samples/store-auto-subscribe-in-each/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	skip: true,
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 b2a5a8dba7..2240425d91 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
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	props: {
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 a7a8ef8d27..cfd4475240 100644
--- a/test/runtime/samples/store-auto-subscribe-in-script/_config.js
+++ b/test/runtime/samples/store-auto-subscribe-in-script/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 const count = writable(0);
 
diff --git a/test/runtime/samples/store-auto-subscribe/_config.js b/test/runtime/samples/store-auto-subscribe/_config.js
index b8203f2a68..eca1f314ff 100644
--- a/test/runtime/samples/store-auto-subscribe/_config.js
+++ b/test/runtime/samples/store-auto-subscribe/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	props: {
diff --git a/test/runtime/samples/store-contextual/_config.js b/test/runtime/samples/store-contextual/_config.js
index c759ede650..e06332a233 100644
--- a/test/runtime/samples/store-contextual/_config.js
+++ b/test/runtime/samples/store-contextual/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 const todos = [
 	writable({ done: false, text: 'write docs' }),
diff --git a/test/runtime/samples/store-imported-module-b/foo.js b/test/runtime/samples/store-imported-module-b/foo.js
index 340c3e6bd8..5d15213c3a 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.js';
+import { writable } from '../../../../store';
 
 export default writable(42);
\ 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 340c3e6bd8..5d15213c3a 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.js';
+import { writable } from '../../../../store';
 
 export default writable(42);
\ 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 340c3e6bd8..5d15213c3a 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.js';
+import { writable } from '../../../../store';
 
 export default writable(42);
\ No newline at end of file
diff --git a/test/runtime/samples/store-increment-updates-reactive/main.svelte b/test/runtime/samples/store-increment-updates-reactive/main.svelte
index ceec177f7a..63d4b68dc1 100644
--- a/test/runtime/samples/store-increment-updates-reactive/main.svelte
+++ b/test/runtime/samples/store-increment-updates-reactive/main.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { writable } from '../../../../store.js';
+	import { writable } from '../../../../store';
 
 	const foo = writable(0);
 
diff --git a/test/runtime/samples/store-prevent-user-declarations/_config.js b/test/runtime/samples/store-prevent-user-declarations/_config.js
index 312348eba4..ec099380e8 100644
--- a/test/runtime/samples/store-prevent-user-declarations/_config.js
+++ b/test/runtime/samples/store-prevent-user-declarations/_config.js
@@ -1,4 +1,4 @@
-import { writable } from '../../../../store.js';
+import { writable } from '../../../../store';
 
 export default {
 	props: {
diff --git a/test/runtime/samples/transition-js-await-block/_config.js b/test/runtime/samples/transition-js-await-block/_config.js
index 2e01dd7f76..80546ae6b8 100644
--- a/test/runtime/samples/transition-js-await-block/_config.js
+++ b/test/runtime/samples/transition-js-await-block/_config.js
@@ -1,7 +1,7 @@
 let fulfil;
 let reject;
 
-let promise = new Promise((f, r) => {
+const promise = new Promise((f, r) => {
 	fulfil = f;
 	reject = r;
 });
@@ -14,7 +14,7 @@ export default {
 	intro: true,
 
 	test({ assert, target, raf }) {
-		let p = target.querySelector('p');
+		const p = target.querySelector('p');
 
 		assert.equal(p.className, 'pending');
 		assert.equal(p.foo, 0);
@@ -26,7 +26,7 @@ export default {
 
 		return promise.then(() => {
 			raf.tick(80);
-			let ps = document.querySelectorAll('p');
+			const ps = document.querySelectorAll('p');
 			assert.equal(ps[1].className, 'pending');
 			assert.equal(ps[0].className, 'then');
 			assert.equal(ps[1].foo, 0.2);
diff --git a/test/runtime/samples/transition-js-events-in-out/_config.js b/test/runtime/samples/transition-js-events-in-out/_config.js
new file mode 100644
index 0000000000..854e7e2f4b
--- /dev/null
+++ b/test/runtime/samples/transition-js-events-in-out/_config.js
@@ -0,0 +1,71 @@
+export default {
+	props: {
+		visible: false,
+		things: ['a', 'b', 'c', 'd']
+	},
+
+	// intro: true,
+
+	html: `
+		<p>waiting...</p>
+	`,
+
+	async test({ assert, component, target, raf }) {
+		component.visible = true;
+
+		assert.htmlEqual(target.innerHTML, `
+			<p>introstart</p>
+			<p>a</p>
+			<p>b</p>
+			<p>c</p>
+			<p>d</p>
+		`);
+
+		await raf.tick(50);
+
+		assert.deepEqual(component.intros.sort(), ['a', 'b', 'c', 'd']);
+		assert.equal(component.intro_count, 4);
+
+		await raf.tick(100);
+		assert.equal(component.intro_count, 0);
+
+		assert.htmlEqual(target.innerHTML, `
+			<p>introend</p>
+			<p>a</p>
+			<p>b</p>
+			<p>c</p>
+			<p>d</p>
+		`);
+
+		component.visible = false;
+
+		assert.htmlEqual(target.innerHTML, `
+			<p>outrostart</p>
+			<p>a</p>
+			<p>b</p>
+			<p>c</p>
+			<p>d</p>
+		`);
+
+		await raf.tick(150);
+		assert.deepEqual(component.outros.sort(), ['a', 'b', 'c', 'd']);
+		assert.equal(component.outro_count, 4);
+
+		await raf.tick(200);
+		assert.equal(component.outro_count, 0);
+
+		component.visible = true;
+
+		await raf.tick(250);
+		assert.deepEqual(component.intros.sort(), ['a', 'a', 'b', 'b', 'c', 'c', 'd', 'd']);
+		assert.equal(component.intro_count, 4);
+
+		assert.htmlEqual(target.innerHTML, `
+			<p>introstart</p>
+			<p>a</p>
+			<p>b</p>
+			<p>c</p>
+			<p>d</p>
+		`);
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-events-in-out/main.svelte b/test/runtime/samples/transition-js-events-in-out/main.svelte
new file mode 100644
index 0000000000..33129f529b
--- /dev/null
+++ b/test/runtime/samples/transition-js-events-in-out/main.svelte
@@ -0,0 +1,59 @@
+<script>
+	import { onMount } from 'svelte';
+
+	export let things;
+	export let visible;
+
+	export let intros = [];
+	export let outros = [];
+	export let intro_count = 0;
+	export let outro_count = 0;
+
+	let status = 'waiting...';
+
+	function foo(node, params) {
+		return {
+			duration: 100,
+			tick: t => {
+				node.foo = t;
+			}
+		};
+	}
+
+	function introstart(e) {
+		intros.push(e.target.textContent);
+		intro_count += 1;
+		status = 'introstart';
+	}
+
+	function introend(e) {
+		intro_count -= 1;
+		status = 'introend';
+	}
+
+	function outrostart(e) {
+		outros.push(e.target.textContent);
+		outro_count += 1;
+		status = 'outrostart';
+	}
+
+	function outroend(e) {
+		outro_count -= 1;
+		status = 'outroend';
+	}
+</script>
+
+<p>{status}</p>
+
+{#each things as thing}
+	{#if visible}
+		<p
+			in:foo
+			out:foo
+			on:introstart={introstart}
+			on:introend={introend}
+			on:outrostart={outrostart}
+			on:outroend={outroend}
+		>{thing}</p>
+	{/if}
+{/each}
\ No newline at end of file
diff --git a/test/server-side-rendering/index.js b/test/server-side-rendering/index.js
index 6a546b0b7b..cf6e5ad964 100644
--- a/test/server-side-rendering/index.js
+++ b/test/server-side-rendering/index.js
@@ -1,7 +1,6 @@
 import * as assert from "assert";
 import * as fs from "fs";
 import * as path from "path";
-import * as glob from 'tiny-glob/sync.js';
 
 import {
 	showOutput,
@@ -96,10 +95,13 @@ describe("ssr", () => {
 		(config.skip ? it.skip : config.solo ? it.only : it)(dir, () => {
 			const cwd = path.resolve("test/runtime/samples", dir);
 
-			glob('**/*.svelte', { cwd: `test/runtime/samples/${dir}` }).forEach(file => {
-				const resolved = require.resolve(`../runtime/samples/${dir}/${file}`);
-				delete require.cache[resolved];
-			});
+			Object.keys(require.cache)
+				.filter(x => x.endsWith('.svelte'))
+				.forEach(file => {
+					delete require.cache[file];
+				});
+
+			delete global.window;
 
 			const compileOptions = Object.assign({ sveltePath }, config.compileOptions, {
 				generate: 'ssr'
diff --git a/test/server-side-rendering/samples/bindings-readonly/_expected.html b/test/server-side-rendering/samples/bindings-readonly/_expected.html
new file mode 100644
index 0000000000..af678acde0
--- /dev/null
+++ b/test/server-side-rendering/samples/bindings-readonly/_expected.html
@@ -0,0 +1,4 @@
+<div></div>
+<audio></audio>
+<video></video>
+<input type="file">
diff --git a/test/server-side-rendering/samples/bindings-readonly/main.svelte b/test/server-side-rendering/samples/bindings-readonly/main.svelte
new file mode 100644
index 0000000000..3ff98a3ead
--- /dev/null
+++ b/test/server-side-rendering/samples/bindings-readonly/main.svelte
@@ -0,0 +1,44 @@
+<script>
+	export let clientWidth = 1;
+	export let clientHeight = 2;
+	export let offsetHeight = 3;
+	export let offsetWidth = 4;
+
+	export let audioDuration = 5;
+	export let audioBuffered = 6;
+	export let audioSeekable = 7;
+	export let audioPlayed = 8;
+
+	export let videoDuration = 9;
+	export let videoBuffered = 10;
+	export let videoSeekable = 11;
+	export let videoPlayed = 12;
+
+	export let value = '/some/file';
+</script>
+
+<div
+	bind:clientWidth
+	bind:clientHeight
+	bind:offsetWidth
+	bind:offsetHeight
+></div>
+
+<audio
+	bind:duration="{audioDuration}"
+	bind:buffered="{audioBuffered}"
+	bind:seekable="{audioSeekable}"
+	bind:played="{audioPlayed}"
+></audio>
+
+<video
+	bind:duration="{videoDuration}"
+	bind:buffered="{videoBuffered}"
+	bind:seekable="{videoSeekable}"
+	bind:played="{videoPlayed}"
+></video>
+
+<input
+  type="file"
+	bind:value
+/>
diff --git a/test/server-side-rendering/samples/text-area-bind/_expected.html b/test/server-side-rendering/samples/text-area-bind/_expected.html
new file mode 100644
index 0000000000..c3c8441f56
--- /dev/null
+++ b/test/server-side-rendering/samples/text-area-bind/_expected.html
@@ -0,0 +1 @@
+<textarea>hello</textarea>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/text-area-bind/main.svelte b/test/server-side-rendering/samples/text-area-bind/main.svelte
new file mode 100644
index 0000000000..7126e09375
--- /dev/null
+++ b/test/server-side-rendering/samples/text-area-bind/main.svelte
@@ -0,0 +1,5 @@
+<script>
+	  let value = 'hello';
+</script>
+
+<textarea bind:value></textarea>
\ No newline at end of file
diff --git a/test/setup.js b/test/setup.js
index 8bb73d81d0..7406a07dd9 100644
--- a/test/setup.js
+++ b/test/setup.js
@@ -7,7 +7,7 @@ process.env.TEST = true;
 require.extensions['.js'] = function(module, filename) {
 	const exports = [];
 
-	var code = fs.readFileSync(filename, 'utf-8')
+	let code = fs.readFileSync(filename, 'utf-8')
 		.replace(/^import \* as (\w+) from ['"]([^'"]+)['"];?/gm, 'var $1 = require("$2");')
 		.replace(/^import (\w+) from ['"]([^'"]+)['"];?/gm, 'var {default: $1} = require("$2");')
 		.replace(/^import {([^}]+)} from ['"](.+)['"];?/gm, 'var {$1} = require("$2");')
@@ -35,4 +35,4 @@ require.extensions['.js'] = function(module, filename) {
 		console.log(code); // eslint-disable-line no-console
 		throw err;
 	}
-};
\ No newline at end of file
+};
diff --git a/test/sourcemaps/index.js b/test/sourcemaps/index.js
index 79028719b9..ee169ebe1b 100644
--- a/test/sourcemaps/index.js
+++ b/test/sourcemaps/index.js
@@ -1,7 +1,7 @@
 import * as fs from "fs";
 import * as path from "path";
 import * as assert from "assert";
-import { loadConfig, svelte } from "../helpers.js";
+import { svelte } from "../helpers.js";
 import { SourceMapConsumer } from "source-map";
 import { getLocator } from "locate-character";
 
@@ -18,8 +18,6 @@ describe("sourcemaps", () => {
 		}
 
 		(solo ? it.only : skip ? it.skip : it)(dir, () => {
-			const config = loadConfig(`./sourcemaps/samples/${dir}/_config.js`);
-
 			const filename = path.resolve(
 				`test/sourcemaps/samples/${dir}/input.svelte`
 			);
diff --git a/test/store/index.js b/test/store/index.ts
similarity index 65%
rename from test/store/index.js
rename to test/store/index.ts
index 44617d6d00..bb999f1220 100644
--- a/test/store/index.js
+++ b/test/store/index.ts
@@ -1,5 +1,5 @@
 import * as assert from 'assert';
-import { readable, writable, derived, get } from '../../store.js';
+import { readable, writable, derived, get } from '../../store';
 
 describe('store', () => {
 	describe('writable', () => {
@@ -30,10 +30,10 @@ describe('store', () => {
 				return () => called -= 1;
 			});
 
-			const unsubscribe1 = store.subscribe(() => {});
+			const unsubscribe1 = store.subscribe(() => { });
 			assert.equal(called, 1);
 
-			const unsubscribe2 = store.subscribe(() => {});
+			const unsubscribe2 = store.subscribe(() => { });
 			assert.equal(called, 1);
 
 			unsubscribe1();
@@ -49,7 +49,7 @@ describe('store', () => {
 
 			const store = writable(obj);
 
-			store.subscribe(value => {
+			store.subscribe(() => {
 				called += 1;
 			});
 
@@ -73,7 +73,7 @@ describe('store', () => {
 				set(0);
 
 				return () => {
-					tick = () => {};
+					tick = () => { };
 					running = false;
 				};
 			});
@@ -189,6 +189,34 @@ describe('store', () => {
 			unsubscribe();
 		});
 
+		it('prevents diamond dependency problem', () => {
+			const count = writable(0);
+			const values = [];
+
+			const a = derived(count, $count => {
+				return 'a' + $count;
+			});
+
+			const b = derived(count, $count => {
+				return 'b' + $count;
+			});
+
+			const combined = derived([a, b], ([a, b]) => {
+				return a + b;
+			});
+
+			const unsubscribe = combined.subscribe(v => {
+				values.push(v);
+			});
+
+			assert.deepEqual(values, ['a0b0']);
+
+			count.set(1);
+			assert.deepEqual(values, ['a0b0', 'a1b1']);
+
+			unsubscribe();
+		});
+
 		it('is updated with safe_not_equal logic', () => {
 			const arr = [0];
 
@@ -211,11 +239,78 @@ describe('store', () => {
 
 			unsubscribe();
 		});
+
+		it('calls a cleanup function', () => {
+			const num = writable(1);
+
+			const values = [];
+			const cleaned_up = [];
+
+			const d = derived(num, ($num, set) => {
+				set($num * 2);
+
+				return function cleanup() {
+					cleaned_up.push($num);
+				};
+			});
+
+			num.set(2);
+
+			const unsubscribe = d.subscribe(value => {
+				values.push(value);
+			});
+
+			num.set(3);
+			num.set(4);
+
+			assert.deepEqual(values, [4, 6, 8]);
+			assert.deepEqual(cleaned_up, [2, 3]);
+
+			unsubscribe();
+
+			assert.deepEqual(cleaned_up, [2, 3, 4]);
+		});
+
+		it('discards non-function return values', () => {
+			const num = writable(1);
+
+			const values = [];
+
+			const d = derived(num, ($num, set) => {
+				set($num * 2);
+				return {};
+			});
+
+			num.set(2);
+
+			const unsubscribe = d.subscribe(value => {
+				values.push(value);
+			});
+
+			num.set(3);
+			num.set(4);
+
+			assert.deepEqual(values, [4, 6, 8]);
+
+			unsubscribe();
+		});
+
+		it('allows derived with different types', () => {
+			const a = writable('one');
+			const b = writable(1);
+			const c = derived([a, b], ([a, b]) => `${a} ${b}`);
+
+			assert.deepEqual(get(c), 'one 1');
+
+			a.set('two');
+			b.set(2);
+			assert.deepEqual(get(c), 'two 2');
+		});
 	});
 
 	describe('get', () => {
 		it('gets the current value of a store', () => {
-			const store = readable(42, () => {});
+			const store = readable(42, () => { });
 			assert.equal(get(store), 42);
 		});
 	});
diff --git a/test/test.js b/test/test.js
index 993b1f637c..7759941dbb 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2,6 +2,6 @@ const glob = require("tiny-glob/sync.js");
 
 require("./setup");
 
-glob("*/index.js", { cwd: "test" }).forEach(function(file) {
+glob("*/index.{js,ts}", { cwd: "test" }).forEach((file) => {
 	require("./" + file);
-});
\ No newline at end of file
+});
diff --git a/test/validator/index.js b/test/validator/index.js
index b26b087bb3..1e54cc20db 100644
--- a/test/validator/index.js
+++ b/test/validator/index.js
@@ -24,7 +24,7 @@ describe("validate", () => {
 			let error;
 
 			try {
-				let { warnings } = svelte.compile(input, {
+				const { warnings } = svelte.compile(input, {
 					dev: config.dev,
 					legacy: config.legacy,
 					generate: false
@@ -59,7 +59,7 @@ describe("validate", () => {
 					assert.deepEqual(error.end, expected.end);
 					assert.equal(error.pos, expected.pos);
 				} catch (e) {
-					console.error(error)
+					console.error(error); // eslint-disable-line no-console
 					throw e;
 				}
 			}
diff --git a/test/validator/samples/attribute-expected-equals/errors.json b/test/validator/samples/attribute-expected-equals/errors.json
new file mode 100644
index 0000000000..a3fa9d3cac
--- /dev/null
+++ b/test/validator/samples/attribute-expected-equals/errors.json
@@ -0,0 +1,15 @@
+[{
+	"code": "unexpected-token",
+	"message": "Expected =",
+	"start": {
+		"line": 5,
+		"column": 9,
+		"character": 50
+	},
+	"end": {
+		"line": 5,
+		"column": 9,
+		"character": 50
+	},
+	"pos": 50
+}]
diff --git a/test/validator/samples/attribute-expected-equals/input.svelte b/test/validator/samples/attribute-expected-equals/input.svelte
new file mode 100644
index 0000000000..91f4b0ca7b
--- /dev/null
+++ b/test/validator/samples/attribute-expected-equals/input.svelte
@@ -0,0 +1,5 @@
+<script>
+	let name = 'world';
+</script>
+
+<h1 class"=foo">Hello {name}!</h1>
diff --git a/test/validator/samples/component-namespaced/input.svelte b/test/validator/samples/component-namespaced/input.svelte
new file mode 100644
index 0000000000..996d2d8769
--- /dev/null
+++ b/test/validator/samples/component-namespaced/input.svelte
@@ -0,0 +1,5 @@
+<script>
+	import * as NS from 'some-library';
+</script>
+
+<NS.Foo/>
\ No newline at end of file
diff --git a/test/validator/samples/component-namespaced/warnings.json b/test/validator/samples/component-namespaced/warnings.json
new file mode 100644
index 0000000000..0637a088a0
--- /dev/null
+++ b/test/validator/samples/component-namespaced/warnings.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/test/vars/samples/component-namespaced/_config.js b/test/vars/samples/component-namespaced/_config.js
new file mode 100644
index 0000000000..ac63873967
--- /dev/null
+++ b/test/vars/samples/component-namespaced/_config.js
@@ -0,0 +1,16 @@
+export default {
+	test(assert, vars) {
+		assert.deepEqual(vars, [
+			{
+				name: 'NS',
+				export_name: null,
+				injected: false,
+				module: false,
+				mutated: false,
+				reassigned: false,
+				referenced: true,
+				writable: false
+			}
+		]);
+	}
+};
\ No newline at end of file
diff --git a/test/vars/samples/component-namespaced/input.svelte b/test/vars/samples/component-namespaced/input.svelte
new file mode 100644
index 0000000000..996d2d8769
--- /dev/null
+++ b/test/vars/samples/component-namespaced/input.svelte
@@ -0,0 +1,5 @@
+<script>
+	import * as NS from 'some-library';
+</script>
+
+<NS.Foo/>
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index fdb7367e05..07bc24acaf 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,18 +1,33 @@
 {
-    "compilerOptions": {
-        "target": "ES6",
-        "diagnostics": true,
-        "noImplicitThis": true,
-        "noEmitOnError": true,
-        "allowJs": true,
-        "lib": ["es5", "es6", "dom"],
-        "importHelpers": true,
-        "moduleResolution": "node"
-    },
-    "include": [
-        "src"
-    ],
-    "exclude": [
-        "node_modules"
-    ]
+	"compilerOptions": {
+		"target": "es2015",
+		"module": "es6",
+		"declaration": true,
+		"declarationDir": "types",
+		"noImplicitThis": true,
+		"noUnusedLocals": true,
+		"noUnusedParameters": true,
+		"noEmitOnError": true,
+		"lib": [
+			"es5",
+			"es6",
+			"dom",
+			"es2015"
+		],
+		"importHelpers": true,
+		"moduleResolution": "node",
+		"baseUrl": ".",
+		"paths": {
+			"svelte/internal": ["./src/runtime/internal/index"],
+			"svelte/easing": ["./src/runtime/easing/index"],
+			"svelte/motion": ["./src/runtime/motion/index"],
+			"svelte/store": ["./src/runtime/store/index"]
+		},
+		"typeRoots": [
+			"node_modules/@types"
+		]
+	},
+	"include": [
+		"src/**/*"
+	]
 }