diff --git a/.eslintrc.json b/.eslintrc.json
index 8140b7cd91..340b9a0e12 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -5,7 +5,6 @@
         "semi": [ 2, "always" ],
         "keyword-spacing": [ 2, { "before": true, "after": true } ],
         "space-before-blocks": [ 2, "always" ],
-        "space-before-function-paren": [ 2, "always" ],
         "no-mixed-spaces-and-tabs": [ 2, "smart-tabs" ],
         "no-cond-assign": 0,
         "no-unused-vars": 2,
@@ -34,6 +33,9 @@
         "plugin:import/errors",
         "plugin:import/warnings"
     ],
+    "plugins": [
+        "html"
+    ],
     "parserOptions": {
         "ecmaVersion": 6,
         "sourceType": "module"
diff --git a/.gitignore b/.gitignore
index a31f1af75b..e50eb0cb41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ test/sourcemaps/samples/*/output.js
 test/sourcemaps/samples/*/output.js.map
 _actual.*
 tmp
+_actual-bundle.*
+src/generators/dom/shared.ts
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 017a2219b8..9767660858 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,124 @@
 # Svelte changelog
 
+## 1.23.4
+
+* Don't recreate if blocks incorrectly ([#669](https://github.com/sveltejs/svelte/pull/669))
+
+## 1.23.3
+
+* Pass parameters to `get_block` ([#667](https://github.com/sveltejs/svelte/issues/667))
+
+## 1.23.2
+
+* Fix if blocks being recreated on update ([#665](https://github.com/sveltejs/svelte/issues/665))
+
+## 1.23.1
+
+* Fix each-else blocks that are empty on initial render ([#662](https://github.com/sveltejs/svelte/issues/662))
+
+## 1.23.0
+
+* Hydration ([#649](https://github.com/sveltejs/svelte/pull/649))
+* Correctly transform CSS selectors with pseudo-elements ([#658](https://github.com/sveltejs/svelte/issues/658))
+
+## 1.22.5
+
+* Fix nested component unmounting bug ([#643](https://github.com/sveltejs/svelte/issues/643)) 
+
+## 1.22.4
+
+* Include `ast` in `svelte.compile` return value ([#632](https://github.com/sveltejs/svelte/issues/632))
+* Set initial value of `<select>` binding, if unspecified ([#639](https://github.com/sveltejs/svelte/issues/639))
+* Mark indirect dependencies of `<select>` bindings (i.e. the dependencies of their `<option>` values) ([#639](https://github.com/sveltejs/svelte/issues/639))
+
+## 1.22.3
+
+* Fix nested component unmounting bug ([#625](https://github.com/sveltejs/svelte/issues/625))
+* Allow components to have computed member expression bindings ([#624](https://github.com/sveltejs/svelte/issues/624))
+* Handle empty `<style>` tags ([#634](https://github.com/sveltejs/svelte/issues/634))
+* Warn on missing component ([#623](https://github.com/sveltejs/svelte/issues/623))
+* Allow dynamic `type` attribute for unbound inputs ([#620](https://github.com/sveltejs/svelte/issues/620))
+* Rename `addEventListener` and `removeEventListener` directives ([#621](https://github.com/sveltejs/svelte/issues/621))
+
+## 1.22.2
+
+* Escape template strings correctly in SSR output ([#616](https://github.com/sveltejs/svelte/issues/616))
+* Prevent magic-string deprecation warning ([#617](https://github.com/sveltejs/svelte/pull/617))
+
+## 1.22.1
+
+* Sanitise event handler names ([#612](https://github.com/sveltejs/svelte/issues/612))
+
+## 1.22.0
+
+* Symmetry between `mount` and `unmount`. This is potentially a breaking change if your components import other components that were precompiled with an earlier version of Svelte ([#592](https://github.com/sveltejs/svelte/issues/592))
+* Add `cascade` option, which prevents styles affecting child components if `false`, unless selectors are wrapped in `:global(...)` and keyframe declaration IDs are prefixed with `-global-`. This will become the default behaviour in v2 ([#583](https://github.com/sveltejs/svelte/issues/583))
+* Support binding to computed member expressions ([#602](https://github.com/sveltejs/svelte/issues/602))
+* Coerce empty string in `number`/`range` inputs to `undefined`, not `0` ([#584](https://github.com/sveltejs/svelte/issues/584))
+* Fix insert location of DOM elements in each/if/nested component edge cases ([#610](https://github.com/sveltejs/svelte/issues/610))
+
+## 1.21.0
+
+* Always use `helpers` if referenced, not just for call expressions ([#575](https://github.com/sveltejs/svelte/issues/575))
+* Fix parsing of `<textarea>` children ([#599](https://github.com/sveltejs/svelte/pull/599))
+* Treat `<textarea>` value attributes and children as equivalent, and fail validation if both are present ([#599](https://github.com/sveltejs/svelte/pull/599))
+* Fix `<textarea>` SSR ([#599](https://github.com/sveltejs/svelte/pull/599))
+* Apply CSS transition styles immediately if transition has delay ([#574](https://github.com/sveltejs/svelte/issues/574))
+* Ensure `transitionManager` is treeshakeable ([#593](https://github.com/sveltejs/svelte/issues/593))
+* Fix for environments where `node.style.animation` is undefined ([#587](https://github.com/sveltejs/svelte/issues/587))
+* Fix order of operations when dealing with `<select>` elements ([#590](https://github.com/sveltejs/svelte/issues/590))
+* Downgrade 'invalid callee' to a warning ([#579](https://github.com/sveltejs/svelte/issues/579))
+* Convert to TypeScript ([#573](https://github.com/sveltejs/svelte/pull/573))
+
+## 1.20.2
+
+* Fix destruction of compound if-blocks with outros ([#572](https://github.com/sveltejs/svelte/pull/572))
+
+## 1.20.1
+
+* Fix insertion order of `if` blocks and their anchors ([#569](https://github.com/sveltejs/svelte/issues/569))
+
+## 1.20.0
+
+* Faster, better updates of keyed each blocks ([#373](https://github.com/sveltejs/svelte/issues/373), [#543](https://github.com/sveltejs/svelte/issues/543))
+* Use element IDs to robustly track dynamically injected `<style>` tags ([#554](https://github.com/sveltejs/svelte/issues/554))
+* Abort outros before corresponding intros ([#546](https://github.com/sveltejs/svelte/issues/546))
+* Generate less code for `if` blocks with `else` blocks ([#540](https://github.com/sveltejs/svelte/issues/540))
+* Ensure `{{yield}}` block content is injected into the right place ([#561](https://github.com/sveltejs/svelte/issues/561))
+* Simpler, more readable codegen code ([#559](https://github.com/sveltejs/svelte/pull/559))
+* Validate transition directives ([#564](https://github.com/sveltejs/svelte/issues/564))
+* Apply delays to bidirectional transitions ([#562](https://github.com/sveltejs/svelte/issues/562))
+* Handle all valid HTML entities ([#565](https://github.com/sveltejs/svelte/pull/565))
+* Fix outros on compound `if` blocks ([#565](https://github.com/sveltejs/svelte/pull/565))
+* Validation for `<:Window>` tags ([#565](https://github.com/sveltejs/svelte/pull/565))
+* Increased test coverage ([#565](https://github.com/sveltejs/svelte/pull/565))
+
+## 1.19.1
+
+* Export `generateKeyframes`, so that CSS transitions work
+
+## 1.19.0
+
+* Experimental support for transitions ([#7](https://github.com/sveltejs/svelte/issues/7))
+* Use `querySelector(':checked')` instead of `selectedOptions` ([#539](https://github.com/sveltejs/svelte/issues/539))
+* Stringify helpers before bundling them, to avoid renaming errors ([#538](https://github.com/sveltejs/svelte/issues/538))
+
+## 1.18.2
+
+* Parenthesize if-block conditions ([#532](https://github.com/sveltejs/svelte/issues/532))
+* Fix parsing of parenthesized expressions ([#534](https://github.com/sveltejs/svelte/issues/534))
+* Fix error on `bind:checked` that doesn't belong to a checkbox input ([#529](https://github.com/sveltejs/svelte/pull/529))
+
+## 1.18.1
+
+* Allow `destroy()` in event handlers ([#523](https://github.com/sveltejs/svelte/issues/523))
+* Fix bug with `{{yield}}` blocks following elements ([#524](https://github.com/sveltejs/svelte/issues/524))
+
+## 1.18.0
+
+* Visit `<select>` attributes after children, to ensure options are in the right state ([#521](https://github.com/sveltejs/svelte/pull/521))
+* Use sibling elements as anchors rather than creating comment nodes wherever possible ([#3](https://github.com/sveltejs/svelte/issues/3))
+
 ## 1.17.2
 
 * Replace bad characters when creating variable names based on element names ([#516](https://github.com/sveltejs/svelte/issues/516))
diff --git a/README.md b/README.md
index f116e2eeb1..c50a07810d 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ const { code, map } = svelte.compile( source, {
 
 The Svelte compiler exposes the following API:
 
-* `compile( source [, options ] ) => { code, map }` - Compile the component with the given options (see below). Returns an object containing the compiled JavaScript and a sourcemap.
+* `compile( source [, options ] ) => { code, map, ast, css }` - Compile the component with the given options (see below). Returns an object containing the compiled JavaScript, a sourcemap, an AST and transformed CSS.
 * `create( source [, options ] ) => function` - Compile the component and return the component itself.
 * `VERSION` - The version of this copy of the Svelte compiler as a string, `'x.x.x'`.
 
@@ -77,6 +77,7 @@ The Svelte compiler optionally takes a second argument, an object of configurati
 | `name` | `string` | The name of the constructor in the compiled component. | `'SvelteComponent'` |
 | `filename` | `string` | The filename to use in sourcemaps and compiler error and warning messages. | `'SvelteComponent.html'` |
 | `amd`.`id` | `string` | The AMD module ID to use for the `'amd'` and `'umd'` output formats. | `undefined` |
+| `cascade` | `true`, `false` | Whether to cascade all of the component's styles to child components. If `false`, only selectors wrapped in `:global(...)` and keyframe IDs beginning with `-global-` are cascaded. | `true` |
 | `shared` | `true`, `false`, `string` | Whether to import various helpers from a shared external library. When you have a project with multiple components, this reduces the overall size of your JavaScript bundle, at the expense of having immediately-usable component. You can pass a string of the module path to use, or `true` will import from `'svelte/shared.js'`. | `false` |
 | `dev` | `true`, `false` | Whether to enable run-time checks in the compiled component. These are helpful during development, but slow your component down. | `false` |
 | `css` | `true`, `false` | Whether to include code to inject your component's styles into the DOM. | `true` |
diff --git a/mocha.coverage.opts b/mocha.coverage.opts
index 27e9bc5f94..1513d44a4b 100644
--- a/mocha.coverage.opts
+++ b/mocha.coverage.opts
@@ -1,5 +1,5 @@
 --require babel-register
 --require reify
- --recursive
+--recursive
 ./**/__test__.js
 test/*/index.js
diff --git a/mocha.opts b/mocha.opts
index 4e8a550a4c..af6b17a845 100644
--- a/mocha.opts
+++ b/mocha.opts
@@ -1 +1,2 @@
-test/test.js
+--bail
+test/test.js
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000000..1a3217e3f2
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,1449 @@
+{
+  "name": "svelte",
+  "version": "1.22.2",
+  "lockfileVersion": 1,
+  "dependencies": {
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+      "dev": true
+    },
+    "chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true
+    },
+    "magic-string": {
+      "version": "0.21.3",
+      "dev": true,
+      "dependencies": {
+        "abbrev": {
+          "version": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
+          "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU="
+        },
+        "acorn": {
+          "version": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo="
+        },
+        "acorn-jsx": {
+          "version": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+          "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s="
+        },
+        "acorn-object-spread": {
+          "version": "https://registry.npmjs.org/acorn-object-spread/-/acorn-object-spread-1.0.0.tgz",
+          "integrity": "sha1-SOrQ9KjrFplaF6Dbn/xqyq2kumg="
+        },
+        "ajv": {
+          "version": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY="
+        },
+        "ajv-keywords": {
+          "version": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
+          "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw="
+        },
+        "align-text": {
+          "version": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+          "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc="
+        },
+        "amdefine": {
+          "version": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+          "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
+        },
+        "ansi-escapes": {
+          "version": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
+          "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4="
+        },
+        "ansi-regex": {
+          "version": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+        },
+        "ansi-styles": {
+          "version": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+        },
+        "argparse": {
+          "version": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
+          "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY="
+        },
+        "array-differ": {
+          "version": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+          "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE="
+        },
+        "array-find-index": {
+          "version": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+          "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
+        },
+        "array-union": {
+          "version": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+          "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk="
+        },
+        "array-uniq": {
+          "version": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+          "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
+        },
+        "arrify": {
+          "version": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+          "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
+        },
+        "asn1": {
+          "version": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+          "integrity": "sha1-VZvhg3bQik7E2+gId9J4GGObLfc=",
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+          "integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=",
+          "optional": true
+        },
+        "async": {
+          "version": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+          "integrity": "sha1-xXED96F/wDfwLXwuZLYC6iI/fWM=",
+          "optional": true
+        },
+        "babel-code-frame": {
+          "version": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
+          "integrity": "sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ="
+        },
+        "balanced-match": {
+          "version": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
+        },
+        "beeper": {
+          "version": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
+          "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak="
+        },
+        "bl": {
+          "version": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz",
+          "integrity": "sha1-wGt5evCF6gC8Unr8jvzxHeIjIFQ="
+        },
+        "boom": {
+          "version": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
+          "integrity": "sha1-emNune1O/O+xnO9JR6PGffrukRs="
+        },
+        "brace-expansion": {
+          "version": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
+          "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k="
+        },
+        "browser-resolve": {
+          "version": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz",
+          "integrity": "sha1-j/CbCixCFxihBRwmCzLkj0QpOM4=",
+          "dependencies": {
+            "resolve": {
+              "version": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+              "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
+            }
+          }
+        },
+        "browser-stdout": {
+          "version": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
+          "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8="
+        },
+        "buble": {
+          "version": "https://registry.npmjs.org/buble/-/buble-0.14.3.tgz",
+          "integrity": "sha1-Z4yx/CTckOWtoEfeql3cb22omD4="
+        },
+        "buffer-shims": {
+          "version": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+          "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E="
+        },
+        "builtin-modules": {
+          "version": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+          "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
+        },
+        "caller-path": {
+          "version": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+          "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8="
+        },
+        "callsites": {
+          "version": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+          "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo="
+        },
+        "camelcase": {
+          "version": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+          "optional": true
+        },
+        "camelcase-keys": {
+          "version": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+          "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+          "dependencies": {
+            "camelcase": {
+              "version": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+              "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
+            }
+          }
+        },
+        "caseless": {
+          "version": "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz",
+          "integrity": "sha1-gWfBq4OX+1u5X5bSjlqBxQ8kesQ="
+        },
+        "center-align": {
+          "version": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+          "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+          "optional": true
+        },
+        "chalk": {
+          "version": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg="
+        },
+        "circular-json": {
+          "version": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz",
+          "integrity": "sha1-vos2rvzN6LPKeqLWr8B6NyQsDS0="
+        },
+        "cli-cursor": {
+          "version": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+          "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc="
+        },
+        "cli-width": {
+          "version": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz",
+          "integrity": "sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao="
+        },
+        "cliui": {
+          "version": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+          "optional": true,
+          "dependencies": {
+            "wordwrap": {
+              "version": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+              "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+              "optional": true
+            }
+          }
+        },
+        "clone": {
+          "version": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+          "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk="
+        },
+        "clone-stats": {
+          "version": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+          "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE="
+        },
+        "co": {
+          "version": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+        },
+        "code-point-at": {
+          "version": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+        },
+        "codecov.io": {
+          "version": "https://registry.npmjs.org/codecov.io/-/codecov.io-0.1.6.tgz",
+          "integrity": "sha1-Wd/QLaH/McL7K5Uq2K0W/TeBtyg="
+        },
+        "combined-stream": {
+          "version": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "integrity": "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8=",
+          "optional": true
+        },
+        "commander": {
+          "version": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+          "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q="
+        },
+        "concat-map": {
+          "version": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+        },
+        "concat-stream": {
+          "version": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
+          "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
+          "dependencies": {
+            "isarray": {
+              "version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+            },
+            "readable-stream": {
+              "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
+              "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g="
+            },
+            "string_decoder": {
+              "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
+              "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg="
+            }
+          }
+        },
+        "console-group": {
+          "version": "https://registry.npmjs.org/console-group/-/console-group-0.3.3.tgz",
+          "integrity": "sha1-bY62uda3V6KJUoT2LQnHrUPyu84="
+        },
+        "core-util-is": {
+          "version": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+        },
+        "cryptiles": {
+          "version": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
+          "integrity": "sha1-7ZH/HxetE9N0gohZT4pIoNJvMlw=",
+          "optional": true
+        },
+        "ctype": {
+          "version": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+          "integrity": "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=",
+          "optional": true
+        },
+        "currently-unhandled": {
+          "version": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+          "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o="
+        },
+        "d": {
+          "version": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+          "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8="
+        },
+        "dateformat": {
+          "version": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
+          "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk="
+        },
+        "debug": {
+          "version": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw="
+        },
+        "decamelize": {
+          "version": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+        },
+        "deep-equal": {
+          "version": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz",
+          "integrity": "sha1-skbCuApXCkfBG+HZvRBw7IeLh84="
+        },
+        "deep-is": {
+          "version": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+          "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+        },
+        "defined": {
+          "version": "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz",
+          "integrity": "sha1-817qfXBekzuvE7LwOz+D2SFAOz4="
+        },
+        "del": {
+          "version": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+          "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag="
+        },
+        "delayed-stream": {
+          "version": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+          "integrity": "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8=",
+          "optional": true
+        },
+        "diff": {
+          "version": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
+          "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k="
+        },
+        "doctrine": {
+          "version": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
+          "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=",
+          "dependencies": {
+            "isarray": {
+              "version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+            }
+          }
+        },
+        "duplexer": {
+          "version": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+          "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E="
+        },
+        "duplexer2": {
+          "version": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+          "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
+          "dependencies": {
+            "readable-stream": {
+              "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+              "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk="
+            }
+          }
+        },
+        "error-ex": {
+          "version": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
+          "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw="
+        },
+        "es5-ext": {
+          "version": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.21.tgz",
+          "integrity": "sha1-Gacl+eUdAwC7wejoIRCf2dr1WSU="
+        },
+        "es6-iterator": {
+          "version": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz",
+          "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI="
+        },
+        "es6-map": {
+          "version": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
+          "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA="
+        },
+        "es6-set": {
+          "version": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
+          "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE="
+        },
+        "es6-symbol": {
+          "version": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+          "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc="
+        },
+        "es6-weak-map": {
+          "version": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
+          "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8="
+        },
+        "escape-string-regexp": {
+          "version": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+        },
+        "escodegen": {
+          "version": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
+          "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
+          "dependencies": {
+            "esprima": {
+              "version": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+              "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
+            },
+            "estraverse": {
+              "version": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
+              "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q="
+            },
+            "source-map": {
+              "version": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
+              "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
+              "optional": true
+            }
+          }
+        },
+        "escope": {
+          "version": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
+          "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM="
+        },
+        "eslint": {
+          "version": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz",
+          "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw="
+        },
+        "espree": {
+          "version": "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz",
+          "integrity": "sha1-KRC1zNSc6JPC//+qtP2LOjG4I3Q=",
+          "dependencies": {
+            "acorn": {
+              "version": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz",
+              "integrity": "sha1-xGDfCEkUY/AozLguqzcwvwEIez0="
+            }
+          }
+        },
+        "esprima": {
+          "version": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
+        },
+        "esquery": {
+          "version": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
+          "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo="
+        },
+        "esrecurse": {
+          "version": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.1.0.tgz",
+          "integrity": "sha1-RxO2U2rffyrE8yfVWed1a/9kgiA=",
+          "dependencies": {
+            "estraverse": {
+              "version": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz",
+              "integrity": "sha1-9srKcokzqFDvkGYdDheYK6RxEaI="
+            }
+          }
+        },
+        "estraverse": {
+          "version": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+          "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
+        },
+        "estree-walker": {
+          "version": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.2.1.tgz",
+          "integrity": "sha1-va/oCVOD2EFNXcLs9MkXO225QS4="
+        },
+        "esutils": {
+          "version": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+          "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
+        },
+        "event-emitter": {
+          "version": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+          "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk="
+        },
+        "exit-hook": {
+          "version": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
+          "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g="
+        },
+        "fancy-log": {
+          "version": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz",
+          "integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg="
+        },
+        "fast-levenshtein": {
+          "version": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+          "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+        },
+        "figures": {
+          "version": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+          "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4="
+        },
+        "file-entry-cache": {
+          "version": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+          "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E="
+        },
+        "fileset": {
+          "version": "https://registry.npmjs.org/fileset/-/fileset-0.2.1.tgz",
+          "integrity": "sha1-WI74lzxmI7KnbfRlEFaWuWqsgGc=",
+          "dependencies": {
+            "glob": {
+              "version": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+              "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E="
+            },
+            "minimatch": {
+              "version": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+              "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc="
+            }
+          }
+        },
+        "find-up": {
+          "version": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8="
+        },
+        "flat-cache": {
+          "version": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz",
+          "integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y="
+        },
+        "forever-agent": {
+          "version": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+          "integrity": "sha1-bQ4JxJIflKJ/Y9O0nF/v8epMUTA="
+        },
+        "form-data": {
+          "version": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+          "integrity": "sha1-kavXiKupcCsaq/qLwBAxoqyeOxI=",
+          "optional": true
+        },
+        "fs.realpath": {
+          "version": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+        },
+        "generate-function": {
+          "version": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
+          "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ="
+        },
+        "generate-object-property": {
+          "version": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+          "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA="
+        },
+        "get-stdin": {
+          "version": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+          "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
+        },
+        "glob": {
+          "version": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU="
+        },
+        "globals": {
+          "version": "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz",
+          "integrity": "sha1-DAymltm5u2lNLlRwvTd3fKrVAoY="
+        },
+        "globby": {
+          "version": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+          "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0="
+        },
+        "glogg": {
+          "version": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
+          "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U="
+        },
+        "graceful-fs": {
+          "version": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+        },
+        "graceful-readlink": {
+          "version": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+          "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
+        },
+        "growl": {
+          "version": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
+          "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8="
+        },
+        "gulp-util": {
+          "version": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz",
+          "integrity": "sha1-eJJcS4+LSQBawBoBHFV+YhiUHLs=",
+          "dependencies": {
+            "object-assign": {
+              "version": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+              "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I="
+            }
+          }
+        },
+        "gulplog": {
+          "version": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+          "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U="
+        },
+        "handlebars": {
+          "version": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz",
+          "integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=",
+          "dependencies": {
+            "async": {
+              "version": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+              "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
+            },
+            "source-map": {
+              "version": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+              "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s="
+            }
+          }
+        },
+        "has-ansi": {
+          "version": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE="
+        },
+        "has-flag": {
+          "version": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "has-gulplog": {
+          "version": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
+          "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4="
+        },
+        "hawk": {
+          "version": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+          "integrity": "sha1-h81JH5tG5OKurKM1QWdmiF0tHtk=",
+          "optional": true
+        },
+        "hoek": {
+          "version": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
+          "integrity": "sha1-PTIkYrrfB3Fup+uFuviAec3c5QU="
+        },
+        "hosted-git-info": {
+          "version": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz",
+          "integrity": "sha1-AHa59GonBQbduq6lZJaJdGBhKmc="
+        },
+        "http-signature": {
+          "version": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+          "integrity": "sha1-T72sEyVZqoMjEh5UB3nAoBKyfmY=",
+          "optional": true
+        },
+        "ignore": {
+          "version": "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz",
+          "integrity": "sha1-QyNS5XrM2HqzEQ6C0/6g5HgSFW0="
+        },
+        "imurmurhash": {
+          "version": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+          "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+        },
+        "indent-string": {
+          "version": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+          "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA="
+        },
+        "inflight": {
+          "version": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk="
+        },
+        "inherits": {
+          "version": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+        },
+        "inquirer": {
+          "version": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
+          "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34="
+        },
+        "interpret": {
+          "version": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz",
+          "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A="
+        },
+        "is-arrayish": {
+          "version": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+          "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+        },
+        "is-buffer": {
+          "version": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
+          "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw="
+        },
+        "is-builtin-module": {
+          "version": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+          "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74="
+        },
+        "is-finite": {
+          "version": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+          "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko="
+        },
+        "is-fullwidth-code-point": {
+          "version": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs="
+        },
+        "is-my-json-valid": {
+          "version": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz",
+          "integrity": "sha1-8Hndm/2uZe4gOKrorLyGqxCeNpM="
+        },
+        "is-path-cwd": {
+          "version": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+          "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0="
+        },
+        "is-path-in-cwd": {
+          "version": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
+          "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw="
+        },
+        "is-path-inside": {
+          "version": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
+          "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838="
+        },
+        "is-property": {
+          "version": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+          "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ="
+        },
+        "is-resolvable": {
+          "version": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz",
+          "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI="
+        },
+        "is-utf8": {
+          "version": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+          "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+        },
+        "isarray": {
+          "version": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+        },
+        "isexe": {
+          "version": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+          "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+        },
+        "istanbul": {
+          "version": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
+          "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
+          "dependencies": {
+            "async": {
+              "version": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+              "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
+            },
+            "esprima": {
+              "version": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+              "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
+            },
+            "glob": {
+              "version": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+              "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E="
+            },
+            "resolve": {
+              "version": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+              "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
+            },
+            "supports-color": {
+              "version": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+              "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY="
+            }
+          }
+        },
+        "js-tokens": {
+          "version": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz",
+          "integrity": "sha1-COnxMkhKLEWjCQfp3E1VZ7fxFNc="
+        },
+        "js-yaml": {
+          "version": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz",
+          "integrity": "sha1-UgtFZPhlc7qWZir4Woyvp7S1pvY="
+        },
+        "json-stable-stringify": {
+          "version": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+          "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8="
+        },
+        "json-stringify-safe": {
+          "version": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+          "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+        },
+        "json3": {
+          "version": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+          "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE="
+        },
+        "jsonify": {
+          "version": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+          "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
+        },
+        "jsonpointer": {
+          "version": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
+          "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk="
+        },
+        "kind-of": {
+          "version": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ="
+        },
+        "lazy-cache": {
+          "version": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+          "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+          "optional": true
+        },
+        "levn": {
+          "version": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+          "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4="
+        },
+        "load-json-file": {
+          "version": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+          "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+          "dependencies": {
+            "strip-bom": {
+              "version": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+              "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4="
+            }
+          }
+        },
+        "lodash": {
+          "version": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+        },
+        "lodash._baseassign": {
+          "version": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+          "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4="
+        },
+        "lodash._basecopy": {
+          "version": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+          "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
+        },
+        "lodash._basecreate": {
+          "version": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
+          "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE="
+        },
+        "lodash._basetostring": {
+          "version": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
+          "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U="
+        },
+        "lodash._basevalues": {
+          "version": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
+          "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc="
+        },
+        "lodash._getnative": {
+          "version": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+          "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
+        },
+        "lodash._isiterateecall": {
+          "version": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+          "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
+        },
+        "lodash._reescape": {
+          "version": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
+          "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo="
+        },
+        "lodash._reevaluate": {
+          "version": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
+          "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0="
+        },
+        "lodash._reinterpolate": {
+          "version": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+          "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
+        },
+        "lodash._root": {
+          "version": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
+          "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI="
+        },
+        "lodash.create": {
+          "version": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
+          "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c="
+        },
+        "lodash.escape": {
+          "version": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
+          "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg="
+        },
+        "lodash.isarguments": {
+          "version": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+          "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
+        },
+        "lodash.isarray": {
+          "version": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+          "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
+        },
+        "lodash.keys": {
+          "version": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+          "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo="
+        },
+        "lodash.restparam": {
+          "version": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+          "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
+        },
+        "lodash.template": {
+          "version": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
+          "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8="
+        },
+        "lodash.templatesettings": {
+          "version": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
+          "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU="
+        },
+        "longest": {
+          "version": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+          "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc="
+        },
+        "loud-rejection": {
+          "version": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+          "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8="
+        },
+        "magic-string": {
+          "version": "https://registry.npmjs.org/magic-string/-/magic-string-0.14.0.tgz",
+          "integrity": "sha1-VyJK7xcByu7Sc7F6OalW5ysXJGI="
+        },
+        "map-obj": {
+          "version": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
+        },
+        "meow": {
+          "version": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+          "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs="
+        },
+        "mime": {
+          "version": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+          "integrity": "sha1-WCA+7Ybjpe8XrtK32evUfwpg3RA=",
+          "optional": true
+        },
+        "mime-types": {
+          "version": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
+          "integrity": "sha1-mVrhOSq4r/y/yyZB3QVOlDwNXc4="
+        },
+        "minimatch": {
+          "version": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+          "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM="
+        },
+        "minimist": {
+          "version": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        },
+        "mkdirp": {
+          "version": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+          "dependencies": {
+            "minimist": {
+              "version": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+              "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+            }
+          }
+        },
+        "mocha": {
+          "version": "https://registry.npmjs.org/mocha/-/mocha-3.4.2.tgz",
+          "integrity": "sha1-0O9NMyEm2/GNDWQMmzgt1IvpdZQ=",
+          "dependencies": {
+            "debug": {
+              "version": "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz",
+              "integrity": "sha1-vFlryr52F/Edn6FTYe3tVgi4SZs="
+            },
+            "glob": {
+              "version": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
+              "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg="
+            },
+            "ms": {
+              "version": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+              "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U="
+            },
+            "supports-color": {
+              "version": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
+              "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU="
+            }
+          }
+        },
+        "ms": {
+          "version": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "multipipe": {
+          "version": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+          "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s="
+        },
+        "mute-stream": {
+          "version": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
+          "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA="
+        },
+        "natural-compare": {
+          "version": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+          "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+        },
+        "node-uuid": {
+          "version": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
+          "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc="
+        },
+        "nopt": {
+          "version": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+          "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k="
+        },
+        "normalize-package-data": {
+          "version": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz",
+          "integrity": "sha1-2Bntoqne29H/pWPqQHHZNngilbs="
+        },
+        "number-is-nan": {
+          "version": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+        },
+        "oauth-sign": {
+          "version": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz",
+          "integrity": "sha1-8ilW8x6nFRqCHl8vsywRPK2Ln2k=",
+          "optional": true
+        },
+        "object-assign": {
+          "version": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+        },
+        "once": {
+          "version": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E="
+        },
+        "onetime": {
+          "version": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+          "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k="
+        },
+        "optimist": {
+          "version": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+          "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+          "dependencies": {
+            "minimist": {
+              "version": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+              "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
+            },
+            "wordwrap": {
+              "version": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+              "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
+            }
+          }
+        },
+        "optionator": {
+          "version": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+          "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q="
+        },
+        "os-homedir": {
+          "version": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+          "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+        },
+        "parse-json": {
+          "version": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck="
+        },
+        "path-exists": {
+          "version": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s="
+        },
+        "path-is-absolute": {
+          "version": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+        },
+        "path-is-inside": {
+          "version": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+          "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
+        },
+        "path-parse": {
+          "version": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
+          "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME="
+        },
+        "path-type": {
+          "version": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE="
+        },
+        "pify": {
+          "version": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+        },
+        "pinkie": {
+          "version": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+          "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
+        },
+        "pinkie-promise": {
+          "version": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+          "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o="
+        },
+        "pluralize": {
+          "version": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
+          "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU="
+        },
+        "prelude-ls": {
+          "version": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+          "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+        },
+        "process-nextick-args": {
+          "version": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+        },
+        "progress": {
+          "version": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+          "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74="
+        },
+        "punycode": {
+          "version": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "optional": true
+        },
+        "qs": {
+          "version": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz",
+          "integrity": "sha1-GbV/8k3CqZzh+L32r82ln472H4g="
+        },
+        "read-pkg": {
+          "version": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+          "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg="
+        },
+        "read-pkg-up": {
+          "version": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+          "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI="
+        },
+        "readable-stream": {
+          "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw="
+        },
+        "readline2": {
+          "version": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
+          "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU="
+        },
+        "rechoir": {
+          "version": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+          "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q="
+        },
+        "redent": {
+          "version": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+          "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94="
+        },
+        "remap-istanbul": {
+          "version": "https://registry.npmjs.org/remap-istanbul/-/remap-istanbul-0.6.4.tgz",
+          "integrity": "sha1-rFUe/xqmQVBLTzGNAwPdph47tpU=",
+          "dependencies": {
+            "amdefine": {
+              "version": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz",
+              "integrity": "sha1-/RdHRwDLXMnCtwnwvp0jzjwZjDM="
+            },
+            "async": {
+              "version": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+              "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
+            },
+            "esprima": {
+              "version": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+              "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
+            },
+            "istanbul": {
+              "version": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.3.tgz",
+              "integrity": "sha1-W3FO4K5JOsXvIEuZ84crzu9z1To="
+            },
+            "resolve": {
+              "version": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+              "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
+            },
+            "supports-color": {
+              "version": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+              "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY="
+            }
+          }
+        },
+        "repeat-string": {
+          "version": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+          "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
+        },
+        "repeating": {
+          "version": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+          "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo="
+        },
+        "replace-ext": {
+          "version": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+          "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ="
+        },
+        "request": {
+          "version": "https://registry.npmjs.org/request/-/request-2.42.0.tgz",
+          "integrity": "sha1-VyvQFIk4VkBArHqxSLlkI6BjMEo="
+        },
+        "require-uncached": {
+          "version": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+          "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM="
+        },
+        "resolve": {
+          "version": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz",
+          "integrity": "sha1-ZVkHw0aahoDcLeOidaj91paR8OU="
+        },
+        "resolve-from": {
+          "version": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+          "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY="
+        },
+        "restore-cursor": {
+          "version": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
+          "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE="
+        },
+        "resumer": {
+          "version": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz",
+          "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k="
+        },
+        "right-align": {
+          "version": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+          "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
+          "optional": true
+        },
+        "rimraf": {
+          "version": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+          "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0="
+        },
+        "rollup": {
+          "version": "https://registry.npmjs.org/rollup/-/rollup-0.36.4.tgz",
+          "integrity": "sha1-oiRJTFOGwdc9OPe7hvafXrARo9I="
+        },
+        "rollup-plugin-buble": {
+          "version": "https://registry.npmjs.org/rollup-plugin-buble/-/rollup-plugin-buble-0.14.0.tgz",
+          "integrity": "sha1-NybbVf75uc03zr7VWcu9S5suW8Y="
+        },
+        "rollup-plugin-node-resolve": {
+          "version": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-2.1.1.tgz",
+          "integrity": "sha1-y7eDsNFbAnlNWJFTULLw2QK43cg="
+        },
+        "rollup-plugin-replace": {
+          "version": "https://registry.npmjs.org/rollup-plugin-replace/-/rollup-plugin-replace-1.1.1.tgz",
+          "integrity": "sha1-OWMV3tBQps5DuVGKiGo/YO+x6jM=",
+          "dependencies": {
+            "magic-string": {
+              "version": "https://registry.npmjs.org/magic-string/-/magic-string-0.15.2.tgz",
+              "integrity": "sha1-BoHXOIdBu8Ot2qZQYJkmJMbAnpw="
+            }
+          }
+        },
+        "rollup-pluginutils": {
+          "version": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz",
+          "integrity": "sha1-HhVud4+UtyVb+hs9AXi+j1xVJAg="
+        },
+        "run-async": {
+          "version": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
+          "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k="
+        },
+        "rx-lite": {
+          "version": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
+          "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI="
+        },
+        "safe-buffer": {
+          "version": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
+          "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c="
+        },
+        "semver": {
+          "version": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
+        },
+        "shelljs": {
+          "version": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz",
+          "integrity": "sha1-svXHfvlxSPS09uImguELuoZnz/E="
+        },
+        "signal-exit": {
+          "version": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+        },
+        "slice-ansi": {
+          "version": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
+          "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU="
+        },
+        "sntp": {
+          "version": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
+          "integrity": "sha1-+4hfGLDzqtGJ+CSGJTa87ux1CQA=",
+          "optional": true
+        },
+        "source-map": {
+          "version": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
+        },
+        "source-map-support": {
+          "version": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz",
+          "integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E="
+        },
+        "sparkles": {
+          "version": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz",
+          "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM="
+        },
+        "spdx-correct": {
+          "version": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
+          "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A="
+        },
+        "spdx-expression-parse": {
+          "version": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
+          "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw="
+        },
+        "spdx-license-ids": {
+          "version": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
+          "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc="
+        },
+        "split": {
+          "version": "https://registry.npmjs.org/split/-/split-0.2.10.tgz",
+          "integrity": "sha1-Zwl8YB1pfOE2j0GPBs0gHPBSGlc="
+        },
+        "sprintf-js": {
+          "version": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+          "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+        },
+        "stream-combiner": {
+          "version": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+          "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ="
+        },
+        "string_decoder": {
+          "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+        },
+        "string-width": {
+          "version": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M="
+        },
+        "stringstream": {
+          "version": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+          "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
+          "optional": true
+        },
+        "strip-ansi": {
+          "version": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8="
+        },
+        "strip-bom": {
+          "version": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+        },
+        "strip-indent": {
+          "version": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+          "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI="
+        },
+        "strip-json-comments": {
+          "version": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+        },
+        "supports-color": {
+          "version": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+        },
+        "table": {
+          "version": "https://registry.npmjs.org/table/-/table-3.8.3.tgz",
+          "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
+          "dependencies": {
+            "is-fullwidth-code-point": {
+              "version": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+              "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+            },
+            "string-width": {
+              "version": "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz",
+              "integrity": "sha1-Y1xUNsxypuDDh87KJ41OLuxSaH4="
+            }
+          }
+        },
+        "tape": {
+          "version": "https://registry.npmjs.org/tape/-/tape-2.3.0.tgz",
+          "integrity": "sha1-Df7scJIn+8yRcKvn8EaWKycUMds="
+        },
+        "text-table": {
+          "version": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+          "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
+        },
+        "through": {
+          "version": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+          "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+        },
+        "through2": {
+          "version": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz",
+          "integrity": "sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=",
+          "dependencies": {
+            "isarray": {
+              "version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+              "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+            },
+            "readable-stream": {
+              "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+              "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44="
+            }
+          }
+        },
+        "time-stamp": {
+          "version": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
+          "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM="
+        },
+        "tough-cookie": {
+          "version": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+          "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
+          "optional": true
+        },
+        "trim-newlines": {
+          "version": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+          "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
+        },
+        "tryit": {
+          "version": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
+          "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics="
+        },
+        "tunnel-agent": {
+          "version": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
+        },
+        "type-check": {
+          "version": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+          "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I="
+        },
+        "typedarray": {
+          "version": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+          "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+        },
+        "uglify-js": {
+          "version": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.27.tgz",
+          "integrity": "sha1-R3h/kSsPJC5bmENDvo416V9pTJw=",
+          "optional": true
+        },
+        "uglify-to-browserify": {
+          "version": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+          "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+          "optional": true
+        },
+        "urlgrey": {
+          "version": "https://registry.npmjs.org/urlgrey/-/urlgrey-0.4.0.tgz",
+          "integrity": "sha1-8GU1cED7NcOzEdTl3DZITZbb6gY="
+        },
+        "user-home": {
+          "version": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
+          "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8="
+        },
+        "util-deprecate": {
+          "version": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+        },
+        "validate-npm-package-license": {
+          "version": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+          "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w="
+        },
+        "vinyl": {
+          "version": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
+          "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4="
+        },
+        "vlq": {
+          "version": "https://registry.npmjs.org/vlq/-/vlq-0.2.2.tgz",
+          "integrity": "sha1-4xbVJXtAuGu0PLjV/qXX9U1rDKE="
+        },
+        "which": {
+          "version": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
+          "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU="
+        },
+        "window-size": {
+          "version": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+          "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
+          "optional": true
+        },
+        "wordwrap": {
+          "version": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
+        },
+        "wrappy": {
+          "version": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+        },
+        "write": {
+          "version": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+          "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c="
+        },
+        "xtend": {
+          "version": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+        },
+        "yargs": {
+          "version": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+          "optional": true
+        }
+      }
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+      "dev": true
+    }
+  }
+}
diff --git a/package.json b/package.json
index f0d78fcd3e..a4bf6f7156 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "1.17.2",
+  "version": "1.23.4",
   "description": "The magical disappearing UI framework",
   "main": "compiler/svelte.js",
   "files": [
@@ -17,12 +17,11 @@
     "precodecov": "npm run coverage",
     "lint": "eslint src test/*.js",
     "benchmark": "./scripts/benchmark.sh",
-    "build": "npm run build:main && npm run build:shared && npm run build:ssr",
-    "build:main": "rollup -c rollup/rollup.config.main.js",
-    "build:shared": "rollup -c rollup/rollup.config.shared.js",
-    "build:ssr": "rollup -c rollup/rollup.config.ssr.js",
+    "build": "node src/shared/_build.js && rollup -c",
+    "dev": "node src/shared/_build.js && rollup -c -w",
     "pretest": "npm run build",
-    "prepublish": "npm run lint && npm run build"
+    "prepublish": "npm run build && npm run lint",
+    "prettier": "prettier --use-tabs --single-quote --trailing-comma es5 --write \"src/**/*.ts\""
   },
   "repository": {
     "type": "git",
@@ -41,6 +40,8 @@
   },
   "homepage": "https://github.com/sveltejs/svelte#README",
   "devDependencies": {
+    "@types/mocha": "^2.2.41",
+    "@types/node": "^7.0.22",
     "acorn": "^4.0.4",
     "babel": "^6.23.0",
     "babel-core": "^6.23.1",
@@ -53,35 +54,43 @@
     "babel-plugin-transform-es2015-spread": "^6.22.0",
     "babel-preset-env": "^1.2.1",
     "babel-register": "^6.23.0",
+    "chalk": "^1.1.3",
     "codecov": "^1.0.1",
     "console-group": "^0.3.2",
     "css-tree": "1.0.0-alpha16",
     "eslint": "^3.12.2",
+    "eslint-plugin-html": "^3.0.0",
     "eslint-plugin-import": "^2.2.0",
     "estree-walker": "^0.3.0",
     "fuzzyset.js": "0.0.1",
     "glob": "^7.1.1",
     "jsdom": "^9.9.1",
     "locate-character": "^2.0.0",
-    "magic-string": "^0.19.0",
+    "magic-string": "^0.21.1",
     "mocha": "^3.2.0",
     "node-resolve": "^1.3.3",
     "nyc": "^10.0.0",
+    "prettier": "^1.4.1",
     "reify": "^0.4.4",
-    "rollup": "^0.39.0",
+    "rollup": "^0.43.0",
     "rollup-plugin-buble": "^0.15.0",
     "rollup-plugin-commonjs": "^7.0.0",
     "rollup-plugin-json": "^2.1.0",
     "rollup-plugin-node-resolve": "^2.0.0",
+    "rollup-plugin-typescript": "^0.8.1",
+    "rollup-watch": "^3.2.2",
     "source-map": "^0.5.6",
-    "source-map-support": "^0.4.8"
+    "source-map-support": "^0.4.8",
+    "typescript": "^2.3.2"
   },
   "nyc": {
     "include": [
-      "src/**/*.js"
+      "src/**/*.js",
+      "shared.js"
     ],
     "exclude": [
-      "src/**/__test__.js"
+      "src/**/__test__.js",
+      "src/shared/**"
     ]
   },
   "babel": {
diff --git a/rollup.config.js b/rollup.config.js
new file mode 100644
index 0000000000..fe2a98494d
--- /dev/null
+++ b/rollup.config.js
@@ -0,0 +1,74 @@
+import path from 'path';
+import nodeResolve from 'rollup-plugin-node-resolve';
+import commonjs from 'rollup-plugin-commonjs';
+import json from 'rollup-plugin-json';
+import typescript from 'rollup-plugin-typescript';
+import buble from 'rollup-plugin-buble';
+
+const src = path.resolve('src');
+
+export default [
+	/* compiler/svelte.js */
+	{
+		entry: 'src/index.ts',
+		dest: 'compiler/svelte.js',
+		format: 'umd',
+		moduleName: 'svelte',
+		plugins: [
+			{
+				resolveId(importee, importer) {
+					// bit of a hack — TypeScript only really works if it can resolve imports,
+					// but they misguidedly chose to reject imports with file extensions. This
+					// means we need to resolve them here
+					if (
+						importer &&
+						importer.startsWith(src) &&
+						importee[0] === '.' &&
+						path.extname(importee) === ''
+					) {
+						return path.resolve(path.dirname(importer), `${importee}.ts`);
+					}
+				}
+			},
+			nodeResolve({ jsnext: true, module: true }),
+			commonjs(),
+			json(),
+			typescript({
+				include: 'src/**',
+				exclude: 'src/shared/**',
+				typescript: require('typescript')
+			})
+		],
+		sourceMap: true
+	},
+
+	/* ssr/register.js */
+	{
+		entry: 'src/server-side-rendering/register.js',
+		dest: 'ssr/register.js',
+		format: 'cjs',
+		plugins: [
+			nodeResolve({ jsnext: true, module: true }),
+			commonjs(),
+			buble({
+				include: 'src/**',
+				exclude: 'src/shared/**',
+				target: {
+					node: 4
+				}
+			})
+		],
+		external: [path.resolve('src/index.ts'), 'fs', 'path'],
+		paths: {
+			[path.resolve('src/index.ts')]: '../compiler/svelte.js'
+		},
+		sourceMap: true
+	},
+
+	/* shared.js */
+	{
+		entry: 'src/shared/index.js',
+		dest: 'shared.js',
+		format: 'es'
+	}
+];
diff --git a/rollup/rollup.config.main.js b/rollup/rollup.config.main.js
deleted file mode 100644
index c05b9911cf..0000000000
--- a/rollup/rollup.config.main.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import nodeResolve from 'rollup-plugin-node-resolve';
-import commonjs from 'rollup-plugin-commonjs';
-import json from 'rollup-plugin-json';
-import buble from 'rollup-plugin-buble';
-
-export default {
-	entry: 'src/index.js',
-	moduleName: 'svelte',
-	targets: [
-		{ dest: 'compiler/svelte.js', format: 'umd' }
-	],
-	plugins: [
-		nodeResolve({ jsnext: true, module: true }),
-		commonjs(),
-		json(),
-		buble({
-			include: 'src/**',
-			exclude: 'src/shared/**',
-			target: {
-				node: 4
-			}
-		})
-	],
-	sourceMap: true
-};
diff --git a/rollup/rollup.config.shared.js b/rollup/rollup.config.shared.js
deleted file mode 100644
index 1dda31ee6b..0000000000
--- a/rollup/rollup.config.shared.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
-	entry: 'src/shared/index.js',
-	dest: 'shared.js',
-	format: 'es'
-};
diff --git a/rollup/rollup.config.ssr.js b/rollup/rollup.config.ssr.js
deleted file mode 100644
index 38caf3ece4..0000000000
--- a/rollup/rollup.config.ssr.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import * as path from 'path';
-import nodeResolve from 'rollup-plugin-node-resolve';
-import commonjs from 'rollup-plugin-commonjs';
-import buble from 'rollup-plugin-buble';
-
-export default {
-	entry: 'src/server-side-rendering/register.js',
-	moduleName: 'svelte',
-	targets: [
-		{ dest: 'ssr/register.js', format: 'cjs' }
-	],
-	plugins: [
-		nodeResolve({ jsnext: true, module: true }),
-		commonjs(),
-		buble({
-			include: 'src/**',
-			exclude: 'src/shared/**',
-			target: {
-				node: 4
-			}
-		})
-	],
-	external: [ path.resolve( 'src/index.js' ), 'fs', 'path' ],
-	paths: {
-		[ path.resolve( 'src/index.js' ) ]: '../compiler/svelte.js'
-	},
-	sourceMap: true
-};
diff --git a/src/generators/Generator.js b/src/generators/Generator.js
deleted file mode 100644
index cf6ec0548c..0000000000
--- a/src/generators/Generator.js
+++ /dev/null
@@ -1,465 +0,0 @@
-import MagicString, { Bundle } from 'magic-string';
-import { walk } from 'estree-walker';
-import isReference from '../utils/isReference.js';
-import flattenReference from '../utils/flattenReference.js';
-import globalWhitelist from '../utils/globalWhitelist.js';
-import reservedNames from '../utils/reservedNames.js';
-import namespaces from '../utils/namespaces.js';
-import { removeNode, removeObjectKey } from '../utils/removeNode.js';
-import getIntro from './shared/utils/getIntro.js';
-import getOutro from './shared/utils/getOutro.js';
-import processCss from './shared/processCss.js';
-import annotateWithScopes from '../utils/annotateWithScopes.js';
-
-const test = typeof global !== 'undefined' && global.__svelte_test;
-
-export default class Generator {
-	constructor ( parsed, source, name, options ) {
-		this.parsed = parsed;
-		this.source = source;
-		this.name = name;
-		this.options = options;
-
-		this.imports = [];
-		this.helpers = new Set();
-		this.components = new Set();
-		this.events = new Set();
-		this.importedComponents = new Map();
-
-		this.bindingGroups = [];
-
-		// track which properties are needed, so we can provide useful info
-		// in dev mode
-		this.expectedProperties = new Set();
-
-		this.code = new MagicString( source );
-		this.css = parsed.css ? processCss( parsed, this.code ) : null;
-		this.cssId = parsed.css ? `svelte-${parsed.hash}` : '';
-		this.usesRefs = false;
-
-		// allow compiler to deconflict user's `import { get } from 'whatever'` and
-		// Svelte's builtin `import { get, ... } from 'svelte/shared.js'`;
-		this.importedNames = new Set();
-		this.aliases = new Map();
-		this._usedNames = new Set( [ name ] );
-	}
-
-	addSourcemapLocations ( node ) {
-		walk( node, {
-			enter: node => {
-				this.code.addSourcemapLocation( node.start );
-				this.code.addSourcemapLocation( node.end );
-			}
-		});
-	}
-
-	alias ( name ) {
-		if ( !this.aliases.has( name ) ) {
-			this.aliases.set( name, this.getUniqueName( name ) );
-		}
-
-		return this.aliases.get( name );
-	}
-
-	contextualise ( block, expression, context, isEventHandler ) {
-		this.addSourcemapLocations( expression );
-
-		const usedContexts = [];
-
-		const { code, helpers } = this;
-		const { contexts, indexes } = block;
-
-		let scope = annotateWithScopes( expression ); // TODO this already happens in findDependencies
-		let lexicalDepth = 0;
-
-		const self = this;
-
-		walk( expression, {
-			enter ( node, parent, key ) {
-				if ( /^Function/.test( node.type ) ) lexicalDepth += 1;
-
-				if ( node._scope ) {
-					scope = node._scope;
-					return;
-				}
-
-				if ( node.type === 'ThisExpression' ) {
-					if ( lexicalDepth === 0 && context ) code.overwrite( node.start, node.end, context, true );
-				}
-
-				else if ( isReference( node, parent ) ) {
-					const { name } = flattenReference( node );
-					if ( scope.has( name ) ) return;
-
-					if ( parent && parent.type === 'CallExpression' && node === parent.callee && helpers.has( name ) ) {
-						code.prependRight( node.start, `${self.alias( 'template' )}.helpers.` );
-					}
-
-					else if ( name === 'event' && isEventHandler ) {
-						// noop
-					}
-
-					else if ( contexts.has( name ) ) {
-						const contextName = contexts.get( name );
-						if ( contextName !== name ) {
-							// this is true for 'reserved' names like `state` and `component`
-							code.overwrite( node.start, node.start + name.length, contextName, true );
-						}
-
-						if ( !~usedContexts.indexOf( name ) ) usedContexts.push( name );
-					}
-
-					else if ( indexes.has( name ) ) {
-						const context = indexes.get( name );
-						if ( !~usedContexts.indexOf( context ) ) usedContexts.push( context );
-					}
-
-					else {
-						// handle shorthand properties
-						if ( parent && parent.type === 'Property' && parent.shorthand ) {
-							if ( key === 'key' ) {
-								code.appendLeft( node.start, `${name}: ` );
-								return;
-							}
-						}
-
-						if ( globalWhitelist.has( name ) ) {
-							code.prependRight( node.start, `( '${name}' in state ? state.` );
-							code.appendLeft( node.object ? node.object.end : node.end, ` : ${name} )` );
-						} else {
-							code.prependRight( node.start, `state.` );
-						}
-
-						if ( !~usedContexts.indexOf( 'state' ) ) usedContexts.push( 'state' );
-					}
-
-					this.skip();
-				}
-			},
-
-			leave ( node ) {
-				if ( /^Function/.test( node.type ) ) lexicalDepth -= 1;
-				if ( node._scope ) scope = scope.parent;
-			}
-		});
-
-		return {
-			dependencies: expression._dependencies, // TODO probably a better way to do this
-			contexts: usedContexts,
-			snippet: `[✂${expression.start}-${expression.end}✂]`
-		};
-	}
-
-	findDependencies ( contextDependencies, indexes, expression ) {
-		if ( expression._dependencies ) return expression._dependencies;
-
-		let scope = annotateWithScopes( expression );
-		const dependencies = [];
-
-		const generator = this; // can't use arrow functions, because of this.skip()
-
-		walk( expression, {
-			enter ( node, parent ) {
-				if ( node._scope ) {
-					scope = node._scope;
-					return;
-				}
-
-				if ( isReference( node, parent ) ) {
-					const { name } = flattenReference( node );
-					if ( scope.has( name ) || generator.helpers.has( name ) ) return;
-
-					if ( contextDependencies.has( name ) ) {
-						dependencies.push( ...contextDependencies.get( name ) );
-					} else if ( !indexes.has( name ) ) {
-						dependencies.push( name );
-					}
-
-					this.skip();
-				}
-			},
-
-			leave ( node ) {
-				if ( node._scope ) scope = scope.parent;
-			}
-		});
-
-		dependencies.forEach( name => {
-			if ( !globalWhitelist.has( name ) ) {
-				this.expectedProperties.add( name );
-			}
-		});
-
-		return ( expression._dependencies = dependencies );
-	}
-
-	generate ( result, options, { name, format } ) {
-		if ( this.imports.length ) {
-			const statements = [];
-
-			this.imports.forEach( ( declaration, i ) => {
-				if ( format === 'es' ) {
-					statements.push( this.source.slice( declaration.start, declaration.end ) );
-					return;
-				}
-
-				const defaultImport = declaration.specifiers.find( x => x.type === 'ImportDefaultSpecifier' || x.type === 'ImportSpecifier' && x.imported.name === 'default' );
-				const namespaceImport = declaration.specifiers.find( x => x.type === 'ImportNamespaceSpecifier' );
-				const namedImports = declaration.specifiers.filter( x => x.type === 'ImportSpecifier' && x.imported.name !== 'default' );
-
-				const name = ( defaultImport || namespaceImport ) ? ( defaultImport || namespaceImport ).local.name : `__import${i}`;
-				declaration.name = name; // hacky but makes life a bit easier later
-
-				namedImports.forEach( specifier => {
-					statements.push( `var ${specifier.local.name} = ${name}.${specifier.imported.name}` );
-				});
-
-				if ( defaultImport ) {
-					statements.push( `${name} = ( ${name} && ${name}.__esModule ) ? ${name}['default'] : ${name};` );
-				}
-			});
-
-			result = `${statements.join( '\n' )}\n\n${result}`;
-		}
-
-		const pattern = /\[✂(\d+)-(\d+)$/;
-
-		const parts = result.split( '✂]' );
-		const finalChunk = parts.pop();
-
-		const compiled = new Bundle({ separator: '' });
-
-		function addString ( str ) {
-			compiled.addSource({
-				content: new MagicString( str )
-			});
-		}
-
-		const intro = getIntro( format, options, this.imports );
-		if ( intro ) addString( intro );
-
-		const { filename } = options;
-
-		// special case — the source file doesn't actually get used anywhere. we need
-		// to add an empty file to populate map.sources and map.sourcesContent
-		if ( !parts.length ) {
-			compiled.addSource({
-				filename,
-				content: new MagicString( this.source ).remove( 0, this.source.length )
-			});
-		}
-
-		parts.forEach( str => {
-			const chunk = str.replace( pattern, '' );
-			if ( chunk ) addString( chunk );
-
-			const match = pattern.exec( str );
-
-			const snippet = this.code.snip( +match[1], +match[2] );
-
-			compiled.addSource({
-				filename,
-				content: snippet
-			});
-		});
-
-		addString( finalChunk );
-		addString( '\n\n' + getOutro( format, name, options, this.imports ) );
-
-		return {
-			code: compiled.toString(),
-			map: compiled.generateMap({ includeContent: true, file: options.outputFilename }),
-			css: this.css
-		};
-	}
-
-	getUniqueName ( name ) {
-		if ( test ) name = `${name}$`;
-		let alias = name;
-		for ( let i = 1; reservedNames.has( alias ) || this.importedNames.has( alias ) || this._usedNames.has( alias ); alias = `${name}_${i++}` );
-		this._usedNames.add( alias );
-		return alias;
-	}
-
-	getUniqueNameMaker ( params ) {
-		const localUsedNames = new Set( params );
-		return name => {
-			if ( test ) name = `${name}$`;
-			let alias = name;
-			for ( let i = 1; reservedNames.has( alias ) || this.importedNames.has( alias ) || this._usedNames.has( alias ) || localUsedNames.has( alias ); alias = `${name}_${i++}` );
-			localUsedNames.add( alias );
-			return alias;
-		};
-	}
-
-	parseJs ( ssr ) {
-		const { source } = this;
-		const { js } = this.parsed;
-
-		const imports = this.imports;
-		const computations = [];
-		const templateProperties = {};
-
-		let namespace = null;
-		let hasJs = !!js;
-
-		if ( js ) {
-			this.addSourcemapLocations( js.content );
-			const body = js.content.body.slice(); // slice, because we're going to be mutating the original
-
-			// imports need to be hoisted out of the IIFE
-			for ( let i = 0; i < body.length; i += 1 ) {
-				const node = body[i];
-				if ( node.type === 'ImportDeclaration' ) {
-					removeNode( this.code, js.content, node );
-					imports.push( node );
-
-					node.specifiers.forEach( specifier => {
-						this.importedNames.add( specifier.local.name );
-					});
-				}
-			}
-
-			const defaultExport = body.find( node => node.type === 'ExportDefaultDeclaration' );
-
-			if ( defaultExport ) {
-				defaultExport.declaration.properties.forEach( prop => {
-					templateProperties[ prop.key.name ] = prop;
-				});
-			}
-
-			[ 'helpers', 'events', 'components' ].forEach( key => {
-				if ( templateProperties[ key ] ) {
-					templateProperties[ key ].value.properties.forEach( prop => {
-						this[ key ].add( prop.key.name );
-					});
-				}
-			});
-
-			if ( templateProperties.computed ) {
-				const dependencies = new Map();
-
-				templateProperties.computed.value.properties.forEach( prop => {
-					const key = prop.key.name;
-					const value = prop.value;
-
-					const deps = value.params.map( param => param.type === 'AssignmentPattern' ? param.left.name : param.name );
-					dependencies.set( key, deps );
-				});
-
-				const visited = new Set();
-
-				function visit ( key ) {
-					if ( !dependencies.has( key ) ) return; // not a computation
-
-					if ( visited.has( key ) ) return;
-					visited.add( key );
-
-					const deps = dependencies.get( key );
-					deps.forEach( visit );
-
-					computations.push({ key, deps });
-				}
-
-				templateProperties.computed.value.properties.forEach( prop => visit( prop.key.name ) );
-			}
-
-			if ( templateProperties.namespace ) {
-				const ns = templateProperties.namespace.value.value;
-				namespace = namespaces[ ns ] || ns;
-
-				removeObjectKey( this.code, defaultExport.declaration, 'namespace' );
-			}
-
-			if ( templateProperties.components ) {
-				let hasNonImportedComponent = false;
-				templateProperties.components.value.properties.forEach( property => {
-					const key = property.key.name;
-					const value = source.slice( property.value.start, property.value.end );
-					if ( this.importedNames.has( value ) ) {
-						this.importedComponents.set( key, value );
-					} else {
-						hasNonImportedComponent = true;
-					}
-				});
-				if ( hasNonImportedComponent ) {
-					// remove the specific components that were imported, as we'll refer to them directly
-					Array.from( this.importedComponents.keys() ).forEach( key => {
-						removeObjectKey( this.code, templateProperties.components.value, key );
-					});
-				} else {
-					// remove the entire components portion of the export
-					removeObjectKey( this.code, defaultExport.declaration, 'components' );
-				}
-			}
-
-			// Remove these after version 2
-			if ( templateProperties.onrender ) {
-				const { key } = templateProperties.onrender;
-				this.code.overwrite( key.start, key.end, 'oncreate', true );
-				templateProperties.oncreate = templateProperties.onrender;
-			}
-
-			if ( templateProperties.onteardown ) {
-				const { key } = templateProperties.onteardown;
-				this.code.overwrite( key.start, key.end, 'ondestroy', true );
-				templateProperties.ondestroy = templateProperties.onteardown;
-			}
-
-			// in an SSR context, we don't need to include events, methods, oncreate or ondestroy
-			if ( ssr ) {
-				if ( templateProperties.oncreate ) removeNode( this.code, defaultExport.declaration, templateProperties.oncreate );
-				if ( templateProperties.ondestroy ) removeNode( this.code, defaultExport.declaration, templateProperties.ondestroy );
-				if ( templateProperties.methods ) removeNode( this.code, defaultExport.declaration, templateProperties.methods );
-				if ( templateProperties.events ) removeNode( this.code, defaultExport.declaration, templateProperties.events );
-			}
-
-			// now that we've analysed the default export, we can determine whether or not we need to keep it
-			let hasDefaultExport = !!defaultExport;
-			if ( defaultExport && defaultExport.declaration.properties.length === 0 ) {
-				hasDefaultExport = false;
-				removeNode( this.code, js.content, defaultExport );
-			}
-
-			// if we do need to keep it, then we need to generate a return statement
-			if ( hasDefaultExport ) {
-				const finalNode = body[ body.length - 1 ];
-				if ( defaultExport === finalNode ) {
-					// export is last property, we can just return it
-					this.code.overwrite( defaultExport.start, defaultExport.declaration.start, `return ` );
-				} else {
-					const { declarations } = annotateWithScopes( js );
-					let template = 'template';
-					for ( let i = 1; declarations.has( template ); template = `template_${i++}` );
-
-					this.code.overwrite( defaultExport.start, defaultExport.declaration.start, `var ${template} = ` );
-
-					let i = defaultExport.start;
-					while ( /\s/.test( source[ i - 1 ] ) ) i--;
-
-					const indentation = source.slice( i, defaultExport.start );
-					this.code.appendLeft( finalNode.end, `\n\n${indentation}return ${template};` );
-				}
-			}
-
-			// user code gets wrapped in an IIFE
-			if ( js.content.body.length ) {
-				const prefix = hasDefaultExport ? `var ${this.alias( 'template' )} = (function () {` : `(function () {`;
-				this.code.prependRight( js.content.start, prefix ).appendLeft( js.content.end, '}());' );
-			}
-
-			// if there's no need to include user code, remove it altogether
-			else {
-				this.code.remove( js.content.start, js.content.end );
-				hasJs = false;
-			}
-		}
-
-		return {
-			computations,
-			hasJs,
-			namespace,
-			templateProperties
-		};
-	}
-}
diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts
new file mode 100644
index 0000000000..1a1528d0c4
--- /dev/null
+++ b/src/generators/Generator.ts
@@ -0,0 +1,593 @@
+import MagicString, { Bundle } from 'magic-string';
+import { walk } from 'estree-walker';
+import isReference from '../utils/isReference';
+import flattenReference from '../utils/flattenReference';
+import globalWhitelist from '../utils/globalWhitelist';
+import reservedNames from '../utils/reservedNames';
+import namespaces from '../utils/namespaces';
+import { removeNode, removeObjectKey } from '../utils/removeNode';
+import getIntro from './shared/utils/getIntro';
+import getOutro from './shared/utils/getOutro';
+import processCss from './shared/processCss';
+import annotateWithScopes from '../utils/annotateWithScopes';
+import clone from '../utils/clone';
+import DomBlock from './dom/Block';
+import SsrBlock from './server-side-rendering/Block';
+import { Node, Parsed, CompileOptions } from '../interfaces';
+
+const test = typeof global !== 'undefined' && global.__svelte_test;
+
+export default class Generator {
+	parsed: Parsed;
+	source: string;
+	name: string;
+	options: CompileOptions;
+
+	imports: Node[];
+	helpers: Set<string>;
+	components: Set<string>;
+	events: Set<string>;
+	transitions: Set<string>;
+	importedComponents: Map<string, string>;
+
+	code: MagicString;
+
+	bindingGroups: string[];
+	indirectDependencies: Map<string, Set<string>>;
+	expectedProperties: Set<string>;
+	cascade: boolean;
+	css: string;
+	cssId: string;
+	usesRefs: boolean;
+
+	importedNames: Set<string>;
+	aliases: Map<string, string>;
+	usedNames: Set<string>;
+
+	constructor(
+		parsed: Parsed,
+		source: string,
+		name: string,
+		options: CompileOptions
+	) {
+		this.ast = clone(parsed);
+
+		this.parsed = parsed;
+		this.source = source;
+		this.options = options;
+
+		this.imports = [];
+		this.helpers = new Set();
+		this.components = new Set();
+		this.events = new Set();
+		this.transitions = new Set();
+		this.importedComponents = new Map();
+
+		this.bindingGroups = [];
+		this.indirectDependencies = new Map();
+
+		// track which properties are needed, so we can provide useful info
+		// in dev mode
+		this.expectedProperties = new Set();
+
+		this.code = new MagicString(source);
+		this.cascade = options.cascade !== false; // TODO remove this option in v2
+		this.css = parsed.css ? processCss(parsed, this.code, this.cascade) : null;
+		this.cssId = parsed.css ? `svelte-${parsed.hash}` : '';
+		this.usesRefs = false;
+
+		// allow compiler to deconflict user's `import { get } from 'whatever'` and
+		// Svelte's builtin `import { get, ... } from 'svelte/shared.ts'`;
+		this.importedNames = new Set();
+		this.aliases = new Map();
+		this.usedNames = new Set();
+
+		this.parseJs();
+		this.name = this.alias(name);
+	}
+
+	addSourcemapLocations(node: Node) {
+		walk(node, {
+			enter: (node: Node) => {
+				this.code.addSourcemapLocation(node.start);
+				this.code.addSourcemapLocation(node.end);
+			},
+		});
+	}
+
+	alias(name: string) {
+		if (!this.aliases.has(name)) {
+			this.aliases.set(name, this.getUniqueName(name));
+		}
+
+		return this.aliases.get(name);
+	}
+
+	contextualise(
+		block: DomBlock | SsrBlock,
+		expression: Node,
+		context: string,
+		isEventHandler: boolean
+	) {
+		this.addSourcemapLocations(expression);
+
+		const usedContexts: string[] = [];
+
+		const { code, helpers } = this;
+		const { contexts, indexes } = block;
+
+		let scope = annotateWithScopes(expression); // TODO this already happens in findDependencies
+		let lexicalDepth = 0;
+
+		const self = this;
+
+		walk(expression, {
+			enter(node: Node, parent: Node, key: string) {
+				if (/^Function/.test(node.type)) lexicalDepth += 1;
+
+				if (node._scope) {
+					scope = node._scope;
+					return;
+				}
+
+				if (node.type === 'ThisExpression') {
+					if (lexicalDepth === 0 && context)
+						code.overwrite(node.start, node.end, context, {
+							storeName: true,
+							contentOnly: false,
+						});
+				} else if (isReference(node, parent)) {
+					const { name } = flattenReference(node);
+					if (scope.has(name)) return;
+
+					if (name === 'event' && isEventHandler) {
+						// noop
+					} else if (contexts.has(name)) {
+						const contextName = contexts.get(name);
+						if (contextName !== name) {
+							// this is true for 'reserved' names like `state` and `component`
+							code.overwrite(
+								node.start,
+								node.start + name.length,
+								contextName,
+								{ storeName: true, contentOnly: false }
+							);
+						}
+
+						if (!~usedContexts.indexOf(name)) usedContexts.push(name);
+					} else if (helpers.has(name)) {
+						code.prependRight(node.start, `${self.alias('template')}.helpers.`);
+					} else if (indexes.has(name)) {
+						const context = indexes.get(name);
+						if (!~usedContexts.indexOf(context)) usedContexts.push(context);
+					} else {
+						// handle shorthand properties
+						if (parent && parent.type === 'Property' && parent.shorthand) {
+							if (key === 'key') {
+								code.appendLeft(node.start, `${name}: `);
+								return;
+							}
+						}
+
+						if (globalWhitelist.has(name)) {
+							code.prependRight(node.start, `( '${name}' in state ? state.`);
+							code.appendLeft(
+								node.object ? node.object.end : node.end,
+								` : ${name} )`
+							);
+						} else {
+							code.prependRight(node.start, `state.`);
+						}
+
+						if (!~usedContexts.indexOf('state')) usedContexts.push('state');
+					}
+
+					this.skip();
+				}
+			},
+
+			leave(node: Node) {
+				if (/^Function/.test(node.type)) lexicalDepth -= 1;
+				if (node._scope) scope = scope.parent;
+			},
+		});
+
+		const dependencies = new Set(expression._dependencies || []);
+
+		if (expression._dependencies) {
+			expression._dependencies.forEach((prop: string) => {
+				if (this.indirectDependencies.has(prop)) {
+					this.indirectDependencies.get(prop).forEach(dependency => {
+						dependencies.add(dependency);
+					});
+				}
+			});
+		}
+
+		return {
+			dependencies: Array.from(dependencies),
+			contexts: usedContexts,
+			snippet: `[✂${expression.start}-${expression.end}✂]`,
+		};
+	}
+
+	findDependencies(
+		contextDependencies: Map<string, string[]>,
+		indexes: Map<string, string>,
+		expression: Node
+	) {
+		if (expression._dependencies) return expression._dependencies;
+
+		let scope = annotateWithScopes(expression);
+		const dependencies: string[] = [];
+
+		const generator = this; // can't use arrow functions, because of this.skip()
+
+		walk(expression, {
+			enter(node: Node, parent: Node) {
+				if (node._scope) {
+					scope = node._scope;
+					return;
+				}
+
+				if (isReference(node, parent)) {
+					const { name } = flattenReference(node);
+					if (scope.has(name) || generator.helpers.has(name)) return;
+
+					if (contextDependencies.has(name)) {
+						dependencies.push(...contextDependencies.get(name));
+					} else if (!indexes.has(name)) {
+						dependencies.push(name);
+					}
+
+					this.skip();
+				}
+			},
+
+			leave(node: Node) {
+				if (node._scope) scope = scope.parent;
+			},
+		});
+
+		dependencies.forEach(name => {
+			if (!globalWhitelist.has(name)) {
+				this.expectedProperties.add(name);
+			}
+		});
+
+		return (expression._dependencies = dependencies);
+	}
+
+	generate(result, options, { name, format }) {
+		if (this.imports.length) {
+			const statements: string[] = [];
+
+			this.imports.forEach((declaration, i) => {
+				if (format === 'es') {
+					statements.push(
+						this.source.slice(declaration.start, declaration.end)
+					);
+					return;
+				}
+
+				const defaultImport = declaration.specifiers.find(
+					(x: Node) =>
+						x.type === 'ImportDefaultSpecifier' ||
+						(x.type === 'ImportSpecifier' && x.imported.name === 'default')
+				);
+				const namespaceImport = declaration.specifiers.find(
+					(x: Node) => x.type === 'ImportNamespaceSpecifier'
+				);
+				const namedImports = declaration.specifiers.filter(
+					(x: Node) =>
+						x.type === 'ImportSpecifier' && x.imported.name !== 'default'
+				);
+
+				const name = defaultImport || namespaceImport
+					? (defaultImport || namespaceImport).local.name
+					: `__import${i}`;
+				declaration.name = name; // hacky but makes life a bit easier later
+
+				namedImports.forEach((specifier: Node) => {
+					statements.push(
+						`var ${specifier.local.name} = ${name}.${specifier.imported.name}`
+					);
+				});
+
+				if (defaultImport) {
+					statements.push(
+						`${name} = ( ${name} && ${name}.__esModule ) ? ${name}['default'] : ${name};`
+					);
+				}
+			});
+
+			result = `${statements.join('\n')}\n\n${result}`;
+		}
+
+		const pattern = /\[✂(\d+)-(\d+)$/;
+
+		const parts = result.split('✂]');
+		const finalChunk = parts.pop();
+
+		const compiled = new Bundle({ separator: '' });
+
+		function addString(str: string) {
+			compiled.addSource({
+				content: new MagicString(str),
+			});
+		}
+
+		const intro = getIntro(format, options, this.imports);
+		if (intro) addString(intro);
+
+		const { filename } = options;
+
+		// special case — the source file doesn't actually get used anywhere. we need
+		// to add an empty file to populate map.sources and map.sourcesContent
+		if (!parts.length) {
+			compiled.addSource({
+				filename,
+				content: new MagicString(this.source).remove(0, this.source.length),
+			});
+		}
+
+		parts.forEach((str: string) => {
+			const chunk = str.replace(pattern, '');
+			if (chunk) addString(chunk);
+
+			const match = pattern.exec(str);
+
+			const snippet = this.code.snip(+match[1], +match[2]);
+
+			compiled.addSource({
+				filename,
+				content: snippet,
+			});
+		});
+
+		addString(finalChunk);
+		addString('\n\n' + getOutro(format, name, options, this.imports));
+
+		return {
+			ast: this.ast,
+			code: compiled.toString(),
+			map: compiled.generateMap({
+				includeContent: true,
+				file: options.outputFilename,
+			}),
+			css: this.css,
+		};
+	}
+
+	getUniqueName(name: string) {
+		if (test) name = `${name}$`;
+		let alias = name;
+		for (
+			let i = 1;
+			reservedNames.has(alias) ||
+			this.importedNames.has(alias) ||
+			this.usedNames.has(alias);
+			alias = `${name}_${i++}`
+		);
+		this.usedNames.add(alias);
+		return alias;
+	}
+
+	getUniqueNameMaker(params) {
+		const localUsedNames = new Set(params);
+		return name => {
+			if (test) name = `${name}$`;
+			let alias = name;
+			for (
+				let i = 1;
+				reservedNames.has(alias) ||
+				this.importedNames.has(alias) ||
+				this.usedNames.has(alias) ||
+				localUsedNames.has(alias);
+				alias = `${name}_${i++}`
+			);
+			localUsedNames.add(alias);
+			return alias;
+		};
+	}
+
+	parseJs() {
+		const { source } = this;
+		const { js } = this.parsed;
+
+		const imports = this.imports;
+		const computations = [];
+		const templateProperties = {};
+
+		let namespace = null;
+		let hasJs = !!js;
+
+		if (js) {
+			this.addSourcemapLocations(js.content);
+			const body = js.content.body.slice(); // slice, because we're going to be mutating the original
+
+			// imports need to be hoisted out of the IIFE
+			for (let i = 0; i < body.length; i += 1) {
+				const node = body[i];
+				if (node.type === 'ImportDeclaration') {
+					removeNode(this.code, js.content, node);
+					imports.push(node);
+
+					node.specifiers.forEach((specifier: Node) => {
+						this.importedNames.add(specifier.local.name);
+					});
+				}
+			}
+
+			const defaultExport = this.defaultExport = body.find(
+				(node: Node) => node.type === 'ExportDefaultDeclaration'
+			);
+
+			if (defaultExport) {
+				defaultExport.declaration.properties.forEach((prop: Node) => {
+					templateProperties[prop.key.name] = prop;
+				});
+			}
+
+			['helpers', 'events', 'components', 'transitions'].forEach(key => {
+				if (templateProperties[key]) {
+					templateProperties[key].value.properties.forEach((prop: node) => {
+						this[key].add(prop.key.name);
+					});
+				}
+			});
+
+			if (templateProperties.computed) {
+				const dependencies = new Map();
+
+				templateProperties.computed.value.properties.forEach((prop: Node) => {
+					const key = prop.key.name;
+					const value = prop.value;
+
+					const deps = value.params.map(
+						(param: Node) =>
+							param.type === 'AssignmentPattern' ? param.left.name : param.name
+					);
+					dependencies.set(key, deps);
+				});
+
+				const visited = new Set();
+
+				function visit(key) {
+					if (!dependencies.has(key)) return; // not a computation
+
+					if (visited.has(key)) return;
+					visited.add(key);
+
+					const deps = dependencies.get(key);
+					deps.forEach(visit);
+
+					computations.push({ key, deps });
+				}
+
+				templateProperties.computed.value.properties.forEach((prop: Node) =>
+					visit(prop.key.name)
+				);
+			}
+
+			if (templateProperties.namespace) {
+				const ns = templateProperties.namespace.value.value;
+				namespace = namespaces[ns] || ns;
+
+				removeObjectKey(this.code, defaultExport.declaration, 'namespace');
+			}
+
+			if (templateProperties.components) {
+				let hasNonImportedComponent = false;
+				templateProperties.components.value.properties.forEach(
+					(property: Node) => {
+						const key = property.key.name;
+						const value = source.slice(
+							property.value.start,
+							property.value.end
+						);
+						if (this.importedNames.has(value)) {
+							this.importedComponents.set(key, value);
+						} else {
+							hasNonImportedComponent = true;
+						}
+					}
+				);
+				if (hasNonImportedComponent) {
+					// remove the specific components that were imported, as we'll refer to them directly
+					Array.from(this.importedComponents.keys()).forEach(key => {
+						removeObjectKey(
+							this.code,
+							templateProperties.components.value,
+							key
+						);
+					});
+				} else {
+					// remove the entire components portion of the export
+					removeObjectKey(this.code, defaultExport.declaration, 'components');
+				}
+			}
+
+			// Remove these after version 2
+			if (templateProperties.onrender) {
+				const { key } = templateProperties.onrender;
+				this.code.overwrite(key.start, key.end, 'oncreate', {
+					storeName: true,
+					contentOnly: false,
+				});
+				templateProperties.oncreate = templateProperties.onrender;
+			}
+
+			if (templateProperties.onteardown) {
+				const { key } = templateProperties.onteardown;
+				this.code.overwrite(key.start, key.end, 'ondestroy', {
+					storeName: true,
+					contentOnly: false,
+				});
+				templateProperties.ondestroy = templateProperties.onteardown;
+			}
+
+			// now that we've analysed the default export, we can determine whether or not we need to keep it
+			let hasDefaultExport = !!defaultExport;
+			if (defaultExport && defaultExport.declaration.properties.length === 0) {
+				hasDefaultExport = false;
+				removeNode(this.code, js.content, defaultExport);
+			}
+
+			// if we do need to keep it, then we need to generate a return statement
+			if (hasDefaultExport) {
+				const finalNode = body[body.length - 1];
+				if (defaultExport === finalNode) {
+					// export is last property, we can just return it
+					this.code.overwrite(
+						defaultExport.start,
+						defaultExport.declaration.start,
+						`return `
+					);
+				} else {
+					const { declarations } = annotateWithScopes(js);
+					let template = 'template';
+					for (
+						let i = 1;
+						declarations.has(template);
+						template = `template_${i++}`
+					);
+
+					this.code.overwrite(
+						defaultExport.start,
+						defaultExport.declaration.start,
+						`var ${template} = `
+					);
+
+					let i = defaultExport.start;
+					while (/\s/.test(source[i - 1])) i--;
+
+					const indentation = source.slice(i, defaultExport.start);
+					this.code.appendLeft(
+						finalNode.end,
+						`\n\n${indentation}return ${template};`
+					);
+				}
+			}
+
+			// user code gets wrapped in an IIFE
+			if (js.content.body.length) {
+				const prefix = hasDefaultExport
+					? `var ${this.alias('template')} = (function () {`
+					: `(function () {`;
+				this.code
+					.prependRight(js.content.start, prefix)
+					.appendLeft(js.content.end, '}());');
+			} else {
+				// if there's no need to include user code, remove it altogether
+				this.code.remove(js.content.start, js.content.end);
+				hasJs = false;
+			}
+		}
+
+		this.computations = computations;
+		this.hasJs = hasJs;
+		this.namespace = namespace;
+		this.templateProperties = templateProperties;
+	}
+}
diff --git a/src/generators/dom/Block.js b/src/generators/dom/Block.js
deleted file mode 100644
index 4ef169b655..0000000000
--- a/src/generators/dom/Block.js
+++ /dev/null
@@ -1,185 +0,0 @@
-import CodeBuilder from '../../utils/CodeBuilder.js';
-import deindent from '../../utils/deindent.js';
-
-export default class Block {
-	constructor ( options ) {
-		this.generator = options.generator;
-		this.name = options.name;
-		this.key = options.key;
-		this.expression = options.expression;
-		this.context = options.context;
-
-		this.contexts = options.contexts;
-		this.indexes = options.indexes;
-		this.contextDependencies = options.contextDependencies;
-		this.dependencies = new Set();
-
-		this.params = options.params;
-		this.indexNames = options.indexNames;
-		this.listNames = options.listNames;
-
-		this.listName = options.listName;
-
-		this.builders = {
-			create: new CodeBuilder(),
-			mount: new CodeBuilder(),
-			update: new CodeBuilder(),
-			detach: new CodeBuilder(),
-			detachRaw: new CodeBuilder(),
-			destroy: new CodeBuilder()
-		};
-
-		this.aliases = new Map();
-		this.variables = new Map();
-		this.getUniqueName = this.generator.getUniqueNameMaker( options.params );
-
-		// unique names
-		this.component = this.getUniqueName( 'component' );
-		this.target = this.getUniqueName( 'target' );
-
-		this.hasUpdateMethod = false; // determined later
-	}
-
-	addDependencies ( dependencies ) {
-		dependencies.forEach( dependency => {
-			this.dependencies.add( dependency );
-		});
-	}
-
-	addElement ( name, renderStatement, parentNode, needsIdentifier = false ) {
-		const isToplevel = !parentNode;
-		if ( needsIdentifier || isToplevel ) {
-			this.builders.create.addLine(
-				`var ${name} = ${renderStatement};`
-			);
-
-			this.mount( name, parentNode );
-		} else {
-			this.builders.create.addLine( `${this.generator.helper( 'appendNode' )}( ${renderStatement}, ${parentNode} );` );
-		}
-
-		if ( isToplevel ) {
-			this.builders.detach.addLine( `${this.generator.helper( 'detachNode' )}( ${name} );` );
-		}
-	}
-
-	addVariable ( name, init ) {
-		if ( this.variables.has( name ) && this.variables.get( name ) !== init ) {
-			throw new Error( `Variable '${name}' already initialised with a different value` );
-		}
-
-		this.variables.set( name, init );
-	}
-
-	alias ( name ) {
-		if ( !this.aliases.has( name ) ) {
-			this.aliases.set( name, this.getUniqueName( name ) );
-		}
-
-		return this.aliases.get( name );
-	}
-
-	child ( options ) {
-		return new Block( Object.assign( {}, this, options, { parent: this } ) );
-	}
-
-	contextualise ( expression, context, isEventHandler ) {
-		return this.generator.contextualise( this, expression, context, isEventHandler );
-	}
-
-	createAnchor ( name, parentNode ) {
-		const renderStatement = `${this.generator.helper( 'createComment' )}()`;
-		this.addElement( name, renderStatement, parentNode, true );
-	}
-
-	findDependencies ( expression ) {
-		return this.generator.findDependencies( this.contextDependencies, this.indexes, expression );
-	}
-
-	mount ( name, parentNode ) {
-		if ( parentNode ) {
-			this.builders.create.addLine( `${this.generator.helper( 'appendNode' )}( ${name}, ${parentNode} );` );
-		} else {
-			this.builders.mount.addLine( `${this.generator.helper( 'insertNode' )}( ${name}, ${this.target}, anchor );` );
-		}
-	}
-
-	render () {
-		if ( this.variables.size ) {
-			const variables = Array.from( this.variables.keys() )
-				.map( key => {
-					const init = this.variables.get( key );
-					return init !== undefined ? `${key} = ${init}` : key;
-				})
-				.join( ', ' );
-
-			this.builders.create.addBlockAtStart( `var ${variables};` );
-		}
-
-		if ( this.autofocus ) {
-			this.builders.create.addLine( `${this.autofocus}.focus();` );
-		}
-
-		// minor hack – we need to ensure that any {{{triples}}} are detached
-		// first, so we append normal detach statements to detachRaw
-		this.builders.detachRaw.addBlock( this.builders.detach );
-
-		if ( !this.builders.detachRaw.isEmpty() ) {
-			this.builders.destroy.addBlock( deindent`
-				if ( detach ) {
-					${this.builders.detachRaw}
-				}
-			` );
-		}
-
-		const properties = new CodeBuilder();
-
-		let localKey;
-		if ( this.key ) {
-			localKey = this.getUniqueName( 'key' );
-			properties.addBlock( `key: ${localKey},` );
-		}
-
-		if ( this.builders.mount.isEmpty() ) {
-			properties.addBlock( `mount: ${this.generator.helper( 'noop' )},` );
-		} else {
-			properties.addBlock( deindent`
-				mount: function ( ${this.target}, anchor ) {
-					${this.builders.mount}
-				},
-			` );
-		}
-
-		if ( this.hasUpdateMethod ) {
-			if ( this.builders.update.isEmpty() ) {
-				properties.addBlock( `update: ${this.generator.helper( 'noop' )},` );
-			} else {
-				properties.addBlock( deindent`
-					update: function ( changed, ${this.params.join( ', ' )} ) {
-						${this.builders.update}
-					},
-				` );
-			}
-		}
-
-		if ( this.builders.destroy.isEmpty() ) {
-			properties.addBlock( `destroy: ${this.generator.helper( 'noop' )}` );
-		} else {
-			properties.addBlock( deindent`
-				destroy: function ( detach ) {
-					${this.builders.destroy}
-				}
-			` );
-		}
-
-		return deindent`
-			function ${this.name} ( ${this.params.join( ', ' )}, ${this.component}${this.key ? `, ${localKey}` : ''} ) {
-				${this.builders.create}
-
-				return {
-					${properties}
-				};
-			}
-		`;
-	}
-}
\ No newline at end of file
diff --git a/src/generators/dom/Block.ts b/src/generators/dom/Block.ts
new file mode 100644
index 0000000000..ff58a4e947
--- /dev/null
+++ b/src/generators/dom/Block.ts
@@ -0,0 +1,362 @@
+import CodeBuilder from '../../utils/CodeBuilder';
+import deindent from '../../utils/deindent';
+import { DomGenerator } from './index';
+import { Node } from '../../interfaces';
+import shared from './shared';
+
+export interface BlockOptions {
+	name: string;
+	generator?: DomGenerator;
+	expression?: Node;
+	context?: string;
+	key?: string;
+	contexts?: Map<string, string>;
+	indexes?: Map<string, string>;
+	contextDependencies?: Map<string, string[]>;
+	params?: string[];
+	indexNames?: Map<string, string>;
+	listNames?: Map<string, string>;
+	indexName?: string;
+	listName?: string;
+	dependencies?: Set<string>;
+}
+
+export default class Block {
+	generator: DomGenerator;
+	name: string;
+	expression: Node;
+	context: string;
+
+	key: string;
+	first: string;
+
+	contexts: Map<string, string>;
+	indexes: Map<string, string>;
+	contextDependencies: Map<string, string[]>;
+	dependencies: Set<string>;
+	params: string[];
+	indexNames: Map<string, string>;
+	listNames: Map<string, string>;
+	indexName: string;
+	listName: string;
+
+	builders: {
+		init: CodeBuilder;
+		create: CodeBuilder;
+		claim: CodeBuilder;
+		hydrate: CodeBuilder;
+		mount: CodeBuilder;
+		intro: CodeBuilder;
+		update: CodeBuilder;
+		outro: CodeBuilder;
+		unmount: CodeBuilder;
+		detachRaw: CodeBuilder;
+		destroy: CodeBuilder;
+	};
+
+	hasIntroMethod: boolean;
+	hasOutroMethod: boolean;
+	outros: number;
+
+	aliases: Map<string, string>;
+	variables: Map<string, string>;
+	getUniqueName: (name: string) => string;
+
+	hasUpdateMethod: boolean;
+	autofocus: string;
+
+	constructor(options: BlockOptions) {
+		this.generator = options.generator;
+		this.name = options.name;
+		this.expression = options.expression;
+		this.context = options.context;
+
+		// for keyed each blocks
+		this.key = options.key;
+		this.first = null;
+
+		this.contexts = options.contexts;
+		this.indexes = options.indexes;
+		this.contextDependencies = options.contextDependencies;
+		this.dependencies = new Set();
+
+		this.params = options.params;
+		this.indexNames = options.indexNames;
+		this.listNames = options.listNames;
+
+		this.listName = options.listName;
+
+		this.builders = {
+			init: new CodeBuilder(),
+			create: new CodeBuilder(),
+			claim: new CodeBuilder(),
+			hydrate: new CodeBuilder(),
+			mount: new CodeBuilder(),
+			intro: new CodeBuilder(),
+			update: new CodeBuilder(),
+			outro: new CodeBuilder(),
+			unmount: new CodeBuilder(),
+			detachRaw: new CodeBuilder(),
+			destroy: new CodeBuilder(),
+		};
+
+		this.hasIntroMethod = false; // a block could have an intro method but not intro transitions, e.g. if a sibling block has intros
+		this.hasOutroMethod = false;
+		this.outros = 0;
+
+		this.aliases = new Map();
+		this.variables = new Map();
+		this.getUniqueName = this.generator.getUniqueNameMaker(options.params);
+
+		this.hasUpdateMethod = false; // determined later
+	}
+
+	addDependencies(dependencies: string[]) {
+		dependencies.forEach(dependency => {
+			this.dependencies.add(dependency);
+		});
+	}
+
+	addElement(
+		name: string,
+		renderStatement: string,
+		claimStatement: string,
+		parentNode: string,
+		needsIdentifier = false
+	) {
+		const isToplevel = !parentNode;
+
+		this.addVariable(name);
+		this.builders.create.addLine(`${name} = ${renderStatement};`);
+		this.builders.claim.addLine(`${name} = ${claimStatement};`);
+
+		this.mount(name, parentNode);
+
+		if (isToplevel) {
+			this.builders.unmount.addLine(`@detachNode( ${name} );`);
+		}
+	}
+
+	addVariable(name: string, init?: string) {
+		if (this.variables.has(name) && this.variables.get(name) !== init) {
+			throw new Error(
+				`Variable '${name}' already initialised with a different value`
+			);
+		}
+
+		this.variables.set(name, init);
+	}
+
+	alias(name: string) {
+		if (!this.aliases.has(name)) {
+			this.aliases.set(name, this.getUniqueName(name));
+		}
+
+		return this.aliases.get(name);
+	}
+
+	child(options: BlockOptions) {
+		return new Block(Object.assign({}, this, options, { parent: this }));
+	}
+
+	contextualise(expression: Node, context?: string, isEventHandler?: boolean) {
+		return this.generator.contextualise(
+			this,
+			expression,
+			context,
+			isEventHandler
+		);
+	}
+
+	findDependencies(expression: Node) {
+		return this.generator.findDependencies(
+			this.contextDependencies,
+			this.indexes,
+			expression
+		);
+	}
+
+	mount(name: string, parentNode: string) {
+		if (parentNode) {
+			this.builders.mount.addLine(`@appendNode( ${name}, ${parentNode} );`);
+		} else {
+			this.builders.mount.addLine(`@insertNode( ${name}, #target, anchor );`);
+		}
+	}
+
+	render() {
+		let introing;
+		const hasIntros = !this.builders.intro.isEmpty();
+		if (hasIntros) {
+			introing = this.getUniqueName('introing');
+			this.addVariable(introing);
+		}
+
+		let outroing;
+		const hasOutros = !this.builders.outro.isEmpty();
+		if (hasOutros) {
+			outroing = this.getUniqueName('outroing');
+			this.addVariable(outroing);
+		}
+
+		if (this.autofocus) {
+			this.builders.mount.addLine(`${this.autofocus}.focus();`);
+		}
+
+		// minor hack – we need to ensure that any {{{triples}}} are detached first
+		this.builders.unmount.addBlockAtStart(this.builders.detachRaw);
+
+		const properties = new CodeBuilder();
+
+		let localKey;
+		if (this.key) {
+			localKey = this.getUniqueName('key');
+			properties.addBlock(`key: ${localKey},`);
+		}
+
+		if (this.first) {
+			properties.addBlock(`first: null,`);
+			this.builders.hydrate.addLine(`this.first = ${this.first};`);
+		}
+
+		if (this.builders.create.isEmpty()) {
+			properties.addBlock(`create: @noop,`);
+		} else {
+			properties.addBlock(deindent`
+				create: function () {
+					${this.builders.create}
+					${!this.builders.hydrate.isEmpty() && `this.hydrate();`}
+				},
+			`);
+		}
+
+		if (this.generator.hydratable) {
+			if (this.builders.claim.isEmpty()) {
+				properties.addBlock(`claim: @noop,`);
+			} else {
+				properties.addBlock(deindent`
+					claim: function ( nodes ) {
+						${this.builders.claim}
+						${!this.builders.hydrate.isEmpty() && `this.hydrate();`}
+					},
+				`);
+			}
+		}
+
+		if (!this.builders.hydrate.isEmpty()) {
+			properties.addBlock(deindent`
+				hydrate: function ( nodes ) {
+					${this.builders.hydrate}
+				},
+			`);
+		}
+
+		if (this.builders.mount.isEmpty()) {
+			properties.addBlock(`mount: @noop,`);
+		} else {
+			properties.addBlock(deindent`
+				mount: function ( #target, anchor ) {
+					${this.builders.mount}
+				},
+			`);
+		}
+
+		if (this.hasUpdateMethod) {
+			if (this.builders.update.isEmpty()) {
+				properties.addBlock(`update: @noop,`);
+			} else {
+				properties.addBlock(deindent`
+					update: function ( changed, ${this.params.join(', ')} ) {
+						${this.builders.update}
+					},
+				`);
+			}
+		}
+
+		if (this.hasIntroMethod) {
+			if (hasIntros) {
+				properties.addBlock(deindent`
+					intro: function ( #target, anchor ) {
+						if ( ${introing} ) return;
+						${introing} = true;
+						${hasOutros && `${outroing} = false;`}
+
+						${this.builders.intro}
+
+						this.mount( #target, anchor );
+					},
+				`);
+			} else {
+				properties.addBlock(deindent`
+					intro: function ( #target, anchor ) {
+						this.mount( #target, anchor );
+					},
+				`);
+			}
+		}
+
+		if (this.hasOutroMethod) {
+			if (hasOutros) {
+				properties.addBlock(deindent`
+					outro: function ( ${this.alias('outrocallback')} ) {
+						if ( ${outroing} ) return;
+						${outroing} = true;
+						${hasIntros && `${introing} = false;`}
+
+						var ${this.alias('outros')} = ${this.outros};
+
+						${this.builders.outro}
+					},
+				`);
+			} else {
+				properties.addBlock(deindent`
+					outro: function ( outrocallback ) {
+						outrocallback();
+					},
+				`);
+			}
+		}
+
+		if (this.builders.unmount.isEmpty()) {
+			properties.addBlock(`unmount: @noop,`);
+		} else {
+			properties.addBlock(deindent`
+				unmount: function () {
+					${this.builders.unmount}
+				},
+			`);
+		}
+
+		if (this.builders.destroy.isEmpty()) {
+			properties.addBlock(`destroy: @noop`);
+		} else {
+			properties.addBlock(deindent`
+				destroy: function () {
+					${this.builders.destroy}
+				}
+			`);
+		}
+
+		return deindent`
+			function ${this.name} ( ${this.params.join(', ')}, #component${this.key
+			? `, ${localKey}`
+			: ''} ) {
+				${this.variables.size > 0 &&
+					`var ${Array.from(this.variables.keys())
+						.map(key => {
+							const init = this.variables.get(key);
+							return init !== undefined ? `${key} = ${init}` : key;
+						})
+						.join(', ')};`}
+
+				${!this.builders.init.isEmpty() && this.builders.init}
+
+				return {
+					${properties}
+				};
+			}
+		`.replace(/(\\)?#(\w*)/g, (match, escaped, name) => {
+			return escaped ? match.slice(1) : this.alias(name);
+		});
+	}
+}
diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js
deleted file mode 100644
index 1309c4ddb2..0000000000
--- a/src/generators/dom/index.js
+++ /dev/null
@@ -1,312 +0,0 @@
-import MagicString from 'magic-string';
-import { parse } from 'acorn';
-import annotateWithScopes from '../../utils/annotateWithScopes.js';
-import isReference from '../../utils/isReference.js';
-import { walk } from 'estree-walker';
-import deindent from '../../utils/deindent.js';
-import CodeBuilder from '../../utils/CodeBuilder.js';
-import visit from './visit.js';
-import Generator from '../Generator.js';
-import preprocess from './preprocess.js';
-import * as shared from '../../shared/index.js';
-
-class DomGenerator extends Generator {
-	constructor ( parsed, source, name, options ) {
-		super( parsed, source, name, options );
-		this.blocks = [];
-		this.uses = new Set();
-
-		this.readonly = new Set();
-
-		// initial values for e.g. window.innerWidth, if there's a <:Window> meta tag
-		this.builders = {
-			metaBindings: new CodeBuilder()
-		};
-	}
-
-	helper ( name ) {
-		if ( this.options.dev && `${name}Dev` in shared ) {
-			name = `${name}Dev`;
-		}
-
-		this.uses.add( name );
-
-		return this.alias( name );
-	}
-}
-
-export default function dom ( parsed, source, options ) {
-	const format = options.format || 'es';
-	const name = options.name || 'SvelteComponent';
-
-	const generator = new DomGenerator( parsed, source, name, options );
-
-	const { computations, hasJs, templateProperties, namespace } = generator.parseJs();
-
-	const block = preprocess( generator, parsed.html );
-
-	const state = {
-		namespace,
-		parentNode: null,
-		isTopLevel: true
-	};
-
-	parsed.html.children.forEach( node => {
-		visit( generator, block, state, node );
-	});
-
-	const builders = {
-		main: new CodeBuilder(),
-		init: new CodeBuilder(),
-		_set: new CodeBuilder()
-	};
-
-	if ( options.dev ) {
-		builders._set.addBlock( deindent`
-			if ( typeof newState !== 'object' ) {
-				throw new Error( 'Component .set was called without an object of data key-values to update.' );
-			}
-		`);
-	}
-
-	builders._set.addLine( 'var oldState = this._state;' );
-	builders._set.addLine( `this._state = ${generator.helper( 'assign' )}( {}, oldState, newState );` );
-
-	if ( computations.length ) {
-		const builder = new CodeBuilder();
-		const differs = generator.helper( 'differs' );
-
-		computations.forEach( ({ key, deps }) => {
-			if ( generator.readonly.has( key ) ) {
-				// <:Window> bindings
-				throw new Error( `Cannot have a computed value '${key}' that clashes with a read-only property` );
-			}
-
-			generator.readonly.add( key );
-
-			const condition = `isInitial || ${deps.map( dep => `( '${dep}' in newState && ${differs}( state.${dep}, oldState.${dep} ) )` ).join( ' || ' )}`;
-			const statement = `state.${key} = newState.${key} = ${generator.alias( 'template' )}.computed.${key}( ${deps.map( dep => `state.${dep}` ).join( ', ' )} );`;
-
-			builder.addConditionalLine( condition, statement );
-		});
-
-		builders.main.addBlock( deindent`
-			function ${generator.alias( 'recompute' )} ( state, newState, oldState, isInitial ) {
-				${builder}
-			}
-		` );
-	}
-
-	if ( options.dev ) {
-		Array.from( generator.readonly ).forEach( prop => {
-			builders._set.addLine( `if ( '${prop}' in newState && !this._updatingReadonlyProperty ) throw new Error( "Cannot set read-only property '${prop}'" );` );
-		});
-	}
-
-	if ( computations.length ) {
-		builders._set.addLine( `${generator.alias( 'recompute' )}( this._state, newState, oldState, false )` );
-	}
-
-	builders._set.addLine( `${generator.helper( 'dispatchObservers' )}( this, this._observers.pre, newState, oldState );` );
-	if ( block.hasUpdateMethod ) builders._set.addLine( `if ( this._fragment ) this._fragment.update( newState, this._state );` ); // TODO is the condition necessary?
-	builders._set.addLine( `${generator.helper( 'dispatchObservers' )}( this, this._observers.post, newState, oldState );` );
-
-	if ( hasJs ) {
-		builders.main.addBlock( `[✂${parsed.js.content.start}-${parsed.js.content.end}✂]` );
-	}
-
-	if ( generator.css && options.css !== false ) {
-		builders.main.addBlock( deindent`
-			var ${generator.alias( 'added_css' )} = false;
-			function ${generator.alias( 'add_css' )} () {
-				var style = ${generator.helper( 'createElement' )}( 'style' );
-				style.textContent = ${JSON.stringify( generator.css )};
-				${generator.helper( 'appendNode' )}( style, document.head );
-
-				${generator.alias( 'added_css' )} = true;
-			}
-		` );
-	}
-
-	generator.blocks.forEach( block => {
-		builders.main.addBlock( block.render() );
-	});
-
-	builders.init.addLine( `this._torndown = false;` );
-
-	if ( parsed.css && options.css !== false ) {
-		builders.init.addLine( `if ( !${generator.alias( 'added_css' )} ) ${generator.alias( 'add_css' )}();` );
-	}
-
-	if ( generator.hasComponents ) {
-		builders.init.addLine( `this._renderHooks = [];` );
-	}
-
-	if ( generator.hasComplexBindings ) {
-		builders.init.addBlock( deindent`
-			this._bindings = [];
-			this._fragment = ${generator.alias( 'create_main_fragment' )}( this._state, this );
-			if ( options.target ) this._fragment.mount( options.target, null );
-			while ( this._bindings.length ) this._bindings.pop()();
-		` );
-
-		builders._set.addLine( `while ( this._bindings.length ) this._bindings.pop()();` );
-	} else {
-		builders.init.addBlock( deindent`
-			this._fragment = ${generator.alias( 'create_main_fragment' )}( this._state, this );
-			if ( options.target ) this._fragment.mount( options.target, null );
-		` );
-	}
-
-	if ( generator.hasComponents ) {
-		const statement = `this._flush();`;
-
-		builders.init.addBlock( statement );
-		builders._set.addBlock( statement );
-	}
-
-	if ( templateProperties.oncreate ) {
-		builders.init.addBlock( deindent`
-			if ( options._root ) {
-				options._root._renderHooks.push({ fn: ${generator.alias( 'template' )}.oncreate, context: this });
-			} else {
-				${generator.alias( 'template' )}.oncreate.call( this );
-			}
-		` );
-	}
-
-	const constructorBlock = new CodeBuilder();
-
-	constructorBlock.addLine( `options = options || {};` );
-	if ( generator.usesRefs ) constructorBlock.addLine( `this.refs = {};` );
-
-	constructorBlock.addLine(
-		`this._state = ${templateProperties.data ? `${generator.helper( 'assign' )}( ${generator.alias( 'template' )}.data(), options.data )` : `options.data || {}`};`
-	);
-
-	if ( !generator.builders.metaBindings.isEmpty() ) {
-		constructorBlock.addBlock( generator.builders.metaBindings );
-	}
-
-	if ( computations.length ) {
-		constructorBlock.addLine(
-			`${generator.alias( 'recompute' )}( this._state, this._state, {}, true );`
-		);
-	}
-
-	if ( options.dev ) {
-		generator.expectedProperties.forEach( prop => {
-			constructorBlock.addLine(
-				`if ( !( '${prop}' in this._state ) ) console.warn( "Component was created without expected data property '${prop}'" );`
-			);
-		});
-
-		constructorBlock.addBlock(
-			`if ( !options.target && !options._root ) throw new Error( "'target' is a required option" );`
-		);
-	}
-
-	if ( generator.bindingGroups.length ) {
-		constructorBlock.addLine( `this._bindingGroups = [ ${Array( generator.bindingGroups.length ).fill( '[]' ).join( ', ' )} ];` );
-	}
-
-	constructorBlock.addBlock( deindent`
-		this._observers = {
-			pre: Object.create( null ),
-			post: Object.create( null )
-		};
-
-		this._handlers = Object.create( null );
-
-		this._root = options._root;
-		this._yield = options._yield;
-
-		${builders.init}
-	` );
-
-	builders.main.addBlock( deindent`
-		function ${name} ( options ) {
-			${constructorBlock}
-		}
-	` );
-
-	const sharedPath = options.shared === true ? 'svelte/shared.js' : options.shared;
-
-	const prototypeBase = `${name}.prototype` + ( templateProperties.methods ? `, ${generator.alias( 'template' )}.methods` : '' );
-	const proto = sharedPath ? `${generator.helper( 'proto' )} ` : deindent`
-		{
-			${
-				[ 'get', 'fire', 'observe', 'on', 'set', '_flush' ]
-					.map( n => `${n}: ${generator.helper( n )}` )
-					.join( ',\n' )
-			}
-		}`;
-
-	builders.main.addBlock( `${generator.helper( 'assign' )}( ${prototypeBase}, ${proto});` );
-
-	// TODO deprecate component.teardown()
-	builders.main.addBlock( deindent`
-		${name}.prototype._set = function _set ( newState ) {
-			${builders._set}
-		};
-
-		${name}.prototype.teardown = ${name}.prototype.destroy = function destroy ( detach ) {
-			this.fire( 'destroy' );${templateProperties.ondestroy ? `\n${generator.alias( 'template' )}.ondestroy.call( this );` : ``}
-
-			this._fragment.destroy( detach !== false );
-			this._fragment = null;
-
-			this._state = {};
-			this._torndown = true;
-		};
-	` );
-
-	if ( sharedPath ) {
-		if ( format !== 'es' ) {
-			throw new Error( `Components with shared helpers must be compiled to ES2015 modules (format: 'es')` );
-		}
-
-		const names = Array.from( generator.uses ).sort().map( name => {
-			return name !== generator.alias( name ) ? `${name} as ${generator.alias( name )}` : name;
-		});
-
-		builders.main.addLineAtStart(
-			`import { ${names.join( ', ' )} } from ${JSON.stringify( sharedPath )};`
-		);
-	} else {
-		generator.uses.forEach( key => {
-			const str = shared[ key ].toString(); // eslint-disable-line import/namespace
-			const code = new MagicString( str );
-			const fn = parse( str ).body[0];
-
-			let scope = annotateWithScopes( fn );
-
-			walk( fn, {
-				enter ( node, parent ) {
-					if ( node._scope ) scope = node._scope;
-
-					if ( node.type === 'Identifier' && isReference( node, parent ) && !scope.has( node.name ) ) {
-						if ( node.name in shared ) {
-							// this helper function depends on another one
-							generator.uses.add( node.name );
-
-							const alias = generator.alias( node.name );
-							if ( alias !== node.name ) code.overwrite( node.start, node.end, alias );
-						}
-					}
-				},
-
-				leave ( node ) {
-					if ( node._scope ) scope = scope.parent;
-				}
-			});
-
-			const alias = generator.alias( fn.id.name );
-			if ( alias !== fn.id.name ) code.overwrite( fn.id.start, fn.id.end, alias );
-
-			builders.main.addBlock( code.toString() );
-		});
-	}
-
-	return generator.generate( builders.main.toString(), options, { name, format } );
-}
diff --git a/src/generators/dom/index.ts b/src/generators/dom/index.ts
new file mode 100644
index 0000000000..fe0b3857f2
--- /dev/null
+++ b/src/generators/dom/index.ts
@@ -0,0 +1,340 @@
+import MagicString from 'magic-string';
+import { parseExpressionAt } from 'acorn';
+import annotateWithScopes from '../../utils/annotateWithScopes';
+import isReference from '../../utils/isReference';
+import { walk } from 'estree-walker';
+import deindent from '../../utils/deindent';
+import stringify from '../../utils/stringify';
+import CodeBuilder from '../../utils/CodeBuilder';
+import visit from './visit';
+import shared from './shared';
+import Generator from '../Generator';
+import preprocess from './preprocess';
+import Block from './Block';
+import { Parsed, CompileOptions, Node } from '../../interfaces';
+
+export class DomGenerator extends Generator {
+	blocks: Block[];
+	readonly: Set<string>;
+	metaBindings: string[];
+
+	hydratable: boolean;
+
+	hasIntroTransitions: boolean;
+	hasOutroTransitions: boolean;
+	hasComplexBindings: boolean;
+
+	constructor(
+		parsed: Parsed,
+		source: string,
+		name: string,
+		options: CompileOptions
+	) {
+		super(parsed, source, name, options);
+		this.blocks = [];
+
+		this.readonly = new Set();
+
+		this.hydratable = options.hydratable;
+
+		// initial values for e.g. window.innerWidth, if there's a <:Window> meta tag
+		this.metaBindings = [];
+	}
+}
+
+export default function dom(
+	parsed: Parsed,
+	source: string,
+	options: CompileOptions
+) {
+	const format = options.format || 'es';
+
+	const generator = new DomGenerator(parsed, source, options.name || 'SvelteComponent', options);
+
+	const {
+		computations,
+		hasJs,
+		name,
+		templateProperties,
+		namespace,
+	} = generator;
+
+	const { block, state } = preprocess(generator, namespace, parsed.html);
+
+	parsed.html.children.forEach((node: Node) => {
+		visit(generator, block, state, node);
+	});
+
+	const builder = new CodeBuilder();
+
+	if (computations.length) {
+		const computationBuilder = new CodeBuilder();
+
+		computations.forEach(({ key, deps }) => {
+			if (generator.readonly.has(key)) {
+				// <:Window> bindings
+				throw new Error(
+					`Cannot have a computed value '${key}' that clashes with a read-only property`
+				);
+			}
+
+			generator.readonly.add(key);
+
+			const condition = `isInitial || ${deps
+				.map(
+					dep =>
+						`( '${dep}' in newState && @differs( state.${dep}, oldState.${dep} ) )`
+				)
+				.join(' || ')}`;
+			const statement = `state.${key} = newState.${key} = @template.computed.${key}( ${deps
+				.map(dep => `state.${dep}`)
+				.join(', ')} );`;
+
+			computationBuilder.addConditionalLine(condition, statement);
+		});
+
+		builder.addBlock(deindent`
+			function @recompute ( state, newState, oldState, isInitial ) {
+				${computationBuilder}
+			}
+		`);
+	}
+
+	const _set = deindent`
+		${options.dev &&
+			deindent`
+			if ( typeof newState !== 'object' ) {
+				throw new Error( 'Component .set was called without an object of data key-values to update.' );
+			}
+
+			${Array.from(generator.readonly).map(
+				prop =>
+					`if ( '${prop}' in newState && !this._updatingReadonlyProperty ) throw new Error( "Cannot set read-only property '${prop}'" );`
+			)}
+		`}
+
+		var oldState = this._state;
+		this._state = @assign( {}, oldState, newState );
+		${computations.length &&
+			`@recompute( this._state, newState, oldState, false )`}
+		@dispatchObservers( this, this._observers.pre, newState, oldState );
+		${block.hasUpdateMethod && `this._fragment.update( newState, this._state );`}
+		@dispatchObservers( this, this._observers.post, newState, oldState );
+		${generator.hasComplexBindings &&
+			`while ( this._bindings.length ) this._bindings.pop()();`}
+		${(generator.hasComponents || generator.hasIntroTransitions) &&
+			`this._flush();`}
+	`;
+
+	if (hasJs) {
+		builder.addBlock(`[✂${parsed.js.content.start}-${parsed.js.content.end}✂]`);
+	}
+
+	if (generator.css && options.css !== false) {
+		builder.addBlock(deindent`
+			function @add_css () {
+				var style = @createElement( 'style' );
+				style.id = '${generator.cssId}-style';
+				style.textContent = ${stringify(generator.css)};
+				@appendNode( style, document.head );
+			}
+		`);
+	}
+
+	generator.blocks.forEach(block => {
+		builder.addBlock(block.render());
+	});
+
+	const sharedPath = options.shared === true
+		? 'svelte/shared.js'
+		: options.shared;
+
+	const prototypeBase =
+		`${name}.prototype` +
+		(templateProperties.methods ? `, @template.methods` : '');
+	const proto = sharedPath
+		? `@proto `
+		: deindent`
+		{
+			${['get', 'fire', 'observe', 'on', 'set', '_flush']
+				.map(n => `${n}: @${n}`)
+				.join(',\n')}
+		}`;
+
+	// TODO deprecate component.teardown()
+	builder.addBlock(deindent`
+		function ${name} ( options ) {
+			options = options || {};
+			${options.dev &&
+				`if ( !options.target && !options._root ) throw new Error( "'target' is a required option" );`}
+			${generator.usesRefs && `this.refs = {};`}
+			this._state = ${templateProperties.data
+				? `@assign( @template.data(), options.data )`
+				: `options.data || {}`};
+			${generator.metaBindings}
+			${computations.length && `@recompute( this._state, this._state, {}, true );`}
+			${options.dev &&
+				Array.from(generator.expectedProperties).map(
+					prop =>
+						`if ( !( '${prop}' in this._state ) ) console.warn( "Component was created without expected data property '${prop}'" );`
+				)}
+			${generator.bindingGroups.length &&
+				`this._bindingGroups = [ ${Array(generator.bindingGroups.length)
+					.fill('[]')
+					.join(', ')} ];`}
+
+			this._observers = {
+				pre: Object.create( null ),
+				post: Object.create( null )
+			};
+
+			this._handlers = Object.create( null );
+
+			this._root = options._root || this;
+			this._yield = options._yield;
+
+			this._torndown = false;
+			${generator.css &&
+				options.css !== false &&
+				`if ( !document.getElementById( '${generator.cssId}-style' ) ) @add_css();`}
+			${(generator.hasComponents || generator.hasIntroTransitions) &&
+				`this._renderHooks = [];`}
+			${generator.hasComplexBindings && `this._bindings = [];`}
+
+			this._fragment = @create_main_fragment( this._state, this );
+
+			if ( options.target ) {
+				${generator.hydratable
+					? deindent`
+						var nodes = @children( options.target );
+						options.hydrate ? this._fragment.claim( nodes ) : this._fragment.create();
+						nodes.forEach( @detachNode );
+					` :
+					deindent`
+						${options.dev && `if ( options.hydrate ) throw new Error( 'options.hydrate only works if the component was compiled with the \`hydratable: true\` option' );`}
+						this._fragment.create();
+					`}
+				this._fragment.${block.hasIntroMethod ? 'intro' : 'mount'}( options.target, null );
+			}
+			
+			${generator.hasComplexBindings &&
+				`while ( this._bindings.length ) this._bindings.pop()();`}
+			${(generator.hasComponents || generator.hasIntroTransitions) &&
+				`this._flush();`}
+
+			${templateProperties.oncreate &&
+				deindent`
+				if ( options._root ) {
+					options._root._renderHooks.push( @template.oncreate.bind( this ) );
+				} else {
+					@template.oncreate.call( this );
+				}
+			`}
+		}
+
+		@assign( ${prototypeBase}, ${proto});
+
+		${name}.prototype._set = function _set ( newState ) {
+			${_set}
+		};
+
+		${name}.prototype.teardown = ${name}.prototype.destroy = function destroy ( detach ) {
+			this.fire( 'destroy' );
+			${templateProperties.ondestroy && `@template.ondestroy.call( this );`}
+
+			if ( detach !== false ) this._fragment.unmount();
+			this._fragment.destroy();
+			this._fragment = null;
+
+			this._state = {};
+			this._torndown = true;
+		};
+	`);
+
+	const usedHelpers = new Set();
+
+	let result = builder
+		.toString()
+		.replace(/(\\)?@(\w*)/g, (match: string, escaped: string, name: string) => {
+			if (escaped) return match.slice(1);
+
+			if (name in shared) {
+				if (options.dev && `${name}Dev` in shared) name = `${name}Dev`;
+				usedHelpers.add(name);
+			}
+
+			return generator.alias(name);
+		});
+
+	if (sharedPath) {
+		if (format !== 'es') {
+			throw new Error(
+				`Components with shared helpers must be compiled to ES2015 modules (format: 'es')`
+			);
+		}
+
+		const names = Array.from(usedHelpers).sort().map(name => {
+			return name !== generator.alias(name)
+				? `${name} as ${generator.alias(name)}`
+				: name;
+		});
+
+		result =
+			`import { ${names.join(', ')} } from ${stringify(sharedPath)};\n\n` +
+			result;
+	} else {
+		usedHelpers.forEach(key => {
+			const str = shared[key];
+			const code = new MagicString(str);
+			const expression = parseExpressionAt(str, 0);
+
+			let scope = annotateWithScopes(expression);
+
+			walk(expression, {
+				enter(node, parent) {
+					if (node._scope) scope = node._scope;
+
+					if (
+						node.type === 'Identifier' &&
+						isReference(node, parent) &&
+						!scope.has(node.name)
+					) {
+						if (node.name in shared) {
+							// this helper function depends on another one
+							const dependency = node.name;
+							usedHelpers.add(dependency);
+
+							const alias = generator.alias(dependency);
+							if (alias !== node.name)
+								code.overwrite(node.start, node.end, alias);
+						}
+					}
+				},
+
+				leave(node) {
+					if (node._scope) scope = scope.parent;
+				},
+			});
+
+			if (key === 'transitionManager') {
+				// special case
+				const global = `_svelteTransitionManager`;
+
+				result += `\n\nvar ${generator.alias(
+					'transitionManager'
+				)} = window.${global} || ( window.${global} = ${code});`;
+			} else {
+				const alias = generator.alias(expression.id.name);
+				if (alias !== expression.id.name)
+					code.overwrite(expression.id.start, expression.id.end, alias);
+
+				result += `\n\n${code}`;
+			}
+		});
+	}
+
+	return generator.generate(result, options, {
+		name,
+		format,
+	});
+}
diff --git a/src/generators/dom/interfaces.ts b/src/generators/dom/interfaces.ts
new file mode 100644
index 0000000000..03923b79bf
--- /dev/null
+++ b/src/generators/dom/interfaces.ts
@@ -0,0 +1,13 @@
+export interface State {
+	name: string;
+	namespace: string;
+	parentNode: string;
+	parentNodes: string;
+	isTopLevel: boolean;
+	parentNodeName?: string;
+	basename?: string;
+	inEachBlock?: boolean;
+	allUsedContexts?: string[];
+	usesComponent?: boolean;
+	selectBindingDependencies?: string[];
+}
diff --git a/src/generators/dom/preprocess.js b/src/generators/dom/preprocess.js
deleted file mode 100644
index f8ab06ddc3..0000000000
--- a/src/generators/dom/preprocess.js
+++ /dev/null
@@ -1,219 +0,0 @@
-import Block from './Block.js';
-import { trimStart, trimEnd } from '../../utils/trim.js';
-
-function isElseIf ( node ) {
-	return node && node.children.length === 1 && node.children[0].type === 'IfBlock';
-}
-
-const preprocessors = {
-	MustacheTag: ( generator, block, node ) => {
-		const dependencies = block.findDependencies( node.expression );
-		block.addDependencies( dependencies );
-	},
-
-	IfBlock: ( generator, block, node ) => {
-		const blocks = [];
-		let dynamic = false;
-
-		function attachBlocks ( node ) {
-			const dependencies = block.findDependencies( node.expression );
-			block.addDependencies( dependencies );
-
-			node._block = block.child({
-				name: generator.getUniqueName( `create_if_block` )
-			});
-
-			blocks.push( node._block );
-			preprocessChildren( generator, node._block, node );
-
-			if ( node._block.dependencies.size > 0 ) {
-				dynamic = true;
-				block.addDependencies( node._block.dependencies );
-			}
-
-			if ( isElseIf( node.else ) ) {
-				attachBlocks( node.else.children[0] );
-			} else if ( node.else ) {
-				node.else._block = block.child({
-					name: generator.getUniqueName( `create_if_block` )
-				});
-
-				blocks.push( node.else._block );
-				preprocessChildren( generator, node.else._block, node.else );
-
-				if ( node.else._block.dependencies.size > 0 ) {
-					dynamic = true;
-					block.addDependencies( node.else._block.dependencies );
-				}
-			}
-		}
-
-		attachBlocks( node );
-
-		blocks.forEach( block => {
-			block.hasUpdateMethod = dynamic;
-		});
-
-		generator.blocks.push( ...blocks );
-	},
-
-	EachBlock: ( generator, block, node ) => {
-		const dependencies = block.findDependencies( node.expression );
-		block.addDependencies( dependencies );
-
-		const indexNames = new Map( block.indexNames );
-		const indexName = node.index || block.getUniqueName( `${node.context}_index` );
-		indexNames.set( node.context, indexName );
-
-		const listNames = new Map( block.listNames );
-		const listName = block.getUniqueName( `each_block_value` );
-		listNames.set( node.context, listName );
-
-		const context = generator.getUniqueName( node.context );
-		const contexts = new Map( block.contexts );
-		contexts.set( node.context, context );
-
-		const indexes = new Map( block.indexes );
-		if ( node.index ) indexes.set( indexName, node.context );
-
-		const contextDependencies = new Map( block.contextDependencies );
-		contextDependencies.set( node.context, dependencies );
-
-		node._block = block.child({
-			name: generator.getUniqueName( 'create_each_block' ),
-			expression: node.expression,
-			context: node.context,
-			key: node.key,
-
-			contextDependencies,
-			contexts,
-			indexes,
-
-			listName,
-			indexName,
-
-			indexNames,
-			listNames,
-			params: block.params.concat( listName, context, indexName )
-		});
-
-		generator.blocks.push( node._block );
-		preprocessChildren( generator, node._block, node );
-		block.addDependencies( node._block.dependencies );
-		node._block.hasUpdateMethod = node._block.dependencies.size > 0;
-
-		if ( node.else ) {
-			node.else._block = block.child({
-				name: generator.getUniqueName( `${node._block.name}_else` )
-			});
-
-			generator.blocks.push( node.else._block );
-			preprocessChildren( generator, node.else._block, node.else );
-			node.else._block.hasUpdateMethod = node.else._block.dependencies.size > 0;
-		}
-	},
-
-	Element: ( generator, block, node ) => {
-		node.attributes.forEach( attribute => {
-			if ( attribute.type === 'Attribute' && attribute.value !== true ) {
-				attribute.value.forEach( chunk => {
-					if ( chunk.type !== 'Text' ) {
-						const dependencies = block.findDependencies( chunk.expression );
-						block.addDependencies( dependencies );
-					}
-				});
-			}
-
-			else if ( attribute.type === 'Binding' ) {
-				const dependencies = block.findDependencies( attribute.value );
-				block.addDependencies( dependencies );
-			}
-		});
-
-		const isComponent = generator.components.has( node.name ) || node.name === ':Self';
-
-		if ( node.children.length ) {
-			if ( isComponent ) {
-				const name = block.getUniqueName( ( node.name === ':Self' ? generator.name : node.name ).toLowerCase() );
-
-				node._block = block.child({
-					name: generator.getUniqueName( `create_${name}_yield_fragment` )
-				});
-
-				generator.blocks.push( node._block );
-				preprocessChildren( generator, node._block, node );
-				block.addDependencies( node._block.dependencies );
-				node._block.hasUpdateMethod = node._block.dependencies.size > 0;
-			}
-
-			else {
-				preprocessChildren( generator, block, node );
-			}
-		}
-	}
-};
-
-preprocessors.RawMustacheTag = preprocessors.MustacheTag;
-
-function preprocessChildren ( generator, block, node ) {
-	// glue text nodes together
-	const cleaned = [];
-	let lastChild;
-
-	node.children.forEach( child => {
-		if ( child.type === 'Comment' ) return;
-
-		if ( child.type === 'Text' && lastChild && lastChild.type === 'Text' ) {
-			lastChild.data += child.data;
-			lastChild.end = child.end;
-		} else {
-			cleaned.push( child );
-		}
-
-		lastChild = child;
-	});
-
-	node.children = cleaned;
-
-	cleaned.forEach( child => {
-		const preprocess = preprocessors[ child.type ];
-		if ( preprocess ) preprocess( generator, block, child );
-	});
-}
-
-export default function preprocess ( generator, node ) {
-	const block = new Block({
-		generator,
-		name: generator.alias( 'create_main_fragment' ),
-		key: null,
-
-		contexts: new Map(),
-		indexes: new Map(),
-		contextDependencies: new Map(),
-
-		params: [ 'state' ],
-		indexNames: new Map(),
-		listNames: new Map(),
-
-		dependencies: new Set()
-	});
-
-	generator.blocks.push( block );
-	preprocessChildren( generator, block, node );
-	block.hasUpdateMethod = block.dependencies.size > 0;
-
-	// trim leading and trailing whitespace from the top level
-	const firstChild = node.children[0];
-	if ( firstChild && firstChild.type === 'Text' ) {
-		firstChild.data = trimStart( firstChild.data );
-		if ( !firstChild.data ) node.children.shift();
-	}
-
-	const lastChild = node.children[ node.children.length - 1 ];
-	if ( lastChild && lastChild.type === 'Text' ) {
-		lastChild.data = trimEnd( lastChild.data );
-		if ( !lastChild.data ) node.children.pop();
-	}
-
-	return block;
-}
\ No newline at end of file
diff --git a/src/generators/dom/preprocess.ts b/src/generators/dom/preprocess.ts
new file mode 100644
index 0000000000..55a057b9e4
--- /dev/null
+++ b/src/generators/dom/preprocess.ts
@@ -0,0 +1,439 @@
+import Block from './Block';
+import { trimStart, trimEnd } from '../../utils/trim';
+import { assign } from '../../shared/index.js';
+import { DomGenerator } from './index';
+import { Node } from '../../interfaces';
+import { State } from './interfaces';
+
+function isElseIf(node: Node) {
+	return (
+		node && node.children.length === 1 && node.children[0].type === 'IfBlock'
+	);
+}
+
+function getChildState(parent: State, child = {}) {
+	return assign(
+		{},
+		parent,
+		{ name: null, parentNode: null, parentNodes: 'nodes' },
+		child || {}
+	);
+}
+
+// Whitespace inside one of these elements will not result in
+// a whitespace node being created in any circumstances. (This
+// list is almost certainly very incomplete)
+const elementsWithoutText = new Set([
+	'audio',
+	'datalist',
+	'dl',
+	'ol',
+	'optgroup',
+	'select',
+	'ul',
+	'video',
+]);
+
+const preprocessors = {
+	MustacheTag: (
+		generator: DomGenerator,
+		block: Block,
+		state: State,
+		node: Node,
+		stripWhitespace: boolean
+	) => {
+		const dependencies = block.findDependencies(node.expression);
+		block.addDependencies(dependencies);
+
+		node._state = getChildState(state, {
+			name: block.getUniqueName('text'),
+		});
+	},
+
+	RawMustacheTag: (
+		generator: DomGenerator,
+		block: Block,
+		state: State,
+		node: Node,
+		stripWhitespace: boolean
+	) => {
+		const dependencies = block.findDependencies(node.expression);
+		block.addDependencies(dependencies);
+
+		const basename = block.getUniqueName('raw');
+		const name = block.getUniqueName(`${basename}_before`);
+
+		node._state = getChildState(state, { basename, name });
+	},
+
+	Text: (generator: DomGenerator, block: Block, state: State, node: Node, stripWhitespace: boolean) => {
+		node._state = getChildState(state);
+
+		if (!/\S/.test(node.data)) {
+			if (state.namespace) return;
+			if (elementsWithoutText.has(state.parentNodeName)) return;
+		}
+
+		node._state.shouldCreate = true;
+		node._state.name = block.getUniqueName(`text`);
+	},
+
+	IfBlock: (
+		generator: DomGenerator,
+		block: Block,
+		state: State,
+		node: Node,
+		stripWhitespace: boolean,
+		nextSibling: Node
+	) => {
+		const blocks: Block[] = [];
+		let dynamic = false;
+		let hasIntros = false;
+		let hasOutros = false;
+
+		function attachBlocks(node: Node) {
+			const dependencies = block.findDependencies(node.expression);
+			block.addDependencies(dependencies);
+
+			node._block = block.child({
+				name: generator.getUniqueName(`create_if_block`),
+			});
+
+			node._state = getChildState(state);
+
+			blocks.push(node._block);
+			preprocessChildren(generator, node._block, node._state, node, stripWhitespace, node);
+
+			if (node._block.dependencies.size > 0) {
+				dynamic = true;
+				block.addDependencies(node._block.dependencies);
+			}
+
+			if (node._block.hasIntroMethod) hasIntros = true;
+			if (node._block.hasOutroMethod) hasOutros = true;
+
+			if (isElseIf(node.else)) {
+				attachBlocks(node.else.children[0]);
+			} else if (node.else) {
+				node.else._block = block.child({
+					name: generator.getUniqueName(`create_if_block`),
+				});
+
+				node.else._state = getChildState(state);
+
+				blocks.push(node.else._block);
+				preprocessChildren(
+					generator,
+					node.else._block,
+					node.else._state,
+					node.else,
+					stripWhitespace,
+					nextSibling
+				);
+
+				if (node.else._block.dependencies.size > 0) {
+					dynamic = true;
+					block.addDependencies(node.else._block.dependencies);
+				}
+			}
+		}
+
+		attachBlocks(node);
+
+		blocks.forEach(block => {
+			block.hasUpdateMethod = dynamic;
+			block.hasIntroMethod = hasIntros;
+			block.hasOutroMethod = hasOutros;
+		});
+
+		generator.blocks.push(...blocks);
+	},
+
+	EachBlock: (
+		generator: DomGenerator,
+		block: Block,
+		state: State,
+		node: Node,
+		stripWhitespace: boolean,
+		nextSibling: Node
+	) => {
+		const dependencies = block.findDependencies(node.expression);
+		block.addDependencies(dependencies);
+
+		const indexNames = new Map(block.indexNames);
+		const indexName =
+			node.index || block.getUniqueName(`${node.context}_index`);
+		indexNames.set(node.context, indexName);
+
+		const listNames = new Map(block.listNames);
+		const listName = block.getUniqueName(`each_block_value`);
+		listNames.set(node.context, listName);
+
+		const context = generator.getUniqueName(node.context);
+		const contexts = new Map(block.contexts);
+		contexts.set(node.context, context);
+
+		const indexes = new Map(block.indexes);
+		if (node.index) indexes.set(indexName, node.context);
+
+		const contextDependencies = new Map(block.contextDependencies);
+		contextDependencies.set(node.context, dependencies);
+
+		node._block = block.child({
+			name: generator.getUniqueName('create_each_block'),
+			expression: node.expression,
+			context: node.context,
+			key: node.key,
+
+			contextDependencies,
+			contexts,
+			indexes,
+
+			listName,
+			indexName,
+
+			indexNames,
+			listNames,
+			params: block.params.concat(listName, context, indexName),
+		});
+
+		node._state = getChildState(state, {
+			inEachBlock: true,
+		});
+
+		generator.blocks.push(node._block);
+		preprocessChildren(generator, node._block, node._state, node, stripWhitespace, nextSibling);
+		block.addDependencies(node._block.dependencies);
+		node._block.hasUpdateMethod = node._block.dependencies.size > 0;
+
+		if (node.else) {
+			node.else._block = block.child({
+				name: generator.getUniqueName(`${node._block.name}_else`),
+			});
+
+			node.else._state = getChildState(state);
+
+			generator.blocks.push(node.else._block);
+			preprocessChildren(
+				generator,
+				node.else._block,
+				node.else._state,
+				node.else,
+				stripWhitespace,
+				nextSibling
+			);
+			node.else._block.hasUpdateMethod = node.else._block.dependencies.size > 0;
+		}
+	},
+
+	Element: (
+		generator: DomGenerator,
+		block: Block,
+		state: State,
+		node: Node,
+		stripWhitespace: boolean,
+		nextSibling: Node
+	) => {
+		node.attributes.forEach((attribute: Node) => {
+			if (attribute.type === 'Attribute' && attribute.value !== true) {
+				attribute.value.forEach((chunk: Node) => {
+					if (chunk.type !== 'Text') {
+						const dependencies = block.findDependencies(chunk.expression);
+						block.addDependencies(dependencies);
+
+						// special case — <option value='{{foo}}'> — see below
+						if (
+							node.name === 'option' &&
+							attribute.name === 'value' &&
+							state.selectBindingDependencies
+						) {
+							state.selectBindingDependencies.forEach(prop => {
+								dependencies.forEach((dependency: string) => {
+									generator.indirectDependencies.get(prop).add(dependency);
+								});
+							});
+						}
+					}
+				});
+			} else if (attribute.type === 'Binding') {
+				const dependencies = block.findDependencies(attribute.value);
+				block.addDependencies(dependencies);
+			} else if (attribute.type === 'Transition') {
+				if (attribute.intro)
+					generator.hasIntroTransitions = block.hasIntroMethod = true;
+				if (attribute.outro) {
+					generator.hasOutroTransitions = block.hasOutroMethod = true;
+					block.outros += 1;
+				}
+			}
+		});
+
+		// special case — in a case like this...
+		//
+		//   <select bind:value='foo'>
+		//     <option value='{{bar}}'>bar</option>
+		//     <option value='{{baz}}'>baz</option>
+		//   </option>
+		//
+		// ...we need to know that `foo` depends on `bar` and `baz`,
+		// so that if `foo.qux` changes, we know that we need to
+		// mark `bar` and `baz` as dirty too
+		if (node.name === 'select') {
+			const value = node.attributes.find(
+				(attribute: Node) => attribute.name === 'value'
+			);
+			if (value) {
+				// TODO does this also apply to e.g. `<input type='checkbox' bind:group='foo'>`?
+				const dependencies = block.findDependencies(value.value);
+				state.selectBindingDependencies = dependencies;
+				dependencies.forEach((prop: string) => {
+					generator.indirectDependencies.set(prop, new Set());
+				});
+			} else {
+				state.selectBindingDependencies = null;
+			}
+		}
+
+		const isComponent =
+			generator.components.has(node.name) || node.name === ':Self';
+
+		if (isComponent) {
+			node._state = getChildState(state);
+		} else {
+			const name = block.getUniqueName(
+				node.name.replace(/[^a-zA-Z0-9_$]/g, '_')
+			);
+
+			node._state = getChildState(state, {
+				isTopLevel: false,
+				name,
+				parentNode: name,
+				parentNodes: block.getUniqueName(`${name}_nodes`),
+				parentNodeName: node.name,
+				namespace: node.name === 'svg'
+					? 'http://www.w3.org/2000/svg'
+					: state.namespace,
+				allUsedContexts: [],
+			});
+		}
+
+		if (node.children.length) {
+			if (isComponent) {
+				const name = block.getUniqueName(
+					(node.name === ':Self' ? generator.name : node.name).toLowerCase()
+				);
+
+				node._block = block.child({
+					name: generator.getUniqueName(`create_${name}_yield_fragment`),
+				});
+
+				generator.blocks.push(node._block);
+				preprocessChildren(generator, node._block, node._state, node, stripWhitespace, nextSibling);
+				block.addDependencies(node._block.dependencies);
+				node._block.hasUpdateMethod = node._block.dependencies.size > 0;
+			} else {
+				if (node.name === 'pre' || node.name === 'textarea') stripWhitespace = false;
+				preprocessChildren(generator, block, node._state, node, stripWhitespace, nextSibling);
+			}
+		}
+	},
+};
+
+function preprocessChildren(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node,
+	stripWhitespace: boolean,
+	nextSibling: Node
+) {
+	// glue text nodes together
+	const cleaned: Node[] = [];
+	let lastChild: Node;
+
+	node.children.forEach((child: Node) => {
+		if (child.type === 'Comment') return;
+
+		if (child.type === 'Text' && lastChild && lastChild.type === 'Text') {
+			lastChild.data += child.data;
+			lastChild.end = child.end;
+		} else {
+			if (child.type === 'Text' && stripWhitespace && cleaned.length === 0) {
+				child.data = trimStart(child.data);
+				if (child.data) cleaned.push(child);
+			} else {
+				cleaned.push(child);
+			}
+		}
+
+		lastChild = child;
+	});
+
+	lastChild = null;
+
+	cleaned.forEach((child: Node, i: number) => {
+		const preprocessor = preprocessors[child.type];
+		if (preprocessor) preprocessor(generator, block, state, child, stripWhitespace, cleaned[i + 1] || nextSibling);
+
+		if (lastChild) {
+			lastChild.next = child;
+			lastChild.needsAnchor = !child._state || !child._state.name;
+		}
+
+		lastChild = child;
+	});
+
+	// We want to remove trailing whitespace inside an element/component/block,
+	// *unless* there is no whitespace between this node and its next sibling
+	if (lastChild && lastChild.type === 'Text') {
+		if (stripWhitespace && (!nextSibling || (nextSibling.type === 'Text' && /^\s/.test(nextSibling.data)))) {
+			lastChild.data = trimEnd(lastChild.data);
+			if (!lastChild.data) {
+				cleaned.pop();
+				lastChild = cleaned[cleaned.length - 1];
+				lastChild.next = null;
+			}
+		}
+	}
+
+	if (lastChild) {
+		lastChild.needsAnchor = !state.parentNode;
+	}
+
+	node.children = cleaned;
+}
+
+export default function preprocess(
+	generator: DomGenerator,
+	namespace: string,
+	node: Node
+) {
+	const block = new Block({
+		generator,
+		name: '@create_main_fragment',
+		key: null,
+
+		contexts: new Map(),
+		indexes: new Map(),
+		contextDependencies: new Map(),
+
+		params: ['state'],
+		indexNames: new Map(),
+		listNames: new Map(),
+
+		dependencies: new Set(),
+	});
+
+	const state: State = {
+		namespace,
+		parentNode: null,
+		parentNodes: 'nodes',
+		isTopLevel: true,
+	};
+
+	generator.blocks.push(block);
+	preprocessChildren(generator, block, state, node, true, null);
+	block.hasUpdateMethod = block.dependencies.size > 0;
+
+	return { block, state };
+}
diff --git a/src/generators/dom/visit.js b/src/generators/dom/visit.js
deleted file mode 100644
index 22a040af06..0000000000
--- a/src/generators/dom/visit.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import visitors from './visitors/index.js';
-
-export default function visit ( generator, block, state, node ) {
-	const visitor = visitors[ node.type ];
-	visitor( generator, block, state, node );
-}
\ No newline at end of file
diff --git a/src/generators/dom/visit.ts b/src/generators/dom/visit.ts
new file mode 100644
index 0000000000..91601fa8fd
--- /dev/null
+++ b/src/generators/dom/visit.ts
@@ -0,0 +1,14 @@
+import visitors from './visitors/index';
+import { DomGenerator } from './index';
+import Block from './Block';
+import { Node } from '../../interfaces';
+
+export default function visit(
+	generator: DomGenerator,
+	block: Block,
+	state,
+	node: Node
+) {
+	const visitor = visitors[node.type];
+	visitor(generator, block, state, node);
+}
diff --git a/src/generators/dom/visitors/Component/Attribute.js b/src/generators/dom/visitors/Component/Attribute.js
deleted file mode 100644
index 8458eeb866..0000000000
--- a/src/generators/dom/visitors/Component/Attribute.js
+++ /dev/null
@@ -1,67 +0,0 @@
-export default function visitAttribute ( generator, block, state, node, attribute, local ) {
-	if ( attribute.value === true ) {
-		// attributes without values, e.g. <textarea readonly>
-		local.staticAttributes.push({
-			name: attribute.name,
-			value: true
-		});
-	}
-
-	else if ( attribute.value.length === 0 ) {
-		local.staticAttributes.push({
-			name: attribute.name,
-			value: `''`
-		});
-	}
-
-	else if ( attribute.value.length === 1 ) {
-		const value = attribute.value[0];
-
-		if ( value.type === 'Text' ) {
-			// static attributes
-			const result = isNaN( value.data ) ? JSON.stringify( value.data ) : value.data;
-			local.staticAttributes.push({
-				name: attribute.name,
-				value: result
-			});
-		}
-
-		else {
-			// simple dynamic attributes
-			const { dependencies, snippet } = block.contextualise( value.expression );
-
-			// TODO only update attributes that have changed
-			local.dynamicAttributes.push({
-				name: attribute.name,
-				value: snippet,
-				dependencies
-			});
-		}
-	}
-
-	else {
-		// complex dynamic attributes
-		const allDependencies = [];
-
-		const value = ( attribute.value[0].type === 'Text' ? '' : `"" + ` ) + (
-			attribute.value.map( chunk => {
-				if ( chunk.type === 'Text' ) {
-					return JSON.stringify( chunk.data );
-				} else {
-					const { dependencies, snippet } = block.contextualise( chunk.expression );
-					dependencies.forEach( dependency => {
-						if ( !~allDependencies.indexOf( dependency ) ) allDependencies.push( dependency );
-					});
-
-					return `( ${snippet} )`;
-				}
-			}).join( ' + ' )
-		);
-
-		local.dynamicAttributes.push({
-			name: attribute.name,
-			value,
-			dependencies: allDependencies
-		});
-	}
-}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Component/Attribute.ts b/src/generators/dom/visitors/Component/Attribute.ts
new file mode 100644
index 0000000000..10ce5ad981
--- /dev/null
+++ b/src/generators/dom/visitors/Component/Attribute.ts
@@ -0,0 +1,77 @@
+import { DomGenerator } from '../../index';
+import Block from '../../Block';
+import { Node } from '../../../../interfaces';
+import { State } from '../../interfaces';
+import stringify from '../../../../utils/stringify';
+
+export default function visitAttribute(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node,
+	attribute,
+	local
+) {
+	if (attribute.value === true) {
+		// attributes without values, e.g. <textarea readonly>
+		local.staticAttributes.push({
+			name: attribute.name,
+			value: true,
+		});
+	} else if (attribute.value.length === 0) {
+		local.staticAttributes.push({
+			name: attribute.name,
+			value: `''`,
+		});
+	} else if (attribute.value.length === 1) {
+		const value = attribute.value[0];
+
+		if (value.type === 'Text') {
+			// static attributes
+			const result = isNaN(value.data) ? stringify(value.data) : value.data;
+			local.staticAttributes.push({
+				name: attribute.name,
+				value: result,
+			});
+		} else {
+			// simple dynamic attributes
+			const { dependencies, snippet } = block.contextualise(value.expression);
+
+			// TODO only update attributes that have changed
+			local.dynamicAttributes.push({
+				name: attribute.name,
+				value: snippet,
+				dependencies,
+			});
+		}
+	} else {
+		// complex dynamic attributes
+		const allDependencies = [];
+
+		const value =
+			(attribute.value[0].type === 'Text' ? '' : `"" + `) +
+			attribute.value
+				.map(chunk => {
+					if (chunk.type === 'Text') {
+						return stringify(chunk.data);
+					} else {
+						const { dependencies, snippet } = block.contextualise(
+							chunk.expression
+						);
+						dependencies.forEach(dependency => {
+							if (!~allDependencies.indexOf(dependency))
+								allDependencies.push(dependency);
+						});
+
+						return `( ${snippet} )`;
+					}
+				})
+				.join(' + ');
+
+		local.dynamicAttributes.push({
+			name: attribute.name,
+			value,
+			dependencies: allDependencies,
+		});
+	}
+}
diff --git a/src/generators/dom/visitors/Component/Binding.js b/src/generators/dom/visitors/Component/Binding.js
deleted file mode 100644
index 9465eca810..0000000000
--- a/src/generators/dom/visitors/Component/Binding.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import deindent from '../../../../utils/deindent.js';
-import flattenReference from '../../../../utils/flattenReference.js';
-import getSetter from '../shared/binding/getSetter.js';
-
-export default function visitBinding ( generator, block, state, node, attribute, local ) {
-	const { name } = flattenReference( attribute.value );
-	const { snippet, contexts, dependencies } = block.contextualise( attribute.value );
-
-	if ( dependencies.length > 1 ) throw new Error( 'An unexpected situation arose. Please raise an issue at https://github.com/sveltejs/svelte/issues — thanks!' );
-
-	contexts.forEach( context => {
-		if ( !~local.allUsedContexts.indexOf( context ) ) local.allUsedContexts.push( context );
-	});
-
-	const contextual = block.contexts.has( name );
-
-	let obj;
-	let prop;
-
-	if ( contextual ) {
-		obj = block.listNames.get( name );
-		prop = block.indexNames.get( name );
-	} else if ( attribute.value.type === 'MemberExpression' ) {
-		prop = `'[✂${attribute.value.property.start}-${attribute.value.property.end}✂]'`;
-		obj = `[✂${attribute.value.object.start}-${attribute.value.object.end}✂]`;
-	} else {
-		obj = 'state';
-		prop = `'${name}'`;
-	}
-
-	local.bindings.push({
-		name: attribute.name,
-		value: snippet,
-		obj,
-		prop
-	});
-
-	const setter = getSetter({ block, name, context: '_context', attribute, dependencies, value: 'value' });
-
-	generator.hasComplexBindings = true;
-
-	const updating = block.getUniqueName( `${local.name}_updating` );
-	block.addVariable( updating, 'false' );
-
-	local.create.addBlock( deindent`
-		${block.component}._bindings.push( function () {
-			if ( ${local.name}._torndown ) return;
-			${local.name}.observe( '${attribute.name}', function ( value ) {
-				if ( ${updating} ) return;
-				${updating} = true;
-				${setter}
-				${updating} = false;
-			}, { init: ${generator.helper( 'differs' )}( ${local.name}.get( '${attribute.name}' ), ${snippet} ) });
-		});
-	` );
-
-	local.update.addBlock( deindent`
-		if ( !${updating} && ${dependencies.map( dependency => `'${dependency}' in changed` ).join( '||' )} ) {
-			${updating} = true;
-			${local.name}._set({ ${attribute.name}: ${snippet} });
-			${updating} = false;
-		}
-	` );
-}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Component/Binding.ts b/src/generators/dom/visitors/Component/Binding.ts
new file mode 100644
index 0000000000..cd10709238
--- /dev/null
+++ b/src/generators/dom/visitors/Component/Binding.ts
@@ -0,0 +1,89 @@
+import deindent from '../../../../utils/deindent';
+import flattenReference from '../../../../utils/flattenReference';
+import getSetter from '../shared/binding/getSetter';
+import { DomGenerator } from '../../index';
+import Block from '../../Block';
+import { Node } from '../../../../interfaces';
+import { State } from '../../interfaces';
+import getObject from '../../../../utils/getObject';
+
+export default function visitBinding(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node,
+	attribute,
+	local
+) {
+	const { name } = getObject(attribute.value);
+	const { snippet, contexts, dependencies } = block.contextualise(
+		attribute.value
+	);
+
+	contexts.forEach(context => {
+		if (!~local.allUsedContexts.indexOf(context))
+			local.allUsedContexts.push(context);
+	});
+
+	const contextual = block.contexts.has(name);
+
+	let obj;
+	let prop;
+
+	if (contextual) {
+		obj = block.listNames.get(name);
+		prop = block.indexNames.get(name);
+	} else if (attribute.value.type === 'MemberExpression') {
+		prop = `[✂${attribute.value.property.start}-${attribute.value.property
+			.end}✂]`;
+		if (!attribute.value.computed) prop = `'${prop}'`;
+		obj = `[✂${attribute.value.object.start}-${attribute.value.object.end}✂]`;
+	} else {
+		obj = 'state';
+		prop = `'${name}'`;
+	}
+
+	local.bindings.push({
+		name: attribute.name,
+		value: snippet,
+		obj,
+		prop,
+	});
+
+	const setter = getSetter({
+		block,
+		name,
+		snippet,
+		context: '_context',
+		attribute,
+		dependencies,
+		value: 'value',
+	});
+
+	generator.hasComplexBindings = true;
+
+	const updating = block.getUniqueName(`${local.name}_updating`);
+	block.addVariable(updating, 'false');
+
+	local.create.addBlock(deindent`
+		#component._bindings.push( function () {
+			if ( ${local.name}._torndown ) return;
+			${local.name}.observe( '${attribute.name}', function ( value ) {
+				if ( ${updating} ) return;
+				${updating} = true;
+				${setter}
+				${updating} = false;
+			}, { init: @differs( ${local.name}.get( '${attribute.name}' ), ${snippet} ) });
+		});
+	`);
+
+	local.update.addBlock(deindent`
+		if ( !${updating} && ${dependencies
+		.map(dependency => `'${dependency}' in changed`)
+		.join(' || ')} ) {
+			${updating} = true;
+			${local.name}._set({ ${attribute.name}: ${snippet} });
+			${updating} = false;
+		}
+	`);
+}
diff --git a/src/generators/dom/visitors/Component/Component.js b/src/generators/dom/visitors/Component/Component.js
deleted file mode 100644
index 9a2dbf0025..0000000000
--- a/src/generators/dom/visitors/Component/Component.js
+++ /dev/null
@@ -1,188 +0,0 @@
-import deindent from '../../../../utils/deindent.js';
-import CodeBuilder from '../../../../utils/CodeBuilder.js';
-import visit from '../../visit.js';
-import visitAttribute from './Attribute.js';
-import visitEventHandler from './EventHandler.js';
-import visitBinding from './Binding.js';
-import visitRef from './Ref.js';
-
-function stringifyProps ( props ) {
-	if ( !props.length ) return '{}';
-
-	const joined = props.join( ', ' );
-	if ( joined.length > 40 ) {
-		// make larger data objects readable
-		return `{\n\t${props.join( ',\n\t' )}\n}`;
-	}
-
-	return `{ ${joined} }`;
-}
-
-const order = {
-	Attribute: 1,
-	EventHandler: 2,
-	Binding: 3,
-	Ref: 4
-};
-
-const visitors = {
-	Attribute: visitAttribute,
-	EventHandler: visitEventHandler,
-	Binding: visitBinding,
-	Ref: visitRef
-};
-
-export default function visitComponent ( generator, block, state, node ) {
-	const hasChildren = node.children.length > 0;
-	const name = block.getUniqueName( ( node.name === ':Self' ? generator.name : node.name ).toLowerCase() );
-
-	const childState = Object.assign( {}, state, {
-		parentNode: null
-	});
-
-	const local = {
-		name,
-		namespace: state.namespace,
-		isComponent: true,
-
-		allUsedContexts: [],
-		staticAttributes: [],
-		dynamicAttributes: [],
-		bindings: [],
-
-		create: new CodeBuilder(),
-		update: new CodeBuilder()
-	};
-
-	const isToplevel = !state.parentNode;
-
-	generator.hasComponents = true;
-
-	node.attributes
-		.sort( ( a, b ) => order[ a.type ] - order[ b.type ] )
-		.forEach( attribute => {
-			visitors[ attribute.type ]( generator, block, childState, node, attribute, local );
-		});
-
-	if ( local.allUsedContexts.length ) {
-		const initialProps = local.allUsedContexts.map( contextName => {
-			if ( contextName === 'state' ) return `state: state`;
-
-			const listName = block.listNames.get( contextName );
-			const indexName = block.indexNames.get( contextName );
-
-			return `${listName}: ${listName},\n${indexName}: ${indexName}`;
-		}).join( ',\n' );
-
-		const updates = local.allUsedContexts.map( contextName => {
-			if ( contextName === 'state' ) return `${name}._context.state = state;`;
-
-			const listName = block.listNames.get( contextName );
-			const indexName = block.indexNames.get( contextName );
-
-			return `${name}._context.${listName} = ${listName};\n${name}._context.${indexName} = ${indexName};`;
-		}).join( '\n' );
-
-		local.create.addBlock( deindent`
-			${name}._context = {
-				${initialProps}
-			};
-		` );
-
-		local.update.addBlock( updates );
-	}
-
-	const componentInitProperties = [
-		`target: ${!isToplevel ? state.parentNode: 'null'}`,
-		`_root: ${block.component}._root || ${block.component}`
-	];
-
-	// Component has children, put them in a separate {{yield}} block
-	if ( hasChildren ) {
-		const params = block.params.join( ', ' );
-
-		const childBlock = node._block;
-
-		node.children.forEach( child => {
-			visit( generator, childBlock, childState, child );
-		});
-
-		const yieldFragment = block.getUniqueName( `${name}_yield_fragment` );
-
-		block.builders.create.addLine(
-			`var ${yieldFragment} = ${childBlock.name}( ${params}, ${block.component} );`
-		);
-
-		if ( childBlock.hasUpdateMethod ) {
-			block.builders.update.addLine(
-				`${yieldFragment}.update( changed, ${params} );`
-			);
-		}
-
-		componentInitProperties.push( `_yield: ${yieldFragment}`);
-	}
-
-	const statements = [];
-
-	if ( local.staticAttributes.length || local.dynamicAttributes.length || local.bindings.length ) {
-		const initialProps = local.staticAttributes
-			.concat( local.dynamicAttributes )
-			.map( attribute => `${attribute.name}: ${attribute.value}` );
-
-		const initialPropString = stringifyProps( initialProps );
-
-		if ( local.bindings.length ) {
-			const initialData = block.getUniqueName( `${name}_initial_data` );
-
-			statements.push( `var ${initialData} = ${initialPropString};` );
-
-			local.bindings.forEach( binding => {
-				statements.push( `if ( ${binding.prop} in ${binding.obj} ) ${initialData}.${binding.name} = ${binding.value};` );
-			});
-
-			componentInitProperties.push( `data: ${initialData}` );
-		} else if ( initialProps.length ) {
-			componentInitProperties.push( `data: ${initialPropString}` );
-		}
-	}
-
-	const expression = node.name === ':Self' ? generator.name : generator.importedComponents.get( node.name ) || `${generator.alias( 'template' )}.components.${node.name}`;
-
-	local.create.addBlockAtStart( deindent`
-		${statements.join( '\n' )}
-		var ${name} = new ${expression}({
-			${componentInitProperties.join(',\n')}
-		});
-	` );
-
-	if ( isToplevel ) {
-		block.builders.mount.addLine( `${name}._fragment.mount( ${block.target}, anchor );` );
-	}
-
-	if ( local.dynamicAttributes.length ) {
-		const updates = local.dynamicAttributes.map( attribute => {
-			if ( attribute.dependencies.length ) {
-				return deindent`
-					if ( ${attribute.dependencies.map( dependency => `'${dependency}' in changed` ).join( '||' )} ) ${name}_changes.${attribute.name} = ${attribute.value};
-				`;
-			}
-
-			// TODO this is an odd situation to encounter – I *think* it should only happen with
-			// each block indices, in which case it may be possible to optimise this
-			return `${name}_changes.${attribute.name} = ${attribute.value};`;
-		});
-
-		local.update.addBlock( deindent`
-			var ${name}_changes = {};
-
-			${updates.join( '\n' )}
-
-			if ( Object.keys( ${name}_changes ).length ) ${name}.set( ${name}_changes );
-		` );
-	}
-
-	block.builders.destroy.addLine( `${name}.destroy( ${isToplevel ? 'detach' : 'false'} );` );
-
-	block.builders.create.addBlock( local.create );
-	if ( !local.update.isEmpty() ) block.builders.update.addBlock( local.update );
-}
diff --git a/src/generators/dom/visitors/Component/Component.ts b/src/generators/dom/visitors/Component/Component.ts
new file mode 100644
index 0000000000..557cc41a1c
--- /dev/null
+++ b/src/generators/dom/visitors/Component/Component.ts
@@ -0,0 +1,236 @@
+import deindent from '../../../../utils/deindent';
+import CodeBuilder from '../../../../utils/CodeBuilder';
+import visit from '../../visit';
+import visitAttribute from './Attribute';
+import visitEventHandler from './EventHandler';
+import visitBinding from './Binding';
+import visitRef from './Ref';
+import { DomGenerator } from '../../index';
+import Block from '../../Block';
+import { Node } from '../../../../interfaces';
+import { State } from '../../interfaces';
+
+function stringifyProps(props: string[]) {
+	if (!props.length) return '{}';
+
+	const joined = props.join(', ');
+	if (joined.length > 40) {
+		// make larger data objects readable
+		return `{\n\t${props.join(',\n\t')}\n}`;
+	}
+
+	return `{ ${joined} }`;
+}
+
+const order = {
+	Attribute: 1,
+	EventHandler: 2,
+	Binding: 3,
+	Ref: 4,
+};
+
+const visitors = {
+	Attribute: visitAttribute,
+	EventHandler: visitEventHandler,
+	Binding: visitBinding,
+	Ref: visitRef,
+};
+
+export default function visitComponent(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node
+) {
+	const hasChildren = node.children.length > 0;
+	const name = block.getUniqueName(
+		(node.name === ':Self' ? generator.name : node.name).toLowerCase()
+	);
+
+	const childState = node._state;
+
+	const local = {
+		name,
+		namespace: state.namespace,
+		isComponent: true,
+
+		allUsedContexts: [],
+		staticAttributes: [],
+		dynamicAttributes: [],
+		bindings: [],
+
+		create: new CodeBuilder(),
+		update: new CodeBuilder(),
+	};
+
+	const isTopLevel = !state.parentNode;
+
+	generator.hasComponents = true;
+
+	node.attributes
+		.sort((a, b) => order[a.type] - order[b.type])
+		.forEach(attribute => {
+			visitors[attribute.type](
+				generator,
+				block,
+				childState,
+				node,
+				attribute,
+				local
+			);
+		});
+
+	if (local.allUsedContexts.length) {
+		const initialProps = local.allUsedContexts
+			.map(contextName => {
+				if (contextName === 'state') return `state: state`;
+
+				const listName = block.listNames.get(contextName);
+				const indexName = block.indexNames.get(contextName);
+
+				return `${listName}: ${listName},\n${indexName}: ${indexName}`;
+			})
+			.join(',\n');
+
+		const updates = local.allUsedContexts
+			.map(contextName => {
+				if (contextName === 'state') return `${name}._context.state = state;`;
+
+				const listName = block.listNames.get(contextName);
+				const indexName = block.indexNames.get(contextName);
+
+				return `${name}._context.${listName} = ${listName};\n${name}._context.${indexName} = ${indexName};`;
+			})
+			.join('\n');
+
+		local.create.addBlock(deindent`
+			${name}._context = {
+				${initialProps}
+			};
+		`);
+
+		local.update.addBlock(updates);
+	}
+
+	const componentInitProperties = [`_root: #component._root`];
+
+	// Component has children, put them in a separate {{yield}} block
+	if (hasChildren) {
+		const params = block.params.join(', ');
+
+		const childBlock = node._block;
+
+		node.children.forEach((child: Node) => {
+			visit(generator, childBlock, childState, child);
+		});
+
+		const yieldFragment = block.getUniqueName(`${name}_yield_fragment`);
+
+		block.builders.init.addLine(
+			`var ${yieldFragment} = ${childBlock.name}( ${params}, #component );`
+		);
+
+		block.builders.create.addLine(`${yieldFragment}.create();`);
+
+		block.builders.claim.addLine(
+			`${yieldFragment}.claim( ${state.parentNodes} );`
+		);
+
+		if (childBlock.hasUpdateMethod) {
+			block.builders.update.addLine(
+				`${yieldFragment}.update( changed, ${params} );`
+			);
+		}
+
+		block.builders.destroy.addLine(`${yieldFragment}.destroy();`);
+
+		componentInitProperties.push(`_yield: ${yieldFragment}`);
+	}
+
+	const statements: string[] = [];
+
+	if (
+		local.staticAttributes.length ||
+		local.dynamicAttributes.length ||
+		local.bindings.length
+	) {
+		const initialProps = local.staticAttributes
+			.concat(local.dynamicAttributes)
+			.map(attribute => `${attribute.name}: ${attribute.value}`);
+
+		const initialPropString = stringifyProps(initialProps);
+
+		if (local.bindings.length) {
+			const initialData = block.getUniqueName(`${name}_initial_data`);
+
+			statements.push(`var ${initialData} = ${initialPropString};`);
+
+			local.bindings.forEach(binding => {
+				statements.push(
+					`if ( ${binding.prop} in ${binding.obj} ) ${initialData}.${binding.name} = ${binding.value};`
+				);
+			});
+
+			componentInitProperties.push(`data: ${initialData}`);
+		} else if (initialProps.length) {
+			componentInitProperties.push(`data: ${initialPropString}`);
+		}
+	}
+
+	const expression = node.name === ':Self'
+		? generator.name
+		: generator.importedComponents.get(node.name) ||
+				`@template.components.${node.name}`;
+
+	local.create.addBlockAtStart(deindent`
+		${statements.join('\n')}
+		var ${name} = new ${expression}({
+			${componentInitProperties.join(',\n')}
+		});
+	`);
+
+	if (local.dynamicAttributes.length) {
+		const updates = local.dynamicAttributes.map(attribute => {
+			if (attribute.dependencies.length) {
+				return deindent`
+					if ( ${attribute.dependencies
+						.map(dependency => `'${dependency}' in changed`)
+						.join(
+							'||'
+						)} ) ${name}_changes.${attribute.name} = ${attribute.value};
+				`;
+			}
+
+			// TODO this is an odd situation to encounter – I *think* it should only happen with
+			// each block indices, in which case it may be possible to optimise this
+			return `${name}_changes.${attribute.name} = ${attribute.value};`;
+		});
+
+		local.update.addBlock(deindent`
+			var ${name}_changes = {};
+
+			${updates.join('\n')}
+
+			if ( Object.keys( ${name}_changes ).length ) ${name}.set( ${name}_changes );
+		`);
+	}
+
+	if (isTopLevel)
+		block.builders.unmount.addLine(`${name}._fragment.unmount();`);
+	block.builders.destroy.addLine(`${name}.destroy( false );`);
+
+	block.builders.init.addBlock(local.create);
+
+	const targetNode = state.parentNode || '#target';
+	const anchorNode = state.parentNode ? 'null' : 'anchor';
+
+	block.builders.create.addLine(`${name}._fragment.create();`);
+	block.builders.claim.addLine(
+		`${name}._fragment.claim( ${state.parentNodes} );`
+	);
+	block.builders.mount.addLine(
+		`${name}._fragment.mount( ${targetNode}, ${anchorNode} );`
+	);
+
+	if (!local.update.isEmpty()) block.builders.update.addBlock(local.update);
+}
diff --git a/src/generators/dom/visitors/Component/EventHandler.js b/src/generators/dom/visitors/Component/EventHandler.js
deleted file mode 100644
index 43aecb6efa..0000000000
--- a/src/generators/dom/visitors/Component/EventHandler.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import deindent from '../../../../utils/deindent.js';
-
-export default function visitEventHandler ( generator, block, state, node, attribute, local ) {
-	// TODO verify that it's a valid callee (i.e. built-in or declared method)
-	generator.addSourcemapLocations( attribute.expression );
-	generator.code.prependRight( attribute.expression.start, `${block.component}.` );
-
-	const usedContexts = [];
-	attribute.expression.arguments.forEach( arg => {
-		const { contexts } = block.contextualise( arg, null, true );
-
-		contexts.forEach( context => {
-			if ( !~usedContexts.indexOf( context ) ) usedContexts.push( context );
-			if ( !~local.allUsedContexts.indexOf( context ) ) local.allUsedContexts.push( context );
-		});
-	});
-
-	// TODO hoist event handlers? can do `this.__component.method(...)`
-	const declarations = usedContexts.map( name => {
-		if ( name === 'state' ) return 'var state = this._context.state;';
-
-		const listName = block.listNames.get( name );
-		const indexName = block.indexNames.get( name );
-
-		return `var ${listName} = this._context.${listName}, ${indexName} = this._context.${indexName}, ${name} = ${listName}[${indexName}]`;
-	});
-
-	const handlerBody = ( declarations.length ? declarations.join( '\n' ) + '\n\n' : '' ) + `[✂${attribute.expression.start}-${attribute.expression.end}✂];`;
-
-	local.create.addBlock( deindent`
-		${local.name}.on( '${attribute.name}', function ( event ) {
-			${handlerBody}
-		});
-	` );
-}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Component/EventHandler.ts b/src/generators/dom/visitors/Component/EventHandler.ts
new file mode 100644
index 0000000000..1010456253
--- /dev/null
+++ b/src/generators/dom/visitors/Component/EventHandler.ts
@@ -0,0 +1,52 @@
+import deindent from '../../../../utils/deindent';
+import { DomGenerator } from '../../index';
+import Block from '../../Block';
+import { Node } from '../../../../interfaces';
+import { State } from '../../interfaces';
+
+export default function visitEventHandler(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node,
+	attribute: Node,
+	local
+) {
+	// TODO verify that it's a valid callee (i.e. built-in or declared method)
+	generator.addSourcemapLocations(attribute.expression);
+	generator.code.prependRight(
+		attribute.expression.start,
+		`${block.alias('component')}.`
+	);
+
+	const usedContexts: string[] = [];
+	attribute.expression.arguments.forEach((arg: Node) => {
+		const { contexts } = block.contextualise(arg, null, true);
+
+		contexts.forEach(context => {
+			if (!~usedContexts.indexOf(context)) usedContexts.push(context);
+			if (!~local.allUsedContexts.indexOf(context))
+				local.allUsedContexts.push(context);
+		});
+	});
+
+	// TODO hoist event handlers? can do `this.__component.method(...)`
+	const declarations = usedContexts.map(name => {
+		if (name === 'state') return 'var state = this._context.state;';
+
+		const listName = block.listNames.get(name);
+		const indexName = block.indexNames.get(name);
+
+		return `var ${listName} = this._context.${listName}, ${indexName} = this._context.${indexName}, ${name} = ${listName}[${indexName}]`;
+	});
+
+	const handlerBody =
+		(declarations.length ? declarations.join('\n') + '\n\n' : '') +
+		`[✂${attribute.expression.start}-${attribute.expression.end}✂];`;
+
+	local.create.addBlock(deindent`
+		${local.name}.on( '${attribute.name}', function ( event ) {
+			${handlerBody}
+		});
+	`);
+}
diff --git a/src/generators/dom/visitors/Component/Ref.js b/src/generators/dom/visitors/Component/Ref.js
deleted file mode 100644
index 727cf8f29a..0000000000
--- a/src/generators/dom/visitors/Component/Ref.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import deindent from '../../../../utils/deindent.js';
-
-export default function visitRef ( generator, block, state, node, attribute, local ) {
-	generator.usesRefs = true;
-
-	local.create.addLine(
-		`${block.component}.refs.${attribute.name} = ${local.name};`
-	);
-
-	block.builders.destroy.addLine( deindent`
-		if ( ${block.component}.refs.${attribute.name} === ${local.name} ) ${block.component}.refs.${attribute.name} = null;
-	` );
-}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Component/Ref.ts b/src/generators/dom/visitors/Component/Ref.ts
new file mode 100644
index 0000000000..98afb02953
--- /dev/null
+++ b/src/generators/dom/visitors/Component/Ref.ts
@@ -0,0 +1,22 @@
+import deindent from '../../../../utils/deindent';
+import { DomGenerator } from '../../index';
+import Block from '../../Block';
+import { Node } from '../../../../interfaces';
+import { State } from '../../interfaces';
+
+export default function visitRef(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node,
+	attribute: Node,
+	local
+) {
+	generator.usesRefs = true;
+
+	local.create.addLine(`#component.refs.${attribute.name} = ${local.name};`);
+
+	block.builders.destroy.addLine(deindent`
+		if ( #component.refs.${attribute.name} === ${local.name} ) #component.refs.${attribute.name} = null;
+	`);
+}
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
deleted file mode 100644
index 5a1a71d16c..0000000000
--- a/src/generators/dom/visitors/EachBlock.js
+++ /dev/null
@@ -1,247 +0,0 @@
-import CodeBuilder from '../../../utils/CodeBuilder.js';
-import deindent from '../../../utils/deindent.js';
-import visit from '../visit.js';
-
-export default function visitEachBlock ( generator, block, state, node ) {
-	const each_block = generator.getUniqueName( `each_block` );
-	const create_each_block = node._block.name;
-	const each_block_value = node._block.listName;
-	const iterations = block.getUniqueName( `${each_block}_iterations` );
-	const i = block.alias( `i` );
-	const params = block.params.join( ', ' );
-	const anchor = block.getUniqueName( `${each_block}_anchor` );
-
-	const vars = { each_block, create_each_block, each_block_value, iterations, i, params, anchor };
-
-	const { snippet } = block.contextualise( node.expression );
-
-	block.createAnchor( anchor, state.parentNode );
-	block.builders.create.addLine( `var ${each_block_value} = ${snippet};` );
-	block.builders.create.addLine( `var ${iterations} = [];` );
-
-	if ( node.key ) {
-		keyed( generator, block, state, node, snippet, vars );
-	} else {
-		unkeyed( generator, block, state, node, snippet, vars );
-	}
-
-	const isToplevel = !state.parentNode;
-
-	if ( isToplevel ) {
-		block.builders.mount.addBlock( deindent`
-			for ( var ${i} = 0; ${i} < ${iterations}.length; ${i} += 1 ) {
-				${iterations}[${i}].mount( ${block.target}, ${anchor} );
-			}
-		` );
-	}
-
-	block.builders.destroy.addBlock(
-		`${generator.helper( 'destroyEach' )}( ${iterations}, ${isToplevel ? 'detach' : 'false'}, 0 );` );
-
-	if ( node.else ) {
-		const each_block_else = generator.getUniqueName( `${each_block}_else` );
-
-		block.builders.create.addLine( `var ${each_block_else} = null;` );
-
-		// TODO neaten this up... will end up with an empty line in the block
-		block.builders.create.addBlock( deindent`
-			if ( !${each_block_value}.length ) {
-				${each_block_else} = ${node.else._block.name}( ${params}, ${block.component} );
-				${!isToplevel ? `${each_block_else}.mount( ${state.parentNode}, ${anchor} );` : ''}
-			}
-		` );
-
-		block.builders.mount.addBlock( deindent`
-			if ( ${each_block_else} ) {
-				${each_block_else}.mount( ${state.parentNode || block.target}, ${anchor} );
-			}
-		` );
-
-		if ( node.else._block.hasUpdateMethod ) {
-			block.builders.update.addBlock( deindent`
-				if ( !${each_block_value}.length && ${each_block_else} ) {
-					${each_block_else}.update( changed, ${params} );
-				} else if ( !${each_block_value}.length ) {
-					${each_block_else} = ${node.else._block.name}( ${params}, ${block.component} );
-					${each_block_else}.mount( ${anchor}.parentNode, ${anchor} );
-				} else if ( ${each_block_else} ) {
-					${each_block_else}.destroy( true );
-					${each_block_else} = null;
-				}
-			` );
-		} else {
-			block.builders.update.addBlock( deindent`
-				if ( ${each_block_value}.length ) {
-					if ( ${each_block_else} ) {
-						${each_block_else}.destroy( true );
-						${each_block_else} = null;
-					}
-				} else if ( !${each_block_else} ) {
-					${each_block_else} = ${node.else._block.name}( ${params}, ${block.component} );
-					${each_block_else}.mount( ${anchor}.parentNode, ${anchor} );
-				}
-			` );
-		}
-
-
-		block.builders.destroy.addBlock( deindent`
-			if ( ${each_block_else} ) {
-				${each_block_else}.destroy( ${isToplevel ? 'detach' : 'false'} );
-			}
-		` );
-	}
-
-	const childState = Object.assign( {}, state, {
-		parentNode: null,
-		inEachBlock: true
-	});
-
-	node.children.forEach( child => {
-		visit( generator, node._block, childState, child );
-	});
-
-	if ( node.else ) {
-		const childState = Object.assign( {}, state, {
-			parentNode: null
-		});
-
-		node.else.children.forEach( child => {
-			visit( generator, node.else._block, childState, child );
-		});
-	}
-}
-
-function keyed ( generator, block, state, node, snippet, { each_block, create_each_block, each_block_value, iterations, i, params, anchor } ) {
-	const fragment = block.getUniqueName( 'fragment' );
-	const value = block.getUniqueName( 'value' );
-	const key = block.getUniqueName( 'key' );
-	const lookup = block.getUniqueName( `${each_block}_lookup` );
-	const _lookup = block.getUniqueName( `_${each_block}_lookup` );
-	const iteration = block.getUniqueName( `${each_block}_iteration` );
-	const _iterations = block.getUniqueName( `_${each_block}_iterations` );
-
-	block.builders.create.addLine( `var ${lookup} = Object.create( null );` );
-
-	const create = new CodeBuilder();
-
-	create.addBlock( deindent`
-		var ${key} = ${each_block_value}[${i}].${node.key};
-		${iterations}[${i}] = ${lookup}[ ${key} ] = ${create_each_block}( ${params}, ${each_block_value}, ${each_block_value}[${i}], ${i}, ${block.component}${node.key ? `, ${key}` : `` } );
-	` );
-
-	if ( state.parentNode ) {
-		create.addLine(
-			`${iterations}[${i}].mount( ${state.parentNode}, ${anchor} );`
-		);
-	}
-
-	block.builders.create.addBlock( deindent`
-		for ( var ${i} = 0; ${i} < ${each_block_value}.length; ${i} += 1 ) {
-			${create}
-		}
-	` );
-
-	const consequent = node._block.hasUpdateMethod ?
-		deindent`
-			${_iterations}[${i}] = ${_lookup}[ ${key} ] = ${lookup}[ ${key} ];
-			${_lookup}[ ${key} ].update( changed, ${params}, ${each_block_value}, ${each_block_value}[${i}], ${i} );
-		` :
-		`${_iterations}[${i}] = ${_lookup}[ ${key} ] = ${lookup}[ ${key} ];`;
-
-	block.builders.update.addBlock( deindent`
-		var ${each_block_value} = ${snippet};
-		var ${_iterations} = [];
-		var ${_lookup} = Object.create( null );
-
-		var ${fragment} = document.createDocumentFragment();
-
-		// create new iterations as necessary
-		for ( var ${i} = 0; ${i} < ${each_block_value}.length; ${i} += 1 ) {
-			var ${value} = ${each_block_value}[${i}];
-			var ${key} = ${value}.${node.key};
-
-			if ( ${lookup}[ ${key} ] ) {
-				${consequent}
-			} else {
-				${_iterations}[${i}] = ${_lookup}[ ${key} ] = ${create_each_block}( ${params}, ${each_block_value}, ${each_block_value}[${i}], ${i}, ${block.component}${node.key ? `, ${key}` : `` } );
-			}
-
-			${_iterations}[${i}].mount( ${fragment}, null );
-		}
-
-		// remove old iterations
-		for ( var ${i} = 0; ${i} < ${iterations}.length; ${i} += 1 ) {
-			var ${iteration} = ${iterations}[${i}];
-			if ( !${_lookup}[ ${iteration}.key ] ) {
-				${iteration}.destroy( true );
-			}
-		}
-
-		${anchor}.parentNode.insertBefore( ${fragment}, ${anchor} );
-
-		${iterations} = ${_iterations};
-		${lookup} = ${_lookup};
-	` );
-}
-
-function unkeyed ( generator, block, state, node, snippet, { create_each_block, each_block_value, iterations, i, params, anchor } ) {
-	const create = new CodeBuilder();
-
-	create.addLine(
-		`${iterations}[${i}] = ${create_each_block}( ${params}, ${each_block_value}, ${each_block_value}[${i}], ${i}, ${block.component} );`
-	);
-
-	if ( state.parentNode ) {
-		create.addLine(
-			`${iterations}[${i}].mount( ${state.parentNode}, ${anchor} );`
-		);
-	}
-
-	block.builders.create.addBlock( deindent`
-		for ( var ${i} = 0; ${i} < ${each_block_value}.length; ${i} += 1 ) {
-			${create}
-		}
-	` );
-
-	const dependencies = block.findDependencies( node.expression );
-	const allDependencies = new Set( node._block.dependencies );
-	dependencies.forEach( dependency => {
-		allDependencies.add( dependency );
-	});
-
-	const condition = Array.from( allDependencies )
-		.map( dependency => `'${dependency}' in changed` )
-		.join( ' || ' );
-
-	if ( condition !== '' ) {
-		const forLoopBody = node._block.hasUpdateMethod ?
-			deindent`
-				if ( ${iterations}[${i}] ) {
-					${iterations}[${i}].update( changed, ${params}, ${each_block_value}, ${each_block_value}[${i}], ${i} );
-				} else {
-					${iterations}[${i}] = ${create_each_block}( ${params}, ${each_block_value}, ${each_block_value}[${i}], ${i}, ${block.component} );
-					${iterations}[${i}].mount( ${anchor}.parentNode, ${anchor} );
-				}
-			` :
-			deindent`
-				${iterations}[${i}] = ${create_each_block}( ${params}, ${each_block_value}, ${each_block_value}[${i}], ${i}, ${block.component} );
-				${iterations}[${i}].mount( ${anchor}.parentNode, ${anchor} );
-			`;
-
-		const start = node._block.hasUpdateMethod ? '0' : `${iterations}.length`;
-
-		block.builders.update.addBlock( deindent`
-			var ${each_block_value} = ${snippet};
-
-			if ( ${condition} ) {
-				for ( var ${i} = ${start}; ${i} < ${each_block_value}.length; ${i} += 1 ) {
-					${forLoopBody}
-				}
-
-				${generator.helper( 'destroyEach' )}( ${iterations}, true, ${each_block_value}.length );
-
-				${iterations}.length = ${each_block_value}.length;
-			}
-		` );
-	}
-}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/EachBlock.ts b/src/generators/dom/visitors/EachBlock.ts
new file mode 100644
index 0000000000..82a117eaae
--- /dev/null
+++ b/src/generators/dom/visitors/EachBlock.ts
@@ -0,0 +1,479 @@
+import deindent from '../../../utils/deindent';
+import visit from '../visit';
+import { DomGenerator } from '../index';
+import Block from '../Block';
+import { Node } from '../../../interfaces';
+import { State } from '../interfaces';
+
+export default function visitEachBlock(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node
+) {
+	const each_block = generator.getUniqueName(`each_block`);
+	const create_each_block = node._block.name;
+	const each_block_value = node._block.listName;
+	const iterations = block.getUniqueName(`${each_block}_iterations`);
+	const params = block.params.join(', ');
+	const anchor = node.needsAnchor
+		? block.getUniqueName(`${each_block}_anchor`)
+		: (node.next && node.next._state.name) || 'null';
+
+	const mountOrIntro = node._block.hasIntroMethod ? 'intro' : 'mount';
+	const vars = {
+		each_block,
+		create_each_block,
+		each_block_value,
+		iterations,
+		params,
+		anchor,
+		mountOrIntro,
+	};
+
+	const { snippet } = block.contextualise(node.expression);
+
+	block.builders.init.addLine(`var ${each_block_value} = ${snippet};`);
+
+	if (node.key) {
+		keyed(generator, block, state, node, snippet, vars);
+	} else {
+		unkeyed(generator, block, state, node, snippet, vars);
+	}
+
+	const isToplevel = !state.parentNode;
+
+	if (node.needsAnchor) {
+		block.addElement(
+			anchor,
+			`@createComment()`,
+			`@createComment()`,
+			state.parentNode,
+			true
+		);
+	} else if (node.next) {
+		node.next.usedAsAnchor = true;
+	}
+
+	if (node.else) {
+		const each_block_else = generator.getUniqueName(`${each_block}_else`);
+
+		block.builders.init.addLine(`var ${each_block_else} = null;`);
+
+		// TODO neaten this up... will end up with an empty line in the block
+		block.builders.init.addBlock(deindent`
+			if ( !${each_block_value}.length ) {
+				${each_block_else} = ${node.else._block.name}( ${params}, #component );
+				${each_block_else}.create();
+			}
+		`);
+
+		block.builders.mount.addBlock(deindent`
+			if ( ${each_block_else} ) {
+				${each_block_else}.${mountOrIntro}( ${state.parentNode ||
+			'#target'}, null );
+			}
+		`);
+
+		const parentNode = state.parentNode || `${anchor}.parentNode`;
+
+		if (node.else._block.hasUpdateMethod) {
+			block.builders.update.addBlock(deindent`
+				if ( !${each_block_value}.length && ${each_block_else} ) {
+					${each_block_else}.update( changed, ${params} );
+				} else if ( !${each_block_value}.length ) {
+					${each_block_else} = ${node.else._block.name}( ${params}, #component );
+					${each_block_else}.create();
+					${each_block_else}.${mountOrIntro}( ${parentNode}, ${anchor} );
+				} else if ( ${each_block_else} ) {
+					${each_block_else}.unmount();
+					${each_block_else}.destroy();
+					${each_block_else} = null;
+				}
+			`);
+		} else {
+			block.builders.update.addBlock(deindent`
+				if ( ${each_block_value}.length ) {
+					if ( ${each_block_else} ) {
+						${each_block_else}.unmount();
+						${each_block_else}.destroy();
+						${each_block_else} = null;
+					}
+				} else if ( !${each_block_else} ) {
+					${each_block_else} = ${node.else._block.name}( ${params}, #component );
+					${each_block_else}.create();
+					${each_block_else}.${mountOrIntro}( ${parentNode}, ${anchor} );
+				}
+			`);
+		}
+
+		block.builders.unmount.addLine(
+			`if ( ${each_block_else} ) ${each_block_else}.unmount()`
+		);
+
+		block.builders.destroy.addBlock(deindent`
+			if ( ${each_block_else} ) ${each_block_else}.destroy( false );
+		`);
+	}
+
+	node.children.forEach((child: Node) => {
+		visit(generator, node._block, node._state, child);
+	});
+
+	if (node.else) {
+		node.else.children.forEach((child: Node) => {
+			visit(generator, node.else._block, node.else._state, child);
+		});
+	}
+}
+
+function keyed(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node,
+	snippet: string,
+	{
+		each_block,
+		create_each_block,
+		each_block_value,
+		params,
+		anchor,
+		mountOrIntro,
+	}
+) {
+	const key = block.getUniqueName('key');
+	const lookup = block.getUniqueName(`${each_block}_lookup`);
+	const iteration = block.getUniqueName(`${each_block}_iteration`);
+	const head = block.getUniqueName(`${each_block}_head`);
+	const last = block.getUniqueName(`${each_block}_last`);
+	const expected = block.getUniqueName(`${each_block}_expected`);
+
+	block.addVariable(lookup, `Object.create( null )`);
+	block.addVariable(head);
+	block.addVariable(last);
+
+	if (node.children[0] && node.children[0].type === 'Element') {
+		// TODO or text/tag/raw
+		node._block.first = node.children[0]._state.parentNode; // TODO this is highly confusing
+	} else {
+		node._block.first = node._block.getUniqueName('first');
+		node._block.addElement(
+			node._block.first,
+			`@createComment()`,
+			`@createComment()`,
+			null,
+			true
+		);
+	}
+
+	block.builders.init.addBlock(deindent`
+		for ( var #i = 0; #i < ${each_block_value}.length; #i += 1 ) {
+			var ${key} = ${each_block_value}[#i].${node.key};
+			var ${iteration} = ${lookup}[${key}] = ${create_each_block}( ${params}, ${each_block_value}, ${each_block_value}[#i], #i, #component, ${key} );
+
+			if ( ${last} ) ${last}.next = ${iteration};
+			${iteration}.last = ${last};
+			${last} = ${iteration};
+
+			if ( #i === 0 ) ${head} = ${iteration};
+		}
+	`);
+
+	const targetNode = state.parentNode || '#target';
+	const anchorNode = state.parentNode ? 'null' : 'anchor';
+
+	block.builders.create.addBlock(deindent`
+		var ${iteration} = ${head};
+		while ( ${iteration} ) {
+			${iteration}.create();
+			${iteration} = ${iteration}.next;
+		}
+	`);
+
+	block.builders.claim.addBlock(deindent`
+		var ${iteration} = ${head};
+		while ( ${iteration} ) {
+			${iteration}.claim( ${state.parentNodes} );
+			${iteration} = ${iteration}.next;
+		}
+	`);
+
+	block.builders.mount.addBlock(deindent`
+		var ${iteration} = ${head};
+		while ( ${iteration} ) {
+			${iteration}.${mountOrIntro}( ${targetNode}, ${anchorNode} );
+			${iteration} = ${iteration}.next;
+		}
+	`);
+
+	const dynamic = node._block.hasUpdateMethod;
+	const parentNode = state.parentNode || `${anchor}.parentNode`;
+
+	let destroy;
+	if (node._block.hasOutroMethod) {
+		const fn = block.getUniqueName(`${each_block}_outro`);
+		block.builders.init.addBlock(deindent`
+			function ${fn} ( iteration ) {
+				iteration.outro( function () {
+					iteration.unmount();
+					iteration.destroy();
+					${lookup}[iteration.key] = null;
+				});
+			}
+		`);
+
+		destroy = deindent`
+			while ( ${expected} ) {
+				${fn}( ${expected} );
+				${expected} = ${expected}.next;
+			}
+
+			for ( #i = 0; #i < discard_pile.length; #i += 1 ) {
+				if ( discard_pile[#i].discard ) {
+					${fn}( discard_pile[#i] );
+				}
+			}
+		`;
+	} else {
+		const fn = block.getUniqueName(`${each_block}_destroy`);
+		block.builders.init.addBlock(deindent`
+			function ${fn} ( iteration ) {
+				iteration.unmount();
+				iteration.destroy();
+				${lookup}[iteration.key] = null;
+			}
+		`);
+
+		destroy = deindent`
+			while ( ${expected} ) {
+				${fn}( ${expected} );
+				${expected} = ${expected}.next;
+			}
+
+			for ( #i = 0; #i < discard_pile.length; #i += 1 ) {
+				var ${iteration} = discard_pile[#i];
+				if ( ${iteration}.discard ) {
+					${fn}( ${iteration} );
+				}
+			}
+		`;
+	}
+
+	block.builders.update.addBlock(deindent`
+		var ${each_block_value} = ${snippet};
+
+		var ${expected} = ${head};
+		var ${last} = null;
+
+		var discard_pile = [];
+
+		for ( #i = 0; #i < ${each_block_value}.length; #i += 1 ) {
+			var ${key} = ${each_block_value}[#i].${node.key};
+			var ${iteration} = ${lookup}[${key}];
+
+			${dynamic &&
+				`if ( ${iteration} ) ${iteration}.update( changed, ${params}, ${each_block_value}, ${each_block_value}[#i], #i );`}
+
+			if ( ${expected} ) {
+				if ( ${key} === ${expected}.key ) {
+					${expected} = ${expected}.next;
+				} else {
+					if ( ${iteration} ) {
+						// probably a deletion
+						while ( ${expected} && ${expected}.key !== ${key} ) {
+							${expected}.discard = true;
+							discard_pile.push( ${expected} );
+							${expected} = ${expected}.next;
+						};
+
+						${expected} = ${expected} && ${expected}.next;
+						${iteration}.discard = false;
+						${iteration}.last = ${last};
+
+						if (!${expected}) ${iteration}.mount( ${parentNode}, ${anchor} );
+					} else {
+						// key is being inserted
+						${iteration} = ${lookup}[${key}] = ${create_each_block}( ${params}, ${each_block_value}, ${each_block_value}[#i], #i, #component, ${key} );
+						${iteration}.create();
+						${iteration}.${mountOrIntro}( ${parentNode}, ${expected}.first );
+
+						${expected}.last = ${iteration};
+						${iteration}.next = ${expected};
+					}
+				}
+			} else {
+				// we're appending from this point forward
+				if ( ${iteration} ) {
+					${iteration}.discard = false;
+					${iteration}.next = null;
+					${iteration}.mount( ${parentNode}, ${anchor} );
+				} else {
+					${iteration} = ${lookup}[${key}] = ${create_each_block}( ${params}, ${each_block_value}, ${each_block_value}[#i], #i, #component, ${key} );
+					${iteration}.create();
+					${iteration}.${mountOrIntro}( ${parentNode}, ${anchor} );
+				}
+			}
+
+			if ( ${last} ) ${last}.next = ${iteration};
+			${iteration}.last = ${last};
+			${node._block.hasIntroMethod &&
+				`${iteration}.intro( ${parentNode}, ${anchor} );`}
+			${last} = ${iteration};
+		}
+
+		if ( ${last} ) ${last}.next = null;
+
+		${destroy}
+
+		${head} = ${lookup}[${each_block_value}[0] && ${each_block_value}[0].${node.key}];
+	`);
+
+	if (!state.parentNode) {
+		block.builders.unmount.addBlock(deindent`
+			var ${iteration} = ${head};
+			while ( ${iteration} ) {
+				${iteration}.unmount();
+				${iteration} = ${iteration}.next;
+			}
+		`);
+	}
+
+	block.builders.destroy.addBlock(deindent`
+		var ${iteration} = ${head};
+		while ( ${iteration} ) {
+			${iteration}.destroy( false );
+			${iteration} = ${iteration}.next;
+		}
+	`);
+}
+
+function unkeyed(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node,
+	snippet,
+	{
+		create_each_block,
+		each_block_value,
+		iterations,
+		params,
+		anchor,
+		mountOrIntro,
+	}
+) {
+	block.builders.init.addBlock(deindent`
+		var ${iterations} = [];
+
+		for ( var #i = 0; #i < ${each_block_value}.length; #i += 1 ) {
+			${iterations}[#i] = ${create_each_block}( ${params}, ${each_block_value}, ${each_block_value}[#i], #i, #component );
+		}
+	`);
+
+	const targetNode = state.parentNode || '#target';
+	const anchorNode = state.parentNode ? 'null' : 'anchor';
+
+	block.builders.create.addBlock(deindent`
+		for ( var #i = 0; #i < ${iterations}.length; #i += 1 ) {
+			${iterations}[#i].create();
+		}
+	`);
+
+	block.builders.claim.addBlock(deindent`
+		for ( var #i = 0; #i < ${iterations}.length; #i += 1 ) {
+			${iterations}[#i].claim( ${state.parentNodes} );
+		}
+	`);
+
+	block.builders.mount.addBlock(deindent`
+		for ( var #i = 0; #i < ${iterations}.length; #i += 1 ) {
+			${iterations}[#i].${mountOrIntro}( ${targetNode}, ${anchorNode} );
+		}
+	`);
+
+	const dependencies = block.findDependencies(node.expression);
+	const allDependencies = new Set(node._block.dependencies);
+	dependencies.forEach((dependency: string) => {
+		allDependencies.add(dependency);
+	});
+
+	// TODO do this for keyed blocks as well
+	const condition = Array.from(allDependencies)
+		.map(dependency => `'${dependency}' in changed`)
+		.join(' || ');
+
+	const parentNode = state.parentNode || `${anchor}.parentNode`;
+
+	if (condition !== '') {
+		const forLoopBody = node._block.hasUpdateMethod
+			? node._block.hasIntroMethod
+				? deindent`
+					if ( ${iterations}[#i] ) {
+						${iterations}[#i].update( changed, ${params}, ${each_block_value}, ${each_block_value}[#i], #i );
+					} else {
+						${iterations}[#i] = ${create_each_block}( ${params}, ${each_block_value}, ${each_block_value}[#i], #i, #component );
+						${iterations}[#i].create();
+					}
+					${iterations}[#i].intro( ${parentNode}, ${anchor} );
+				`
+				: deindent`
+					if ( ${iterations}[#i] ) {
+						${iterations}[#i].update( changed, ${params}, ${each_block_value}, ${each_block_value}[#i], #i );
+					} else {
+						${iterations}[#i] = ${create_each_block}( ${params}, ${each_block_value}, ${each_block_value}[#i], #i, #component );
+						${iterations}[#i].create();
+						${iterations}[#i].mount( ${parentNode}, ${anchor} );
+					}
+				`
+			: deindent`
+				${iterations}[#i] = ${create_each_block}( ${params}, ${each_block_value}, ${each_block_value}[#i], #i, #component );
+				${iterations}[#i].${mountOrIntro}( ${parentNode}, ${anchor} );
+			`;
+
+		const start = node._block.hasUpdateMethod ? '0' : `${iterations}.length`;
+
+		const outro = block.getUniqueName('outro');
+		const destroy = node._block.hasOutroMethod
+			? deindent`
+				function ${outro} ( i ) {
+					if ( ${iterations}[i] ) {
+						${iterations}[i].outro( function () {
+							${iterations}[i].unmount();
+							${iterations}[i].destroy();
+							${iterations}[i] = null;
+						});
+					}
+				}
+
+				for ( ; #i < ${iterations}.length; #i += 1 ) ${outro}( #i );
+			`
+			: deindent`
+				for ( ; #i < ${iterations}.length; #i += 1 ) {
+					${iterations}[#i].unmount();
+					${iterations}[#i].destroy();
+				}
+				${iterations}.length = ${each_block_value}.length;
+			`;
+
+		block.builders.update.addBlock(deindent`
+			var ${each_block_value} = ${snippet};
+
+			if ( ${condition} ) {
+				for ( var #i = ${start}; #i < ${each_block_value}.length; #i += 1 ) {
+					${forLoopBody}
+				}
+
+				${destroy}
+			}
+		`);
+	}
+
+	block.builders.unmount.addBlock(deindent`
+		for ( var #i = 0; #i < ${iterations}.length; #i += 1 ) {
+			${iterations}[#i].unmount();
+		}
+	`);
+
+	block.builders.destroy.addBlock(`@destroyEach( ${iterations}, false, 0 );`);
+}
diff --git a/src/generators/dom/visitors/Element/Attribute.js b/src/generators/dom/visitors/Element/Attribute.js
deleted file mode 100644
index 1e83b5d33e..0000000000
--- a/src/generators/dom/visitors/Element/Attribute.js
+++ /dev/null
@@ -1,125 +0,0 @@
-import attributeLookup from './lookup.js';
-import deindent from '../../../../utils/deindent.js';
-import getStaticAttributeValue from './getStaticAttributeValue.js';
-
-export default function visitAttribute ( generator, block, state, node, attribute ) {
-	const name = attribute.name;
-
-	let metadata = state.namespace ? null : attributeLookup[ name ];
-	if ( metadata && metadata.appliesTo && !~metadata.appliesTo.indexOf( node.name ) ) metadata = null;
-
-	const isIndirectlyBoundValue = name === 'value' && (
-		node.name === 'option' || // TODO check it's actually bound
-		node.name === 'input' && /^(checkbox|radio)$/.test( getStaticAttributeValue( node, 'type' ) )
-	);
-
-	const propertyName = isIndirectlyBoundValue ? '__value' : metadata && metadata.propertyName;
-
-	// xlink is a special case... we could maybe extend this to generic
-	// namespaced attributes but I'm not sure that's applicable in
-	// HTML5?
-	const method = name.slice( 0, 6 ) === 'xlink:' ? 'setXlinkAttribute' : 'setAttribute';
-
-	const isDynamic = attribute.value !== true && attribute.value.length > 1 || ( attribute.value.length === 1 && attribute.value[0].type !== 'Text' );
-
-	if ( isDynamic ) {
-		let value;
-
-		if ( attribute.value.length === 1 ) {
-			// single {{tag}} — may be a non-string
-			const { snippet } = block.contextualise( attribute.value[0].expression );
-			value = snippet;
-		} else {
-			// '{{foo}} {{bar}}' — treat as string concatenation
-			value = ( attribute.value[0].type === 'Text' ? '' : `"" + ` ) + (
-				attribute.value.map( chunk => {
-					if ( chunk.type === 'Text' ) {
-						return JSON.stringify( chunk.data );
-					} else {
-						const { snippet } = block.contextualise( chunk.expression );
-						return `( ${snippet} )`;
-					}
-				}).join( ' + ' )
-			);
-		}
-
-		const last = block.getUniqueName( `${state.parentNode}_${name.replace( /[^a-zA-Z_$]/g, '_')}_value` );
-		block.addVariable( last );
-
-		const isSelectValueAttribute = name === 'value' && state.parentNodeName === 'select';
-
-		let updater;
-
-		if ( isSelectValueAttribute ) {
-			// annoying special case
-			const isMultipleSelect = node.name === 'select' && node.attributes.find( attr => attr.name.toLowerCase() === 'multiple' ); // TODO use getStaticAttributeValue
-			const i = block.getUniqueName( 'i' );
-			const option = block.getUniqueName( 'option' );
-
-			const ifStatement = isMultipleSelect ?
-				deindent`
-					${option}.selected = ~${last}.indexOf( ${option}.__value );` :
-				deindent`
-					if ( ${option}.__value === ${last} ) {
-						${option}.selected = true;
-						break;
-					}`;
-
-			updater = deindent`
-				for ( var ${i} = 0; ${i} < ${state.parentNode}.options.length; ${i} += 1 ) {
-					var ${option} = ${state.parentNode}.options[${i}];
-
-					${ifStatement}
-				}
-			`;
-
-			block.builders.create.addLine( deindent`
-				${last} = ${value}
-				${updater}
-			` );
-		} else if ( propertyName ) {
-			block.builders.create.addLine( `${state.parentNode}.${propertyName} = ${last} = ${value};` );
-			updater = `${state.parentNode}.${propertyName} = ${last};`;
-		} else {
-			block.builders.create.addLine( `${generator.helper( method )}( ${state.parentNode}, '${name}', ${last} = ${value} );` );
-			updater = `${generator.helper( method )}( ${state.parentNode}, '${name}', ${last} );`;
-		}
-
-		block.builders.update.addBlock( deindent`
-			if ( ${last} !== ( ${last} = ${value} ) ) {
-				${updater}
-			}
-		` );
-	}
-
-	else {
-		const value = attribute.value === true ? 'true' :
-		              attribute.value.length === 0 ? `''` :
-		              JSON.stringify( attribute.value[0].data );
-
-		const statement = propertyName ?
-			`${state.parentNode}.${propertyName} = ${value};` :
-			`${generator.helper( method )}( ${state.parentNode}, '${name}', ${value} );`;
-
-
-		block.builders.create.addLine( statement );
-
-		// special case – autofocus. has to be handled in a bit of a weird way
-		if ( attribute.value === true && name === 'autofocus' ) {
-			block.autofocus = state.parentNode;
-		}
-
-		// special case — xmlns
-		if ( name === 'xmlns' ) {
-			// TODO this attribute must be static – enforce at compile time
-			state.namespace = attribute.value[0].data;
-		}
-	}
-
-	if ( isIndirectlyBoundValue ) {
-		const updateValue = `${state.parentNode}.value = ${state.parentNode}.__value;`;
-
-		block.builders.create.addLine( updateValue );
-		if ( isDynamic ) block.builders.update.addLine( updateValue );
-	}
-}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Element/Attribute.ts b/src/generators/dom/visitors/Element/Attribute.ts
new file mode 100644
index 0000000000..2b7f3389d6
--- /dev/null
+++ b/src/generators/dom/visitors/Element/Attribute.ts
@@ -0,0 +1,159 @@
+import attributeLookup from './lookup';
+import deindent from '../../../../utils/deindent';
+import stringify from '../../../../utils/stringify';
+import getStaticAttributeValue from './getStaticAttributeValue';
+import { DomGenerator } from '../../index';
+import Block from '../../Block';
+import { Node } from '../../../../interfaces';
+import { State } from '../../interfaces';
+
+export default function visitAttribute(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node,
+	attribute: Node
+) {
+	const name = attribute.name;
+
+	let metadata = state.namespace ? null : attributeLookup[name];
+	if (metadata && metadata.appliesTo && !~metadata.appliesTo.indexOf(node.name))
+		metadata = null;
+
+	const isIndirectlyBoundValue =
+		name === 'value' &&
+		(node.name === 'option' || // TODO check it's actually bound
+			(node.name === 'input' &&
+				node.attributes.find(
+					(attribute: Node) =>
+						attribute.type === 'Binding' && /checked|group/.test(attribute.name)
+				)));
+
+	const propertyName = isIndirectlyBoundValue
+		? '__value'
+		: metadata && metadata.propertyName;
+
+	// xlink is a special case... we could maybe extend this to generic
+	// namespaced attributes but I'm not sure that's applicable in
+	// HTML5?
+	const method = name.slice(0, 6) === 'xlink:'
+		? '@setXlinkAttribute'
+		: '@setAttribute';
+
+	const isDynamic =
+		(attribute.value !== true && attribute.value.length > 1) ||
+		(attribute.value.length === 1 && attribute.value[0].type !== 'Text');
+
+	if (isDynamic) {
+		let value;
+
+		if (attribute.value.length === 1) {
+			// single {{tag}} — may be a non-string
+			const { snippet } = block.contextualise(attribute.value[0].expression);
+			value = snippet;
+		} else {
+			// '{{foo}} {{bar}}' — treat as string concatenation
+			value =
+				(attribute.value[0].type === 'Text' ? '' : `"" + `) +
+				attribute.value
+					.map((chunk: Node) => {
+						if (chunk.type === 'Text') {
+							return stringify(chunk.data);
+						} else {
+							const { snippet } = block.contextualise(chunk.expression);
+							return `( ${snippet} )`;
+						}
+					})
+					.join(' + ');
+		}
+
+		const last = block.getUniqueName(
+			`${state.parentNode}_${name.replace(/[^a-zA-Z_$]/g, '_')}_value`
+		);
+		block.addVariable(last);
+
+		const isSelectValueAttribute =
+			name === 'value' && state.parentNodeName === 'select';
+
+		let updater;
+
+		if (isSelectValueAttribute) {
+			// annoying special case
+			const isMultipleSelect =
+				node.name === 'select' &&
+				node.attributes.find(
+					(attr: Node) => attr.name.toLowerCase() === 'multiple'
+				); // TODO use getStaticAttributeValue
+			const i = block.getUniqueName('i');
+			const option = block.getUniqueName('option');
+
+			const ifStatement = isMultipleSelect
+				? deindent`
+					${option}.selected = ~${last}.indexOf( ${option}.__value );`
+				: deindent`
+					if ( ${option}.__value === ${last} ) {
+						${option}.selected = true;
+						break;
+					}`;
+
+			updater = deindent`
+				for ( var ${i} = 0; ${i} < ${state.parentNode}.options.length; ${i} += 1 ) {
+					var ${option} = ${state.parentNode}.options[${i}];
+
+					${ifStatement}
+				}
+			`;
+
+			block.builders.hydrate.addLine(deindent`
+				${last} = ${value}
+				${updater}
+			`);
+		} else if (propertyName) {
+			block.builders.hydrate.addLine(
+				`${state.parentNode}.${propertyName} = ${last} = ${value};`
+			);
+			updater = `${state.parentNode}.${propertyName} = ${last};`;
+		} else {
+			block.builders.hydrate.addLine(
+				`${method}( ${state.parentNode}, '${name}', ${last} = ${value} );`
+			);
+			updater = `${method}( ${state.parentNode}, '${name}', ${last} );`;
+		}
+
+		block.builders.update.addBlock(deindent`
+			if ( ${last} !== ( ${last} = ${value} ) ) {
+				${updater}
+			}
+		`);
+	} else {
+		const value = attribute.value === true
+			? 'true'
+			: attribute.value.length === 0
+				? `''`
+				: stringify(attribute.value[0].data);
+
+		const statement = propertyName
+			? `${state.parentNode}.${propertyName} = ${value};`
+			: `${method}( ${state.parentNode}, '${name}', ${value} );`;
+
+		block.builders.hydrate.addLine(statement);
+
+		// special case – autofocus. has to be handled in a bit of a weird way
+		if (attribute.value === true && name === 'autofocus') {
+			block.autofocus = state.parentNode;
+		}
+
+		// special case — xmlns
+		if (name === 'xmlns') {
+			// TODO this attribute must be static – enforce at compile time
+			state.namespace = attribute.value[0].data;
+		}
+	}
+
+	if (isIndirectlyBoundValue) {
+		const updateValue = `${state.parentNode}.value = ${state.parentNode}.__value;`;
+
+		block.builders.hydrate.addLine(updateValue);
+		if (isDynamic) block.builders.update.addLine(updateValue);
+	}
+}
diff --git a/src/generators/dom/visitors/Element/Binding.js b/src/generators/dom/visitors/Element/Binding.js
deleted file mode 100644
index 2ca07f3f2e..0000000000
--- a/src/generators/dom/visitors/Element/Binding.js
+++ /dev/null
@@ -1,199 +0,0 @@
-import deindent from '../../../../utils/deindent.js';
-import flattenReference from '../../../../utils/flattenReference.js';
-import getSetter from '../shared/binding/getSetter.js';
-import getStaticAttributeValue from './getStaticAttributeValue.js';
-
-export default function visitBinding ( generator, block, state, node, attribute ) {
-	const { name, parts } = flattenReference( attribute.value );
-	const { snippet, contexts, dependencies } = block.contextualise( attribute.value );
-
-	if ( dependencies.length > 1 ) throw new Error( 'An unexpected situation arose. Please raise an issue at https://github.com/sveltejs/svelte/issues — thanks!' );
-
-	contexts.forEach( context => {
-		if ( !~state.allUsedContexts.indexOf( context ) ) state.allUsedContexts.push( context );
-	});
-
-	const eventName = getBindingEventName( node, attribute );
-	const handler = block.getUniqueName( `${state.parentNode}_${eventName}_handler` );
-	const isMultipleSelect = node.name === 'select' && node.attributes.find( attr => attr.name.toLowerCase() === 'multiple' ); // TODO use getStaticAttributeValue
-	const type = getStaticAttributeValue( node, 'type' );
-	const bindingGroup = attribute.name === 'group' ? getBindingGroup( generator, parts.join( '.' ) ) : null;
-	const value = getBindingValue( generator, block, state, node, attribute, isMultipleSelect, bindingGroup, type );
-
-	let setter = getSetter({ block, name, context: '_svelte', attribute, dependencies, value });
-	let updateElement = `${state.parentNode}.${attribute.name} = ${snippet};`;
-	const lock = block.alias( `${state.parentNode}_updating` );
-	let updateCondition = `!${lock}`;
-
-	block.addVariable( lock, 'false' );
-
-	// <select> special case
-	if ( node.name === 'select' ) {
-		if ( !isMultipleSelect ) {
-			setter = `var selectedOption = ${state.parentNode}.selectedOptions[0] || ${state.parentNode}.options[0];\n${setter}`;
-		}
-
-		const value = block.getUniqueName( 'value' );
-		const i = block.alias( 'i' );
-		const option = block.getUniqueName( 'option' );
-
-		const ifStatement = isMultipleSelect ?
-			deindent`
-				${option}.selected = ~${value}.indexOf( ${option}.__value );` :
-			deindent`
-				if ( ${option}.__value === ${value} ) {
-					${option}.selected = true;
-					break;
-				}`;
-
-		updateElement = deindent`
-			var ${value} = ${snippet};
-			for ( var ${i} = 0; ${i} < ${state.parentNode}.options.length; ${i} += 1 ) {
-				var ${option} = ${state.parentNode}.options[${i}];
-
-				${ifStatement}
-			}
-		`;
-	}
-
-	// <input type='checkbox|radio' bind:group='selected'> special case
-	else if ( attribute.name === 'group' ) {
-		if ( type === 'radio' ) {
-			setter = deindent`
-				if ( !${state.parentNode}.checked ) return;
-				${setter}
-			`;
-		}
-
-		const condition = type === 'checkbox' ?
-			`~${snippet}.indexOf( ${state.parentNode}.__value )` :
-			`${state.parentNode}.__value === ${snippet}`;
-
-		block.builders.create.addLine(
-			`${block.component}._bindingGroups[${bindingGroup}].push( ${state.parentNode} );`
-		);
-
-		block.builders.destroy.addBlock(
-			`${block.component}._bindingGroups[${bindingGroup}].splice( ${block.component}._bindingGroups[${bindingGroup}].indexOf( ${state.parentNode} ), 1 );`
-		);
-
-		updateElement = `${state.parentNode}.checked = ${condition};`;
-	}
-
-	else if ( node.name === 'audio' || node.name === 'video' ) {
-		generator.hasComplexBindings = true;
-		block.builders.create.addBlock( `${block.component}._bindings.push( ${handler} );` );
-
-		if ( attribute.name === 'currentTime' ) {
-			const frame = block.getUniqueName( `${state.parentNode}_animationframe` );
-			block.addVariable( frame );
-			setter = deindent`
-				cancelAnimationFrame( ${frame} );
-				if ( !${state.parentNode}.paused ) ${frame} = requestAnimationFrame( ${handler} );
-				${setter}
-			`;
-
-			updateCondition += ` && !isNaN( ${snippet} )`;
-		}
-
-		else if ( attribute.name === 'duration' ) {
-			updateCondition = null;
-		}
-
-		else if ( attribute.name === 'paused' ) {
-			// this is necessary to prevent the audio restarting by itself
-			const last = block.getUniqueName( `${state.parentNode}_paused_value` );
-			block.addVariable( last, 'true' );
-
-			updateCondition = `${last} !== ( ${last} = ${snippet} )`;
-			updateElement = `${state.parentNode}[ ${last} ? 'pause' : 'play' ]();`;
-		}
-	}
-
-	block.builders.create.addBlock( deindent`
-		function ${handler} () {
-			${lock} = true;
-			${setter}
-			${lock} = false;
-		}
-
-		${generator.helper( 'addEventListener' )}( ${state.parentNode}, '${eventName}', ${handler} );
-	` );
-
-	if ( node.name !== 'audio' && node.name !== 'video' ) node.initialUpdate = updateElement;
-
-	if ( updateCondition !== null ) {
-		// audio/video duration is read-only, it never updates
-		block.builders.update.addBlock( deindent`
-			if ( ${updateCondition} ) {
-				${updateElement}
-			}
-		` );
-	}
-
-	block.builders.destroy.addLine( deindent`
-		${generator.helper( 'removeEventListener' )}( ${state.parentNode}, '${eventName}', ${handler} );
-	` );
-
-	if ( attribute.name === 'paused' ) {
-		block.builders.create.addLine( `${generator.helper( 'addEventListener' )}( ${state.parentNode}, 'play', ${handler} );` );
-		block.builders.destroy.addLine( `${generator.helper( 'removeEventListener' )}( ${state.parentNode}, 'play', ${handler} );` );
-	}
-}
-
-function getBindingEventName ( node, attribute ) {
-	if ( node.name === 'input' ) {
-		const typeAttribute = node.attributes.find( attr => attr.type === 'Attribute' && attr.name === 'type' );
-		const type = typeAttribute ? typeAttribute.value[0].data : 'text'; // TODO in validation, should throw if type attribute is not static
-
-		return type === 'checkbox' || type === 'radio' ? 'change' : 'input';
-	}
-
-	if ( node.name === 'textarea' ) return 'input';
-	if ( attribute.name === 'currentTime' ) return 'timeupdate';
-	if ( attribute.name === 'duration' ) return 'durationchange';
-	if ( attribute.name === 'paused' ) return 'pause';
-
-	return 'change';
-}
-
-function getBindingValue ( generator, block, state, node, attribute, isMultipleSelect, bindingGroup, type ) {
-	// <select multiple bind:value='selected>
-	if ( isMultipleSelect ) {
-		return `[].map.call( ${state.parentNode}.selectedOptions, function ( option ) { return option.__value; })`;
-	}
-
-	// <select bind:value='selected>
-	if ( node.name === 'select' ) {
-		return 'selectedOption && selectedOption.__value';
-	}
-
-	// <input type='checkbox' bind:group='foo'>
-	if ( attribute.name === 'group' ) {
-		if ( type === 'checkbox' ) {
-			return `${generator.helper( 'getBindingGroupValue' )}( ${block.component}._bindingGroups[${bindingGroup}] )`;
-		}
-
-		return `${state.parentNode}.__value`;
-	}
-
-	// <input type='range|number' bind:value>
-	if ( type === 'range' || type === 'number' ) {
-		return `+${state.parentNode}.${attribute.name}`;
-	}
-
-	// everything else
-	return `${state.parentNode}.${attribute.name}`;
-}
-
-function getBindingGroup ( generator, keypath ) {
-	// TODO handle contextual bindings — `keypath` should include unique ID of
-	// each block that provides context
-	let index = generator.bindingGroups.indexOf( keypath );
-	if ( index === -1 ) {
-		index = generator.bindingGroups.length;
-		generator.bindingGroups.push( keypath );
-	}
-
-	return index;
-}
diff --git a/src/generators/dom/visitors/Element/Binding.ts b/src/generators/dom/visitors/Element/Binding.ts
new file mode 100644
index 0000000000..d2acbdd583
--- /dev/null
+++ b/src/generators/dom/visitors/Element/Binding.ts
@@ -0,0 +1,253 @@
+import deindent from '../../../../utils/deindent';
+import flattenReference from '../../../../utils/flattenReference';
+import getSetter from '../shared/binding/getSetter';
+import getStaticAttributeValue from './getStaticAttributeValue';
+import { DomGenerator } from '../../index';
+import Block from '../../Block';
+import { Node } from '../../../../interfaces';
+import { State } from '../../interfaces';
+import getObject from '../../../../utils/getObject';
+
+export default function visitBinding(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node,
+	attribute: Node
+) {
+	const { name } = getObject(attribute.value);
+	const { snippet, contexts, dependencies } = block.contextualise(
+		attribute.value
+	);
+
+	contexts.forEach(context => {
+		if (!~state.allUsedContexts.indexOf(context))
+			state.allUsedContexts.push(context);
+	});
+
+	const eventName = getBindingEventName(node, attribute);
+	const handler = block.getUniqueName(
+		`${state.parentNode}_${eventName}_handler`
+	);
+	const isMultipleSelect =
+		node.name === 'select' &&
+		node.attributes.find(
+			(attr: Node) => attr.name.toLowerCase() === 'multiple'
+		); // TODO use getStaticAttributeValue
+	const type = getStaticAttributeValue(node, 'type');
+	const bindingGroup = attribute.name === 'group'
+		? getBindingGroup(generator, attribute.value)
+		: null;
+	const value = getBindingValue(
+		generator,
+		block,
+		state,
+		node,
+		attribute,
+		isMultipleSelect,
+		bindingGroup,
+		type
+	);
+
+	let setter = getSetter({
+		block,
+		name,
+		snippet,
+		context: '_svelte',
+		attribute,
+		dependencies,
+		value,
+	});
+	let updateElement = `${state.parentNode}.${attribute.name} = ${snippet};`;
+	const lock = `#${state.parentNode}_updating`;
+	let updateCondition = `!${lock}`;
+
+	block.addVariable(lock, 'false');
+
+	// <select> special case
+	if (node.name === 'select') {
+		if (!isMultipleSelect) {
+			setter = `var selectedOption = ${state.parentNode}.querySelector(':checked') || ${state.parentNode}.options[0];\n${setter}`;
+		}
+
+		const value = block.getUniqueName('value');
+		const option = block.getUniqueName('option');
+
+		const ifStatement = isMultipleSelect
+			? deindent`
+				${option}.selected = ~${value}.indexOf( ${option}.__value );`
+			: deindent`
+				if ( ${option}.__value === ${value} ) {
+					${option}.selected = true;
+					break;
+				}`;
+
+		updateElement = deindent`
+			var ${value} = ${snippet};
+			for ( var #i = 0; #i < ${state.parentNode}.options.length; #i += 1 ) {
+				var ${option} = ${state.parentNode}.options[#i];
+
+				${ifStatement}
+			}
+		`;
+
+		generator.hasComplexBindings = true;
+		block.builders.hydrate.addBlock(
+			`if ( !('${name}' in state) ) #component._bindings.push( ${handler} );`
+		);
+	} else if (attribute.name === 'group') {
+		// <input type='checkbox|radio' bind:group='selected'> special case
+		if (type === 'radio') {
+			setter = deindent`
+				if ( !${state.parentNode}.checked ) return;
+				${setter}
+			`;
+		}
+
+		const condition = type === 'checkbox'
+			? `~${snippet}.indexOf( ${state.parentNode}.__value )`
+			: `${state.parentNode}.__value === ${snippet}`;
+
+		block.builders.hydrate.addLine(
+			`#component._bindingGroups[${bindingGroup}].push( ${state.parentNode} );`
+		);
+
+		block.builders.destroy.addBlock(
+			`#component._bindingGroups[${bindingGroup}].splice( #component._bindingGroups[${bindingGroup}].indexOf( ${state.parentNode} ), 1 );`
+		);
+
+		updateElement = `${state.parentNode}.checked = ${condition};`;
+	} else if (node.name === 'audio' || node.name === 'video') {
+		generator.hasComplexBindings = true;
+		block.builders.hydrate.addBlock(`#component._bindings.push( ${handler} );`);
+
+		if (attribute.name === 'currentTime') {
+			const frame = block.getUniqueName(`${state.parentNode}_animationframe`);
+			block.addVariable(frame);
+			setter = deindent`
+				cancelAnimationFrame( ${frame} );
+				if ( !${state.parentNode}.paused ) ${frame} = requestAnimationFrame( ${handler} );
+				${setter}
+			`;
+
+			updateCondition += ` && !isNaN( ${snippet} )`;
+		} else if (attribute.name === 'duration') {
+			updateCondition = null;
+		} else if (attribute.name === 'paused') {
+			// this is necessary to prevent the audio restarting by itself
+			const last = block.getUniqueName(`${state.parentNode}_paused_value`);
+			block.addVariable(last, 'true');
+
+			updateCondition = `${last} !== ( ${last} = ${snippet} )`;
+			updateElement = `${state.parentNode}[ ${last} ? 'pause' : 'play' ]();`;
+		}
+	}
+
+	block.builders.init.addBlock(deindent`
+		function ${handler} () {
+			${lock} = true;
+			${setter}
+			${lock} = false;
+		}
+	`);
+
+	block.builders.hydrate.addBlock(
+		`@addListener( ${state.parentNode}, '${eventName}', ${handler} );`
+	);
+
+	if (node.name !== 'audio' && node.name !== 'video')
+		node.initialUpdate = updateElement;
+
+	if (updateCondition !== null) {
+		// audio/video duration is read-only, it never updates
+		block.builders.update.addBlock(deindent`
+			if ( ${updateCondition} ) {
+				${updateElement}
+			}
+		`);
+	}
+
+	block.builders.destroy.addLine(
+		`@removeListener( ${state.parentNode}, '${eventName}', ${handler} );`
+	);
+
+	if (attribute.name === 'paused') {
+		block.builders.create.addLine(
+			`@addListener( ${state.parentNode}, 'play', ${handler} );`
+		);
+		block.builders.destroy.addLine(
+			`@removeListener( ${state.parentNode}, 'play', ${handler} );`
+		);
+	}
+}
+
+function getBindingEventName(node: Node, attribute: Node) {
+	if (node.name === 'input') {
+		const typeAttribute = node.attributes.find(
+			(attr: Node) => attr.type === 'Attribute' && attr.name === 'type'
+		);
+		const type = typeAttribute ? typeAttribute.value[0].data : 'text'; // TODO in validation, should throw if type attribute is not static
+
+		return type === 'checkbox' || type === 'radio' ? 'change' : 'input';
+	}
+
+	if (node.name === 'textarea') return 'input';
+	if (attribute.name === 'currentTime') return 'timeupdate';
+	if (attribute.name === 'duration') return 'durationchange';
+	if (attribute.name === 'paused') return 'pause';
+
+	return 'change';
+}
+
+function getBindingValue(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node,
+	attribute: Node,
+	isMultipleSelect: boolean,
+	bindingGroup: number,
+	type: string
+) {
+	// <select multiple bind:value='selected>
+	if (isMultipleSelect) {
+		return `[].map.call( ${state.parentNode}.querySelectorAll(':checked'), function ( option ) { return option.__value; })`;
+	}
+
+	// <select bind:value='selected>
+	if (node.name === 'select') {
+		return 'selectedOption && selectedOption.__value';
+	}
+
+	// <input type='checkbox' bind:group='foo'>
+	if (attribute.name === 'group') {
+		if (type === 'checkbox') {
+			return `@getBindingGroupValue( #component._bindingGroups[${bindingGroup}] )`;
+		}
+
+		return `${state.parentNode}.__value`;
+	}
+
+	// <input type='range|number' bind:value>
+	if (type === 'range' || type === 'number') {
+		return `@toNumber( ${state.parentNode}.${attribute.name} )`;
+	}
+
+	// everything else
+	return `${state.parentNode}.${attribute.name}`;
+}
+
+function getBindingGroup(generator: DomGenerator, value: Node) {
+	const { parts } = flattenReference(value); // TODO handle cases involving computed member expressions
+	const keypath = parts.join('.');
+
+	// TODO handle contextual bindings — `keypath` should include unique ID of
+	// each block that provides context
+	let index = generator.bindingGroups.indexOf(keypath);
+	if (index === -1) {
+		index = generator.bindingGroups.length;
+		generator.bindingGroups.push(keypath);
+	}
+
+	return index;
+}
diff --git a/src/generators/dom/visitors/Element/Element.js b/src/generators/dom/visitors/Element/Element.js
deleted file mode 100644
index c4bf6c6af4..0000000000
--- a/src/generators/dom/visitors/Element/Element.js
+++ /dev/null
@@ -1,139 +0,0 @@
-import deindent from '../../../../utils/deindent.js';
-import visit from '../../visit.js';
-import visitComponent from '../Component/Component.js';
-import visitWindow from './meta/Window.js';
-import visitAttribute from './Attribute.js';
-import visitEventHandler from './EventHandler.js';
-import visitBinding from './Binding.js';
-import visitRef from './Ref.js';
-
-const meta = {
-	':Window': visitWindow
-};
-
-const order = {
-	Attribute: 1,
-	Binding: 2,
-	EventHandler: 3,
-	Ref: 4
-};
-
-const visitors = {
-	Attribute: visitAttribute,
-	EventHandler: visitEventHandler,
-	Binding: visitBinding,
-	Ref: visitRef
-};
-
-export default function visitElement ( generator, block, state, node ) {
-	if ( node.name in meta ) {
-		return meta[ node.name ]( generator, block, node );
-	}
-
-	if ( generator.components.has( node.name ) || node.name === ':Self' ) {
-		return visitComponent( generator, block, state, node );
-	}
-
-	const name = block.getUniqueName( node.name.replace( /[^a-zA-Z_$]/g, '_' ) );
-
-	const childState = Object.assign( {}, state, {
-		isTopLevel: false,
-		parentNode: name,
-		parentNodeName: node.name,
-		namespace: node.name === 'svg' ? 'http://www.w3.org/2000/svg' : state.namespace,
-		allUsedContexts: []
-	});
-
-	block.builders.create.addLine( `var ${name} = ${getRenderStatement( generator, childState.namespace, node.name )};` );
-	block.mount( name, state.parentNode );
-
-	if ( !state.parentNode ) {
-		block.builders.detach.addLine( `${generator.helper( 'detachNode' )}( ${name} );` );
-	}
-
-	// add CSS encapsulation attribute
-	if ( generator.cssId && state.isTopLevel ) {
-		block.builders.create.addLine( `${generator.helper( 'setAttribute' )}( ${name}, '${generator.cssId}', '' );` );
-	}
-
-	let selectValueAttribute;
-
-	node.attributes
-		.sort( ( a, b ) => order[ a.type ] - order[ b.type ] )
-		.forEach( attribute => {
-			// <select> value attributes are an annoying special case — it must be handled
-			// *after* its children have been updated
-			if ( ( attribute.type === 'Attribute' || attribute.type === 'Binding' ) && attribute.name === 'value' && node.name === 'select' ) {
-				selectValueAttribute = attribute;
-				return;
-			}
-
-			visitors[ attribute.type ]( generator, block, childState, node, attribute );
-		});
-
-	// special case – bound <option> without a value attribute
-	if ( node.name === 'option' && !node.attributes.find( attribute => attribute.type === 'Attribute' && attribute.name === 'value' ) ) { 	// TODO check it's bound
-		const statement = `${name}.__value = ${name}.textContent;`;
-		node.initialUpdate = node.lateUpdate = statement;
-	}
-
-	if ( childState.allUsedContexts.length || childState.usesComponent ) {
-		const initialProps = [];
-		const updates = [];
-
-		if ( childState.usesComponent ) {
-			initialProps.push( `component: ${block.component}` );
-		}
-
-		childState.allUsedContexts.forEach( contextName => {
-			if ( contextName === 'state' ) return;
-
-			const listName = block.listNames.get( contextName );
-			const indexName = block.indexNames.get( contextName );
-
-			initialProps.push( `${listName}: ${listName},\n${indexName}: ${indexName}` );
-			updates.push( `${name}._svelte.${listName} = ${listName};\n${name}._svelte.${indexName} = ${indexName};` );
-		});
-
-		if ( initialProps.length ) {
-			block.builders.create.addBlock( deindent`
-				${name}._svelte = {
-					${initialProps.join( ',\n' )}
-				};
-			` );
-		}
-
-		if ( updates.length ) {
-			block.builders.update.addBlock( updates.join( '\n' ) );
-		}
-	}
-
-	node.children.forEach( child => {
-		visit( generator, block, childState, child );
-	});
-
-	if ( node.lateUpdate ) {
-		block.builders.update.addLine( node.lateUpdate );
-	}
-
-	if ( selectValueAttribute ) {
-		const visitor = selectValueAttribute.type === 'Attribute' ? visitAttribute : visitBinding;
-		visitor( generator, block, childState, node, selectValueAttribute );
-	}
-
-	if ( node.initialUpdate ) {
-		block.builders.create.addBlock( node.initialUpdate );
-	}
-}
-
-function getRenderStatement ( generator, namespace, name ) {
-	if ( namespace === 'http://www.w3.org/2000/svg' ) {
-		return `${generator.helper( 'createSvgElement' )}( '${name}' )`;
-	}
-
-	if ( namespace ) {
-		return `document.createElementNS( '${namespace}', '${name}' )`;
-	}
-
-	return `${generator.helper( 'createElement' )}( '${name}' )`;
-}
diff --git a/src/generators/dom/visitors/Element/Element.ts b/src/generators/dom/visitors/Element/Element.ts
new file mode 100644
index 0000000000..53b4df6fdd
--- /dev/null
+++ b/src/generators/dom/visitors/Element/Element.ts
@@ -0,0 +1,241 @@
+import deindent from '../../../../utils/deindent';
+import visit from '../../visit';
+import visitComponent from '../Component/Component';
+import visitWindow from './meta/Window';
+import visitAttribute from './Attribute';
+import visitEventHandler from './EventHandler';
+import visitBinding from './Binding';
+import visitRef from './Ref';
+import * as namespaces from '../../../../utils/namespaces';
+import addTransitions from './addTransitions';
+import { DomGenerator } from '../../index';
+import Block from '../../Block';
+import { Node } from '../../../../interfaces';
+import { State } from '../../interfaces';
+
+const meta = {
+	':Window': visitWindow,
+};
+
+const order = {
+	Attribute: 1,
+	Binding: 2,
+	EventHandler: 3,
+	Ref: 4,
+};
+
+const visitors = {
+	Attribute: visitAttribute,
+	EventHandler: visitEventHandler,
+	Binding: visitBinding,
+	Ref: visitRef,
+};
+
+export default function visitElement(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node
+) {
+	if (node.name in meta) {
+		return meta[node.name](generator, block, node);
+	}
+
+	if (generator.components.has(node.name) || node.name === ':Self') {
+		return visitComponent(generator, block, state, node);
+	}
+
+	const childState = node._state;
+	const name = childState.parentNode;
+
+	const isToplevel = !state.parentNode;
+
+	block.addVariable(name);
+	block.builders.create.addLine(
+		`${name} = ${getRenderStatement(
+			generator,
+			childState.namespace,
+			node.name
+		)};`
+	);
+
+	if (generator.hydratable) {
+		block.builders.claim.addBlock(deindent`
+			${name} = ${getClaimStatement(
+			generator,
+			childState.namespace,
+			state.parentNodes,
+			node
+		)};
+			var ${childState.parentNodes} = @children( ${name} );
+		`);
+	}
+
+	if (state.parentNode) {
+		block.builders.mount.addLine(
+			`@appendNode( ${name}, ${state.parentNode} );`
+		);
+	} else {
+		block.builders.mount.addLine(`@insertNode( ${name}, #target, anchor );`);
+	}
+
+	// add CSS encapsulation attribute
+	if (generator.cssId && (!generator.cascade || state.isTopLevel)) {
+		block.builders.hydrate.addLine(
+			`@setAttribute( ${name}, '${generator.cssId}', '' );`
+		);
+	}
+
+	function visitAttributesAndAddProps() {
+		let intro;
+		let outro;
+
+		node.attributes
+			.sort((a: Node, b: Node) => order[a.type] - order[b.type])
+			.forEach((attribute: Node) => {
+				if (attribute.type === 'Transition') {
+					if (attribute.intro) intro = attribute;
+					if (attribute.outro) outro = attribute;
+					return;
+				}
+
+				visitors[attribute.type](generator, block, childState, node, attribute);
+			});
+
+		if (intro || outro)
+			addTransitions(generator, block, childState, node, intro, outro);
+
+		if (childState.allUsedContexts.length || childState.usesComponent) {
+			const initialProps: string[] = [];
+			const updates: string[] = [];
+
+			if (childState.usesComponent) {
+				initialProps.push(`component: #component`);
+			}
+
+			childState.allUsedContexts.forEach((contextName: string) => {
+				if (contextName === 'state') return;
+
+				const listName = block.listNames.get(contextName);
+				const indexName = block.indexNames.get(contextName);
+
+				initialProps.push(
+					`${listName}: ${listName},\n${indexName}: ${indexName}`
+				);
+				updates.push(
+					`${name}._svelte.${listName} = ${listName};\n${name}._svelte.${indexName} = ${indexName};`
+				);
+			});
+
+			if (initialProps.length) {
+				block.builders.hydrate.addBlock(deindent`
+					${name}._svelte = {
+						${initialProps.join(',\n')}
+					};
+				`);
+			}
+
+			if (updates.length) {
+				block.builders.update.addBlock(updates.join('\n'));
+			}
+		}
+	}
+
+	if (isToplevel) {
+		// TODO we eventually need to consider what happens to elements
+		// that belong to the same outgroup as an outroing element...
+		block.builders.unmount.addLine(`@detachNode( ${name} );`);
+	}
+
+	if (node.name !== 'select') {
+		if (node.name === 'textarea') {
+			// this is an egregious hack, but it's the easiest way to get <textarea>
+			// children treated the same way as a value attribute
+			if (node.children.length > 0) {
+				node.attributes.push({
+					type: 'Attribute',
+					name: 'value',
+					value: node.children,
+				});
+
+				node.children = [];
+			}
+		}
+
+		// <select> value attributes are an annoying special case — it must be handled
+		// *after* its children have been updated
+		visitAttributesAndAddProps();
+	}
+
+	// special case – bound <option> without a value attribute
+	if (
+		node.name === 'option' &&
+		!node.attributes.find(
+			(attribute: Node) =>
+				attribute.type === 'Attribute' && attribute.name === 'value'
+		)
+	) {
+		// TODO check it's bound
+		const statement = `${name}.__value = ${name}.textContent;`;
+		node.initialUpdate = node.lateUpdate = statement;
+	}
+
+	node.children.forEach((child: Node) => {
+		visit(generator, block, childState, child);
+	});
+
+	if (node.lateUpdate) {
+		block.builders.update.addLine(node.lateUpdate);
+	}
+
+	if (node.name === 'select') {
+		visitAttributesAndAddProps();
+	}
+
+	if (node.initialUpdate) {
+		block.builders.mount.addBlock(node.initialUpdate);
+	}
+
+	block.builders.claim.addLine(
+		`${childState.parentNodes}.forEach( @detachNode );`
+	);
+}
+
+function getRenderStatement(
+	generator: DomGenerator,
+	namespace: string,
+	name: string
+) {
+	if (namespace === 'http://www.w3.org/2000/svg') {
+		return `@createSvgElement( '${name}' )`;
+	}
+
+	if (namespace) {
+		return `document.createElementNS( '${namespace}', '${name}' )`;
+	}
+
+	return `@createElement( '${name}' )`;
+}
+
+function getClaimStatement(
+	generator: DomGenerator,
+	namespace: string,
+	nodes: string,
+	node: Node
+) {
+	const attributes = node.attributes
+		.filter((attr: Node) => attr.type === 'Attribute')
+		.map((attr: Node) => `${quoteProp(attr.name)}: true`)
+		.join(', ');
+
+	const name = namespace ? node.name : node.name.toUpperCase();
+
+	return `@claimElement( ${nodes}, '${name}', ${attributes
+		? `{ ${attributes} }`
+		: `{}`}, ${namespace === namespaces.svg ? true : false} )`;
+}
+
+function quoteProp(name: string) {
+	if (/[^a-zA-Z_$0-9]/.test(name)) return `'${name}'`;
+	return name;
+}
diff --git a/src/generators/dom/visitors/Element/EventHandler.js b/src/generators/dom/visitors/Element/EventHandler.js
deleted file mode 100644
index 5439bceee2..0000000000
--- a/src/generators/dom/visitors/Element/EventHandler.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import deindent from '../../../../utils/deindent.js';
-import CodeBuilder from '../../../../utils/CodeBuilder.js';
-import flattenReference from '../../../../utils/flattenReference.js';
-
-export default function visitEventHandler ( generator, block, state, node, attribute ) {
-	const name = attribute.name;
-	const isCustomEvent = generator.events.has( name );
-	const shouldHoist = !isCustomEvent && state.inEachBlock;
-
-	generator.addSourcemapLocations( attribute.expression );
-
-	const flattened = flattenReference( attribute.expression.callee );
-	if ( flattened.name !== 'event' && flattened.name !== 'this' ) {
-		// allow event.stopPropagation(), this.select() etc
-		// TODO verify that it's a valid callee (i.e. built-in or declared method)
-		generator.code.prependRight( attribute.expression.start, `${block.component}.` );
-		if ( shouldHoist ) state.usesComponent = true; // this feels a bit hacky but it works!
-	}
-
-	const context = shouldHoist ? null : state.parentNode;
-	const usedContexts = [];
-	attribute.expression.arguments.forEach( arg => {
-		const { contexts } = block.contextualise( arg, context, true );
-
-		contexts.forEach( context => {
-			if ( !~usedContexts.indexOf( context ) ) usedContexts.push( context );
-			if ( !~state.allUsedContexts.indexOf( context ) ) state.allUsedContexts.push( context );
-		});
-	});
-
-	const _this = context || 'this';
-	const declarations = usedContexts.map( name => {
-		if ( name === 'state' ) {
-			if ( shouldHoist ) state.usesComponent = true;
-			return `var state = ${block.component}.get();`;
-		}
-
-		const listName = block.listNames.get( name );
-		const indexName = block.indexNames.get( name );
-		const contextName = block.contexts.get( name );
-
-		return `var ${listName} = ${_this}._svelte.${listName}, ${indexName} = ${_this}._svelte.${indexName}, ${contextName} = ${listName}[${indexName}];`;
-	});
-
-	// get a name for the event handler that is globally unique
-	// if hoisted, locally unique otherwise
-	const handlerName = shouldHoist ?
-		generator.getUniqueName( `${name}_handler` ) :
-		block.getUniqueName( `${name}_handler` );
-
-	// create the handler body
-	const handlerBody = new CodeBuilder();
-
-	if ( state.usesComponent ) {
-		// TODO the element needs to know to create `thing._svelte = { component: component }`
-		handlerBody.addLine( `var ${block.component} = this._svelte.component;` );
-	}
-
-	declarations.forEach( declaration => {
-		handlerBody.addLine( declaration );
-	});
-
-	handlerBody.addLine( `[✂${attribute.expression.start}-${attribute.expression.end}✂];` );
-
-	const handler = isCustomEvent ?
-		deindent`
-			var ${handlerName} = ${generator.alias( 'template' )}.events.${name}.call( ${block.component}, ${state.parentNode}, function ( event ) {
-				${handlerBody}
-			});
-		` :
-		deindent`
-			function ${handlerName} ( event ) {
-				${handlerBody}
-			}
-		`;
-
-	if ( shouldHoist ) {
-		generator.blocks.push({
-			render: () => handler
-		});
-	} else {
-		block.builders.create.addBlock( handler );
-	}
-
-	if ( isCustomEvent ) {
-		block.builders.destroy.addLine( deindent`
-			${handlerName}.teardown();
-		` );
-	} else {
-		block.builders.create.addLine( deindent`
-			${generator.helper( 'addEventListener' )}( ${state.parentNode}, '${name}', ${handlerName} );
-		` );
-
-		block.builders.destroy.addLine( deindent`
-			${generator.helper( 'removeEventListener' )}( ${state.parentNode}, '${name}', ${handlerName} );
-		` );
-	}
-}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Element/EventHandler.ts b/src/generators/dom/visitors/Element/EventHandler.ts
new file mode 100644
index 0000000000..64178f5499
--- /dev/null
+++ b/src/generators/dom/visitors/Element/EventHandler.ts
@@ -0,0 +1,109 @@
+import deindent from '../../../../utils/deindent';
+import flattenReference from '../../../../utils/flattenReference';
+import { DomGenerator } from '../../index';
+import Block from '../../Block';
+import { Node } from '../../../../interfaces';
+import { State } from '../../interfaces';
+
+export default function visitEventHandler(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node,
+	attribute: Node
+) {
+	const name = attribute.name;
+	const isCustomEvent = generator.events.has(name);
+	const shouldHoist = !isCustomEvent && state.inEachBlock;
+
+	generator.addSourcemapLocations(attribute.expression);
+
+	const flattened = flattenReference(attribute.expression.callee);
+	if (flattened.name !== 'event' && flattened.name !== 'this') {
+		// allow event.stopPropagation(), this.select() etc
+		// TODO verify that it's a valid callee (i.e. built-in or declared method)
+		generator.code.prependRight(
+			attribute.expression.start,
+			`${block.alias('component')}.`
+		);
+		if (shouldHoist) state.usesComponent = true; // this feels a bit hacky but it works!
+	}
+
+	const context = shouldHoist ? null : state.parentNode;
+	const usedContexts: string[] = [];
+	attribute.expression.arguments.forEach((arg: Node) => {
+		const { contexts } = block.contextualise(arg, context, true);
+
+		contexts.forEach(context => {
+			if (!~usedContexts.indexOf(context)) usedContexts.push(context);
+			if (!~state.allUsedContexts.indexOf(context))
+				state.allUsedContexts.push(context);
+		});
+	});
+
+	const _this = context || 'this';
+	const declarations = usedContexts.map(name => {
+		if (name === 'state') {
+			if (shouldHoist) state.usesComponent = true;
+			return `var state = #component.get();`;
+		}
+
+		const listName = block.listNames.get(name);
+		const indexName = block.indexNames.get(name);
+		const contextName = block.contexts.get(name);
+
+		return `var ${listName} = ${_this}._svelte.${listName}, ${indexName} = ${_this}._svelte.${indexName}, ${contextName} = ${listName}[${indexName}];`;
+	});
+
+	// get a name for the event handler that is globally unique
+	// if hoisted, locally unique otherwise
+	const handlerName = (shouldHoist ? generator : block).getUniqueName(
+		`${name.replace(/[^a-zA-Z0-9_$]/g, '_')}_handler`
+	);
+
+	// create the handler body
+	const handlerBody = deindent`
+		${state.usesComponent &&
+			`var ${block.alias('component')} = this._svelte.component;`}
+		${declarations}
+		[✂${attribute.expression.start}-${attribute.expression.end}✂];
+	`;
+
+	if (isCustomEvent) {
+		block.addVariable(handlerName);
+
+		block.builders.hydrate.addBlock(deindent`
+			${handlerName} = @template.events.${name}.call( #component, ${state.parentNode}, function ( event ) {
+				${handlerBody}
+			});
+		`);
+
+		block.builders.destroy.addLine(deindent`
+			${handlerName}.teardown();
+		`);
+	} else {
+		const handler = deindent`
+			function ${handlerName} ( event ) {
+				${handlerBody}
+			}
+		`;
+
+		if (shouldHoist) {
+			generator.blocks.push(
+				<Block>{
+					render: () => handler,
+				}
+			);
+		} else {
+			block.builders.init.addBlock(handler);
+		}
+
+		block.builders.hydrate.addLine(
+			`@addListener( ${state.parentNode}, '${name}', ${handlerName} );`
+		);
+
+		block.builders.destroy.addLine(
+			`@removeListener( ${state.parentNode}, '${name}', ${handlerName} );`
+		);
+	}
+}
diff --git a/src/generators/dom/visitors/Element/Ref.js b/src/generators/dom/visitors/Element/Ref.js
deleted file mode 100644
index 4e40746c62..0000000000
--- a/src/generators/dom/visitors/Element/Ref.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import deindent from '../../../../utils/deindent.js';
-
-export default function visitRef ( generator, block, state, node, attribute ) {
-	const name = attribute.name;
-
-	block.builders.create.addLine(
-		`${block.component}.refs.${name} = ${state.parentNode};`
-	);
-
-	block.builders.destroy.addLine( deindent`
-		if ( ${block.component}.refs.${name} === ${state.parentNode} ) ${block.component}.refs.${name} = null;
-	` );
-
-	generator.usesRefs = true; // so this component.refs object is created
-}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Element/Ref.ts b/src/generators/dom/visitors/Element/Ref.ts
new file mode 100644
index 0000000000..54af267ef6
--- /dev/null
+++ b/src/generators/dom/visitors/Element/Ref.ts
@@ -0,0 +1,25 @@
+import deindent from '../../../../utils/deindent';
+import { DomGenerator } from '../../index';
+import Block from '../../Block';
+import { Node } from '../../../../interfaces';
+import { State } from '../../interfaces';
+
+export default function visitRef(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node,
+	attribute: Node
+) {
+	const name = attribute.name;
+
+	block.builders.mount.addLine(
+		`#component.refs.${name} = ${state.parentNode};`
+	);
+
+	block.builders.unmount.addLine(deindent`
+		if ( #component.refs.${name} === ${state.parentNode} ) #component.refs.${name} = null;
+	`);
+
+	generator.usesRefs = true; // so this component.refs object is created
+}
diff --git a/src/generators/dom/visitors/Element/addTransitions.ts b/src/generators/dom/visitors/Element/addTransitions.ts
new file mode 100644
index 0000000000..b533ef8536
--- /dev/null
+++ b/src/generators/dom/visitors/Element/addTransitions.ts
@@ -0,0 +1,89 @@
+import deindent from '../../../../utils/deindent';
+import { DomGenerator } from '../../index';
+import Block from '../../Block';
+import { Node } from '../../../../interfaces';
+import { State } from '../../interfaces';
+
+export default function addTransitions(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node,
+	intro,
+	outro
+) {
+	if (intro === outro) {
+		const name = block.getUniqueName(`${state.name}_transition`);
+		const snippet = intro.expression
+			? block.contextualise(intro.expression).snippet
+			: '{}';
+
+		block.addVariable(name);
+
+		const fn = `@template.transitions.${intro.name}`;
+
+		block.builders.intro.addBlock(deindent`
+			#component._renderHooks.push( function () {
+				if ( !${name} ) ${name} = @wrapTransition( ${state.name}, ${fn}, ${snippet}, true, null );
+				${name}.run( true, function () {
+					#component.fire( 'intro.end', { node: ${state.name} });
+				});
+			});
+		`);
+
+		block.builders.outro.addBlock(deindent`
+			${name}.run( false, function () {
+				#component.fire( 'outro.end', { node: ${state.name} });
+				if ( --#outros === 0 ) #outrocallback();
+				${name} = null;
+			});
+		`);
+	} else {
+		const introName = intro && block.getUniqueName(`${state.name}_intro`);
+		const outroName = outro && block.getUniqueName(`${state.name}_outro`);
+
+		if (intro) {
+			block.addVariable(introName);
+			const snippet = intro.expression
+				? block.contextualise(intro.expression).snippet
+				: '{}';
+
+			const fn = `@template.transitions.${intro.name}`; // TODO add built-in transitions?
+
+			if (outro) {
+				block.builders.intro.addBlock(deindent`
+					if ( ${introName} ) ${introName}.abort();
+					if ( ${outroName} ) ${outroName}.abort();
+				`);
+			}
+
+			block.builders.intro.addBlock(deindent`
+				#component._renderHooks.push( function () {
+					${introName} = @wrapTransition( ${state.name}, ${fn}, ${snippet}, true, null );
+					${introName}.run( true, function () {
+						#component.fire( 'intro.end', { node: ${state.name} });
+					});
+				});
+			`);
+		}
+
+		if (outro) {
+			block.addVariable(outroName);
+			const snippet = outro.expression
+				? block.contextualise(outro.expression).snippet
+				: '{}';
+
+			const fn = `@template.transitions.${outro.name}`;
+
+			// TODO hide elements that have outro'd (unless they belong to a still-outroing
+			// group) prior to their removal from the DOM
+			block.builders.outro.addBlock(deindent`
+				${outroName} = @wrapTransition( ${state.name}, ${fn}, ${snippet}, false, null );
+				${outroName}.run( false, function () {
+					#component.fire( 'outro.end', { node: ${state.name} });
+					if ( --#outros === 0 ) #outrocallback();
+				});
+			`);
+		}
+	}
+}
diff --git a/src/generators/dom/visitors/Element/getStaticAttributeValue.js b/src/generators/dom/visitors/Element/getStaticAttributeValue.js
deleted file mode 100644
index 20e5183956..0000000000
--- a/src/generators/dom/visitors/Element/getStaticAttributeValue.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export default function getStaticAttributeValue ( node, name ) {
-	const attribute = node.attributes.find( attr => attr.name.toLowerCase() === name );
-	if ( !attribute ) return null;
-
-	if ( attribute.value.length !== 1 || attribute.value[0].type !== 'Text' ) {
-		// TODO catch this in validation phase, give a more useful error (with location etc)
-		throw new Error( `'${name} must be a static attribute` );
-	}
-
-	return attribute.value[0].data;
-}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Element/getStaticAttributeValue.ts b/src/generators/dom/visitors/Element/getStaticAttributeValue.ts
new file mode 100644
index 0000000000..490a243516
--- /dev/null
+++ b/src/generators/dom/visitors/Element/getStaticAttributeValue.ts
@@ -0,0 +1,15 @@
+import { Node } from '../../../../interfaces';
+
+export default function getStaticAttributeValue(node: Node, name: string) {
+	const attribute = node.attributes.find(
+		(attr: Node) => attr.name.toLowerCase() === name
+	);
+	if (!attribute) return null;
+
+	if (attribute.value.length !== 1 || attribute.value[0].type !== 'Text') {
+		// TODO catch this in validation phase, give a more useful error (with location etc)
+		throw new Error(`'${name}' must be a static attribute`);
+	}
+
+	return attribute.value[0].data;
+}
diff --git a/src/generators/dom/visitors/Element/lookup.js b/src/generators/dom/visitors/Element/lookup.js
deleted file mode 100644
index 41fc249e61..0000000000
--- a/src/generators/dom/visitors/Element/lookup.js
+++ /dev/null
@@ -1,122 +0,0 @@
-// source: https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes
-const lookup = {
-	accept: { appliesTo: [ 'form', 'input' ] },
-	'accept-charset': { propertyName: 'acceptCharset', appliesTo: [ 'form' ] },
-	accesskey: { propertyName: 'accessKey' },
-	action: { appliesTo: [ 'form' ] },
-	align: { appliesTo: [ 'applet', 'caption', 'col', 'colgroup', 'hr', 'iframe', 'img', 'table', 'tbody', 'td', 'tfoot' , 'th', 'thead', 'tr' ] },
-	allowfullscreen: { propertyName: 'allowFullscreen', appliesTo: [ 'iframe' ] },
-	alt: { appliesTo: [ 'applet', 'area', 'img', 'input' ] },
-	async: { appliesTo: [ 'script' ] },
-	autocomplete: { appliesTo: [ 'form', 'input' ] },
-	autofocus: { appliesTo: [ 'button', 'input', 'keygen', 'select', 'textarea' ] },
-	autoplay: { appliesTo: [ 'audio', 'video' ] },
-	autosave: { appliesTo: [ 'input' ] },
-	bgcolor: { propertyName: 'bgColor', appliesTo: [ 'body', 'col', 'colgroup', 'marquee', 'table', 'tbody', 'tfoot', 'td', 'th', 'tr' ] },
-	border: { appliesTo: [ 'img', 'object', 'table' ] },
-	buffered: { appliesTo: [ 'audio', 'video' ] },
-	challenge: { appliesTo: [ 'keygen' ] },
-	charset: { appliesTo: [ 'meta', 'script' ] },
-	checked: { appliesTo: [ 'command', 'input' ] },
-	cite: { appliesTo: [ 'blockquote', 'del', 'ins', 'q' ] },
-	class: { propertyName: 'className' },
-	code: { appliesTo: [ 'applet' ] },
-	codebase: { propertyName: 'codeBase', appliesTo: [ 'applet' ] },
-	color: { appliesTo: [ 'basefont', 'font', 'hr' ] },
-	cols: { appliesTo: [ 'textarea' ] },
-	colspan: { propertyName: 'colSpan', appliesTo: [ 'td', 'th' ] },
-	content: { appliesTo: [ 'meta' ] },
-	contenteditable: { propertyName: 'contentEditable' },
-	contextmenu: {},
-	controls: { appliesTo: [ 'audio', 'video' ] },
-	coords: { appliesTo: [ 'area' ] },
-	data: { appliesTo: [ 'object' ] },
-	datetime: { propertyName: 'dateTime', appliesTo: [ 'del', 'ins', 'time' ] },
-	default: { appliesTo: [ 'track' ] },
-	defer: { appliesTo: [ 'script' ] },
-	dir: {},
-	dirname: { propertyName: 'dirName', appliesTo: [ 'input', 'textarea' ] },
-	disabled: { appliesTo: [ 'button', 'command', 'fieldset', 'input', 'keygen', 'optgroup', 'option', 'select', 'textarea' ] },
-	download: { appliesTo: [ 'a', 'area' ] },
-	draggable: {},
-	dropzone: {},
-	enctype: { appliesTo: [ 'form' ] },
-	for: { propertyName: 'htmlFor', appliesTo: [ 'label', 'output' ] },
-	form: { appliesTo: [ 'button', 'fieldset', 'input', 'keygen', 'label', 'meter', 'object', 'output', 'progress', 'select', 'textarea' ] },
-	formaction: { appliesTo: [ 'input', 'button' ] },
-	headers: { appliesTo: [ 'td', 'th' ] },
-	height: { appliesTo: [ 'canvas', 'embed', 'iframe', 'img', 'input', 'object', 'video' ] },
-	hidden: {},
-	high: { appliesTo: [ 'meter' ] },
-	href: { appliesTo: [ 'a', 'area', 'base', 'link' ] },
-	hreflang: { appliesTo: [ 'a', 'area', 'link' ] },
-	'http-equiv': { propertyName: 'httpEquiv', appliesTo: [ 'meta' ] },
-	icon: { appliesTo: [ 'command' ] },
-	id: {},
-	ismap: { propertyName: 'isMap', appliesTo: [ 'img' ] },
-	itemprop: {},
-	keytype: { appliesTo: [ 'keygen' ] },
-	kind: { appliesTo: [ 'track' ] },
-	label: { appliesTo: [ 'track' ] },
-	lang: {},
-	language: { appliesTo: [ 'script' ] },
-	loop: { appliesTo: [ 'audio', 'bgsound', 'marquee', 'video' ] },
-	low: { appliesTo: [ 'meter' ] },
-	manifest: { appliesTo: [ 'html' ] },
-	max: { appliesTo: [ 'input', 'meter', 'progress' ] },
-	maxlength: { propertyName: 'maxLength', appliesTo: [ 'input', 'textarea' ] },
-	media: { appliesTo: [ 'a', 'area', 'link', 'source', 'style' ] },
-	method: { appliesTo: [ 'form' ] },
-	min: { appliesTo: [ 'input', 'meter' ] },
-	multiple: { appliesTo: [ 'input', 'select' ] },
-	muted: { appliesTo: [ 'video' ] },
-	name: { appliesTo: [ 'button', 'form', 'fieldset', 'iframe', 'input', 'keygen', 'object', 'output', 'select', 'textarea', 'map', 'meta', 'param' ] },
-	novalidate: { propertyName: 'noValidate', appliesTo: [ 'form' ] },
-	open: { appliesTo: [ 'details' ] },
-	optimum: { appliesTo: [ 'meter' ] },
-	pattern: { appliesTo: [ 'input' ] },
-	ping: { appliesTo: [ 'a', 'area' ] },
-	placeholder: { appliesTo: [ 'input', 'textarea' ] },
-	poster: { appliesTo: [ 'video' ] },
-	preload: { appliesTo: [ 'audio', 'video' ] },
-	radiogroup: { appliesTo: [ 'command' ] },
-	readonly: { propertyName: 'readOnly', appliesTo: [ 'input', 'textarea' ] },
-	rel: { appliesTo: [ 'a', 'area', 'link' ] },
-	required: { appliesTo: [ 'input', 'select', 'textarea' ] },
-	reversed: { appliesTo: [ 'ol' ] },
-	rows: { appliesTo: [ 'textarea' ] },
-	rowspan: { propertyName: 'rowSpan', appliesTo: [ 'td', 'th' ] },
-	sandbox: { appliesTo: [ 'iframe' ] },
-	scope: { appliesTo: [ 'th' ] },
-	scoped: { appliesTo: [ 'style' ] },
-	seamless: { appliesTo: [ 'iframe' ] },
-	selected: { appliesTo: [ 'option' ] },
-	shape: { appliesTo: [ 'a', 'area' ] },
-	size: { appliesTo: [ 'input', 'select' ] },
-	sizes: { appliesTo: [ 'link', 'img', 'source' ] },
-	span: { appliesTo: [ 'col', 'colgroup' ] },
-	spellcheck: {},
-	src: { appliesTo: [ 'audio', 'embed', 'iframe', 'img', 'input', 'script', 'source', 'track', 'video' ] },
-	srcdoc: { appliesTo: [ 'iframe' ] },
-	srclang: { appliesTo: [ 'track' ] },
-	srcset: { appliesTo: [ 'img' ] },
-	start: { appliesTo: [ 'ol' ] },
-	step: { appliesTo: [ 'input' ] },
-	style: { propertyName: 'style.cssText' },
-	summary: { appliesTo: [ 'table' ] },
-	tabindex: { propertyName: 'tabIndex' },
-	target: { appliesTo: [ 'a', 'area', 'base', 'form' ] },
-	title: {},
-	type: { appliesTo: [ 'button', 'input', 'command', 'embed', 'object', 'script', 'source', 'style', 'menu' ] },
-	usemap: { propertyName: 'useMap', appliesTo: [ 'img', 'input', 'object' ] },
-	value: { appliesTo: [ 'button', 'option', 'input', 'li', 'meter', 'progress', 'param', 'select' ] },
-	width: { appliesTo: [ 'canvas', 'embed', 'iframe', 'img', 'input', 'object', 'video' ] },
-	wrap: { appliesTo: [ 'textarea' ] }
-};
-
-Object.keys( lookup ).forEach( name => {
-	const metadata = lookup[ name ];
-	if ( !metadata.propertyName ) metadata.propertyName = name;
-});
-
-export default lookup;
diff --git a/src/generators/dom/visitors/Element/lookup.ts b/src/generators/dom/visitors/Element/lookup.ts
new file mode 100644
index 0000000000..cfa7543eaa
--- /dev/null
+++ b/src/generators/dom/visitors/Element/lookup.ts
@@ -0,0 +1,235 @@
+// source: https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes
+const lookup = {
+	accept: { appliesTo: ['form', 'input'] },
+	'accept-charset': { propertyName: 'acceptCharset', appliesTo: ['form'] },
+	accesskey: { propertyName: 'accessKey' },
+	action: { appliesTo: ['form'] },
+	align: {
+		appliesTo: [
+			'applet',
+			'caption',
+			'col',
+			'colgroup',
+			'hr',
+			'iframe',
+			'img',
+			'table',
+			'tbody',
+			'td',
+			'tfoot',
+			'th',
+			'thead',
+			'tr',
+		],
+	},
+	allowfullscreen: { propertyName: 'allowFullscreen', appliesTo: ['iframe'] },
+	alt: { appliesTo: ['applet', 'area', 'img', 'input'] },
+	async: { appliesTo: ['script'] },
+	autocomplete: { appliesTo: ['form', 'input'] },
+	autofocus: { appliesTo: ['button', 'input', 'keygen', 'select', 'textarea'] },
+	autoplay: { appliesTo: ['audio', 'video'] },
+	autosave: { appliesTo: ['input'] },
+	bgcolor: {
+		propertyName: 'bgColor',
+		appliesTo: [
+			'body',
+			'col',
+			'colgroup',
+			'marquee',
+			'table',
+			'tbody',
+			'tfoot',
+			'td',
+			'th',
+			'tr',
+		],
+	},
+	border: { appliesTo: ['img', 'object', 'table'] },
+	buffered: { appliesTo: ['audio', 'video'] },
+	challenge: { appliesTo: ['keygen'] },
+	charset: { appliesTo: ['meta', 'script'] },
+	checked: { appliesTo: ['command', 'input'] },
+	cite: { appliesTo: ['blockquote', 'del', 'ins', 'q'] },
+	class: { propertyName: 'className' },
+	code: { appliesTo: ['applet'] },
+	codebase: { propertyName: 'codeBase', appliesTo: ['applet'] },
+	color: { appliesTo: ['basefont', 'font', 'hr'] },
+	cols: { appliesTo: ['textarea'] },
+	colspan: { propertyName: 'colSpan', appliesTo: ['td', 'th'] },
+	content: { appliesTo: ['meta'] },
+	contenteditable: { propertyName: 'contentEditable' },
+	contextmenu: {},
+	controls: { appliesTo: ['audio', 'video'] },
+	coords: { appliesTo: ['area'] },
+	data: { appliesTo: ['object'] },
+	datetime: { propertyName: 'dateTime', appliesTo: ['del', 'ins', 'time'] },
+	default: { appliesTo: ['track'] },
+	defer: { appliesTo: ['script'] },
+	dir: {},
+	dirname: { propertyName: 'dirName', appliesTo: ['input', 'textarea'] },
+	disabled: {
+		appliesTo: [
+			'button',
+			'command',
+			'fieldset',
+			'input',
+			'keygen',
+			'optgroup',
+			'option',
+			'select',
+			'textarea',
+		],
+	},
+	download: { appliesTo: ['a', 'area'] },
+	draggable: {},
+	dropzone: {},
+	enctype: { appliesTo: ['form'] },
+	for: { propertyName: 'htmlFor', appliesTo: ['label', 'output'] },
+	form: {
+		appliesTo: [
+			'button',
+			'fieldset',
+			'input',
+			'keygen',
+			'label',
+			'meter',
+			'object',
+			'output',
+			'progress',
+			'select',
+			'textarea',
+		],
+	},
+	formaction: { appliesTo: ['input', 'button'] },
+	headers: { appliesTo: ['td', 'th'] },
+	height: {
+		appliesTo: ['canvas', 'embed', 'iframe', 'img', 'input', 'object', 'video'],
+	},
+	hidden: {},
+	high: { appliesTo: ['meter'] },
+	href: { appliesTo: ['a', 'area', 'base', 'link'] },
+	hreflang: { appliesTo: ['a', 'area', 'link'] },
+	'http-equiv': { propertyName: 'httpEquiv', appliesTo: ['meta'] },
+	icon: { appliesTo: ['command'] },
+	id: {},
+	ismap: { propertyName: 'isMap', appliesTo: ['img'] },
+	itemprop: {},
+	keytype: { appliesTo: ['keygen'] },
+	kind: { appliesTo: ['track'] },
+	label: { appliesTo: ['track'] },
+	lang: {},
+	language: { appliesTo: ['script'] },
+	loop: { appliesTo: ['audio', 'bgsound', 'marquee', 'video'] },
+	low: { appliesTo: ['meter'] },
+	manifest: { appliesTo: ['html'] },
+	max: { appliesTo: ['input', 'meter', 'progress'] },
+	maxlength: { propertyName: 'maxLength', appliesTo: ['input', 'textarea'] },
+	media: { appliesTo: ['a', 'area', 'link', 'source', 'style'] },
+	method: { appliesTo: ['form'] },
+	min: { appliesTo: ['input', 'meter'] },
+	multiple: { appliesTo: ['input', 'select'] },
+	muted: { appliesTo: ['video'] },
+	name: {
+		appliesTo: [
+			'button',
+			'form',
+			'fieldset',
+			'iframe',
+			'input',
+			'keygen',
+			'object',
+			'output',
+			'select',
+			'textarea',
+			'map',
+			'meta',
+			'param',
+		],
+	},
+	novalidate: { propertyName: 'noValidate', appliesTo: ['form'] },
+	open: { appliesTo: ['details'] },
+	optimum: { appliesTo: ['meter'] },
+	pattern: { appliesTo: ['input'] },
+	ping: { appliesTo: ['a', 'area'] },
+	placeholder: { appliesTo: ['input', 'textarea'] },
+	poster: { appliesTo: ['video'] },
+	preload: { appliesTo: ['audio', 'video'] },
+	radiogroup: { appliesTo: ['command'] },
+	readonly: { propertyName: 'readOnly', appliesTo: ['input', 'textarea'] },
+	rel: { appliesTo: ['a', 'area', 'link'] },
+	required: { appliesTo: ['input', 'select', 'textarea'] },
+	reversed: { appliesTo: ['ol'] },
+	rows: { appliesTo: ['textarea'] },
+	rowspan: { propertyName: 'rowSpan', appliesTo: ['td', 'th'] },
+	sandbox: { appliesTo: ['iframe'] },
+	scope: { appliesTo: ['th'] },
+	scoped: { appliesTo: ['style'] },
+	seamless: { appliesTo: ['iframe'] },
+	selected: { appliesTo: ['option'] },
+	shape: { appliesTo: ['a', 'area'] },
+	size: { appliesTo: ['input', 'select'] },
+	sizes: { appliesTo: ['link', 'img', 'source'] },
+	span: { appliesTo: ['col', 'colgroup'] },
+	spellcheck: {},
+	src: {
+		appliesTo: [
+			'audio',
+			'embed',
+			'iframe',
+			'img',
+			'input',
+			'script',
+			'source',
+			'track',
+			'video',
+		],
+	},
+	srcdoc: { appliesTo: ['iframe'] },
+	srclang: { appliesTo: ['track'] },
+	srcset: { appliesTo: ['img'] },
+	start: { appliesTo: ['ol'] },
+	step: { appliesTo: ['input'] },
+	style: { propertyName: 'style.cssText' },
+	summary: { appliesTo: ['table'] },
+	tabindex: { propertyName: 'tabIndex' },
+	target: { appliesTo: ['a', 'area', 'base', 'form'] },
+	title: {},
+	type: {
+		appliesTo: [
+			'button',
+			'input',
+			'command',
+			'embed',
+			'object',
+			'script',
+			'source',
+			'style',
+			'menu',
+		],
+	},
+	usemap: { propertyName: 'useMap', appliesTo: ['img', 'input', 'object'] },
+	value: {
+		appliesTo: [
+			'button',
+			'option',
+			'input',
+			'li',
+			'meter',
+			'progress',
+			'param',
+			'select',
+			'textarea',
+		],
+	},
+	width: {
+		appliesTo: ['canvas', 'embed', 'iframe', 'img', 'input', 'object', 'video'],
+	},
+	wrap: { appliesTo: ['textarea'] },
+};
+
+Object.keys(lookup).forEach(name => {
+	const metadata = lookup[name];
+	if (!metadata.propertyName) metadata.propertyName = name;
+});
+
+export default lookup;
diff --git a/src/generators/dom/visitors/Element/meta/Window.js b/src/generators/dom/visitors/Element/meta/Window.js
deleted file mode 100644
index c89f11c47c..0000000000
--- a/src/generators/dom/visitors/Element/meta/Window.js
+++ /dev/null
@@ -1,178 +0,0 @@
-import flattenReference from '../../../../../utils/flattenReference.js';
-import deindent from '../../../../../utils/deindent.js';
-import CodeBuilder from '../../../../../utils/CodeBuilder.js';
-
-const associatedEvents = {
-	innerWidth: 'resize',
-	innerHeight: 'resize',
-	outerWidth: 'resize',
-	outerHeight: 'resize',
-
-	scrollX: 'scroll',
-	scrollY: 'scroll'
-};
-
-const readonly = new Set([
-	'innerWidth',
-	'innerHeight',
-	'outerWidth',
-	'outerHeight',
-	'online'
-]);
-
-export default function visitWindow ( generator, block, node ) {
-	const events = {};
-	const bindings = {};
-
-	node.attributes.forEach( attribute => {
-		if ( attribute.type === 'EventHandler' ) {
-			// TODO verify that it's a valid callee (i.e. built-in or declared method)
-			generator.addSourcemapLocations( attribute.expression );
-
-			let usesState = false;
-
-			attribute.expression.arguments.forEach( arg => {
-				const { contexts } = block.contextualise( arg, null, true );
-				if ( contexts.length ) usesState = true;
-			});
-
-			const flattened = flattenReference( attribute.expression.callee );
-			if ( flattened.name !== 'event' && flattened.name !== 'this' ) {
-				// allow event.stopPropagation(), this.select() etc
-				generator.code.prependRight( attribute.expression.start, `${block.component}.` );
-			}
-
-			const handlerName = block.getUniqueName( `onwindow${attribute.name}` );
-			const handlerBody = ( usesState ? `var state = ${block.component}.get();\n` : '' ) +
-				`[✂${attribute.expression.start}-${attribute.expression.end}✂];`;
-
-			block.builders.create.addBlock( deindent`
-				function ${handlerName} ( event ) {
-					${handlerBody}
-				};
-				window.addEventListener( '${attribute.name}', ${handlerName} );
-			` );
-
-			block.builders.destroy.addBlock( deindent`
-				window.removeEventListener( '${attribute.name}', ${handlerName} );
-			` );
-		}
-
-		if ( attribute.type === 'Binding' ) {
-			if ( attribute.value.type !== 'Identifier' ) {
-				const { parts, keypath } = flattenReference( attribute.value );
-				throw new Error( `Bindings on <:Window/> must be to top-level properties, e.g. '${parts.pop()}' rather than '${keypath}'` );
-			}
-
-			// in dev mode, throw if read-only values are written to
-			if ( readonly.has( attribute.name ) ) {
-				generator.readonly.add( attribute.value.name );
-			}
-
-			bindings[ attribute.name ] = attribute.value.name;
-
-			// bind:online is a special case, we need to listen for two separate events
-			if ( attribute.name === 'online' ) return;
-
-			const associatedEvent = associatedEvents[ attribute.name ];
-
-			if ( !associatedEvent ) {
-				throw new Error( `Cannot bind to ${attribute.name} on <:Window>` );
-			}
-
-			if ( !events[ associatedEvent ] ) events[ associatedEvent ] = [];
-			events[ associatedEvent ].push( `${attribute.value.name}: this.${attribute.name}` );
-
-			// add initial value
-			generator.builders.metaBindings.addLine(
-				`this._state.${attribute.value.name} = window.${attribute.name};`
-			);
-		}
-	});
-
-	const lock = block.getUniqueName( `window_updating` );
-
-	Object.keys( events ).forEach( event => {
-		const handlerName = block.getUniqueName( `onwindow${event}` );
-		const props = events[ event ].join( ',\n' );
-
-		const handlerBody = new CodeBuilder();
-		if ( event === 'scroll' ) { // TODO other bidirectional bindings...
-			block.addVariable( lock, 'false' );
-			handlerBody.addLine( `${lock} = true;` );
-		}
-
-		if ( generator.options.dev ) handlerBody.addLine( `component._updatingReadonlyProperty = true;` );
-
-		handlerBody.addBlock( deindent`
-			${block.component}.set({
-				${props}
-			});
-		` );
-
-		if ( generator.options.dev ) handlerBody.addLine( `component._updatingReadonlyProperty = false;` );
-
-		if ( event === 'scroll' ) {
-			handlerBody.addLine( `${lock} = false;` );
-		}
-
-		block.builders.create.addBlock( deindent`
-			function ${handlerName} ( event ) {
-				${handlerBody}
-			};
-			window.addEventListener( '${event}', ${handlerName} );
-		` );
-
-		block.builders.destroy.addBlock( deindent`
-			window.removeEventListener( '${event}', ${handlerName} );
-		` );
-	});
-
-	// special case... might need to abstract this out if we add more special cases
-	if ( bindings.scrollX && bindings.scrollY ) {
-		const observerCallback = block.getUniqueName( `scrollobserver` );
-
-		block.builders.create.addBlock( deindent`
-			function ${observerCallback} () {
-				if ( ${lock} ) return;
-				var x = ${bindings.scrollX ? `${block.component}.get( '${bindings.scrollX}' )` : `window.scrollX`};
-				var y = ${bindings.scrollY ? `${block.component}.get( '${bindings.scrollY}' )` : `window.scrollY`};
-				window.scrollTo( x, y );
-			};
-		` );
-
-		if ( bindings.scrollX ) block.builders.create.addLine( `${block.component}.observe( '${bindings.scrollX}', ${observerCallback} );` );
-		if ( bindings.scrollY ) block.builders.create.addLine( `${block.component}.observe( '${bindings.scrollY}', ${observerCallback} );` );
-	} else if ( bindings.scrollX || bindings.scrollY ) {
-		const isX = !!bindings.scrollX;
-
-		block.builders.create.addBlock( deindent`
-			${block.component}.observe( '${bindings.scrollX || bindings.scrollY}', function ( ${isX ? 'x' : 'y'} ) {
-				if ( ${lock} ) return;
-				window.scrollTo( ${isX ? 'x, window.scrollY' : 'window.scrollX, y' } );
-			});
-		` );
-	}
-
-	// another special case. (I'm starting to think these are all special cases.)
-	if ( bindings.online ) {
-		const handlerName = block.getUniqueName( `onlinestatuschanged` );
-		block.builders.create.addBlock( deindent`
-			function ${handlerName} ( event ) {
-				${block.component}.set({ ${bindings.online}: navigator.onLine });
-			};
-			window.addEventListener( 'online', ${handlerName} );
-			window.addEventListener( 'offline', ${handlerName} );
-		` );
-
-		// add initial value
-		generator.builders.metaBindings.addLine(
-			`this._state.${bindings.online} = navigator.onLine;`
-		);
-
-		block.builders.destroy.addBlock( deindent`
-			window.removeEventListener( 'online', ${handlerName} );
-			window.removeEventListener( 'offline', ${handlerName} );
-		` );
-	}
-}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Element/meta/Window.ts b/src/generators/dom/visitors/Element/meta/Window.ts
new file mode 100644
index 0000000000..d6c848c342
--- /dev/null
+++ b/src/generators/dom/visitors/Element/meta/Window.ts
@@ -0,0 +1,194 @@
+import flattenReference from '../../../../../utils/flattenReference';
+import deindent from '../../../../../utils/deindent';
+import { DomGenerator } from '../../../index';
+import Block from '../../../Block';
+import { Node } from '../../../../../interfaces';
+
+const associatedEvents = {
+	innerWidth: 'resize',
+	innerHeight: 'resize',
+	outerWidth: 'resize',
+	outerHeight: 'resize',
+
+	scrollX: 'scroll',
+	scrollY: 'scroll',
+};
+
+const readonly = new Set([
+	'innerWidth',
+	'innerHeight',
+	'outerWidth',
+	'outerHeight',
+	'online',
+]);
+
+export default function visitWindow(
+	generator: DomGenerator,
+	block: Block,
+	node: Node
+) {
+	const events = {};
+	const bindings = {};
+
+	node.attributes.forEach((attribute: Node) => {
+		if (attribute.type === 'EventHandler') {
+			// TODO verify that it's a valid callee (i.e. built-in or declared method)
+			generator.addSourcemapLocations(attribute.expression);
+
+			let usesState = false;
+
+			attribute.expression.arguments.forEach((arg: Node) => {
+				const { contexts } = block.contextualise(arg, null, true);
+				if (contexts.length) usesState = true;
+			});
+
+			const flattened = flattenReference(attribute.expression.callee);
+			if (flattened.name !== 'event' && flattened.name !== 'this') {
+				// allow event.stopPropagation(), this.select() etc
+				generator.code.prependRight(
+					attribute.expression.start,
+					`${block.alias('component')}.`
+				);
+			}
+
+			const handlerName = block.getUniqueName(`onwindow${attribute.name}`);
+			const handlerBody = deindent`
+				${usesState && `var state = #component.get();`}
+				[✂${attribute.expression.start}-${attribute.expression.end}✂];
+			`;
+
+			block.builders.init.addBlock(deindent`
+				function ${handlerName} ( event ) {
+					${handlerBody}
+				};
+				window.addEventListener( '${attribute.name}', ${handlerName} );
+			`);
+
+			block.builders.destroy.addBlock(deindent`
+				window.removeEventListener( '${attribute.name}', ${handlerName} );
+			`);
+		}
+
+		if (attribute.type === 'Binding') {
+			// in dev mode, throw if read-only values are written to
+			if (readonly.has(attribute.name)) {
+				generator.readonly.add(attribute.value.name);
+			}
+
+			bindings[attribute.name] = attribute.value.name;
+
+			// bind:online is a special case, we need to listen for two separate events
+			if (attribute.name === 'online') return;
+
+			const associatedEvent = associatedEvents[attribute.name];
+
+			if (!associatedEvent) {
+				throw new Error(`Cannot bind to ${attribute.name} on <:Window>`);
+			}
+
+			if (!events[associatedEvent]) events[associatedEvent] = [];
+			events[associatedEvent].push(
+				`${attribute.value.name}: this.${attribute.name}`
+			);
+
+			// add initial value
+			generator.metaBindings.push(
+				`this._state.${attribute.value.name} = window.${attribute.name};`
+			);
+		}
+	});
+
+	const lock = block.getUniqueName(`window_updating`);
+
+	Object.keys(events).forEach(event => {
+		const handlerName = block.getUniqueName(`onwindow${event}`);
+		const props = events[event].join(',\n');
+
+		if (event === 'scroll') {
+			// TODO other bidirectional bindings...
+			block.addVariable(lock, 'false');
+		}
+
+		const handlerBody = deindent`
+			${event === 'scroll' && `${lock} = true;`}
+			${generator.options.dev && `component._updatingReadonlyProperty = true;`}
+
+			#component.set({
+				${props}
+			});
+
+			${generator.options.dev && `component._updatingReadonlyProperty = false;`}
+			${event === 'scroll' && `${lock} = false;`}
+		`;
+
+		block.builders.init.addBlock(deindent`
+			function ${handlerName} ( event ) {
+				${handlerBody}
+			};
+			window.addEventListener( '${event}', ${handlerName} );
+		`);
+
+		block.builders.destroy.addBlock(deindent`
+			window.removeEventListener( '${event}', ${handlerName} );
+		`);
+	});
+
+	// special case... might need to abstract this out if we add more special cases
+	if (bindings.scrollX && bindings.scrollY) {
+		const observerCallback = block.getUniqueName(`scrollobserver`);
+
+		block.builders.init.addBlock(deindent`
+			function ${observerCallback} () {
+				if ( ${lock} ) return;
+				var x = ${bindings.scrollX
+					? `#component.get( '${bindings.scrollX}' )`
+					: `window.scrollX`};
+				var y = ${bindings.scrollY
+					? `#component.get( '${bindings.scrollY}' )`
+					: `window.scrollY`};
+				window.scrollTo( x, y );
+			};
+		`);
+
+		if (bindings.scrollX)
+			block.builders.init.addLine(
+				`#component.observe( '${bindings.scrollX}', ${observerCallback} );`
+			);
+		if (bindings.scrollY)
+			block.builders.init.addLine(
+				`#component.observe( '${bindings.scrollY}', ${observerCallback} );`
+			);
+	} else if (bindings.scrollX || bindings.scrollY) {
+		const isX = !!bindings.scrollX;
+
+		block.builders.init.addBlock(deindent`
+			#component.observe( '${bindings.scrollX ||
+				bindings.scrollY}', function ( ${isX ? 'x' : 'y'} ) {
+				if ( ${lock} ) return;
+				window.scrollTo( ${isX ? 'x, window.scrollY' : 'window.scrollX, y'} );
+			});
+		`);
+	}
+
+	// another special case. (I'm starting to think these are all special cases.)
+	if (bindings.online) {
+		const handlerName = block.getUniqueName(`onlinestatuschanged`);
+		block.builders.init.addBlock(deindent`
+			function ${handlerName} ( event ) {
+				#component.set({ ${bindings.online}: navigator.onLine });
+			};
+			window.addEventListener( 'online', ${handlerName} );
+			window.addEventListener( 'offline', ${handlerName} );
+		`);
+
+		// add initial value
+		generator.metaBindings.push(
+			`this._state.${bindings.online} = navigator.onLine;`
+		);
+
+		block.builders.destroy.addBlock(deindent`
+			window.removeEventListener( 'online', ${handlerName} );
+			window.removeEventListener( 'offline', ${handlerName} );
+		`);
+	}
+}
diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js
deleted file mode 100644
index 1f1800b536..0000000000
--- a/src/generators/dom/visitors/IfBlock.js
+++ /dev/null
@@ -1,153 +0,0 @@
-import deindent from '../../../utils/deindent.js';
-import visit from '../visit.js';
-
-function isElseIf ( node ) {
-	return node && node.children.length === 1 && node.children[0].type === 'IfBlock';
-}
-
-function getBranches ( generator, block, state, node ) {
-	const branches = [{
-		condition: block.contextualise( node.expression ).snippet,
-		block: node._block.name,
-		dynamic: node._block.dependencies.size > 0
-	}];
-
-	visitChildren( generator, block, state, node );
-
-	if ( isElseIf( node.else ) ) {
-		branches.push(
-			...getBranches( generator, block, state, node.else.children[0] )
-		);
-	} else {
-		branches.push({
-			condition: null,
-			block: node.else ? node.else._block.name : null,
-			dynamic: node.else ? node.else._block.dependencies.size > 0 : false
-		});
-
-		if ( node.else ) {
-			visitChildren( generator, block, state, node.else );
-		}
-	}
-
-	return branches;
-}
-
-function visitChildren ( generator, block, state, node ) {
-	const childState = Object.assign( {}, state, {
-		parentNode: null
-	});
-
-	node.children.forEach( child => {
-		visit( generator, node._block, childState, child );
-	});
-}
-
-export default function visitIfBlock ( generator, block, state, node ) {
-	const name = generator.getUniqueName( `if_block` );
-	const anchor = generator.getUniqueName( `${name}_anchor` );
-	const params = block.params.join( ', ' );
-
-	const vars = { name, anchor, params };
-
-	block.createAnchor( anchor, state.parentNode );
-
-	const branches = getBranches( generator, block, state, node, generator.getUniqueName( `create_if_block` ) );
-	const dynamic = branches.some( branch => branch.dynamic );
-
-	if ( node.else ) {
-		compound( generator, block, state, node, branches, dynamic, vars );
-	} else {
-		simple( generator, block, state, node, branches[0], dynamic, vars );
-	}
-
-	block.builders.destroy.addLine(
-		`if ( ${name} ) ${name}.destroy( ${state.parentNode ? 'false' : 'detach'} );`
-	);
-}
-
-function simple ( generator, block, state, node, branch, dynamic, { name, anchor, params } ) {
-	block.builders.create.addBlock( deindent`
-		var ${name} = ${branch.condition} && ${branch.block}( ${params}, ${block.component} );
-	` );
-
-	const isToplevel = !state.parentNode;
-
-	if ( isToplevel ) {
-		block.builders.mount.addLine( `if ( ${name} ) ${name}.mount( ${block.target}, ${anchor} );` );
-	} else {
-		block.builders.create.addLine( `if ( ${name} ) ${name}.mount( ${state.parentNode}, ${anchor} );` );
-	}
-
-	if ( dynamic ) {
-		block.builders.update.addBlock( deindent`
-			if ( ${branch.condition} ) {
-				if ( ${name} ) {
-					${name}.update( changed, ${params} );
-				} else {
-					${name} = ${branch.block}( ${params}, ${block.component} );
-					${name}.mount( ${anchor}.parentNode, ${anchor} );
-				}
-			} else if ( ${name} ) {
-				${name}.destroy( true );
-				${name} = null;
-			}
-		` );
-	} else {
-		block.builders.update.addBlock( deindent`
-			if ( ${branch.condition} ) {
-				if ( !${name} ) {
-					${name} = ${branch.block}( ${params}, ${block.component} );
-					${name}.mount( ${anchor}.parentNode, ${anchor} );
-				}
-			} else if ( ${name} ) {
-				${name}.destroy( true );
-				${name} = null;
-			}
-		` );
-	}
-}
-
-function compound ( generator, block, state, node, branches, dynamic, { name, anchor, params } ) {
-	const getBlock = block.getUniqueName( `get_block` );
-	const current_block = block.getUniqueName( `current_block` );
-
-	block.builders.create.addBlock( deindent`
-		function ${getBlock} ( ${params} ) {
-			${branches.map( ({ condition, block }) => {
-				return `${condition ? `if ( ${condition} ) ` : ''}return ${block};`;
-			} ).join( '\n' )}
-		}
-
-		var ${current_block} = ${getBlock}( ${params} );
-		var ${name} = ${current_block} && ${current_block}( ${params}, ${block.component} );
-	` );
-
-	const isToplevel = !state.parentNode;
-
-	if ( isToplevel ) {
-		block.builders.mount.addLine( `if ( ${name} ) ${name}.mount( ${block.target}, ${anchor} );` );
-	} else {
-		block.builders.create.addLine( `if ( ${name} ) ${name}.mount( ${state.parentNode}, ${anchor} );` );
-	}
-
-	if ( dynamic ) {
-		block.builders.update.addBlock( deindent`
-			if ( ${current_block} === ( ${current_block} = ${getBlock}( ${params} ) ) && ${name} ) {
-				${name}.update( changed, ${params} );
-			} else {
-				if ( ${name} ) ${name}.destroy( true );
-				${name} = ${current_block} && ${current_block}( ${params}, ${block.component} );
-				if ( ${name} ) ${name}.mount( ${anchor}.parentNode, ${anchor} );
-			}
-		` );
-	} else {
-		block.builders.update.addBlock( deindent`
-			if ( ${current_block} !== ( ${current_block} = ${getBlock}( ${params} ) ) ) {
-				if ( ${name} ) ${name}.destroy( true );
-				${name} = ${current_block} && ${current_block}( ${params}, ${block.component} );
-				if ( ${name} ) ${name}.mount( ${anchor}.parentNode, ${anchor} );
-			}
-		` );
-	}
-}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/IfBlock.ts b/src/generators/dom/visitors/IfBlock.ts
new file mode 100644
index 0000000000..ddac9800b5
--- /dev/null
+++ b/src/generators/dom/visitors/IfBlock.ts
@@ -0,0 +1,418 @@
+import deindent from '../../../utils/deindent';
+import visit from '../visit';
+import { DomGenerator } from '../index';
+import Block from '../Block';
+import { Node } from '../../../interfaces';
+import { State } from '../interfaces';
+
+function isElseIf(node: Node) {
+	return (
+		node && node.children.length === 1 && node.children[0].type === 'IfBlock'
+	);
+}
+
+function isElseBranch(branch) {
+	return branch.block && !branch.condition;
+}
+
+function getBranches(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node
+) {
+	const branches = [
+		{
+			condition: block.contextualise(node.expression).snippet,
+			block: node._block.name,
+			hasUpdateMethod: node._block.hasUpdateMethod,
+			hasIntroMethod: node._block.hasIntroMethod,
+			hasOutroMethod: node._block.hasOutroMethod,
+		},
+	];
+
+	visitChildren(generator, block, state, node);
+
+	if (isElseIf(node.else)) {
+		branches.push(
+			...getBranches(generator, block, state, node.else.children[0])
+		);
+	} else {
+		branches.push({
+			condition: null,
+			block: node.else ? node.else._block.name : null,
+			hasUpdateMethod: node.else ? node.else._block.hasUpdateMethod : false,
+			hasIntroMethod: node.else ? node.else._block.hasIntroMethod : false,
+			hasOutroMethod: node.else ? node.else._block.hasOutroMethod : false,
+		});
+
+		if (node.else) {
+			visitChildren(generator, block, state, node.else);
+		}
+	}
+
+	return branches;
+}
+
+function visitChildren(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node
+) {
+	node.children.forEach((child: Node) => {
+		visit(generator, node._block, node._state, child);
+	});
+}
+
+export default function visitIfBlock(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node
+) {
+	const name = generator.getUniqueName(`if_block`);
+	const anchor = node.needsAnchor
+		? block.getUniqueName(`${name}_anchor`)
+		: (node.next && node.next._state.name) || 'null';
+	const params = block.params.join(', ');
+
+	const branches = getBranches(generator, block, state, node);
+
+	const hasElse = isElseBranch(branches[branches.length - 1]);
+	const if_name = hasElse ? '' : `if ( ${name} ) `;
+
+	const dynamic = branches[0].hasUpdateMethod; // can use [0] as proxy for all, since they necessarily have the same value
+	const hasOutros = branches[0].hasOutroMethod;
+
+	const vars = { name, anchor, params, if_name, hasElse };
+
+	if (node.else) {
+		if (hasOutros) {
+			compoundWithOutros(
+				generator,
+				block,
+				state,
+				node,
+				branches,
+				dynamic,
+				vars
+			);
+		} else {
+			compound(generator, block, state, node, branches, dynamic, vars);
+		}
+	} else {
+		simple(generator, block, state, node, branches[0], dynamic, vars);
+	}
+
+	block.builders.create.addLine(`${if_name}${name}.create();`);
+
+	block.builders.claim.addLine(
+		`${if_name}${name}.claim( ${state.parentNodes} );`
+	);
+
+	if (node.needsAnchor) {
+		block.addElement(
+			anchor,
+			`@createComment()`,
+			`@createComment()`,
+			state.parentNode,
+			true
+		);
+	} else if (node.next) {
+		node.next.usedAsAnchor = true;
+	}
+}
+
+function simple(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node,
+	branch,
+	dynamic,
+	{ name, anchor, params, if_name }
+) {
+	block.builders.init.addBlock(deindent`
+		var ${name} = (${branch.condition}) && ${branch.block}( ${params}, #component );
+	`);
+
+	const isTopLevel = !state.parentNode;
+	const mountOrIntro = branch.hasIntroMethod ? 'intro' : 'mount';
+	const targetNode = state.parentNode || '#target';
+	const anchorNode = state.parentNode ? 'null' : 'anchor';
+
+	block.builders.mount.addLine(
+		`if ( ${name} ) ${name}.${mountOrIntro}( ${targetNode}, ${anchorNode} );`
+	);
+
+	const parentNode = state.parentNode || `${anchor}.parentNode`;
+
+	const enter = dynamic
+		? branch.hasIntroMethod
+			? deindent`
+				if ( ${name} ) {
+					${name}.update( changed, ${params} );
+				} else {
+					${name} = ${branch.block}( ${params}, #component );
+					if ( ${name} ) ${name}.create();
+				}
+
+				${name}.intro( ${parentNode}, ${anchor} );
+			`
+			: deindent`
+				if ( ${name} ) {
+					${name}.update( changed, ${params} );
+				} else {
+					${name} = ${branch.block}( ${params}, #component );
+					${name}.create();
+					${name}.mount( ${parentNode}, ${anchor} );
+				}
+			`
+		: branch.hasIntroMethod
+			? deindent`
+				if ( !${name} ) {
+					${name} = ${branch.block}( ${params}, #component );
+					${name}.create();
+				}
+				${name}.intro( ${parentNode}, ${anchor} );
+			`
+			: deindent`
+				if ( !${name} ) {
+					${name} = ${branch.block}( ${params}, #component );
+					${name}.create();
+					${name}.mount( ${parentNode}, ${anchor} );
+				}
+			`;
+
+	// no `update()` here — we don't want to update outroing nodes,
+	// as that will typically result in glitching
+	const exit = branch.hasOutroMethod
+		? deindent`
+			${name}.outro( function () {
+				${name}.unmount();
+				${name}.destroy();
+				${name} = null;
+			});
+		`
+		: deindent`
+			${name}.unmount();
+			${name}.destroy();
+			${name} = null;
+		`;
+
+	block.builders.update.addBlock(deindent`
+		if ( ${branch.condition} ) {
+			${enter}
+		} else if ( ${name} ) {
+			${exit}
+		}
+	`);
+
+	block.builders.unmount.addLine(`${if_name}${name}.unmount();`);
+
+	block.builders.destroy.addLine(`${if_name}${name}.destroy();`);
+}
+
+function compound(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node,
+	branches,
+	dynamic,
+	{ name, anchor, params, hasElse, if_name }
+) {
+	const get_block = block.getUniqueName(`get_block`);
+	const current_block = block.getUniqueName(`current_block`);
+	const current_block_and = hasElse ? '' : `${current_block} && `;
+
+	block.builders.init.addBlock(deindent`
+		function ${get_block} ( ${params} ) {
+			${branches
+				.map(({ condition, block }) => {
+					return `${condition ? `if ( ${condition} ) ` : ''}return ${block};`;
+				})
+				.join('\n')}
+		}
+
+		var ${current_block} = ${get_block}( ${params} );
+		var ${name} = ${current_block_and}${current_block}( ${params}, #component );
+	`);
+
+	const isTopLevel = !state.parentNode;
+	const mountOrIntro = branches[0].hasIntroMethod ? 'intro' : 'mount';
+
+	const targetNode = state.parentNode || '#target';
+	const anchorNode = state.parentNode ? 'null' : 'anchor';
+	block.builders.mount.addLine(
+		`${if_name}${name}.${mountOrIntro}( ${targetNode}, ${anchorNode} );`
+	);
+
+	const parentNode = state.parentNode || `${anchor}.parentNode`;
+
+	const changeBlock = deindent`
+		${hasElse
+			? deindent`
+				${name}.unmount();
+				${name}.destroy();
+			`
+			: deindent`
+				if ( ${name} ) {
+					${name}.unmount();
+					${name}.destroy();
+				}`}
+		${name} = ${current_block_and}${current_block}( ${params}, #component );
+		${if_name}${name}.create();
+		${if_name}${name}.${mountOrIntro}( ${parentNode}, ${anchor} );
+	`;
+
+	if (dynamic) {
+		block.builders.update.addBlock(deindent`
+			if ( ${current_block} === ( ${current_block} = ${get_block}( ${params} ) ) && ${name} ) {
+				${name}.update( changed, ${params} );
+			} else {
+				${changeBlock}
+			}
+		`);
+	} else {
+		block.builders.update.addBlock(deindent`
+			if ( ${current_block} !== ( ${current_block} = ${get_block}( ${params} ) ) ) {
+				${changeBlock}
+			}
+		`);
+	}
+
+	block.builders.unmount.addLine(`${if_name}${name}.unmount();`);
+
+	block.builders.destroy.addLine(`${if_name}${name}.destroy();`);
+}
+
+// if any of the siblings have outros, we need to keep references to the blocks
+// (TODO does this only apply to bidi transitions?)
+function compoundWithOutros(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node,
+	branches,
+	dynamic,
+	{ name, anchor, params, hasElse }
+) {
+	const get_block = block.getUniqueName(`get_block`);
+	const current_block_index = block.getUniqueName(`current_block_index`);
+	const previous_block_index = block.getUniqueName(`previous_block_index`);
+	const if_block_creators = block.getUniqueName(`if_block_creators`);
+	const if_blocks = block.getUniqueName(`if_blocks`);
+
+	const if_current_block_index = hasElse
+		? ''
+		: `if ( ~${current_block_index} ) `;
+
+	block.addVariable(current_block_index);
+	block.addVariable(name);
+
+	block.builders.init.addBlock(deindent`
+		var ${if_block_creators} = [
+			${branches.map(branch => branch.block).join(',\n')}
+		];
+
+		var ${if_blocks} = [];
+
+		function ${get_block} ( ${params} ) {
+			${branches
+				.map(({ condition, block }, i) => {
+					return `${condition ? `if ( ${condition} ) ` : ''}return ${block
+						? i
+						: -1};`;
+				})
+				.join('\n')}
+		}
+	`);
+
+	if (hasElse) {
+		block.builders.init.addBlock(deindent`
+			${current_block_index} = ${get_block}( ${params} );
+			${name} = ${if_blocks}[ ${current_block_index} ] = ${if_block_creators}[ ${current_block_index} ]( ${params}, #component );
+		`);
+	} else {
+		block.builders.init.addBlock(deindent`
+			if ( ~( ${current_block_index} = ${get_block}( ${params} ) ) ) {
+				${name} = ${if_blocks}[ ${current_block_index} ] = ${if_block_creators}[ ${current_block_index} ]( ${params}, #component );
+			}
+		`);
+	}
+
+	const isTopLevel = !state.parentNode;
+	const mountOrIntro = branches[0].hasIntroMethod ? 'intro' : 'mount';
+	const targetNode = state.parentNode || '#target';
+	const anchorNode = state.parentNode ? 'null' : 'anchor';
+
+	block.builders.mount.addLine(
+		`${if_current_block_index}${if_blocks}[ ${current_block_index} ].${mountOrIntro}( ${targetNode}, ${anchorNode} );`
+	);
+
+	const parentNode = state.parentNode || `${anchor}.parentNode`;
+
+	const destroyOldBlock = deindent`
+		${name}.outro( function () {
+			${if_blocks}[ ${previous_block_index} ].unmount();
+			${if_blocks}[ ${previous_block_index} ].destroy();
+			${if_blocks}[ ${previous_block_index} ] = null;
+		});
+	`;
+
+	const createNewBlock = deindent`
+		${name} = ${if_blocks}[ ${current_block_index} ];
+		if ( !${name} ) {
+			${name} = ${if_blocks}[ ${current_block_index} ] = ${if_block_creators}[ ${current_block_index} ]( ${params}, #component );
+			${name}.create();
+		}
+		${name}.${mountOrIntro}( ${parentNode}, ${anchor} );
+	`;
+
+	const changeBlock = hasElse
+		? deindent`
+			${destroyOldBlock}
+
+			${createNewBlock}
+		`
+		: deindent`
+			if ( ${name} ) {
+				${destroyOldBlock}
+			}
+
+			if ( ~${current_block_index} ) {
+				${createNewBlock}
+			} else {
+				${name} = null;
+			}
+		`;
+
+	if (dynamic) {
+		block.builders.update.addBlock(deindent`
+			var ${previous_block_index} = ${current_block_index};
+			${current_block_index} = ${get_block}( ${params} );
+			if ( ${current_block_index} === ${previous_block_index} ) {
+				${if_current_block_index}${if_blocks}[ ${current_block_index} ].update( changed, ${params} );
+			} else {
+				${changeBlock}
+			}
+		`);
+	} else {
+		block.builders.update.addBlock(deindent`
+			var ${previous_block_index} = ${current_block_index};
+			${current_block_index} = ${get_block}( ${params} );
+			if ( ${current_block_index} !== ${previous_block_index} ) {
+				${changeBlock}
+			}
+		`);
+	}
+
+	block.builders.destroy.addLine(deindent`
+		${if_current_block_index}{
+			${if_blocks}[ ${current_block_index} ].unmount();
+			${if_blocks}[ ${current_block_index} ].destroy();
+		}
+	`);
+}
diff --git a/src/generators/dom/visitors/MustacheTag.js b/src/generators/dom/visitors/MustacheTag.js
deleted file mode 100644
index db4a57efc2..0000000000
--- a/src/generators/dom/visitors/MustacheTag.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import deindent from '../../../utils/deindent.js';
-
-export default function visitMustacheTag ( generator, block, state, node ) {
-	const name = block.getUniqueName( 'text' );
-	const value = block.getUniqueName( `${name}_value` );
-
-	const { snippet } = block.contextualise( node.expression );
-
-	block.addVariable( value );
-	block.addElement( name, `${generator.helper( 'createText' )}( ${value} = ${snippet} )`, state.parentNode, true );
-
-	block.builders.update.addBlock( deindent`
-		if ( ${value} !== ( ${value} = ${snippet} ) ) {
-			${name}.data = ${value};
-		}
-	` );
-}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/MustacheTag.ts b/src/generators/dom/visitors/MustacheTag.ts
new file mode 100644
index 0000000000..3ef015a9fd
--- /dev/null
+++ b/src/generators/dom/visitors/MustacheTag.ts
@@ -0,0 +1,34 @@
+import deindent from '../../../utils/deindent';
+import { DomGenerator } from '../index';
+import Block from '../Block';
+import { Node } from '../../../interfaces';
+import { State } from '../interfaces';
+
+export default function visitMustacheTag(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node
+) {
+	const name = node._state.name;
+	const value = block.getUniqueName(`${name}_value`);
+
+	const { snippet } = block.contextualise(node.expression);
+
+	block.addVariable(value);
+	block.addElement(
+		name,
+		`@createText( ${value} = ${snippet} )`,
+		generator.hydratable
+			? `@claimText( ${state.parentNodes}, ${value} = ${snippet} )`
+			: '',
+		state.parentNode,
+		true
+	);
+
+	block.builders.update.addBlock(deindent`
+		if ( ${value} !== ( ${value} = ${snippet} ) ) {
+			${name}.data = ${value};
+		}
+	`);
+}
diff --git a/src/generators/dom/visitors/RawMustacheTag.js b/src/generators/dom/visitors/RawMustacheTag.js
deleted file mode 100644
index 2eed5bfdb6..0000000000
--- a/src/generators/dom/visitors/RawMustacheTag.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import deindent from '../../../utils/deindent.js';
-
-export default function visitRawMustacheTag ( generator, block, state, node ) {
-	const name = block.getUniqueName( 'raw' );
-	const value = block.getUniqueName( `${name}_value` );
-	const before = block.getUniqueName( `${name}_before` );
-	const after = block.getUniqueName( `${name}_after` );
-
-	const { snippet } = block.contextualise( node.expression );
-
-	// we would have used comments here, but the `insertAdjacentHTML` api only
-	// exists for `Element`s.
-	block.addElement( before, `${generator.helper( 'createElement' )}( 'noscript' )`, state.parentNode, true );
-	block.addElement( after, `${generator.helper( 'createElement' )}( 'noscript' )`, state.parentNode, true );
-
-	const isToplevel = !state.parentNode;
-
-	block.builders.create.addLine( `var ${value} = ${snippet};` );
-	const mountStatement = `${before}.insertAdjacentHTML( 'afterend', ${value} );`;
-	const detachStatement = `${generator.helper( 'detachBetween' )}( ${before}, ${after} );`;
-
-	if ( isToplevel ) {
-		block.builders.mount.addLine( mountStatement );
-	} else {
-		block.builders.create.addLine( mountStatement );
-	}
-
-	block.builders.update.addBlock( deindent`
-		if ( ${value} !== ( ${value} = ${snippet} ) ) {
-			${detachStatement}
-			${mountStatement}
-		}
-	` );
-
-	block.builders.detachRaw.addBlock( detachStatement );
-}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/RawMustacheTag.ts b/src/generators/dom/visitors/RawMustacheTag.ts
new file mode 100644
index 0000000000..41c3af9aa4
--- /dev/null
+++ b/src/generators/dom/visitors/RawMustacheTag.ts
@@ -0,0 +1,54 @@
+import deindent from '../../../utils/deindent';
+import { DomGenerator } from '../index';
+import Block from '../Block';
+import { Node } from '../../../interfaces';
+import { State } from '../interfaces';
+
+export default function visitRawMustacheTag(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node
+) {
+	const name = node._state.basename;
+	const before = node._state.name;
+	const value = block.getUniqueName(`${name}_value`);
+	const after = block.getUniqueName(`${name}_after`);
+
+	const { snippet } = block.contextualise(node.expression);
+
+	block.addVariable(value);
+
+	// we would have used comments here, but the `insertAdjacentHTML` api only
+	// exists for `Element`s.
+	block.addElement(
+		before,
+		`@createElement( 'noscript' )`,
+		`@createElement( 'noscript' )`,
+		state.parentNode,
+		true
+	);
+	block.addElement(
+		after,
+		`@createElement( 'noscript' )`,
+		`@createElement( 'noscript' )`,
+		state.parentNode,
+		true
+	);
+
+	const isToplevel = !state.parentNode;
+
+	const mountStatement = `${before}.insertAdjacentHTML( 'afterend', ${value} = ${snippet} );`;
+	const detachStatement = `@detachBetween( ${before}, ${after} );`;
+
+	block.builders.mount.addLine(mountStatement);
+
+	block.builders.update.addBlock(deindent`
+		if ( ${value} !== ( ${value} = ${snippet} ) ) {
+			${detachStatement}
+			${mountStatement}
+		}
+	`);
+
+	block.builders.detachRaw.addBlock(detachStatement);
+}
diff --git a/src/generators/dom/visitors/Text.js b/src/generators/dom/visitors/Text.js
deleted file mode 100644
index 923175e5ab..0000000000
--- a/src/generators/dom/visitors/Text.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Whitespace inside one of these elements will not result in
-// a whitespace node being created in any circumstances. (This
-// list is almost certainly very incomplete)
-const elementsWithoutText = new Set([
-	'audio',
-	'datalist',
-	'dl',
-	'ol',
-	'optgroup',
-	'select',
-	'ul',
-	'video'
-]);
-
-export default function visitText ( generator, block, state, node ) {
-	if ( !/\S/.test( node.data ) ) {
-		if ( state.namespace ) return;
-		if ( elementsWithoutText.has( state.parentNodeName) ) return;
-	}
-
-	const name = block.getUniqueName( `text` );
-	block.addElement( name, `${generator.helper( 'createText' )}( ${JSON.stringify( node.data )} )`, state.parentNode, false );
-}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/Text.ts b/src/generators/dom/visitors/Text.ts
new file mode 100644
index 0000000000..bf7bf8fd4a
--- /dev/null
+++ b/src/generators/dom/visitors/Text.ts
@@ -0,0 +1,23 @@
+import { DomGenerator } from '../index';
+import Block from '../Block';
+import { Node } from '../../../interfaces';
+import { State } from '../interfaces';
+import stringify from '../../../utils/stringify';
+
+export default function visitText(
+	generator: DomGenerator,
+	block: Block,
+	state: State,
+	node: Node
+) {
+	if (!node._state.shouldCreate) return;
+	block.addElement(
+		node._state.name,
+		`@createText( ${stringify(node.data)} )`,
+		generator.hydratable
+			? `@claimText( ${state.parentNodes}, ${stringify(node.data)} )`
+			: '',
+		state.parentNode,
+		node.usedAsAnchor
+	);
+}
diff --git a/src/generators/dom/visitors/YieldTag.js b/src/generators/dom/visitors/YieldTag.js
deleted file mode 100644
index 2ee3105669..0000000000
--- a/src/generators/dom/visitors/YieldTag.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default function visitYieldTag ( generator, block, state ) {
-	const anchor = `yield_anchor`;
-	block.createAnchor( anchor, state.parentNode );
-
-	block.builders.mount.addLine(
-		`${block.component}._yield && ${block.component}._yield.mount( ${state.parentNode || block.target}, ${anchor} );`
-	);
-
-	block.builders.destroy.addLine(
-		`${block.component}._yield && ${block.component}._yield.destroy( detach );`
-	);
-}
\ No newline at end of file
diff --git a/src/generators/dom/visitors/YieldTag.ts b/src/generators/dom/visitors/YieldTag.ts
new file mode 100644
index 0000000000..dbfee33f29
--- /dev/null
+++ b/src/generators/dom/visitors/YieldTag.ts
@@ -0,0 +1,19 @@
+import { DomGenerator } from '../index';
+import Block from '../Block';
+import { State } from '../interfaces';
+
+export default function visitYieldTag(
+	generator: DomGenerator,
+	block: Block,
+	state: State
+) {
+	const parentNode = state.parentNode || '#target';
+
+	block.builders.mount.addLine(
+		`if ( #component._yield ) #component._yield.mount( ${parentNode}, null );`
+	);
+
+	block.builders.unmount.addLine(
+		`if ( #component._yield ) #component._yield.unmount();`
+	);
+}
diff --git a/src/generators/dom/visitors/index.js b/src/generators/dom/visitors/index.js
deleted file mode 100644
index 4bdf5b4591..0000000000
--- a/src/generators/dom/visitors/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import EachBlock from './EachBlock.js';
-import Element from './Element/Element.js';
-import IfBlock from './IfBlock.js';
-import MustacheTag from './MustacheTag.js';
-import RawMustacheTag from './RawMustacheTag.js';
-import Text from './Text.js';
-import YieldTag from './YieldTag.js';
-
-export default {
-	EachBlock,
-	Element,
-	IfBlock,
-	MustacheTag,
-	RawMustacheTag,
-	Text,
-	YieldTag
-};
diff --git a/src/generators/dom/visitors/index.ts b/src/generators/dom/visitors/index.ts
new file mode 100644
index 0000000000..c690a2ba9c
--- /dev/null
+++ b/src/generators/dom/visitors/index.ts
@@ -0,0 +1,17 @@
+import EachBlock from './EachBlock';
+import Element from './Element/Element';
+import IfBlock from './IfBlock';
+import MustacheTag from './MustacheTag';
+import RawMustacheTag from './RawMustacheTag';
+import Text from './Text';
+import YieldTag from './YieldTag';
+
+export default {
+	EachBlock,
+	Element,
+	IfBlock,
+	MustacheTag,
+	RawMustacheTag,
+	Text,
+	YieldTag,
+};
diff --git a/src/generators/dom/visitors/shared/binding/getSetter.js b/src/generators/dom/visitors/shared/binding/getSetter.js
deleted file mode 100644
index 14c3799280..0000000000
--- a/src/generators/dom/visitors/shared/binding/getSetter.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import deindent from '../../../../../utils/deindent.js';
-
-export default function getSetter ({ block, name, context, attribute, dependencies, value }) {
-	const tail = attribute.value.type === 'MemberExpression' ? getTailSnippet( attribute.value ) : '';
-
-	if ( block.contexts.has( name ) ) {
-		const prop = dependencies[0];
-
-		return deindent`
-			var list = this.${context}.${block.listNames.get( name )};
-			var index = this.${context}.${block.indexNames.get( name )};
-			list[index]${tail} = ${value};
-
-			${block.component}._set({ ${prop}: ${block.component}.get( '${prop}' ) });
-		`;
-	}
-
-	if ( attribute.value.type === 'MemberExpression' ) {
-		const alias = block.alias( name );
-
-		return deindent`
-			var ${alias} = ${block.component}.get( '${name}' );
-			${alias}${tail} = ${value};
-			${block.component}._set({ ${name}: ${alias} });
-		`;
-	}
-
-	return `${block.component}._set({ ${name}: ${value} });`;
-}
-
-function getTailSnippet ( node ) {
-	const end = node.end;
-	while ( node.type === 'MemberExpression' ) node = node.object;
-	const start = node.end;
-
-	return `[✂${start}-${end}✂]`;
-}
diff --git a/src/generators/dom/visitors/shared/binding/getSetter.ts b/src/generators/dom/visitors/shared/binding/getSetter.ts
new file mode 100644
index 0000000000..5657ab9ef5
--- /dev/null
+++ b/src/generators/dom/visitors/shared/binding/getSetter.ts
@@ -0,0 +1,58 @@
+import deindent from '../../../../../utils/deindent';
+import getTailSnippet from '../../../../../utils/getTailSnippet';
+import { Node } from '../../../../../interfaces';
+
+export default function getSetter({
+	block,
+	name,
+	snippet,
+	context,
+	attribute,
+	dependencies,
+	value,
+}) {
+	const tail = attribute.value.type === 'MemberExpression'
+		? getTailSnippet(attribute.value)
+		: '';
+
+	if (block.contexts.has(name)) {
+		const prop = dependencies[0];
+		const computed = isComputed(attribute.value);
+
+		return deindent`
+			var list = this.${context}.${block.listNames.get(name)};
+			var index = this.${context}.${block.indexNames.get(name)};
+			${computed && `var state = #component.get();`}
+			list[index]${tail} = ${value};
+
+			${computed
+				? `#component._set({ ${dependencies
+						.map((prop: string) => `${prop}: state.${prop}`)
+						.join(', ')} });`
+				: `#component._set({ ${dependencies
+						.map((prop: string) => `${prop}: #component.get( '${prop}' )`)
+						.join(', ')} });`}
+		`;
+	}
+
+	if (attribute.value.type === 'MemberExpression') {
+		return deindent`
+			var state = #component.get();
+			${snippet} = ${value};
+			#component._set({ ${dependencies
+				.map((prop: string) => `${prop}: state.${prop}`)
+				.join(', ')} });
+		`;
+	}
+
+	return `#component._set({ ${name}: ${value} });`;
+}
+
+function isComputed(node: Node) {
+	while (node.type === 'MemberExpression') {
+		if (node.computed) return true;
+		node = node.object;
+	}
+
+	return false;
+}
diff --git a/src/generators/server-side-rendering/Block.js b/src/generators/server-side-rendering/Block.js
deleted file mode 100644
index fa317721e0..0000000000
--- a/src/generators/server-side-rendering/Block.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import deindent from '../../utils/deindent.js';
-import flattenReference from '../../utils/flattenReference.js';
-
-export default class Block {
-	constructor ( options ) {
-		Object.assign( this, options );
-	}
-
-	addBinding ( binding, name ) {
-		const conditions = [ `!( '${binding.name}' in state )`].concat( // TODO handle contextual bindings...
-			this.conditions.map( c => `(${c})` )
-		);
-
-		const { keypath } = flattenReference( binding.value );
-
-		this.generator.bindings.push( deindent`
-			if ( ${conditions.join( '&&' )} ) {
-				tmp = ${name}.data();
-				if ( '${keypath}' in tmp ) {
-					state.${binding.name} = tmp.${keypath};
-					settled = false;
-				}
-			}
-		` );
-	}
-
-	child ( options ) {
-		return new Block( Object.assign( {}, this, options, { parent: this } ) );
-	}
-
-	contextualise ( expression, context, isEventHandler ) {
-		return this.generator.contextualise( this, expression, context, isEventHandler );
-	}
-}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/Block.ts b/src/generators/server-side-rendering/Block.ts
new file mode 100644
index 0000000000..8d908ca8ea
--- /dev/null
+++ b/src/generators/server-side-rendering/Block.ts
@@ -0,0 +1,54 @@
+import deindent from '../../utils/deindent';
+import flattenReference from '../../utils/flattenReference';
+import { SsrGenerator } from './index';
+import { Node } from '../../interfaces';
+import getObject from '../../utils/getObject';
+
+interface BlockOptions {
+	// TODO
+}
+
+export default class Block {
+	generator: SsrGenerator;
+	conditions: string[];
+
+	contexts: Map<string, string>;
+	indexes: Map<string, string>;
+	contextDependencies: Map<string, string[]>;
+
+	constructor(options: BlockOptions) {
+		Object.assign(this, options);
+	}
+
+	addBinding(binding: Node, name: string) {
+		const conditions = [`!( '${binding.name}' in state )`].concat(
+			// TODO handle contextual bindings...
+			this.conditions.map(c => `(${c})`)
+		);
+
+		const { name: prop } = getObject(binding.value);
+
+		this.generator.bindings.push(deindent`
+			if ( ${conditions.join('&&')} ) {
+				tmp = ${name}.data();
+				if ( '${prop}' in tmp ) {
+					state.${binding.name} = tmp.${prop};
+					settled = false;
+				}
+			}
+		`);
+	}
+
+	child(options: BlockOptions) {
+		return new Block(Object.assign({}, this, options, { parent: this }));
+	}
+
+	contextualise(expression: Node, context?: string, isEventHandler?: boolean) {
+		return this.generator.contextualise(
+			this,
+			expression,
+			context,
+			isEventHandler
+		);
+	}
+}
diff --git a/src/generators/server-side-rendering/index.js b/src/generators/server-side-rendering/index.js
deleted file mode 100644
index 02e4e39bf2..0000000000
--- a/src/generators/server-side-rendering/index.js
+++ /dev/null
@@ -1,156 +0,0 @@
-import deindent from '../../utils/deindent.js';
-import CodeBuilder from '../../utils/CodeBuilder.js';
-import Generator from '../Generator.js';
-import Block from './Block.js';
-import visit from './visit.js';
-
-class SsrGenerator extends Generator {
-	constructor ( parsed, source, name, options ) {
-		super( parsed, source, name, options );
-		this.bindings = [];
-		this.renderCode = '';
-	}
-
-	append ( code ) {
-		this.renderCode += code;
-	}
-}
-
-export default function ssr ( parsed, source, options ) {
-	const format = options.format || 'cjs';
-	const name = options.name || 'SvelteComponent';
-
-	const generator = new SsrGenerator( parsed, source, name, options );
-
-	const { computations, hasJs, templateProperties } = generator.parseJs( true );
-
-	const builders = {
-		main: new CodeBuilder(),
-		bindings: new CodeBuilder(),
-		render: new CodeBuilder(),
-		renderCss: new CodeBuilder()
-	};
-
-	// create main render() function
-	const mainBlock = new Block({
-		generator,
-		contexts: new Map(),
-		indexes: new Map(),
-		conditions: []
-	});
-
-	parsed.html.children.forEach( node => {
-		visit( generator, mainBlock, node );
-	});
-
-	builders.render.addLine(
-		templateProperties.data ? `state = Object.assign( ${generator.alias( 'template' )}.data(), state || {} );` : `state = state || {};`
-	);
-
-	computations.forEach( ({ key, deps }) => {
-		builders.render.addLine(
-			`state.${key} = ${generator.alias( 'template' )}.computed.${key}( ${deps.map( dep => `state.${dep}` ).join( ', ' )} );`
-		);
-	});
-
-	if ( generator.bindings.length ) {
-		const bindings = generator.bindings.join( '\n\n' );
-
-		builders.render.addBlock( deindent`
-			var settled = false;
-			var tmp;
-
-			while ( !settled ) {
-				settled = true;
-
-				${bindings}
-			}
-		` );
-	}
-
-	builders.render.addBlock(
-		`return \`${generator.renderCode}\`;`
-	);
-
-	// create renderCss() function
-	builders.renderCss.addBlock(
-		`var components = [];`
-	);
-
-	if ( generator.css ) {
-		builders.renderCss.addBlock( deindent`
-			components.push({
-				filename: ${name}.filename,
-				css: ${JSON.stringify( generator.css )},
-				map: null // TODO
-			});
-		` );
-	}
-
-	if ( templateProperties.components ) {
-		builders.renderCss.addBlock( deindent`
-			var seen = {};
-
-			function addComponent ( component ) {
-				var result = component.renderCss();
-				result.components.forEach( x => {
-					if ( seen[ x.filename ] ) return;
-					seen[ x.filename ] = true;
-					components.push( x );
-				});
-			}
-		` );
-
-		templateProperties.components.value.properties.forEach( prop => {
-			const { name } = prop.key;
-			const expression = generator.importedComponents.get( name ) || `${generator.alias( 'template' )}.components.${name}`;
-			builders.renderCss.addLine( `addComponent( ${expression} );` );
-		});
-	}
-
-	builders.renderCss.addBlock( deindent`
-		return {
-			css: components.map( x => x.css ).join( '\\n' ),
-			map: null,
-			components
-		};
-	` );
-
-	if ( hasJs ) {
-		builders.main.addBlock( `[✂${parsed.js.content.start}-${parsed.js.content.end}✂]` );
-	}
-
-	builders.main.addBlock( deindent`
-		var ${name} = {};
-
-		${name}.filename = ${JSON.stringify( options.filename )};
-
-		${name}.data = function () {
-			return ${templateProperties.data ? `${generator.alias( 'template' )}.data()` : `{}`};
-		};
-
-		${name}.render = function ( state, options ) {
-			${builders.render}
-		};
-
-		${name}.renderCss = function () {
-			${builders.renderCss}
-		};
-
-		var escaped = {
-			'"': '&quot;',
-			"'": '&#39;',
-			'&': '&amp;',
-			'<': '&lt;',
-			'>': '&gt;'
-		};
-
-		function __escape ( html ) {
-			return String( html ).replace( /["'&<>]/g, match => escaped[ match ] );
-		}
-	` );
-
-	const result = builders.main.toString();
-
-	return generator.generate( result, options, { name, format } );
-}
diff --git a/src/generators/server-side-rendering/index.ts b/src/generators/server-side-rendering/index.ts
new file mode 100644
index 0000000000..29cfccd67a
--- /dev/null
+++ b/src/generators/server-side-rendering/index.ts
@@ -0,0 +1,174 @@
+import deindent from '../../utils/deindent';
+import Generator from '../Generator';
+import Block from './Block';
+import visit from './visit';
+import { removeNode, removeObjectKey } from '../../utils/removeNode';
+import { Parsed, Node, CompileOptions } from '../../interfaces';
+
+export class SsrGenerator extends Generator {
+	bindings: string[];
+	renderCode: string;
+	elementDepth: number;
+
+	constructor(
+		parsed: Parsed,
+		source: string,
+		name: string,
+		options: CompileOptions
+	) {
+		super(parsed, source, name, options);
+		this.bindings = [];
+		this.renderCode = '';
+		this.elementDepth = 0;
+
+		// in an SSR context, we don't need to include events, methods, oncreate or ondestroy
+		const { templateProperties, defaultExport } = this;
+
+		if (templateProperties.oncreate)
+			removeNode(
+				this.code,
+				defaultExport.declaration,
+				templateProperties.oncreate
+			);
+		if (templateProperties.ondestroy)
+			removeNode(
+				this.code,
+				defaultExport.declaration,
+				templateProperties.ondestroy
+			);
+		if (templateProperties.methods)
+			removeNode(
+				this.code,
+				defaultExport.declaration,
+				templateProperties.methods
+			);
+		if (templateProperties.events)
+			removeNode(
+				this.code,
+				defaultExport.declaration,
+				templateProperties.events
+			);
+	}
+
+	append(code: string) {
+		this.renderCode += code;
+	}
+}
+
+export default function ssr(
+	parsed: Parsed,
+	source: string,
+	options: CompileOptions
+) {
+	const format = options.format || 'cjs';
+
+	const generator = new SsrGenerator(parsed, source, options.name || 'SvelteComponent', options);
+
+	const { computations, name, hasJs, templateProperties } = generator;
+
+	// create main render() function
+	const mainBlock = new Block({
+		generator,
+		contexts: new Map(),
+		indexes: new Map(),
+		conditions: [],
+	});
+
+	parsed.html.children.forEach((node: Node) => {
+		visit(generator, mainBlock, node);
+	});
+
+	const result = deindent`
+		${hasJs && `[✂${parsed.js.content.start}-${parsed.js.content.end}✂]`}
+
+		var ${name} = {};
+
+		${name}.filename = ${JSON.stringify(options.filename)};
+
+		${name}.data = function () {
+			return ${templateProperties.data ? `@template.data()` : `{}`};
+		};
+
+		${name}.render = function ( state, options ) {
+			${templateProperties.data
+				? `state = Object.assign( @template.data(), state || {} );`
+				: `state = state || {};`}
+
+			${computations.map(
+				({ key, deps }) =>
+					`state.${key} = @template.computed.${key}( ${deps
+						.map(dep => `state.${dep}`)
+						.join(', ')} );`
+			)}
+
+			${generator.bindings.length &&
+				deindent`
+				var settled = false;
+				var tmp;
+
+				while ( !settled ) {
+					settled = true;
+
+					${generator.bindings.join('\n\n')}
+				}
+			`}
+
+			return \`${generator.renderCode}\`.trim();
+		};
+
+		${name}.renderCss = function () {
+			var components = [];
+
+			${generator.css &&
+				deindent`
+				components.push({
+					filename: ${name}.filename,
+					css: ${JSON.stringify(generator.css)},
+					map: null // TODO
+				});
+			`}
+
+			${templateProperties.components &&
+				deindent`
+				var seen = {};
+
+				function addComponent ( component ) {
+					var result = component.renderCss();
+					result.components.forEach( x => {
+						if ( seen[ x.filename ] ) return;
+						seen[ x.filename ] = true;
+						components.push( x );
+					});
+				}
+
+				${templateProperties.components.value.properties.map(prop => {
+					const { name } = prop.key;
+					const expression =
+						generator.importedComponents.get(name) ||
+						`@template.components.${name}`;
+					return `addComponent( ${expression} );`;
+				})}
+			`}
+
+			return {
+				css: components.map( x => x.css ).join( '\\n' ),
+				map: null,
+				components
+			};
+		};
+
+		var escaped = {
+			'"': '&quot;',
+			"'": '&#39;',
+			'&': '&amp;',
+			'<': '&lt;',
+			'>': '&gt;'
+		};
+
+		function __escape ( html ) {
+			return String( html ).replace( /["'&<>]/g, match => escaped[ match ] );
+		}
+	`.replace(/(\\)?@(\w*)/g, (match: string, escaped: string, name: string) => escaped ? match.slice(1) : generator.alias(name));
+
+	return generator.generate(result, options, { name, format });
+}
diff --git a/src/generators/server-side-rendering/visit.js b/src/generators/server-side-rendering/visit.js
deleted file mode 100644
index 1b96ed510b..0000000000
--- a/src/generators/server-side-rendering/visit.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import visitors from './visitors/index.js';
-
-export default function visit ( generator, fragment, node ) {
-	const visitor = visitors[ node.type ];
-	visitor( generator, fragment, node );
-}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visit.ts b/src/generators/server-side-rendering/visit.ts
new file mode 100644
index 0000000000..0c2bba8d69
--- /dev/null
+++ b/src/generators/server-side-rendering/visit.ts
@@ -0,0 +1,13 @@
+import visitors from './visitors/index';
+import { SsrGenerator } from './index';
+import Block from './Block';
+import { Node } from '../../interfaces';
+
+export default function visit(
+	generator: SsrGenerator,
+	block: Block,
+	node: Node
+) {
+	const visitor = visitors[node.type];
+	visitor(generator, block, node);
+}
diff --git a/src/generators/server-side-rendering/visitors/Comment.js b/src/generators/server-side-rendering/visitors/Comment.js
deleted file mode 100644
index 4d3477d7ef..0000000000
--- a/src/generators/server-side-rendering/visitors/Comment.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function visitComment () {
-	// do nothing
-}
diff --git a/src/generators/server-side-rendering/visitors/Comment.ts b/src/generators/server-side-rendering/visitors/Comment.ts
new file mode 100644
index 0000000000..ad10d20aa5
--- /dev/null
+++ b/src/generators/server-side-rendering/visitors/Comment.ts
@@ -0,0 +1,3 @@
+export default function visitComment() {
+	// do nothing
+}
diff --git a/src/generators/server-side-rendering/visitors/Component.js b/src/generators/server-side-rendering/visitors/Component.js
deleted file mode 100644
index 6290ca0710..0000000000
--- a/src/generators/server-side-rendering/visitors/Component.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import flattenReference from '../../../utils/flattenReference.js';
-import visit from '../visit.js';
-
-export default function visitComponent ( generator, block, node ) {
-	function stringify ( chunk ) {
-		if ( chunk.type === 'Text' ) return chunk.data;
-		if ( chunk.type === 'MustacheTag' ) {
-			const { snippet } = block.contextualise( chunk.expression );
-			return '${__escape( ' + snippet + ')}';
-		}
-	}
-
-	const attributes = [];
-	const bindings = [];
-
-	node.attributes.forEach( attribute => {
-		if ( attribute.type === 'Attribute' ) {
-			attributes.push( attribute );
-		} else if ( attribute.type === 'Binding' ) {
-			bindings.push( attribute );
-		}
-	});
-
-	const props = attributes
-		.map( attribute => {
-			let value;
-
-			if ( attribute.value === true ) {
-				value = `true`;
-			} else if ( attribute.value.length === 0 ) {
-				value = `''`;
-			} else if ( attribute.value.length === 1 ) {
-				const chunk = attribute.value[0];
-				if ( chunk.type === 'Text' ) {
-					value = isNaN( chunk.data ) ? JSON.stringify( chunk.data ) : chunk.data;
-				} else {
-					const { snippet } = block.contextualise( chunk.expression );
-					value = snippet;
-				}
-			} else {
-				value = '`' + attribute.value.map( stringify ).join( '' ) + '`';
-			}
-
-			return `${attribute.name}: ${value}`;
-		})
-		.concat( bindings.map( binding => {
-			const { name, keypath } = flattenReference( binding.value );
-			const value = block.contexts.has( name ) ? keypath : `state.${keypath}`;
-			return `${binding.name}: ${value}`;
-		}))
-		.join( ', ' );
-
-	const expression = node.name === ':Self' ? generator.name : generator.importedComponents.get( node.name ) || `${generator.alias( 'template' )}.components.${node.name}`;
-
-	bindings.forEach( binding => {
-		block.addBinding( binding, expression );
-	});
-
-	let open = `\${${expression}.render({${props}}`;
-
-	if ( node.children.length ) {
-		open += `, { yield: () => \``;
-	}
-
-	generator.append( open );
-
-	generator.elementDepth += 1;
-
-	node.children.forEach( child => {
-		visit( generator, block, child );
-	});
-
-	generator.elementDepth -= 1;
-
-	const close = node.children.length ? `\` })}` : ')}';
-	generator.append( close );
-}
diff --git a/src/generators/server-side-rendering/visitors/Component.ts b/src/generators/server-side-rendering/visitors/Component.ts
new file mode 100644
index 0000000000..75785d6ffd
--- /dev/null
+++ b/src/generators/server-side-rendering/visitors/Component.ts
@@ -0,0 +1,97 @@
+import flattenReference from '../../../utils/flattenReference';
+import visit from '../visit';
+import { SsrGenerator } from '../index';
+import Block from '../Block';
+import { Node } from '../../../interfaces';
+import getObject from '../../../utils/getObject';
+import getTailSnippet from '../../../utils/getTailSnippet';
+
+export default function visitComponent(
+	generator: SsrGenerator,
+	block: Block,
+	node: Node
+) {
+	function stringifyAttribute(chunk: Node) {
+		if (chunk.type === 'Text') return chunk.data;
+		if (chunk.type === 'MustacheTag') {
+			const { snippet } = block.contextualise(chunk.expression);
+			return '${__escape( ' + snippet + ')}';
+		}
+	}
+
+	const attributes: Node[] = [];
+	const bindings: Node[] = [];
+
+	node.attributes.forEach((attribute: Node) => {
+		if (attribute.type === 'Attribute') {
+			attributes.push(attribute);
+		} else if (attribute.type === 'Binding') {
+			bindings.push(attribute);
+		}
+	});
+
+	const props = attributes
+		.map(attribute => {
+			let value;
+
+			if (attribute.value === true) {
+				value = `true`;
+			} else if (attribute.value.length === 0) {
+				value = `''`;
+			} else if (attribute.value.length === 1) {
+				const chunk = attribute.value[0];
+				if (chunk.type === 'Text') {
+					value = isNaN(chunk.data) ? JSON.stringify(chunk.data) : chunk.data;
+				} else {
+					const { snippet } = block.contextualise(chunk.expression);
+					value = snippet;
+				}
+			} else {
+				value = '`' + attribute.value.map(stringifyAttribute).join('') + '`';
+			}
+
+			return `${attribute.name}: ${value}`;
+		})
+		.concat(
+			bindings.map(binding => {
+				const { name } = getObject(binding.value);
+				const tail = binding.value.type === 'MemberExpression'
+					? getTailSnippet(binding.value)
+					: '';
+
+				const keypath = block.contexts.has(name)
+					? `${name}${tail}`
+					: `state.${name}${tail}`;
+				return `${binding.name}: ${keypath}`;
+			})
+		)
+		.join(', ');
+
+	const expression = node.name === ':Self'
+		? generator.name
+		: generator.importedComponents.get(node.name) ||
+				`@template.components.${node.name}`;
+
+	bindings.forEach(binding => {
+		block.addBinding(binding, expression);
+	});
+
+	let open = `\${${expression}.render({${props}}`;
+
+	if (node.children.length) {
+		open += `, { yield: () => \``;
+	}
+
+	generator.append(open);
+
+	generator.elementDepth += 1;
+
+	node.children.forEach((child: Node) => {
+		visit(generator, block, child);
+	});
+
+	generator.elementDepth -= 1;
+
+	const close = node.children.length ? `\` })}` : ')}';
+	generator.append(close);
+}
diff --git a/src/generators/server-side-rendering/visitors/EachBlock.js b/src/generators/server-side-rendering/visitors/EachBlock.js
deleted file mode 100644
index b26bbb4222..0000000000
--- a/src/generators/server-side-rendering/visitors/EachBlock.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import visit from '../visit.js';
-
-export default function visitEachBlock ( generator, block, node ) {
-	const { dependencies, snippet } = block.contextualise( node.expression );
-
-	const open = `\${ ${snippet}.map( ${ node.index ? `( ${node.context}, ${node.index} )` : node.context} => \``;
-	generator.append( open );
-
-	// TODO should this be the generator's job? It's duplicated between
-	// here and the equivalent DOM compiler visitor
-	const contexts = new Map( block.contexts );
-	contexts.set( node.context, node.context );
-
-	const indexes = new Map( block.indexes );
-	if ( node.index ) indexes.set( node.index, node.context );
-
-	const contextDependencies = new Map( block.contextDependencies );
-	contextDependencies.set( node.context, dependencies );
-
-	const childBlock = block.child({
-		contexts,
-		indexes,
-		contextDependencies
-	});
-
-	node.children.forEach( child => {
-		visit( generator, childBlock, child );
-	});
-
-	const close = `\` ).join( '' )}`;
-	generator.append( close );
-}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/EachBlock.ts b/src/generators/server-side-rendering/visitors/EachBlock.ts
new file mode 100644
index 0000000000..18591ae809
--- /dev/null
+++ b/src/generators/server-side-rendering/visitors/EachBlock.ts
@@ -0,0 +1,53 @@
+import visit from '../visit';
+import { SsrGenerator } from '../index';
+import Block from '../Block';
+import { Node } from '../../../interfaces';
+
+export default function visitEachBlock(
+	generator: SsrGenerator,
+	block: Block,
+	node: Node
+) {
+	const { dependencies, snippet } = block.contextualise(node.expression);
+
+	const open = `\${ ${node.else
+		? `${snippet}.length ? `
+		: ''}${snippet}.map( ${node.index
+		? `( ${node.context}, ${node.index} )`
+		: node.context} => \``;
+	generator.append(open);
+
+	// TODO should this be the generator's job? It's duplicated between
+	// here and the equivalent DOM compiler visitor
+	const contexts = new Map(block.contexts);
+	contexts.set(node.context, node.context);
+
+	const indexes = new Map(block.indexes);
+	if (node.index) indexes.set(node.index, node.context);
+
+	const contextDependencies = new Map(block.contextDependencies);
+	contextDependencies.set(node.context, dependencies);
+
+	const childBlock = block.child({
+		contexts,
+		indexes,
+		contextDependencies,
+	});
+
+	node.children.forEach((child: Node) => {
+		visit(generator, childBlock, child);
+	});
+
+	const close = `\` ).join( '' )`;
+	generator.append(close);
+
+	if (node.else) {
+		generator.append(` : \``);
+		node.else.children.forEach((child: Node) => {
+			visit(generator, block, child);
+		});
+		generator.append(`\``);
+	}
+
+	generator.append('}');
+}
diff --git a/src/generators/server-side-rendering/visitors/Element.js b/src/generators/server-side-rendering/visitors/Element.js
deleted file mode 100644
index 0a6c5f42c4..0000000000
--- a/src/generators/server-side-rendering/visitors/Element.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import visitComponent from './Component.js';
-import isVoidElementName from '../../../utils/isVoidElementName.js';
-import visit from '../visit.js';
-import visitWindow from './meta/Window.js';
-
-const meta = {
-	':Window': visitWindow
-};
-
-export default function visitElement ( generator, block, node ) {
-	if ( node.name in meta ) {
-		return meta[ node.name ]( generator, block, node );
-	}
-
-	if ( generator.components.has( node.name ) || node.name === ':Self' ) {
-		visitComponent( generator, block, node );
-		return;
-	}
-
-	let openingTag = `<${node.name}`;
-
-	node.attributes.forEach( attribute => {
-		if ( attribute.type !== 'Attribute' ) return;
-
-		let str = ` ${attribute.name}`;
-
-		if ( attribute.value !== true ) {
-			str += `="` + attribute.value.map( chunk => {
-				if ( chunk.type === 'Text' ) {
-					return chunk.data;
-				}
-
-				const { snippet } = block.contextualise( chunk.expression );
-				return '${' + snippet + '}';
-			}).join( '' ) + `"`;
-		}
-
-		openingTag += str;
-	});
-
-	if ( generator.cssId && !generator.elementDepth ) {
-		openingTag += ` ${generator.cssId}`;
-	}
-
-	openingTag += '>';
-
-	generator.append( openingTag );
-
-	generator.elementDepth += 1;
-
-	node.children.forEach( child => {
-		visit( generator, block, child );
-	});
-
-	generator.elementDepth -= 1;
-
-	if ( !isVoidElementName( node.name ) ) {
-		generator.append( `</${node.name}>` );
-	}
-}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/Element.ts b/src/generators/server-side-rendering/visitors/Element.ts
new file mode 100644
index 0000000000..3540bd12f7
--- /dev/null
+++ b/src/generators/server-side-rendering/visitors/Element.ts
@@ -0,0 +1,82 @@
+import visitComponent from './Component';
+import isVoidElementName from '../../../utils/isVoidElementName';
+import visit from '../visit';
+import visitWindow from './meta/Window';
+import { SsrGenerator } from '../index';
+import Block from '../Block';
+import { Node } from '../../../interfaces';
+
+const meta = {
+	':Window': visitWindow,
+};
+
+function stringifyAttributeValue(block: Block, chunks: Node[]) {
+	return chunks
+		.map((chunk: Node) => {
+			if (chunk.type === 'Text') {
+				return chunk.data;
+			}
+
+			const { snippet } = block.contextualise(chunk.expression);
+			return '${' + snippet + '}';
+		})
+		.join('');
+}
+
+export default function visitElement(
+	generator: SsrGenerator,
+	block: Block,
+	node: Node
+) {
+	if (node.name in meta) {
+		return meta[node.name](generator, block, node);
+	}
+
+	if (generator.components.has(node.name) || node.name === ':Self') {
+		visitComponent(generator, block, node);
+		return;
+	}
+
+	let openingTag = `<${node.name}`;
+	let textareaContents; // awkward special case
+
+	node.attributes.forEach((attribute: Node) => {
+		if (attribute.type !== 'Attribute') return;
+
+		if (attribute.name === 'value' && node.name === 'textarea') {
+			textareaContents = stringifyAttributeValue(block, attribute.value);
+		} else {
+			let str = ` ${attribute.name}`;
+
+			if (attribute.value !== true) {
+				str += `="${stringifyAttributeValue(block, attribute.value)}"`;
+			}
+
+			openingTag += str;
+		}
+	});
+
+	if (generator.cssId && (!generator.cascade || generator.elementDepth === 0)) {
+		openingTag += ` ${generator.cssId}`;
+	}
+
+	openingTag += '>';
+
+	generator.append(openingTag);
+
+	if (node.name === 'textarea' && textareaContents !== undefined) {
+		generator.append(textareaContents);
+	} else {
+		generator.elementDepth += 1;
+
+		node.children.forEach((child: Node) => {
+			visit(generator, block, child);
+		});
+
+		generator.elementDepth -= 1;
+	}
+
+	if (!isVoidElementName(node.name)) {
+		generator.append(`</${node.name}>`);
+	}
+}
diff --git a/src/generators/server-side-rendering/visitors/IfBlock.js b/src/generators/server-side-rendering/visitors/IfBlock.js
deleted file mode 100644
index eb2af2caae..0000000000
--- a/src/generators/server-side-rendering/visitors/IfBlock.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import visit from '../visit.js';
-
-export default function visitIfBlock ( generator, block, node ) {
-	const { snippet } = block.contextualise( node.expression );
-
-	generator.append( '${ ' + snippet + ' ? `' );
-
-	const childBlock = block.child({
-		conditions: block.conditions.concat( snippet )
-	});
-
-	node.children.forEach( child => {
-		visit( generator, childBlock, child );
-	});
-
-	generator.append( '` : `' );
-
-	if ( node.else ) {
-		node.else.children.forEach( child => {
-			visit( generator, childBlock, child );
-		});
-	}
-
-	generator.append( '` }' );
-}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/IfBlock.ts b/src/generators/server-side-rendering/visitors/IfBlock.ts
new file mode 100644
index 0000000000..6c758d6358
--- /dev/null
+++ b/src/generators/server-side-rendering/visitors/IfBlock.ts
@@ -0,0 +1,32 @@
+import visit from '../visit';
+import { SsrGenerator } from '../index';
+import Block from '../Block';
+import { Node } from '../../../interfaces';
+
+export default function visitIfBlock(
+	generator: SsrGenerator,
+	block: Block,
+	node: Node
+) {
+	const { snippet } = block.contextualise(node.expression);
+
+	generator.append('${ ' + snippet + ' ? `');
+
+	const childBlock = block.child({
+		conditions: block.conditions.concat(snippet),
+	});
+
+	node.children.forEach((child: Node) => {
+		visit(generator, childBlock, child);
+	});
+
+	generator.append('` : `');
+
+	if (node.else) {
+		node.else.children.forEach((child: Node) => {
+			visit(generator, childBlock, child);
+		});
+	}
+
+	generator.append('` }');
+}
diff --git a/src/generators/server-side-rendering/visitors/MustacheTag.js b/src/generators/server-side-rendering/visitors/MustacheTag.js
deleted file mode 100644
index 4135ef9203..0000000000
--- a/src/generators/server-side-rendering/visitors/MustacheTag.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export default function visitMustacheTag ( generator, block, node ) {
-	const { snippet } = block.contextualise( node.expression );
-	generator.append( '${__escape( ' + snippet + ' )}' );
-}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/MustacheTag.ts b/src/generators/server-side-rendering/visitors/MustacheTag.ts
new file mode 100644
index 0000000000..db6c496692
--- /dev/null
+++ b/src/generators/server-side-rendering/visitors/MustacheTag.ts
@@ -0,0 +1,12 @@
+import { SsrGenerator } from '../index';
+import Block from '../Block';
+import { Node } from '../../../interfaces';
+
+export default function visitMustacheTag(
+	generator: SsrGenerator,
+	block: Block,
+	node: Node
+) {
+	const { snippet } = block.contextualise(node.expression);
+	generator.append('${__escape( ' + snippet + ' )}');
+}
diff --git a/src/generators/server-side-rendering/visitors/RawMustacheTag.js b/src/generators/server-side-rendering/visitors/RawMustacheTag.js
deleted file mode 100644
index 93b1f3c5f8..0000000000
--- a/src/generators/server-side-rendering/visitors/RawMustacheTag.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export default function visitRawMustacheTag ( generator, block, node ) {
-	const { snippet } = block.contextualise( node.expression );
-	generator.append( '${' + snippet + '}' );
-}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/RawMustacheTag.ts b/src/generators/server-side-rendering/visitors/RawMustacheTag.ts
new file mode 100644
index 0000000000..8112349d04
--- /dev/null
+++ b/src/generators/server-side-rendering/visitors/RawMustacheTag.ts
@@ -0,0 +1,12 @@
+import { SsrGenerator } from '../index';
+import Block from '../Block';
+import { Node } from '../../../interfaces';
+
+export default function visitRawMustacheTag(
+	generator: SsrGenerator,
+	block: Block,
+	node: Node
+) {
+	const { snippet } = block.contextualise(node.expression);
+	generator.append('${' + snippet + '}');
+}
diff --git a/src/generators/server-side-rendering/visitors/Text.js b/src/generators/server-side-rendering/visitors/Text.js
deleted file mode 100644
index d7e30d41c5..0000000000
--- a/src/generators/server-side-rendering/visitors/Text.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function visitText ( generator, block, node ) {
-	generator.append( node.data.replace( /\${/g, '\\${' ) );
-}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/Text.ts b/src/generators/server-side-rendering/visitors/Text.ts
new file mode 100644
index 0000000000..b7aad398f2
--- /dev/null
+++ b/src/generators/server-side-rendering/visitors/Text.ts
@@ -0,0 +1,11 @@
+import { SsrGenerator } from '../index';
+import Block from '../Block';
+import { Node } from '../../../interfaces';
+
+export default function visitText(
+	generator: SsrGenerator,
+	block: Block,
+	node: Node
+) {
+	generator.append(node.data.replace(/(\${|`|\\)/g, '\\$1').replace(/([^\\])?([@#])/g, '$1\\$2'));
+}
diff --git a/src/generators/server-side-rendering/visitors/YieldTag.js b/src/generators/server-side-rendering/visitors/YieldTag.js
deleted file mode 100644
index bde5ab1a00..0000000000
--- a/src/generators/server-side-rendering/visitors/YieldTag.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function visitYieldTag ( generator ) {
-	generator.append( `\${options && options.yield ? options.yield() : ''}` );
-}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/YieldTag.ts b/src/generators/server-side-rendering/visitors/YieldTag.ts
new file mode 100644
index 0000000000..03c83655ab
--- /dev/null
+++ b/src/generators/server-side-rendering/visitors/YieldTag.ts
@@ -0,0 +1,5 @@
+import { SsrGenerator } from '../index';
+
+export default function visitYieldTag(generator: SsrGenerator) {
+	generator.append(`\${options && options.yield ? options.yield() : ''}`);
+}
diff --git a/src/generators/server-side-rendering/visitors/index.js b/src/generators/server-side-rendering/visitors/index.js
deleted file mode 100644
index 8e125e5d8b..0000000000
--- a/src/generators/server-side-rendering/visitors/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import Comment from './Comment.js';
-import EachBlock from './EachBlock.js';
-import Element from './Element.js';
-import IfBlock from './IfBlock.js';
-import MustacheTag from './MustacheTag.js';
-import RawMustacheTag from './RawMustacheTag.js';
-import Text from './Text.js';
-import YieldTag from './YieldTag.js';
-
-export default {
-	Comment,
-	EachBlock,
-	Element,
-	IfBlock,
-	MustacheTag,
-	RawMustacheTag,
-	Text,
-	YieldTag
-};
diff --git a/src/generators/server-side-rendering/visitors/index.ts b/src/generators/server-side-rendering/visitors/index.ts
new file mode 100644
index 0000000000..57dc4a7571
--- /dev/null
+++ b/src/generators/server-side-rendering/visitors/index.ts
@@ -0,0 +1,19 @@
+import Comment from './Comment';
+import EachBlock from './EachBlock';
+import Element from './Element';
+import IfBlock from './IfBlock';
+import MustacheTag from './MustacheTag';
+import RawMustacheTag from './RawMustacheTag';
+import Text from './Text';
+import YieldTag from './YieldTag';
+
+export default {
+	Comment,
+	EachBlock,
+	Element,
+	IfBlock,
+	MustacheTag,
+	RawMustacheTag,
+	Text,
+	YieldTag,
+};
diff --git a/src/generators/server-side-rendering/visitors/meta/Window.js b/src/generators/server-side-rendering/visitors/meta/Window.js
deleted file mode 100644
index 4b4bf67ccc..0000000000
--- a/src/generators/server-side-rendering/visitors/meta/Window.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function visitWindow () {
-	// noop
-}
\ No newline at end of file
diff --git a/src/generators/server-side-rendering/visitors/meta/Window.ts b/src/generators/server-side-rendering/visitors/meta/Window.ts
new file mode 100644
index 0000000000..733bf2b5c0
--- /dev/null
+++ b/src/generators/server-side-rendering/visitors/meta/Window.ts
@@ -0,0 +1,3 @@
+export default function visitWindow() {
+	// noop
+}
diff --git a/src/generators/shared/processCss.js b/src/generators/shared/processCss.js
deleted file mode 100644
index 91ca055d31..0000000000
--- a/src/generators/shared/processCss.js
+++ /dev/null
@@ -1,94 +0,0 @@
-const commentsPattern = /\/\*[\s\S]*?\*\//g;
-
-export default function processCss ( parsed, code ) {
-	const css = parsed.css.content.styles;
-	const offset = parsed.css.content.start;
-
-	const attr = `[svelte-${parsed.hash}]`;
-
-	const keyframes = new Map();
-
-	function walkKeyframes ( node ) {
-		if ( node.type === 'Atrule' && node.name.toLowerCase() === 'keyframes' ) {
-			node.expression.children.forEach( expression => {
-				if ( expression.type === 'Identifier' ) {
-					const newName = `svelte-${parsed.hash}-${expression.name}`;
-					code.overwrite( expression.start, expression.end, newName );
-					keyframes.set( expression.name, newName );
-				}
-			});
-		} else if ( node.children ) {
-			node.children.forEach( walkKeyframes );
-		} else if ( node.block ) {
-			walkKeyframes( node.block );
-		}
-	}
-
-	parsed.css.children.forEach( walkKeyframes );
-
-	function transform ( rule ) {
-		rule.selector.children.forEach( selector => {
-			const start = selector.start - offset;
-			const end = selector.end - offset;
-
-			const selectorString = css.slice( start, end );
-
-			const firstToken = selector.children[0];
-
-			let transformed;
-
-			if ( firstToken.type === 'TypeSelector' ) {
-				const insert = firstToken.end - offset;
-				const head = css.slice( start, insert );
-				const tail = css.slice( insert, end );
-
-				transformed = `${head}${attr}${tail}, ${attr} ${selectorString}`;
-			} else {
-				transformed = `${attr}${selectorString}, ${attr} ${selectorString}`;
-			}
-
-			code.overwrite( start + offset, end + offset, transformed );
-		});
-
-		rule.block.children.forEach( block => {
-			if ( block.type === 'Declaration' ) {
-				const property = block.property.toLowerCase();
-				if ( property === 'animation' || property === 'animation-name' ) {
-					block.value.children.forEach( block => {
-						if ( block.type === 'Identifier' ) {
-							const name = block.name;
-							if ( keyframes.has( name ) ) {
-								code.overwrite( block.start, block.end, keyframes.get( name ) );
-							}
-						}
-					});
-				}
-			}
-		});
-	}
-
-	function walk ( node ) {
-		if ( node.type === 'Rule' ) {
-			transform( node );
-		} else if ( node.type === 'Atrule' && node.name.toLowerCase() === 'keyframes' ) {
-			// these have already been processed
-		} else if ( node.children ) {
-			node.children.forEach( walk );
-		} else if ( node.block ) {
-			walk( node.block );
-		}
-	}
-
-	parsed.css.children.forEach( walk );
-
-	// remove comments. TODO would be nice if this was exposed in css-tree
-	let match;
-	while ( match = commentsPattern.exec( css ) ) {
-		const start = match.index + offset;
-		const end = start + match[0].length;
-
-		code.remove( start, end );
-	}
-
-	return code.slice( parsed.css.content.start, parsed.css.content.end );
-}
diff --git a/src/generators/shared/processCss.ts b/src/generators/shared/processCss.ts
new file mode 100644
index 0000000000..8ea6021452
--- /dev/null
+++ b/src/generators/shared/processCss.ts
@@ -0,0 +1,146 @@
+import MagicString from 'magic-string';
+import { Parsed, Node } from '../../interfaces';
+
+const commentsPattern = /\/\*[\s\S]*?\*\//g;
+
+export default function processCss(
+	parsed: Parsed,
+	code: MagicString,
+	cascade: boolean
+) {
+	const css = parsed.css.content.styles;
+	const offset = parsed.css.content.start;
+
+	const attr = `[svelte-${parsed.hash}]`;
+
+	const keyframes = new Map();
+
+	function walkKeyframes(node: Node) {
+		if (node.type === 'Atrule' && node.name.toLowerCase() === 'keyframes') {
+			node.expression.children.forEach((expression: Node) => {
+				if (expression.type === 'Identifier') {
+					if (expression.name.startsWith('-global-')) {
+						code.remove(expression.start, expression.start + 8);
+					} else {
+						const newName = `svelte-${parsed.hash}-${expression.name}`;
+						code.overwrite(expression.start, expression.end, newName);
+						keyframes.set(expression.name, newName);
+					}
+				}
+			});
+		} else if (node.children) {
+			node.children.forEach(walkKeyframes);
+		} else if (node.block) {
+			walkKeyframes(node.block);
+		}
+	}
+
+	parsed.css.children.forEach(walkKeyframes);
+
+	function transform(rule: Node) {
+		rule.selector.children.forEach((selector: Node) => {
+			if (cascade) {
+				// TODO disable cascading (without :global(...)) in v2
+				const start = selector.start - offset;
+				const end = selector.end - offset;
+
+				const selectorString = css.slice(start, end);
+
+				const firstToken = selector.children[0];
+
+				let transformed;
+
+				if (firstToken.type === 'TypeSelector') {
+					const insert = firstToken.end - offset;
+					const head = css.slice(start, insert);
+					const tail = css.slice(insert, end);
+
+					transformed = `${head}${attr}${tail}, ${attr} ${selectorString}`;
+				} else {
+					transformed = `${attr}${selectorString}, ${attr} ${selectorString}`;
+				}
+
+				code.overwrite(selector.start, selector.end, transformed);
+			} else {
+				let shouldTransform = true;
+				let c = selector.start;
+
+				selector.children.forEach((child: Node) => {
+					if (child.type === 'WhiteSpace' || child.type === 'Combinator') {
+						code.appendLeft(c, attr);
+						shouldTransform = true;
+						return;
+					}
+
+					if (!shouldTransform) return;
+
+					if (child.type === 'PseudoClassSelector') {
+						// `:global(xyz)` > xyz
+						if (child.name === 'global') {
+							const first = child.children[0];
+							const last = child.children[child.children.length - 1];
+							code.remove(child.start, first.start).remove(last.end, child.end);
+						} else {
+							code.prependRight(c, attr);
+						}
+
+						shouldTransform = false;
+					} else if (child.type === 'PseudoElementSelector') {
+						code.prependRight(c, attr);
+						shouldTransform = false;
+					}
+
+					c = child.end;
+				});
+
+				if (shouldTransform) {
+					code.appendLeft(c, attr);
+				}
+			}
+		});
+
+		rule.block.children.forEach((block: Node) => {
+			if (block.type === 'Declaration') {
+				const property = block.property.toLowerCase();
+				if (property === 'animation' || property === 'animation-name') {
+					block.value.children.forEach((block: Node) => {
+						if (block.type === 'Identifier') {
+							const name = block.name;
+							if (keyframes.has(name)) {
+								code.overwrite(block.start, block.end, keyframes.get(name));
+							}
+						}
+					});
+				}
+			}
+		});
+	}
+
+	function walk(node: Node) {
+		if (node.type === 'Rule') {
+			transform(node);
+		} else if (
+			node.type === 'Atrule' &&
+			node.name.toLowerCase() === 'keyframes'
+		) {
+			// these have already been processed
+		} else if (node.children) {
+			node.children.forEach(walk);
+		} else if (node.block) {
+			walk(node.block);
+		}
+	}
+
+	parsed.css.children.forEach(walk);
+
+	// remove comments. TODO would be nice if this was exposed in css-tree
+	let match;
+	while ((match = commentsPattern.exec(css))) {
+		const start = match.index + offset;
+		const end = start + match[0].length;
+
+		code.remove(start, end);
+	}
+
+	return code.slice(parsed.css.content.start, parsed.css.content.end);
+}
diff --git a/src/generators/shared/utils/getGlobals.js b/src/generators/shared/utils/getGlobals.js
deleted file mode 100644
index 0d3e7bad14..0000000000
--- a/src/generators/shared/utils/getGlobals.js
+++ /dev/null
@@ -1,43 +0,0 @@
-export default function getGlobals ( imports, { globals, onerror, onwarn } ) {
-	const globalFn = getGlobalFn( globals );
-
-	return imports.map( x => {
-		let name = globalFn( x.source.value );
-
-		if ( !name ) {
-			if ( x.name.startsWith( '__import' ) ) {
-				const error = new Error( `Could not determine name for imported module '${x.source.value}' – use options.globals` );
-				if ( onerror ) {
-					onerror( error );
-				} else {
-					throw error;
-				}
-			}
-
-			else {
-				const warning = {
-					message: `No name was supplied for imported module '${x.source.value}'. Guessing '${x.name}', but you should use options.globals`
-				};
-
-				if ( onwarn ) {
-					onwarn( warning );
-				} else {
-					console.warn( warning ); // eslint-disable-line no-console
-				}
-			}
-
-			name = x.name;
-		}
-
-		return name;
-	});
-}
-
-function getGlobalFn ( globals ) {
-	if ( typeof globals === 'function' ) return globals;
-	if ( typeof globals === 'object' ) {
-		return id => globals[ id ];
-	}
-
-	return () => undefined;
-}
diff --git a/src/generators/shared/utils/getGlobals.ts b/src/generators/shared/utils/getGlobals.ts
new file mode 100644
index 0000000000..1c00a08f60
--- /dev/null
+++ b/src/generators/shared/utils/getGlobals.ts
@@ -0,0 +1,50 @@
+import { Declaration, Options } from './getIntro';
+
+export type Globals = (id: string) => any;
+
+export default function getGlobals(imports: Declaration[], options: Options) {
+	const { globals, onerror, onwarn } = options;
+	const globalFn = getGlobalFn(globals);
+
+	return imports.map(x => {
+		let name = globalFn(x.source.value);
+
+		if (!name) {
+			if (x.name.startsWith('__import')) {
+				const error = new Error(
+					`Could not determine name for imported module '${x.source
+						.value}' – use options.globals`
+				);
+				if (onerror) {
+					onerror(error);
+				} else {
+					throw error;
+				}
+			} else {
+				const warning = {
+					message: `No name was supplied for imported module '${x.source
+						.value}'. Guessing '${x.name}', but you should use options.globals`,
+				};
+
+				if (onwarn) {
+					onwarn(warning);
+				} else {
+					console.warn(warning); // eslint-disable-line no-console
+				}
+			}
+
+			name = x.name;
+		}
+
+		return name;
+	});
+}
+
+function getGlobalFn(globals: any): Globals {
+	if (typeof globals === 'function') return globals;
+	if (typeof globals === 'object') {
+		return id => globals[id];
+	}
+
+	return () => undefined;
+}
diff --git a/src/generators/shared/utils/getIntro.js b/src/generators/shared/utils/getIntro.js
deleted file mode 100644
index c0fa4b4a69..0000000000
--- a/src/generators/shared/utils/getIntro.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import deindent from '../../../utils/deindent.js';
-import getGlobals from './getGlobals.js';
-
-export default function getIntro ( format, options, imports ) {
-	if ( format === 'es' ) return '';
-	if ( format === 'amd' ) return getAmdIntro( options, imports );
-	if ( format === 'cjs' ) return getCjsIntro( options, imports );
-	if ( format === 'iife' ) return getIifeIntro( options, imports );
-	if ( format === 'umd' ) return getUmdIntro( options, imports );
-	if ( format === 'eval' ) return getEvalIntro( options, imports );
-
-	throw new Error( `Not implemented: ${format}` );
-}
-
-function getAmdIntro ( options, imports ) {
-	const sourceString = imports.length ?
-		`[ ${imports.map( declaration => `'${removeExtension( declaration.source.value )}'` ).join( ', ' )} ], ` :
-		'';
-
-	const id = options.amd && options.amd.id;
-
-	return `define(${id ? ` '${id}', ` : ''}${sourceString}function (${paramString( imports )}) { 'use strict';\n\n`;
-}
-
-function getCjsIntro ( options, imports ) {
-	const requireBlock = imports
-		.map( declaration => `var ${declaration.name} = require( '${declaration.source.value}' );` )
-		.join( '\n\n' );
-
-	if ( requireBlock ) {
-		return `'use strict';\n\n${requireBlock}\n\n`;
-	}
-
-	return `'use strict';\n\n`;
-}
-
-function getIifeIntro ( options, imports ) {
-	if ( !options.name ) {
-		throw new Error( `Missing required 'name' option for IIFE export` );
-	}
-
-	return `var ${options.name} = (function (${paramString( imports )}) { 'use strict';\n\n`;
-}
-
-function getUmdIntro ( options, imports ) {
-	if ( !options.name ) {
-		throw new Error( `Missing required 'name' option for UMD export` );
-	}
-
-	const amdId = options.amd && options.amd.id ? `'${options.amd.id}', ` : '';
-
-	const amdDeps = imports.length ? `[${imports.map( declaration => `'${removeExtension( declaration.source.value )}'` ).join( ', ')}], ` : '';
-	const cjsDeps = imports.map( declaration => `require('${declaration.source.value}')` ).join( ', ' );
-	const globalDeps = getGlobals( imports, options );
-
-	return deindent`
-		(function ( global, factory ) {
-			typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(${cjsDeps}) :
-			typeof define === 'function' && define.amd ? define(${amdId}${amdDeps}factory) :
-			(global.${options.name} = factory(${globalDeps}));
-		}(this, (function (${paramString( imports )}) { 'use strict';` + '\n\n';
-}
-
-function getEvalIntro ( options, imports ) {
-	return `(function (${paramString( imports )}) { 'use strict';\n\n`;
-}
-
-function paramString ( imports ) {
-	return imports.length ? ` ${imports.map( dep => dep.name ).join( ', ' )} ` : '';
-}
-
-function removeExtension ( file ) {
-	const index = file.lastIndexOf( '.' );
-	return ~index ? file.slice( 0, index ) : file;
-}
diff --git a/src/generators/shared/utils/getIntro.ts b/src/generators/shared/utils/getIntro.ts
new file mode 100644
index 0000000000..7427f69a0b
--- /dev/null
+++ b/src/generators/shared/utils/getIntro.ts
@@ -0,0 +1,115 @@
+import deindent from '../../../utils/deindent';
+import getGlobals, { Globals } from './getGlobals';
+
+export type ModuleFormat = 'es' | 'amd' | 'cjs' | 'iife' | 'umd' | 'eval';
+
+export interface Options {
+	name: string;
+	amd?: {
+		id?: string;
+	};
+	globals: Globals | object;
+	onerror: (err: Error) => void;
+	onwarn: (obj: Error | { message: string }) => void;
+}
+
+export interface Declaration {
+	name: string;
+	source: {
+		value: string;
+	};
+}
+
+export default function getIntro(
+	format: ModuleFormat,
+	options: Options,
+	imports: Declaration[]
+) {
+	if (format === 'es') return '';
+	if (format === 'amd') return getAmdIntro(options, imports);
+	if (format === 'cjs') return getCjsIntro(options, imports);
+	if (format === 'iife') return getIifeIntro(options, imports);
+	if (format === 'umd') return getUmdIntro(options, imports);
+	if (format === 'eval') return getEvalIntro(options, imports);
+
+	throw new Error(`Not implemented: ${format}`);
+}
+
+function getAmdIntro(options: Options, imports: Declaration[]) {
+	const sourceString = imports.length
+		? `[ ${imports
+				.map(declaration => `'${removeExtension(declaration.source.value)}'`)
+				.join(', ')} ], `
+		: '';
+
+	const id = options.amd && options.amd.id;
+
+	return `define(${id
+		? ` '${id}', `
+		: ''}${sourceString}function (${paramString(imports)}) { 'use strict';\n\n`;
+}
+
+function getCjsIntro(options: Options, imports: Declaration[]) {
+	const requireBlock = imports
+		.map(
+			declaration =>
+				`var ${declaration.name} = require( '${declaration.source.value}' );`
+		)
+		.join('\n\n');
+
+	if (requireBlock) {
+		return `'use strict';\n\n${requireBlock}\n\n`;
+	}
+
+	return `'use strict';\n\n`;
+}
+
+function getIifeIntro(options: Options, imports: Declaration[]) {
+	if (!options.name) {
+		throw new Error(`Missing required 'name' option for IIFE export`);
+	}
+
+	return `var ${options.name} = (function (${paramString(
+		imports
+	)}) { 'use strict';\n\n`;
+}
+
+function getUmdIntro(options: Options, imports: Declaration[]) {
+	if (!options.name) {
+		throw new Error(`Missing required 'name' option for UMD export`);
+	}
+
+	const amdId = options.amd && options.amd.id ? `'${options.amd.id}', ` : '';
+
+	const amdDeps = imports.length
+		? `[${imports
+				.map(declaration => `'${removeExtension(declaration.source.value)}'`)
+				.join(', ')}], `
+		: '';
+	const cjsDeps = imports
+		.map(declaration => `require('${declaration.source.value}')`)
+		.join(', ');
+	const globalDeps = getGlobals(imports, options);
+
+	return (
+		deindent`
+		(function ( global, factory ) {
+			typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(${cjsDeps}) :
+			typeof define === 'function' && define.amd ? define(${amdId}${amdDeps}factory) :
+			(global.${options.name} = factory(${globalDeps}));
+		}(this, (function (${paramString(imports)}) { 'use strict';` + '\n\n'
+	);
+}
+
+function getEvalIntro(options: Options, imports: Declaration[]) {
+	return `(function (${paramString(imports)}) { 'use strict';\n\n`;
+}
+
+function paramString(imports: Declaration[]) {
+	return imports.length ? ` ${imports.map(dep => dep.name).join(', ')} ` : '';
+}
+
+function removeExtension(file: string) {
+	const index = file.lastIndexOf('.');
+	return ~index ? file.slice(0, index) : file;
+}
diff --git a/src/generators/shared/utils/getOutro.js b/src/generators/shared/utils/getOutro.js
deleted file mode 100644
index 7f7c9354cf..0000000000
--- a/src/generators/shared/utils/getOutro.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import getGlobals from './getGlobals.js';
-
-export default function getOutro ( format, name, options, imports ) {
-	if ( format === 'es' ) {
-		return `export default ${name};`;
-	}
-
-	if ( format === 'amd' ) {
-		return `return ${name};\n\n});`;
-	}
-
-	if ( format === 'cjs' ) {
-		return `module.exports = ${name};`;
-	}
-
-	if ( format === 'iife' ) {
-		const globals = getGlobals( imports, options );
-		return `return ${name};\n\n}(${globals.join( ', ' )}));`;
-	}
-
-	if ( format === 'eval' ) {
-		const globals = getGlobals( imports, options );
-		return `return ${name};\n\n}(${globals.join( ', ' )}));`;
-	}
-
-	if ( format === 'umd' ) {
-		return `return ${name};\n\n})));`;
-	}
-
-	throw new Error( `Not implemented: ${format}` );
-}
diff --git a/src/generators/shared/utils/getOutro.ts b/src/generators/shared/utils/getOutro.ts
new file mode 100644
index 0000000000..f9d8f186bc
--- /dev/null
+++ b/src/generators/shared/utils/getOutro.ts
@@ -0,0 +1,36 @@
+import getGlobals from './getGlobals';
+
+export default function getOutro(
+	format: string,
+	name: string,
+	options,
+	imports
+) {
+	if (format === 'es') {
+		return `export default ${name};`;
+	}
+
+	if (format === 'amd') {
+		return `return ${name};\n\n});`;
+	}
+
+	if (format === 'cjs') {
+		return `module.exports = ${name};`;
+	}
+
+	if (format === 'iife') {
+		const globals = getGlobals(imports, options);
+		return `return ${name};\n\n}(${globals.join(', ')}));`;
+	}
+
+	if (format === 'eval') {
+		const globals = getGlobals(imports, options);
+		return `return ${name};\n\n}(${globals.join(', ')}));`;
+	}
+
+	if (format === 'umd') {
+		return `return ${name};\n\n})));`;
+	}
+
+	throw new Error(`Not implemented: ${format}`);
+}
diff --git a/src/generators/shared/utils/walkHtml.js b/src/generators/shared/utils/walkHtml.js
deleted file mode 100644
index 39568cd742..0000000000
--- a/src/generators/shared/utils/walkHtml.js
+++ /dev/null
@@ -1,18 +0,0 @@
-export default function walkHtml ( html, visitors ) {
-	function visit ( node ) {
-		const visitor = visitors[ node.type ];
-		if ( !visitor ) throw new Error( `Not implemented: ${node.type}` );
-
-		if ( visitor.enter ) visitor.enter( node );
-
-		if ( node.children ) {
-			node.children.forEach( child => {
-				visit( child );
-			});
-		}
-
-		if ( visitor.leave ) visitor.leave( node );
-	}
-
-	visit( html );
-}
diff --git a/src/generators/shared/utils/walkHtml.ts b/src/generators/shared/utils/walkHtml.ts
new file mode 100644
index 0000000000..e12b36bbf2
--- /dev/null
+++ b/src/generators/shared/utils/walkHtml.ts
@@ -0,0 +1,20 @@
+import { Node } from '../../../interfaces';
+
+export default function walkHtml(html: Node, visitors) {
+	function visit(node: Node) {
+		const visitor = visitors[node.type];
+		if (!visitor) throw new Error(`Not implemented: ${node.type}`);
+
+		if (visitor.enter) visitor.enter(node);
+
+		if (node.children) {
+			node.children.forEach((child: Node) => {
+				visit(child);
+			});
+		}
+
+		if (visitor.leave) visitor.leave(node);
+	}
+
+	visit(html);
+}
diff --git a/src/index.js b/src/index.js
deleted file mode 100644
index b7f158a84f..0000000000
--- a/src/index.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import parse from './parse/index.js';
-import validate from './validate/index.js';
-import generate from './generators/dom/index.js';
-import generateSSR from './generators/server-side-rendering/index.js';
-import { assign } from './shared/index.js';
-import { version } from '../package.json';
-
-function normalizeOptions ( options ) {
-	return assign( {
-		generate: 'dom',
-
-		// a filename is necessary for sourcemap generation
-		filename: 'SvelteComponent.html',
-
-		onwarn: warning => {
-			if ( warning.loc ) {
-				console.warn( `(${warning.loc.line}:${warning.loc.column}) – ${warning.message}` ); // eslint-disable-line no-console
-			} else {
-				console.warn( warning.message ); // eslint-disable-line no-console
-			}
-		},
-
-		onerror: error => {
-			throw error;
-		}
-	}, options );
-}
-
-export function compile ( source, _options ) {
-	const options = normalizeOptions( _options );
-
-	let parsed;
-
-	try {
-		parsed = parse( source, options );
-	} catch ( err ) {
-		options.onerror( err );
-		return;
-	}
-
-	validate( parsed, source, options );
-
-	const compiler = options.generate === 'ssr'
-		? generateSSR
-		: generate;
-
-	return compiler( parsed, source, options );
-}
-
-export function create ( source, _options = {} ) {
-	_options.format = 'eval';
-
-	const compiled = compile( source, _options );
-
-	if ( !compiled || !compiled.code ) {
-		return;
-	}
-
-	let result;
-	try {
-		result = (new Function( 'return ' + compiled.code ))();
-	} catch ( err ) {
-		if ( _options.onerror ) {
-			_options.onerror( err );
-		} else {
-			throw err;
-		}
-		return;
-	}
-
-	return result;
-}
-
-export { parse, validate, version as VERSION };
diff --git a/src/index.ts b/src/index.ts
new file mode 100644
index 0000000000..5c9d98992f
--- /dev/null
+++ b/src/index.ts
@@ -0,0 +1,75 @@
+import parse from './parse/index';
+import validate from './validate/index';
+import generate from './generators/dom/index';
+import generateSSR from './generators/server-side-rendering/index';
+import { assign } from './shared/index.js';
+import { version } from '../package.json';
+import { Parsed, CompileOptions, Warning } from './interfaces';
+
+function normalizeOptions(options: CompileOptions): CompileOptions {
+	return assign(
+		{
+			generate: 'dom',
+
+			// a filename is necessary for sourcemap generation
+			filename: 'SvelteComponent.html',
+
+			onwarn: (warning: Warning) => {
+				if (warning.loc) {
+					console.warn(
+						`(${warning.loc.line}:${warning.loc.column}) – ${warning.message}`
+					); // eslint-disable-line no-console
+				} else {
+					console.warn(warning.message); // eslint-disable-line no-console
+				}
+			},
+
+			onerror: (error: Error) => {
+				throw error;
+			},
+		},
+		options
+	);
+}
+
+export function compile(source: string, _options: CompileOptions) {
+	const options = normalizeOptions(_options);
+
+	let parsed: Parsed;
+
+	try {
+		parsed = parse(source, options);
+	} catch (err) {
+		options.onerror(err);
+		return;
+	}
+
+	validate(parsed, source, options);
+
+	const compiler = options.generate === 'ssr' ? generateSSR : generate;
+
+	return compiler(parsed, source, options);
+}
+
+export function create(source: string, _options: CompileOptions = {}) {
+	_options.format = 'eval';
+
+	const compiled = compile(source, _options);
+
+	if (!compiled || !compiled.code) {
+		return;
+	}
+
+	try {
+		return new Function('return ' + compiled.code)();
+	} catch (err) {
+		if (_options.onerror) {
+			_options.onerror(err);
+			return;
+		} else {
+			throw err;
+		}
+	}
+}
+
+export { parse, validate, version as VERSION };
diff --git a/src/interfaces.ts b/src/interfaces.ts
new file mode 100644
index 0000000000..fbb745b7b8
--- /dev/null
+++ b/src/interfaces.ts
@@ -0,0 +1,48 @@
+export interface Node {
+	start: number;
+	end: number;
+	type: string;
+	[propName: string]: any;
+}
+
+export interface Parser {
+	readonly template: string;
+	readonly filename?: string;
+
+	index: number;
+	stack: Array<Node>;
+
+	html: Node;
+	css: Node;
+	js: Node;
+	metaTags: {};
+}
+
+export interface Parsed {
+	hash: number;
+	html: Node;
+	css: Node;
+	js: Node;
+}
+
+export interface Warning {
+	loc?: { line: number; column: number; pos: number };
+	message: string;
+	filename?: string;
+	toString: () => string;
+}
+
+export interface CompileOptions {
+	format?: string;
+	name?: string;
+	filename?: string;
+	generate?: string;
+
+	dev?: boolean;
+	shared?: boolean | string;
+	cascade?: boolean;
+	hydratable?: boolean;
+
+	onerror?: (error: Error) => void;
+	onwarn?: (warning: Warning) => void;
+}
diff --git a/src/parse/index.js b/src/parse/index.js
deleted file mode 100644
index 7ea7be222f..0000000000
--- a/src/parse/index.js
+++ /dev/null
@@ -1,179 +0,0 @@
-import { locate } from 'locate-character';
-import fragment from './state/fragment.js';
-import { whitespace } from '../utils/patterns.js';
-import { trimStart, trimEnd } from '../utils/trim.js';
-import getCodeFrame from '../utils/getCodeFrame.js';
-import hash from './utils/hash.js';
-
-function ParseError ( message, template, index, filename ) {
-	const { line, column } = locate( template, index );
-
-	this.name = 'ParseError';
-	this.message = message;
-	this.frame = getCodeFrame( template, line, column );
-
-	this.loc = { line: line + 1, column };
-	this.pos = index;
-	this.filename = filename;
-}
-
-ParseError.prototype.toString = function () {
-	return `${this.message} (${this.loc.line}:${this.loc.column})\n${this.frame}`;
-};
-
-export default function parse ( template, options = {} ) {
-	if ( typeof template !== 'string' ) {
-		throw new TypeError( 'Template must be a string' );
-	}
-
-	template = template.replace( /\s+$/, '' );
-
-	const parser = {
-		index: 0,
-		template,
-		stack: [],
-		metaTags: {},
-
-		current () {
-			return this.stack[ this.stack.length - 1 ];
-		},
-
-		acornError ( err ) {
-			parser.error( err.message.replace( / \(\d+:\d+\)$/, '' ), err.pos );
-		},
-
-		error ( message, index = this.index ) {
-			throw new ParseError( message, this.template, index, options.filename );
-		},
-
-		eat ( str, required ) {
-			if ( this.match( str ) ) {
-				this.index += str.length;
-				return true;
-			}
-
-			if ( required ) {
-				this.error( `Expected ${str}` );
-			}
-		},
-
-		match ( str ) {
-			return this.template.slice( this.index, this.index + str.length ) === str;
-		},
-
-		allowWhitespace () {
-			while ( this.index < this.template.length && whitespace.test( this.template[ this.index ] ) ) {
-				this.index++;
-			}
-		},
-
-		read ( pattern ) {
-			const match = pattern.exec( this.template.slice( this.index ) );
-			if ( !match || match.index !== 0 ) return null;
-
-			parser.index += match[0].length;
-
-			return match[0];
-		},
-
-		readUntil ( pattern ) {
-			if ( this.index >= this.template.length ) parser.error( 'Unexpected end of input' );
-
-			const start = this.index;
-			const match = pattern.exec( this.template.slice( start ) );
-
-			if ( match ) {
-				const start = this.index;
-				this.index = start + match.index;
-				return this.template.slice( start, this.index );
-			}
-
-			this.index = this.template.length;
-			return this.template.slice( start );
-		},
-
-		remaining () {
-			return this.template.slice( this.index );
-		},
-
-		requireWhitespace () {
-			if ( !whitespace.test( this.template[ this.index ] ) ) {
-				this.error( `Expected whitespace` );
-			}
-
-			this.allowWhitespace();
-		},
-
-		html: {
-			start: null,
-			end: null,
-			type: 'Fragment',
-			children: []
-		},
-
-		css: null,
-
-		js: null
-	};
-
-	parser.stack.push( parser.html );
-
-	let state = fragment;
-
-	while ( parser.index < parser.template.length ) {
-		state = state( parser ) || fragment;
-	}
-
-	if ( parser.stack.length > 1 ) {
-		const current = parser.current();
-
-		const type = current.type === 'Element' ? `<${current.name}>` : 'Block';
-		parser.error( `${type} was left open`, current.start );
-	}
-
-	if ( state !== fragment ) {
-		parser.error( 'Unexpected end of input' );
-	}
-
-	// trim unnecessary whitespace
-	while ( parser.html.children.length ) {
-		const firstChild = parser.html.children[0];
-		parser.html.start = firstChild.start;
-
-		if ( firstChild.type !== 'Text' ) break;
-
-		const length = firstChild.data.length;
-		firstChild.data = trimStart( firstChild.data );
-
-		if ( firstChild.data === '' ) {
-			parser.html.children.shift();
-		} else {
-			parser.html.start += length - firstChild.data.length;
-			break;
-		}
-	}
-
-	while ( parser.html.children.length ) {
-		const lastChild = parser.html.children[ parser.html.children.length - 1 ];
-		parser.html.end = lastChild.end;
-
-		if ( lastChild.type !== 'Text' ) break;
-
-		const length = lastChild.data.length;
-		lastChild.data = trimEnd( lastChild.data );
-
-		if ( lastChild.data === '' ) {
-			parser.html.children.pop();
-		} else {
-			parser.html.end -= length - lastChild.data.length;
-			break;
-		}
-	}
-
-	return {
-		hash: hash( template ),
-		html: parser.html,
-		css: parser.css,
-		js: parser.js
-	};
-}
diff --git a/src/parse/index.ts b/src/parse/index.ts
new file mode 100644
index 0000000000..514e074fd4
--- /dev/null
+++ b/src/parse/index.ts
@@ -0,0 +1,180 @@
+import { locate, Location } from 'locate-character';
+import fragment from './state/fragment';
+import { whitespace } from '../utils/patterns';
+import { trimStart, trimEnd } from '../utils/trim';
+import getCodeFrame from '../utils/getCodeFrame';
+import hash from './utils/hash';
+import { Node, Parsed } from '../interfaces';
+import CompileError from '../utils/CompileError';
+
+class ParseError extends CompileError {
+	constructor(
+		message: string,
+		template: string,
+		index: number,
+		filename: string
+	) {
+		super(message, template, index, filename);
+		this.name = 'ParseError';
+	}
+}
+
+interface ParserOptions {
+	filename?: string;
+}
+
+export class Parser {
+	readonly template: string;
+	readonly filename?: string;
+
+	index: number;
+	stack: Array<Node>;
+
+	html: Node;
+	css: Node;
+	js: Node;
+	metaTags: {};
+
+	constructor(template: string, options: ParserOptions) {
+		if (typeof template !== 'string') {
+			throw new TypeError('Template must be a string');
+		}
+
+		this.template = template.replace(/\s+$/, '');
+		this.filename = options.filename;
+
+		this.index = 0;
+		this.stack = [];
+		this.metaTags = {};
+
+		this.html = {
+			start: null,
+			end: null,
+			type: 'Fragment',
+			children: [],
+		};
+
+		this.css = null;
+		this.js = null;
+
+		this.stack.push(this.html);
+
+		let state = fragment;
+
+		while (this.index < this.template.length) {
+			state = state(this) || fragment;
+		}
+
+		if (this.stack.length > 1) {
+			const current = this.current();
+
+			const type = current.type === 'Element' ? `<${current.name}>` : 'Block';
+			this.error(`${type} was left open`, current.start);
+		}
+
+		if (state !== fragment) {
+			this.error('Unexpected end of input');
+		}
+
+		if (this.html.children.length) {
+			let start = this.html.children[0] && this.html.children[0].start;
+			while (/\s/.test(template[start])) start += 1;
+
+			let end = this.html.children[this.html.children.length - 1] && this.html.children[this.html.children.length - 1].end;
+			while (/\s/.test(template[end - 1])) end -= 1;
+
+			this.html.start = start;
+			this.html.end = end;
+		} else {
+			this.html.start = this.html.end = null;
+		}
+	}
+
+	current() {
+		return this.stack[this.stack.length - 1];
+	}
+
+	acornError(err: Error) {
+		this.error(err.message.replace(/ \(\d+:\d+\)$/, ''), err.pos);
+	}
+
+	error(message: string, index = this.index) {
+		throw new ParseError(message, this.template, index, this.filename);
+	}
+
+	eat(str: string, required?: boolean) {
+		if (this.match(str)) {
+			this.index += str.length;
+			return true;
+		}
+
+		if (required) {
+			this.error(`Expected ${str}`);
+		}
+	}
+
+	match(str: string) {
+		return this.template.slice(this.index, this.index + str.length) === str;
+	}
+
+	allowWhitespace() {
+		while (
+			this.index < this.template.length &&
+			whitespace.test(this.template[this.index])
+		) {
+			this.index++;
+		}
+	}
+
+	read(pattern: RegExp) {
+		const match = pattern.exec(this.template.slice(this.index));
+		if (!match || match.index !== 0) return null;
+
+		this.index += match[0].length;
+
+		return match[0];
+	}
+
+	readUntil(pattern: RegExp) {
+		if (this.index >= this.template.length)
+			this.error('Unexpected end of input');
+
+		const start = this.index;
+		const match = pattern.exec(this.template.slice(start));
+
+		if (match) {
+			const start = this.index;
+			this.index = start + match.index;
+			return this.template.slice(start, this.index);
+		}
+
+		this.index = this.template.length;
+		return this.template.slice(start);
+	}
+
+	remaining() {
+		return this.template.slice(this.index);
+	}
+
+	requireWhitespace() {
+		if (!whitespace.test(this.template[this.index])) {
+			this.error(`Expected whitespace`);
+		}
+
+		this.allowWhitespace();
+	}
+}
+
+export default function parse(
+	template: string,
+	options: ParserOptions = {}
+): Parsed {
+	const parser = new Parser(template, options);
+
+	return {
+		hash: hash(parser.template),
+		html: parser.html,
+		css: parser.css,
+		js: parser.js,
+	};
+}
diff --git a/src/parse/read/directives.js b/src/parse/read/directives.js
deleted file mode 100644
index 28adc3078a..0000000000
--- a/src/parse/read/directives.js
+++ /dev/null
@@ -1,129 +0,0 @@
-import { parse, parseExpressionAt } from 'acorn';
-import spaces from '../../utils/spaces.js';
-
-export function readEventHandlerDirective ( parser, start, name ) {
-	const quoteMark = (
-		parser.eat( `'` ) ? `'` :
-		parser.eat( `"` ) ? `"` :
-		null
-	);
-
-	const expressionStart = parser.index;
-
-	let str = '';
-	let escaped = false;
-
-	for ( let i = expressionStart; i < parser.template.length; i += 1 ) {
-		const char = parser.template[i];
-
-		if ( quoteMark ) {
-			if ( char === quoteMark ) {
-				if ( escaped ) {
-					str += quoteMark;
-				} else {
-					parser.index = i + 1;
-					break;
-				}
-			} else if ( escaped ) {
-				str += '\\' + char;
-				escaped = false;
-			} else if ( char === '\\' ) {
-				escaped = true;
-			} else {
-				str += char;
-			}
-		}
-
-		else if ( /\s/.test( char ) ) {
-			parser.index = i;
-			break;
-		}
-
-		else {
-			str += char;
-		}
-	}
-
-	const ast = parse( spaces( expressionStart ) + str );
-
-	if ( ast.body.length > 1 ) {
-		parser.error( `Event handler should be a single call expression`, ast.body[1].start );
-	}
-
-	const expression = ast.body[0].expression;
-
-	if ( expression.type !== 'CallExpression' ) {
-		parser.error( `Expected call expression`, expressionStart );
-	}
-
-	return {
-		start,
-		end: parser.index,
-		type: 'EventHandler',
-		name,
-		expression
-	};
-}
-
-export function readBindingDirective ( parser, start, name ) {
-	let value;
-
-	if ( parser.eat( '=' ) ) {
-		const quoteMark = (
-			parser.eat( `'` ) ? `'` :
-			parser.eat( `"` ) ? `"` :
-			null
-		);
-
-		const a = parser.index;
-
-		if ( parser.eat( '{{' ) ) {
-			let message = 'bound values should not be wrapped';
-			const b = parser.template.indexOf( '}}', a );
-			if ( b !== -1 ) {
-				const value = parser.template.slice( parser.index, b );
-				message += ` — use '${value}', not '{{${value}}}'`;
-			}
-
-			parser.error( message, a );
-		}
-
-		// this is a bit of a hack so that we can give Acorn something parseable
-		let b;
-		if ( quoteMark ) {
-			b = parser.index = parser.template.indexOf( quoteMark, parser.index );
-		} else {
-			parser.readUntil( /[\s\r\n\/>]/ );
-			b = parser.index;
-		}
-
-		const source = spaces( a ) + parser.template.slice( a, b );
-		value = parseExpressionAt( source, a );
-
-		if ( value.type !== 'Identifier' && value.type !== 'MemberExpression' ) {
-			parser.error( `Expected valid property name` );
-		}
-
-		parser.allowWhitespace();
-
-		if ( quoteMark ) {
-			parser.eat( quoteMark, true );
-		}
-	} else {
-		// shorthand – bind:foo equivalent to bind:foo='foo'
-		value = {
-			type: 'Identifier',
-			start: start + 5,
-			end: parser.index,
-			name
-		};
-	}
-
-	return {
-		start,
-		end: parser.index,
-		type: 'Binding',
-		name,
-		value
-	};
-}
diff --git a/src/parse/read/directives.ts b/src/parse/read/directives.ts
new file mode 100644
index 0000000000..6064a61fcb
--- /dev/null
+++ b/src/parse/read/directives.ts
@@ -0,0 +1,159 @@
+import { parseExpressionAt } from 'acorn';
+import spaces from '../../utils/spaces';
+import { Parser } from '../index';
+
+function readExpression(parser: Parser, start: number, quoteMark) {
+	let str = '';
+	let escaped = false;
+
+	for (let i = start; i < parser.template.length; i += 1) {
+		const char = parser.template[i];
+
+		if (quoteMark) {
+			if (char === quoteMark) {
+				if (escaped) {
+					str += quoteMark;
+				} else {
+					break;
+				}
+			} else if (escaped) {
+				str += '\\' + char;
+				escaped = false;
+			} else if (char === '\\') {
+				escaped = true;
+			} else {
+				str += char;
+			}
+		} else if (/\s/.test(char)) {
+			break;
+		} else {
+			str += char;
+		}
+	}
+
+	const expression = parseExpressionAt(spaces(start) + str, start);
+	parser.index = expression.end;
+
+	parser.allowWhitespace();
+	if (quoteMark) parser.eat(quoteMark, true);
+
+	return expression;
+}
+
+export function readEventHandlerDirective(
+	parser: Parser,
+	start: number,
+	name: string
+) {
+	const quoteMark = parser.eat(`'`) ? `'` : parser.eat(`"`) ? `"` : null;
+
+	const expressionStart = parser.index;
+
+	const expression = readExpression(parser, expressionStart, quoteMark);
+
+	if (expression.type !== 'CallExpression') {
+		parser.error(`Expected call expression`, expressionStart);
+	}
+
+	return {
+		start,
+		end: parser.index,
+		type: 'EventHandler',
+		name,
+		expression,
+	};
+}
+
+export function readBindingDirective(
+	parser: Parser,
+	start: number,
+	name: string
+) {
+	let value;
+
+	if (parser.eat('=')) {
+		const quoteMark = parser.eat(`'`) ? `'` : parser.eat(`"`) ? `"` : null;
+
+		const a = parser.index;
+
+		if (parser.eat('{{')) {
+			let message = 'bound values should not be wrapped';
+			const b = parser.template.indexOf('}}', a);
+			if (b !== -1) {
+				const value = parser.template.slice(parser.index, b);
+				message += ` — use '${value}', not '{{${value}}}'`;
+			}
+
+			parser.error(message, a);
+		}
+
+		// this is a bit of a hack so that we can give Acorn something parseable
+		let b;
+		if (quoteMark) {
+			b = parser.index = parser.template.indexOf(quoteMark, parser.index);
+		} else {
+			parser.readUntil(/[\s\r\n\/>]/);
+			b = parser.index;
+		}
+
+		const source = spaces(a) + parser.template.slice(a, b);
+		value = parseExpressionAt(source, a);
+
+		if (value.type !== 'Identifier' && value.type !== 'MemberExpression') {
+			parser.error(`Cannot bind to rvalue`, value.start);
+		}
+
+		parser.allowWhitespace();
+
+		if (quoteMark) {
+			parser.eat(quoteMark, true);
+		}
+	} else {
+		// shorthand – bind:foo equivalent to bind:foo='foo'
+		value = {
+			type: 'Identifier',
+			start: start + 5,
+			end: parser.index,
+			name,
+		};
+	}
+
+	return {
+		start,
+		end: parser.index,
+		type: 'Binding',
+		name,
+		value,
+	};
+}
+
+export function readTransitionDirective(
+	parser: Parser,
+	start: number,
+	name: string,
+	type: string
+) {
+	let expression = null;
+
+	if (parser.eat('=')) {
+		const quoteMark = parser.eat(`'`) ? `'` : parser.eat(`"`) ? `"` : null;
+
+		const expressionStart = parser.index;
+
+		expression = readExpression(parser, expressionStart, quoteMark);
+
+		if (expression.type !== 'ObjectExpression') {
+			parser.error(`Expected object expression`, expressionStart);
+		}
+	}
+
+	return {
+		start,
+		end: parser.index,
+		type: 'Transition',
+		name,
+		intro: type === 'in' || type === 'transition',
+		outro: type === 'out' || type === 'transition',
+		expression,
+	};
+}
diff --git a/src/parse/read/expression.js b/src/parse/read/expression.js
deleted file mode 100644
index 7aa34b9bdc..0000000000
--- a/src/parse/read/expression.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import { parseExpressionAt } from 'acorn';
-
-const literals = new Map([
-	[ 'true', true ],
-	[ 'false', false ],
-	[ 'null', null ]
-]);
-
-export default function readExpression ( parser ) {
-	const start = parser.index;
-
-	const name = parser.readUntil( /\s*}}/ );
-	if ( name && /^[a-z]+$/.test( name ) ) {
-		const end = start + name.length;
-
-		if ( literals.has( name ) ) {
-			return {
-				type: 'Literal',
-				start,
-				end,
-				value: literals.get( name ),
-				raw: name
-			};
-		}
-
-		return {
-			type: 'Identifier',
-			start,
-			end: start + name.length,
-			name
-		};
-	}
-
-	parser.index = start;
-
-	try {
-		const node = parseExpressionAt( parser.template, parser.index );
-		parser.index = node.end;
-
-		return node;
-	} catch ( err ) {
-		parser.acornError( err );
-	}
-}
diff --git a/src/parse/read/expression.ts b/src/parse/read/expression.ts
new file mode 100644
index 0000000000..47e1d706df
--- /dev/null
+++ b/src/parse/read/expression.ts
@@ -0,0 +1,43 @@
+import { parseExpressionAt } from 'acorn';
+import { Parser } from '../index';
+
+const literals = new Map([['true', true], ['false', false], ['null', null]]);
+
+export default function readExpression(parser: Parser) {
+	const start = parser.index;
+
+	const name = parser.readUntil(/\s*}}/);
+	if (name && /^[a-z]+$/.test(name)) {
+		const end = start + name.length;
+
+		if (literals.has(name)) {
+			return {
+				type: 'Literal',
+				start,
+				end,
+				value: literals.get(name),
+				raw: name,
+			};
+		}
+
+		return {
+			type: 'Identifier',
+			start,
+			end: start + name.length,
+			name,
+		};
+	}
+
+	parser.index = start;
+
+	try {
+		const node = parseExpressionAt(parser.template, parser.index, {
+			preserveParens: true,
+		});
+		parser.index = node.end;
+
+		return node;
+	} catch (err) {
+		parser.acornError(err);
+	}
+}
diff --git a/src/parse/read/script.js b/src/parse/read/script.js
deleted file mode 100644
index 2d1156ad7d..0000000000
--- a/src/parse/read/script.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import { parse } from 'acorn';
-import spaces from '../../utils/spaces.js';
-
-const scriptClosingTag = '<\/script>';
-
-export default function readScript ( parser, start, attributes ) {
-	const scriptStart = parser.index;
-	const scriptEnd = parser.template.indexOf( scriptClosingTag, scriptStart );
-
-	if ( scriptEnd === -1 ) parser.error( `<script> must have a closing tag` );
-
-	const source = spaces( scriptStart ) + parser.template.slice( scriptStart, scriptEnd );
-	parser.index = scriptEnd + scriptClosingTag.length;
-
-	let ast;
-
-	try {
-		ast = parse( source, {
-			ecmaVersion: 8,
-			sourceType: 'module'
-		});
-	} catch ( err ) {
-		parser.acornError( err );
-	}
-
-	if ( !ast.body.length ) return null;
-
-	ast.start = scriptStart;
-	return {
-		start,
-		end: parser.index,
-		attributes,
-		content: ast
-	};
-}
diff --git a/src/parse/read/script.ts b/src/parse/read/script.ts
new file mode 100644
index 0000000000..4d4a8559a1
--- /dev/null
+++ b/src/parse/read/script.ts
@@ -0,0 +1,37 @@
+import { parse } from 'acorn';
+import spaces from '../../utils/spaces';
+import { Parser } from '../index';
+
+const scriptClosingTag = '</script>';
+
+export default function readScript(parser: Parser, start: number, attributes) {
+	const scriptStart = parser.index;
+	const scriptEnd = parser.template.indexOf(scriptClosingTag, scriptStart);
+
+	if (scriptEnd === -1) parser.error(`<script> must have a closing tag`);
+
+	const source =
+		spaces(scriptStart) + parser.template.slice(scriptStart, scriptEnd);
+	parser.index = scriptEnd + scriptClosingTag.length;
+
+	let ast;
+
+	try {
+		ast = parse(source, {
+			ecmaVersion: 8,
+			sourceType: 'module',
+		});
+	} catch (err) {
+		parser.acornError(err);
+	}
+
+	if (!ast.body.length) return null;
+
+	ast.start = scriptStart;
+	return {
+		start,
+		end: parser.index,
+		attributes,
+		content: ast,
+	};
+}
diff --git a/src/parse/read/style.js b/src/parse/read/style.ts
similarity index 52%
rename from src/parse/read/style.js
rename to src/parse/read/style.ts
index d367aba627..d1882d67df 100644
--- a/src/parse/read/style.js
+++ b/src/parse/read/style.ts
@@ -1,47 +1,48 @@
 import parse from 'css-tree/lib/parser/index.js';
 import walk from 'css-tree/lib/utils/walk.js';
+import { Parser } from '../index';
 
-export default function readStyle ( parser, start, attributes ) {
+export default function readStyle(parser: Parser, start: number, attributes) {
 	const contentStart = parser.index;
-	const styles = parser.readUntil( /<\/style>/ );
+	const styles = parser.readUntil(/<\/style>/);
 	const contentEnd = parser.index;
 
 	let ast;
 
 	try {
-		ast = parse( styles, {
+		ast = parse(styles, {
 			positions: true,
-			offset: contentStart
+			offset: contentStart,
 		});
-	} catch ( err ) {
-		if ( err.name === 'CssSyntaxError' ) {
-			parser.error( err.message, err.offset );
+	} catch (err) {
+		if (err.name === 'CssSyntaxError') {
+			parser.error(err.message, err.offset);
 		} else {
 			throw err;
 		}
 	}
 
 	// tidy up AST
-	walk.all( ast, node => {
-		if ( node.loc ) {
+	walk.all(ast, node => {
+		if (node.loc) {
 			node.start = node.loc.start.offset;
 			node.end = node.loc.end.offset;
 			delete node.loc;
 		}
 	});
 
-	parser.eat( '</style>', true );
+	parser.eat('</style>', true);
 	const end = parser.index;
 
 	return {
 		start,
 		end,
 		attributes,
-		children: JSON.parse( JSON.stringify( ast.children ) ),
+		children: JSON.parse(JSON.stringify(ast.children)),
 		content: {
 			start: contentStart,
 			end: contentEnd,
-			styles
-		}
+			styles,
+		},
 	};
 }
diff --git a/src/parse/state/fragment.js b/src/parse/state/fragment.js
deleted file mode 100644
index 100e28687d..0000000000
--- a/src/parse/state/fragment.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import tag from './tag.js';
-import mustache from './mustache.js';
-import text from './text.js';
-
-export default function fragment ( parser ) {
-	if ( parser.match( '<' ) ) {
-		return tag;
-	}
-
-	if ( parser.match( '{{' ) ) {
-		return mustache;
-	}
-
-	return text;
-}
diff --git a/src/parse/state/fragment.ts b/src/parse/state/fragment.ts
new file mode 100644
index 0000000000..c82b3e2f8a
--- /dev/null
+++ b/src/parse/state/fragment.ts
@@ -0,0 +1,16 @@
+import tag from './tag';
+import mustache from './mustache';
+import text from './text';
+import { Parser } from '../index';
+
+export default function fragment(parser: Parser) {
+	if (parser.match('<')) {
+		return tag;
+	}
+
+	if (parser.match('{{')) {
+		return mustache;
+	}
+
+	return text;
+}
diff --git a/src/parse/state/mustache.js b/src/parse/state/mustache.js
deleted file mode 100644
index 9a9dd33886..0000000000
--- a/src/parse/state/mustache.js
+++ /dev/null
@@ -1,231 +0,0 @@
-import readExpression from '../read/expression.js';
-import { whitespace } from '../../utils/patterns.js';
-import { trimStart, trimEnd } from '../../utils/trim.js';
-
-const validIdentifier = /[a-zA-Z_$][a-zA-Z0-9_$]*/;
-
-function trimWhitespace ( block, trimBefore, trimAfter ) {
-	const firstChild = block.children[0];
-	const lastChild = block.children[ block.children.length - 1 ];
-
-	if ( firstChild.type === 'Text' && trimBefore ) {
-		firstChild.data = trimStart( firstChild.data );
-		if ( !firstChild.data ) block.children.shift();
-	}
-
-	if ( lastChild.type === 'Text' && trimAfter ) {
-		lastChild.data = trimEnd( lastChild.data );
-		if ( !lastChild.data ) block.children.pop();
-	}
-
-	if ( block.else ) {
-		trimWhitespace( block.else, trimBefore, trimAfter );
-	}
-
-	if ( firstChild.elseif ) {
-		trimWhitespace( firstChild, trimBefore, trimAfter );
-	}
-}
-
-export default function mustache ( parser ) {
-	const start = parser.index;
-	parser.index += 2;
-
-	parser.allowWhitespace();
-
-	// {{/if}} or {{/each}}
-	if ( parser.eat( '/' ) ) {
-		let block = parser.current();
-		let expected;
-
-		if ( block.type === 'ElseBlock' ) {
-			block.end = start;
-			parser.stack.pop();
-			block = parser.current();
-		}
-
-		if ( block.type === 'IfBlock' ) {
-			expected = 'if';
-		} else if ( block.type === 'EachBlock' ) {
-			expected = 'each';
-		} else {
-			parser.error( `Unexpected block closing tag` );
-		}
-
-		parser.eat( expected, true );
-		parser.allowWhitespace();
-		parser.eat( '}}', true );
-
-		while ( block.elseif ) {
-			block.end = parser.index;
-			parser.stack.pop();
-			block = parser.current();
-
-			if ( block.else ) {
-				block.else.end = start;
-			}
-		}
-
-		// strip leading/trailing whitespace as necessary
-		if ( !block.children.length ) parser.error( `Empty block`, block.start );
-
-		const charBefore = parser.template[ block.start - 1 ];
-		const charAfter = parser.template[ parser.index ];
-		const trimBefore = !charBefore || whitespace.test( charBefore );
-		const trimAfter = !charAfter || whitespace.test( charAfter );
-
-		trimWhitespace( block, trimBefore, trimAfter );
-
-		block.end = parser.index;
-		parser.stack.pop();
-	}
-
-	else if ( parser.eat( 'elseif' ) ) {
-		const block = parser.current();
-		if ( block.type !== 'IfBlock' ) parser.error( 'Cannot have an {{elseif ...}} block outside an {{#if ...}} block' );
-
-		parser.requireWhitespace();
-
-		const expression = readExpression( parser );
-
-		parser.allowWhitespace();
-		parser.eat( '}}', true );
-
-		block.else = {
-			start: parser.index,
-			end: null,
-			type: 'ElseBlock',
-			children: [
-				{
-					start: parser.index,
-					end: null,
-					type: 'IfBlock',
-					elseif: true,
-					expression,
-					children: []
-				}
-			]
-		};
-
-		parser.stack.push( block.else.children[0] );
-	}
-
-	else if ( parser.eat( 'else' ) ) {
-		const block = parser.current();
-		if ( block.type !== 'IfBlock' && block.type !== 'EachBlock' ) {
-			parser.error( 'Cannot have an {{else}} block outside an {{#if ...}} or {{#each ...}} block' );
-		}
-
-		parser.allowWhitespace();
-		parser.eat( '}}', true );
-
-		block.else = {
-			start: parser.index,
-			end: null,
-			type: 'ElseBlock',
-			children: []
-		};
-
-		parser.stack.push( block.else );
-	}
-
-	// {{#if foo}} or {{#each foo}}
-	else if ( parser.eat( '#' ) ) {
-		let type;
-
-		if ( parser.eat( 'if' ) ) {
-			type = 'IfBlock';
-		} else if ( parser.eat( 'each' ) ) {
-			type = 'EachBlock';
-		} else {
-			parser.error( `Expected if or each` );
-		}
-
-		parser.requireWhitespace();
-
-		const expression = readExpression( parser );
-
-		const block = {
-			start,
-			end: null,
-			type,
-			expression,
-			children: []
-		};
-
-		parser.allowWhitespace();
-
-		// {{#each}} blocks must declare a context – {{#each list as item}}
-		if ( type === 'EachBlock' ) {
-			parser.eat( 'as', true );
-			parser.requireWhitespace();
-
-			block.context = parser.read( validIdentifier ); // TODO check it's not a keyword
-			if ( !block.context ) parser.error( `Expected name` );
-
-			parser.allowWhitespace();
-
-			if ( parser.eat( ',' ) ) {
-				parser.allowWhitespace();
-				block.index = parser.read( validIdentifier );
-				if ( !block.index ) parser.error( `Expected name` );
-				parser.allowWhitespace();
-			}
-
-			if ( parser.eat( '@' ) ) {
-				block.key = parser.read( validIdentifier );
-				if ( !block.key ) parser.error( `Expected name` );
-				parser.allowWhitespace();
-			}
-		}
-
-		parser.eat( '}}', true );
-
-		parser.current().children.push( block );
-		parser.stack.push( block );
-	}
-
-	// {{yield}}
-	else if ( parser.eat( 'yield' ) ) {
-
-		parser.allowWhitespace();
-		parser.eat( '}}', true );
-
-		parser.current().children.push({
-			start,
-			end: parser.index,
-			type: 'YieldTag'
-		});
-	}
-
-	// {{{raw}}} mustache
-	else if ( parser.eat( '{' ) ) {
-		const expression = readExpression( parser );
-
-		parser.allowWhitespace();
-		parser.eat( '}}}', true );
-
-		parser.current().children.push({
-			start,
-			end: parser.index,
-			type: 'RawMustacheTag',
-			expression
-		});
-	}
-
-	else {
-		const expression = readExpression( parser );
-
-		parser.allowWhitespace();
-		parser.eat( '}}', true );
-
-		parser.current().children.push({
-			start,
-			end: parser.index,
-			type: 'MustacheTag',
-			expression
-		});
-	}
-
-	return null;
-}
diff --git a/src/parse/state/mustache.ts b/src/parse/state/mustache.ts
new file mode 100644
index 0000000000..716f20d288
--- /dev/null
+++ b/src/parse/state/mustache.ts
@@ -0,0 +1,225 @@
+import readExpression from '../read/expression';
+import { whitespace } from '../../utils/patterns';
+import { trimStart, trimEnd } from '../../utils/trim';
+import { Parser } from '../index';
+import { Node } from '../../interfaces';
+
+const validIdentifier = /[a-zA-Z_$][a-zA-Z0-9_$]*/;
+
+function trimWhitespace(block, trimBefore, trimAfter) {
+	const firstChild = block.children[0];
+	const lastChild = block.children[block.children.length - 1];
+
+	if (firstChild.type === 'Text' && trimBefore) {
+		firstChild.data = trimStart(firstChild.data);
+		if (!firstChild.data) block.children.shift();
+	}
+
+	if (lastChild.type === 'Text' && trimAfter) {
+		lastChild.data = trimEnd(lastChild.data);
+		if (!lastChild.data) block.children.pop();
+	}
+
+	if (block.else) {
+		trimWhitespace(block.else, trimBefore, trimAfter);
+	}
+
+	if (firstChild.elseif) {
+		trimWhitespace(firstChild, trimBefore, trimAfter);
+	}
+}
+
+export default function mustache(parser: Parser) {
+	const start = parser.index;
+	parser.index += 2;
+
+	parser.allowWhitespace();
+
+	// {{/if}} or {{/each}}
+	if (parser.eat('/')) {
+		let block = parser.current();
+		let expected;
+
+		if (block.type === 'ElseBlock') {
+			block.end = start;
+			parser.stack.pop();
+			block = parser.current();
+		}
+
+		if (block.type === 'IfBlock') {
+			expected = 'if';
+		} else if (block.type === 'EachBlock') {
+			expected = 'each';
+		} else {
+			parser.error(`Unexpected block closing tag`);
+		}
+
+		parser.eat(expected, true);
+		parser.allowWhitespace();
+		parser.eat('}}', true);
+
+		while (block.elseif) {
+			block.end = parser.index;
+			parser.stack.pop();
+			block = parser.current();
+
+			if (block.else) {
+				block.else.end = start;
+			}
+		}
+
+		// strip leading/trailing whitespace as necessary
+		if (!block.children.length) parser.error(`Empty block`, block.start);
+
+		const charBefore = parser.template[block.start - 1];
+		const charAfter = parser.template[parser.index];
+		const trimBefore = !charBefore || whitespace.test(charBefore);
+		const trimAfter = !charAfter || whitespace.test(charAfter);
+
+		trimWhitespace(block, trimBefore, trimAfter);
+
+		block.end = parser.index;
+		parser.stack.pop();
+	} else if (parser.eat('elseif')) {
+		const block = parser.current();
+		if (block.type !== 'IfBlock')
+			parser.error(
+				'Cannot have an {{elseif ...}} block outside an {{#if ...}} block'
+			);
+
+		parser.requireWhitespace();
+
+		const expression = readExpression(parser);
+
+		parser.allowWhitespace();
+		parser.eat('}}', true);
+
+		block.else = {
+			start: parser.index,
+			end: null,
+			type: 'ElseBlock',
+			children: [
+				{
+					start: parser.index,
+					end: null,
+					type: 'IfBlock',
+					elseif: true,
+					expression,
+					children: [],
+				},
+			],
+		};
+
+		parser.stack.push(block.else.children[0]);
+	} else if (parser.eat('else')) {
+		const block = parser.current();
+		if (block.type !== 'IfBlock' && block.type !== 'EachBlock') {
+			parser.error(
+				'Cannot have an {{else}} block outside an {{#if ...}} or {{#each ...}} block'
+			);
+		}
+
+		parser.allowWhitespace();
+		parser.eat('}}', true);
+
+		block.else = {
+			start: parser.index,
+			end: null,
+			type: 'ElseBlock',
+			children: [],
+		};
+
+		parser.stack.push(block.else);
+	} else if (parser.eat('#')) {
+		// {{#if foo}} or {{#each foo}}
+		let type;
+
+		if (parser.eat('if')) {
+			type = 'IfBlock';
+		} else if (parser.eat('each')) {
+			type = 'EachBlock';
+		} else {
+			parser.error(`Expected if or each`);
+		}
+
+		parser.requireWhitespace();
+
+		const expression = readExpression(parser);
+
+		const block: Node = {
+			start,
+			end: null,
+			type,
+			expression,
+			children: [],
+		};
+
+		parser.allowWhitespace();
+
+		// {{#each}} blocks must declare a context – {{#each list as item}}
+		if (type === 'EachBlock') {
+			parser.eat('as', true);
+			parser.requireWhitespace();
+
+			block.context = parser.read(validIdentifier); // TODO check it's not a keyword
+			if (!block.context) parser.error(`Expected name`);
+
+			parser.allowWhitespace();
+
+			if (parser.eat(',')) {
+				parser.allowWhitespace();
+				block.index = parser.read(validIdentifier);
+				if (!block.index) parser.error(`Expected name`);
+				parser.allowWhitespace();
+			}
+
+			if (parser.eat('@')) {
+				block.key = parser.read(validIdentifier);
+				if (!block.key) parser.error(`Expected name`);
+				parser.allowWhitespace();
+			}
+		}
+
+		parser.eat('}}', true);
+
+		parser.current().children.push(block);
+		parser.stack.push(block);
+	} else if (parser.eat('yield')) {
+		// {{yield}}
+		parser.allowWhitespace();
+		parser.eat('}}', true);
+
+		parser.current().children.push({
+			start,
+			end: parser.index,
+			type: 'YieldTag',
+		});
+	} else if (parser.eat('{')) {
+		// {{{raw}}} mustache
+		const expression = readExpression(parser);
+
+		parser.allowWhitespace();
+		parser.eat('}}}', true);
+
+		parser.current().children.push({
+			start,
+			end: parser.index,
+			type: 'RawMustacheTag',
+			expression,
+		});
+	} else {
+		const expression = readExpression(parser);
+
+		parser.allowWhitespace();
+		parser.eat('}}', true);
+
+		parser.current().children.push({
+			start,
+			end: parser.index,
+			type: 'MustacheTag',
+			expression,
+		});
+	}
+
+	return null;
+}
diff --git a/src/parse/state/tag.js b/src/parse/state/tag.js
deleted file mode 100644
index 48e8cd197e..0000000000
--- a/src/parse/state/tag.js
+++ /dev/null
@@ -1,359 +0,0 @@
-import readExpression from '../read/expression.js';
-import readScript from '../read/script.js';
-import readStyle from '../read/style.js';
-import { readEventHandlerDirective, readBindingDirective } from '../read/directives.js';
-import { trimStart, trimEnd } from '../../utils/trim.js';
-import { decodeCharacterReferences } from '../utils/html.js';
-import isVoidElementName from '../../utils/isVoidElementName.js';
-
-const validTagName = /^\!?[a-zA-Z]{1,}:?[a-zA-Z0-9\-]*/;
-const invalidUnquotedAttributeCharacters = /[\s"'=<>\/`]/;
-
-const SELF = ':Self';
-
-const metaTags = {
-	':Window': true
-};
-
-const specials = new Map( [
-	[ 'script', {
-		read: readScript,
-		property: 'js'
-	} ],
-	[ 'style', {
-		read: readStyle,
-		property: 'css'
-	} ]
-] );
-
-// based on http://developers.whatwg.org/syntax.html#syntax-tag-omission
-const disallowedContents = new Map( [
-	[ 'li', new Set( [ 'li' ] ) ],
-	[ 'dt', new Set( [ 'dt', 'dd' ] ) ],
-	[ 'dd', new Set( [ 'dt', 'dd' ] ) ],
-	[ 'p', new Set( 'address article aside blockquote div dl fieldset footer form h1 h2 h3 h4 h5 h6 header hgroup hr main menu nav ol p pre section table ul'.split( ' ' ) ) ],
-	[ 'rt', new Set( [ 'rt', 'rp' ] ) ],
-	[ 'rp', new Set( [ 'rt', 'rp' ] ) ],
-	[ 'optgroup', new Set( [ 'optgroup' ] ) ],
-	[ 'option', new Set( [ 'option', 'optgroup' ] ) ],
-	[ 'thead', new Set( [ 'tbody', 'tfoot' ] ) ],
-	[ 'tbody', new Set( [ 'tbody', 'tfoot' ] ) ],
-	[ 'tfoot', new Set( [ 'tbody' ] ) ],
-	[ 'tr', new Set( [ 'tr', 'tbody' ] ) ],
-	[ 'td', new Set( [ 'td', 'th', 'tr' ] ) ],
-	[ 'th', new Set( [ 'td', 'th', 'tr' ] ) ],
-] );
-
-function stripWhitespace ( element ) {
-	if ( element.children.length ) {
-		const firstChild = element.children[0];
-		const lastChild = element.children[ element.children.length - 1 ];
-
-		if ( firstChild.type === 'Text' ) {
-			firstChild.data = trimStart( firstChild.data );
-			if ( !firstChild.data ) element.children.shift();
-		}
-
-		if ( lastChild.type === 'Text' ) {
-			lastChild.data = trimEnd( lastChild.data );
-			if ( !lastChild.data ) element.children.pop();
-		}
-	}
-}
-
-export default function tag ( parser ) {
-	const start = parser.index++;
-
-	let parent = parser.current();
-
-	if ( parser.eat( '!--' ) ) {
-		const data = parser.readUntil( /-->/ );
-		parser.eat( '-->' );
-
-		parser.current().children.push({
-			start,
-			end: parser.index,
-			type: 'Comment',
-			data
-		});
-
-		return null;
-	}
-
-	const isClosingTag = parser.eat( '/' );
-
-	const name = readTagName( parser );
-
-	if ( name in metaTags ) {
-		if ( name in parser.metaTags ) {
-			if ( isClosingTag && parser.current().children.length ) {
-				parser.error( `<${name}> cannot have children`, parser.current().children[0].start );
-			}
-
-			parser.error( `A component can only have one <${name}> tag`, start );
-		}
-
-		parser.metaTags[ name ] = true;
-
-		if ( parser.stack.length > 1 ) {
-			parser.error( `<${name}> tags cannot be inside elements or blocks`, start );
-		}
-	}
-
-	parser.allowWhitespace();
-
-	if ( isClosingTag ) {
-		if ( isVoidElementName( name ) ) {
-			parser.error( `<${name}> is a void element and cannot have children, or a closing tag`, start );
-		}
-
-		if ( !parser.eat( '>' ) ) parser.error( `Expected '>'` );
-
-		// close any elements that don't have their own closing tags, e.g. <div><p></div>
-		while ( parent.name !== name ) {
-			if ( parent.type !== 'Element' ) parser.error( `</${name}> attempted to close an element that was not open`, start );
-
-			parent.end = start;
-			parser.stack.pop();
-
-			parent = parser.current();
-		}
-
-		// strip leading/trailing whitespace as necessary
-		stripWhitespace( parent );
-
-		parent.end = parser.index;
-		parser.stack.pop();
-
-		return null;
-	} else if ( disallowedContents.has( parent.name ) ) {
-		// can this be a child of the parent element, or does it implicitly
-		// close it, like `<li>one<li>two`?
-		if ( disallowedContents.get( parent.name ).has( name ) ) {
-			stripWhitespace( parent );
-
-			parent.end = start;
-			parser.stack.pop();
-		}
-	}
-
-	const attributes = [];
-	const uniqueNames = new Set();
-
-	let attribute;
-	while ( attribute = readAttribute( parser, uniqueNames ) ) {
-		attributes.push( attribute );
-		parser.allowWhitespace();
-	}
-
-	parser.allowWhitespace();
-
-	// special cases – top-level <script> and <style>
-	if ( specials.has( name ) && parser.stack.length === 1 ) {
-		const special = specials.get( name );
-
-		if ( parser[ special.property ] ) {
-			parser.index = start;
-			parser.error( `You can only have one top-level <${name}> tag per component` );
-		}
-
-		parser.eat( '>', true );
-		parser[ special.property ] = special.read( parser, start, attributes );
-		return;
-	}
-
-	const element = {
-		start,
-		end: null, // filled in later
-		type: 'Element',
-		name,
-		attributes,
-		children: []
-	};
-
-	parser.current().children.push( element );
-
-	const selfClosing = parser.eat( '/' ) || isVoidElementName( name );
-
-	parser.eat( '>', true );
-
-	if ( selfClosing ) {
-		element.end = parser.index;
-	} else {
-		// don't push self-closing elements onto the stack
-		parser.stack.push( element );
-	}
-
-	return null;
-}
-
-function readTagName ( parser ) {
-	const start = parser.index;
-
-	if ( parser.eat( SELF ) ) {
-		// check we're inside a block, otherwise this
-		// will cause infinite recursion
-		let i = parser.stack.length;
-		let legal = false;
-
-		while ( i-- ) {
-			const fragment = parser.stack[i];
-			if ( fragment.type === 'IfBlock' || fragment.type === 'EachBlock' ) {
-				legal = true;
-				break;
-			}
-		}
-
-		if ( !legal ) {
-			parser.error( `<${SELF}> components can only exist inside if-blocks or each-blocks`, start );
-		}
-
-		return SELF;
-	}
-
-	const name = parser.readUntil( /(\s|\/|>)/ );
-
-	if ( name in metaTags ) return name;
-
-	if ( !validTagName.test( name ) ) {
-		parser.error( `Expected valid tag name`, start );
-	}
-
-	return name;
-}
-
-function readAttribute ( parser, uniqueNames ) {
-	const start = parser.index;
-
-	let name = parser.readUntil( /(\s|=|\/|>)/ );
-	if ( !name ) return null;
-	if ( uniqueNames.has( name ) ) {
-		parser.error( 'Attributes need to be unique', start );
-	}
-
-	uniqueNames.add( name );
-
-	parser.allowWhitespace();
-
-	if ( /^on:/.test( name ) ) {
-		parser.eat( '=', true );
-		return readEventHandlerDirective( parser, start, name.slice( 3 ) );
-	}
-
-	if ( /^bind:/.test( name ) ) {
-		return readBindingDirective( parser, start, name.slice( 5 ) );
-	}
-
-	if ( /^ref:/.test( name ) ) {
-		return {
-			start,
-			end: parser.index,
-			type: 'Ref',
-			name: name.slice( 4 )
-		};
-	}
-
-	let value;
-
-	// :foo is shorthand for foo='{{foo}}'
-	if ( /^:\w+$/.test( name ) ) {
-		name = name.slice( 1 );
-		value = getShorthandValue( start + 1, name );
-	} else {
-		value = parser.eat( '=' ) ? readAttributeValue( parser ) : true;
-	}
-
-	return {
-		start,
-		end: parser.index,
-		type: 'Attribute',
-		name,
-		value
-	};
-}
-
-function readAttributeValue ( parser ) {
-	let quoteMark;
-
-	if ( parser.eat( `'` ) ) quoteMark = `'`;
-	if ( parser.eat( `"` ) ) quoteMark = `"`;
-
-	let currentChunk = {
-		start: parser.index,
-		end: null,
-		type: 'Text',
-		data: ''
-	};
-
-	const done = quoteMark ?
-		char => char === quoteMark :
-		char => invalidUnquotedAttributeCharacters.test( char );
-
-	const chunks = [];
-
-	while ( parser.index < parser.template.length ) {
-		const index = parser.index;
-
-		if ( parser.eat( '{{' ) ) {
-			if ( currentChunk.data ) {
-				currentChunk.end = index;
-				chunks.push( currentChunk );
-			}
-
-			const expression = readExpression( parser );
-			parser.allowWhitespace();
-			if ( !parser.eat( '}}' ) ) {
-				parser.error( `Expected }}` );
-			}
-
-			chunks.push({
-				start: index,
-				end: parser.index,
-				type: 'MustacheTag',
-				expression
-			});
-
-			currentChunk = {
-				start: parser.index,
-				end: null,
-				type: 'Text',
-				data: ''
-			};
-		}
-
-		else if ( done( parser.template[ parser.index ] ) ) {
-			currentChunk.end = parser.index;
-			if ( quoteMark ) parser.index += 1;
-
-			if ( currentChunk.data ) chunks.push( currentChunk );
-
-			chunks.forEach( chunk => {
-				if ( chunk.type === 'Text' ) chunk.data = decodeCharacterReferences( chunk.data );
-			});
-
-			return chunks;
-		}
-
-		else {
-			currentChunk.data += parser.template[ parser.index++ ];
-		}
-	}
-
-	parser.error( `Unexpected end of input` );
-}
-
-function getShorthandValue ( start, name ) {
-	const end = start + name.length;
-
-	return [{
-		type: 'AttributeShorthand',
-		start,
-		end,
-		expression: {
-			type: 'Identifier',
-			start,
-			end,
-			name
-		}
-	}];
-}
diff --git a/src/parse/state/tag.ts b/src/parse/state/tag.ts
new file mode 100644
index 0000000000..6fee187dd9
--- /dev/null
+++ b/src/parse/state/tag.ts
@@ -0,0 +1,393 @@
+import readExpression from '../read/expression';
+import readScript from '../read/script';
+import readStyle from '../read/style';
+import {
+	readEventHandlerDirective,
+	readBindingDirective,
+	readTransitionDirective,
+} from '../read/directives';
+import { trimStart, trimEnd } from '../../utils/trim';
+import { decodeCharacterReferences } from '../utils/html';
+import isVoidElementName from '../../utils/isVoidElementName';
+import { Parser } from '../index';
+import { Node } from '../../interfaces';
+
+const validTagName = /^\!?[a-zA-Z]{1,}:?[a-zA-Z0-9\-]*/;
+
+const SELF = ':Self';
+
+const metaTags = {
+	':Window': true,
+};
+
+const specials = new Map([
+	[
+		'script',
+		{
+			read: readScript,
+			property: 'js',
+		},
+	],
+	[
+		'style',
+		{
+			read: readStyle,
+			property: 'css',
+		},
+	],
+]);
+
+// based on http://developers.whatwg.org/syntax.html#syntax-tag-omission
+const disallowedContents = new Map([
+	['li', new Set(['li'])],
+	['dt', new Set(['dt', 'dd'])],
+	['dd', new Set(['dt', 'dd'])],
+	[
+		'p',
+		new Set(
+			'address article aside blockquote div dl fieldset footer form h1 h2 h3 h4 h5 h6 header hgroup hr main menu nav ol p pre section table ul'.split(
+				' '
+			)
+		),
+	],
+	['rt', new Set(['rt', 'rp'])],
+	['rp', new Set(['rt', 'rp'])],
+	['optgroup', new Set(['optgroup'])],
+	['option', new Set(['option', 'optgroup'])],
+	['thead', new Set(['tbody', 'tfoot'])],
+	['tbody', new Set(['tbody', 'tfoot'])],
+	['tfoot', new Set(['tbody'])],
+	['tr', new Set(['tr', 'tbody'])],
+	['td', new Set(['td', 'th', 'tr'])],
+	['th', new Set(['td', 'th', 'tr'])],
+]);
+
+export default function tag(parser: Parser) {
+	const start = parser.index++;
+
+	let parent = parser.current();
+
+	if (parser.eat('!--')) {
+		const data = parser.readUntil(/-->/);
+		parser.eat('-->');
+
+		parser.current().children.push({
+			start,
+			end: parser.index,
+			type: 'Comment',
+			data,
+		});
+
+		return null;
+	}
+
+	const isClosingTag = parser.eat('/');
+
+	const name = readTagName(parser);
+
+	if (name in metaTags) {
+		if (name in parser.metaTags) {
+			if (isClosingTag && parser.current().children.length) {
+				parser.error(
+					`<${name}> cannot have children`,
+					parser.current().children[0].start
+				);
+			}
+
+			parser.error(`A component can only have one <${name}> tag`, start);
+		}
+
+		parser.metaTags[name] = true;
+
+		if (parser.stack.length > 1) {
+			parser.error(`<${name}> tags cannot be inside elements or blocks`, start);
+		}
+	}
+
+	parser.allowWhitespace();
+
+	if (isClosingTag) {
+		if (isVoidElementName(name)) {
+			parser.error(
+				`<${name}> is a void element and cannot have children, or a closing tag`,
+				start
+			);
+		}
+
+		if (!parser.eat('>')) parser.error(`Expected '>'`);
+
+		// close any elements that don't have their own closing tags, e.g. <div><p></div>
+		while (parent.name !== name) {
+			if (parent.type !== 'Element')
+				parser.error(
+					`</${name}> attempted to close an element that was not open`,
+					start
+				);
+
+			parent.end = start;
+			parser.stack.pop();
+
+			parent = parser.current();
+		}
+
+		parent.end = parser.index;
+		parser.stack.pop();
+
+		return null;
+	} else if (disallowedContents.has(parent.name)) {
+		// can this be a child of the parent element, or does it implicitly
+		// close it, like `<li>one<li>two`?
+		if (disallowedContents.get(parent.name).has(name)) {
+			parent.end = start;
+			parser.stack.pop();
+		}
+	}
+
+	const attributes = [];
+	const uniqueNames = new Set();
+
+	let attribute;
+	while ((attribute = readAttribute(parser, uniqueNames))) {
+		attributes.push(attribute);
+		parser.allowWhitespace();
+	}
+
+	parser.allowWhitespace();
+
+	// special cases – top-level <script> and <style>
+	if (specials.has(name) && parser.stack.length === 1) {
+		const special = specials.get(name);
+
+		if (parser[special.property]) {
+			parser.index = start;
+			parser.error(
+				`You can only have one top-level <${name}> tag per component`
+			);
+		}
+
+		parser.eat('>', true);
+		parser[special.property] = special.read(parser, start, attributes);
+		return;
+	}
+
+	const element: Node = {
+		start,
+		end: null, // filled in later
+		type: 'Element',
+		name,
+		attributes,
+		children: [],
+	};
+
+	parser.current().children.push(element);
+
+	const selfClosing = parser.eat('/') || isVoidElementName(name);
+
+	parser.eat('>', true);
+
+	if (selfClosing) {
+		element.end = parser.index;
+	} else if (name === 'textarea') {
+		// special case
+		element.children = readSequence(
+			parser,
+			() =>
+				parser.template.slice(parser.index, parser.index + 11) === '</textarea>'
+		);
+		parser.read(/<\/textarea>/);
+		element.end = parser.index;
+	} else {
+		// don't push self-closing elements onto the stack
+		parser.stack.push(element);
+	}
+
+	return null;
+}
+
+function readTagName(parser: Parser) {
+	const start = parser.index;
+
+	if (parser.eat(SELF)) {
+		// check we're inside a block, otherwise this
+		// will cause infinite recursion
+		let i = parser.stack.length;
+		let legal = false;
+
+		while (i--) {
+			const fragment = parser.stack[i];
+			if (fragment.type === 'IfBlock' || fragment.type === 'EachBlock') {
+				legal = true;
+				break;
+			}
+		}
+
+		if (!legal) {
+			parser.error(
+				`<${SELF}> components can only exist inside if-blocks or each-blocks`,
+				start
+			);
+		}
+
+		return SELF;
+	}
+
+	const name = parser.readUntil(/(\s|\/|>)/);
+
+	if (name in metaTags) return name;
+
+	if (!validTagName.test(name)) {
+		parser.error(`Expected valid tag name`, start);
+	}
+
+	return name;
+}
+
+function readAttribute(parser: Parser, uniqueNames) {
+	const start = parser.index;
+
+	let name = parser.readUntil(/(\s|=|\/|>)/);
+	if (!name) return null;
+	if (uniqueNames.has(name)) {
+		parser.error('Attributes need to be unique', start);
+	}
+
+	uniqueNames.add(name);
+
+	parser.allowWhitespace();
+
+	if (/^on:/.test(name)) {
+		parser.eat('=', true);
+		return readEventHandlerDirective(parser, start, name.slice(3));
+	}
+
+	if (/^bind:/.test(name)) {
+		return readBindingDirective(parser, start, name.slice(5));
+	}
+
+	if (/^ref:/.test(name)) {
+		return {
+			start,
+			end: parser.index,
+			type: 'Ref',
+			name: name.slice(4),
+		};
+	}
+
+	const match = /^(in|out|transition):/.exec(name);
+	if (match) {
+		return readTransitionDirective(
+			parser,
+			start,
+			name.slice(match[0].length),
+			match[1]
+		);
+	}
+
+	let value;
+
+	// :foo is shorthand for foo='{{foo}}'
+	if (/^:\w+$/.test(name)) {
+		name = name.slice(1);
+		value = getShorthandValue(start + 1, name);
+	} else {
+		value = parser.eat('=') ? readAttributeValue(parser) : true;
+	}
+
+	return {
+		start,
+		end: parser.index,
+		type: 'Attribute',
+		name,
+		value,
+	};
+}
+
+function readAttributeValue(parser: Parser) {
+	const quoteMark = parser.eat(`'`) ? `'` : parser.eat(`"`) ? `"` : null;
+
+	const regex = quoteMark === `'`
+		? /'/
+		: quoteMark === `"` ? /"/ : /[\s"'=<>\/`]/;
+
+	const value = readSequence(parser, () =>
+		regex.test(parser.template[parser.index])
+	);
+
+	if (quoteMark) parser.index += 1;
+	return value;
+}
+
+function getShorthandValue(start: number, name: string) {
+	const end = start + name.length;
+
+	return [
+		{
+			type: 'AttributeShorthand',
+			start,
+			end,
+			expression: {
+				type: 'Identifier',
+				start,
+				end,
+				name,
+			},
+		},
+	];
+}
+
+function readSequence(parser: Parser, done: () => boolean) {
+	let currentChunk: Node = {
+		start: parser.index,
+		end: null,
+		type: 'Text',
+		data: '',
+	};
+
+	const chunks = [];
+
+	while (parser.index < parser.template.length) {
+		const index = parser.index;
+
+		if (done()) {
+			currentChunk.end = parser.index;
+
+			if (currentChunk.data) chunks.push(currentChunk);
+
+			chunks.forEach(chunk => {
+				if (chunk.type === 'Text')
+					chunk.data = decodeCharacterReferences(chunk.data);
+			});
+
+			return chunks;
+		} else if (parser.eat('{{')) {
+			if (currentChunk.data) {
+				currentChunk.end = index;
+				chunks.push(currentChunk);
+			}
+
+			const expression = readExpression(parser);
+			parser.allowWhitespace();
+			if (!parser.eat('}}')) {
+				parser.error(`Expected }}`);
+			}
+
+			chunks.push({
+				start: index,
+				end: parser.index,
+				type: 'MustacheTag',
+				expression,
+			});
+
+			currentChunk = {
+				start: parser.index,
+				end: null,
+				type: 'Text',
+				data: '',
+			};
+		} else {
+			currentChunk.data += parser.template[parser.index++];
+		}
+	}
+
+	parser.error(`Unexpected end of input`);
+}
diff --git a/src/parse/state/text.js b/src/parse/state/text.js
deleted file mode 100644
index ee42dd25e3..0000000000
--- a/src/parse/state/text.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { decodeCharacterReferences } from '../utils/html.js';
-
-export default function text ( parser ) {
-	const start = parser.index;
-
-	let data = '';
-
-	while ( parser.index < parser.template.length && !parser.match( '<' ) && !parser.match( '{{' ) ) {
-		data += parser.template[ parser.index++ ];
-	}
-
-	parser.current().children.push({
-		start,
-		end: parser.index,
-		type: 'Text',
-		data: decodeCharacterReferences( data )
-	});
-
-	return null;
-}
diff --git a/src/parse/state/text.ts b/src/parse/state/text.ts
new file mode 100644
index 0000000000..0f85040c21
--- /dev/null
+++ b/src/parse/state/text.ts
@@ -0,0 +1,25 @@
+import { decodeCharacterReferences } from '../utils/html';
+import { Parser } from '../index';
+
+export default function text(parser: Parser) {
+	const start = parser.index;
+
+	let data = '';
+
+	while (
+		parser.index < parser.template.length &&
+		!parser.match('<') &&
+		!parser.match('{{')
+	) {
+		data += parser.template[parser.index++];
+	}
+
+	parser.current().children.push({
+		start,
+		end: parser.index,
+		type: 'Text',
+		data: decodeCharacterReferences(data),
+	});
+
+	return null;
+}
diff --git a/src/parse/utils/entities.ts b/src/parse/utils/entities.ts
new file mode 100644
index 0000000000..91689c5f30
--- /dev/null
+++ b/src/parse/utils/entities.ts
@@ -0,0 +1,2034 @@
+// https://dev.w3.org/html5/html-author/charref
+export default {
+	CounterClockwiseContourIntegral: 8755,
+	ClockwiseContourIntegral: 8754,
+	DoubleLongLeftRightArrow: 10234,
+	DiacriticalDoubleAcute: 733,
+	NotSquareSupersetEqual: 8931,
+	CloseCurlyDoubleQuote: 8221,
+	DoubleContourIntegral: 8751,
+	FilledVerySmallSquare: 9642,
+	NegativeVeryThinSpace: 8203,
+	NotPrecedesSlantEqual: 8928,
+	NotRightTriangleEqual: 8941,
+	NotSucceedsSlantEqual: 8929,
+	CapitalDifferentialD: 8517,
+	DoubleLeftRightArrow: 8660,
+	DoubleLongRightArrow: 10233,
+	EmptyVerySmallSquare: 9643,
+	NestedGreaterGreater: 8811,
+	NotDoubleVerticalBar: 8742,
+	NotLeftTriangleEqual: 8940,
+	NotSquareSubsetEqual: 8930,
+	OpenCurlyDoubleQuote: 8220,
+	ReverseUpEquilibrium: 10607,
+	DoubleLongLeftArrow: 10232,
+	DownLeftRightVector: 10576,
+	LeftArrowRightArrow: 8646,
+	NegativeMediumSpace: 8203,
+	RightArrowLeftArrow: 8644,
+	SquareSupersetEqual: 8850,
+	leftrightsquigarrow: 8621,
+	DownRightTeeVector: 10591,
+	DownRightVectorBar: 10583,
+	LongLeftRightArrow: 10231,
+	Longleftrightarrow: 10234,
+	NegativeThickSpace: 8203,
+	PrecedesSlantEqual: 8828,
+	ReverseEquilibrium: 8651,
+	RightDoubleBracket: 10215,
+	RightDownTeeVector: 10589,
+	RightDownVectorBar: 10581,
+	RightTriangleEqual: 8885,
+	SquareIntersection: 8851,
+	SucceedsSlantEqual: 8829,
+	blacktriangleright: 9656,
+	longleftrightarrow: 10231,
+	DoubleUpDownArrow: 8661,
+	DoubleVerticalBar: 8741,
+	DownLeftTeeVector: 10590,
+	DownLeftVectorBar: 10582,
+	FilledSmallSquare: 9724,
+	GreaterSlantEqual: 10878,
+	LeftDoubleBracket: 10214,
+	LeftDownTeeVector: 10593,
+	LeftDownVectorBar: 10585,
+	LeftTriangleEqual: 8884,
+	NegativeThinSpace: 8203,
+	NotReverseElement: 8716,
+	NotTildeFullEqual: 8775,
+	RightAngleBracket: 10217,
+	RightUpDownVector: 10575,
+	SquareSubsetEqual: 8849,
+	VerticalSeparator: 10072,
+	blacktriangledown: 9662,
+	blacktriangleleft: 9666,
+	leftrightharpoons: 8651,
+	rightleftharpoons: 8652,
+	twoheadrightarrow: 8608,
+	DiacriticalAcute: 180,
+	DiacriticalGrave: 96,
+	DiacriticalTilde: 732,
+	DoubleRightArrow: 8658,
+	DownArrowUpArrow: 8693,
+	EmptySmallSquare: 9723,
+	GreaterEqualLess: 8923,
+	GreaterFullEqual: 8807,
+	LeftAngleBracket: 10216,
+	LeftUpDownVector: 10577,
+	LessEqualGreater: 8922,
+	NonBreakingSpace: 160,
+	NotRightTriangle: 8939,
+	NotSupersetEqual: 8841,
+	RightTriangleBar: 10704,
+	RightUpTeeVector: 10588,
+	RightUpVectorBar: 10580,
+	UnderParenthesis: 9181,
+	UpArrowDownArrow: 8645,
+	circlearrowright: 8635,
+	downharpoonright: 8642,
+	ntrianglerighteq: 8941,
+	rightharpoondown: 8641,
+	rightrightarrows: 8649,
+	twoheadleftarrow: 8606,
+	vartriangleright: 8883,
+	CloseCurlyQuote: 8217,
+	ContourIntegral: 8750,
+	DoubleDownArrow: 8659,
+	DoubleLeftArrow: 8656,
+	DownRightVector: 8641,
+	LeftRightVector: 10574,
+	LeftTriangleBar: 10703,
+	LeftUpTeeVector: 10592,
+	LeftUpVectorBar: 10584,
+	LowerRightArrow: 8600,
+	NotGreaterEqual: 8817,
+	NotGreaterTilde: 8821,
+	NotLeftTriangle: 8938,
+	OverParenthesis: 9180,
+	RightDownVector: 8642,
+	ShortRightArrow: 8594,
+	UpperRightArrow: 8599,
+	bigtriangledown: 9661,
+	circlearrowleft: 8634,
+	curvearrowright: 8631,
+	downharpoonleft: 8643,
+	leftharpoondown: 8637,
+	leftrightarrows: 8646,
+	nLeftrightarrow: 8654,
+	nleftrightarrow: 8622,
+	ntrianglelefteq: 8940,
+	rightleftarrows: 8644,
+	rightsquigarrow: 8605,
+	rightthreetimes: 8908,
+	straightepsilon: 1013,
+	trianglerighteq: 8885,
+	vartriangleleft: 8882,
+	DiacriticalDot: 729,
+	DoubleRightTee: 8872,
+	DownLeftVector: 8637,
+	GreaterGreater: 10914,
+	HorizontalLine: 9472,
+	InvisibleComma: 8291,
+	InvisibleTimes: 8290,
+	LeftDownVector: 8643,
+	LeftRightArrow: 8596,
+	Leftrightarrow: 8660,
+	LessSlantEqual: 10877,
+	LongRightArrow: 10230,
+	Longrightarrow: 10233,
+	LowerLeftArrow: 8601,
+	NestedLessLess: 8810,
+	NotGreaterLess: 8825,
+	NotLessGreater: 8824,
+	NotSubsetEqual: 8840,
+	NotVerticalBar: 8740,
+	OpenCurlyQuote: 8216,
+	ReverseElement: 8715,
+	RightTeeVector: 10587,
+	RightVectorBar: 10579,
+	ShortDownArrow: 8595,
+	ShortLeftArrow: 8592,
+	SquareSuperset: 8848,
+	TildeFullEqual: 8773,
+	UpperLeftArrow: 8598,
+	ZeroWidthSpace: 8203,
+	curvearrowleft: 8630,
+	doublebarwedge: 8966,
+	downdownarrows: 8650,
+	hookrightarrow: 8618,
+	leftleftarrows: 8647,
+	leftrightarrow: 8596,
+	leftthreetimes: 8907,
+	longrightarrow: 10230,
+	looparrowright: 8620,
+	nshortparallel: 8742,
+	ntriangleright: 8939,
+	rightarrowtail: 8611,
+	rightharpoonup: 8640,
+	trianglelefteq: 8884,
+	upharpoonright: 8638,
+	ApplyFunction: 8289,
+	DifferentialD: 8518,
+	DoubleLeftTee: 10980,
+	DoubleUpArrow: 8657,
+	LeftTeeVector: 10586,
+	LeftVectorBar: 10578,
+	LessFullEqual: 8806,
+	LongLeftArrow: 10229,
+	Longleftarrow: 10232,
+	NotTildeEqual: 8772,
+	NotTildeTilde: 8777,
+	Poincareplane: 8460,
+	PrecedesEqual: 10927,
+	PrecedesTilde: 8830,
+	RightArrowBar: 8677,
+	RightTeeArrow: 8614,
+	RightTriangle: 8883,
+	RightUpVector: 8638,
+	SucceedsEqual: 10928,
+	SucceedsTilde: 8831,
+	SupersetEqual: 8839,
+	UpEquilibrium: 10606,
+	VerticalTilde: 8768,
+	VeryThinSpace: 8202,
+	bigtriangleup: 9651,
+	blacktriangle: 9652,
+	divideontimes: 8903,
+	fallingdotseq: 8786,
+	hookleftarrow: 8617,
+	leftarrowtail: 8610,
+	leftharpoonup: 8636,
+	longleftarrow: 10229,
+	looparrowleft: 8619,
+	measuredangle: 8737,
+	ntriangleleft: 8938,
+	shortparallel: 8741,
+	smallsetminus: 8726,
+	triangleright: 9657,
+	upharpoonleft: 8639,
+	DownArrowBar: 10515,
+	DownTeeArrow: 8615,
+	ExponentialE: 8519,
+	GreaterEqual: 8805,
+	GreaterTilde: 8819,
+	HilbertSpace: 8459,
+	HumpDownHump: 8782,
+	Intersection: 8898,
+	LeftArrowBar: 8676,
+	LeftTeeArrow: 8612,
+	LeftTriangle: 8882,
+	LeftUpVector: 8639,
+	NotCongruent: 8802,
+	NotLessEqual: 8816,
+	NotLessTilde: 8820,
+	Proportional: 8733,
+	RightCeiling: 8969,
+	RoundImplies: 10608,
+	ShortUpArrow: 8593,
+	SquareSubset: 8847,
+	UnderBracket: 9141,
+	VerticalLine: 124,
+	blacklozenge: 10731,
+	exponentiale: 8519,
+	risingdotseq: 8787,
+	triangledown: 9663,
+	triangleleft: 9667,
+	CircleMinus: 8854,
+	CircleTimes: 8855,
+	Equilibrium: 8652,
+	GreaterLess: 8823,
+	LeftCeiling: 8968,
+	LessGreater: 8822,
+	MediumSpace: 8287,
+	NotPrecedes: 8832,
+	NotSucceeds: 8833,
+	OverBracket: 9140,
+	RightVector: 8640,
+	Rrightarrow: 8667,
+	RuleDelayed: 10740,
+	SmallCircle: 8728,
+	SquareUnion: 8852,
+	SubsetEqual: 8838,
+	UpDownArrow: 8597,
+	Updownarrow: 8661,
+	VerticalBar: 8739,
+	backepsilon: 1014,
+	blacksquare: 9642,
+	circledcirc: 8858,
+	circleddash: 8861,
+	curlyeqprec: 8926,
+	curlyeqsucc: 8927,
+	diamondsuit: 9830,
+	eqslantless: 10901,
+	expectation: 8496,
+	nRightarrow: 8655,
+	nrightarrow: 8603,
+	preccurlyeq: 8828,
+	precnapprox: 10937,
+	quaternions: 8461,
+	straightphi: 981,
+	succcurlyeq: 8829,
+	succnapprox: 10938,
+	thickapprox: 8776,
+	updownarrow: 8597,
+	Bernoullis: 8492,
+	CirclePlus: 8853,
+	EqualTilde: 8770,
+	Fouriertrf: 8497,
+	ImaginaryI: 8520,
+	Laplacetrf: 8466,
+	LeftVector: 8636,
+	Lleftarrow: 8666,
+	NotElement: 8713,
+	NotGreater: 8815,
+	Proportion: 8759,
+	RightArrow: 8594,
+	RightFloor: 8971,
+	Rightarrow: 8658,
+	TildeEqual: 8771,
+	TildeTilde: 8776,
+	UnderBrace: 9183,
+	UpArrowBar: 10514,
+	UpTeeArrow: 8613,
+	circledast: 8859,
+	complement: 8705,
+	curlywedge: 8911,
+	eqslantgtr: 10902,
+	gtreqqless: 10892,
+	lessapprox: 10885,
+	lesseqqgtr: 10891,
+	lmoustache: 9136,
+	longmapsto: 10236,
+	mapstodown: 8615,
+	mapstoleft: 8612,
+	nLeftarrow: 8653,
+	nleftarrow: 8602,
+	precapprox: 10935,
+	rightarrow: 8594,
+	rmoustache: 9137,
+	sqsubseteq: 8849,
+	sqsupseteq: 8850,
+	subsetneqq: 10955,
+	succapprox: 10936,
+	supsetneqq: 10956,
+	upuparrows: 8648,
+	varepsilon: 949,
+	varnothing: 8709,
+	Backslash: 8726,
+	CenterDot: 183,
+	CircleDot: 8857,
+	Congruent: 8801,
+	Coproduct: 8720,
+	DoubleDot: 168,
+	DownArrow: 8595,
+	DownBreve: 785,
+	Downarrow: 8659,
+	HumpEqual: 8783,
+	LeftArrow: 8592,
+	LeftFloor: 8970,
+	Leftarrow: 8656,
+	LessTilde: 8818,
+	Mellintrf: 8499,
+	MinusPlus: 8723,
+	NotCupCap: 8813,
+	NotExists: 8708,
+	OverBrace: 9182,
+	PlusMinus: 177,
+	Therefore: 8756,
+	ThinSpace: 8201,
+	TripleDot: 8411,
+	UnionPlus: 8846,
+	backprime: 8245,
+	backsimeq: 8909,
+	bigotimes: 10754,
+	centerdot: 183,
+	checkmark: 10003,
+	complexes: 8450,
+	dotsquare: 8865,
+	downarrow: 8595,
+	gtrapprox: 10886,
+	gtreqless: 8923,
+	heartsuit: 9829,
+	leftarrow: 8592,
+	lesseqgtr: 8922,
+	nparallel: 8742,
+	nshortmid: 8740,
+	nsubseteq: 8840,
+	nsupseteq: 8841,
+	pitchfork: 8916,
+	rationals: 8474,
+	spadesuit: 9824,
+	subseteqq: 10949,
+	subsetneq: 8842,
+	supseteqq: 10950,
+	supsetneq: 8843,
+	therefore: 8756,
+	triangleq: 8796,
+	varpropto: 8733,
+	DDotrahd: 10513,
+	DotEqual: 8784,
+	Integral: 8747,
+	LessLess: 10913,
+	NotEqual: 8800,
+	NotTilde: 8769,
+	PartialD: 8706,
+	Precedes: 8826,
+	RightTee: 8866,
+	Succeeds: 8827,
+	SuchThat: 8715,
+	Superset: 8835,
+	Uarrocir: 10569,
+	UnderBar: 818,
+	andslope: 10840,
+	angmsdaa: 10664,
+	angmsdab: 10665,
+	angmsdac: 10666,
+	angmsdad: 10667,
+	angmsdae: 10668,
+	angmsdaf: 10669,
+	angmsdag: 10670,
+	angmsdah: 10671,
+	angrtvbd: 10653,
+	approxeq: 8778,
+	awconint: 8755,
+	backcong: 8780,
+	barwedge: 8965,
+	bbrktbrk: 9142,
+	bigoplus: 10753,
+	bigsqcup: 10758,
+	biguplus: 10756,
+	bigwedge: 8896,
+	boxminus: 8863,
+	boxtimes: 8864,
+	capbrcup: 10825,
+	circledR: 174,
+	circledS: 9416,
+	cirfnint: 10768,
+	clubsuit: 9827,
+	cupbrcap: 10824,
+	curlyvee: 8910,
+	cwconint: 8754,
+	doteqdot: 8785,
+	dotminus: 8760,
+	drbkarow: 10512,
+	dzigrarr: 10239,
+	elinters: 9191,
+	emptyset: 8709,
+	eqvparsl: 10725,
+	fpartint: 10765,
+	geqslant: 10878,
+	gesdotol: 10884,
+	gnapprox: 10890,
+	hksearow: 10533,
+	hkswarow: 10534,
+	imagline: 8464,
+	imagpart: 8465,
+	infintie: 10717,
+	integers: 8484,
+	intercal: 8890,
+	intlarhk: 10775,
+	laemptyv: 10676,
+	ldrushar: 10571,
+	leqslant: 10877,
+	lesdotor: 10883,
+	llcorner: 8990,
+	lnapprox: 10889,
+	lrcorner: 8991,
+	lurdshar: 10570,
+	mapstoup: 8613,
+	multimap: 8888,
+	naturals: 8469,
+	otimesas: 10806,
+	parallel: 8741,
+	plusacir: 10787,
+	pointint: 10773,
+	precneqq: 10933,
+	precnsim: 8936,
+	profalar: 9006,
+	profline: 8978,
+	profsurf: 8979,
+	raemptyv: 10675,
+	realpart: 8476,
+	rppolint: 10770,
+	rtriltri: 10702,
+	scpolint: 10771,
+	setminus: 8726,
+	shortmid: 8739,
+	smeparsl: 10724,
+	sqsubset: 8847,
+	sqsupset: 8848,
+	subseteq: 8838,
+	succneqq: 10934,
+	succnsim: 8937,
+	supseteq: 8839,
+	thetasym: 977,
+	thicksim: 8764,
+	timesbar: 10801,
+	triangle: 9653,
+	triminus: 10810,
+	trpezium: 9186,
+	ulcorner: 8988,
+	urcorner: 8989,
+	varkappa: 1008,
+	varsigma: 962,
+	vartheta: 977,
+	Because: 8757,
+	Cayleys: 8493,
+	Cconint: 8752,
+	Cedilla: 184,
+	Diamond: 8900,
+	DownTee: 8868,
+	Element: 8712,
+	Epsilon: 917,
+	Implies: 8658,
+	LeftTee: 8867,
+	NewLine: 10,
+	NoBreak: 8288,
+	NotLess: 8814,
+	Omicron: 927,
+	OverBar: 175,
+	Product: 8719,
+	UpArrow: 8593,
+	Uparrow: 8657,
+	Upsilon: 933,
+	alefsym: 8501,
+	angrtvb: 8894,
+	angzarr: 9084,
+	asympeq: 8781,
+	backsim: 8765,
+	because: 8757,
+	bemptyv: 10672,
+	between: 8812,
+	bigcirc: 9711,
+	bigodot: 10752,
+	bigstar: 9733,
+	boxplus: 8862,
+	ccupssm: 10832,
+	cemptyv: 10674,
+	cirscir: 10690,
+	coloneq: 8788,
+	congdot: 10861,
+	cudarrl: 10552,
+	cudarrr: 10549,
+	cularrp: 10557,
+	curarrm: 10556,
+	dbkarow: 10511,
+	ddagger: 8225,
+	ddotseq: 10871,
+	demptyv: 10673,
+	diamond: 8900,
+	digamma: 989,
+	dotplus: 8724,
+	dwangle: 10662,
+	epsilon: 949,
+	eqcolon: 8789,
+	equivDD: 10872,
+	gesdoto: 10882,
+	gtquest: 10876,
+	gtrless: 8823,
+	harrcir: 10568,
+	intprod: 10812,
+	isindot: 8949,
+	larrbfs: 10527,
+	larrsim: 10611,
+	lbrksld: 10639,
+	lbrkslu: 10637,
+	ldrdhar: 10599,
+	lesdoto: 10881,
+	lessdot: 8918,
+	lessgtr: 8822,
+	lesssim: 8818,
+	lotimes: 10804,
+	lozenge: 9674,
+	ltquest: 10875,
+	luruhar: 10598,
+	maltese: 10016,
+	minusdu: 10794,
+	napprox: 8777,
+	natural: 9838,
+	nearrow: 8599,
+	nexists: 8708,
+	notinva: 8713,
+	notinvb: 8951,
+	notinvc: 8950,
+	notniva: 8716,
+	notnivb: 8958,
+	notnivc: 8957,
+	npolint: 10772,
+	nsqsube: 8930,
+	nsqsupe: 8931,
+	nvinfin: 10718,
+	nwarrow: 8598,
+	olcross: 10683,
+	omicron: 959,
+	orderof: 8500,
+	orslope: 10839,
+	pertenk: 8241,
+	planckh: 8462,
+	pluscir: 10786,
+	plussim: 10790,
+	plustwo: 10791,
+	precsim: 8830,
+	quatint: 10774,
+	questeq: 8799,
+	rarrbfs: 10528,
+	rarrsim: 10612,
+	rbrksld: 10638,
+	rbrkslu: 10640,
+	rdldhar: 10601,
+	realine: 8475,
+	rotimes: 10805,
+	ruluhar: 10600,
+	searrow: 8600,
+	simplus: 10788,
+	simrarr: 10610,
+	subedot: 10947,
+	submult: 10945,
+	subplus: 10943,
+	subrarr: 10617,
+	succsim: 8831,
+	supdsub: 10968,
+	supedot: 10948,
+	suphsub: 10967,
+	suplarr: 10619,
+	supmult: 10946,
+	supplus: 10944,
+	swarrow: 8601,
+	topfork: 10970,
+	triplus: 10809,
+	tritime: 10811,
+	uparrow: 8593,
+	upsilon: 965,
+	uwangle: 10663,
+	vzigzag: 10650,
+	zigrarr: 8669,
+	Aacute: 193,
+	Abreve: 258,
+	Agrave: 192,
+	Assign: 8788,
+	Atilde: 195,
+	Barwed: 8966,
+	Bumpeq: 8782,
+	Cacute: 262,
+	Ccaron: 268,
+	Ccedil: 199,
+	Colone: 10868,
+	Conint: 8751,
+	CupCap: 8781,
+	Dagger: 8225,
+	Dcaron: 270,
+	DotDot: 8412,
+	Dstrok: 272,
+	Eacute: 201,
+	Ecaron: 282,
+	Egrave: 200,
+	Exists: 8707,
+	ForAll: 8704,
+	Gammad: 988,
+	Gbreve: 286,
+	Gcedil: 290,
+	HARDcy: 1066,
+	Hstrok: 294,
+	Iacute: 205,
+	Igrave: 204,
+	Itilde: 296,
+	Jsercy: 1032,
+	Kcedil: 310,
+	Lacute: 313,
+	Lambda: 923,
+	Lcaron: 317,
+	Lcedil: 315,
+	Lmidot: 319,
+	Lstrok: 321,
+	Nacute: 323,
+	Ncaron: 327,
+	Ncedil: 325,
+	Ntilde: 209,
+	Oacute: 211,
+	Odblac: 336,
+	Ograve: 210,
+	Oslash: 216,
+	Otilde: 213,
+	Otimes: 10807,
+	Racute: 340,
+	Rarrtl: 10518,
+	Rcaron: 344,
+	Rcedil: 342,
+	SHCHcy: 1065,
+	SOFTcy: 1068,
+	Sacute: 346,
+	Scaron: 352,
+	Scedil: 350,
+	Square: 9633,
+	Subset: 8912,
+	Supset: 8913,
+	Tcaron: 356,
+	Tcedil: 354,
+	Tstrok: 358,
+	Uacute: 218,
+	Ubreve: 364,
+	Udblac: 368,
+	Ugrave: 217,
+	Utilde: 360,
+	Vdashl: 10982,
+	Verbar: 8214,
+	Vvdash: 8874,
+	Yacute: 221,
+	Zacute: 377,
+	Zcaron: 381,
+	aacute: 225,
+	abreve: 259,
+	agrave: 224,
+	andand: 10837,
+	angmsd: 8737,
+	angsph: 8738,
+	apacir: 10863,
+	approx: 8776,
+	atilde: 227,
+	barvee: 8893,
+	barwed: 8965,
+	becaus: 8757,
+	bernou: 8492,
+	bigcap: 8898,
+	bigcup: 8899,
+	bigvee: 8897,
+	bkarow: 10509,
+	bottom: 8869,
+	bowtie: 8904,
+	boxbox: 10697,
+	bprime: 8245,
+	brvbar: 166,
+	bullet: 8226,
+	bumpeq: 8783,
+	cacute: 263,
+	capand: 10820,
+	capcap: 10827,
+	capcup: 10823,
+	capdot: 10816,
+	ccaron: 269,
+	ccedil: 231,
+	circeq: 8791,
+	cirmid: 10991,
+	colone: 8788,
+	commat: 64,
+	compfn: 8728,
+	conint: 8750,
+	coprod: 8720,
+	copysr: 8471,
+	cularr: 8630,
+	cupcap: 10822,
+	cupcup: 10826,
+	cupdot: 8845,
+	curarr: 8631,
+	curren: 164,
+	cylcty: 9005,
+	dagger: 8224,
+	daleth: 8504,
+	dcaron: 271,
+	dfisht: 10623,
+	divide: 247,
+	divonx: 8903,
+	dlcorn: 8990,
+	dlcrop: 8973,
+	dollar: 36,
+	drcorn: 8991,
+	drcrop: 8972,
+	dstrok: 273,
+	eacute: 233,
+	easter: 10862,
+	ecaron: 283,
+	ecolon: 8789,
+	egrave: 232,
+	egsdot: 10904,
+	elsdot: 10903,
+	emptyv: 8709,
+	emsp13: 8196,
+	emsp14: 8197,
+	eparsl: 10723,
+	eqcirc: 8790,
+	equals: 61,
+	equest: 8799,
+	female: 9792,
+	ffilig: 64259,
+	ffllig: 64260,
+	forall: 8704,
+	frac12: 189,
+	frac13: 8531,
+	frac14: 188,
+	frac15: 8533,
+	frac16: 8537,
+	frac18: 8539,
+	frac23: 8532,
+	frac25: 8534,
+	frac34: 190,
+	frac35: 8535,
+	frac38: 8540,
+	frac45: 8536,
+	frac56: 8538,
+	frac58: 8541,
+	frac78: 8542,
+	gacute: 501,
+	gammad: 989,
+	gbreve: 287,
+	gesdot: 10880,
+	gesles: 10900,
+	gtlPar: 10645,
+	gtrarr: 10616,
+	gtrdot: 8919,
+	gtrsim: 8819,
+	hairsp: 8202,
+	hamilt: 8459,
+	hardcy: 1098,
+	hearts: 9829,
+	hellip: 8230,
+	hercon: 8889,
+	homtht: 8763,
+	horbar: 8213,
+	hslash: 8463,
+	hstrok: 295,
+	hybull: 8259,
+	hyphen: 8208,
+	iacute: 237,
+	igrave: 236,
+	iiiint: 10764,
+	iinfin: 10716,
+	incare: 8453,
+	inodot: 305,
+	intcal: 8890,
+	iquest: 191,
+	isinsv: 8947,
+	itilde: 297,
+	jsercy: 1112,
+	kappav: 1008,
+	kcedil: 311,
+	kgreen: 312,
+	lAtail: 10523,
+	lacute: 314,
+	lagran: 8466,
+	lambda: 955,
+	langle: 10216,
+	larrfs: 10525,
+	larrhk: 8617,
+	larrlp: 8619,
+	larrpl: 10553,
+	larrtl: 8610,
+	latail: 10521,
+	lbrace: 123,
+	lbrack: 91,
+	lcaron: 318,
+	lcedil: 316,
+	ldquor: 8222,
+	lesdot: 10879,
+	lesges: 10899,
+	lfisht: 10620,
+	lfloor: 8970,
+	lharul: 10602,
+	llhard: 10603,
+	lmidot: 320,
+	lmoust: 9136,
+	loplus: 10797,
+	lowast: 8727,
+	lowbar: 95,
+	lparlt: 10643,
+	lrhard: 10605,
+	lsaquo: 8249,
+	lsquor: 8218,
+	lstrok: 322,
+	lthree: 8907,
+	ltimes: 8905,
+	ltlarr: 10614,
+	ltrPar: 10646,
+	mapsto: 8614,
+	marker: 9646,
+	mcomma: 10793,
+	midast: 42,
+	midcir: 10992,
+	middot: 183,
+	minusb: 8863,
+	minusd: 8760,
+	mnplus: 8723,
+	models: 8871,
+	mstpos: 8766,
+	nVDash: 8879,
+	nVdash: 8878,
+	nacute: 324,
+	ncaron: 328,
+	ncedil: 326,
+	nearhk: 10532,
+	nequiv: 8802,
+	nesear: 10536,
+	nexist: 8708,
+	nltrie: 8940,
+	nprcue: 8928,
+	nrtrie: 8941,
+	nsccue: 8929,
+	nsimeq: 8772,
+	ntilde: 241,
+	numero: 8470,
+	nvDash: 8877,
+	nvHarr: 10500,
+	nvdash: 8876,
+	nvlArr: 10498,
+	nvrArr: 10499,
+	nwarhk: 10531,
+	nwnear: 10535,
+	oacute: 243,
+	odblac: 337,
+	odsold: 10684,
+	ograve: 242,
+	ominus: 8854,
+	origof: 8886,
+	oslash: 248,
+	otilde: 245,
+	otimes: 8855,
+	parsim: 10995,
+	percnt: 37,
+	period: 46,
+	permil: 8240,
+	phmmat: 8499,
+	planck: 8463,
+	plankv: 8463,
+	plusdo: 8724,
+	plusdu: 10789,
+	plusmn: 177,
+	preceq: 10927,
+	primes: 8473,
+	prnsim: 8936,
+	propto: 8733,
+	prurel: 8880,
+	puncsp: 8200,
+	qprime: 8279,
+	rAtail: 10524,
+	racute: 341,
+	rangle: 10217,
+	rarrap: 10613,
+	rarrfs: 10526,
+	rarrhk: 8618,
+	rarrlp: 8620,
+	rarrpl: 10565,
+	rarrtl: 8611,
+	ratail: 10522,
+	rbrace: 125,
+	rbrack: 93,
+	rcaron: 345,
+	rcedil: 343,
+	rdquor: 8221,
+	rfisht: 10621,
+	rfloor: 8971,
+	rharul: 10604,
+	rmoust: 9137,
+	roplus: 10798,
+	rpargt: 10644,
+	rsaquo: 8250,
+	rsquor: 8217,
+	rthree: 8908,
+	rtimes: 8906,
+	sacute: 347,
+	scaron: 353,
+	scedil: 351,
+	scnsim: 8937,
+	searhk: 10533,
+	seswar: 10537,
+	sfrown: 8994,
+	shchcy: 1097,
+	sigmaf: 962,
+	sigmav: 962,
+	simdot: 10858,
+	smashp: 10803,
+	softcy: 1100,
+	solbar: 9023,
+	spades: 9824,
+	sqsube: 8849,
+	sqsupe: 8850,
+	square: 9633,
+	squarf: 9642,
+	ssetmn: 8726,
+	ssmile: 8995,
+	sstarf: 8902,
+	subdot: 10941,
+	subset: 8834,
+	subsim: 10951,
+	subsub: 10965,
+	subsup: 10963,
+	succeq: 10928,
+	supdot: 10942,
+	supset: 8835,
+	supsim: 10952,
+	supsub: 10964,
+	supsup: 10966,
+	swarhk: 10534,
+	swnwar: 10538,
+	target: 8982,
+	tcaron: 357,
+	tcedil: 355,
+	telrec: 8981,
+	there4: 8756,
+	thetav: 977,
+	thinsp: 8201,
+	thksim: 8764,
+	timesb: 8864,
+	timesd: 10800,
+	topbot: 9014,
+	topcir: 10993,
+	tprime: 8244,
+	tridot: 9708,
+	tstrok: 359,
+	uacute: 250,
+	ubreve: 365,
+	udblac: 369,
+	ufisht: 10622,
+	ugrave: 249,
+	ulcorn: 8988,
+	ulcrop: 8975,
+	urcorn: 8989,
+	urcrop: 8974,
+	utilde: 361,
+	vangrt: 10652,
+	varphi: 966,
+	varrho: 1009,
+	veebar: 8891,
+	vellip: 8942,
+	verbar: 124,
+	wedbar: 10847,
+	wedgeq: 8793,
+	weierp: 8472,
+	wreath: 8768,
+	xoplus: 10753,
+	xotime: 10754,
+	xsqcup: 10758,
+	xuplus: 10756,
+	xwedge: 8896,
+	yacute: 253,
+	zacute: 378,
+	zcaron: 382,
+	zeetrf: 8488,
+	AElig: 198,
+	Acirc: 194,
+	Alpha: 913,
+	Amacr: 256,
+	Aogon: 260,
+	Aring: 197,
+	Breve: 728,
+	Ccirc: 264,
+	Colon: 8759,
+	Cross: 10799,
+	Dashv: 10980,
+	Delta: 916,
+	Ecirc: 202,
+	Emacr: 274,
+	Eogon: 280,
+	Equal: 10869,
+	Gamma: 915,
+	Gcirc: 284,
+	Hacek: 711,
+	Hcirc: 292,
+	IJlig: 306,
+	Icirc: 206,
+	Imacr: 298,
+	Iogon: 302,
+	Iukcy: 1030,
+	Jcirc: 308,
+	Jukcy: 1028,
+	Kappa: 922,
+	OElig: 338,
+	Ocirc: 212,
+	Omacr: 332,
+	Omega: 937,
+	Prime: 8243,
+	RBarr: 10512,
+	Scirc: 348,
+	Sigma: 931,
+	THORN: 222,
+	TRADE: 8482,
+	TSHcy: 1035,
+	Theta: 920,
+	Tilde: 8764,
+	Ubrcy: 1038,
+	Ucirc: 219,
+	Umacr: 362,
+	Union: 8899,
+	Uogon: 370,
+	UpTee: 8869,
+	Uring: 366,
+	VDash: 8875,
+	Vdash: 8873,
+	Wcirc: 372,
+	Wedge: 8896,
+	Ycirc: 374,
+	acirc: 226,
+	acute: 180,
+	aelig: 230,
+	aleph: 8501,
+	alpha: 945,
+	amacr: 257,
+	amalg: 10815,
+	angle: 8736,
+	angrt: 8735,
+	angst: 8491,
+	aogon: 261,
+	aring: 229,
+	asymp: 8776,
+	awint: 10769,
+	bcong: 8780,
+	bdquo: 8222,
+	bepsi: 1014,
+	blank: 9251,
+	blk12: 9618,
+	blk14: 9617,
+	blk34: 9619,
+	block: 9608,
+	boxDL: 9559,
+	boxDR: 9556,
+	boxDl: 9558,
+	boxDr: 9555,
+	boxHD: 9574,
+	boxHU: 9577,
+	boxHd: 9572,
+	boxHu: 9575,
+	boxUL: 9565,
+	boxUR: 9562,
+	boxUl: 9564,
+	boxUr: 9561,
+	boxVH: 9580,
+	boxVL: 9571,
+	boxVR: 9568,
+	boxVh: 9579,
+	boxVl: 9570,
+	boxVr: 9567,
+	boxdL: 9557,
+	boxdR: 9554,
+	boxdl: 9488,
+	boxdr: 9484,
+	boxhD: 9573,
+	boxhU: 9576,
+	boxhd: 9516,
+	boxhu: 9524,
+	boxuL: 9563,
+	boxuR: 9560,
+	boxul: 9496,
+	boxur: 9492,
+	boxvH: 9578,
+	boxvL: 9569,
+	boxvR: 9566,
+	boxvh: 9532,
+	boxvl: 9508,
+	boxvr: 9500,
+	breve: 728,
+	bsemi: 8271,
+	bsime: 8909,
+	bsolb: 10693,
+	bumpE: 10926,
+	bumpe: 8783,
+	caret: 8257,
+	caron: 711,
+	ccaps: 10829,
+	ccirc: 265,
+	ccups: 10828,
+	cedil: 184,
+	check: 10003,
+	clubs: 9827,
+	colon: 58,
+	comma: 44,
+	crarr: 8629,
+	cross: 10007,
+	csube: 10961,
+	csupe: 10962,
+	ctdot: 8943,
+	cuepr: 8926,
+	cuesc: 8927,
+	cupor: 10821,
+	cuvee: 8910,
+	cuwed: 8911,
+	cwint: 8753,
+	dashv: 8867,
+	dblac: 733,
+	ddarr: 8650,
+	delta: 948,
+	dharl: 8643,
+	dharr: 8642,
+	diams: 9830,
+	disin: 8946,
+	doteq: 8784,
+	dtdot: 8945,
+	dtrif: 9662,
+	duarr: 8693,
+	duhar: 10607,
+	eDDot: 10871,
+	ecirc: 234,
+	efDot: 8786,
+	emacr: 275,
+	empty: 8709,
+	eogon: 281,
+	eplus: 10865,
+	epsiv: 949,
+	eqsim: 8770,
+	equiv: 8801,
+	erDot: 8787,
+	erarr: 10609,
+	esdot: 8784,
+	exist: 8707,
+	fflig: 64256,
+	filig: 64257,
+	fllig: 64258,
+	fltns: 9649,
+	forkv: 10969,
+	frasl: 8260,
+	frown: 8994,
+	gamma: 947,
+	gcirc: 285,
+	gescc: 10921,
+	gimel: 8503,
+	gneqq: 8809,
+	gnsim: 8935,
+	grave: 96,
+	gsime: 10894,
+	gsiml: 10896,
+	gtcir: 10874,
+	gtdot: 8919,
+	harrw: 8621,
+	hcirc: 293,
+	hoarr: 8703,
+	icirc: 238,
+	iexcl: 161,
+	iiint: 8749,
+	iiota: 8489,
+	ijlig: 307,
+	imacr: 299,
+	image: 8465,
+	imath: 305,
+	imped: 437,
+	infin: 8734,
+	iogon: 303,
+	iprod: 10812,
+	isinE: 8953,
+	isins: 8948,
+	isinv: 8712,
+	iukcy: 1110,
+	jcirc: 309,
+	jmath: 567,
+	jukcy: 1108,
+	kappa: 954,
+	lAarr: 8666,
+	lBarr: 10510,
+	langd: 10641,
+	laquo: 171,
+	larrb: 8676,
+	lbarr: 10508,
+	lbbrk: 10098,
+	lbrke: 10635,
+	lceil: 8968,
+	ldquo: 8220,
+	lescc: 10920,
+	lhard: 8637,
+	lharu: 8636,
+	lhblk: 9604,
+	llarr: 8647,
+	lltri: 9722,
+	lneqq: 8808,
+	lnsim: 8934,
+	loang: 10220,
+	loarr: 8701,
+	lobrk: 10214,
+	lopar: 10629,
+	lrarr: 8646,
+	lrhar: 8651,
+	lrtri: 8895,
+	lsime: 10893,
+	lsimg: 10895,
+	lsquo: 8216,
+	ltcir: 10873,
+	ltdot: 8918,
+	ltrie: 8884,
+	ltrif: 9666,
+	mDDot: 8762,
+	mdash: 8212,
+	micro: 181,
+	minus: 8722,
+	mumap: 8888,
+	nabla: 8711,
+	napos: 329,
+	natur: 9838,
+	ncong: 8775,
+	ndash: 8211,
+	neArr: 8663,
+	nearr: 8599,
+	ngsim: 8821,
+	nhArr: 8654,
+	nharr: 8622,
+	nhpar: 10994,
+	nlArr: 8653,
+	nlarr: 8602,
+	nless: 8814,
+	nlsim: 8820,
+	nltri: 8938,
+	notin: 8713,
+	notni: 8716,
+	nprec: 8832,
+	nrArr: 8655,
+	nrarr: 8603,
+	nrtri: 8939,
+	nsime: 8772,
+	nsmid: 8740,
+	nspar: 8742,
+	nsube: 8840,
+	nsucc: 8833,
+	nsupe: 8841,
+	numsp: 8199,
+	nwArr: 8662,
+	nwarr: 8598,
+	ocirc: 244,
+	odash: 8861,
+	oelig: 339,
+	ofcir: 10687,
+	ohbar: 10677,
+	olarr: 8634,
+	olcir: 10686,
+	oline: 8254,
+	omacr: 333,
+	omega: 969,
+	operp: 10681,
+	oplus: 8853,
+	orarr: 8635,
+	order: 8500,
+	ovbar: 9021,
+	parsl: 11005,
+	phone: 9742,
+	plusb: 8862,
+	pluse: 10866,
+	pound: 163,
+	prcue: 8828,
+	prime: 8242,
+	prnap: 10937,
+	prsim: 8830,
+	quest: 63,
+	rAarr: 8667,
+	rBarr: 10511,
+	radic: 8730,
+	rangd: 10642,
+	range: 10661,
+	raquo: 187,
+	rarrb: 8677,
+	rarrc: 10547,
+	rarrw: 8605,
+	ratio: 8758,
+	rbarr: 10509,
+	rbbrk: 10099,
+	rbrke: 10636,
+	rceil: 8969,
+	rdquo: 8221,
+	reals: 8477,
+	rhard: 8641,
+	rharu: 8640,
+	rlarr: 8644,
+	rlhar: 8652,
+	rnmid: 10990,
+	roang: 10221,
+	roarr: 8702,
+	robrk: 10215,
+	ropar: 10630,
+	rrarr: 8649,
+	rsquo: 8217,
+	rtrie: 8885,
+	rtrif: 9656,
+	sbquo: 8218,
+	sccue: 8829,
+	scirc: 349,
+	scnap: 10938,
+	scsim: 8831,
+	sdotb: 8865,
+	sdote: 10854,
+	seArr: 8664,
+	searr: 8600,
+	setmn: 8726,
+	sharp: 9839,
+	sigma: 963,
+	simeq: 8771,
+	simgE: 10912,
+	simlE: 10911,
+	simne: 8774,
+	slarr: 8592,
+	smile: 8995,
+	sqcap: 8851,
+	sqcup: 8852,
+	sqsub: 8847,
+	sqsup: 8848,
+	srarr: 8594,
+	starf: 9733,
+	strns: 175,
+	subnE: 10955,
+	subne: 8842,
+	supnE: 10956,
+	supne: 8843,
+	swArr: 8665,
+	swarr: 8601,
+	szlig: 223,
+	theta: 952,
+	thkap: 8776,
+	thorn: 254,
+	tilde: 732,
+	times: 215,
+	trade: 8482,
+	trisb: 10701,
+	tshcy: 1115,
+	twixt: 8812,
+	ubrcy: 1118,
+	ucirc: 251,
+	udarr: 8645,
+	udhar: 10606,
+	uharl: 8639,
+	uharr: 8638,
+	uhblk: 9600,
+	ultri: 9720,
+	umacr: 363,
+	uogon: 371,
+	uplus: 8846,
+	upsih: 978,
+	uring: 367,
+	urtri: 9721,
+	utdot: 8944,
+	utrif: 9652,
+	uuarr: 8648,
+	vBarv: 10985,
+	vDash: 8872,
+	varpi: 982,
+	vdash: 8866,
+	veeeq: 8794,
+	vltri: 8882,
+	vprop: 8733,
+	vrtri: 8883,
+	wcirc: 373,
+	wedge: 8743,
+	xcirc: 9711,
+	xdtri: 9661,
+	xhArr: 10234,
+	xharr: 10231,
+	xlArr: 10232,
+	xlarr: 10229,
+	xodot: 10752,
+	xrArr: 10233,
+	xrarr: 10230,
+	xutri: 9651,
+	ycirc: 375,
+	Aopf: 120120,
+	Ascr: 119964,
+	Auml: 196,
+	Barv: 10983,
+	Beta: 914,
+	Bopf: 120121,
+	Bscr: 8492,
+	CHcy: 1063,
+	COPY: 169,
+	Cdot: 266,
+	Copf: 8450,
+	Cscr: 119966,
+	DJcy: 1026,
+	DScy: 1029,
+	DZcy: 1039,
+	Darr: 8609,
+	Dopf: 120123,
+	Dscr: 119967,
+	Edot: 278,
+	Eopf: 120124,
+	Escr: 8496,
+	Esim: 10867,
+	Euml: 203,
+	Fopf: 120125,
+	Fscr: 8497,
+	GJcy: 1027,
+	Gdot: 288,
+	Gopf: 120126,
+	Gscr: 119970,
+	Hopf: 8461,
+	Hscr: 8459,
+	IEcy: 1045,
+	IOcy: 1025,
+	Idot: 304,
+	Iopf: 120128,
+	Iota: 921,
+	Iscr: 8464,
+	Iuml: 207,
+	Jopf: 120129,
+	Jscr: 119973,
+	KHcy: 1061,
+	KJcy: 1036,
+	Kopf: 120130,
+	Kscr: 119974,
+	LJcy: 1033,
+	Lang: 10218,
+	Larr: 8606,
+	Lopf: 120131,
+	Lscr: 8466,
+	Mopf: 120132,
+	Mscr: 8499,
+	NJcy: 1034,
+	Nopf: 8469,
+	Nscr: 119977,
+	Oopf: 120134,
+	Oscr: 119978,
+	Ouml: 214,
+	Popf: 8473,
+	Pscr: 119979,
+	QUOT: 34,
+	Qopf: 8474,
+	Qscr: 119980,
+	Rang: 10219,
+	Rarr: 8608,
+	Ropf: 8477,
+	Rscr: 8475,
+	SHcy: 1064,
+	Sopf: 120138,
+	Sqrt: 8730,
+	Sscr: 119982,
+	Star: 8902,
+	TScy: 1062,
+	Topf: 120139,
+	Tscr: 119983,
+	Uarr: 8607,
+	Uopf: 120140,
+	Upsi: 978,
+	Uscr: 119984,
+	Uuml: 220,
+	Vbar: 10987,
+	Vert: 8214,
+	Vopf: 120141,
+	Vscr: 119985,
+	Wopf: 120142,
+	Wscr: 119986,
+	Xopf: 120143,
+	Xscr: 119987,
+	YAcy: 1071,
+	YIcy: 1031,
+	YUcy: 1070,
+	Yopf: 120144,
+	Yscr: 119988,
+	Yuml: 376,
+	ZHcy: 1046,
+	Zdot: 379,
+	Zeta: 918,
+	Zopf: 8484,
+	Zscr: 119989,
+	andd: 10844,
+	andv: 10842,
+	ange: 10660,
+	aopf: 120146,
+	apid: 8779,
+	apos: 39,
+	ascr: 119990,
+	auml: 228,
+	bNot: 10989,
+	bbrk: 9141,
+	beta: 946,
+	beth: 8502,
+	bnot: 8976,
+	bopf: 120147,
+	boxH: 9552,
+	boxV: 9553,
+	boxh: 9472,
+	boxv: 9474,
+	bscr: 119991,
+	bsim: 8765,
+	bsol: 92,
+	bull: 8226,
+	bump: 8782,
+	cdot: 267,
+	cent: 162,
+	chcy: 1095,
+	cirE: 10691,
+	circ: 710,
+	cire: 8791,
+	comp: 8705,
+	cong: 8773,
+	copf: 120148,
+	copy: 169,
+	cscr: 119992,
+	csub: 10959,
+	csup: 10960,
+	dArr: 8659,
+	dHar: 10597,
+	darr: 8595,
+	dash: 8208,
+	diam: 8900,
+	djcy: 1106,
+	dopf: 120149,
+	dscr: 119993,
+	dscy: 1109,
+	dsol: 10742,
+	dtri: 9663,
+	dzcy: 1119,
+	eDot: 8785,
+	ecir: 8790,
+	edot: 279,
+	emsp: 8195,
+	ensp: 8194,
+	eopf: 120150,
+	epar: 8917,
+	epsi: 1013,
+	escr: 8495,
+	esim: 8770,
+	euml: 235,
+	euro: 8364,
+	excl: 33,
+	flat: 9837,
+	fnof: 402,
+	fopf: 120151,
+	fork: 8916,
+	fscr: 119995,
+	gdot: 289,
+	geqq: 8807,
+	gjcy: 1107,
+	gnap: 10890,
+	gneq: 10888,
+	gopf: 120152,
+	gscr: 8458,
+	gsim: 8819,
+	gtcc: 10919,
+	hArr: 8660,
+	half: 189,
+	harr: 8596,
+	hbar: 8463,
+	hopf: 120153,
+	hscr: 119997,
+	iecy: 1077,
+	imof: 8887,
+	iocy: 1105,
+	iopf: 120154,
+	iota: 953,
+	iscr: 119998,
+	isin: 8712,
+	iuml: 239,
+	jopf: 120155,
+	jscr: 119999,
+	khcy: 1093,
+	kjcy: 1116,
+	kopf: 120156,
+	kscr: 120000,
+	lArr: 8656,
+	lHar: 10594,
+	lang: 10216,
+	larr: 8592,
+	late: 10925,
+	lcub: 123,
+	ldca: 10550,
+	ldsh: 8626,
+	leqq: 8806,
+	ljcy: 1113,
+	lnap: 10889,
+	lneq: 10887,
+	lopf: 120157,
+	lozf: 10731,
+	lpar: 40,
+	lscr: 120001,
+	lsim: 8818,
+	lsqb: 91,
+	ltcc: 10918,
+	ltri: 9667,
+	macr: 175,
+	male: 9794,
+	malt: 10016,
+	mlcp: 10971,
+	mldr: 8230,
+	mopf: 120158,
+	mscr: 120002,
+	nbsp: 160,
+	ncap: 10819,
+	ncup: 10818,
+	ngeq: 8817,
+	ngtr: 8815,
+	nisd: 8954,
+	njcy: 1114,
+	nldr: 8229,
+	nleq: 8816,
+	nmid: 8740,
+	nopf: 120159,
+	npar: 8742,
+	nscr: 120003,
+	nsim: 8769,
+	nsub: 8836,
+	nsup: 8837,
+	ntgl: 8825,
+	ntlg: 8824,
+	oast: 8859,
+	ocir: 8858,
+	odiv: 10808,
+	odot: 8857,
+	ogon: 731,
+	oint: 8750,
+	omid: 10678,
+	oopf: 120160,
+	opar: 10679,
+	ordf: 170,
+	ordm: 186,
+	oror: 10838,
+	oscr: 8500,
+	osol: 8856,
+	ouml: 246,
+	para: 182,
+	part: 8706,
+	perp: 8869,
+	phiv: 966,
+	plus: 43,
+	popf: 120161,
+	prap: 10935,
+	prec: 8826,
+	prnE: 10933,
+	prod: 8719,
+	prop: 8733,
+	pscr: 120005,
+	qint: 10764,
+	qopf: 120162,
+	qscr: 120006,
+	quot: 34,
+	rArr: 8658,
+	rHar: 10596,
+	race: 10714,
+	rang: 10217,
+	rarr: 8594,
+	rcub: 125,
+	rdca: 10551,
+	rdsh: 8627,
+	real: 8476,
+	rect: 9645,
+	rhov: 1009,
+	ring: 730,
+	ropf: 120163,
+	rpar: 41,
+	rscr: 120007,
+	rsqb: 93,
+	rtri: 9657,
+	scap: 10936,
+	scnE: 10934,
+	sdot: 8901,
+	sect: 167,
+	semi: 59,
+	sext: 10038,
+	shcy: 1096,
+	sime: 8771,
+	simg: 10910,
+	siml: 10909,
+	smid: 8739,
+	smte: 10924,
+	solb: 10692,
+	sopf: 120164,
+	spar: 8741,
+	squf: 9642,
+	sscr: 120008,
+	star: 9734,
+	subE: 10949,
+	sube: 8838,
+	succ: 8827,
+	sung: 9834,
+	sup1: 185,
+	sup2: 178,
+	sup3: 179,
+	supE: 10950,
+	supe: 8839,
+	tbrk: 9140,
+	tdot: 8411,
+	tint: 8749,
+	toea: 10536,
+	topf: 120165,
+	tosa: 10537,
+	trie: 8796,
+	tscr: 120009,
+	tscy: 1094,
+	uArr: 8657,
+	uHar: 10595,
+	uarr: 8593,
+	uopf: 120166,
+	upsi: 965,
+	uscr: 120010,
+	utri: 9653,
+	uuml: 252,
+	vArr: 8661,
+	vBar: 10984,
+	varr: 8597,
+	vert: 124,
+	vopf: 120167,
+	vscr: 120011,
+	wopf: 120168,
+	wscr: 120012,
+	xcap: 8898,
+	xcup: 8899,
+	xmap: 10236,
+	xnis: 8955,
+	xopf: 120169,
+	xscr: 120013,
+	xvee: 8897,
+	yacy: 1103,
+	yicy: 1111,
+	yopf: 120170,
+	yscr: 120014,
+	yucy: 1102,
+	yuml: 255,
+	zdot: 380,
+	zeta: 950,
+	zhcy: 1078,
+	zopf: 120171,
+	zscr: 120015,
+	zwnj: 8204,
+	AMP: 38,
+	Acy: 1040,
+	Afr: 120068,
+	And: 10835,
+	Bcy: 1041,
+	Bfr: 120069,
+	Cap: 8914,
+	Cfr: 8493,
+	Chi: 935,
+	Cup: 8915,
+	Dcy: 1044,
+	Del: 8711,
+	Dfr: 120071,
+	Dot: 168,
+	ENG: 330,
+	ETH: 208,
+	Ecy: 1069,
+	Efr: 120072,
+	Eta: 919,
+	Fcy: 1060,
+	Ffr: 120073,
+	Gcy: 1043,
+	Gfr: 120074,
+	Hat: 94,
+	Hfr: 8460,
+	Icy: 1048,
+	Ifr: 8465,
+	Int: 8748,
+	Jcy: 1049,
+	Jfr: 120077,
+	Kcy: 1050,
+	Kfr: 120078,
+	Lcy: 1051,
+	Lfr: 120079,
+	Lsh: 8624,
+	Map: 10501,
+	Mcy: 1052,
+	Mfr: 120080,
+	Ncy: 1053,
+	Nfr: 120081,
+	Not: 10988,
+	Ocy: 1054,
+	Ofr: 120082,
+	Pcy: 1055,
+	Pfr: 120083,
+	Phi: 934,
+	Psi: 936,
+	Qfr: 120084,
+	REG: 174,
+	Rcy: 1056,
+	Rfr: 8476,
+	Rho: 929,
+	Rsh: 8625,
+	Scy: 1057,
+	Sfr: 120086,
+	Sub: 8912,
+	Sum: 8721,
+	Sup: 8913,
+	Tab: 9,
+	Tau: 932,
+	Tcy: 1058,
+	Tfr: 120087,
+	Ucy: 1059,
+	Ufr: 120088,
+	Vcy: 1042,
+	Vee: 8897,
+	Vfr: 120089,
+	Wfr: 120090,
+	Xfr: 120091,
+	Ycy: 1067,
+	Yfr: 120092,
+	Zcy: 1047,
+	Zfr: 8488,
+	acd: 8767,
+	acy: 1072,
+	afr: 120094,
+	amp: 38,
+	and: 8743,
+	ang: 8736,
+	apE: 10864,
+	ape: 8778,
+	ast: 42,
+	bcy: 1073,
+	bfr: 120095,
+	bot: 8869,
+	cap: 8745,
+	cfr: 120096,
+	chi: 967,
+	cir: 9675,
+	cup: 8746,
+	dcy: 1076,
+	deg: 176,
+	dfr: 120097,
+	die: 168,
+	div: 247,
+	dot: 729,
+	ecy: 1101,
+	efr: 120098,
+	egs: 10902,
+	ell: 8467,
+	els: 10901,
+	eng: 331,
+	eta: 951,
+	eth: 240,
+	fcy: 1092,
+	ffr: 120099,
+	gEl: 10892,
+	gap: 10886,
+	gcy: 1075,
+	gel: 8923,
+	geq: 8805,
+	ges: 10878,
+	gfr: 120100,
+	ggg: 8921,
+	glE: 10898,
+	gla: 10917,
+	glj: 10916,
+	gnE: 8809,
+	gne: 10888,
+	hfr: 120101,
+	icy: 1080,
+	iff: 8660,
+	ifr: 120102,
+	int: 8747,
+	jcy: 1081,
+	jfr: 120103,
+	kcy: 1082,
+	kfr: 120104,
+	lEg: 10891,
+	lap: 10885,
+	lat: 10923,
+	lcy: 1083,
+	leg: 8922,
+	leq: 8804,
+	les: 10877,
+	lfr: 120105,
+	lgE: 10897,
+	lnE: 8808,
+	lne: 10887,
+	loz: 9674,
+	lrm: 8206,
+	lsh: 8624,
+	map: 8614,
+	mcy: 1084,
+	mfr: 120106,
+	mho: 8487,
+	mid: 8739,
+	nap: 8777,
+	ncy: 1085,
+	nfr: 120107,
+	nge: 8817,
+	ngt: 8815,
+	nis: 8956,
+	niv: 8715,
+	nle: 8816,
+	nlt: 8814,
+	not: 172,
+	npr: 8832,
+	nsc: 8833,
+	num: 35,
+	ocy: 1086,
+	ofr: 120108,
+	ogt: 10689,
+	ohm: 8486,
+	olt: 10688,
+	ord: 10845,
+	orv: 10843,
+	par: 8741,
+	pcy: 1087,
+	pfr: 120109,
+	phi: 966,
+	piv: 982,
+	prE: 10931,
+	pre: 10927,
+	psi: 968,
+	qfr: 120110,
+	rcy: 1088,
+	reg: 174,
+	rfr: 120111,
+	rho: 961,
+	rlm: 8207,
+	rsh: 8625,
+	scE: 10932,
+	sce: 10928,
+	scy: 1089,
+	sfr: 120112,
+	shy: 173,
+	sim: 8764,
+	smt: 10922,
+	sol: 47,
+	squ: 9633,
+	sub: 8834,
+	sum: 8721,
+	sup: 8835,
+	tau: 964,
+	tcy: 1090,
+	tfr: 120113,
+	top: 8868,
+	ucy: 1091,
+	ufr: 120114,
+	uml: 168,
+	vcy: 1074,
+	vee: 8744,
+	vfr: 120115,
+	wfr: 120116,
+	xfr: 120117,
+	ycy: 1099,
+	yen: 165,
+	yfr: 120118,
+	zcy: 1079,
+	zfr: 120119,
+	zwj: 8205,
+	DD: 8517,
+	GT: 62,
+	Gg: 8921,
+	Gt: 8811,
+	Im: 8465,
+	LT: 60,
+	Ll: 8920,
+	Lt: 8810,
+	Mu: 924,
+	Nu: 925,
+	Or: 10836,
+	Pi: 928,
+	Pr: 10939,
+	Re: 8476,
+	Sc: 10940,
+	Xi: 926,
+	ac: 8766,
+	af: 8289,
+	ap: 8776,
+	dd: 8518,
+	ee: 8519,
+	eg: 10906,
+	el: 10905,
+	gE: 8807,
+	ge: 8805,
+	gg: 8811,
+	gl: 8823,
+	gt: 62,
+	ic: 8291,
+	ii: 8520,
+	in: 8712,
+	it: 8290,
+	lE: 8806,
+	le: 8804,
+	lg: 8822,
+	ll: 8810,
+	lt: 60,
+	mp: 8723,
+	mu: 956,
+	ne: 8800,
+	ni: 8715,
+	nu: 957,
+	oS: 9416,
+	or: 8744,
+	pi: 960,
+	pm: 177,
+	pr: 8826,
+	rx: 8478,
+	sc: 8827,
+	wp: 8472,
+	wr: 8768,
+	xi: 958,
+};
diff --git a/src/parse/utils/hash.js b/src/parse/utils/hash.ts
similarity index 52%
rename from src/parse/utils/hash.js
rename to src/parse/utils/hash.ts
index 02dc221523..8bc550a5c0 100644
--- a/src/parse/utils/hash.js
+++ b/src/parse/utils/hash.ts
@@ -1,8 +1,8 @@
 // https://github.com/darkskyapp/string-hash/blob/master/index.js
-export default function hash ( str ) {
+export default function hash(str: string): number {
 	let hash = 5381;
 	let i = str.length;
 
-	while ( i-- ) hash = ( hash * 33 ) ^ str.charCodeAt( i );
+	while (i--) hash = ((hash << 5) - hash) ^ str.charCodeAt(i);
 	return hash >>> 0;
 }
diff --git a/src/parse/utils/html.js b/src/parse/utils/html.js
deleted file mode 100644
index 124bf03f4f..0000000000
--- a/src/parse/utils/html.js
+++ /dev/null
@@ -1,80 +0,0 @@
-// borrowed from Ractive – https://github.com/ractivejs/ractive/blob/faf93cbd33c3fedfd8d6dd48340990540bde4a94/src/utils/html.js
-const htmlEntities = { quot: 34, amp: 38, apos: 39, lt: 60, gt: 62, nbsp: 160, iexcl: 161, cent: 162, pound: 163, curren: 164, yen: 165, brvbar: 166, sect: 167, uml: 168, copy: 169, ordf: 170, laquo: 171, not: 172, shy: 173, reg: 174, macr: 175, deg: 176, plusmn: 177, sup2: 178, sup3: 179, acute: 180, micro: 181, para: 182, middot: 183, cedil: 184, sup1: 185, ordm: 186, raquo: 187, frac14: 188, frac12: 189, frac34: 190, iquest: 191, Agrave: 192, Aacute: 193, Acirc: 194, Atilde: 195, Auml: 196, Aring: 197, AElig: 198, Ccedil: 199, Egrave: 200, Eacute: 201, Ecirc: 202, Euml: 203, Igrave: 204, Iacute: 205, Icirc: 206, Iuml: 207, ETH: 208, Ntilde: 209, Ograve: 210, Oacute: 211, Ocirc: 212, Otilde: 213, Ouml: 214, times: 215, Oslash: 216, Ugrave: 217, Uacute: 218, Ucirc: 219, Uuml: 220, Yacute: 221, THORN: 222, szlig: 223, agrave: 224, aacute: 225, acirc: 226, atilde: 227, auml: 228, aring: 229, aelig: 230, ccedil: 231, egrave: 232, eacute: 233, ecirc: 234, euml: 235, igrave: 236, iacute: 237, icirc: 238, iuml: 239, eth: 240, ntilde: 241, ograve: 242, oacute: 243, ocirc: 244, otilde: 245, ouml: 246, divide: 247, oslash: 248, ugrave: 249, uacute: 250, ucirc: 251, uuml: 252, yacute: 253, thorn: 254, yuml: 255, OElig: 338, oelig: 339, Scaron: 352, scaron: 353, Yuml: 376, fnof: 402, circ: 710, tilde: 732, Alpha: 913, Beta: 914, Gamma: 915, Delta: 916, Epsilon: 917, Zeta: 918, Eta: 919, Theta: 920, Iota: 921, Kappa: 922, Lambda: 923, Mu: 924, Nu: 925, Xi: 926, Omicron: 927, Pi: 928, Rho: 929, Sigma: 931, Tau: 932, Upsilon: 933, Phi: 934, Chi: 935, Psi: 936, Omega: 937, alpha: 945, beta: 946, gamma: 947, delta: 948, epsilon: 949, zeta: 950, eta: 951, theta: 952, iota: 953, kappa: 954, lambda: 955, mu: 956, nu: 957, xi: 958, omicron: 959, pi: 960, rho: 961, sigmaf: 962, sigma: 963, tau: 964, upsilon: 965, phi: 966, chi: 967, psi: 968, omega: 969, thetasym: 977, upsih: 978, piv: 982, ensp: 8194, emsp: 8195, thinsp: 8201, zwnj: 8204, zwj: 8205, lrm: 8206, rlm: 8207, ndash: 8211, mdash: 8212, lsquo: 8216, rsquo: 8217, sbquo: 8218, ldquo: 8220, rdquo: 8221, bdquo: 8222, dagger: 8224, Dagger: 8225, bull: 8226, hellip: 8230, permil: 8240, prime: 8242, Prime: 8243, lsaquo: 8249, rsaquo: 8250, oline: 8254, frasl: 8260, euro: 8364, image: 8465, weierp: 8472, real: 8476, trade: 8482, alefsym: 8501, larr: 8592, uarr: 8593, rarr: 8594, darr: 8595, harr: 8596, crarr: 8629, lArr: 8656, uArr: 8657, rArr: 8658, dArr: 8659, hArr: 8660, forall: 8704, part: 8706, exist: 8707, empty: 8709, nabla: 8711, isin: 8712, notin: 8713, ni: 8715, prod: 8719, sum: 8721, minus: 8722, lowast: 8727, radic: 8730, prop: 8733, infin: 8734, ang: 8736, and: 8743, or: 8744, cap: 8745, cup: 8746, int: 8747, there4: 8756, sim: 8764, cong: 8773, asymp: 8776, ne: 8800, equiv: 8801, le: 8804, ge: 8805, sub: 8834, sup: 8835, nsub: 8836, sube: 8838, supe: 8839, oplus: 8853, otimes: 8855, perp: 8869, sdot: 8901, lceil: 8968, rceil: 8969, lfloor: 8970, rfloor: 8971, lang: 9001, rang: 9002, loz: 9674, spades: 9824, clubs: 9827, hearts: 9829, diams: 9830	};
-const controlCharacters = [ 8364, 129, 8218, 402, 8222, 8230, 8224, 8225, 710, 8240, 352, 8249, 338, 141, 381, 143, 144, 8216, 8217, 8220, 8221, 8226, 8211, 8212, 732, 8482, 353, 8250, 339, 157, 382, 376 ];
-const entityPattern = new RegExp( '&(#?(?:x[\\w\\d]+|\\d+|' + Object.keys( htmlEntities ).join( '|' ) + '));?', 'g' );
-
-export function decodeCharacterReferences ( html ) {
-	return html.replace( entityPattern, ( match, entity ) => {
-		let code;
-
-		// Handle named entities
-		if ( entity[0] !== '#' ) {
-			code = htmlEntities[ entity ];
-		} else if ( entity[1] === 'x' ) {
-			code = parseInt( entity.substring( 2 ), 16 );
-		} else {
-			code = parseInt( entity.substring( 1 ), 10 );
-		}
-
-		if ( !code ) {
-			return match;
-		}
-
-		return String.fromCodePoint( validateCode( code ) );
-	});
-}
-const invalid = 65533;
-
-// some code points are verboten. If we were inserting HTML, the browser would replace the illegal
-// code points with alternatives in some cases - since we're bypassing that mechanism, we need
-// to replace them ourselves
-//
-// Source: http://en.wikipedia.org/wiki/Character_encodings_in_HTML#Illegal_characters
-function validateCode ( code ) {
-	if ( !code ) {
-		return invalid;
-	}
-
-	// line feed becomes generic whitespace
-	if ( code === 10 ) {
-		return 32;
-	}
-
-	// ASCII range. (Why someone would use HTML entities for ASCII characters I don't know, but...)
-	if ( code < 128 ) {
-		return code;
-	}
-
-	// code points 128-159 are dealt with leniently by browsers, but they're incorrect. We need
-	// to correct the mistake or we'll end up with missing € signs and so on
-	if ( code <= 159 ) {
-		return controlCharacters[ code - 128 ];
-	}
-
-	// basic multilingual plane
-	if ( code < 55296 ) {
-		return code;
-	}
-
-	// UTF-16 surrogate halves
-	if ( code <= 57343 ) {
-		return invalid;
-	}
-
-	// rest of the basic multilingual plane
-	if ( code <= 65535 ) {
-		return code;
-	}
-
-	// supplementary multilingual plane 0x10000 - 0x1ffff
-	if ( code >= 65536 && code <= 131071 ) {
-		return code;
-	}
-
-	// supplementary ideographic plane 0x20000 - 0x2ffff
-	if ( code >= 131072 && code <= 196607 ) {
-		return code;
-	}
-
-	return invalid;
-}
diff --git a/src/parse/utils/html.ts b/src/parse/utils/html.ts
new file mode 100644
index 0000000000..dd4296a8d0
--- /dev/null
+++ b/src/parse/utils/html.ts
@@ -0,0 +1,113 @@
+import htmlEntities from './entities';
+
+const windows1252 = [
+	8364,
+	129,
+	8218,
+	402,
+	8222,
+	8230,
+	8224,
+	8225,
+	710,
+	8240,
+	352,
+	8249,
+	338,
+	141,
+	381,
+	143,
+	144,
+	8216,
+	8217,
+	8220,
+	8221,
+	8226,
+	8211,
+	8212,
+	732,
+	8482,
+	353,
+	8250,
+	339,
+	157,
+	382,
+	376,
+];
+const entityPattern = new RegExp(
+	`&(#?(?:x[\\w\\d]+|\\d+|${Object.keys(htmlEntities).join('|')}));?`,
+	'g'
+);
+
+export function decodeCharacterReferences(html: string) {
+	return html.replace(entityPattern, (match, entity) => {
+		let code;
+
+		// Handle named entities
+		if (entity[0] !== '#') {
+			code = htmlEntities[entity];
+		} else if (entity[1] === 'x') {
+			code = parseInt(entity.substring(2), 16);
+		} else {
+			code = parseInt(entity.substring(1), 10);
+		}
+
+		if (!code) {
+			return match;
+		}
+
+		return String.fromCodePoint(validateCode(code));
+	});
+}
+
+const NUL = 0;
+
+// some code points are verboten. If we were inserting HTML, the browser would replace the illegal
+// code points with alternatives in some cases - since we're bypassing that mechanism, we need
+// to replace them ourselves
+//
+// Source: http://en.wikipedia.org/wiki/Character_encodings_in_HTML#Illegal_characters
+function validateCode(code: number) {
+	// line feed becomes generic whitespace
+	if (code === 10) {
+		return 32;
+	}
+
+	// ASCII range. (Why someone would use HTML entities for ASCII characters I don't know, but...)
+	if (code < 128) {
+		return code;
+	}
+
+	// code points 128-159 are dealt with leniently by browsers, but they're incorrect. We need
+	// to correct the mistake or we'll end up with missing € signs and so on
+	if (code <= 159) {
+		return windows1252[code - 128];
+	}
+
+	// basic multilingual plane
+	if (code < 55296) {
+		return code;
+	}
+
+	// UTF-16 surrogate halves
+	if (code <= 57343) {
+		return NUL;
+	}
+
+	// rest of the basic multilingual plane
+	if (code <= 65535) {
+		return code;
+	}
+
+	// supplementary multilingual plane 0x10000 - 0x1ffff
+	if (code >= 65536 && code <= 131071) {
+		return code;
+	}
+
+	// supplementary ideographic plane 0x20000 - 0x2ffff
+	if (code >= 131072 && code <= 196607) {
+		return code;
+	}
+
+	return NUL;
+}
diff --git a/src/server-side-rendering/register.js b/src/server-side-rendering/register.js
index 95c2a63fad..442888e99e 100644
--- a/src/server-side-rendering/register.js
+++ b/src/server-side-rendering/register.js
@@ -1,17 +1,17 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import { compile } from '../index.js';
+import { compile } from '../index.ts';
 
-function capitalise ( name ) {
-	return name[0].toUpperCase() + name.slice( 1 );
+function capitalise(name) {
+	return name[0].toUpperCase() + name.slice(1);
 }
 
-require.extensions[ '.html' ] = function ( module, filename ) {
-	const { code } = compile( fs.readFileSync( filename, 'utf-8' ), {
+require.extensions['.html'] = function(module, filename) {
+	const { code } = compile(fs.readFileSync(filename, 'utf-8'), {
 		filename,
-		name: capitalise( path.basename( filename ).replace( /\.html$/, '' ) ),
+		name: capitalise(path.basename(filename).replace(/\.html$/, '')),
 		generate: 'ssr'
 	});
 
-	return module._compile( code, filename );
+	return module._compile(code, filename);
 };
diff --git a/src/shared/.eslintrc.json b/src/shared/.eslintrc.json
new file mode 100644
index 0000000000..46f1957077
--- /dev/null
+++ b/src/shared/.eslintrc.json
@@ -0,0 +1,38 @@
+{
+    "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,
+        "no-const-assign": 2,
+        "no-class-assign": 2,
+        "no-this-before-super": 2,
+        "no-unreachable": 2,
+        "valid-typeof": 2,
+        "quote-props": [ 2, "as-needed" ],
+        "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": 6,
+        "sourceType": "module"
+    },
+    "settings": {
+        "import/core-modules": [ "svelte" ]
+    }
+}
diff --git a/src/shared/_build.js b/src/shared/_build.js
new file mode 100644
index 0000000000..3bbf0298ff
--- /dev/null
+++ b/src/shared/_build.js
@@ -0,0 +1,38 @@
+const fs = require('fs');
+const path = require('path');
+const acorn = require('acorn');
+
+const declarations = {};
+
+fs.readdirSync(__dirname).forEach(file => {
+	if (!/^[a-z]+\.js$/.test(file)) return;
+
+	const source = fs.readFileSync(path.join(__dirname, file), 'utf-8');
+	const ast = acorn.parse(source, {
+		ecmaVersion: 6,
+		sourceType: 'module'
+	});
+
+	ast.body.forEach(node => {
+		if (node.type !== 'ExportNamedDeclaration') return;
+
+		const declaration = node.declaration;
+		if (!declaration) return;
+
+		const name = declaration.type === 'VariableDeclaration'
+			? declaration.declarations[0].id.name
+			: declaration.id.name;
+
+		const value = declaration.type === 'VariableDeclaration'
+			? declaration.declarations[0].init
+			: declaration;
+
+		declarations[name] = source.slice(value.start, value.end);
+	});
+});
+
+fs.writeFileSync(
+	'src/generators/dom/shared.ts',
+	`// this file is auto-generated, do not edit it
+export default ${JSON.stringify(declarations, null, '\t')};`
+);
diff --git a/src/shared/dom.js b/src/shared/dom.js
index 6280783cb6..08a06be802 100644
--- a/src/shared/dom.js
+++ b/src/shared/dom.js
@@ -1,63 +1,99 @@
-export function appendNode ( node, target ) {
-	target.appendChild( node );
+export function appendNode(node, target) {
+	target.appendChild(node);
 }
 
-export function insertNode ( node, target, anchor ) {
-	target.insertBefore( node, anchor );
+export function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
 }
 
-export function detachNode ( node ) {
-	node.parentNode.removeChild( node );
+export function detachNode(node) {
+	node.parentNode.removeChild(node);
 }
 
-export function detachBetween ( before, after ) {
-	while ( before.nextSibling && before.nextSibling !== after ) {
-		before.parentNode.removeChild( before.nextSibling );
+export function detachBetween(before, after) {
+	while (before.nextSibling && before.nextSibling !== after) {
+		before.parentNode.removeChild(before.nextSibling);
 	}
 }
 
-export function destroyEach ( iterations, detach, start ) {
-	for ( var i = start; i < iterations.length; i += 1 ) {
-		iterations[i].destroy( detach );
+// TODO this is out of date
+export function destroyEach(iterations, detach, start) {
+	for (var i = start; i < iterations.length; i += 1) {
+		if (iterations[i]) iterations[i].destroy(detach);
 	}
 }
 
-export function createElement ( name ) {
-	return document.createElement( name );
+export function createElement(name) {
+	return document.createElement(name);
 }
 
-export function createSvgElement ( name ) {
-	return document.createElementNS( 'http://www.w3.org/2000/svg', name );
+export function createSvgElement(name) {
+	return document.createElementNS('http://www.w3.org/2000/svg', name);
 }
 
-export function createText ( data ) {
-	return document.createTextNode( data );
+export function createText(data) {
+	return document.createTextNode(data);
 }
 
-export function createComment () {
-	return document.createComment( '' );
+export function createComment() {
+	return document.createComment('');
 }
 
-export function addEventListener ( node, event, handler ) {
-	node.addEventListener( event, handler, false );
+export function addListener(node, event, handler) {
+	node.addEventListener(event, handler, false);
 }
 
-export function removeEventListener ( node, event, handler ) {
-	node.removeEventListener( event, handler, false );
+export function removeListener(node, event, handler) {
+	node.removeEventListener(event, handler, false);
 }
 
-export function setAttribute ( node, attribute, value ) {
-	node.setAttribute( attribute, value );
+export function setAttribute(node, attribute, value) {
+	node.setAttribute(attribute, value);
 }
 
-export function setXlinkAttribute ( node, attribute, value ) {
-	node.setAttributeNS( 'http://www.w3.org/1999/xlink', attribute, value );
+export function setXlinkAttribute(node, attribute, value) {
+	node.setAttributeNS('http://www.w3.org/1999/xlink', attribute, value);
 }
 
-export function getBindingGroupValue ( group ) {
+export function getBindingGroupValue(group) {
 	var value = [];
-	for ( var i = 0; i < group.length; i += 1 ) {
-		if ( group[i].checked ) value.push( group[i].__value );
+	for (var i = 0; i < group.length; i += 1) {
+		if (group[i].checked) value.push(group[i].__value);
 	}
 	return value;
+}
+
+export function toNumber(value) {
+	return value === '' ? undefined : +value;
+}
+
+export function children (element) {
+	return Array.from(element.childNodes);
+}
+
+export function claimElement (nodes, name, attributes, svg) {
+	for (var i = 0; i < nodes.length; i += 1) {
+		var node = nodes[i];
+		if (node.nodeName === name) {
+			for (var j = 0; j < node.attributes.length; j += 1) {
+				var attribute = node.attributes[j];
+				if (!attributes[attribute.name]) node.removeAttribute(attribute.name);
+			}
+			return nodes.splice(i, 1)[0]; // TODO strip unwanted attributes
+		}
+	}
+
+	return svg ? createSvgElement(name) : createElement(name);
+}
+
+export function claimText (nodes, data) {
+	for (var i = 0; i < nodes.length; i += 1) {
+		var node = nodes[i];
+		if (node.nodeType === 3) {
+			node.data = data;
+			return nodes.splice(i, 1)[0];
+		}
+	}
+
+	return createText(data);
 }
\ No newline at end of file
diff --git a/src/shared/index.js b/src/shared/index.js
index 9fa41f3122..b7b5ff7b64 100644
--- a/src/shared/index.js
+++ b/src/shared/index.js
@@ -1,121 +1,119 @@
+import { assign } from './utils.js';
 export * from './dom.js';
+export * from './transitions.js';
+export * from './utils.js';
 
-export function noop () {}
-
-export function assign ( target ) {
-	for ( var i = 1; i < arguments.length; i += 1 ) {
-		var source = arguments[i];
-		for ( var k in source ) target[k] = source[k];
-	}
-
-	return target;
-}
-
-export function differs ( a, b ) {
-	return ( a !== b ) || ( a && ( typeof a === 'object' ) || ( typeof a === 'function' ) );
+export function differs(a, b) {
+	return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
 }
 
-export function dispatchObservers ( component, group, newState, oldState ) {
-	for ( var key in group ) {
-		if ( !( key in newState ) ) continue;
+export function dispatchObservers(component, group, newState, oldState) {
+	for (var key in group) {
+		if (!(key in newState)) continue;
 
-		var newValue = newState[ key ];
-		var oldValue = oldState[ key ];
+		var newValue = newState[key];
+		var oldValue = oldState[key];
 
-		if ( differs( newValue, oldValue ) ) {
-			var callbacks = group[ key ];
-			if ( !callbacks ) continue;
+		if (differs(newValue, oldValue)) {
+			var callbacks = group[key];
+			if (!callbacks) continue;
 
-			for ( var i = 0; i < callbacks.length; i += 1 ) {
+			for (var i = 0; i < callbacks.length; i += 1) {
 				var callback = callbacks[i];
-				if ( callback.__calling ) continue;
+				if (callback.__calling) continue;
 
 				callback.__calling = true;
-				callback.call( component, newValue, oldValue );
+				callback.call(component, newValue, oldValue);
 				callback.__calling = false;
 			}
 		}
 	}
 }
 
-export function get ( key ) {
-	return key ? this._state[ key ] : this._state;
+export function get(key) {
+	return key ? this._state[key] : this._state;
 }
 
-export function fire ( eventName, data ) {
-	var handlers = eventName in this._handlers && this._handlers[ eventName ].slice();
-	if ( !handlers ) return;
+export function fire(eventName, data) {
+	var handlers =
+		eventName in this._handlers && this._handlers[eventName].slice();
+	if (!handlers) return;
 
-	for ( var i = 0; i < handlers.length; i += 1 ) {
-		handlers[i].call( this, data );
+	for (var i = 0; i < handlers.length; i += 1) {
+		handlers[i].call(this, data);
 	}
 }
 
-export function observe ( key, callback, options ) {
-	var group = ( options && options.defer ) ? this._observers.post : this._observers.pre;
+export function observe(key, callback, options) {
+	var group = options && options.defer
+		? this._observers.post
+		: this._observers.pre;
 
-	( group[ key ] || ( group[ key ] = [] ) ).push( callback );
+	(group[key] || (group[key] = [])).push(callback);
 
-	if ( !options || options.init !== false ) {
+	if (!options || options.init !== false) {
 		callback.__calling = true;
-		callback.call( this, this._state[ key ] );
+		callback.call(this, this._state[key]);
 		callback.__calling = false;
 	}
 
 	return {
-		cancel: function () {
-			var index = group[ key ].indexOf( callback );
-			if ( ~index ) group[ key ].splice( index, 1 );
+		cancel: function() {
+			var index = group[key].indexOf(callback);
+			if (~index) group[key].splice(index, 1);
 		}
 	};
 }
 
-export function observeDev ( key, callback, options ) {
-	var c = ( key = '' + key ).search( /[^\w]/ );
-	if ( c > -1 ) {
-		var message = "The first argument to component.observe(...) must be the name of a top-level property";
-		if ( c > 0 ) message += ", i.e. '" + key.slice( 0, c ) + "' rather than '" + key + "'";
+export function observeDev(key, callback, options) {
+	var c = (key = '' + key).search(/[^\w]/);
+	if (c > -1) {
+		var message =
+			'The first argument to component.observe(...) must be the name of a top-level property';
+		if (c > 0)
+			message += ", i.e. '" + key.slice(0, c) + "' rather than '" + key + "'";
 
-		throw new Error( message );
+		throw new Error(message);
 	}
 
-	return observe.call( this, key, callback, options );
+	return observe.call(this, key, callback, options);
 }
 
-export function on ( eventName, handler ) {
-	if ( eventName === 'teardown' ) return this.on( 'destroy', handler );
+export function on(eventName, handler) {
+	if (eventName === 'teardown') return this.on('destroy', handler);
 
-	var handlers = this._handlers[ eventName ] || ( this._handlers[ eventName ] = [] );
-	handlers.push( handler );
+	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
+	handlers.push(handler);
 
 	return {
-		cancel: function () {
-			var index = handlers.indexOf( handler );
-			if ( ~index ) handlers.splice( index, 1 );
+		cancel: function() {
+			var index = handlers.indexOf(handler);
+			if (~index) handlers.splice(index, 1);
 		}
 	};
 }
 
-export function onDev ( eventName, handler ) {
-	if ( eventName === 'teardown' ) {
-		console.warn( "Use component.on('destroy', ...) instead of component.on('teardown', ...) which has been deprecated and will be unsupported in Svelte 2" );
-		return this.on( 'destroy', handler );
+export function onDev(eventName, handler) {
+	if (eventName === 'teardown') {
+		console.warn(
+			"Use component.on('destroy', ...) instead of component.on('teardown', ...) which has been deprecated and will be unsupported in Svelte 2"
+		);
+		return this.on('destroy', handler);
 	}
 
-	return on.call( this, eventName, handler );
+	return on.call(this, eventName, handler);
 }
 
-export function set ( newState ) {
-	this._set( assign( {}, newState ) );
-	( this._root || this )._flush();
+export function set(newState) {
+	this._set(assign({}, newState));
+	this._root._flush();
 }
 
-export function _flush () {
-	if ( !this._renderHooks ) return;
+export function _flush() {
+	if (!this._renderHooks) return;
 
-	while ( this._renderHooks.length ) {
-		var hook = this._renderHooks.pop();
-		hook.fn.call( hook.context );
+	while (this._renderHooks.length) {
+		this._renderHooks.pop()();
 	}
 }
 
diff --git a/src/shared/transitions.js b/src/shared/transitions.js
new file mode 100644
index 0000000000..30b5c73342
--- /dev/null
+++ b/src/shared/transitions.js
@@ -0,0 +1,205 @@
+import { assign, noop } from './utils.js';
+import { createElement } from './dom.js';
+
+export function linear(t) {
+	return t;
+}
+
+export function generateRule(
+	a,
+	b,
+	delta,
+	duration,
+	ease,
+	fn
+) {
+	var keyframes = '{\n';
+
+	for (var p = 0; p <= 1; p += 16.666 / duration) {
+		var t = a + delta * ease(p);
+		keyframes += p * 100 + '%{' + fn(t) + '}\n';
+	}
+
+	return keyframes + '100% {' + fn(b) + '}\n}';
+}
+
+// https://github.com/darkskyapp/string-hash/blob/master/index.js
+export function hash(str) {
+	var hash = 5381;
+	var i = str.length;
+
+	while (i--) hash = ((hash << 5) - hash) ^ str.charCodeAt(i);
+	return hash >>> 0;
+}
+
+export function wrapTransition(node, fn, params, intro, outgroup) {
+	var obj = fn(node, params);
+	var duration = obj.duration || 300;
+	var ease = obj.easing || linear;
+	var cssText;
+
+	// TODO share <style> tag between all transitions?
+	if (obj.css && !transitionManager.stylesheet) {
+		var style = createElement('style');
+		document.head.appendChild(style);
+		transitionManager.stylesheet = style.sheet;
+	}
+
+	if (intro) {
+		if (obj.css && obj.delay) {
+			cssText = node.style.cssText;
+			node.style.cssText += obj.css(0);
+		}
+
+		if (obj.tick) obj.tick(0);
+	}
+
+	return {
+		t: intro ? 0 : 1,
+		running: false,
+		program: null,
+		pending: null,
+		run: function(intro, callback) {
+			var program = {
+				start: window.performance.now() + (obj.delay || 0),
+				intro: intro,
+				callback: callback
+			};
+
+			if (obj.delay) {
+				this.pending = program;
+			} else {
+				this.start(program);
+			}
+
+			if (!this.running) {
+				this.running = true;
+				transitionManager.add(this);
+			}
+		},
+		start: function(program) {
+			program.a = this.t;
+			program.b = program.intro ? 1 : 0;
+			program.delta = program.b - program.a;
+			program.duration = duration * Math.abs(program.b - program.a);
+			program.end = program.start + program.duration;
+
+			if (obj.css) {
+				if (obj.delay) node.style.cssText = cssText;
+
+				program.rule = generateRule(
+					program.a,
+					program.b,
+					program.delta,
+					program.duration,
+					ease,
+					obj.css
+				);
+
+				transitionManager.addRule(program.rule, program.name = '__svelte_' + hash(program.rule));
+
+				node.style.animation = (node.style.animation || '')
+					.split(', ')
+					.filter(function(anim) {
+						// when introing, discard old animations if there are any
+						return anim && (program.delta < 0 || !/__svelte/.test(anim));
+					})
+					.concat(program.name + ' ' + duration + 'ms linear 1 forwards')
+					.join(', ');
+			}
+
+			this.program = program;
+			this.pending = null;
+		},
+		update: function(now) {
+			var program = this.program;
+			if (!program) return;
+
+			var p = now - program.start;
+			this.t = program.a + program.delta * ease(p / program.duration);
+			if (obj.tick) obj.tick(this.t);
+		},
+		done: function() {
+			var program = this.program;
+			this.t = program.b;
+			if (obj.tick) obj.tick(this.t);
+			if (obj.css) transitionManager.deleteRule(node, program.name);
+			program.callback();
+			program = null;
+			this.running = !!this.pending;
+		},
+		abort: function() {
+			if (obj.tick) obj.tick(1);
+			if (obj.css) transitionManager.deleteRule(node, this.program.name);
+			this.program = this.pending = null;
+			this.running = false;
+		}
+	};
+}
+
+export var transitionManager = {
+	running: false,
+	transitions: [],
+	bound: null,
+	stylesheet: null,
+	activeRules: {},
+
+	add: function(transition) {
+		this.transitions.push(transition);
+
+		if (!this.running) {
+			this.running = true;
+			this.next();
+		}
+	},
+
+	addRule: function(rule, name) {
+		if (!this.activeRules[name]) {
+			this.activeRules[name] = true;
+			this.stylesheet.insertRule('@keyframes ' + name + ' ' + rule, this.stylesheet.cssRules.length);
+		}
+	},
+
+	next: function() {
+		this.running = false;
+
+		var now = window.performance.now();
+		var i = this.transitions.length;
+
+		while (i--) {
+			var transition = this.transitions[i];
+
+			if (transition.program && now >= transition.program.end) {
+				transition.done();
+			}
+
+			if (transition.pending && now >= transition.pending.start) {
+				transition.start(transition.pending);
+			}
+
+			if (transition.running) {
+				transition.update(now);
+				this.running = true;
+			} else if (!transition.pending) {
+				this.transitions.splice(i, 1);
+			}
+		}
+
+		if (this.running) {
+			requestAnimationFrame(this.bound || (this.bound = this.next.bind(this)));
+		} else if (this.stylesheet) {
+			var i = this.stylesheet.cssRules.length;
+			while (i--) this.stylesheet.deleteRule(i);
+			this.activeRules = {};
+		}
+	},
+
+	deleteRule: function(node, name) {
+		node.style.animation = node.style.animation
+			.split(', ')
+			.filter(function(anim) {
+				return anim.slice(0, name.length) !== name;
+			})
+			.join(', ');
+	}
+};
diff --git a/src/shared/utils.js b/src/shared/utils.js
new file mode 100644
index 0000000000..4cf2f32a1d
--- /dev/null
+++ b/src/shared/utils.js
@@ -0,0 +1,14 @@
+export function noop() {}
+
+export function assign(target) {
+	var k,
+		source,
+		i = 1,
+		len = arguments.length;
+	for (; i < len; i++) {
+		source = arguments[i];
+		for (k in source) target[k] = source[k];
+	}
+
+	return target;
+}
diff --git a/src/utils/CodeBuilder.js b/src/utils/CodeBuilder.js
deleted file mode 100644
index eb2e215c40..0000000000
--- a/src/utils/CodeBuilder.js
+++ /dev/null
@@ -1,94 +0,0 @@
-const LINE = {};
-const BLOCK = {};
-
-export default class CodeBuilder {
-	constructor () {
-		this.result = '';
-
-		this.first = null;
-		this.last = null;
-
-		this.lastCondition = null;
-	}
-
-	addConditionalLine ( condition, line ) {
-		if ( condition === this.lastCondition ) {
-			this.result += `\n\t${line}`;
-		} else {
-			if ( this.lastCondition ) {
-				this.result += `\n}\n\n`;
-			}
-
-			this.result += `if ( ${condition} ) {\n\t${line}`;
-			this.lastCondition = condition;
-		}
-
-		this.last = BLOCK;
-	}
-
-	addLine ( line ) {
-		if ( this.lastCondition ) {
-			this.result += `\n}`;
-			this.lastCondition = null;
-		}
-
-		if ( this.last === BLOCK ) {
-			this.result += `\n\n${line}`;
-		} else if ( this.last === LINE ) {
-			this.result += `\n${line}`;
-		} else {
-			this.result += line;
-		}
-
-		this.last = LINE;
-		if ( !this.first ) this.first = LINE;
-	}
-
-	addLineAtStart ( line ) {
-		if ( this.first === BLOCK ) {
-			this.result = `${line}\n\n${this.result}`;
-		} else if ( this.first === LINE ) {
-			this.result = `${line}\n${this.result}`;
-		} else {
-			this.result += line;
-		}
-
-		this.first = LINE;
-		if ( !this.last ) this.last = LINE;
-	}
-
-	addBlock ( block ) {
-		if ( this.lastCondition ) {
-			this.result += `\n}`;
-			this.lastCondition = null;
-		}
-
-		if ( this.result ) {
-			this.result += `\n\n${block}`;
-		} else {
-			this.result += block;
-		}
-
-		this.last = BLOCK;
-		if ( !this.first ) this.first = BLOCK;
-	}
-
-	addBlockAtStart ( block ) {
-		if ( this.result ) {
-			this.result = `${block}\n\n${this.result}`;
-		} else {
-			this.result += block;
-		}
-
-		this.first = BLOCK;
-		if ( !this.last ) this.last = BLOCK;
-	}
-
-	isEmpty () {
-		return this.result === '';
-	}
-
-	toString () {
-		return this.result.trim() + ( this.lastCondition ? `\n}` : `` );
-	}
-}
diff --git a/src/utils/CodeBuilder.ts b/src/utils/CodeBuilder.ts
new file mode 100644
index 0000000000..92c88ea483
--- /dev/null
+++ b/src/utils/CodeBuilder.ts
@@ -0,0 +1,104 @@
+enum ChunkType {
+	Line,
+	Block
+}
+
+export default class CodeBuilder {
+	result: string;
+	first: ChunkType;
+	last: ChunkType;
+	lastCondition: string;
+
+	constructor(str = '') {
+		this.result = str;
+
+		const initial = str
+			? /\n/.test(str) ? ChunkType.Block : ChunkType.Line
+			: null;
+		this.first = initial;
+		this.last = initial;
+
+		this.lastCondition = null;
+	}
+
+	addConditionalLine(condition: string, line: string) {
+		if (condition === this.lastCondition) {
+			this.result += `\n\t${line}`;
+		} else {
+			if (this.lastCondition) {
+				this.result += `\n}\n\n`;
+			}
+
+			this.result += `if ( ${condition} ) {\n\t${line}`;
+			this.lastCondition = condition;
+		}
+
+		this.last = ChunkType.Block;
+	}
+
+	addLine(line: string) {
+		if (this.lastCondition) {
+			this.result += `\n}`;
+			this.lastCondition = null;
+		}
+
+		if (this.last === ChunkType.Block) {
+			this.result += `\n\n${line}`;
+		} else if (this.last === ChunkType.Line) {
+			this.result += `\n${line}`;
+		} else {
+			this.result += line;
+		}
+
+		this.last = ChunkType.Line;
+		if (!this.first) this.first = ChunkType.Line;
+	}
+
+	addLineAtStart(line: string) {
+		if (this.first === ChunkType.Block) {
+			this.result = `${line}\n\n${this.result}`;
+		} else if (this.first === ChunkType.Line) {
+			this.result = `${line}\n${this.result}`;
+		} else {
+			this.result += line;
+		}
+
+		this.first = ChunkType.Line;
+		if (!this.last) this.last = ChunkType.Line;
+	}
+
+	addBlock(block: string) {
+		if (this.lastCondition) {
+			this.result += `\n}`;
+			this.lastCondition = null;
+		}
+
+		if (this.result) {
+			this.result += `\n\n${block}`;
+		} else {
+			this.result += block;
+		}
+
+		this.last = ChunkType.Block;
+		if (!this.first) this.first = ChunkType.Block;
+	}
+
+	addBlockAtStart(block: string) {
+		if (this.result) {
+			this.result = `${block}\n\n${this.result}`;
+		} else {
+			this.result += block;
+		}
+
+		this.first = ChunkType.Block;
+		if (!this.last) this.last = ChunkType.Block;
+	}
+
+	isEmpty() {
+		return this.result === '';
+	}
+
+	toString() {
+		return this.result.trim() + (this.lastCondition ? `\n}` : ``);
+	}
+}
diff --git a/src/utils/CompileError.ts b/src/utils/CompileError.ts
new file mode 100644
index 0000000000..1af9b39c2f
--- /dev/null
+++ b/src/utils/CompileError.ts
@@ -0,0 +1,31 @@
+import { locate } from 'locate-character';
+import getCodeFrame from '../utils/getCodeFrame';
+
+export default class CompileError extends Error {
+	frame: string;
+	loc: { line: number; column: number };
+	pos: number;
+	filename: string;
+
+	constructor(
+		message: string,
+		template: string,
+		index: number,
+		filename: string
+	) {
+		super(message);
+
+		const { line, column } = locate(template, index);
+
+		this.loc = { line: line + 1, column };
+		this.pos = index;
+		this.filename = filename;
+
+		this.frame = getCodeFrame(template, line, column);
+	}
+
+	toString() {
+		return `${this.message} (${this.loc.line}:${this.loc.column})\n${this
+			.frame}`;
+	}
+}
diff --git a/src/utils/__test__.js b/src/utils/__test__.js
deleted file mode 100644
index 54e173d5f9..0000000000
--- a/src/utils/__test__.js
+++ /dev/null
@@ -1,172 +0,0 @@
-import * as assert from 'assert';
-import deindent from './deindent.js';
-import CodeBuilder from './CodeBuilder.js';
-
-describe( 'deindent', () => {
-	it( 'deindents a simple string', () => {
-		const deindented = deindent`
-			deindent me please
-		`;
-
-		assert.equal( deindented, `deindent me please` );
-	});
-
-	it( 'deindents a multiline string', () => {
-		const deindented = deindent`
-			deindent me please
-			and me as well
-		`;
-
-		assert.equal( deindented, `deindent me please\nand me as well` );
-	});
-
-	it( 'preserves indentation of inserted values', () => {
-		const insert = deindent`
-			line one
-			line two
-		`;
-
-		const deindented = deindent`
-			before
-				${insert}
-			after
-		`;
-
-		assert.equal( deindented, `before\n\tline one\n\tline two\nafter` );
-	});
-});
-
-describe( 'CodeBuilder', () => {
-	it( 'creates an empty block', () => {
-		const builder = new CodeBuilder();
-		assert.equal( builder.toString(), '' );
-	});
-
-	it( 'creates a block with a line', () => {
-		const builder = new CodeBuilder();
-
-		builder.addLine( 'var answer = 42;' );
-		assert.equal( builder.toString(), 'var answer = 42;' );
-	});
-
-	it( 'creates a block with two lines', () => {
-		const builder = new CodeBuilder();
-
-		builder.addLine( 'var problems = 99;' );
-		builder.addLine( 'var answer = 42;' );
-		assert.equal( builder.toString(), 'var problems = 99;\nvar answer = 42;' );
-	});
-
-	it( 'adds newlines around blocks', () => {
-		const builder = new CodeBuilder();
-
-		builder.addLine( '// line 1' );
-		builder.addLine( '// line 2' );
-		builder.addBlock( deindent`
-			if ( foo ) {
-				bar();
-			}
-		` );
-		builder.addLine( '// line 3' );
-		builder.addLine( '// line 4' );
-
-		assert.equal( builder.toString(), deindent`
-			// line 1
-			// line 2
-
-			if ( foo ) {
-				bar();
-			}
-
-			// line 3
-			// line 4
-		` );
-	});
-
-	it( 'nests codebuilders with correct indentation', () => {
-		const child = new CodeBuilder();
-
-		child.addBlock( deindent`
-			var obj = {
-				answer: 42
-			};
-		` );
-
-		const builder = new CodeBuilder();
-
-		builder.addLine( '// line 1' );
-		builder.addLine( '// line 2' );
-		builder.addBlock( deindent`
-			if ( foo ) {
-				${child}
-			}
-		` );
-		builder.addLine( '// line 3' );
-		builder.addLine( '// line 4' );
-
-		assert.equal( builder.toString(), deindent`
-			// line 1
-			// line 2
-
-			if ( foo ) {
-				var obj = {
-					answer: 42
-				};
-			}
-
-			// line 3
-			// line 4
-		` );
-	});
-
-	it( 'adds a line at start', () => {
-		const builder = new CodeBuilder();
-
-		builder.addLine( '// second' );
-		builder.addLineAtStart( '// first' );
-
-		assert.equal( builder.toString(), deindent`
-			// first
-			// second
-		` );
-	});
-
-	it( 'adds a line at start before a block', () => {
-		const builder = new CodeBuilder();
-
-		builder.addBlock( '// second' );
-		builder.addLineAtStart( '// first' );
-
-		assert.equal( builder.toString(), deindent`
-			// first
-
-			// second
-		` );
-	});
-
-	it( 'adds a block at start', () => {
-		const builder = new CodeBuilder();
-
-		builder.addLine( '// second' );
-		builder.addBlockAtStart( '// first' );
-
-		assert.equal( builder.toString(), deindent`
-			// first
-
-			// second
-		` );
-	});
-
-	it( 'adds a block at start before a block', () => {
-		const builder = new CodeBuilder();
-
-		builder.addBlock( '// second' );
-		builder.addBlockAtStart( '// first' );
-
-		assert.equal( builder.toString(), deindent`
-			// first
-
-			// second
-		` );
-	});
-});
diff --git a/src/utils/__test__.ts b/src/utils/__test__.ts
new file mode 100644
index 0000000000..c1681dd8d6
--- /dev/null
+++ b/src/utils/__test__.ts
@@ -0,0 +1,190 @@
+import * as assert from 'assert';
+import deindent from './deindent';
+import CodeBuilder from './CodeBuilder';
+
+describe('deindent', () => {
+	it('deindents a simple string', () => {
+		const deindented = deindent`
+			deindent me please
+		`;
+
+		assert.equal(deindented, `deindent me please`);
+	});
+
+	it('deindents a multiline string', () => {
+		const deindented = deindent`
+			deindent me please
+			and me as well
+		`;
+
+		assert.equal(deindented, `deindent me please\nand me as well`);
+	});
+
+	it('preserves indentation of inserted values', () => {
+		const insert = deindent`
+			line one
+			line two
+		`;
+
+		const deindented = deindent`
+			before
+				${insert}
+			after
+		`;
+
+		assert.equal(deindented, `before\n\tline one\n\tline two\nafter`);
+	});
+});
+
+describe('CodeBuilder', () => {
+	it('creates an empty block', () => {
+		const builder = new CodeBuilder();
+		assert.equal(builder.toString(), '');
+	});
+
+	it('creates a block with a line', () => {
+		const builder = new CodeBuilder();
+
+		builder.addLine('var answer = 42;');
+		assert.equal(builder.toString(), 'var answer = 42;');
+	});
+
+	it('creates a block with two lines', () => {
+		const builder = new CodeBuilder();
+
+		builder.addLine('var problems = 99;');
+		builder.addLine('var answer = 42;');
+		assert.equal(builder.toString(), 'var problems = 99;\nvar answer = 42;');
+	});
+
+	it('adds newlines around blocks', () => {
+		const builder = new CodeBuilder();
+
+		builder.addLine('// line 1');
+		builder.addLine('// line 2');
+		builder.addBlock(deindent`
+			if ( foo ) {
+				bar();
+			}
+		`);
+		builder.addLine('// line 3');
+		builder.addLine('// line 4');
+
+		assert.equal(
+			builder.toString(),
+			deindent`
+			// line 1
+			// line 2
+
+			if ( foo ) {
+				bar();
+			}
+
+			// line 3
+			// line 4
+		`
+		);
+	});
+
+	it('nests codebuilders with correct indentation', () => {
+		const child = new CodeBuilder();
+
+		child.addBlock(deindent`
+			var obj = {
+				answer: 42
+			};
+		`);
+
+		const builder = new CodeBuilder();
+
+		builder.addLine('// line 1');
+		builder.addLine('// line 2');
+		builder.addBlock(deindent`
+			if ( foo ) {
+				${child}
+			}
+		`);
+		builder.addLine('// line 3');
+		builder.addLine('// line 4');
+
+		assert.equal(
+			builder.toString(),
+			deindent`
+			// line 1
+			// line 2
+
+			if ( foo ) {
+				var obj = {
+					answer: 42
+				};
+			}
+
+			// line 3
+			// line 4
+		`
+		);
+	});
+
+	it('adds a line at start', () => {
+		const builder = new CodeBuilder();
+
+		builder.addLine('// second');
+		builder.addLineAtStart('// first');
+
+		assert.equal(
+			builder.toString(),
+			deindent`
+			// first
+			// second
+		`
+		);
+	});
+
+	it('adds a line at start before a block', () => {
+		const builder = new CodeBuilder();
+
+		builder.addBlock('// second');
+		builder.addLineAtStart('// first');
+
+		assert.equal(
+			builder.toString(),
+			deindent`
+			// first
+
+			// second
+		`
+		);
+	});
+
+	it('adds a block at start', () => {
+		const builder = new CodeBuilder();
+
+		builder.addLine('// second');
+		builder.addBlockAtStart('// first');
+
+		assert.equal(
+			builder.toString(),
+			deindent`
+			// first
+
+			// second
+		`
+		);
+	});
+
+	it('adds a block at start before a block', () => {
+		const builder = new CodeBuilder();
+
+		builder.addBlock('// second');
+		builder.addBlockAtStart('// first');
+
+		assert.equal(
+			builder.toString(),
+			deindent`
+			// first
+
+			// second
+		`
+		);
+	});
+});
diff --git a/src/utils/annotateWithScopes.js b/src/utils/annotateWithScopes.js
deleted file mode 100644
index cc7926e6b9..0000000000
--- a/src/utils/annotateWithScopes.js
+++ /dev/null
@@ -1,102 +0,0 @@
-import { walk } from 'estree-walker';
-
-export default function annotateWithScopes ( expression ) {
-	let scope = new Scope( null, false );
-
-	walk( expression, {
-		enter ( node ) {
-			if ( /Function/.test( node.type ) ) {
-				if ( node.type === 'FunctionDeclaration' ) {
-					scope.declarations.add( node.id.name );
-				} else {
-					node._scope = scope = new Scope( scope, false );
-					if ( node.id ) scope.declarations.add( node.id.name );
-				}
-
-				node.params.forEach( param => {
-					extractNames( param ).forEach( name => {
-						scope.declarations.add( name );
-					});
-				});
-			}
-
-			else if ( /For(?:In|Of)Statement/.test( node.type ) ) {
-				node._scope = scope = new Scope( scope, true );
-			}
-
-			else if ( node.type === 'BlockStatement' ) {
-				node._scope = scope = new Scope( scope, true );
-			}
-
-			else if ( /(Function|Class|Variable)Declaration/.test( node.type ) ) {
-				scope.addDeclaration( node );
-			}
-		},
-
-		leave ( node ) {
-			if ( node._scope ) {
-				scope = scope.parent;
-			}
-		}
-	});
-
-	return scope;
-}
-
-class Scope {
-	constructor ( parent, block ) {
-		this.parent = parent;
-		this.block = block;
-		this.declarations = new Set();
-	}
-
-	addDeclaration ( node ) {
-		if ( node.kind === 'var' && !this.block && this.parent ) {
-			this.parent.addDeclaration( node );
-		} else if ( node.type === 'VariableDeclaration' ) {
-			node.declarations.forEach( declarator => {
-				extractNames( declarator.id ).forEach( name => {
-					this.declarations.add( name );
-				});
-			});
-		} else {
-			this.declarations.add( node.id.name );
-		}
-	}
-
-	has ( name ) {
-		return this.declarations.has( name ) || this.parent && this.parent.has( name );
-	}
-}
-
-function extractNames ( param ) {
-	const names = [];
-	extractors[ param.type ]( names, param );
-	return names;
-}
-
-const extractors = {
-	Identifier ( names, param ) {
-		names.push( param.name );
-	},
-
-	ObjectPattern ( names, param ) {
-		param.properties.forEach( prop => {
-			extractors[ prop.value.type ]( names, prop.value );
-		});
-	},
-
-	ArrayPattern ( names, param ) {
-		param.elements.forEach( element => {
-			if ( element ) extractors[ element.type ]( names, element );
-		});
-	},
-
-	RestElement ( names, param ) {
-		extractors[ param.argument.type ]( names, param.argument );
-	},
-
-	AssignmentPattern ( names, param ) {
-		extractors[ param.left.type ]( names, param.left );
-	}
-};
diff --git a/src/utils/annotateWithScopes.ts b/src/utils/annotateWithScopes.ts
new file mode 100644
index 0000000000..ab6e83d6b1
--- /dev/null
+++ b/src/utils/annotateWithScopes.ts
@@ -0,0 +1,103 @@
+import { walk } from 'estree-walker';
+import { Node } from '../interfaces';
+
+export default function annotateWithScopes(expression: Node) {
+	let scope = new Scope(null, false);
+
+	walk(expression, {
+		enter(node: Node) {
+			if (/Function/.test(node.type)) {
+				if (node.type === 'FunctionDeclaration') {
+					scope.declarations.add(node.id.name);
+				} else {
+					node._scope = scope = new Scope(scope, false);
+					if (node.id) scope.declarations.add(node.id.name);
+				}
+
+				node.params.forEach((param: Node) => {
+					extractNames(param).forEach(name => {
+						scope.declarations.add(name);
+					});
+				});
+			} else if (/For(?:In|Of)Statement/.test(node.type)) {
+				node._scope = scope = new Scope(scope, true);
+			} else if (node.type === 'BlockStatement') {
+				node._scope = scope = new Scope(scope, true);
+			} else if (/(Function|Class|Variable)Declaration/.test(node.type)) {
+				scope.addDeclaration(node);
+			}
+		},
+
+		leave(node: Node) {
+			if (node._scope) {
+				scope = scope.parent;
+			}
+		},
+	});
+
+	return scope;
+}
+
+class Scope {
+	parent: Scope;
+	block: boolean;
+	declarations: Set<string>;
+
+	constructor(parent: Scope, block: boolean) {
+		this.parent = parent;
+		this.block = block;
+		this.declarations = new Set();
+	}
+
+	addDeclaration(node: Node) {
+		if (node.kind === 'var' && !this.block && this.parent) {
+			this.parent.addDeclaration(node);
+		} else if (node.type === 'VariableDeclaration') {
+			node.declarations.forEach((declarator: Node) => {
+				extractNames(declarator.id).forEach(name => {
+					this.declarations.add(name);
+				});
+			});
+		} else {
+			this.declarations.add(node.id.name);
+		}
+	}
+
+	has(name: string): boolean {
+		return (
+			this.declarations.has(name) || (this.parent && this.parent.has(name))
+		);
+	}
+}
+
+function extractNames(param: Node) {
+	const names: string[] = [];
+	extractors[param.type](names, param);
+	return names;
+}
+
+const extractors = {
+	Identifier(names: string[], param: Node) {
+		names.push(param.name);
+	},
+
+	ObjectPattern(names: string[], param: Node) {
+		param.properties.forEach((prop: Node) => {
+			extractors[prop.value.type](names, prop.value);
+		});
+	},
+
+	ArrayPattern(names: string[], param: Node) {
+		param.elements.forEach((element: Node) => {
+			if (element) extractors[element.type](names, element);
+		});
+	},
+
+	RestElement(names: string[], param: Node) {
+		extractors[param.argument.type](names, param.argument);
+	},
+
+	AssignmentPattern(names: string[], param: Node) {
+		extractors[param.left.type](names, param.left);
+	},
+};
diff --git a/src/utils/clone.ts b/src/utils/clone.ts
new file mode 100644
index 0000000000..d01b7aaa87
--- /dev/null
+++ b/src/utils/clone.ts
@@ -0,0 +1,18 @@
+import { Node } from '../interfaces';
+
+export default function clone(node: Node) {
+	const cloned = {};
+
+	for (const key in node) {
+		const value = node[key];
+		if (Array.isArray(value)) {
+			cloned[key] = value.map(clone);
+		} else if (value && typeof value === 'object') {
+			cloned[key] = clone(value);
+		} else {
+			cloned[key] = value;
+		}
+	}
+
+	return cloned;
+}
diff --git a/src/utils/deindent.js b/src/utils/deindent.js
deleted file mode 100644
index 63730254b3..0000000000
--- a/src/utils/deindent.js
+++ /dev/null
@@ -1,25 +0,0 @@
-const start = /\n(\t+)/;
-
-export default function deindent ( strings, ...values ) {
-	const indentation = start.exec( strings[0] )[1];
-	const pattern = new RegExp( `^${indentation}`, 'gm' );
-
-	let result = strings[0].replace( start, '' ).replace( pattern, '' );
-
-	let trailingIndentation = getTrailingIndentation( result );
-
-	for ( let i = 1; i < strings.length; i += 1 ) {
-		const value  = String( values[ i - 1 ] ).replace( /\n/g, `\n${trailingIndentation}` );
-		result += value + strings[i].replace( pattern, '' );
-
-		trailingIndentation = getTrailingIndentation( result );
-	}
-
-	return result.trim();
-}
-
-function getTrailingIndentation ( str ) {
-	let i = str.length;
-	while ( str[ i - 1 ] === ' ' || str[ i - 1 ] === '\t' ) i -= 1;
-	return str.slice( i, str.length );
-}
diff --git a/src/utils/deindent.ts b/src/utils/deindent.ts
new file mode 100644
index 0000000000..9fbcf10953
--- /dev/null
+++ b/src/utils/deindent.ts
@@ -0,0 +1,44 @@
+const start = /\n(\t+)/;
+
+export default function deindent(
+	strings: TemplateStringsArray,
+	...values: any[]
+) {
+	const indentation = start.exec(strings[0])[1];
+	const pattern = new RegExp(`^${indentation}`, 'gm');
+
+	let result = strings[0].replace(start, '').replace(pattern, '');
+
+	let trailingIndentation = getTrailingIndentation(result);
+
+	for (let i = 1; i < strings.length; i += 1) {
+		let expression = values[i - 1];
+		const string = strings[i].replace(pattern, '');
+
+		if (Array.isArray(expression)) {
+			expression = expression.length ? expression.join('\n') : null;
+		}
+
+		if (expression || expression === '') {
+			const value = String(expression).replace(
+				/\n/g,
+				`\n${trailingIndentation}`
+			);
+			result += value + string;
+		} else {
+			let c = result.length;
+			while (/\s/.test(result[c - 1])) c -= 1;
+			result = result.slice(0, c) + string;
+		}
+
+		trailingIndentation = getTrailingIndentation(result);
+	}
+
+	return result.trim().replace(/\t+$/gm, '');
+}
+
+function getTrailingIndentation(str: string) {
+	let i = str.length;
+	while (str[i - 1] === ' ' || str[i - 1] === '\t') i -= 1;
+	return str.slice(i, str.length);
+}
diff --git a/src/utils/flattenReference.js b/src/utils/flattenReference.js
deleted file mode 100644
index c4b46e914f..0000000000
--- a/src/utils/flattenReference.js
+++ /dev/null
@@ -1,19 +0,0 @@
-export default function flatten ( node ) {
-	const parts = [];
-	const propEnd = node.end;
-
-	while ( node.type === 'MemberExpression' ) {
-		if ( node.computed ) return null;
-		parts.unshift( node.property.name );
-
-		node = node.object;
-	}
-
-	const propStart = node.end;
-	const name = node.type === 'Identifier' ? node.name : node.type === 'ThisExpression' ? 'this' : null;
-
-	if ( !name ) return null;
-
-	parts.unshift( name );
-	return { name, parts, keypath: `${name}[✂${propStart}-${propEnd}✂]` };
-}
diff --git a/src/utils/flattenReference.ts b/src/utils/flattenReference.ts
new file mode 100644
index 0000000000..b44fb6e27f
--- /dev/null
+++ b/src/utils/flattenReference.ts
@@ -0,0 +1,23 @@
+import { Node } from '../interfaces';
+
+export default function flatten(node: Node) {
+	const parts = [];
+	const propEnd = node.end;
+
+	while (node.type === 'MemberExpression') {
+		if (node.computed) return null;
+		parts.unshift(node.property.name);
+
+		node = node.object;
+	}
+
+	const propStart = node.end;
+	const name = node.type === 'Identifier'
+		? node.name
+		: node.type === 'ThisExpression' ? 'this' : null;
+
+	if (!name) return null;
+
+	parts.unshift(name);
+	return { name, parts, keypath: `${name}[✂${propStart}-${propEnd}✂]` };
+}
diff --git a/src/utils/getCodeFrame.js b/src/utils/getCodeFrame.js
deleted file mode 100644
index 90fd01e98e..0000000000
--- a/src/utils/getCodeFrame.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import spaces from './spaces.js';
-
-function tabsToSpaces ( str ) {
-	return str.replace( /^\t+/, match => match.split( '\t' ).join( '  ' ) );
-}
-
-export default function getCodeFrame ( source, line, column ) {
-	const lines = source.split( '\n' );
-
-	const frameStart = Math.max( 0, line - 2 );
-	const frameEnd = Math.min( line + 3, lines.length );
-
-	const digits = String( frameEnd + 1 ).length;
-
-	return lines
-		.slice( frameStart, frameEnd )
-		.map( ( str, i ) => {
-			const isErrorLine = frameStart + i === line;
-
-			let lineNum = String( i + frameStart + 1 );
-			while ( lineNum.length < digits ) lineNum = ` ${lineNum}`;
-
-			if ( isErrorLine ) {
-				const indicator = spaces( digits + 2 + tabsToSpaces( str.slice( 0, column ) ).length ) + '^';
-				return `${lineNum}: ${tabsToSpaces( str )}\n${indicator}`;
-			}
-
-			return `${lineNum}: ${tabsToSpaces( str )}`;
-		})
-		.join( '\n' );
-}
diff --git a/src/utils/getCodeFrame.ts b/src/utils/getCodeFrame.ts
new file mode 100644
index 0000000000..39c54c7d60
--- /dev/null
+++ b/src/utils/getCodeFrame.ts
@@ -0,0 +1,36 @@
+import spaces from './spaces';
+
+function tabsToSpaces(str: string) {
+	return str.replace(/^\t+/, match => match.split('\t').join('  '));
+}
+
+export default function getCodeFrame(
+	source: string,
+	line: number,
+	column: number
+) {
+	const lines = source.split('\n');
+
+	const frameStart = Math.max(0, line - 2);
+	const frameEnd = Math.min(line + 3, lines.length);
+
+	const digits = String(frameEnd + 1).length;
+
+	return lines
+		.slice(frameStart, frameEnd)
+		.map((str, i) => {
+			const isErrorLine = frameStart + i === line;
+
+			let lineNum = String(i + frameStart + 1);
+			while (lineNum.length < digits) lineNum = ` ${lineNum}`;
+
+			if (isErrorLine) {
+				const indicator =
+					spaces(digits + 2 + tabsToSpaces(str.slice(0, column)).length) + '^';
+				return `${lineNum}: ${tabsToSpaces(str)}\n${indicator}`;
+			}
+
+			return `${lineNum}: ${tabsToSpaces(str)}`;
+		})
+		.join('\n');
+}
diff --git a/src/utils/getObject.ts b/src/utils/getObject.ts
new file mode 100644
index 0000000000..4cde63eb8f
--- /dev/null
+++ b/src/utils/getObject.ts
@@ -0,0 +1,6 @@
+import { Node } from '../interfaces';
+
+export default function getObject(node: Node) {
+	while (node.type === 'MemberExpression') node = node.object;
+	return node;
+}
diff --git a/src/utils/getTailSnippet.ts b/src/utils/getTailSnippet.ts
new file mode 100644
index 0000000000..df4d7b1ab4
--- /dev/null
+++ b/src/utils/getTailSnippet.ts
@@ -0,0 +1,9 @@
+import { Node } from '../interfaces';
+
+export default function getTailSnippet(node: Node) {
+	const end = node.end;
+	while (node.type === 'MemberExpression') node = node.object;
+	const start = node.end;
+
+	return `[✂${start}-${end}✂]`;
+}
diff --git a/src/utils/globalWhitelist.js b/src/utils/globalWhitelist.js
deleted file mode 100644
index 8472308174..0000000000
--- a/src/utils/globalWhitelist.js
+++ /dev/null
@@ -1 +0,0 @@
-export default new Set( [ 'Array', 'Boolean', 'console', 'Date', 'decodeURI', 'decodeURIComponent', 'encodeURI', 'encodeURIComponent', 'Infinity', 'Intl', 'isFinite', 'isNaN', 'JSON', 'Map', 'Math', 'NaN', 'Number', 'Object', 'parseFloat', 'parseInt', 'RegExp', 'Set', 'String', 'undefined' ] );
diff --git a/src/utils/globalWhitelist.ts b/src/utils/globalWhitelist.ts
new file mode 100644
index 0000000000..1c248bda1f
--- /dev/null
+++ b/src/utils/globalWhitelist.ts
@@ -0,0 +1,26 @@
+export default new Set([
+	'Array',
+	'Boolean',
+	'console',
+	'Date',
+	'decodeURI',
+	'decodeURIComponent',
+	'encodeURI',
+	'encodeURIComponent',
+	'Infinity',
+	'Intl',
+	'isFinite',
+	'isNaN',
+	'JSON',
+	'Map',
+	'Math',
+	'NaN',
+	'Number',
+	'Object',
+	'parseFloat',
+	'parseInt',
+	'RegExp',
+	'Set',
+	'String',
+	'undefined',
+]);
diff --git a/src/utils/isReference.js b/src/utils/isReference.js
deleted file mode 100644
index c2e6c8967a..0000000000
--- a/src/utils/isReference.js
+++ /dev/null
@@ -1,28 +0,0 @@
-export default function isReference ( node, parent ) {
-	if ( node.type === 'MemberExpression' ) {
-		return !node.computed && isReference( node.object, node );
-	}
-
-	if ( node.type === 'Identifier' ) {
-		// the only time we could have an identifier node without a parent is
-		// if it's the entire body of a function without a block statement –
-		// i.e. an arrow function expression like `a => a`
-		if ( !parent ) return true;
-
-		// TODO is this right?
-		if ( parent.type === 'MemberExpression' || parent.type === 'MethodDefinition' ) {
-			return parent.computed || node === parent.object;
-		}
-
-		// disregard the `bar` in `{ bar: foo }`, but keep it in `{ [bar]: foo }`
-		if ( parent.type === 'Property' ) return parent.computed || node === parent.value;
-
-		// disregard the `bar` in `class Foo { bar () {...} }`
-		if ( parent.type === 'MethodDefinition' ) return false;
-
-		// disregard the `bar` in `export { foo as bar }`
-		if ( parent.type === 'ExportSpecifier' && node !== parent.local ) return;
-
-		return true;
-	}
-}
diff --git a/src/utils/isReference.ts b/src/utils/isReference.ts
new file mode 100644
index 0000000000..9a5f3688fb
--- /dev/null
+++ b/src/utils/isReference.ts
@@ -0,0 +1,34 @@
+import { Node } from '../interfaces';
+
+export default function isReference(node: Node, parent: Node): boolean {
+	if (node.type === 'MemberExpression') {
+		return !node.computed && isReference(node.object, node);
+	}
+
+	if (node.type === 'Identifier') {
+		// the only time we could have an identifier node without a parent is
+		// if it's the entire body of a function without a block statement –
+		// i.e. an arrow function expression like `a => a`
+		if (!parent) return true;
+
+		// TODO is this right?
+		if (
+			parent.type === 'MemberExpression' ||
+			parent.type === 'MethodDefinition'
+		) {
+			return parent.computed || node === parent.object;
+		}
+
+		// disregard the `bar` in `{ bar: foo }`, but keep it in `{ [bar]: foo }`
+		if (parent.type === 'Property')
+			return parent.computed || node === parent.value;
+
+		// disregard the `bar` in `class Foo { bar () {...} }`
+		if (parent.type === 'MethodDefinition') return false;
+
+		// disregard the `bar` in `export { foo as bar }`
+		if (parent.type === 'ExportSpecifier' && node !== parent.local) return;
+
+		return true;
+	}
+}
diff --git a/src/utils/isVoidElementName.js b/src/utils/isVoidElementName.js
deleted file mode 100644
index 8af4f34db8..0000000000
--- a/src/utils/isVoidElementName.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const voidElementNames = /^(?:area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)$/;
-
-export default function isVoidElementName ( name ) {
-	return voidElementNames.test( name ) || name.toLowerCase() === '!doctype';
-}
diff --git a/src/utils/isVoidElementName.ts b/src/utils/isVoidElementName.ts
new file mode 100644
index 0000000000..2396a0cde2
--- /dev/null
+++ b/src/utils/isVoidElementName.ts
@@ -0,0 +1,5 @@
+const voidElementNames = /^(?:area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)$/;
+
+export default function isVoidElementName(name: string) {
+	return voidElementNames.test(name) || name.toLowerCase() === '!doctype';
+}
diff --git a/src/utils/namespaces.js b/src/utils/namespaces.js
deleted file mode 100644
index 595d0f0def..0000000000
--- a/src/utils/namespaces.js
+++ /dev/null
@@ -1,13 +0,0 @@
-export const html   = 'http://www.w3.org/1999/xhtml';
-export const mathml = 'http://www.w3.org/1998/Math/MathML';
-export const svg    = 'http://www.w3.org/2000/svg';
-export const xlink  = 'http://www.w3.org/1999/xlink';
-export const xml    = 'http://www.w3.org/XML/1998/namespace';
-export const xmlns  = 'http://www.w3.org/2000/xmlns';
-
-export const validNamespaces = [
-	'html', 'mathml', 'svg', 'xlink', 'xml', 'xmlns',
-	html, mathml, svg, xlink, xml, xmlns
-];
-
-export default { html, mathml, svg, xlink, xml, xmlns };
diff --git a/src/utils/namespaces.ts b/src/utils/namespaces.ts
new file mode 100644
index 0000000000..dc5cee2752
--- /dev/null
+++ b/src/utils/namespaces.ts
@@ -0,0 +1,23 @@
+export const html = 'http://www.w3.org/1999/xhtml';
+export const mathml = 'http://www.w3.org/1998/Math/MathML';
+export const svg = 'http://www.w3.org/2000/svg';
+export const xlink = 'http://www.w3.org/1999/xlink';
+export const xml = 'http://www.w3.org/XML/1998/namespace';
+export const xmlns = 'http://www.w3.org/2000/xmlns';
+
+export const validNamespaces = [
+	'html',
+	'mathml',
+	'svg',
+	'xlink',
+	'xml',
+	'xmlns',
+	html,
+	mathml,
+	svg,
+	xlink,
+	xml,
+	xmlns,
+];
+
+export default { html, mathml, svg, xlink, xml, xmlns };
diff --git a/src/utils/patterns.js b/src/utils/patterns.ts
similarity index 100%
rename from src/utils/patterns.js
rename to src/utils/patterns.ts
diff --git a/src/utils/removeNode.js b/src/utils/removeNode.js
deleted file mode 100644
index aecec33455..0000000000
--- a/src/utils/removeNode.js
+++ /dev/null
@@ -1,55 +0,0 @@
-const keys = {
-	ObjectExpression: 'properties',
-	Program: 'body'
-};
-
-const offsets = {
-	ObjectExpression: [ 1, -1 ],
-	Program: [ 0, 0 ]
-};
-
-export function removeNode ( code, parent, node ) {
-	const key = keys[ parent.type ];
-	const offset = offsets[ parent.type ];
-	if ( !key || !offset ) throw new Error( `not implemented: ${parent.type}` );
-
-	const list = parent[ key ];
-	const i = list.indexOf( node );
-	if ( i === -1 ) throw new Error( 'node not in list' );
-
-	let a;
-	let b;
-
-	if ( list.length === 1 ) {
-		// remove everything, leave {}
-		a = parent.start + offset[0];
-		b = parent.end + offset[1];
-	} else if ( i === 0 ) {
-		// remove everything before second node, including comments
-		a = parent.start + offset[0];
-		while ( /\s/.test( code.original[a] ) ) a += 1;
-
-		b = list[i].end;
-		while ( /[\s,]/.test( code.original[b] ) ) b += 1;
-	} else {
-		// remove the end of the previous node to the end of this one
-		a = list[ i - 1 ].end;
-		b = node.end;
-	}
-
-	code.remove( a, b );
-	list.splice( i, 1 );
-	return;
-}
-
-export function removeObjectKey ( code, node, key ) {
-	if ( node.type !== 'ObjectExpression' ) return;
-
-	let i = node.properties.length;
-	while ( i-- ) {
-		const property = node.properties[i];
-		if ( property.key.type === 'Identifier' && property.key.name === key ) {
-			removeNode( code, node, property );
-		}
-	}
-}
diff --git a/src/utils/removeNode.ts b/src/utils/removeNode.ts
new file mode 100644
index 0000000000..bce5984a98
--- /dev/null
+++ b/src/utils/removeNode.ts
@@ -0,0 +1,57 @@
+import { Node } from '../interfaces';
+
+const keys = {
+	ObjectExpression: 'properties',
+	Program: 'body',
+};
+
+const offsets = {
+	ObjectExpression: [1, -1],
+	Program: [0, 0],
+};
+
+export function removeNode(code, parent: Node, node: Node) {
+	const key = keys[parent.type];
+	const offset = offsets[parent.type];
+	if (!key || !offset) throw new Error(`not implemented: ${parent.type}`);
+
+	const list = parent[key];
+	const i = list.indexOf(node);
+	if (i === -1) throw new Error('node not in list');
+
+	let a;
+	let b;
+
+	if (list.length === 1) {
+		// remove everything, leave {}
+		a = parent.start + offset[0];
+		b = parent.end + offset[1];
+	} else if (i === 0) {
+		// remove everything before second node, including comments
+		a = parent.start + offset[0];
+		while (/\s/.test(code.original[a])) a += 1;
+
+		b = list[i].end;
+		while (/[\s,]/.test(code.original[b])) b += 1;
+	} else {
+		// remove the end of the previous node to the end of this one
+		a = list[i - 1].end;
+		b = node.end;
+	}
+
+	code.remove(a, b);
+	list.splice(i, 1);
+	return;
+}
+
+export function removeObjectKey(code, node, key) {
+	if (node.type !== 'ObjectExpression') return;
+
+	let i = node.properties.length;
+	while (i--) {
+		const property = node.properties[i];
+		if (property.key.type === 'Identifier' && property.key.name === key) {
+			removeNode(code, node, property);
+		}
+	}
+}
diff --git a/src/utils/reservedNames.js b/src/utils/reservedNames.js
deleted file mode 100644
index cc44bbd873..0000000000
--- a/src/utils/reservedNames.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const reservedNames = new Set( [ 'arguments', 'await', 'break', 'case', 'catch', 'class', 'const', 'continue', 'debugger', 'default', 'delete', 'do', 'else', 'enum', 'eval', 'export', 'extends', 'false', 'finally', 'for', 'function', 'if', 'implements', 'import', 'in', 'instanceof', 'interface', 'let', 'new', 'null', 'package', 'private', 'protected', 'public', 'return', 'static', 'super', 'switch', 'this', 'throw', 'true', 'try', 'typeof', 'var', 'void', 'while', 'with', 'yield' ] );
-
-// prevent e.g. `{{#each states as state}}` breaking
-reservedNames.add( 'state' );
-
-export default reservedNames;
\ No newline at end of file
diff --git a/src/utils/reservedNames.ts b/src/utils/reservedNames.ts
new file mode 100644
index 0000000000..1e5b28740e
--- /dev/null
+++ b/src/utils/reservedNames.ts
@@ -0,0 +1,55 @@
+const reservedNames = new Set([
+	'arguments',
+	'await',
+	'break',
+	'case',
+	'catch',
+	'class',
+	'const',
+	'continue',
+	'debugger',
+	'default',
+	'delete',
+	'do',
+	'else',
+	'enum',
+	'eval',
+	'export',
+	'extends',
+	'false',
+	'finally',
+	'for',
+	'function',
+	'if',
+	'implements',
+	'import',
+	'in',
+	'instanceof',
+	'interface',
+	'let',
+	'new',
+	'null',
+	'package',
+	'private',
+	'protected',
+	'public',
+	'return',
+	'static',
+	'super',
+	'switch',
+	'this',
+	'throw',
+	'true',
+	'try',
+	'typeof',
+	'var',
+	'void',
+	'while',
+	'with',
+	'yield',
+]);
+
+// prevent e.g. `{{#each states as state}}` breaking
+reservedNames.add('state');
+
+export default reservedNames;
diff --git a/src/utils/spaces.js b/src/utils/spaces.js
deleted file mode 100644
index 26c818fd8d..0000000000
--- a/src/utils/spaces.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default function spaces ( i ) {
-	let result = '';
-	while ( i-- ) result += ' ';
-	return result;
-}
diff --git a/src/utils/spaces.ts b/src/utils/spaces.ts
new file mode 100644
index 0000000000..657c9c3884
--- /dev/null
+++ b/src/utils/spaces.ts
@@ -0,0 +1,5 @@
+export default function spaces(i: number) {
+	let result = '';
+	while (i--) result += ' ';
+	return result;
+}
diff --git a/src/utils/stringify.ts b/src/utils/stringify.ts
new file mode 100644
index 0000000000..7c63b45ce1
--- /dev/null
+++ b/src/utils/stringify.ts
@@ -0,0 +1,3 @@
+export default function stringify(data: string) {
+	return JSON.stringify(data.replace(/([^\\])?([@#])/g, '$1\\$2'));
+}
diff --git a/src/utils/trim.js b/src/utils/trim.js
deleted file mode 100644
index c64d7b26a2..0000000000
--- a/src/utils/trim.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { whitespace } from './patterns.js';
-
-export function trimStart ( str ) {
-	let i = 0;
-	while ( whitespace.test( str[i] ) ) i += 1;
-
-	return str.slice( i );
-}
-
-export function trimEnd ( str ) {
-	let i = str.length;
-	while ( whitespace.test( str[ i - 1 ] ) ) i -= 1;
-
-	return str.slice( 0, i );
-}
diff --git a/src/utils/trim.ts b/src/utils/trim.ts
new file mode 100644
index 0000000000..387b368826
--- /dev/null
+++ b/src/utils/trim.ts
@@ -0,0 +1,15 @@
+import { whitespace } from './patterns';
+
+export function trimStart(str: string) {
+	let i = 0;
+	while (whitespace.test(str[i])) i += 1;
+
+	return str.slice(i);
+}
+
+export function trimEnd(str: string) {
+	let i = str.length;
+	while (whitespace.test(str[i - 1])) i -= 1;
+
+	return str.slice(0, i);
+}
diff --git a/src/validate/html/index.js b/src/validate/html/index.js
deleted file mode 100644
index 13b627f73a..0000000000
--- a/src/validate/html/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import * as namespaces from '../../utils/namespaces.js';
-import validateElement from './validateElement.js';
-import validateWindow from './validateWindow.js';
-
-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|switch|symbol|text|textPath|title|tref|tspan|unknown|use|view|vkern)$/;
-
-const meta = new Map([
-	[ ':Window', validateWindow ]
-]);
-
-export default function validateHtml ( validator, html ) {
-	let elementDepth = 0;
-
-	function visit ( node ) {
-		if ( node.type === 'Element' ) {
-			if ( elementDepth === 0 && validator.namespace !== namespaces.svg && svg.test( node.name ) ) {
-				validator.warn( `<${node.name}> is an SVG element – did you forget to add { namespace: 'svg' } ?`, node.start );
-			}
-
-			if ( meta.has( node.name ) ) {
-				return meta.get( node.name )( validator, node );
-			}
-
-			elementDepth += 1;
-
-			validateElement( validator, node );
-		}
-
-		if ( node.children ) {
-			node.children.forEach( visit );
-		}
-
-		if ( node.else ) {
-			visit( node.else );
-		}
-
-		if ( node.type === 'Element' ) {
-			elementDepth -= 1;
-		}
-	}
-
-	html.children.forEach( visit );
-}
diff --git a/src/validate/html/index.ts b/src/validate/html/index.ts
new file mode 100644
index 0000000000..b09cece0e4
--- /dev/null
+++ b/src/validate/html/index.ts
@@ -0,0 +1,64 @@
+import * as namespaces from '../../utils/namespaces';
+import validateElement from './validateElement';
+import validateWindow from './validateWindow';
+import { Validator } from '../index';
+import { Node } 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|switch|symbol|text|textPath|title|tref|tspan|unknown|use|view|vkern)$/;
+
+const meta = new Map([[':Window', validateWindow]]);
+
+export default function validateHtml(validator: Validator, html: Node) {
+	let elementDepth = 0;
+
+	function visit(node: Node) {
+		if (node.type === 'Element') {
+			if (
+				elementDepth === 0 &&
+				validator.namespace !== namespaces.svg &&
+				svg.test(node.name)
+			) {
+				validator.warn(
+					`<${node.name}> is an SVG element – did you forget to add { namespace: 'svg' } ?`,
+					node.start
+				);
+			}
+
+			if (meta.has(node.name)) {
+				return meta.get(node.name)(validator, node);
+			}
+
+			elementDepth += 1;
+
+			validateElement(validator, node);
+		} else if (node.type === 'EachBlock') {
+			if (validator.helpers.has(node.context)) {
+				let c = node.expression.end;
+
+				// find start of context
+				while (/\s/.test(validator.source[c])) c += 1;
+				c += 2;
+				while (/\s/.test(validator.source[c])) c += 1;
+
+				validator.warn(
+					`Context clashes with a helper. Rename one or the other to eliminate any ambiguity`,
+					c
+				);
+			}
+		}
+
+		if (node.children) {
+			node.children.forEach(visit);
+		}
+
+		if (node.else) {
+			visit(node.else);
+		}
+
+		if (node.type === 'Element') {
+			elementDepth -= 1;
+		}
+	}
+
+	html.children.forEach(visit);
+}
diff --git a/src/validate/html/validateElement.js b/src/validate/html/validateElement.js
deleted file mode 100644
index c3405c75a2..0000000000
--- a/src/validate/html/validateElement.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import flattenReference from '../../utils/flattenReference.js';
-
-export default function validateElement ( validator, node ) {
-	const isComponent = node.name === ':Self' || validator.components.has( node.name );
-
-	node.attributes.forEach( attribute => {
-		if ( !isComponent && attribute.type === 'Binding' ) {
-			const { name } = attribute;
-
-			if ( name === 'value' ) {
-				if ( node.name !== 'input' && node.name !== 'textarea' && node.name !== 'select' ) {
-					validator.error( `'value' is not a valid binding on <${node.name}> elements`, attribute.start );
-				}
-			}
-
-			else if ( name === 'checked' ) {
-				if ( node.name !== 'input' ) {
-					validator.error( `'checked' is not a valid binding on <${node.name}> elements`, attribute.start );
-				}
-
-				if ( getType( validator, node ) !== 'checkbox' ) {
-					validator.error( `'checked' binding can only be used with <input type="checkbox">` );
-				}
-			}
-
-			else if ( name === 'group' ) {
-				if ( node.name !== 'input' ) {
-					validator.error( `'group' is not a valid binding on <${node.name}> elements`, attribute.start );
-				}
-
-				const type = getType( validator, node );
-
-				if ( type !== 'checkbox' && type !== 'radio' ) {
-					validator.error( `'checked' binding can only be used with <input type="checkbox"> or <input type="radio">` );
-				}
-			}
-
-			else if ( name === 'currentTime' || name === 'duration' || name === 'paused' ) {
-				if ( node.name !== 'audio' && node.name !== 'video' ) {
-					validator.error( `'${name}' binding can only be used with <audio> or <video>` );
-				}
-			}
-
-			else {
-				validator.error( `'${attribute.name}' is not a valid binding`, attribute.start );
-			}
-		}
-
-		if ( attribute.type === 'EventHandler' ) {
-			const { callee, start, type } = attribute.expression;
-
-			if ( type !== 'CallExpression' ) {
-				validator.error( `Expected a call expression`, start );
-			}
-
-			const { name } = flattenReference( callee );
-
-			if ( name === 'this' || name === 'event' ) return;
-			if ( callee.type === 'Identifier' && callee.name === 'set' || callee.name === 'fire' || validator.methods.has( callee.name ) ) return;
-
-			const validCallees = list( [ 'this.*', 'event.*', 'set', 'fire' ].concat( Array.from( validator.methods.keys() ) ) );
-			let message = `'${validator.source.slice( callee.start, callee.end )}' is an invalid callee (should be one of ${validCallees})`;
-
-			if ( callee.type === 'Identifier' && validator.helpers.has( callee.name ) ) {
-				message += `. '${callee.name}' exists on 'helpers', did you put it in the wrong place?`;
-			}
-
-			validator.error( message, start );
-		}
-	});
-}
-
-function getType ( validator, node ) {
-	const attribute = node.attributes.find( attribute => attribute.name === 'type' );
-	if ( !attribute ) return null;
-
-	if ( attribute.value === true ) {
-		validator.error( `'type' attribute must be specified`, attribute.start );
-	}
-
-	if ( attribute.value.length > 1 || attribute.value[0].type !== 'Text' ) {
-		validator.error( `'type attribute cannot be dynamic`, attribute.start );
-	}
-
-	return attribute.value[0].data;
-}
-
-function list ( items, conjunction = 'or' ) {
-	if ( items.length === 1 ) return items[0];
-	return `${items.slice( 0, -1 ).join( ', ' )} ${conjunction} ${items[ items.length - 1 ]}`;
-}
\ No newline at end of file
diff --git a/src/validate/html/validateElement.ts b/src/validate/html/validateElement.ts
new file mode 100644
index 0000000000..69a50b6cff
--- /dev/null
+++ b/src/validate/html/validateElement.ts
@@ -0,0 +1,156 @@
+import validateEventHandler from './validateEventHandler';
+import { Validator } from '../index';
+import { Node } from '../../interfaces';
+
+export default function validateElement(validator: Validator, node: Node) {
+	const isComponent =
+		node.name === ':Self' || validator.components.has(node.name);
+
+	if (!isComponent && /^[A-Z]/.test(node.name[0])) {
+		// TODO upgrade to validator.error in v2
+		validator.warn(`${node.name} component is not defined`, node.start);
+	}
+
+	let hasIntro: boolean;
+	let hasOutro: boolean;
+	let hasTransition: boolean;
+
+	node.attributes.forEach((attribute: Node) => {
+		if (!isComponent && attribute.type === 'Binding') {
+			const { name } = attribute;
+
+			if (name === 'value') {
+				if (
+					node.name !== 'input' &&
+					node.name !== 'textarea' &&
+					node.name !== 'select'
+				) {
+					validator.error(
+						`'value' is not a valid binding on <${node.name}> elements`,
+						attribute.start
+					);
+				}
+
+				checkTypeAttribute(validator, node);
+			} else if (name === 'checked') {
+				if (node.name !== 'input') {
+					validator.error(
+						`'checked' is not a valid binding on <${node.name}> elements`,
+						attribute.start
+					);
+				}
+
+				if (checkTypeAttribute(validator, node) !== 'checkbox') {
+					validator.error(
+						`'checked' binding can only be used with <input type="checkbox">`,
+						attribute.start
+					);
+				}
+			} else if (name === 'group') {
+				if (node.name !== 'input') {
+					validator.error(
+						`'group' is not a valid binding on <${node.name}> elements`,
+						attribute.start
+					);
+				}
+
+				const type = checkTypeAttribute(validator, node);
+
+				if (type !== 'checkbox' && type !== 'radio') {
+					validator.error(
+						`'checked' binding can only be used with <input type="checkbox"> or <input type="radio">`,
+						attribute.start
+					);
+				}
+			} else if (
+				name === 'currentTime' ||
+				name === 'duration' ||
+				name === 'paused'
+			) {
+				if (node.name !== 'audio' && node.name !== 'video') {
+					validator.error(
+						`'${name}' binding can only be used with <audio> or <video>`,
+						attribute.start
+					);
+				}
+			} else {
+				validator.error(
+					`'${attribute.name}' is not a valid binding`,
+					attribute.start
+				);
+			}
+		} else if (attribute.type === 'EventHandler') {
+			validateEventHandler(validator, attribute);
+		} else if (attribute.type === 'Transition') {
+			const bidi = attribute.intro && attribute.outro;
+
+			if (hasTransition) {
+				if (bidi)
+					validator.error(
+						`An element can only have one 'transition' directive`,
+						attribute.start
+					);
+				validator.error(
+					`An element cannot have both a 'transition' directive and an '${attribute.intro
+						? 'in'
+						: 'out'}' directive`,
+					attribute.start
+				);
+			}
+
+			if ((hasIntro && attribute.intro) || (hasOutro && attribute.outro)) {
+				if (bidi)
+					validator.error(
+						`An element cannot have both an '${hasIntro
+							? 'in'
+							: 'out'}' directive and a 'transition' directive`,
+						attribute.start
+					);
+				validator.error(
+					`An element can only have one '${hasIntro ? 'in' : 'out'}' directive`,
+					attribute.start
+				);
+			}
+
+			if (attribute.intro) hasIntro = true;
+			if (attribute.outro) hasOutro = true;
+			if (bidi) hasTransition = true;
+
+			if (!validator.transitions.has(attribute.name)) {
+				validator.error(
+					`Missing transition '${attribute.name}'`,
+					attribute.start
+				);
+			}
+		} else if (attribute.type === 'Attribute') {
+			if (attribute.name === 'value' && node.name === 'textarea') {
+				if (node.children.length) {
+					validator.error(
+						`A <textarea> can have either a value attribute or (equivalently) child content, but not both`,
+						attribute.start
+					);
+				}
+			}
+		}
+	});
+}
+
+function checkTypeAttribute(validator: Validator, node: Node) {
+	const attribute = node.attributes.find(
+		(attribute: Node) => attribute.name === 'type'
+	);
+	if (!attribute) return null;
+
+	if (attribute.value === true) {
+		validator.error(`'type' attribute must be specified`, attribute.start);
+	}
+
+	if (attribute.value.length > 1 || attribute.value[0].type !== 'Text') {
+		validator.error(
+			`'type' attribute cannot be dynamic if input uses two-way binding`,
+			attribute.start
+		);
+	}
+
+	return attribute.value[0].data;
+}
diff --git a/src/validate/html/validateEventHandler.ts b/src/validate/html/validateEventHandler.ts
new file mode 100644
index 0000000000..85fdad08e6
--- /dev/null
+++ b/src/validate/html/validateEventHandler.ts
@@ -0,0 +1,42 @@
+import flattenReference from '../../utils/flattenReference';
+import list from '../utils/list';
+import { Validator } from '../index';
+import { Node } from '../../interfaces';
+
+const validBuiltins = new Set(['set', 'fire', 'destroy']);
+
+export default function validateEventHandlerCallee(
+	validator: Validator,
+	attribute: Node
+) {
+	const { callee, start, type } = attribute.expression;
+
+	if (type !== 'CallExpression') {
+		validator.error(`Expected a call expression`, start);
+	}
+
+	const { name } = flattenReference(callee);
+
+	if (name === 'this' || name === 'event') return;
+	if (
+		(callee.type === 'Identifier' && validBuiltins.has(callee.name)) ||
+		validator.methods.has(callee.name)
+	)
+		return;
+
+	const validCallees = ['this.*', 'event.*'].concat(
+		Array.from(validBuiltins),
+		Array.from(validator.methods.keys())
+	);
+
+	let message = `'${validator.source.slice(
+		callee.start,
+		callee.end
+	)}' is an invalid callee (should be one of ${list(validCallees)})`;
+
+	if (callee.type === 'Identifier' && validator.helpers.has(callee.name)) {
+		message += `. '${callee.name}' exists on 'helpers', did you put it in the wrong place?`;
+	}
+
+	validator.warn(message, start);
+}
diff --git a/src/validate/html/validateWindow.js b/src/validate/html/validateWindow.js
deleted file mode 100644
index 233eefa922..0000000000
--- a/src/validate/html/validateWindow.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function validateWindow () {
-	// TODO
-}
\ No newline at end of file
diff --git a/src/validate/html/validateWindow.ts b/src/validate/html/validateWindow.ts
new file mode 100644
index 0000000000..7c78b7f37d
--- /dev/null
+++ b/src/validate/html/validateWindow.ts
@@ -0,0 +1,56 @@
+import flattenReference from '../../utils/flattenReference';
+import fuzzymatch from '../utils/fuzzymatch';
+import list from '../utils/list';
+import validateEventHandler from './validateEventHandler';
+import { Validator } from '../index';
+import { Node } from '../../interfaces';
+
+const validBindings = [
+	'innerWidth',
+	'innerHeight',
+	'outerWidth',
+	'outerHeight',
+	'scrollX',
+	'scrollY',
+];
+
+export default function validateWindow(validator: Validator, node: Node) {
+	node.attributes.forEach((attribute: Node) => {
+		if (attribute.type === 'Binding') {
+			if (attribute.value.type !== 'Identifier') {
+				const { parts } = flattenReference(attribute.value);
+
+				validator.error(
+					`Bindings on <:Window/> must be to top-level properties, e.g. '${parts[
+						parts.length - 1
+					]}' rather than '${parts.join('.')}'`,
+					attribute.value.start
+				);
+			}
+
+			if (!~validBindings.indexOf(attribute.name)) {
+				const match = attribute.name === 'width'
+					? 'innerWidth'
+					: attribute.name === 'height'
+						? 'innerHeight'
+						: fuzzymatch(attribute.name, validBindings);
+
+				const message = `'${attribute.name}' is not a valid binding on <:Window>`;
+
+				if (match) {
+					validator.error(
+						`${message} (did you mean '${match}'?)`,
+						attribute.start
+					);
+				} else {
+					validator.error(
+						`${message} — valid bindings are ${list(validBindings)}`,
+						attribute.start
+					);
+				}
+			}
+		} else if (attribute.type === 'EventHandler') {
+			validateEventHandler(validator, attribute);
+		}
+	});
+}
diff --git a/src/validate/index.js b/src/validate/index.js
deleted file mode 100644
index 8040549e56..0000000000
--- a/src/validate/index.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import validateJs from './js/index.js';
-import validateHtml from './html/index.js';
-import { getLocator } from 'locate-character';
-import getCodeFrame from '../utils/getCodeFrame.js';
-
-export default function validate ( parsed, source, { onerror, onwarn, name, filename } ) {
-	const locator = getLocator( source );
-
-	const validator = {
-		error: ( message, pos ) => {
-			const { line, column } = locator( pos );
-
-			const error = new Error( message );
-			error.frame = getCodeFrame( source, line, column );
-			error.loc = { line: line + 1, column };
-			error.pos = pos;
-			error.filename = filename;
-
-			error.toString = () => `${error.message} (${error.loc.line}:${error.loc.column})\n${error.frame}`;
-
-			throw error;
-		},
-
-		warn: ( message, pos ) => {
-			const { line, column } = locator( pos );
-
-			const frame = getCodeFrame( source, line, column );
-
-			onwarn({
-				message,
-				frame,
-				loc: { line: line + 1, column },
-				pos,
-				filename,
-				toString: () => `${message} (${line + 1}:${column})\n${frame}`
-			});
-		},
-
-		source,
-
-		namespace: null,
-		defaultExport: null,
-		properties: {},
-		components: new Map(),
-		methods: new Map(),
-		helpers: new Map()
-	};
-
-	try {
-		if ( name && !/^[a-zA-Z_$][a-zA-Z_$0-9]*$/.test( name ) ) {
-			const error = new Error( `options.name must be a valid identifier` );
-			throw error;
-		}
-
-		if ( name && !/^[A-Z]/.test( name ) ) {
-			const message = `options.name should be capitalised`;
-			onwarn({
-				message,
-				filename,
-				toString: () => message
-			});
-		}
-
-		if ( parsed.js ) {
-			validateJs( validator, parsed.js );
-		}
-
-		if ( parsed.html ) {
-			validateHtml( validator, parsed.html );
-		}
-	} catch ( err ) {
-		if ( onerror ) {
-			onerror( err );
-		} else {
-			throw err;
-		}
-	}
-}
diff --git a/src/validate/index.ts b/src/validate/index.ts
new file mode 100644
index 0000000000..a395eb83d8
--- /dev/null
+++ b/src/validate/index.ts
@@ -0,0 +1,114 @@
+import validateJs from './js/index';
+import validateHtml from './html/index';
+import { getLocator, Location } from 'locate-character';
+import getCodeFrame from '../utils/getCodeFrame';
+import CompileError from '../utils/CompileError';
+import { Node, Parsed, CompileOptions, Warning } from '../interfaces';
+
+class ValidationError extends CompileError {
+	constructor(
+		message: string,
+		template: string,
+		index: number,
+		filename: string
+	) {
+		super(message, template, index, filename);
+		this.name = 'ValidationError';
+	}
+}
+
+export class Validator {
+	readonly source: string;
+	readonly filename: string;
+
+	onwarn: ({}) => void;
+	locator?: (pos: number) => Location;
+
+	namespace: string;
+	defaultExport: Node;
+	properties: Map<string, Node>;
+	components: Map<string, Node>;
+	methods: Map<string, Node>;
+	helpers: Map<string, Node>;
+	transitions: Map<string, Node>;
+
+	constructor(parsed: Parsed, source: string, options: CompileOptions) {
+		this.source = source;
+		this.filename = options !== undefined ? options.filename : undefined;
+
+		this.onwarn = options !== undefined ? options.onwarn : undefined;
+
+		this.namespace = null;
+		this.defaultExport = null;
+
+		this.properties = new Map();
+		this.components = new Map();
+		this.methods = new Map();
+		this.helpers = new Map();
+		this.transitions = new Map();
+	}
+
+	error(message: string, pos: number) {
+		throw new ValidationError(message, this.source, pos, this.filename);
+	}
+
+	warn(message: string, pos: number) {
+		if (!this.locator) this.locator = getLocator(this.source);
+		const { line, column } = this.locator(pos);
+
+		const frame = getCodeFrame(this.source, line, column);
+
+		this.onwarn({
+			message,
+			frame,
+			loc: { line: line + 1, column },
+			pos,
+			filename: this.filename,
+			toString: () => `${message} (${line + 1}:${column})\n${frame}`,
+		});
+	}
+}
+
+export default function validate(
+	parsed: Parsed,
+	source: string,
+	options: CompileOptions
+) {
+	const { onwarn, onerror, name, filename } = options;
+
+	try {
+		if (name && !/^[a-zA-Z_$][a-zA-Z_$0-9]*$/.test(name)) {
+			const error = new Error(`options.name must be a valid identifier (got '${name}')`);
+			throw error;
+		}
+
+		if (name && !/^[A-Z]/.test(name)) {
+			const message = `options.name should be capitalised`;
+			onwarn({
+				message,
+				filename,
+				toString: () => message,
+			});
+		}
+
+		const validator = new Validator(parsed, source, {
+			onwarn,
+			name,
+			filename,
+		});
+
+		if (parsed.js) {
+			validateJs(validator, parsed.js);
+		}
+
+		if (parsed.html) {
+			validateHtml(validator, parsed.html);
+		}
+	} catch (err) {
+		if (onerror) {
+			onerror(err);
+		} else {
+			throw err;
+		}
+	}
+}
diff --git a/src/validate/js/index.js b/src/validate/js/index.js
deleted file mode 100644
index 6817382496..0000000000
--- a/src/validate/js/index.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import propValidators from './propValidators/index.js';
-import FuzzySet from './utils/FuzzySet.js';
-import checkForDupes from './utils/checkForDupes.js';
-import checkForComputedKeys from './utils/checkForComputedKeys.js';
-import namespaces from '../../utils/namespaces.js';
-
-const validPropList = Object.keys( propValidators );
-
-const fuzzySet = new FuzzySet( validPropList );
-
-export default function validateJs ( validator, js ) {
-	js.content.body.forEach( node => {
-		// check there are no named exports
-		if ( node.type === 'ExportNamedDeclaration' ) {
-			validator.error( `A component can only have a default export`, node.start );
-		}
-
-		if ( node.type === 'ExportDefaultDeclaration' ) {
-			if ( node.declaration.type !== 'ObjectExpression' ) {
-				return validator.error( `Default export must be an object literal`, node.declaration.start );
-			}
-
-			checkForComputedKeys( validator, node.declaration.properties );
-			checkForDupes( validator, node.declaration.properties );
-
-			const props = validator.properties;
-
-			node.declaration.properties.forEach( prop => {
-				props[ prop.key.name ] = prop;
-			});
-
-			// Remove these checks in version 2
-			if ( props.oncreate && props.onrender ) {
-				validator.error( 'Cannot have both oncreate and onrender', props.onrender.start );
-			}
-
-			if ( props.ondestroy && props.onteardown ) {
-				validator.error( 'Cannot have both ondestroy and onteardown', props.onteardown.start );
-			}
-
-			// ensure all exported props are valid
-			node.declaration.properties.forEach( prop => {
-				const propValidator = propValidators[ prop.key.name ];
-
-				if ( propValidator ) {
-					propValidator( validator, prop );
-				} else {
-					const matches = fuzzySet.get( prop.key.name );
-					if ( matches && matches[0] && matches[0][0] > 0.7 ) {
-						validator.error( `Unexpected property '${prop.key.name}' (did you mean '${matches[0][1]}'?)`, prop.start );
-					} else if ( /FunctionExpression/.test( prop.value.type ) ) {
-						validator.error( `Unexpected property '${prop.key.name}' (did you mean to include it in 'methods'?)`, prop.start );
-					} else {
-						validator.error( `Unexpected property '${prop.key.name}'`, prop.start );
-					}
-				}
-			});
-
-			if ( props.namespace ) {
-				const ns = props.namespace.value.value;
-				validator.namespace = namespaces[ ns ] || ns;
-			}
-
-			validator.defaultExport = node;
-		}
-	});
-
-	[ 'components', 'methods', 'helpers' ].forEach( key => {
-		if ( validator.properties[ key ] ) {
-			validator.properties[ key ].value.properties.forEach( prop => {
-				validator[ key ].set( prop.key.name, prop.value );
-			});
-		}
-	});
-}
diff --git a/src/validate/js/index.ts b/src/validate/js/index.ts
new file mode 100644
index 0000000000..0b7547f64c
--- /dev/null
+++ b/src/validate/js/index.ts
@@ -0,0 +1,95 @@
+import propValidators from './propValidators/index';
+import fuzzymatch from '../utils/fuzzymatch';
+import checkForDupes from './utils/checkForDupes';
+import checkForComputedKeys from './utils/checkForComputedKeys';
+import namespaces from '../../utils/namespaces';
+import { Validator } from '../';
+import { Node } from '../../interfaces';
+
+const validPropList = Object.keys(propValidators);
+
+export default function validateJs(validator: Validator, js: Node) {
+	js.content.body.forEach((node: Node) => {
+		// check there are no named exports
+		if (node.type === 'ExportNamedDeclaration') {
+			validator.error(`A component can only have a default export`, node.start);
+		}
+
+		if (node.type === 'ExportDefaultDeclaration') {
+			if (node.declaration.type !== 'ObjectExpression') {
+				return validator.error(
+					`Default export must be an object literal`,
+					node.declaration.start
+				);
+			}
+
+			checkForComputedKeys(validator, node.declaration.properties);
+			checkForDupes(validator, node.declaration.properties);
+
+			const props = validator.properties;
+
+			node.declaration.properties.forEach((prop: Node) => {
+				props.set(prop.key.name, prop);
+			});
+
+			// Remove these checks in version 2
+			if (props.has('oncreate') && props.has('onrender')) {
+				validator.error(
+					'Cannot have both oncreate and onrender',
+					props.get('onrender').start
+				);
+			}
+
+			if (props.has('ondestroy') && props.has('onteardown')) {
+				validator.error(
+					'Cannot have both ondestroy and onteardown',
+					props.get('onteardown').start
+				);
+			}
+
+			// ensure all exported props are valid
+			node.declaration.properties.forEach((prop: Node) => {
+				const propValidator = propValidators[prop.key.name];
+
+				if (propValidator) {
+					propValidator(validator, prop);
+				} else {
+					const match = fuzzymatch(prop.key.name, validPropList);
+					if (match) {
+						validator.error(
+							`Unexpected property '${prop.key
+								.name}' (did you mean '${match}'?)`,
+							prop.start
+						);
+					} else if (/FunctionExpression/.test(prop.value.type)) {
+						validator.error(
+							`Unexpected property '${prop.key
+								.name}' (did you mean to include it in 'methods'?)`,
+							prop.start
+						);
+					} else {
+						validator.error(
+							`Unexpected property '${prop.key.name}'`,
+							prop.start
+						);
+					}
+				}
+			});
+
+			if (props.has('namespace')) {
+				const ns = props.get('namespace').value.value;
+				validator.namespace = namespaces[ns] || ns;
+			}
+
+			validator.defaultExport = node;
+		}
+	});
+
+	['components', 'methods', 'helpers', 'transitions'].forEach(key => {
+		if (validator.properties.has(key)) {
+			validator.properties.get(key).value.properties.forEach((prop: Node) => {
+				validator[key].set(prop.key.name, prop.value);
+			});
+		}
+	});
+}
diff --git a/src/validate/js/propValidators/components.js b/src/validate/js/propValidators/components.js
deleted file mode 100644
index 06bb504ecf..0000000000
--- a/src/validate/js/propValidators/components.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import checkForDupes from '../utils/checkForDupes.js';
-import checkForComputedKeys from '../utils/checkForComputedKeys.js';
-
-export default function components ( validator, prop ) {
-	if ( prop.value.type !== 'ObjectExpression' ) {
-		validator.error( `The 'components' property must be an object literal`, prop.start );
-		return;
-	}
-
-	checkForDupes( validator, prop.value.properties );
-	checkForComputedKeys( validator, prop.value.properties );
-
-	prop.value.properties.forEach( component => {
-		if ( component.key.name === 'state' ) {
-			validator.error( `Component constructors cannot be called 'state' due to technical limitations`, component.start );
-		}
-
-		if ( !/^[A-Z]/.test( component.key.name ) ) {
-			validator.warn( `Component names should be capitalised`, component.start );
-		}
-	});
-}
diff --git a/src/validate/js/propValidators/components.ts b/src/validate/js/propValidators/components.ts
new file mode 100644
index 0000000000..a7ca5eb990
--- /dev/null
+++ b/src/validate/js/propValidators/components.ts
@@ -0,0 +1,30 @@
+import checkForDupes from '../utils/checkForDupes';
+import checkForComputedKeys from '../utils/checkForComputedKeys';
+import { Validator } from '../../';
+import { Node } from '../../../interfaces';
+
+export default function components(validator: Validator, prop: Node) {
+	if (prop.value.type !== 'ObjectExpression') {
+		validator.error(
+			`The 'components' property must be an object literal`,
+			prop.start
+		);
+		return;
+	}
+
+	checkForDupes(validator, prop.value.properties);
+	checkForComputedKeys(validator, prop.value.properties);
+
+	prop.value.properties.forEach((component: Node) => {
+		if (component.key.name === 'state') {
+			validator.error(
+				`Component constructors cannot be called 'state' due to technical limitations`,
+				component.start
+			);
+		}
+
+		if (!/^[A-Z]/.test(component.key.name)) {
+			validator.warn(`Component names should be capitalised`, component.start);
+		}
+	});
+}
diff --git a/src/validate/js/propValidators/computed.js b/src/validate/js/propValidators/computed.js
deleted file mode 100644
index 16f8e36190..0000000000
--- a/src/validate/js/propValidators/computed.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import checkForDupes from '../utils/checkForDupes.js';
-import checkForComputedKeys from '../utils/checkForComputedKeys.js';
-
-const isFunctionExpression = new Set( [ 'FunctionExpression', 'ArrowFunctionExpression' ] );
-
-export default function computed ( validator, prop ) {
-	if ( prop.value.type !== 'ObjectExpression' ) {
-		validator.error( `The 'computed' property must be an object literal`, prop.start );
-		return;
-	}
-
-	checkForDupes( validator, prop.value.properties );
-	checkForComputedKeys( validator, prop.value.properties );
-
-	prop.value.properties.forEach( computation => {
-		if ( !isFunctionExpression.has( computation.value.type ) ) {
-			validator.error( `Computed properties can be function expressions or arrow function expressions`, computation.value.start );
-			return;
-		}
-
-		const params = computation.value.params;
-
-		if ( params.length === 0 ) {
-			validator.error( `A computed value must depend on at least one property`, computation.value.start );
-			return;
-		}
-
-		params.forEach( param => {
-			const valid = param.type === 'Identifier' || param.type === 'AssignmentPattern' && param.left.type === 'Identifier';
-
-			if ( !valid ) {
-				validator.error( `Computed properties cannot use destructuring in function parameters`, param.start );
-			}
-		});
-	});
-}
diff --git a/src/validate/js/propValidators/computed.ts b/src/validate/js/propValidators/computed.ts
new file mode 100644
index 0000000000..7456963e90
--- /dev/null
+++ b/src/validate/js/propValidators/computed.ts
@@ -0,0 +1,56 @@
+import checkForDupes from '../utils/checkForDupes';
+import checkForComputedKeys from '../utils/checkForComputedKeys';
+import { Validator } from '../../';
+import { Node } from '../../../interfaces';
+
+const isFunctionExpression = new Set([
+	'FunctionExpression',
+	'ArrowFunctionExpression',
+]);
+
+export default function computed(validator: Validator, prop: Node) {
+	if (prop.value.type !== 'ObjectExpression') {
+		validator.error(
+			`The 'computed' property must be an object literal`,
+			prop.start
+		);
+		return;
+	}
+
+	checkForDupes(validator, prop.value.properties);
+	checkForComputedKeys(validator, prop.value.properties);
+
+	prop.value.properties.forEach((computation: Node) => {
+		if (!isFunctionExpression.has(computation.value.type)) {
+			validator.error(
+				`Computed properties can be function expressions or arrow function expressions`,
+				computation.value.start
+			);
+			return;
+		}
+
+		const params = computation.value.params;
+
+		if (params.length === 0) {
+			validator.error(
+				`A computed value must depend on at least one property`,
+				computation.value.start
+			);
+			return;
+		}
+
+		params.forEach((param: Node) => {
+			const valid =
+				param.type === 'Identifier' ||
+				(param.type === 'AssignmentPattern' &&
+					param.left.type === 'Identifier');
+
+			if (!valid) {
+				validator.error(
+					`Computed properties cannot use destructuring in function parameters`,
+					param.start
+				);
+			}
+		});
+	});
+}
diff --git a/src/validate/js/propValidators/data.js b/src/validate/js/propValidators/data.js
deleted file mode 100644
index 5ea398136b..0000000000
--- a/src/validate/js/propValidators/data.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const disallowed = new Set( [ 'Literal', 'ObjectExpression', 'ArrayExpression' ] );
-
-export default function data ( validator, prop ) {
-	while ( prop.type === 'ParenthesizedExpression' ) prop = prop.expression;
-
-	// TODO should we disallow references and expressions as well?
-
-	if ( disallowed.has( prop.value.type ) ) {
-		validator.error( `'data' must be a function`, prop.value.start );
-	}
-}
diff --git a/src/validate/js/propValidators/data.ts b/src/validate/js/propValidators/data.ts
new file mode 100644
index 0000000000..b49931cf21
--- /dev/null
+++ b/src/validate/js/propValidators/data.ts
@@ -0,0 +1,14 @@
+import { Validator } from '../../';
+import { Node } from '../../../interfaces';
+
+const disallowed = new Set(['Literal', 'ObjectExpression', 'ArrayExpression']);
+
+export default function data(validator: Validator, prop: Node) {
+	while (prop.type === 'ParenthesizedExpression') prop = prop.expression;
+
+	// TODO should we disallow references and expressions as well?
+
+	if (disallowed.has(prop.value.type)) {
+		validator.error(`'data' must be a function`, prop.value.start);
+	}
+}
diff --git a/src/validate/js/propValidators/events.js b/src/validate/js/propValidators/events.js
deleted file mode 100644
index 437b259132..0000000000
--- a/src/validate/js/propValidators/events.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import checkForDupes from '../utils/checkForDupes.js';
-import checkForComputedKeys from '../utils/checkForComputedKeys.js';
-
-export default function events ( validator, prop ) {
-	if ( prop.value.type !== 'ObjectExpression' ) {
-		validator.error( `The 'events' property must be an object literal`, prop.start );
-		return;
-	}
-
-	checkForDupes( validator, prop.value.properties );
-	checkForComputedKeys( validator, prop.value.properties );
-}
diff --git a/src/validate/js/propValidators/events.ts b/src/validate/js/propValidators/events.ts
new file mode 100644
index 0000000000..1bbf75d1e6
--- /dev/null
+++ b/src/validate/js/propValidators/events.ts
@@ -0,0 +1,17 @@
+import checkForDupes from '../utils/checkForDupes';
+import checkForComputedKeys from '../utils/checkForComputedKeys';
+import { Validator } from '../../';
+import { Node } from '../../../interfaces';
+
+export default function events(validator: Validator, prop: Node) {
+	if (prop.value.type !== 'ObjectExpression') {
+		validator.error(
+			`The 'events' property must be an object literal`,
+			prop.start
+		);
+		return;
+	}
+
+	checkForDupes(validator, prop.value.properties);
+	checkForComputedKeys(validator, prop.value.properties);
+}
diff --git a/src/validate/js/propValidators/helpers.js b/src/validate/js/propValidators/helpers.js
deleted file mode 100644
index 7e27e31134..0000000000
--- a/src/validate/js/propValidators/helpers.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import checkForDupes from '../utils/checkForDupes.js';
-import checkForComputedKeys from '../utils/checkForComputedKeys.js';
-import { walk } from 'estree-walker';
-
-export default function helpers ( validator, prop ) {
-	if ( prop.value.type !== 'ObjectExpression' ) {
-		validator.error( `The 'helpers' property must be an object literal`, prop.start );
-		return;
-	}
-
-	checkForDupes( validator, prop.value.properties );
-	checkForComputedKeys( validator, prop.value.properties );
-
-	prop.value.properties.forEach( prop => {
-		if ( !/FunctionExpression/.test( prop.value.type ) ) return;
-
-		let lexicalDepth = 0;
-		let usesArguments = false;
-
-		walk( prop.value.body, {
-			enter ( node ) {
-				if ( /^Function/.test( node.type ) ) {
-					lexicalDepth += 1;
-				}
-
-				else if ( lexicalDepth === 0 ) {
-					// handle special case that's caused some people confusion — using `this.get(...)` instead of passing argument
-					// TODO do the same thing for computed values?
-					if ( node.type === 'CallExpression' && node.callee.type === 'MemberExpression' && node.callee.object.type === 'ThisExpression' && node.callee.property.name === 'get' && !node.callee.property.computed ) {
-						validator.error( `Cannot use this.get(...) — it must be passed into the helper function as an argument`, node.start );
-					}
-
-					if ( node.type === 'ThisExpression' ) {
-						validator.error( `Helpers should be pure functions — they do not have access to the component instance and cannot use 'this'. Did you mean to put this in 'methods'?`, node.start );
-					}
-
-					else if ( node.type === 'Identifier' && node.name === 'arguments' ) {
-						usesArguments = true;
-					}
-				}
-			},
-
-			leave ( node ) {
-				if ( /^Function/.test( node.type ) ) {
-					lexicalDepth -= 1;
-				}
-			}
-		});
-
-		if ( prop.value.params.length === 0 && !usesArguments ) {
-			validator.warn( `Helpers should be pure functions, with at least one argument`, prop.start );
-		}
-	});
-}
diff --git a/src/validate/js/propValidators/helpers.ts b/src/validate/js/propValidators/helpers.ts
new file mode 100644
index 0000000000..d5d51c99ea
--- /dev/null
+++ b/src/validate/js/propValidators/helpers.ts
@@ -0,0 +1,70 @@
+import checkForDupes from '../utils/checkForDupes';
+import checkForComputedKeys from '../utils/checkForComputedKeys';
+import { walk } from 'estree-walker';
+import { Validator } from '../../';
+import { Node } from '../../../interfaces';
+
+export default function helpers(validator: Validator, prop: Node) {
+	if (prop.value.type !== 'ObjectExpression') {
+		validator.error(
+			`The 'helpers' property must be an object literal`,
+			prop.start
+		);
+		return;
+	}
+
+	checkForDupes(validator, prop.value.properties);
+	checkForComputedKeys(validator, prop.value.properties);
+
+	prop.value.properties.forEach((prop: Node) => {
+		if (!/FunctionExpression/.test(prop.value.type)) return;
+
+		let lexicalDepth = 0;
+		let usesArguments = false;
+
+		walk(prop.value.body, {
+			enter(node: Node) {
+				if (/^Function/.test(node.type)) {
+					lexicalDepth += 1;
+				} else if (lexicalDepth === 0) {
+					// handle special case that's caused some people confusion — using `this.get(...)` instead of passing argument
+					// TODO do the same thing for computed values?
+					if (
+						node.type === 'CallExpression' &&
+						node.callee.type === 'MemberExpression' &&
+						node.callee.object.type === 'ThisExpression' &&
+						node.callee.property.name === 'get' &&
+						!node.callee.property.computed
+					) {
+						validator.error(
+							`Cannot use this.get(...) — it must be passed into the helper function as an argument`,
+							node.start
+						);
+					}
+
+					if (node.type === 'ThisExpression') {
+						validator.error(
+							`Helpers should be pure functions — they do not have access to the component instance and cannot use 'this'. Did you mean to put this in 'methods'?`,
+							node.start
+						);
+					} else if (node.type === 'Identifier' && node.name === 'arguments') {
+						usesArguments = true;
+					}
+				}
+			},
+
+			leave(node: Node) {
+				if (/^Function/.test(node.type)) {
+					lexicalDepth -= 1;
+				}
+			},
+		});
+
+		if (prop.value.params.length === 0 && !usesArguments) {
+			validator.warn(
+				`Helpers should be pure functions, with at least one argument`,
+				prop.start
+			);
+		}
+	});
+}
diff --git a/src/validate/js/propValidators/index.js b/src/validate/js/propValidators/index.js
deleted file mode 100644
index 0d5f6d8ffc..0000000000
--- a/src/validate/js/propValidators/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import data from './data.js';
-import computed from './computed.js';
-import oncreate from './oncreate.js';
-import ondestroy from './ondestroy.js';
-import onrender from './onrender.js';
-import onteardown from './onteardown.js';
-import helpers from './helpers.js';
-import methods from './methods.js';
-import components from './components.js';
-import events from './events.js';
-import namespace from './namespace.js';
-
-export default {
-	data,
-	computed,
-	oncreate,
-	ondestroy,
-	onrender,
-	onteardown,
-	helpers,
-	methods,
-	components,
-	events,
-	namespace
-};
diff --git a/src/validate/js/propValidators/index.ts b/src/validate/js/propValidators/index.ts
new file mode 100644
index 0000000000..6d3b089d99
--- /dev/null
+++ b/src/validate/js/propValidators/index.ts
@@ -0,0 +1,27 @@
+import data from './data';
+import computed from './computed';
+import oncreate from './oncreate';
+import ondestroy from './ondestroy';
+import onrender from './onrender';
+import onteardown from './onteardown';
+import helpers from './helpers';
+import methods from './methods';
+import components from './components';
+import events from './events';
+import namespace from './namespace';
+import transitions from './transitions';
+
+export default {
+	data,
+	computed,
+	oncreate,
+	ondestroy,
+	onrender,
+	onteardown,
+	helpers,
+	methods,
+	components,
+	events,
+	namespace,
+	transitions,
+};
diff --git a/src/validate/js/propValidators/methods.js b/src/validate/js/propValidators/methods.js
deleted file mode 100644
index 0bddc3d184..0000000000
--- a/src/validate/js/propValidators/methods.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import checkForAccessors from '../utils/checkForAccessors.js';
-import checkForDupes from '../utils/checkForDupes.js';
-import checkForComputedKeys from '../utils/checkForComputedKeys.js';
-import usesThisOrArguments from '../utils/usesThisOrArguments.js';
-
-const builtin = new Set( [ 'set', 'get', 'on', 'fire', 'observe', 'destroy' ] );
-
-export default function methods ( validator, prop ) {
-	if ( prop.value.type !== 'ObjectExpression' ) {
-		validator.error( `The 'methods' property must be an object literal`, prop.start );
-		return;
-	}
-
-	checkForAccessors( validator, prop.value.properties, 'Methods' );
-	checkForDupes( validator, prop.value.properties );
-	checkForComputedKeys( validator, prop.value.properties );
-
-	prop.value.properties.forEach( prop => {
-		if ( builtin.has( prop.key.name ) ) {
-			validator.error( `Cannot overwrite built-in method '${prop.key.name}'` );
-		}
-
-		if ( prop.value.type === 'ArrowFunctionExpression' ) {
-			if ( usesThisOrArguments( prop.value.body ) ) {
-				validator.error( `Method '${prop.key.name}' should be a function expression, not an arrow function expression`, prop.start );
-			}
-		}
-	});
-}
diff --git a/src/validate/js/propValidators/methods.ts b/src/validate/js/propValidators/methods.ts
new file mode 100644
index 0000000000..7d8547ef39
--- /dev/null
+++ b/src/validate/js/propValidators/methods.ts
@@ -0,0 +1,41 @@
+import checkForAccessors from '../utils/checkForAccessors';
+import checkForDupes from '../utils/checkForDupes';
+import checkForComputedKeys from '../utils/checkForComputedKeys';
+import usesThisOrArguments from '../utils/usesThisOrArguments';
+import { Validator } from '../../';
+import { Node } from '../../../interfaces';
+
+const builtin = new Set(['set', 'get', 'on', 'fire', 'observe', 'destroy']);
+
+export default function methods(validator: Validator, prop: Node) {
+	if (prop.value.type !== 'ObjectExpression') {
+		validator.error(
+			`The 'methods' property must be an object literal`,
+			prop.start
+		);
+		return;
+	}
+
+	checkForAccessors(validator, prop.value.properties, 'Methods');
+	checkForDupes(validator, prop.value.properties);
+	checkForComputedKeys(validator, prop.value.properties);
+
+	prop.value.properties.forEach((prop: Node) => {
+		if (builtin.has(prop.key.name)) {
+			validator.error(
+				`Cannot overwrite built-in method '${prop.key.name}'`,
+				prop.start
+			);
+		}
+
+		if (prop.value.type === 'ArrowFunctionExpression') {
+			if (usesThisOrArguments(prop.value.body)) {
+				validator.error(
+					`Method '${prop.key
+						.name}' should be a function expression, not an arrow function expression`,
+					prop.start
+				);
+			}
+		}
+	});
+}
diff --git a/src/validate/js/propValidators/namespace.js b/src/validate/js/propValidators/namespace.js
deleted file mode 100644
index ec8bad0a04..0000000000
--- a/src/validate/js/propValidators/namespace.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import * as namespaces from '../../../utils/namespaces.js';
-import FuzzySet from '../utils/FuzzySet.js';
-
-const fuzzySet = new FuzzySet( namespaces.validNamespaces );
-const valid = new Set( namespaces.validNamespaces );
-
-export default function namespace ( validator, prop ) {
-	const ns = prop.value.value;
-
-	if ( prop.value.type !== 'Literal' || typeof ns !== 'string' ) {
-		validator.error( `The 'namespace' property must be a string literal representing a valid namespace`, prop.start );
-	}
-
-	if ( !valid.has( ns ) ) {
-		const matches = fuzzySet.get( ns );
-		if ( matches && matches[0] && matches[0][0] > 0.7 ) {
-			validator.error( `Invalid namespace '${ns}' (did you mean '${matches[0][1]}'?)`, prop.start );
-		} else {
-			validator.error( `Invalid namespace '${ns}'`, prop.start );
-		}
-	}
-}
diff --git a/src/validate/js/propValidators/namespace.ts b/src/validate/js/propValidators/namespace.ts
new file mode 100644
index 0000000000..30e3ead77f
--- /dev/null
+++ b/src/validate/js/propValidators/namespace.ts
@@ -0,0 +1,29 @@
+import * as namespaces from '../../../utils/namespaces';
+import fuzzymatch from '../../utils/fuzzymatch';
+import { Validator } from '../../';
+import { Node } from '../../../interfaces';
+
+const valid = new Set(namespaces.validNamespaces);
+
+export default function namespace(validator: Validator, prop: Node) {
+	const ns = prop.value.value;
+
+	if (prop.value.type !== 'Literal' || typeof ns !== 'string') {
+		validator.error(
+			`The 'namespace' property must be a string literal representing a valid namespace`,
+			prop.start
+		);
+	}
+
+	if (!valid.has(ns)) {
+		const match = fuzzymatch(ns, namespaces.validNamespaces);
+		if (match) {
+			validator.error(
+				`Invalid namespace '${ns}' (did you mean '${match}'?)`,
+				prop.start
+			);
+		} else {
+			validator.error(`Invalid namespace '${ns}'`, prop.start);
+		}
+	}
+}
diff --git a/src/validate/js/propValidators/oncreate.js b/src/validate/js/propValidators/oncreate.js
deleted file mode 100644
index 3d863ec726..0000000000
--- a/src/validate/js/propValidators/oncreate.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import usesThisOrArguments from '../utils/usesThisOrArguments.js';
-
-export default function oncreate ( validator, prop ) {
-	if ( prop.value.type === 'ArrowFunctionExpression' ) {
-		if ( usesThisOrArguments( prop.value.body ) ) {
-			validator.error( `'oncreate' should be a function expression, not an arrow function expression`, prop.start );
-		}
-	}
-}
diff --git a/src/validate/js/propValidators/oncreate.ts b/src/validate/js/propValidators/oncreate.ts
new file mode 100644
index 0000000000..587a8b3679
--- /dev/null
+++ b/src/validate/js/propValidators/oncreate.ts
@@ -0,0 +1,14 @@
+import usesThisOrArguments from '../utils/usesThisOrArguments';
+import { Validator } from '../../';
+import { Node } from '../../../interfaces';
+
+export default function oncreate(validator: Validator, prop: Node) {
+	if (prop.value.type === 'ArrowFunctionExpression') {
+		if (usesThisOrArguments(prop.value.body)) {
+			validator.error(
+				`'oncreate' should be a function expression, not an arrow function expression`,
+				prop.start
+			);
+		}
+	}
+}
diff --git a/src/validate/js/propValidators/ondestroy.js b/src/validate/js/propValidators/ondestroy.js
deleted file mode 100644
index 3471034178..0000000000
--- a/src/validate/js/propValidators/ondestroy.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import usesThisOrArguments from '../utils/usesThisOrArguments.js';
-
-export default function ondestroy ( validator, prop ) {
-	if ( prop.value.type === 'ArrowFunctionExpression' ) {
-		if ( usesThisOrArguments( prop.value.body ) ) {
-			validator.error( `'ondestroy' should be a function expression, not an arrow function expression`, prop.start );
-		}
-	}
-}
diff --git a/src/validate/js/propValidators/ondestroy.ts b/src/validate/js/propValidators/ondestroy.ts
new file mode 100644
index 0000000000..e12525e73f
--- /dev/null
+++ b/src/validate/js/propValidators/ondestroy.ts
@@ -0,0 +1,14 @@
+import usesThisOrArguments from '../utils/usesThisOrArguments';
+import { Validator } from '../../';
+import { Node } from '../../../interfaces';
+
+export default function ondestroy(validator: Validator, prop: Node) {
+	if (prop.value.type === 'ArrowFunctionExpression') {
+		if (usesThisOrArguments(prop.value.body)) {
+			validator.error(
+				`'ondestroy' should be a function expression, not an arrow function expression`,
+				prop.start
+			);
+		}
+	}
+}
diff --git a/src/validate/js/propValidators/onrender.js b/src/validate/js/propValidators/onrender.js
deleted file mode 100644
index 4f0cad4fbb..0000000000
--- a/src/validate/js/propValidators/onrender.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import oncreate from './oncreate.js';
-
-export default function onrender ( validator, prop ) {
-	validator.warn( `'onrender' has been deprecated in favour of 'oncreate', and will cause an error in Svelte 2.x`, prop.start );
-	oncreate( validator, prop );
-}
diff --git a/src/validate/js/propValidators/onrender.ts b/src/validate/js/propValidators/onrender.ts
new file mode 100644
index 0000000000..fd6751a373
--- /dev/null
+++ b/src/validate/js/propValidators/onrender.ts
@@ -0,0 +1,11 @@
+import oncreate from './oncreate';
+import { Validator } from '../../';
+import { Node } from '../../../interfaces';
+
+export default function onrender(validator: Validator, prop: Node) {
+	validator.warn(
+		`'onrender' has been deprecated in favour of 'oncreate', and will cause an error in Svelte 2.x`,
+		prop.start
+	);
+	oncreate(validator, prop);
+}
diff --git a/src/validate/js/propValidators/onteardown.js b/src/validate/js/propValidators/onteardown.js
deleted file mode 100644
index c1038d4365..0000000000
--- a/src/validate/js/propValidators/onteardown.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import ondestroy from './ondestroy.js';
-
-export default function onteardown ( validator, prop ) {
-	validator.warn( `'onteardown' has been deprecated in favour of 'ondestroy', and will cause an error in Svelte 2.x`, prop.start );
-	ondestroy( validator, prop );
-}
diff --git a/src/validate/js/propValidators/onteardown.ts b/src/validate/js/propValidators/onteardown.ts
new file mode 100644
index 0000000000..cca770909c
--- /dev/null
+++ b/src/validate/js/propValidators/onteardown.ts
@@ -0,0 +1,11 @@
+import ondestroy from './ondestroy';
+import { Validator } from '../../';
+import { Node } from '../../../interfaces';
+
+export default function onteardown(validator: Validator, prop: Node) {
+	validator.warn(
+		`'onteardown' has been deprecated in favour of 'ondestroy', and will cause an error in Svelte 2.x`,
+		prop.start
+	);
+	ondestroy(validator, prop);
+}
diff --git a/src/validate/js/propValidators/transitions.ts b/src/validate/js/propValidators/transitions.ts
new file mode 100644
index 0000000000..6470beee6f
--- /dev/null
+++ b/src/validate/js/propValidators/transitions.ts
@@ -0,0 +1,22 @@
+import checkForDupes from '../utils/checkForDupes';
+import checkForComputedKeys from '../utils/checkForComputedKeys';
+import { Validator } from '../../';
+import { Node } from '../../../interfaces';
+
+export default function transitions(validator: Validator, prop: Node) {
+	if (prop.value.type !== 'ObjectExpression') {
+		validator.error(
+			`The 'transitions' property must be an object literal`,
+			prop.start
+		);
+		return;
+	}
+
+	checkForDupes(validator, prop.value.properties);
+	checkForComputedKeys(validator, prop.value.properties);
+
+	prop.value.properties.forEach(() => {
+		// TODO probably some validation that can happen here...
+		// checking for use of `this` etc?
+	});
+}
diff --git a/src/validate/js/utils/checkForAccessors.js b/src/validate/js/utils/checkForAccessors.js
deleted file mode 100644
index c6fad53dc8..0000000000
--- a/src/validate/js/utils/checkForAccessors.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function checkForAccessors ( validator, properties, label ) {
-	properties.forEach( prop => {
-		if ( prop.kind !== 'init' ) {
-			validator.error( `${label} cannot use getters and setters`, prop.start );
-		}
-	});
-}
diff --git a/src/validate/js/utils/checkForAccessors.ts b/src/validate/js/utils/checkForAccessors.ts
new file mode 100644
index 0000000000..6c00d3a23a
--- /dev/null
+++ b/src/validate/js/utils/checkForAccessors.ts
@@ -0,0 +1,14 @@
+import { Validator } from '../../';
+import { Node } from '../../../interfaces';
+
+export default function checkForAccessors(
+	validator: Validator,
+	properties: Node[],
+	label: string
+) {
+	properties.forEach(prop => {
+		if (prop.kind !== 'init') {
+			validator.error(`${label} cannot use getters and setters`, prop.start);
+		}
+	});
+}
diff --git a/src/validate/js/utils/checkForComputedKeys.js b/src/validate/js/utils/checkForComputedKeys.js
deleted file mode 100644
index f4365fde9d..0000000000
--- a/src/validate/js/utils/checkForComputedKeys.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function checkForComputedKeys ( validator, properties ) {
-	properties.forEach( prop => {
-		if ( prop.key.computed ) {
-			validator.error( `Cannot use computed keys`, prop.start );
-		}
-	});
-}
diff --git a/src/validate/js/utils/checkForComputedKeys.ts b/src/validate/js/utils/checkForComputedKeys.ts
new file mode 100644
index 0000000000..cf3892d02c
--- /dev/null
+++ b/src/validate/js/utils/checkForComputedKeys.ts
@@ -0,0 +1,13 @@
+import { Validator } from '../../';
+import { Node } from '../../../interfaces';
+
+export default function checkForComputedKeys(
+	validator: Validator,
+	properties: Node[]
+) {
+	properties.forEach(prop => {
+		if (prop.key.computed) {
+			validator.error(`Cannot use computed keys`, prop.start);
+		}
+	});
+}
diff --git a/src/validate/js/utils/checkForDupes.js b/src/validate/js/utils/checkForDupes.js
deleted file mode 100644
index b35ae79159..0000000000
--- a/src/validate/js/utils/checkForDupes.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export default function checkForDupes ( validator, properties ) {
-	const seen = new Set();
-
-	properties.forEach( prop => {
-		if ( seen.has( prop.key.name ) ) {
-			validator.error( `Duplicate property '${prop.key.name}'`, prop.start );
-		}
-
-		seen.add( prop.key.name );
-	});
-}
diff --git a/src/validate/js/utils/checkForDupes.ts b/src/validate/js/utils/checkForDupes.ts
new file mode 100644
index 0000000000..8565ab5388
--- /dev/null
+++ b/src/validate/js/utils/checkForDupes.ts
@@ -0,0 +1,17 @@
+import { Validator } from '../../';
+import { Node } from '../../../interfaces';
+
+export default function checkForDupes(
+	validator: Validator,
+	properties: Node[]
+) {
+	const seen = new Set();
+
+	properties.forEach(prop => {
+		if (seen.has(prop.key.name)) {
+			validator.error(`Duplicate property '${prop.key.name}'`, prop.start);
+		}
+
+		seen.add(prop.key.name);
+	});
+}
diff --git a/src/validate/js/utils/usesThisOrArguments.js b/src/validate/js/utils/usesThisOrArguments.js
deleted file mode 100644
index 40fffc0a5c..0000000000
--- a/src/validate/js/utils/usesThisOrArguments.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { walk } from 'estree-walker';
-import isReference from '../../../utils/isReference.js';
-
-export default function usesThisOrArguments ( node ) {
-	let result = false;
-
-	walk( node, {
-		enter ( node ) {
-			if ( result || node.type === 'FunctionExpression' || node.type === 'FunctionDeclaration' ) {
-				return this.skip();
-			}
-
-			if ( node.type === 'ThisExpression' ) {
-				result = true;
-			}
-
-			if ( node.type === 'Identifier' && isReference( node ) && node.name === 'arguments' ) {
-				result = true;
-			}
-		}
-	});
-
-	return result;
-}
diff --git a/src/validate/js/utils/usesThisOrArguments.ts b/src/validate/js/utils/usesThisOrArguments.ts
new file mode 100644
index 0000000000..958594a9eb
--- /dev/null
+++ b/src/validate/js/utils/usesThisOrArguments.ts
@@ -0,0 +1,33 @@
+import { walk } from 'estree-walker';
+import isReference from '../../../utils/isReference';
+import { Node } from '../../../interfaces';
+
+export default function usesThisOrArguments(node: Node) {
+	let result = false;
+
+	walk(node, {
+		enter(node: Node, parent: Node) {
+			if (
+				result ||
+				node.type === 'FunctionExpression' ||
+				node.type === 'FunctionDeclaration'
+			) {
+				return this.skip();
+			}
+
+			if (node.type === 'ThisExpression') {
+				result = true;
+			}
+
+			if (
+				node.type === 'Identifier' &&
+				isReference(node, parent) &&
+				node.name === 'arguments'
+			) {
+				result = true;
+			}
+		},
+	});
+
+	return result;
+}
diff --git a/src/validate/js/utils/FuzzySet.js b/src/validate/utils/FuzzySet.ts
similarity index 80%
rename from src/validate/js/utils/FuzzySet.js
rename to src/validate/utils/FuzzySet.ts
index f4b5d6502c..1973d3ff83 100644
--- a/src/validate/js/utils/FuzzySet.js
+++ b/src/validate/utils/FuzzySet.ts
@@ -1,12 +1,19 @@
-// adapted from https://github.com/Glench/this.js/blob/master/lib/this.js
+// adapted from https://github.com/Glench/fuzzyset.js/blob/master/lib/fuzzyset.js
 // BSD Licensed
 
-export default function FuzzySet (arr, useLevenshtein, gramSizeLower, gramSizeUpper) {
+export default function FuzzySet(
+	arr,
+	useLevenshtein,
+	gramSizeLower,
+	gramSizeUpper
+) {
 	// default options
 	arr = arr || [];
 	this.gramSizeLower = gramSizeLower || 2;
 	this.gramSizeUpper = gramSizeUpper || 3;
-	this.useLevenshtein = (typeof useLevenshtein !== 'boolean') ? true : useLevenshtein;
+	this.useLevenshtein = typeof useLevenshtein !== 'boolean'
+		? true
+		: useLevenshtein;
 
 	// define all the object functions and attributes
 	this.exactSet = {};
@@ -14,7 +21,7 @@ export default function FuzzySet (arr, useLevenshtein, gramSizeLower, gramSizeUp
 	this.items = {};
 
 	// helper functions
-	function levenshtein ( str1, str2 ) {
+	function levenshtein(str1, str2) {
 		const current = [];
 		let prev;
 		let value;
@@ -40,10 +47,12 @@ export default function FuzzySet (arr, useLevenshtein, gramSizeLower, gramSizeUp
 	}
 
 	// return an edit distance from 0 to 1
-	function _distance (str1, str2) {
-		if (str1 === null && str2 === null) throw 'Trying to compare two null values';
+	function _distance(str1, str2) {
+		if (str1 === null && str2 === null)
+			throw 'Trying to compare two null values';
 		if (str1 === null || str2 === null) return 0;
-		str1 = String(str1); str2 = String(str2);
+		str1 = String(str1);
+		str2 = String(str2);
 
 		const distance = levenshtein(str1, str2);
 		if (str1.length > str2.length) {
@@ -55,7 +64,7 @@ export default function FuzzySet (arr, useLevenshtein, gramSizeLower, gramSizeUp
 
 	const _nonWordRe = /[^\w, ]+/;
 
-	function _iterateGrams (value, gramSize) {
+	function _iterateGrams(value, gramSize) {
 		gramSize = gramSize || 2;
 		const simplified = '-' + value.toLowerCase().replace(_nonWordRe, '') + '-';
 		const lenDiff = gramSize - simplified.length;
@@ -72,7 +81,7 @@ export default function FuzzySet (arr, useLevenshtein, gramSizeLower, gramSizeUp
 		return results;
 	}
 
-	function _gramCounter (value, gramSize) {
+	function _gramCounter(value, gramSize) {
 		// return an object where key=gram, value=number of occurrences
 		gramSize = gramSize || 2;
 		const result = {};
@@ -90,7 +99,7 @@ export default function FuzzySet (arr, useLevenshtein, gramSizeLower, gramSizeUp
 	}
 
 	// the main functions
-	this.get = function (value, defaultValue) {
+	this.get = function(value, defaultValue) {
 		// check for value in set, returning defaultValue or null if none found
 		const result = this._get(value);
 		if (!result && typeof defaultValue !== 'undefined') {
@@ -99,7 +108,7 @@ export default function FuzzySet (arr, useLevenshtein, gramSizeLower, gramSizeUp
 		return result;
 	};
 
-	this._get = function (value) {
+	this._get = function(value) {
 		const normalizedValue = this._normalizeStr(value);
 		const result = this.exactSet[normalizedValue];
 
@@ -109,7 +118,11 @@ export default function FuzzySet (arr, useLevenshtein, gramSizeLower, gramSizeUp
 
 		let results = [];
 		// start with high gram size and if there are no results, go to lower gram sizes
-		for (let gramSize = this.gramSizeUpper; gramSize >= this.gramSizeLower; --gramSize) {
+		for (
+			let gramSize = this.gramSizeUpper;
+			gramSize >= this.gramSizeLower;
+			--gramSize
+		) {
 			results = this.__get(value, gramSize);
 			if (results) {
 				return results;
@@ -118,7 +131,7 @@ export default function FuzzySet (arr, useLevenshtein, gramSizeLower, gramSizeUp
 		return null;
 	};
 
-	this.__get = function (value, gramSize) {
+	this.__get = function(value, gramSize) {
 		const normalizedValue = this._normalizeStr(value);
 		const matches = {};
 		const gramCounts = _gramCounter(normalizedValue, gramSize);
@@ -146,10 +159,9 @@ export default function FuzzySet (arr, useLevenshtein, gramSizeLower, gramSizeUp
 			}
 		}
 
-		function isEmptyObject ( obj ) {
-			for ( const prop in obj ) {
-				if ( obj.hasOwnProperty( prop ) )
-					return false;
+		function isEmptyObject(obj) {
+			for (const prop in obj) {
+				if (obj.hasOwnProperty(prop)) return false;
 			}
 			return true;
 		}
@@ -165,9 +177,12 @@ export default function FuzzySet (arr, useLevenshtein, gramSizeLower, gramSizeUp
 		// build a results list of [score, str]
 		for (const matchIndex in matches) {
 			matchScore = matches[matchIndex];
-			results.push([matchScore / (vectorNormal * items[matchIndex][0]), items[matchIndex][1]]);
+			results.push([
+				matchScore / (vectorNormal * items[matchIndex][0]),
+				items[matchIndex][1],
+			]);
 		}
-		function sortDescending (a, b) {
+		function sortDescending(a, b) {
 			if (a[0] < b[0]) {
 				return 1;
 			} else if (a[0] > b[0]) {
@@ -183,7 +198,10 @@ export default function FuzzySet (arr, useLevenshtein, gramSizeLower, gramSizeUp
 			const endIndex = Math.min(50, results.length);
 			// truncate somewhat arbitrarily to 50
 			for (let i = 0; i < endIndex; ++i) {
-				newResults.push([_distance(results[i][1], normalizedValue), results[i][1]]);
+				newResults.push([
+					_distance(results[i][1], normalizedValue),
+					results[i][1],
+				]);
 			}
 			results = newResults;
 			results.sort(sortDescending);
@@ -197,7 +215,7 @@ export default function FuzzySet (arr, useLevenshtein, gramSizeLower, gramSizeUp
 		return newResults;
 	};
 
-	this.add = function (value) {
+	this.add = function(value) {
 		const normalizedValue = this._normalizeStr(value);
 		if (normalizedValue in this.exactSet) {
 			return false;
@@ -209,7 +227,7 @@ export default function FuzzySet (arr, useLevenshtein, gramSizeLower, gramSizeUp
 		}
 	};
 
-	this._add = function (value, gramSize) {
+	this._add = function(value, gramSize) {
 		const normalizedValue = this._normalizeStr(value);
 		const items = this.items[gramSize] || [];
 		const index = items.length;
@@ -235,13 +253,14 @@ export default function FuzzySet (arr, useLevenshtein, gramSizeLower, gramSizeUp
 		this.exactSet[normalizedValue] = value;
 	};
 
-	this._normalizeStr = function (str) {
-		if (Object.prototype.toString.call(str) !== '[object String]') throw 'Must use a string as argument to FuzzySet functions';
+	this._normalizeStr = function(str) {
+		if (Object.prototype.toString.call(str) !== '[object String]')
+			throw 'Must use a string as argument to FuzzySet functions';
 		return str.toLowerCase();
 	};
 
 	// return length of items in set
-	this.length = function () {
+	this.length = function() {
 		let count = 0;
 		let prop;
 
@@ -254,7 +273,7 @@ export default function FuzzySet (arr, useLevenshtein, gramSizeLower, gramSizeUp
 	};
 
 	// return is set is empty
-	this.isEmpty = function () {
+	this.isEmpty = function() {
 		for (const prop in this.exactSet) {
 			if (this.exactSet.hasOwnProperty(prop)) {
 				return false;
@@ -264,7 +283,7 @@ export default function FuzzySet (arr, useLevenshtein, gramSizeLower, gramSizeUp
 	};
 
 	// return list of values loaded into set
-	this.values = function () {
+	this.values = function() {
 		const values = [];
 
 		for (const prop in this.exactSet) {
@@ -275,7 +294,6 @@ export default function FuzzySet (arr, useLevenshtein, gramSizeLower, gramSizeUp
 		return values;
 	};
 
-
 	// initialization
 	let i = this.gramSizeLower;
 	for (i; i < this.gramSizeUpper + 1; ++i) {
diff --git a/src/validate/utils/fuzzymatch.ts b/src/validate/utils/fuzzymatch.ts
new file mode 100644
index 0000000000..5d70372191
--- /dev/null
+++ b/src/validate/utils/fuzzymatch.ts
@@ -0,0 +1,8 @@
+import FuzzySet from './FuzzySet';
+
+export default function fuzzymatch(name: string, names: string[]) {
+	const set = new FuzzySet(names);
+	const matches = set.get(name);
+
+	return matches && matches[0] && matches[0][0] > 0.7 ? matches[0][1] : null;
+}
diff --git a/src/validate/utils/list.ts b/src/validate/utils/list.ts
new file mode 100644
index 0000000000..785f006d19
--- /dev/null
+++ b/src/validate/utils/list.ts
@@ -0,0 +1,6 @@
+export default function list(items: string[], conjunction = 'or') {
+	if (items.length === 1) return items[0];
+	return `${items.slice(0, -1).join(', ')} ${conjunction} ${items[
+		items.length - 1
+	]}`;
+}
diff --git a/test/create/index.js b/test/create/index.js
index 8e5ac8abf4..3c2387d737 100644
--- a/test/create/index.js
+++ b/test/create/index.js
@@ -1,40 +1,39 @@
-import deindent from '../../src/utils/deindent.js';
-import assert from 'assert';
-import { svelte } from '../helpers.js';
+import assert from "assert";
+import { svelte, deindent } from "../helpers.js";
 
-describe( 'create', () => {
-	it( 'should return a component constructor', () => {
+describe("create", () => {
+	it("should return a component constructor", () => {
 		const source = deindent`
 			<div>{{prop}}</div>
 		`;
 
-		const component = svelte.create( source );
-		assert( component instanceof Function );
+		const component = svelte.create(source);
+		assert(component instanceof Function);
 	});
 
-	it( 'should throw error when source is invalid ', done => {
+	it("should throw error when source is invalid ", done => {
 		const source = deindent`
 			<div>{{prop}</div>
 		`;
 
-		const component = svelte.create( source, {
+		const component = svelte.create(source, {
 			onerror: () => {
 				done();
 			}
 		});
 
-		assert.equal( component, undefined );
+		assert.equal(component, undefined);
 	});
 
-	it( 'should return undefined when source is invalid ', () => {
+	it("should return undefined when source is invalid ", () => {
 		const source = deindent`
 			<div>{{prop}</div>
 		`;
 
-		const component = svelte.create( source, {
+		const component = svelte.create(source, {
 			onerror: () => {}
 		});
 
-		assert.equal( component, undefined );
+		assert.equal(component, undefined);
 	});
 });
diff --git a/test/css/index.js b/test/css/index.js
index cbbec99d36..51cf1b4aba 100644
--- a/test/css/index.js
+++ b/test/css/index.js
@@ -1,25 +1,41 @@
-import assert from 'assert';
-import * as fs from 'fs';
-import { svelte, exists } from '../helpers.js';
+import assert from "assert";
+import * as fs from "fs";
+import { svelte } from "../helpers.js";
 
-describe( 'css', () => {
-	fs.readdirSync( 'test/css/samples' ).forEach( dir => {
-		if ( dir[0] === '.' ) return;
+function tryRequire(file) {
+	try {
+		return require(file).default;
+	} catch (err) {
+		if (err.code !== "MODULE_NOT_FOUND") throw err;
+		return null;
+	}
+}
 
-		const solo = exists( `test/css/samples/${dir}/solo` );
+describe("css", () => {
+	fs.readdirSync("test/css/samples").forEach(dir => {
+		if (dir[0] === ".") return;
 
-		if ( solo && process.env.CI ) {
-			throw new Error( 'Forgot to remove `solo: true` from test' );
+		// add .solo to a sample directory name to only run that test
+		const solo = /\.solo/.test(dir);
+
+		if (solo && process.env.CI) {
+			throw new Error("Forgot to remove `solo: true` from test");
 		}
 
-		( solo ? it.only : it )( dir, () => {
-			const input = fs.readFileSync( `test/css/samples/${dir}/input.html`, 'utf-8' ).replace( /\s+$/, '' );
+		(solo ? it.only : it)(dir, () => {
+			const config = tryRequire(`./samples/${dir}/_config.js`) || {};
+			const input = fs
+				.readFileSync(`test/css/samples/${dir}/input.html`, "utf-8")
+				.replace(/\s+$/, "");
 
-			const actual = svelte.compile( input ).css;
-			fs.writeFileSync( `test/css/samples/${dir}/_actual.css`, actual );
-			const expected = fs.readFileSync( `test/css/samples/${dir}/expected.css`, 'utf-8' );
+			const actual = svelte.compile(input, config).css;
+			fs.writeFileSync(`test/css/samples/${dir}/_actual.css`, actual);
+			const expected = fs.readFileSync(
+				`test/css/samples/${dir}/expected.css`,
+				"utf-8"
+			);
 
-			assert.equal( actual.trim(), expected.trim() );
+			assert.equal(actual.trim(), expected.trim());
 		});
 	});
 });
diff --git a/test/css/samples/basic/expected.css b/test/css/samples/basic/expected.css
index ee9575d9a8..0d52d6d95f 100644
--- a/test/css/samples/basic/expected.css
+++ b/test/css/samples/basic/expected.css
@@ -1,4 +1,4 @@
 
-	div[svelte-281576708], [svelte-281576708] div {
+	div[svelte-2278551596], [svelte-2278551596] div {
 		color: red;
 	}
diff --git a/test/css/samples/cascade-false-global-keyframes/_config.js b/test/css/samples/cascade-false-global-keyframes/_config.js
new file mode 100644
index 0000000000..b37866f9b6
--- /dev/null
+++ b/test/css/samples/cascade-false-global-keyframes/_config.js
@@ -0,0 +1,3 @@
+export default {
+	cascade: false
+};
\ No newline at end of file
diff --git a/test/css/samples/cascade-false-global-keyframes/expected.css b/test/css/samples/cascade-false-global-keyframes/expected.css
new file mode 100644
index 0000000000..042db53426
--- /dev/null
+++ b/test/css/samples/cascade-false-global-keyframes/expected.css
@@ -0,0 +1,13 @@
+
+	@keyframes why {
+		0% { color: red; }
+		100% { color: blue; }
+	}
+
+	.animated[svelte-90785995] {
+		animation: why 2s;
+	}
+
+	.also-animated[svelte-90785995] {
+		animation: not-defined-here 2s;
+	}
diff --git a/test/css/samples/cascade-false-global-keyframes/input.html b/test/css/samples/cascade-false-global-keyframes/input.html
new file mode 100644
index 0000000000..3f2d568807
--- /dev/null
+++ b/test/css/samples/cascade-false-global-keyframes/input.html
@@ -0,0 +1,17 @@
+<div class='animated'>animated</div>
+<div class='also-animated'>also animated</div>
+
+<style>
+	@keyframes -global-why {
+		0% { color: red; }
+		100% { color: blue; }
+	}
+
+	.animated {
+		animation: why 2s;
+	}
+
+	.also-animated {
+		animation: not-defined-here 2s;
+	}
+</style>
\ No newline at end of file
diff --git a/test/css/samples/cascade-false-global/_config.js b/test/css/samples/cascade-false-global/_config.js
new file mode 100644
index 0000000000..b37866f9b6
--- /dev/null
+++ b/test/css/samples/cascade-false-global/_config.js
@@ -0,0 +1,3 @@
+export default {
+	cascade: false
+};
\ No newline at end of file
diff --git a/test/css/samples/cascade-false-global/expected.css b/test/css/samples/cascade-false-global/expected.css
new file mode 100644
index 0000000000..96071a3d6f
--- /dev/null
+++ b/test/css/samples/cascade-false-global/expected.css
@@ -0,0 +1,12 @@
+
+	div {
+		color: red;
+	}
+
+	div.foo {
+		color: blue;
+	}
+
+	.foo {
+		font-weight: bold;
+	}
diff --git a/test/css/samples/cascade-false-global/input.html b/test/css/samples/cascade-false-global/input.html
new file mode 100644
index 0000000000..947edb6ab5
--- /dev/null
+++ b/test/css/samples/cascade-false-global/input.html
@@ -0,0 +1,16 @@
+<div>red</div>
+<div class='foo'>bold/blue</div>
+
+<style>
+	:global(div) {
+		color: red;
+	}
+
+	:global(div.foo) {
+		color: blue;
+	}
+
+	:global(.foo) {
+		font-weight: bold;
+	}
+</style>
\ No newline at end of file
diff --git a/test/css/samples/cascade-false-keyframes/_config.js b/test/css/samples/cascade-false-keyframes/_config.js
new file mode 100644
index 0000000000..b37866f9b6
--- /dev/null
+++ b/test/css/samples/cascade-false-keyframes/_config.js
@@ -0,0 +1,3 @@
+export default {
+	cascade: false
+};
\ No newline at end of file
diff --git a/test/css/samples/cascade-false-keyframes/expected.css b/test/css/samples/cascade-false-keyframes/expected.css
new file mode 100644
index 0000000000..5377c86da7
--- /dev/null
+++ b/test/css/samples/cascade-false-keyframes/expected.css
@@ -0,0 +1,13 @@
+
+	@keyframes svelte-1647166666-why {
+		0% { color: red; }
+		100% { color: blue; }
+	}
+
+	.animated[svelte-1647166666] {
+		animation: svelte-1647166666-why 2s;
+	}
+
+	.also-animated[svelte-1647166666] {
+		animation: not-defined-here 2s;
+	}
diff --git a/test/css/samples/cascade-false-keyframes/input.html b/test/css/samples/cascade-false-keyframes/input.html
new file mode 100644
index 0000000000..ba220a5e22
--- /dev/null
+++ b/test/css/samples/cascade-false-keyframes/input.html
@@ -0,0 +1,17 @@
+<div class='animated'>animated</div>
+<div class='also-animated'>also animated</div>
+
+<style>
+	@keyframes why {
+		0% { color: red; }
+		100% { color: blue; }
+	}
+
+	.animated {
+		animation: why 2s;
+	}
+
+	.also-animated {
+		animation: not-defined-here 2s;
+	}
+</style>
\ No newline at end of file
diff --git a/test/css/samples/cascade-false-pseudo-element/_config.js b/test/css/samples/cascade-false-pseudo-element/_config.js
new file mode 100644
index 0000000000..b37866f9b6
--- /dev/null
+++ b/test/css/samples/cascade-false-pseudo-element/_config.js
@@ -0,0 +1,3 @@
+export default {
+	cascade: false
+};
\ No newline at end of file
diff --git a/test/css/samples/cascade-false-pseudo-element/expected.css b/test/css/samples/cascade-false-pseudo-element/expected.css
new file mode 100644
index 0000000000..3488839c46
--- /dev/null
+++ b/test/css/samples/cascade-false-pseudo-element/expected.css
@@ -0,0 +1,12 @@
+
+	span[svelte-2146001331]::after {
+		content: 'i am a pseudo-element';
+	}
+
+	span[svelte-2146001331]:first-child {
+		color: red;
+	}
+
+	span[svelte-2146001331]:last-child::after {
+		color: blue;
+	}
diff --git a/test/css/samples/cascade-false-pseudo-element/input.html b/test/css/samples/cascade-false-pseudo-element/input.html
new file mode 100644
index 0000000000..16be3071f9
--- /dev/null
+++ b/test/css/samples/cascade-false-pseudo-element/input.html
@@ -0,0 +1,15 @@
+<span></span>
+
+<style>
+	span::after {
+		content: 'i am a pseudo-element';
+	}
+
+	span:first-child {
+		color: red;
+	}
+
+	span:last-child::after {
+		color: blue;
+	}
+</style>
\ No newline at end of file
diff --git a/test/css/samples/cascade-false/_config.js b/test/css/samples/cascade-false/_config.js
new file mode 100644
index 0000000000..b37866f9b6
--- /dev/null
+++ b/test/css/samples/cascade-false/_config.js
@@ -0,0 +1,3 @@
+export default {
+	cascade: false
+};
\ No newline at end of file
diff --git a/test/css/samples/cascade-false/expected.css b/test/css/samples/cascade-false/expected.css
new file mode 100644
index 0000000000..373c5aefed
--- /dev/null
+++ b/test/css/samples/cascade-false/expected.css
@@ -0,0 +1,12 @@
+
+	div[svelte-781920915] {
+		color: red;
+	}
+
+	div.foo[svelte-781920915] {
+		color: blue;
+	}
+
+	.foo[svelte-781920915] {
+		font-weight: bold;
+	}
diff --git a/test/css/samples/cascade-false/input.html b/test/css/samples/cascade-false/input.html
new file mode 100644
index 0000000000..f56b586ef8
--- /dev/null
+++ b/test/css/samples/cascade-false/input.html
@@ -0,0 +1,16 @@
+<div>red</div>
+<div class='foo'>bold/blue</div>
+
+<style>
+	div {
+		color: red;
+	}
+
+	div.foo {
+		color: blue;
+	}
+
+	.foo {
+		font-weight: bold;
+	}
+</style>
\ No newline at end of file
diff --git a/test/css/samples/keyframes/expected.css b/test/css/samples/keyframes/expected.css
new file mode 100644
index 0000000000..c7d8540bdd
--- /dev/null
+++ b/test/css/samples/keyframes/expected.css
@@ -0,0 +1,9 @@
+
+	@keyframes svelte-2931302006-why {
+		0% { color: red; }
+		100% { color: blue; }
+	}
+
+	[svelte-2931302006].animated, [svelte-2931302006] .animated {
+		animation: svelte-2931302006-why 2s;
+	}
diff --git a/test/css/samples/keyframes/input.html b/test/css/samples/keyframes/input.html
new file mode 100644
index 0000000000..b4d120f34f
--- /dev/null
+++ b/test/css/samples/keyframes/input.html
@@ -0,0 +1,12 @@
+<div class='animated'>animated</div>
+
+<style>
+	@keyframes why {
+		0% { color: red; }
+		100% { color: blue; }
+	}
+
+	.animated {
+		animation: why 2s;
+	}
+</style>
\ No newline at end of file
diff --git a/test/css/samples/media-query/expected.css b/test/css/samples/media-query/expected.css
new file mode 100644
index 0000000000..cecc50d860
--- /dev/null
+++ b/test/css/samples/media-query/expected.css
@@ -0,0 +1,6 @@
+
+	@media (min-width: 400px) {
+		[svelte-411199634].large-screen, [svelte-411199634] .large-screen {
+			display: block;
+		}
+	}
diff --git a/test/css/samples/media-query/input.html b/test/css/samples/media-query/input.html
new file mode 100644
index 0000000000..d5465ab4f9
--- /dev/null
+++ b/test/css/samples/media-query/input.html
@@ -0,0 +1,9 @@
+<div class='large-screen'>animated</div>
+
+<style>
+	@media (min-width: 400px) {
+		.large-screen {
+			display: block;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/test/formats/index.js b/test/formats/index.js
index b7fb5e444a..9d62bb712f 100644
--- a/test/formats/index.js
+++ b/test/formats/index.js
@@ -1,88 +1,93 @@
-import deindent from '../../src/utils/deindent.js';
-import assert from 'assert';
-import { svelte, env, setupHtmlEqual } from '../helpers.js';
+import assert from "assert";
+import { svelte, deindent, env, setupHtmlEqual } from "../helpers.js";
 
-function testAmd ( code, expectedId, dependencies, html ) {
-	const fn = new Function( 'define', code );
+function testAmd(code, expectedId, dependencies, html) {
+	const fn = new Function("define", code);
 
-	return env().then( window => {
-		function define ( id, deps, factory ) {
-			assert.equal( id, expectedId );
-			assert.deepEqual( deps, Object.keys( dependencies ) );
+	return env().then(window => {
+		function define(id, deps, factory) {
+			assert.equal(id, expectedId);
+			assert.deepEqual(deps, Object.keys(dependencies));
 
-			const SvelteComponent = factory( ...Object.keys( dependencies ).map( key => dependencies[ key ] ) );
+			const SvelteComponent = factory(
+				...Object.keys(dependencies).map(key => dependencies[key])
+			);
 
-			const main = window.document.body.querySelector( 'main' );
+			const main = window.document.body.querySelector("main");
 			const component = new SvelteComponent({ target: main });
 
-			assert.htmlEqual( main.innerHTML, html );
+			assert.htmlEqual(main.innerHTML, html);
 
 			component.destroy();
 		}
 
 		define.amd = true;
 
-		fn( define );
+		fn(define);
 	});
 }
 
-function testCjs ( code, dependencyById, html ) {
-	const fn = new Function( 'module', 'exports', 'require', code );
+function testCjs(code, dependencyById, html) {
+	const fn = new Function("module", "exports", "require", code);
 
-	return env().then( window => {
+	return env().then(window => {
 		const module = { exports: {} };
 		const require = id => {
-			return dependencyById[ id ];
+			return dependencyById[id];
 		};
 
-		fn( module, module.exports, require );
+		fn(module, module.exports, require);
 
 		const SvelteComponent = module.exports;
 
-		const main = window.document.body.querySelector( 'main' );
+		const main = window.document.body.querySelector("main");
 		const component = new SvelteComponent({ target: main });
 
-		assert.htmlEqual( main.innerHTML, html );
+		assert.htmlEqual(main.innerHTML, html);
 
 		component.destroy();
 	});
 }
 
-function testIife ( code, name, globals, html ) {
-	const fn = new Function( Object.keys( globals ), `${code}\n\nreturn ${name};` );
+function testIife(code, name, globals, html) {
+	const fn = new Function(Object.keys(globals), `${code}\n\nreturn ${name};`);
 
-	return env().then( window => {
-		const SvelteComponent = fn( ...Object.keys( globals ).map( key => globals[ key ] ) );
+	return env().then(window => {
+		const SvelteComponent = fn(
+			...Object.keys(globals).map(key => globals[key])
+		);
 
-		const main = window.document.body.querySelector( 'main' );
+		const main = window.document.body.querySelector("main");
 		const component = new SvelteComponent({ target: main });
 
-		assert.htmlEqual( main.innerHTML, html );
+		assert.htmlEqual(main.innerHTML, html);
 
 		component.destroy();
 	});
 }
 
-function testEval ( code, name, globals, html ) {
-	const fn = new Function( Object.keys( globals ), `return ${code};` );
+function testEval(code, name, globals, html) {
+	const fn = new Function(Object.keys(globals), `return ${code};`);
 
-	return env().then( window => {
-		const SvelteComponent = fn( ...Object.keys( globals ).map( key => globals[ key ] ) );
+	return env().then(window => {
+		const SvelteComponent = fn(
+			...Object.keys(globals).map(key => globals[key])
+		);
 
-		const main = window.document.body.querySelector( 'main' );
+		const main = window.document.body.querySelector("main");
 		const component = new SvelteComponent({ target: main });
 
-		assert.htmlEqual( main.innerHTML, html );
+		assert.htmlEqual(main.innerHTML, html);
 
 		component.destroy();
 	});
 }
 
-describe( 'formats', () => {
-	before( setupHtmlEqual );
+describe("formats", () => {
+	before(setupHtmlEqual);
 
-	describe( 'amd', () => {
-		it( 'generates an AMD module', () => {
+	describe("amd", () => {
+		it("generates an AMD module", () => {
 			const source = deindent`
 				<div>{{answer}}</div>
 
@@ -97,17 +102,17 @@ describe( 'formats', () => {
 				</script>
 			`;
 
-			const { code } = svelte.compile( source, {
-				format: 'amd',
-				amd: { id: 'foo' }
+			const { code } = svelte.compile(source, {
+				format: "amd",
+				amd: { id: "foo" }
 			});
 
-			return testAmd( code, 'foo', { answer: 42 }, `<div>42</div>` );
+			return testAmd(code, "foo", { answer: 42 }, `<div>42</div>`);
 		});
 	});
 
-	describe( 'cjs', () => {
-		it( 'generates a CommonJS module', () => {
+	describe("cjs", () => {
+		it("generates a CommonJS module", () => {
 			const source = deindent`
 				<div>{{answer}}</div>
 
@@ -122,16 +127,16 @@ describe( 'formats', () => {
 				</script>
 			`;
 
-			const { code } = svelte.compile( source, {
-				format: 'cjs'
+			const { code } = svelte.compile(source, {
+				format: "cjs"
 			});
 
-			return testCjs( code, { answer: 42 }, `<div>42</div>` );
+			return testCjs(code, { answer: 42 }, `<div>42</div>`);
 		});
 	});
 
-	describe( 'iife', () => {
-		it( 'generates a self-executing script', () => {
+	describe("iife", () => {
+		it("generates a self-executing script", () => {
 			const source = deindent`
 				<div>{{answer}}</div>
 
@@ -146,20 +151,20 @@ describe( 'formats', () => {
 				</script>
 			`;
 
-			const { code } = svelte.compile( source, {
-				format: 'iife',
-				name: 'Foo',
+			const { code } = svelte.compile(source, {
+				format: "iife",
+				name: "Foo",
 				globals: {
-					answer: 'answer'
+					answer: "answer"
 				}
 			});
 
-			return testIife( code, 'Foo', { answer: 42 }, `<div>42</div>` );
+			return testIife(code, "Foo", { answer: 42 }, `<div>42</div>`);
 		});
 	});
 
-	describe( 'umd', () => {
-		it( 'generates a UMD build', () => {
+	describe("umd", () => {
+		it("generates a UMD build", () => {
 			const source = deindent`
 				<div>{{answer}}</div>
 
@@ -174,25 +179,25 @@ describe( 'formats', () => {
 				</script>
 			`;
 
-			const { code } = svelte.compile( source, {
-				format: 'umd',
-				name: 'Foo',
+			const { code } = svelte.compile(source, {
+				format: "umd",
+				name: "Foo",
 				globals: {
-					answer: 'answer'
+					answer: "answer"
 				},
 				amd: {
-					id: 'foo'
+					id: "foo"
 				}
 			});
 
-			return testAmd( code, 'foo', { answer: 42 }, `<div>42</div>` )
-				.then( () => testCjs( code, { answer: 42 }, `<div>42</div>` ) )
-				.then( () => testIife( code, 'Foo', { answer: 42 }, `<div>42</div>` ) );
+			return testAmd(code, "foo", { answer: 42 }, `<div>42</div>`)
+				.then(() => testCjs(code, { answer: 42 }, `<div>42</div>`))
+				.then(() => testIife(code, "Foo", { answer: 42 }, `<div>42</div>`));
 		});
 	});
 
-	describe( 'eval', () => {
-		it( 'generates a self-executing script that returns the component on eval', () => {
+	describe("eval", () => {
+		it("generates a self-executing script that returns the component on eval", () => {
 			const source = deindent`
 				<div>{{answer}}</div>
 
@@ -207,14 +212,14 @@ describe( 'formats', () => {
 				</script>
 			`;
 
-			const { code } = svelte.compile( source, {
-				format: 'eval',
+			const { code } = svelte.compile(source, {
+				format: "eval",
 				globals: {
-					answer: 'answer'
+					answer: "answer"
 				}
 			});
 
-			return testEval( code, 'Foo', { answer: 42 }, `<div>42</div>` );
+			return testEval(code, "Foo", { answer: 42 }, `<div>42</div>`);
 		});
 	});
 });
diff --git a/test/helpers.js b/test/helpers.js
index 4318d6d364..8d9cd3a660 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -1,6 +1,9 @@
 import jsdom from 'jsdom';
 import assert from 'assert';
-import * as fs from 'fs';
+import glob from 'glob';
+import fs from 'fs';
+import path from 'path';
+import chalk from 'chalk';
 
 import * as consoleGroup from 'console-group';
 consoleGroup.install();
@@ -10,127 +13,134 @@ sourceMapSupport.install();
 
 // for coverage purposes, we need to test source files,
 // but for sanity purposes, we need to test dist files
-export function loadSvelte ( test ) {
-	if ( test ) global.__svelte_test = true;
+export function loadSvelte(test) {
+	if (test) global.__svelte_test = true;
 
-	const resolved = process.env.COVERAGE ?
-		require.resolve( '../src/index.js' ) :
-		require.resolve( '../compiler/svelte.js' );
+	const resolved = process.env.COVERAGE
+		? require.resolve('../src/index.js')
+		: require.resolve('../compiler/svelte.js');
 
-	delete require.cache[ resolved ];
-	return require( resolved );
+	delete require.cache[resolved];
+	return require(resolved);
 }
 
 export const svelte = loadSvelte();
 
-export function exists ( path ) {
+export function exists(path) {
 	try {
-		fs.statSync( path );
+		fs.statSync(path);
 		return true;
-	} catch ( err ) {
+	} catch (err) {
 		return false;
 	}
 }
 
-export function tryToLoadJson ( file ) {
+export function tryToLoadJson(file) {
 	try {
-		return JSON.parse( fs.readFileSync( file ) );
-	} catch ( err ) {
-		if ( err.code !== 'ENOENT' ) throw err;
+		return JSON.parse(fs.readFileSync(file));
+	} catch (err) {
+		if (err.code !== 'ENOENT') throw err;
 		return null;
 	}
 }
 
-export function tryToReadFile ( file ) {
+export function tryToReadFile(file) {
 	try {
-		return fs.readFileSync( file, 'utf-8' );
-	} catch ( err ) {
-		if ( err.code !== 'ENOENT' ) throw err;
+		return fs.readFileSync(file, 'utf-8');
+	} catch (err) {
+		if (err.code !== 'ENOENT') throw err;
 		return null;
 	}
 }
 
-export function env () {
-	return new Promise( ( fulfil, reject ) => {
-		jsdom.env( '<main></main>', ( err, window ) => {
-			if ( err ) {
-				reject( err );
+export function env() {
+	return new Promise((fulfil, reject) => {
+		jsdom.env('<main></main>', (err, window) => {
+			if (err) {
+				reject(err);
 			} else {
 				global.document = window.document;
-				fulfil( window );
+				fulfil(window);
 			}
 		});
 	});
 }
 
-function cleanChildren ( node ) {
+function cleanChildren(node) {
 	let previous = null;
 
-	[ ...node.childNodes ].forEach( child => {
-		if ( child.nodeType === 8 ) {
+	[...node.childNodes].forEach(child => {
+		if (child.nodeType === 8) {
 			// comment
-			node.removeChild( child );
+			node.removeChild(child);
 			return;
 		}
 
-		if ( child.nodeType === 3 ) {
-			if ( node.namespaceURI === 'http://www.w3.org/2000/svg' && node.tagName !== 'text' && node.tagName !== 'tspan' ) {
-				node.removeChild( child );
+		if (child.nodeType === 3) {
+			if (
+				node.namespaceURI === 'http://www.w3.org/2000/svg' &&
+				node.tagName !== 'text' &&
+				node.tagName !== 'tspan'
+			) {
+				node.removeChild(child);
 			}
 
-			child.data = child.data.replace( /\s{2,}/, '\n' );
+			child.data = child.data.replace(/\s{2,}/, '\n');
 
 			// text
-			if ( previous && previous.nodeType === 3 ) {
+			if (previous && previous.nodeType === 3) {
 				previous.data += child.data;
-				previous.data = previous.data.replace( /\s{2,}/, '\n' );
+				previous.data = previous.data.replace(/\s{2,}/, '\n');
 
-				node.removeChild( child );
+				node.removeChild(child);
+				child = previous;
 			}
-		}
-
-		else {
-			cleanChildren( child );
+		} else {
+			cleanChildren(child);
 		}
 
 		previous = child;
 	});
 
 	// collapse whitespace
-	if ( node.firstChild && node.firstChild.nodeType === 3 ) {
-		node.firstChild.data = node.firstChild.data.replace( /^\s+/, '' );
-		if ( !node.firstChild.data ) node.removeChild( node.firstChild );
+	if (node.firstChild && node.firstChild.nodeType === 3) {
+		node.firstChild.data = node.firstChild.data.replace(/^\s+/, '');
+		if (!node.firstChild.data) node.removeChild(node.firstChild);
 	}
 
-	if ( node.lastChild && node.lastChild.nodeType === 3 ) {
-		node.lastChild.data = node.lastChild.data.replace( /\s+$/, '' );
-		if ( !node.lastChild.data ) node.removeChild( node.lastChild );
+	if (node.lastChild && node.lastChild.nodeType === 3) {
+		node.lastChild.data = node.lastChild.data.replace(/\s+$/, '');
+		if (!node.lastChild.data) node.removeChild(node.lastChild);
 	}
 }
 
-export function setupHtmlEqual () {
-	return env().then( window => {
-		assert.htmlEqual = ( actual, expected, message ) => {
-			window.document.body.innerHTML = actual.replace( />[\s\r\n]+</g, '><' ).trim();
-			cleanChildren( window.document.body, '' );
+export function setupHtmlEqual() {
+	return env().then(window => {
+		assert.htmlEqual = (actual, expected, message) => {
+			window.document.body.innerHTML = actual
+				.replace(/>[\s\r\n]+</g, '><')
+				.trim();
+			cleanChildren(window.document.body, '');
 			actual = window.document.body.innerHTML;
 
-			window.document.body.innerHTML = expected.replace( />[\s\r\n]+</g, '><' ).trim();
-			cleanChildren( window.document.body, '' );
+			window.document.body.innerHTML = expected
+				.replace(/>[\s\r\n]+</g, '><')
+				.trim();
+			cleanChildren(window.document.body, '');
 			expected = window.document.body.innerHTML;
 
-			assert.deepEqual( actual, expected, message );
+			assert.deepEqual(actual, expected, message);
 		};
 	});
 }
 
-export function loadConfig ( file ) {
+export function loadConfig(file) {
 	try {
-		const resolved = require.resolve( file );
-		delete require.cache[ resolved ];
-		return require( resolved ).default;
-	} catch ( err ) {
-		if ( err.code === 'E_NOT_FOUND' ) {
+		const resolved = require.resolve(file);
+		delete require.cache[resolved];
+		return require(resolved).default;
+	} catch (err) {
+		if (err.code === 'E_NOT_FOUND') {
 			return {};
 		}
 
@@ -138,11 +148,85 @@ export function loadConfig ( file ) {
 	}
 }
 
-export function addLineNumbers ( code ) {
-	return code.split( '\n' ).map( ( line, i ) => {
-		i = String( i + 1 );
-		while ( i.length < 3 ) i = ` ${i}`;
+export function addLineNumbers(code) {
+	return code
+		.split('\n')
+		.map((line, i) => {
+			i = String(i + 1);
+			while (i.length < 3) i = ` ${i}`;
+
+			return (
+				chalk.grey(`  ${i}: `) +
+				line.replace(/^\t+/, match => match.split('\t').join('    '))
+			);
+		})
+		.join('\n');
+}
+
+function capitalise(str) {
+	return str[0].toUpperCase() + str.slice(1);
+}
+
+export function showOutput(cwd, options = {}) {
+	glob.sync('**/*.html', { cwd }).forEach(file => {
+		if (file[0] === '_') return;
+		const { code } = svelte.compile(
+			fs.readFileSync(`${cwd}/${file}`, 'utf-8'),
+			Object.assign(options, {
+				filename: file,
+				name: capitalise(path.basename(file).replace(/\.html$/, ''))
+			})
+		);
+
+		console.log( // eslint-disable-line no-console
+			`\n>> ${chalk.cyan.bold(file)}\n${addLineNumbers(code)}\n<< ${chalk.cyan.bold(file)}`
+		);
+	});
+}
+
+const start = /\n(\t+)/;
+export function deindent(strings, ...values) {
+	const indentation = start.exec(strings[0])[1];
+	const pattern = new RegExp(`^${indentation}`, 'gm');
+
+	let result = strings[0].replace(start, '').replace(pattern, '');
+
+	let trailingIndentation = getTrailingIndentation(result);
+
+	for (let i = 1; i < strings.length; i += 1) {
+		let expression = values[i - 1];
+		const string = strings[i].replace(pattern, '');
+
+		if (Array.isArray(expression)) {
+			expression = expression.length ? expression.join('\n') : null;
+		}
+
+		if (expression || expression === '') {
+			const value = String(expression).replace(
+				/\n/g,
+				`\n${trailingIndentation}`
+			);
+			result += value + string;
+		} else {
+			let c = result.length;
+			while (/\s/.test(result[c - 1])) c -= 1;
+			result = result.slice(0, c) + string;
+		}
+
+		trailingIndentation = getTrailingIndentation(result);
+	}
+
+	return result.trim().replace(/\t+$/gm, '');
+}
+
+function getTrailingIndentation(str) {
+	let i = str.length;
+	while (str[i - 1] === ' ' || str[i - 1] === '\t') i -= 1;
+	return str.slice(i, str.length);
+}
 
-		return `${i}: ${line.replace( /^\t+/, match => match.split( '\t' ).join( '    ' ) )}`;
-	}).join( '\n' );
+export function spaces(i) {
+	let result = '';
+	while (i--) result += ' ';
+	return result;
 }
diff --git a/test/hydration/index.js b/test/hydration/index.js
new file mode 100644
index 0000000000..1e291ed6b1
--- /dev/null
+++ b/test/hydration/index.js
@@ -0,0 +1,105 @@
+import assert from 'assert';
+import path from 'path';
+import fs from 'fs';
+
+import {
+	showOutput,
+	loadConfig,
+	loadSvelte,
+	env,
+	setupHtmlEqual
+} from '../helpers.js';
+
+let compileOptions = null;
+
+function getName(filename) {
+	const base = path.basename(filename).replace('.html', '');
+	return base[0].toUpperCase() + base.slice(1);
+}
+
+const nodeVersionMatch = /^v(\d)/.exec(process.version);
+const legacy = +nodeVersionMatch[1] < 6;
+const babelrc = require('../../package.json').babel;
+
+describe('hydration', () => {
+	before(() => {
+		const svelte = loadSvelte();
+
+		require.extensions['.html'] = function(module, filename) {
+			const options = Object.assign(
+				{ filename, name: getName(filename), hydratable: true },
+				compileOptions
+			);
+			let { code } = svelte.compile(fs.readFileSync(filename, 'utf-8'), options);
+
+			if (legacy) code = require('babel-core').transform(code, babelrc).code;
+
+			return module._compile(code, filename);
+		};
+
+		return setupHtmlEqual();
+	});
+
+	function runTest(dir) {
+		if (dir[0] === '.') return;
+
+		const config = loadConfig(`./hydration/samples/${dir}/_config.js`);
+
+		if (config.solo && process.env.CI) {
+			throw new Error('Forgot to remove `solo: true` from test');
+		}
+
+		(config.skip ? it.skip : config.solo ? it.only : it)(dir, () => {
+			const cwd = path.resolve(`test/hydration/samples/${dir}`);
+
+			compileOptions = config.compileOptions || {};
+			compileOptions.shared = path.resolve('shared.js');
+			compileOptions.dev = config.dev;
+			compileOptions.hydrate = true;
+
+			return env()
+				.then(window => {
+					global.window = window;
+
+					let SvelteComponent;
+
+					try {
+						SvelteComponent = require(`${cwd}/main.html`).default;
+					} catch (err) {
+						throw err;
+					}
+
+					const target = window.document.body;
+					target.innerHTML = fs.readFileSync(`${cwd}/_before.html`, 'utf-8');
+
+					const snapshot = config.snapshot ? config.snapshot(target) : {};
+
+					const component = new SvelteComponent({
+						target,
+						hydrate: true,
+						data: config.data
+					});
+
+					assert.htmlEqual(target.innerHTML, fs.readFileSync(`${cwd}/_after.html`, 'utf-8'));
+
+					if (config.test) {
+						config.test(assert, target, snapshot, component, window);
+					} else {
+						component.destroy();
+						assert.equal(target.innerHTML, '');
+					}
+				})
+				.catch(err => {
+					showOutput(cwd, { shared: 'svelte/shared.js' }); // eslint-disable-line no-console
+					throw err;
+				})
+				.then(() => {
+					if (config.show) showOutput(cwd, { shared: 'svelte/shared.js' });
+				});
+		});
+	}
+
+	fs.readdirSync('test/hydration/samples').forEach(dir => {
+		runTest(dir, null);
+	});
+});
diff --git a/test/hydration/samples/basic/_after.html b/test/hydration/samples/basic/_after.html
new file mode 100644
index 0000000000..efe5048cbc
--- /dev/null
+++ b/test/hydration/samples/basic/_after.html
@@ -0,0 +1 @@
+<h1>Hello world!</h1>
\ No newline at end of file
diff --git a/test/hydration/samples/basic/_before.html b/test/hydration/samples/basic/_before.html
new file mode 100644
index 0000000000..efe5048cbc
--- /dev/null
+++ b/test/hydration/samples/basic/_before.html
@@ -0,0 +1 @@
+<h1>Hello world!</h1>
\ No newline at end of file
diff --git a/test/hydration/samples/basic/_config.js b/test/hydration/samples/basic/_config.js
new file mode 100644
index 0000000000..79d91d0d8a
--- /dev/null
+++ b/test/hydration/samples/basic/_config.js
@@ -0,0 +1,17 @@
+export default {
+	snapshot(target) {
+		const h1 = target.querySelector('h1');
+
+		return {
+			h1,
+			text: h1.childNodes[0]
+		};
+	},
+
+	test(assert, target, snapshot) {
+		const h1 = target.querySelector('h1');
+
+		assert.equal(h1, snapshot.h1);
+		assert.equal(h1.childNodes[0], snapshot.text);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/basic/main.html b/test/hydration/samples/basic/main.html
new file mode 100644
index 0000000000..efe5048cbc
--- /dev/null
+++ b/test/hydration/samples/basic/main.html
@@ -0,0 +1 @@
+<h1>Hello world!</h1>
\ No newline at end of file
diff --git a/test/hydration/samples/binding-input/_after.html b/test/hydration/samples/binding-input/_after.html
new file mode 100644
index 0000000000..be17352b0d
--- /dev/null
+++ b/test/hydration/samples/binding-input/_after.html
@@ -0,0 +1,2 @@
+<input>
+<p>Hello world!</p>
\ No newline at end of file
diff --git a/test/hydration/samples/binding-input/_before.html b/test/hydration/samples/binding-input/_before.html
new file mode 100644
index 0000000000..be17352b0d
--- /dev/null
+++ b/test/hydration/samples/binding-input/_before.html
@@ -0,0 +1,2 @@
+<input>
+<p>Hello world!</p>
\ No newline at end of file
diff --git a/test/hydration/samples/binding-input/_config.js b/test/hydration/samples/binding-input/_config.js
new file mode 100644
index 0000000000..86ba3fe9ec
--- /dev/null
+++ b/test/hydration/samples/binding-input/_config.js
@@ -0,0 +1,29 @@
+export default {
+	data: {
+		name: 'world'
+	},
+
+	snapshot(target) {
+		return {
+			input: target.querySelector('input'),
+			p: target.querySelector('p')
+		};
+	},
+
+	test(assert, target, snapshot, component, window) {
+		const input = target.querySelector('input');
+		const p = target.querySelector('p');
+
+		assert.equal(input, snapshot.input);
+		assert.equal(p, snapshot.p);
+
+		input.value = 'everybody';
+		input.dispatchEvent(new window.Event('input'));
+
+		assert.equal(component.get('name'), 'everybody');
+		assert.htmlEqual(target.innerHTML, `
+			<input>
+			<p>Hello everybody!</p>
+		`);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/binding-input/main.html b/test/hydration/samples/binding-input/main.html
new file mode 100644
index 0000000000..d4359f73e4
--- /dev/null
+++ b/test/hydration/samples/binding-input/main.html
@@ -0,0 +1,2 @@
+<input bind:value='name'>
+<p>Hello {{name}}!</p>
\ No newline at end of file
diff --git a/test/hydration/samples/component-in-element/Nested.html b/test/hydration/samples/component-in-element/Nested.html
new file mode 100644
index 0000000000..70bf63ad9d
--- /dev/null
+++ b/test/hydration/samples/component-in-element/Nested.html
@@ -0,0 +1 @@
+<p>nested</p>
\ No newline at end of file
diff --git a/test/hydration/samples/component-in-element/_after.html b/test/hydration/samples/component-in-element/_after.html
new file mode 100644
index 0000000000..b96db6ffc8
--- /dev/null
+++ b/test/hydration/samples/component-in-element/_after.html
@@ -0,0 +1,3 @@
+<div>
+	<p>nested</p>
+</div>
\ No newline at end of file
diff --git a/test/hydration/samples/component-in-element/_before.html b/test/hydration/samples/component-in-element/_before.html
new file mode 100644
index 0000000000..b96db6ffc8
--- /dev/null
+++ b/test/hydration/samples/component-in-element/_before.html
@@ -0,0 +1,3 @@
+<div>
+	<p>nested</p>
+</div>
\ No newline at end of file
diff --git a/test/hydration/samples/component-in-element/_config.js b/test/hydration/samples/component-in-element/_config.js
new file mode 100644
index 0000000000..790b026400
--- /dev/null
+++ b/test/hydration/samples/component-in-element/_config.js
@@ -0,0 +1,21 @@
+export default {
+	snapshot(target) {
+		const div = target.querySelector('div');
+		const p = target.querySelector('p');
+
+		return {
+			div,
+			p,
+			text: p.childNodes[0]
+		};
+	},
+
+	test(assert, target, snapshot) {
+		const div = target.querySelector('div');
+		const p = target.querySelector('p');
+
+		assert.equal(div, snapshot.div);
+		assert.equal(p, snapshot.p);
+		assert.equal(p.childNodes[0], snapshot.text);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/component-in-element/main.html b/test/hydration/samples/component-in-element/main.html
new file mode 100644
index 0000000000..d639570c56
--- /dev/null
+++ b/test/hydration/samples/component-in-element/main.html
@@ -0,0 +1,13 @@
+<div>
+	<Nested/>
+</div>
+
+<script>
+	import Nested from './Nested.html';
+
+	export default {
+		components: {
+			Nested
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/hydration/samples/component/Nested.html b/test/hydration/samples/component/Nested.html
new file mode 100644
index 0000000000..70bf63ad9d
--- /dev/null
+++ b/test/hydration/samples/component/Nested.html
@@ -0,0 +1 @@
+<p>nested</p>
\ No newline at end of file
diff --git a/test/hydration/samples/component/_after.html b/test/hydration/samples/component/_after.html
new file mode 100644
index 0000000000..70bf63ad9d
--- /dev/null
+++ b/test/hydration/samples/component/_after.html
@@ -0,0 +1 @@
+<p>nested</p>
\ No newline at end of file
diff --git a/test/hydration/samples/component/_before.html b/test/hydration/samples/component/_before.html
new file mode 100644
index 0000000000..70bf63ad9d
--- /dev/null
+++ b/test/hydration/samples/component/_before.html
@@ -0,0 +1 @@
+<p>nested</p>
\ No newline at end of file
diff --git a/test/hydration/samples/component/_config.js b/test/hydration/samples/component/_config.js
new file mode 100644
index 0000000000..c26b3c7ad0
--- /dev/null
+++ b/test/hydration/samples/component/_config.js
@@ -0,0 +1,17 @@
+export default {
+	snapshot(target) {
+		const p = target.querySelector('p');
+
+		return {
+			p,
+			text: p.childNodes[0]
+		};
+	},
+
+	test(assert, target, snapshot) {
+		const p = target.querySelector('p');
+
+		assert.equal(p, snapshot.p);
+		assert.equal(p.childNodes[0], snapshot.text);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/component/main.html b/test/hydration/samples/component/main.html
new file mode 100644
index 0000000000..c669ca09a8
--- /dev/null
+++ b/test/hydration/samples/component/main.html
@@ -0,0 +1,11 @@
+<Nested/>
+
+<script>
+	import Nested from './Nested.html';
+
+	export default {
+		components: {
+			Nested
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/hydration/samples/dynamic-text-changed/_after.html b/test/hydration/samples/dynamic-text-changed/_after.html
new file mode 100644
index 0000000000..c675400a49
--- /dev/null
+++ b/test/hydration/samples/dynamic-text-changed/_after.html
@@ -0,0 +1 @@
+<h1>Hello everybody!</h1>
\ No newline at end of file
diff --git a/test/hydration/samples/dynamic-text-changed/_before.html b/test/hydration/samples/dynamic-text-changed/_before.html
new file mode 100644
index 0000000000..efe5048cbc
--- /dev/null
+++ b/test/hydration/samples/dynamic-text-changed/_before.html
@@ -0,0 +1 @@
+<h1>Hello world!</h1>
\ No newline at end of file
diff --git a/test/hydration/samples/dynamic-text-changed/_config.js b/test/hydration/samples/dynamic-text-changed/_config.js
new file mode 100644
index 0000000000..e836ebf4b2
--- /dev/null
+++ b/test/hydration/samples/dynamic-text-changed/_config.js
@@ -0,0 +1,21 @@
+export default {
+	data: {
+		name: 'everybody'
+	},
+
+	snapshot(target) {
+		const h1 = target.querySelector('h1');
+
+		return {
+			h1,
+			text: h1.childNodes[0]
+		};
+	},
+
+	test(assert, target, snapshot) {
+		const h1 = target.querySelector('h1');
+
+		assert.equal(h1, snapshot.h1);
+		assert.equal(h1.childNodes[0], snapshot.text);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/dynamic-text-changed/main.html b/test/hydration/samples/dynamic-text-changed/main.html
new file mode 100644
index 0000000000..c8dd28836a
--- /dev/null
+++ b/test/hydration/samples/dynamic-text-changed/main.html
@@ -0,0 +1 @@
+<h1>Hello {{name}}!</h1>
\ No newline at end of file
diff --git a/test/hydration/samples/dynamic-text/_after.html b/test/hydration/samples/dynamic-text/_after.html
new file mode 100644
index 0000000000..efe5048cbc
--- /dev/null
+++ b/test/hydration/samples/dynamic-text/_after.html
@@ -0,0 +1 @@
+<h1>Hello world!</h1>
\ No newline at end of file
diff --git a/test/hydration/samples/dynamic-text/_before.html b/test/hydration/samples/dynamic-text/_before.html
new file mode 100644
index 0000000000..efe5048cbc
--- /dev/null
+++ b/test/hydration/samples/dynamic-text/_before.html
@@ -0,0 +1 @@
+<h1>Hello world!</h1>
\ No newline at end of file
diff --git a/test/hydration/samples/dynamic-text/_config.js b/test/hydration/samples/dynamic-text/_config.js
new file mode 100644
index 0000000000..3ca70ee5d2
--- /dev/null
+++ b/test/hydration/samples/dynamic-text/_config.js
@@ -0,0 +1,21 @@
+export default {
+	data: {
+		name: 'world'
+	},
+
+	snapshot(target) {
+		const h1 = target.querySelector('h1');
+
+		return {
+			h1,
+			text: h1.childNodes[0]
+		};
+	},
+
+	test(assert, target, snapshot) {
+		const h1 = target.querySelector('h1');
+
+		assert.equal(h1, snapshot.h1);
+		assert.equal(h1.childNodes[0], snapshot.text);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/dynamic-text/main.html b/test/hydration/samples/dynamic-text/main.html
new file mode 100644
index 0000000000..c8dd28836a
--- /dev/null
+++ b/test/hydration/samples/dynamic-text/main.html
@@ -0,0 +1 @@
+<h1>Hello {{name}}!</h1>
\ No newline at end of file
diff --git a/test/hydration/samples/each-block/_after.html b/test/hydration/samples/each-block/_after.html
new file mode 100644
index 0000000000..36cd79642a
--- /dev/null
+++ b/test/hydration/samples/each-block/_after.html
@@ -0,0 +1,5 @@
+<ul>
+	<li>animal</li>
+	<li>vegetable</li>
+	<li>mineral</li>
+</ul>
\ No newline at end of file
diff --git a/test/hydration/samples/each-block/_before.html b/test/hydration/samples/each-block/_before.html
new file mode 100644
index 0000000000..36cd79642a
--- /dev/null
+++ b/test/hydration/samples/each-block/_before.html
@@ -0,0 +1,5 @@
+<ul>
+	<li>animal</li>
+	<li>vegetable</li>
+	<li>mineral</li>
+</ul>
\ No newline at end of file
diff --git a/test/hydration/samples/each-block/_config.js b/test/hydration/samples/each-block/_config.js
new file mode 100644
index 0000000000..065ae25cb9
--- /dev/null
+++ b/test/hydration/samples/each-block/_config.js
@@ -0,0 +1,29 @@
+export default {
+	data: {
+		things: [
+			'animal',
+			'vegetable',
+			'mineral'
+		]
+	},
+
+	snapshot(target) {
+		const ul = target.querySelector('ul');
+		const lis = ul.querySelectorAll('li');
+
+		return {
+			ul,
+			lis
+		};
+	},
+
+	test(assert, target, snapshot) {
+		const ul = target.querySelector('ul');
+		const lis = ul.querySelectorAll('li');
+
+		assert.equal(ul, snapshot.ul);
+		assert.equal(lis[0], snapshot.lis[0]);
+		assert.equal(lis[1], snapshot.lis[1]);
+		assert.equal(lis[2], snapshot.lis[2]);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/each-block/main.html b/test/hydration/samples/each-block/main.html
new file mode 100644
index 0000000000..821f6c53e2
--- /dev/null
+++ b/test/hydration/samples/each-block/main.html
@@ -0,0 +1,5 @@
+<ul>
+	{{#each things as thing}}
+		<li>{{thing}}</li>
+	{{/each}}
+</ul>
\ No newline at end of file
diff --git a/test/hydration/samples/element-attribute-added/_after.html b/test/hydration/samples/element-attribute-added/_after.html
new file mode 100644
index 0000000000..8d93bba36d
--- /dev/null
+++ b/test/hydration/samples/element-attribute-added/_after.html
@@ -0,0 +1 @@
+<div class='bar'></div>
\ No newline at end of file
diff --git a/test/hydration/samples/element-attribute-added/_before.html b/test/hydration/samples/element-attribute-added/_before.html
new file mode 100644
index 0000000000..c6a8a8c95d
--- /dev/null
+++ b/test/hydration/samples/element-attribute-added/_before.html
@@ -0,0 +1 @@
+<div class='foo'></div>
\ No newline at end of file
diff --git a/test/hydration/samples/element-attribute-added/_config.js b/test/hydration/samples/element-attribute-added/_config.js
new file mode 100644
index 0000000000..a1cfe933c2
--- /dev/null
+++ b/test/hydration/samples/element-attribute-added/_config.js
@@ -0,0 +1,19 @@
+export default {
+	data: {
+		class: 'bar'
+	},
+
+	snapshot(target) {
+		const div = target.querySelector('div');
+
+		return {
+			div
+		};
+	},
+
+	test(assert, target, snapshot) {
+		const div = target.querySelector('div');
+
+		assert.equal(div, snapshot.div);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/element-attribute-added/main.html b/test/hydration/samples/element-attribute-added/main.html
new file mode 100644
index 0000000000..6b149d165f
--- /dev/null
+++ b/test/hydration/samples/element-attribute-added/main.html
@@ -0,0 +1 @@
+<div class='{{class}}'></div>
\ No newline at end of file
diff --git a/test/hydration/samples/element-attribute-changed/_after.html b/test/hydration/samples/element-attribute-changed/_after.html
new file mode 100644
index 0000000000..c6a8a8c95d
--- /dev/null
+++ b/test/hydration/samples/element-attribute-changed/_after.html
@@ -0,0 +1 @@
+<div class='foo'></div>
\ No newline at end of file
diff --git a/test/hydration/samples/element-attribute-changed/_before.html b/test/hydration/samples/element-attribute-changed/_before.html
new file mode 100644
index 0000000000..281c6866c3
--- /dev/null
+++ b/test/hydration/samples/element-attribute-changed/_before.html
@@ -0,0 +1 @@
+<div></div>
\ No newline at end of file
diff --git a/test/hydration/samples/element-attribute-changed/_config.js b/test/hydration/samples/element-attribute-changed/_config.js
new file mode 100644
index 0000000000..a1cfe933c2
--- /dev/null
+++ b/test/hydration/samples/element-attribute-changed/_config.js
@@ -0,0 +1,19 @@
+export default {
+	data: {
+		class: 'bar'
+	},
+
+	snapshot(target) {
+		const div = target.querySelector('div');
+
+		return {
+			div
+		};
+	},
+
+	test(assert, target, snapshot) {
+		const div = target.querySelector('div');
+
+		assert.equal(div, snapshot.div);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/element-attribute-changed/main.html b/test/hydration/samples/element-attribute-changed/main.html
new file mode 100644
index 0000000000..c6a8a8c95d
--- /dev/null
+++ b/test/hydration/samples/element-attribute-changed/main.html
@@ -0,0 +1 @@
+<div class='foo'></div>
\ No newline at end of file
diff --git a/test/hydration/samples/element-attribute-removed/_after.html b/test/hydration/samples/element-attribute-removed/_after.html
new file mode 100644
index 0000000000..281c6866c3
--- /dev/null
+++ b/test/hydration/samples/element-attribute-removed/_after.html
@@ -0,0 +1 @@
+<div></div>
\ No newline at end of file
diff --git a/test/hydration/samples/element-attribute-removed/_before.html b/test/hydration/samples/element-attribute-removed/_before.html
new file mode 100644
index 0000000000..c6a8a8c95d
--- /dev/null
+++ b/test/hydration/samples/element-attribute-removed/_before.html
@@ -0,0 +1 @@
+<div class='foo'></div>
\ No newline at end of file
diff --git a/test/hydration/samples/element-attribute-removed/_config.js b/test/hydration/samples/element-attribute-removed/_config.js
new file mode 100644
index 0000000000..a1cfe933c2
--- /dev/null
+++ b/test/hydration/samples/element-attribute-removed/_config.js
@@ -0,0 +1,19 @@
+export default {
+	data: {
+		class: 'bar'
+	},
+
+	snapshot(target) {
+		const div = target.querySelector('div');
+
+		return {
+			div
+		};
+	},
+
+	test(assert, target, snapshot) {
+		const div = target.querySelector('div');
+
+		assert.equal(div, snapshot.div);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/element-attribute-removed/main.html b/test/hydration/samples/element-attribute-removed/main.html
new file mode 100644
index 0000000000..281c6866c3
--- /dev/null
+++ b/test/hydration/samples/element-attribute-removed/main.html
@@ -0,0 +1 @@
+<div></div>
\ No newline at end of file
diff --git a/test/hydration/samples/element-attribute-unchanged/_after.html b/test/hydration/samples/element-attribute-unchanged/_after.html
new file mode 100644
index 0000000000..c6a8a8c95d
--- /dev/null
+++ b/test/hydration/samples/element-attribute-unchanged/_after.html
@@ -0,0 +1 @@
+<div class='foo'></div>
\ No newline at end of file
diff --git a/test/hydration/samples/element-attribute-unchanged/_before.html b/test/hydration/samples/element-attribute-unchanged/_before.html
new file mode 100644
index 0000000000..c6a8a8c95d
--- /dev/null
+++ b/test/hydration/samples/element-attribute-unchanged/_before.html
@@ -0,0 +1 @@
+<div class='foo'></div>
\ No newline at end of file
diff --git a/test/hydration/samples/element-attribute-unchanged/_config.js b/test/hydration/samples/element-attribute-unchanged/_config.js
new file mode 100644
index 0000000000..d41f5db0fb
--- /dev/null
+++ b/test/hydration/samples/element-attribute-unchanged/_config.js
@@ -0,0 +1,15 @@
+export default {
+	snapshot(target) {
+		const div = target.querySelector('div');
+
+		return {
+			div
+		};
+	},
+
+	test(assert, target, snapshot) {
+		const div = target.querySelector('div');
+
+		assert.equal(div, snapshot.div);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/element-attribute-unchanged/main.html b/test/hydration/samples/element-attribute-unchanged/main.html
new file mode 100644
index 0000000000..c6a8a8c95d
--- /dev/null
+++ b/test/hydration/samples/element-attribute-unchanged/main.html
@@ -0,0 +1 @@
+<div class='foo'></div>
\ No newline at end of file
diff --git a/test/hydration/samples/element-nested/_after.html b/test/hydration/samples/element-nested/_after.html
new file mode 100644
index 0000000000..b96db6ffc8
--- /dev/null
+++ b/test/hydration/samples/element-nested/_after.html
@@ -0,0 +1,3 @@
+<div>
+	<p>nested</p>
+</div>
\ No newline at end of file
diff --git a/test/hydration/samples/element-nested/_before.html b/test/hydration/samples/element-nested/_before.html
new file mode 100644
index 0000000000..b96db6ffc8
--- /dev/null
+++ b/test/hydration/samples/element-nested/_before.html
@@ -0,0 +1,3 @@
+<div>
+	<p>nested</p>
+</div>
\ No newline at end of file
diff --git a/test/hydration/samples/element-nested/_config.js b/test/hydration/samples/element-nested/_config.js
new file mode 100644
index 0000000000..0965bc39c6
--- /dev/null
+++ b/test/hydration/samples/element-nested/_config.js
@@ -0,0 +1,17 @@
+export default {
+	snapshot(target) {
+		const div = target.querySelector('div');
+
+		return {
+			div,
+			p: div.querySelector('p')
+		};
+	},
+
+	test(assert, target, snapshot) {
+		const div = target.querySelector('div');
+
+		assert.equal(div, snapshot.div);
+		assert.equal(div.querySelector('p'), snapshot.p);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/element-nested/main.html b/test/hydration/samples/element-nested/main.html
new file mode 100644
index 0000000000..b96db6ffc8
--- /dev/null
+++ b/test/hydration/samples/element-nested/main.html
@@ -0,0 +1,3 @@
+<div>
+	<p>nested</p>
+</div>
\ No newline at end of file
diff --git a/test/hydration/samples/element-ref/_after.html b/test/hydration/samples/element-ref/_after.html
new file mode 100644
index 0000000000..efe5048cbc
--- /dev/null
+++ b/test/hydration/samples/element-ref/_after.html
@@ -0,0 +1 @@
+<h1>Hello world!</h1>
\ No newline at end of file
diff --git a/test/hydration/samples/element-ref/_before.html b/test/hydration/samples/element-ref/_before.html
new file mode 100644
index 0000000000..efe5048cbc
--- /dev/null
+++ b/test/hydration/samples/element-ref/_before.html
@@ -0,0 +1 @@
+<h1>Hello world!</h1>
\ No newline at end of file
diff --git a/test/hydration/samples/element-ref/_config.js b/test/hydration/samples/element-ref/_config.js
new file mode 100644
index 0000000000..21743569bd
--- /dev/null
+++ b/test/hydration/samples/element-ref/_config.js
@@ -0,0 +1,16 @@
+export default {
+	snapshot(target) {
+		const h1 = target.querySelector('h1');
+
+		return {
+			h1,
+		};
+	},
+
+	test(assert, target, snapshot, component) {
+		const h1 = target.querySelector('h1');
+
+		assert.equal(h1, snapshot.h1);
+		assert.equal(component.refs.h1, h1);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/element-ref/main.html b/test/hydration/samples/element-ref/main.html
new file mode 100644
index 0000000000..95c0299762
--- /dev/null
+++ b/test/hydration/samples/element-ref/main.html
@@ -0,0 +1 @@
+<h1 ref:h1>Hello world!</h1>
\ No newline at end of file
diff --git a/test/hydration/samples/event-handler/_after.html b/test/hydration/samples/event-handler/_after.html
new file mode 100644
index 0000000000..13cd34a990
--- /dev/null
+++ b/test/hydration/samples/event-handler/_after.html
@@ -0,0 +1 @@
+<button>click me</button>
\ No newline at end of file
diff --git a/test/hydration/samples/event-handler/_before.html b/test/hydration/samples/event-handler/_before.html
new file mode 100644
index 0000000000..13cd34a990
--- /dev/null
+++ b/test/hydration/samples/event-handler/_before.html
@@ -0,0 +1 @@
+<button>click me</button>
\ No newline at end of file
diff --git a/test/hydration/samples/event-handler/_config.js b/test/hydration/samples/event-handler/_config.js
new file mode 100644
index 0000000000..4cd132f801
--- /dev/null
+++ b/test/hydration/samples/event-handler/_config.js
@@ -0,0 +1,26 @@
+export default {
+	data: {
+		clicked: false
+	},
+
+	snapshot(target) {
+		const button = target.querySelector('button');
+
+		return {
+			button
+		};
+	},
+
+	test(assert, target, snapshot, component, window) {
+		const button = target.querySelector('button');
+		assert.equal(button, snapshot.button);
+
+		button.dispatchEvent(new window.MouseEvent('click'));
+
+		assert.ok(component.get('clicked'));
+		assert.htmlEqual(target.innerHTML, `
+			<button>click me</button>
+			<p>clicked!</p>
+		`);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/event-handler/main.html b/test/hydration/samples/event-handler/main.html
new file mode 100644
index 0000000000..9533175147
--- /dev/null
+++ b/test/hydration/samples/event-handler/main.html
@@ -0,0 +1,5 @@
+<button on:click='set({ clicked: true })'>click me</button>
+
+{{#if clicked}}
+	<p>clicked!</p>
+{{/if}}
\ No newline at end of file
diff --git a/test/hydration/samples/if-block-anchor/_after.html b/test/hydration/samples/if-block-anchor/_after.html
new file mode 100644
index 0000000000..31701ce3e9
--- /dev/null
+++ b/test/hydration/samples/if-block-anchor/_after.html
@@ -0,0 +1,4 @@
+<div>
+	<p>foo!</p>
+	<p>bar!</p>
+</div>
\ No newline at end of file
diff --git a/test/hydration/samples/if-block-anchor/_before.html b/test/hydration/samples/if-block-anchor/_before.html
new file mode 100644
index 0000000000..31701ce3e9
--- /dev/null
+++ b/test/hydration/samples/if-block-anchor/_before.html
@@ -0,0 +1,4 @@
+<div>
+	<p>foo!</p>
+	<p>bar!</p>
+</div>
\ No newline at end of file
diff --git a/test/hydration/samples/if-block-anchor/_config.js b/test/hydration/samples/if-block-anchor/_config.js
new file mode 100644
index 0000000000..f9acaa30ed
--- /dev/null
+++ b/test/hydration/samples/if-block-anchor/_config.js
@@ -0,0 +1,26 @@
+export default {
+	data: {
+		foo: true,
+		bar: true
+	},
+
+	snapshot(target) {
+		const div = target.querySelector('div');
+		const ps = target.querySelectorAll('p');
+
+		return {
+			div,
+			p0: ps[0],
+			p1: ps[1]
+		};
+	},
+
+	test(assert, target, snapshot) {
+		const div = target.querySelector('div');
+		const ps = target.querySelectorAll('p');
+
+		assert.equal(div, snapshot.div);
+		assert.equal(ps[0], snapshot.p0);
+		assert.equal(ps[1], snapshot.p1);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/if-block-anchor/main.html b/test/hydration/samples/if-block-anchor/main.html
new file mode 100644
index 0000000000..b46363fecb
--- /dev/null
+++ b/test/hydration/samples/if-block-anchor/main.html
@@ -0,0 +1,9 @@
+<div>
+	{{#if foo}}
+		<p>foo!</p>
+	{{/if}}
+
+	{{#if bar}}
+		<p>bar!</p>
+	{{/if}}
+</div>
\ No newline at end of file
diff --git a/test/hydration/samples/if-block-false/_after.html b/test/hydration/samples/if-block-false/_after.html
new file mode 100644
index 0000000000..17eb5acc05
--- /dev/null
+++ b/test/hydration/samples/if-block-false/_after.html
@@ -0,0 +1,2 @@
+<p>before</p>
+<p>after</p>
\ No newline at end of file
diff --git a/test/hydration/samples/if-block-false/_before.html b/test/hydration/samples/if-block-false/_before.html
new file mode 100644
index 0000000000..17eb5acc05
--- /dev/null
+++ b/test/hydration/samples/if-block-false/_before.html
@@ -0,0 +1,2 @@
+<p>before</p>
+<p>after</p>
\ No newline at end of file
diff --git a/test/hydration/samples/if-block-false/_config.js b/test/hydration/samples/if-block-false/_config.js
new file mode 100644
index 0000000000..ba071e9910
--- /dev/null
+++ b/test/hydration/samples/if-block-false/_config.js
@@ -0,0 +1,19 @@
+export default {
+	data: {
+		foo: false
+	},
+
+	snapshot(target) {
+		const p = target.querySelector('p');
+
+		return {
+			p
+		};
+	},
+
+	test(assert, target, snapshot) {
+		const p = target.querySelector('p');
+
+		assert.equal(p, snapshot.p);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/if-block-false/main.html b/test/hydration/samples/if-block-false/main.html
new file mode 100644
index 0000000000..4d42d3e7d7
--- /dev/null
+++ b/test/hydration/samples/if-block-false/main.html
@@ -0,0 +1,5 @@
+<p>before</p>
+{{#if foo}}
+	<p>foo!</p>
+{{/if}}
+<p>after</p>
\ No newline at end of file
diff --git a/test/hydration/samples/if-block-update/_after.html b/test/hydration/samples/if-block-update/_after.html
new file mode 100644
index 0000000000..5ed8b34a53
--- /dev/null
+++ b/test/hydration/samples/if-block-update/_after.html
@@ -0,0 +1 @@
+<p>foo!</p>
\ No newline at end of file
diff --git a/test/hydration/samples/if-block-update/_before.html b/test/hydration/samples/if-block-update/_before.html
new file mode 100644
index 0000000000..5ed8b34a53
--- /dev/null
+++ b/test/hydration/samples/if-block-update/_before.html
@@ -0,0 +1 @@
+<p>foo!</p>
\ No newline at end of file
diff --git a/test/hydration/samples/if-block-update/_config.js b/test/hydration/samples/if-block-update/_config.js
new file mode 100644
index 0000000000..185dacb1e7
--- /dev/null
+++ b/test/hydration/samples/if-block-update/_config.js
@@ -0,0 +1,23 @@
+export default {
+	data: {
+		foo: true,
+		bar: false
+	},
+
+	snapshot(target) {
+		const p = target.querySelector('p');
+
+		return {
+			p
+		};
+	},
+
+	test(assert, target, snapshot, component) {
+		const p = target.querySelector('p');
+
+		assert.equal(p, snapshot.p);
+
+		component.set({ foo: false, bar: true });
+		assert.htmlEqual(target.innerHTML, `<p>bar!</p>`);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/if-block-update/main.html b/test/hydration/samples/if-block-update/main.html
new file mode 100644
index 0000000000..82c5a193fe
--- /dev/null
+++ b/test/hydration/samples/if-block-update/main.html
@@ -0,0 +1,7 @@
+{{#if foo}}
+	<p>foo!</p>
+{{/if}}
+
+{{#if bar}}
+	<p>bar!</p>
+{{/if}}
\ No newline at end of file
diff --git a/test/hydration/samples/if-block/_after.html b/test/hydration/samples/if-block/_after.html
new file mode 100644
index 0000000000..5ed8b34a53
--- /dev/null
+++ b/test/hydration/samples/if-block/_after.html
@@ -0,0 +1 @@
+<p>foo!</p>
\ No newline at end of file
diff --git a/test/hydration/samples/if-block/_before.html b/test/hydration/samples/if-block/_before.html
new file mode 100644
index 0000000000..5ed8b34a53
--- /dev/null
+++ b/test/hydration/samples/if-block/_before.html
@@ -0,0 +1 @@
+<p>foo!</p>
\ No newline at end of file
diff --git a/test/hydration/samples/if-block/_config.js b/test/hydration/samples/if-block/_config.js
new file mode 100644
index 0000000000..465c32c2af
--- /dev/null
+++ b/test/hydration/samples/if-block/_config.js
@@ -0,0 +1,19 @@
+export default {
+	data: {
+		foo: true
+	},
+
+	snapshot(target) {
+		const p = target.querySelector('p');
+
+		return {
+			p
+		};
+	},
+
+	test(assert, target, snapshot) {
+		const p = target.querySelector('p');
+
+		assert.equal(p, snapshot.p);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/if-block/main.html b/test/hydration/samples/if-block/main.html
new file mode 100644
index 0000000000..050095b913
--- /dev/null
+++ b/test/hydration/samples/if-block/main.html
@@ -0,0 +1,3 @@
+{{#if foo}}
+	<p>foo!</p>
+{{/if}}
\ No newline at end of file
diff --git a/test/hydration/samples/raw/_after.html b/test/hydration/samples/raw/_after.html
new file mode 100644
index 0000000000..47214db3c9
--- /dev/null
+++ b/test/hydration/samples/raw/_after.html
@@ -0,0 +1,4 @@
+<noscript></noscript>
+<p>this is some html</p>
+<p>and so is this</p>
+<noscript></noscript>
\ No newline at end of file
diff --git a/test/hydration/samples/raw/_before.html b/test/hydration/samples/raw/_before.html
new file mode 100644
index 0000000000..b68c0e317e
--- /dev/null
+++ b/test/hydration/samples/raw/_before.html
@@ -0,0 +1,2 @@
+<p>this is some html</p>
+<p>and so is this</p>
\ No newline at end of file
diff --git a/test/hydration/samples/raw/_config.js b/test/hydration/samples/raw/_config.js
new file mode 100644
index 0000000000..e1108714ee
--- /dev/null
+++ b/test/hydration/samples/raw/_config.js
@@ -0,0 +1,27 @@
+export default {
+	skip: true, // existing nodes are blown away
+
+	data: {
+		raw: `<p>this is some html</p> <p>and so is this</p>`
+	},
+
+	snapshot(target) {
+		const ps = target.querySelectorAll('p');
+
+		return {
+			p0: ps[0],
+			text0: ps[0].firstChild,
+			p1: ps[1],
+			text1: ps[1].firstChild
+		};
+	},
+
+	test(assert, target, snapshot) {
+		const ps = target.querySelectorAll('p');
+
+		assert.equal(ps[0], snapshot.p0);
+		assert.equal(ps[0].firstChild, snapshot.text0);
+		assert.equal(ps[1], snapshot.p1);
+		assert.equal(ps[1].firstChild, snapshot.text1);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/raw/main.html b/test/hydration/samples/raw/main.html
new file mode 100644
index 0000000000..7523dfd4de
--- /dev/null
+++ b/test/hydration/samples/raw/main.html
@@ -0,0 +1 @@
+{{{raw}}}
\ No newline at end of file
diff --git a/test/hydration/samples/top-level-text/_after.html b/test/hydration/samples/top-level-text/_after.html
new file mode 100644
index 0000000000..4add785daf
--- /dev/null
+++ b/test/hydration/samples/top-level-text/_after.html
@@ -0,0 +1 @@
+Text
\ No newline at end of file
diff --git a/test/hydration/samples/top-level-text/_before.html b/test/hydration/samples/top-level-text/_before.html
new file mode 100644
index 0000000000..4add785daf
--- /dev/null
+++ b/test/hydration/samples/top-level-text/_before.html
@@ -0,0 +1 @@
+Text
\ No newline at end of file
diff --git a/test/hydration/samples/top-level-text/_config.js b/test/hydration/samples/top-level-text/_config.js
new file mode 100644
index 0000000000..e8a81e7ca1
--- /dev/null
+++ b/test/hydration/samples/top-level-text/_config.js
@@ -0,0 +1,13 @@
+export default {
+	snapshot(target) {
+		return {
+			text: target.childNodes[0]
+		};
+	},
+
+	test(assert, target, snapshot) {
+		const text = target.childNodes[0];
+
+		assert.equal(text, snapshot.text);
+	}
+};
\ No newline at end of file
diff --git a/test/hydration/samples/top-level-text/main.html b/test/hydration/samples/top-level-text/main.html
new file mode 100644
index 0000000000..4add785daf
--- /dev/null
+++ b/test/hydration/samples/top-level-text/main.html
@@ -0,0 +1 @@
+Text
\ No newline at end of file
diff --git a/test/js/index.js b/test/js/index.js
index bd3e9cbc6d..512cba41fa 100644
--- a/test/js/index.js
+++ b/test/js/index.js
@@ -1,41 +1,70 @@
-import assert from 'assert';
-import * as fs from 'fs';
-import * as path from 'path';
-import { svelte } from '../helpers.js';
+import assert from "assert";
+import * as fs from "fs";
+import * as path from "path";
+import { rollup } from "rollup";
+import { svelte } from "../helpers.js";
 
-describe( 'js', () => {
-	fs.readdirSync( 'test/js/samples' ).forEach( dir => {
-		if ( dir[0] === '.' ) return;
+describe("js", () => {
+	fs.readdirSync("test/js/samples").forEach(dir => {
+		if (dir[0] === ".") return;
 
 		// add .solo to a sample directory name to only run that test
-		const solo = /\.solo/.test( dir );
+		const solo = /\.solo/.test(dir);
 
-		if ( solo && process.env.CI ) {
-			throw new Error( 'Forgot to remove `solo: true` from test' );
+		if (solo && process.env.CI) {
+			throw new Error("Forgot to remove `solo: true` from test");
 		}
 
-		( solo ? it.only : it )( dir, () => {
-			dir = path.resolve( 'test/js/samples', dir );
-			const input = fs.readFileSync( `${dir}/input.html`, 'utf-8' ).replace( /\s+$/, '' );
+		(solo ? it.only : it)(dir, () => {
+			dir = path.resolve("test/js/samples", dir);
+			const input = fs
+				.readFileSync(`${dir}/input.html`, "utf-8")
+				.replace(/\s+$/, "");
 
 			let actual;
 
 			try {
-				actual = svelte.compile( input, {
+				actual = svelte.compile(input, {
 					shared: true
 				}).code;
-			} catch ( err ) {
-				console.log( err.frame );
+			} catch (err) {
+				console.log(err.frame);
 				throw err;
 			}
 
-			fs.writeFileSync( `${dir}/_actual.js`, actual );
-			const expected = fs.readFileSync( `${dir}/expected.js`, 'utf-8' );
-
-			assert.equal(
-				actual.trim().replace( /^\s+$/gm, '' ),
-				expected.trim().replace( /^\s+$/gm, '' )
+			fs.writeFileSync(`${dir}/_actual.js`, actual);
+			const expected = fs.readFileSync(`${dir}/expected.js`, "utf-8");
+			const expectedBundle = fs.readFileSync(
+				`${dir}/expected-bundle.js`,
+				"utf-8"
 			);
+
+			return rollup({
+				entry: `${dir}/_actual.js`,
+				plugins: [
+					{
+						resolveId(importee, importer) {
+							if (!importer) return importee;
+							if (importee === "svelte/shared.js")
+								return path.resolve("shared.js");
+							return null;
+						}
+					}
+				]
+			}).then(bundle => {
+				const actualBundle = bundle.generate({ format: "es" }).code;
+				fs.writeFileSync(`${dir}/_actual-bundle.js`, actualBundle);
+
+				assert.equal(
+					actual.trim().replace(/^\s+$/gm, ""),
+					expected.trim().replace(/^\s+$/gm, "")
+				);
+
+				assert.equal(
+					actualBundle.trim().replace(/^\s+$/gm, ""),
+					expectedBundle.trim().replace(/^\s+$/gm, "")
+				);
+			});
 		});
 	});
 });
diff --git a/test/js/samples/collapses-text-around-comments/expected-bundle.js b/test/js/samples/collapses-text-around-comments/expected-bundle.js
new file mode 100644
index 0000000000..54bd3af679
--- /dev/null
+++ b/test/js/samples/collapses-text-around-comments/expected-bundle.js
@@ -0,0 +1,232 @@
+function noop() {}
+
+function assign(target) {
+	var k,
+		source,
+		i = 1,
+		len = arguments.length;
+	for (; i < len; i++) {
+		source = arguments[i];
+		for (k in source) target[k] = source[k];
+	}
+
+	return target;
+}
+
+function appendNode(node, target) {
+	target.appendChild(node);
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function createText(data) {
+	return document.createTextNode(data);
+}
+
+function setAttribute(node, attribute, value) {
+	node.setAttribute(attribute, value);
+}
+
+function differs(a, b) {
+	return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, newState, oldState) {
+	for (var key in group) {
+		if (!(key in newState)) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		if (differs(newValue, oldValue)) {
+			var callbacks = group[key];
+			if (!callbacks) continue;
+
+			for (var i = 0; i < callbacks.length; i += 1) {
+				var callback = callbacks[i];
+				if (callback.__calling) continue;
+
+				callback.__calling = true;
+				callback.call(component, newValue, oldValue);
+				callback.__calling = false;
+			}
+		}
+	}
+}
+
+function get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function fire(eventName, data) {
+	var handlers =
+		eventName in this._handlers && this._handlers[eventName].slice();
+	if (!handlers) return;
+
+	for (var i = 0; i < handlers.length; i += 1) {
+		handlers[i].call(this, data);
+	}
+}
+
+function observe(key, callback, options) {
+	var group = options && options.defer
+		? this._observers.post
+		: this._observers.pre;
+
+	(group[key] || (group[key] = [])).push(callback);
+
+	if (!options || options.init !== false) {
+		callback.__calling = true;
+		callback.call(this, this._state[key]);
+		callback.__calling = false;
+	}
+
+	return {
+		cancel: function() {
+			var index = group[key].indexOf(callback);
+			if (~index) group[key].splice(index, 1);
+		}
+	};
+}
+
+function on(eventName, handler) {
+	if (eventName === 'teardown') return this.on('destroy', handler);
+
+	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
+	handlers.push(handler);
+
+	return {
+		cancel: function() {
+			var index = handlers.indexOf(handler);
+			if (~index) handlers.splice(index, 1);
+		}
+	};
+}
+
+function set(newState) {
+	this._set(assign({}, newState));
+	this._root._flush();
+}
+
+function _flush() {
+	if (!this._renderHooks) return;
+
+	while (this._renderHooks.length) {
+		this._renderHooks.pop()();
+	}
+}
+
+var proto = {
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	_flush: _flush
+};
+
+var template = (function () {
+	return {
+		data: function () {
+			return { foo: 42 }
+		}
+	};
+}());
+
+function add_css () {
+	var style = createElement( 'style' );
+	style.id = 'svelte-3590263702-style';
+	style.textContent = "\n\tp[svelte-3590263702], [svelte-3590263702] p {\n\t\tcolor: red;\n\t}\n";
+	appendNode( style, document.head );
+}
+
+function create_main_fragment ( state, component ) {
+	var p, text_value, text;
+
+	return {
+		create: function () {
+			p = createElement( 'p' );
+			text = createText( text_value = state.foo );
+			this.hydrate();
+		},
+
+		hydrate: function ( nodes ) {
+			setAttribute( p, 'svelte-3590263702', '' );
+		},
+
+		mount: function ( target, anchor ) {
+			insertNode( p, target, anchor );
+			appendNode( text, p );
+		},
+
+		update: function ( changed, state ) {
+			if ( text_value !== ( text_value = state.foo ) ) {
+				text.data = text_value;
+			}
+		},
+
+		unmount: function () {
+			detachNode( p );
+		},
+
+		destroy: noop
+	};
+}
+
+function SvelteComponent ( options ) {
+	options = options || {};
+	this._state = assign( template.data(), options.data );
+
+	this._observers = {
+		pre: Object.create( null ),
+		post: Object.create( null )
+	};
+
+	this._handlers = Object.create( null );
+
+	this._root = options._root || this;
+	this._yield = options._yield;
+
+	this._torndown = false;
+	if ( !document.getElementById( 'svelte-3590263702-style' ) ) add_css();
+
+	this._fragment = create_main_fragment( this._state, this );
+
+	if ( options.target ) {
+		this._fragment.create();
+		this._fragment.mount( options.target, null );
+	}
+}
+
+assign( SvelteComponent.prototype, proto );
+
+SvelteComponent.prototype._set = function _set ( newState ) {
+	var oldState = this._state;
+	this._state = assign( {}, oldState, newState );
+	dispatchObservers( this, this._observers.pre, newState, oldState );
+	this._fragment.update( newState, this._state );
+	dispatchObservers( this, this._observers.post, newState, oldState );
+};
+
+SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
+	this.fire( 'destroy' );
+
+	if ( detach !== false ) this._fragment.unmount();
+	this._fragment.destroy();
+	this._fragment = null;
+
+	this._state = {};
+	this._torndown = true;
+};
+
+export default SvelteComponent;
diff --git a/test/js/samples/collapses-text-around-comments/expected.js b/test/js/samples/collapses-text-around-comments/expected.js
index dd6f2a3f27..33931b121c 100644
--- a/test/js/samples/collapses-text-around-comments/expected.js
+++ b/test/js/samples/collapses-text-around-comments/expected.js
@@ -1,4 +1,4 @@
-import { appendNode, assign, createElement, createText, detachNode, dispatchObservers, insertNode, proto, setAttribute } from "svelte/shared.js";
+import { appendNode, assign, createElement, createText, detachNode, dispatchObservers, insertNode, noop, proto, setAttribute } from "svelte/shared.js";
 
 var template = (function () {
 	return {
@@ -8,26 +8,30 @@ var template = (function () {
 	};
 }());
 
-var added_css = false;
 function add_css () {
 	var style = createElement( 'style' );
-	style.textContent = "\n\tp[svelte-3842350206], [svelte-3842350206] p {\n\t\tcolor: red;\n\t}\n";
+	style.id = 'svelte-3590263702-style';
+	style.textContent = "\n\tp[svelte-3590263702], [svelte-3590263702] p {\n\t\tcolor: red;\n\t}\n";
 	appendNode( style, document.head );
-
-	added_css = true;
 }
 
 function create_main_fragment ( state, component ) {
-	var text_value;
-
-	var p = createElement( 'p' );
-	setAttribute( p, 'svelte-3842350206', '' );
-	var text = createText( text_value = state.foo );
-	appendNode( text, p );
+	var p, text_value, text;
 
 	return {
+		create: function () {
+			p = createElement( 'p' );
+			text = createText( text_value = state.foo );
+			this.hydrate();
+		},
+
+		hydrate: function ( nodes ) {
+			setAttribute( p, 'svelte-3590263702', '' );
+		},
+
 		mount: function ( target, anchor ) {
 			insertNode( p, target, anchor );
+			appendNode( text, p );
 		},
 
 		update: function ( changed, state ) {
@@ -36,11 +40,11 @@ function create_main_fragment ( state, component ) {
 			}
 		},
 
-		destroy: function ( detach ) {
-			if ( detach ) {
-				detachNode( p );
-			}
-		}
+		unmount: function () {
+			detachNode( p );
+		},
+
+		destroy: noop
 	};
 }
 
@@ -55,14 +59,18 @@ function SvelteComponent ( options ) {
 
 	this._handlers = Object.create( null );
 
-	this._root = options._root;
+	this._root = options._root || this;
 	this._yield = options._yield;
 
 	this._torndown = false;
-	if ( !added_css ) add_css();
+	if ( !document.getElementById( 'svelte-3590263702-style' ) ) add_css();
 
 	this._fragment = create_main_fragment( this._state, this );
-	if ( options.target ) this._fragment.mount( options.target, null );
+
+	if ( options.target ) {
+		this._fragment.create();
+		this._fragment.mount( options.target, null );
+	}
 }
 
 assign( SvelteComponent.prototype, proto );
@@ -71,14 +79,15 @@ SvelteComponent.prototype._set = function _set ( newState ) {
 	var oldState = this._state;
 	this._state = assign( {}, oldState, newState );
 	dispatchObservers( this, this._observers.pre, newState, oldState );
-	if ( this._fragment ) this._fragment.update( newState, this._state );
+	this._fragment.update( newState, this._state );
 	dispatchObservers( this, this._observers.post, newState, oldState );
 };
 
 SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
 	this.fire( 'destroy' );
 
-	this._fragment.destroy( detach !== false );
+	if ( detach !== false ) this._fragment.unmount();
+	this._fragment.destroy();
 	this._fragment = null;
 
 	this._state = {};
diff --git a/test/js/samples/computed-collapsed-if/expected-bundle.js b/test/js/samples/computed-collapsed-if/expected-bundle.js
new file mode 100644
index 0000000000..d82dbc3616
--- /dev/null
+++ b/test/js/samples/computed-collapsed-if/expected-bundle.js
@@ -0,0 +1,189 @@
+function noop() {}
+
+function assign(target) {
+	var k,
+		source,
+		i = 1,
+		len = arguments.length;
+	for (; i < len; i++) {
+		source = arguments[i];
+		for (k in source) target[k] = source[k];
+	}
+
+	return target;
+}
+
+function differs(a, b) {
+	return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, newState, oldState) {
+	for (var key in group) {
+		if (!(key in newState)) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		if (differs(newValue, oldValue)) {
+			var callbacks = group[key];
+			if (!callbacks) continue;
+
+			for (var i = 0; i < callbacks.length; i += 1) {
+				var callback = callbacks[i];
+				if (callback.__calling) continue;
+
+				callback.__calling = true;
+				callback.call(component, newValue, oldValue);
+				callback.__calling = false;
+			}
+		}
+	}
+}
+
+function get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function fire(eventName, data) {
+	var handlers =
+		eventName in this._handlers && this._handlers[eventName].slice();
+	if (!handlers) return;
+
+	for (var i = 0; i < handlers.length; i += 1) {
+		handlers[i].call(this, data);
+	}
+}
+
+function observe(key, callback, options) {
+	var group = options && options.defer
+		? this._observers.post
+		: this._observers.pre;
+
+	(group[key] || (group[key] = [])).push(callback);
+
+	if (!options || options.init !== false) {
+		callback.__calling = true;
+		callback.call(this, this._state[key]);
+		callback.__calling = false;
+	}
+
+	return {
+		cancel: function() {
+			var index = group[key].indexOf(callback);
+			if (~index) group[key].splice(index, 1);
+		}
+	};
+}
+
+function on(eventName, handler) {
+	if (eventName === 'teardown') return this.on('destroy', handler);
+
+	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
+	handlers.push(handler);
+
+	return {
+		cancel: function() {
+			var index = handlers.indexOf(handler);
+			if (~index) handlers.splice(index, 1);
+		}
+	};
+}
+
+function set(newState) {
+	this._set(assign({}, newState));
+	this._root._flush();
+}
+
+function _flush() {
+	if (!this._renderHooks) return;
+
+	while (this._renderHooks.length) {
+		this._renderHooks.pop()();
+	}
+}
+
+var proto = {
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	_flush: _flush
+};
+
+function recompute ( state, newState, oldState, isInitial ) {
+	if ( isInitial || ( 'x' in newState && differs( state.x, oldState.x ) ) ) {
+		state.a = newState.a = template.computed.a( state.x );
+		state.b = newState.b = template.computed.b( state.x );
+	}
+}
+
+var template = (function () {
+	return {
+		computed: {
+			a: x => x * 2,
+			b: x => x * 3
+		}
+	};
+}());
+
+function create_main_fragment ( state, component ) {
+
+	return {
+		create: noop,
+
+		mount: noop,
+
+		unmount: noop,
+
+		destroy: noop
+	};
+}
+
+function SvelteComponent ( options ) {
+	options = options || {};
+	this._state = options.data || {};
+	recompute( this._state, this._state, {}, true );
+
+	this._observers = {
+		pre: Object.create( null ),
+		post: Object.create( null )
+	};
+
+	this._handlers = Object.create( null );
+
+	this._root = options._root || this;
+	this._yield = options._yield;
+
+	this._torndown = false;
+
+	this._fragment = create_main_fragment( this._state, this );
+
+	if ( options.target ) {
+		this._fragment.create();
+		this._fragment.mount( options.target, null );
+	}
+}
+
+assign( SvelteComponent.prototype, proto );
+
+SvelteComponent.prototype._set = function _set ( newState ) {
+	var oldState = this._state;
+	this._state = assign( {}, oldState, newState );
+	recompute( this._state, newState, oldState, false );
+	dispatchObservers( this, this._observers.pre, newState, oldState );
+	dispatchObservers( this, this._observers.post, newState, oldState );
+};
+
+SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
+	this.fire( 'destroy' );
+
+	if ( detach !== false ) this._fragment.unmount();
+	this._fragment.destroy();
+	this._fragment = null;
+
+	this._state = {};
+	this._torndown = true;
+};
+
+export default SvelteComponent;
diff --git a/test/js/samples/computed-collapsed-if/expected.js b/test/js/samples/computed-collapsed-if/expected.js
index 96eb2a6202..e16d023bfb 100644
--- a/test/js/samples/computed-collapsed-if/expected.js
+++ b/test/js/samples/computed-collapsed-if/expected.js
@@ -18,10 +18,13 @@ var template = (function () {
 
 function create_main_fragment ( state, component ) {
 
-
 	return {
+		create: noop,
+
 		mount: noop,
 
+		unmount: noop,
+
 		destroy: noop
 	};
 }
@@ -38,13 +41,17 @@ function SvelteComponent ( options ) {
 
 	this._handlers = Object.create( null );
 
-	this._root = options._root;
+	this._root = options._root || this;
 	this._yield = options._yield;
 
 	this._torndown = false;
 
 	this._fragment = create_main_fragment( this._state, this );
-	if ( options.target ) this._fragment.mount( options.target, null );
+
+	if ( options.target ) {
+		this._fragment.create();
+		this._fragment.mount( options.target, null );
+	}
 }
 
 assign( SvelteComponent.prototype, proto );
@@ -60,7 +67,8 @@ SvelteComponent.prototype._set = function _set ( newState ) {
 SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
 	this.fire( 'destroy' );
 
-	this._fragment.destroy( detach !== false );
+	if ( detach !== false ) this._fragment.unmount();
+	this._fragment.destroy();
 	this._fragment = null;
 
 	this._state = {};
diff --git a/test/js/samples/each-block-changed-check/expected-bundle.js b/test/js/samples/each-block-changed-check/expected-bundle.js
new file mode 100644
index 0000000000..6f3a1a886d
--- /dev/null
+++ b/test/js/samples/each-block-changed-check/expected-bundle.js
@@ -0,0 +1,335 @@
+function noop() {}
+
+function assign(target) {
+	var k,
+		source,
+		i = 1,
+		len = arguments.length;
+	for (; i < len; i++) {
+		source = arguments[i];
+		for (k in source) target[k] = source[k];
+	}
+
+	return target;
+}
+
+function appendNode(node, target) {
+	target.appendChild(node);
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function detachBetween(before, after) {
+	while (before.nextSibling && before.nextSibling !== after) {
+		before.parentNode.removeChild(before.nextSibling);
+	}
+}
+
+// TODO this is out of date
+function destroyEach(iterations, detach, start) {
+	for (var i = start; i < iterations.length; i += 1) {
+		if (iterations[i]) iterations[i].destroy(detach);
+	}
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function createText(data) {
+	return document.createTextNode(data);
+}
+
+function differs(a, b) {
+	return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, newState, oldState) {
+	for (var key in group) {
+		if (!(key in newState)) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		if (differs(newValue, oldValue)) {
+			var callbacks = group[key];
+			if (!callbacks) continue;
+
+			for (var i = 0; i < callbacks.length; i += 1) {
+				var callback = callbacks[i];
+				if (callback.__calling) continue;
+
+				callback.__calling = true;
+				callback.call(component, newValue, oldValue);
+				callback.__calling = false;
+			}
+		}
+	}
+}
+
+function get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function fire(eventName, data) {
+	var handlers =
+		eventName in this._handlers && this._handlers[eventName].slice();
+	if (!handlers) return;
+
+	for (var i = 0; i < handlers.length; i += 1) {
+		handlers[i].call(this, data);
+	}
+}
+
+function observe(key, callback, options) {
+	var group = options && options.defer
+		? this._observers.post
+		: this._observers.pre;
+
+	(group[key] || (group[key] = [])).push(callback);
+
+	if (!options || options.init !== false) {
+		callback.__calling = true;
+		callback.call(this, this._state[key]);
+		callback.__calling = false;
+	}
+
+	return {
+		cancel: function() {
+			var index = group[key].indexOf(callback);
+			if (~index) group[key].splice(index, 1);
+		}
+	};
+}
+
+function on(eventName, handler) {
+	if (eventName === 'teardown') return this.on('destroy', handler);
+
+	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
+	handlers.push(handler);
+
+	return {
+		cancel: function() {
+			var index = handlers.indexOf(handler);
+			if (~index) handlers.splice(index, 1);
+		}
+	};
+}
+
+function set(newState) {
+	this._set(assign({}, newState));
+	this._root._flush();
+}
+
+function _flush() {
+	if (!this._renderHooks) return;
+
+	while (this._renderHooks.length) {
+		this._renderHooks.pop()();
+	}
+}
+
+var proto = {
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	_flush: _flush
+};
+
+function create_main_fragment ( state, component ) {
+	var text, p, text_1_value, text_1;
+
+	var each_block_value = state.comments;
+
+	var each_block_iterations = [];
+
+	for ( var i = 0; i < each_block_value.length; i += 1 ) {
+		each_block_iterations[i] = create_each_block( state, each_block_value, each_block_value[i], i, component );
+	}
+
+	return {
+		create: function () {
+			for ( var i = 0; i < each_block_iterations.length; i += 1 ) {
+				each_block_iterations[i].create();
+			}
+
+			text = createText( "\n\n" );
+			p = createElement( 'p' );
+			text_1 = createText( text_1_value = state.foo );
+		},
+
+		mount: function ( target, anchor ) {
+			for ( var i = 0; i < each_block_iterations.length; i += 1 ) {
+				each_block_iterations[i].mount( target, anchor );
+			}
+
+			insertNode( text, target, anchor );
+			insertNode( p, target, anchor );
+			appendNode( text_1, p );
+		},
+
+		update: function ( changed, state ) {
+			var each_block_value = state.comments;
+
+			if ( 'comments' in changed || 'elapsed' in changed || 'time' in changed ) {
+				for ( var i = 0; i < each_block_value.length; i += 1 ) {
+					if ( each_block_iterations[i] ) {
+						each_block_iterations[i].update( changed, state, each_block_value, each_block_value[i], i );
+					} else {
+						each_block_iterations[i] = create_each_block( state, each_block_value, each_block_value[i], i, component );
+						each_block_iterations[i].create();
+						each_block_iterations[i].mount( text.parentNode, text );
+					}
+				}
+
+				for ( ; i < each_block_iterations.length; i += 1 ) {
+					each_block_iterations[i].unmount();
+					each_block_iterations[i].destroy();
+				}
+				each_block_iterations.length = each_block_value.length;
+			}
+
+			if ( text_1_value !== ( text_1_value = state.foo ) ) {
+				text_1.data = text_1_value;
+			}
+		},
+
+		unmount: function () {
+			for ( var i = 0; i < each_block_iterations.length; i += 1 ) {
+				each_block_iterations[i].unmount();
+			}
+
+			detachNode( text );
+			detachNode( p );
+		},
+
+		destroy: function () {
+			destroyEach( each_block_iterations, false, 0 );
+		}
+	};
+}
+
+function create_each_block ( state, each_block_value, comment, i, component ) {
+	var div, strong, text_value, text, text_1, span, text_2_value, text_2, text_3, text_4_value, text_4, text_5, text_6, raw_value, raw_before, raw_after;
+
+	return {
+		create: function () {
+			div = createElement( 'div' );
+			strong = createElement( 'strong' );
+			text = createText( text_value = i );
+			text_1 = createText( "\n\n\t\t" );
+			span = createElement( 'span' );
+			text_2 = createText( text_2_value = comment.author );
+			text_3 = createText( " wrote " );
+			text_4 = createText( text_4_value = state.elapsed(comment.time, state.time) );
+			text_5 = createText( " ago:" );
+			text_6 = createText( "\n\n\t\t" );
+			raw_before = createElement( 'noscript' );
+			raw_after = createElement( 'noscript' );
+			this.hydrate();
+		},
+
+		hydrate: function ( nodes ) {
+			div.className = "comment";
+			span.className = "meta";
+		},
+
+		mount: function ( target, anchor ) {
+			insertNode( div, target, anchor );
+			appendNode( strong, div );
+			appendNode( text, strong );
+			appendNode( text_1, div );
+			appendNode( span, div );
+			appendNode( text_2, span );
+			appendNode( text_3, span );
+			appendNode( text_4, span );
+			appendNode( text_5, span );
+			appendNode( text_6, div );
+			appendNode( raw_before, div );
+			appendNode( raw_after, div );
+			raw_before.insertAdjacentHTML( 'afterend', raw_value = comment.html );
+		},
+
+		update: function ( changed, state, each_block_value, comment, i ) {
+			if ( text_value !== ( text_value = i ) ) {
+				text.data = text_value;
+			}
+
+			if ( text_2_value !== ( text_2_value = comment.author ) ) {
+				text_2.data = text_2_value;
+			}
+
+			if ( text_4_value !== ( text_4_value = state.elapsed(comment.time, state.time) ) ) {
+				text_4.data = text_4_value;
+			}
+
+			if ( raw_value !== ( raw_value = comment.html ) ) {
+				detachBetween( raw_before, raw_after );
+				raw_before.insertAdjacentHTML( 'afterend', raw_value = comment.html );
+			}
+		},
+
+		unmount: function () {
+			detachBetween( raw_before, raw_after );
+
+			detachNode( div );
+		},
+
+		destroy: noop
+	};
+}
+
+function SvelteComponent ( options ) {
+	options = options || {};
+	this._state = options.data || {};
+
+	this._observers = {
+		pre: Object.create( null ),
+		post: Object.create( null )
+	};
+
+	this._handlers = Object.create( null );
+
+	this._root = options._root || this;
+	this._yield = options._yield;
+
+	this._torndown = false;
+
+	this._fragment = create_main_fragment( this._state, this );
+
+	if ( options.target ) {
+		this._fragment.create();
+		this._fragment.mount( options.target, null );
+	}
+}
+
+assign( SvelteComponent.prototype, proto );
+
+SvelteComponent.prototype._set = function _set ( newState ) {
+	var oldState = this._state;
+	this._state = assign( {}, oldState, newState );
+	dispatchObservers( this, this._observers.pre, newState, oldState );
+	this._fragment.update( newState, this._state );
+	dispatchObservers( this, this._observers.post, newState, oldState );
+};
+
+SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
+	this.fire( 'destroy' );
+
+	if ( detach !== false ) this._fragment.unmount();
+	this._fragment.destroy();
+	this._fragment = null;
+
+	this._state = {};
+	this._torndown = true;
+};
+
+export default SvelteComponent;
diff --git a/test/js/samples/each-block-changed-check/expected.js b/test/js/samples/each-block-changed-check/expected.js
index ea742ff8ed..4fa7680a77 100644
--- a/test/js/samples/each-block-changed-check/expected.js
+++ b/test/js/samples/each-block-changed-check/expected.js
@@ -1,31 +1,35 @@
-import { appendNode, assign, createComment, createElement, createText, destroyEach, detachBetween, detachNode, dispatchObservers, insertNode, proto } from "svelte/shared.js";
+import { appendNode, assign, createElement, createText, destroyEach, detachBetween, detachNode, dispatchObservers, insertNode, noop, proto } from "svelte/shared.js";
 
 function create_main_fragment ( state, component ) {
-	var text_1_value;
+	var text, p, text_1_value, text_1;
 
-	var each_block_anchor = createComment();
 	var each_block_value = state.comments;
+
 	var each_block_iterations = [];
 
 	for ( var i = 0; i < each_block_value.length; i += 1 ) {
 		each_block_iterations[i] = create_each_block( state, each_block_value, each_block_value[i], i, component );
 	}
 
-	var text = createText( "\n\n" );
-	var p = createElement( 'p' );
-	var text_1 = createText( text_1_value = state.foo );
-	appendNode( text_1, p );
-
 	return {
-		mount: function ( target, anchor ) {
-			insertNode( each_block_anchor, target, anchor );
+		create: function () {
+			for ( var i = 0; i < each_block_iterations.length; i += 1 ) {
+				each_block_iterations[i].create();
+			}
+
+			text = createText( "\n\n" );
+			p = createElement( 'p' );
+			text_1 = createText( text_1_value = state.foo );
+		},
 
+		mount: function ( target, anchor ) {
 			for ( var i = 0; i < each_block_iterations.length; i += 1 ) {
-				each_block_iterations[i].mount( target, each_block_anchor );
+				each_block_iterations[i].mount( target, anchor );
 			}
 
 			insertNode( text, target, anchor );
 			insertNode( p, target, anchor );
+			appendNode( text_1, p );
 		},
 
 		update: function ( changed, state ) {
@@ -37,12 +41,15 @@ function create_main_fragment ( state, component ) {
 						each_block_iterations[i].update( changed, state, each_block_value, each_block_value[i], i );
 					} else {
 						each_block_iterations[i] = create_each_block( state, each_block_value, each_block_value[i], i, component );
-						each_block_iterations[i].mount( each_block_anchor.parentNode, each_block_anchor );
+						each_block_iterations[i].create();
+						each_block_iterations[i].mount( text.parentNode, text );
 					}
 				}
 
-				destroyEach( each_block_iterations, true, each_block_value.length );
-
+				for ( ; i < each_block_iterations.length; i += 1 ) {
+					each_block_iterations[i].unmount();
+					each_block_iterations[i].destroy();
+				}
 				each_block_iterations.length = each_block_value.length;
 			}
 
@@ -51,48 +58,60 @@ function create_main_fragment ( state, component ) {
 			}
 		},
 
-		destroy: function ( detach ) {
-			destroyEach( each_block_iterations, detach, 0 );
-
-			if ( detach ) {
-				detachNode( each_block_anchor );
-				detachNode( text );
-				detachNode( p );
+		unmount: function () {
+			for ( var i = 0; i < each_block_iterations.length; i += 1 ) {
+				each_block_iterations[i].unmount();
 			}
+
+			detachNode( text );
+			detachNode( p );
+		},
+
+		destroy: function () {
+			destroyEach( each_block_iterations, false, 0 );
 		}
 	};
 }
 
 function create_each_block ( state, each_block_value, comment, i, component ) {
-	var text_value, text_2_value, text_4_value;
-
-	var div = createElement( 'div' );
-	div.className = "comment";
-	var strong = createElement( 'strong' );
-	appendNode( strong, div );
-	var text = createText( text_value = i );
-	appendNode( text, strong );
-	appendNode( createText( "\n\n\t\t" ), div );
-	var span = createElement( 'span' );
-	appendNode( span, div );
-	span.className = "meta";
-	var text_2 = createText( text_2_value = comment.author );
-	appendNode( text_2, span );
-	appendNode( createText( " wrote " ), span );
-	var text_4 = createText( text_4_value = state.elapsed(comment.time, state.time) );
-	appendNode( text_4, span );
-	appendNode( createText( " ago:" ), span );
-	appendNode( createText( "\n\n\t\t" ), div );
-	var raw_before = createElement( 'noscript' );
-	appendNode( raw_before, div );
-	var raw_after = createElement( 'noscript' );
-	appendNode( raw_after, div );
-	var raw_value = comment.html;
-	raw_before.insertAdjacentHTML( 'afterend', raw_value );
+	var div, strong, text_value, text, text_1, span, text_2_value, text_2, text_3, text_4_value, text_4, text_5, text_6, raw_value, raw_before, raw_after;
 
 	return {
+		create: function () {
+			div = createElement( 'div' );
+			strong = createElement( 'strong' );
+			text = createText( text_value = i );
+			text_1 = createText( "\n\n\t\t" );
+			span = createElement( 'span' );
+			text_2 = createText( text_2_value = comment.author );
+			text_3 = createText( " wrote " );
+			text_4 = createText( text_4_value = state.elapsed(comment.time, state.time) );
+			text_5 = createText( " ago:" );
+			text_6 = createText( "\n\n\t\t" );
+			raw_before = createElement( 'noscript' );
+			raw_after = createElement( 'noscript' );
+			this.hydrate();
+		},
+
+		hydrate: function ( nodes ) {
+			div.className = "comment";
+			span.className = "meta";
+		},
+
 		mount: function ( target, anchor ) {
 			insertNode( div, target, anchor );
+			appendNode( strong, div );
+			appendNode( text, strong );
+			appendNode( text_1, div );
+			appendNode( span, div );
+			appendNode( text_2, span );
+			appendNode( text_3, span );
+			appendNode( text_4, span );
+			appendNode( text_5, span );
+			appendNode( text_6, div );
+			appendNode( raw_before, div );
+			appendNode( raw_after, div );
+			raw_before.insertAdjacentHTML( 'afterend', raw_value = comment.html );
 		},
 
 		update: function ( changed, state, each_block_value, comment, i ) {
@@ -110,17 +129,17 @@ function create_each_block ( state, each_block_value, comment, i, component ) {
 
 			if ( raw_value !== ( raw_value = comment.html ) ) {
 				detachBetween( raw_before, raw_after );
-				raw_before.insertAdjacentHTML( 'afterend', raw_value );
+				raw_before.insertAdjacentHTML( 'afterend', raw_value = comment.html );
 			}
 		},
 
-		destroy: function ( detach ) {
-			if ( detach ) {
-				detachBetween( raw_before, raw_after );
+		unmount: function () {
+			detachBetween( raw_before, raw_after );
 
-				detachNode( div );
-			}
-		}
+			detachNode( div );
+		},
+
+		destroy: noop
 	};
 }
 
@@ -135,13 +154,17 @@ function SvelteComponent ( options ) {
 
 	this._handlers = Object.create( null );
 
-	this._root = options._root;
+	this._root = options._root || this;
 	this._yield = options._yield;
 
 	this._torndown = false;
 
 	this._fragment = create_main_fragment( this._state, this );
-	if ( options.target ) this._fragment.mount( options.target, null );
+
+	if ( options.target ) {
+		this._fragment.create();
+		this._fragment.mount( options.target, null );
+	}
 }
 
 assign( SvelteComponent.prototype, proto );
@@ -150,18 +173,19 @@ SvelteComponent.prototype._set = function _set ( newState ) {
 	var oldState = this._state;
 	this._state = assign( {}, oldState, newState );
 	dispatchObservers( this, this._observers.pre, newState, oldState );
-	if ( this._fragment ) this._fragment.update( newState, this._state );
+	this._fragment.update( newState, this._state );
 	dispatchObservers( this, this._observers.post, newState, oldState );
 };
 
 SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
 	this.fire( 'destroy' );
 
-	this._fragment.destroy( detach !== false );
+	if ( detach !== false ) this._fragment.unmount();
+	this._fragment.destroy();
 	this._fragment = null;
 
 	this._state = {};
 	this._torndown = true;
 };
 
-export default SvelteComponent;
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/event-handlers-custom/expected-bundle.js b/test/js/samples/event-handlers-custom/expected-bundle.js
new file mode 100644
index 0000000000..f7a9c0aa73
--- /dev/null
+++ b/test/js/samples/event-handlers-custom/expected-bundle.js
@@ -0,0 +1,223 @@
+function assign(target) {
+	var k,
+		source,
+		i = 1,
+		len = arguments.length;
+	for (; i < len; i++) {
+		source = arguments[i];
+		for (k in source) target[k] = source[k];
+	}
+
+	return target;
+}
+
+function appendNode(node, target) {
+	target.appendChild(node);
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function createText(data) {
+	return document.createTextNode(data);
+}
+
+function differs(a, b) {
+	return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, newState, oldState) {
+	for (var key in group) {
+		if (!(key in newState)) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		if (differs(newValue, oldValue)) {
+			var callbacks = group[key];
+			if (!callbacks) continue;
+
+			for (var i = 0; i < callbacks.length; i += 1) {
+				var callback = callbacks[i];
+				if (callback.__calling) continue;
+
+				callback.__calling = true;
+				callback.call(component, newValue, oldValue);
+				callback.__calling = false;
+			}
+		}
+	}
+}
+
+function get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function fire(eventName, data) {
+	var handlers =
+		eventName in this._handlers && this._handlers[eventName].slice();
+	if (!handlers) return;
+
+	for (var i = 0; i < handlers.length; i += 1) {
+		handlers[i].call(this, data);
+	}
+}
+
+function observe(key, callback, options) {
+	var group = options && options.defer
+		? this._observers.post
+		: this._observers.pre;
+
+	(group[key] || (group[key] = [])).push(callback);
+
+	if (!options || options.init !== false) {
+		callback.__calling = true;
+		callback.call(this, this._state[key]);
+		callback.__calling = false;
+	}
+
+	return {
+		cancel: function() {
+			var index = group[key].indexOf(callback);
+			if (~index) group[key].splice(index, 1);
+		}
+	};
+}
+
+function on(eventName, handler) {
+	if (eventName === 'teardown') return this.on('destroy', handler);
+
+	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
+	handlers.push(handler);
+
+	return {
+		cancel: function() {
+			var index = handlers.indexOf(handler);
+			if (~index) handlers.splice(index, 1);
+		}
+	};
+}
+
+function set(newState) {
+	this._set(assign({}, newState));
+	this._root._flush();
+}
+
+function _flush() {
+	if (!this._renderHooks) return;
+
+	while (this._renderHooks.length) {
+		this._renderHooks.pop()();
+	}
+}
+
+var proto = {
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	_flush: _flush
+};
+
+var template = (function () {
+	return {
+		methods: {
+			foo ( bar ) {
+				console.log( bar );
+			}
+		},
+		events: {
+			foo ( node, callback ) {
+				// code goes here
+			}
+		}
+	};
+}());
+
+function create_main_fragment ( state, component ) {
+	var button, foo_handler, text;
+
+	return {
+		create: function () {
+			button = createElement( 'button' );
+			text = createText( "foo" );
+			this.hydrate();
+		},
+
+		hydrate: function ( nodes ) {
+			foo_handler = template.events.foo.call( component, button, function ( event ) {
+				var state = component.get();
+				component.foo( state.bar );
+			});
+		},
+
+		mount: function ( target, anchor ) {
+			insertNode( button, target, anchor );
+			appendNode( text, button );
+		},
+
+		unmount: function () {
+			detachNode( button );
+		},
+
+		destroy: function () {
+			foo_handler.teardown();
+		}
+	};
+}
+
+function SvelteComponent ( options ) {
+	options = options || {};
+	this._state = options.data || {};
+
+	this._observers = {
+		pre: Object.create( null ),
+		post: Object.create( null )
+	};
+
+	this._handlers = Object.create( null );
+
+	this._root = options._root || this;
+	this._yield = options._yield;
+
+	this._torndown = false;
+
+	this._fragment = create_main_fragment( this._state, this );
+
+	if ( options.target ) {
+		this._fragment.create();
+		this._fragment.mount( options.target, null );
+	}
+}
+
+assign( SvelteComponent.prototype, template.methods, proto );
+
+SvelteComponent.prototype._set = function _set ( newState ) {
+	var oldState = this._state;
+	this._state = assign( {}, oldState, newState );
+	dispatchObservers( this, this._observers.pre, newState, oldState );
+	dispatchObservers( this, this._observers.post, newState, oldState );
+};
+
+SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
+	this.fire( 'destroy' );
+
+	if ( detach !== false ) this._fragment.unmount();
+	this._fragment.destroy();
+	this._fragment = null;
+
+	this._state = {};
+	this._torndown = true;
+};
+
+export default SvelteComponent;
diff --git a/test/js/samples/event-handlers-custom/expected.js b/test/js/samples/event-handlers-custom/expected.js
index 5fcfff19e2..882bc08e85 100644
--- a/test/js/samples/event-handlers-custom/expected.js
+++ b/test/js/samples/event-handlers-custom/expected.js
@@ -16,26 +16,33 @@ var template = (function () {
 }());
 
 function create_main_fragment ( state, component ) {
-	var button = createElement( 'button' );
+	var button, foo_handler, text;
 
-	var foo_handler = template.events.foo.call( component, button, function ( event ) {
-		var state = component.get();
-		component.foo( state.bar );
-	});
+	return {
+		create: function () {
+			button = createElement( 'button' );
+			text = createText( "foo" );
+			this.hydrate();
+		},
 
-	appendNode( createText( "foo" ), button );
+		hydrate: function ( nodes ) {
+			foo_handler = template.events.foo.call( component, button, function ( event ) {
+				var state = component.get();
+				component.foo( state.bar );
+			});
+		},
 
-	return {
 		mount: function ( target, anchor ) {
 			insertNode( button, target, anchor );
+			appendNode( text, button );
 		},
 
-		destroy: function ( detach ) {
-			foo_handler.teardown();
+		unmount: function () {
+			detachNode( button );
+		},
 
-			if ( detach ) {
-				detachNode( button );
-			}
+		destroy: function () {
+			foo_handler.teardown();
 		}
 	};
 }
@@ -51,13 +58,17 @@ function SvelteComponent ( options ) {
 
 	this._handlers = Object.create( null );
 
-	this._root = options._root;
+	this._root = options._root || this;
 	this._yield = options._yield;
 
 	this._torndown = false;
 
 	this._fragment = create_main_fragment( this._state, this );
-	if ( options.target ) this._fragment.mount( options.target, null );
+
+	if ( options.target ) {
+		this._fragment.create();
+		this._fragment.mount( options.target, null );
+	}
 }
 
 assign( SvelteComponent.prototype, template.methods, proto );
@@ -72,7 +83,8 @@ SvelteComponent.prototype._set = function _set ( newState ) {
 SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
 	this.fire( 'destroy' );
 
-	this._fragment.destroy( detach !== false );
+	if ( detach !== false ) this._fragment.unmount();
+	this._fragment.destroy();
 	this._fragment = null;
 
 	this._state = {};
diff --git a/test/js/samples/if-block-no-update/expected-bundle.js b/test/js/samples/if-block-no-update/expected-bundle.js
new file mode 100644
index 0000000000..e017940f2e
--- /dev/null
+++ b/test/js/samples/if-block-no-update/expected-bundle.js
@@ -0,0 +1,270 @@
+function noop() {}
+
+function assign(target) {
+	var k,
+		source,
+		i = 1,
+		len = arguments.length;
+	for (; i < len; i++) {
+		source = arguments[i];
+		for (k in source) target[k] = source[k];
+	}
+
+	return target;
+}
+
+function appendNode(node, target) {
+	target.appendChild(node);
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function createText(data) {
+	return document.createTextNode(data);
+}
+
+function createComment() {
+	return document.createComment('');
+}
+
+function differs(a, b) {
+	return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, newState, oldState) {
+	for (var key in group) {
+		if (!(key in newState)) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		if (differs(newValue, oldValue)) {
+			var callbacks = group[key];
+			if (!callbacks) continue;
+
+			for (var i = 0; i < callbacks.length; i += 1) {
+				var callback = callbacks[i];
+				if (callback.__calling) continue;
+
+				callback.__calling = true;
+				callback.call(component, newValue, oldValue);
+				callback.__calling = false;
+			}
+		}
+	}
+}
+
+function get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function fire(eventName, data) {
+	var handlers =
+		eventName in this._handlers && this._handlers[eventName].slice();
+	if (!handlers) return;
+
+	for (var i = 0; i < handlers.length; i += 1) {
+		handlers[i].call(this, data);
+	}
+}
+
+function observe(key, callback, options) {
+	var group = options && options.defer
+		? this._observers.post
+		: this._observers.pre;
+
+	(group[key] || (group[key] = [])).push(callback);
+
+	if (!options || options.init !== false) {
+		callback.__calling = true;
+		callback.call(this, this._state[key]);
+		callback.__calling = false;
+	}
+
+	return {
+		cancel: function() {
+			var index = group[key].indexOf(callback);
+			if (~index) group[key].splice(index, 1);
+		}
+	};
+}
+
+function on(eventName, handler) {
+	if (eventName === 'teardown') return this.on('destroy', handler);
+
+	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
+	handlers.push(handler);
+
+	return {
+		cancel: function() {
+			var index = handlers.indexOf(handler);
+			if (~index) handlers.splice(index, 1);
+		}
+	};
+}
+
+function set(newState) {
+	this._set(assign({}, newState));
+	this._root._flush();
+}
+
+function _flush() {
+	if (!this._renderHooks) return;
+
+	while (this._renderHooks.length) {
+		this._renderHooks.pop()();
+	}
+}
+
+var proto = {
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	_flush: _flush
+};
+
+function create_main_fragment ( state, component ) {
+	var if_block_anchor;
+
+	function get_block ( state ) {
+		if ( state.foo ) return create_if_block;
+		return create_if_block_1;
+	}
+
+	var current_block = get_block( state );
+	var if_block = current_block( state, component );
+
+	return {
+		create: function () {
+			if_block.create();
+			if_block_anchor = createComment();
+		},
+
+		mount: function ( target, anchor ) {
+			if_block.mount( target, anchor );
+			insertNode( if_block_anchor, target, anchor );
+		},
+
+		update: function ( changed, state ) {
+			if ( current_block !== ( current_block = get_block( state ) ) ) {
+				if_block.unmount();
+				if_block.destroy();
+				if_block = current_block( state, component );
+				if_block.create();
+				if_block.mount( if_block_anchor.parentNode, if_block_anchor );
+			}
+		},
+
+		unmount: function () {
+			if_block.unmount();
+			detachNode( if_block_anchor );
+		},
+
+		destroy: function () {
+			if_block.destroy();
+		}
+	};
+}
+
+function create_if_block ( state, component ) {
+	var p, text;
+
+	return {
+		create: function () {
+			p = createElement( 'p' );
+			text = createText( "foo!" );
+		},
+
+		mount: function ( target, anchor ) {
+			insertNode( p, target, anchor );
+			appendNode( text, p );
+		},
+
+		unmount: function () {
+			detachNode( p );
+		},
+
+		destroy: noop
+	};
+}
+
+function create_if_block_1 ( state, component ) {
+	var p, text;
+
+	return {
+		create: function () {
+			p = createElement( 'p' );
+			text = createText( "not foo!" );
+		},
+
+		mount: function ( target, anchor ) {
+			insertNode( p, target, anchor );
+			appendNode( text, p );
+		},
+
+		unmount: function () {
+			detachNode( p );
+		},
+
+		destroy: noop
+	};
+}
+
+function SvelteComponent ( options ) {
+	options = options || {};
+	this._state = options.data || {};
+
+	this._observers = {
+		pre: Object.create( null ),
+		post: Object.create( null )
+	};
+
+	this._handlers = Object.create( null );
+
+	this._root = options._root || this;
+	this._yield = options._yield;
+
+	this._torndown = false;
+
+	this._fragment = create_main_fragment( this._state, this );
+
+	if ( options.target ) {
+		this._fragment.create();
+		this._fragment.mount( options.target, null );
+	}
+}
+
+assign( SvelteComponent.prototype, proto );
+
+SvelteComponent.prototype._set = function _set ( newState ) {
+	var oldState = this._state;
+	this._state = assign( {}, oldState, newState );
+	dispatchObservers( this, this._observers.pre, newState, oldState );
+	this._fragment.update( newState, this._state );
+	dispatchObservers( this, this._observers.post, newState, oldState );
+};
+
+SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
+	this.fire( 'destroy' );
+
+	if ( detach !== false ) this._fragment.unmount();
+	this._fragment.destroy();
+	this._fragment = null;
+
+	this._state = {};
+	this._torndown = true;
+};
+
+export default SvelteComponent;
diff --git a/test/js/samples/if-block-no-update/expected.js b/test/js/samples/if-block-no-update/expected.js
index 1ed5eb2e7f..fdedd6e4a7 100644
--- a/test/js/samples/if-block-no-update/expected.js
+++ b/test/js/samples/if-block-no-update/expected.js
@@ -1,7 +1,7 @@
-import { appendNode, assign, createComment, createElement, createText, detachNode, dispatchObservers, insertNode, proto } from "svelte/shared.js";
+import { appendNode, assign, createComment, createElement, createText, detachNode, dispatchObservers, insertNode, noop, proto } from "svelte/shared.js";
 
 function create_main_fragment ( state, component ) {
-	var if_block_anchor = createComment();
+	var if_block_anchor;
 
 	function get_block ( state ) {
 		if ( state.foo ) return create_if_block;
@@ -9,63 +9,81 @@ function create_main_fragment ( state, component ) {
 	}
 
 	var current_block = get_block( state );
-	var if_block = current_block && current_block( state, component );
+	var if_block = current_block( state, component );
 
 	return {
+		create: function () {
+			if_block.create();
+			if_block_anchor = createComment();
+		},
+
 		mount: function ( target, anchor ) {
+			if_block.mount( target, anchor );
 			insertNode( if_block_anchor, target, anchor );
-			if ( if_block ) if_block.mount( target, if_block_anchor );
 		},
 
 		update: function ( changed, state ) {
 			if ( current_block !== ( current_block = get_block( state ) ) ) {
-				if ( if_block ) if_block.destroy( true );
-				if_block = current_block && current_block( state, component );
-				if ( if_block ) if_block.mount( if_block_anchor.parentNode, if_block_anchor );
+				if_block.unmount();
+				if_block.destroy();
+				if_block = current_block( state, component );
+				if_block.create();
+				if_block.mount( if_block_anchor.parentNode, if_block_anchor );
 			}
 		},
 
-		destroy: function ( detach ) {
-			if ( if_block ) if_block.destroy( detach );
+		unmount: function () {
+			if_block.unmount();
+			detachNode( if_block_anchor );
+		},
 
-			if ( detach ) {
-				detachNode( if_block_anchor );
-			}
+		destroy: function () {
+			if_block.destroy();
 		}
 	};
 }
 
 function create_if_block ( state, component ) {
-	var p = createElement( 'p' );
-	appendNode( createText( "foo!" ), p );
+	var p, text;
 
 	return {
+		create: function () {
+			p = createElement( 'p' );
+			text = createText( "foo!" );
+		},
+
 		mount: function ( target, anchor ) {
 			insertNode( p, target, anchor );
+			appendNode( text, p );
 		},
 
-		destroy: function ( detach ) {
-			if ( detach ) {
-				detachNode( p );
-			}
-		}
+		unmount: function () {
+			detachNode( p );
+		},
+
+		destroy: noop
 	};
 }
 
 function create_if_block_1 ( state, component ) {
-	var p = createElement( 'p' );
-	appendNode( createText( "not foo!" ), p );
+	var p, text;
 
 	return {
+		create: function () {
+			p = createElement( 'p' );
+			text = createText( "not foo!" );
+		},
+
 		mount: function ( target, anchor ) {
 			insertNode( p, target, anchor );
+			appendNode( text, p );
 		},
 
-		destroy: function ( detach ) {
-			if ( detach ) {
-				detachNode( p );
-			}
-		}
+		unmount: function () {
+			detachNode( p );
+		},
+
+		destroy: noop
 	};
 }
 
@@ -80,13 +98,17 @@ function SvelteComponent ( options ) {
 
 	this._handlers = Object.create( null );
 
-	this._root = options._root;
+	this._root = options._root || this;
 	this._yield = options._yield;
 
 	this._torndown = false;
 
 	this._fragment = create_main_fragment( this._state, this );
-	if ( options.target ) this._fragment.mount( options.target, null );
+
+	if ( options.target ) {
+		this._fragment.create();
+		this._fragment.mount( options.target, null );
+	}
 }
 
 assign( SvelteComponent.prototype, proto );
@@ -95,14 +117,15 @@ SvelteComponent.prototype._set = function _set ( newState ) {
 	var oldState = this._state;
 	this._state = assign( {}, oldState, newState );
 	dispatchObservers( this, this._observers.pre, newState, oldState );
-	if ( this._fragment ) this._fragment.update( newState, this._state );
+	this._fragment.update( newState, this._state );
 	dispatchObservers( this, this._observers.post, newState, oldState );
 };
 
 SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
 	this.fire( 'destroy' );
 
-	this._fragment.destroy( detach !== false );
+	if ( detach !== false ) this._fragment.unmount();
+	this._fragment.destroy();
 	this._fragment = null;
 
 	this._state = {};
diff --git a/test/js/samples/if-block-simple/expected-bundle.js b/test/js/samples/if-block-simple/expected-bundle.js
new file mode 100644
index 0000000000..13695550b0
--- /dev/null
+++ b/test/js/samples/if-block-simple/expected-bundle.js
@@ -0,0 +1,246 @@
+function noop() {}
+
+function assign(target) {
+	var k,
+		source,
+		i = 1,
+		len = arguments.length;
+	for (; i < len; i++) {
+		source = arguments[i];
+		for (k in source) target[k] = source[k];
+	}
+
+	return target;
+}
+
+function appendNode(node, target) {
+	target.appendChild(node);
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function createText(data) {
+	return document.createTextNode(data);
+}
+
+function createComment() {
+	return document.createComment('');
+}
+
+function differs(a, b) {
+	return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, newState, oldState) {
+	for (var key in group) {
+		if (!(key in newState)) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		if (differs(newValue, oldValue)) {
+			var callbacks = group[key];
+			if (!callbacks) continue;
+
+			for (var i = 0; i < callbacks.length; i += 1) {
+				var callback = callbacks[i];
+				if (callback.__calling) continue;
+
+				callback.__calling = true;
+				callback.call(component, newValue, oldValue);
+				callback.__calling = false;
+			}
+		}
+	}
+}
+
+function get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function fire(eventName, data) {
+	var handlers =
+		eventName in this._handlers && this._handlers[eventName].slice();
+	if (!handlers) return;
+
+	for (var i = 0; i < handlers.length; i += 1) {
+		handlers[i].call(this, data);
+	}
+}
+
+function observe(key, callback, options) {
+	var group = options && options.defer
+		? this._observers.post
+		: this._observers.pre;
+
+	(group[key] || (group[key] = [])).push(callback);
+
+	if (!options || options.init !== false) {
+		callback.__calling = true;
+		callback.call(this, this._state[key]);
+		callback.__calling = false;
+	}
+
+	return {
+		cancel: function() {
+			var index = group[key].indexOf(callback);
+			if (~index) group[key].splice(index, 1);
+		}
+	};
+}
+
+function on(eventName, handler) {
+	if (eventName === 'teardown') return this.on('destroy', handler);
+
+	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
+	handlers.push(handler);
+
+	return {
+		cancel: function() {
+			var index = handlers.indexOf(handler);
+			if (~index) handlers.splice(index, 1);
+		}
+	};
+}
+
+function set(newState) {
+	this._set(assign({}, newState));
+	this._root._flush();
+}
+
+function _flush() {
+	if (!this._renderHooks) return;
+
+	while (this._renderHooks.length) {
+		this._renderHooks.pop()();
+	}
+}
+
+var proto = {
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	_flush: _flush
+};
+
+function create_main_fragment ( state, component ) {
+	var if_block_anchor;
+
+	var if_block = (state.foo) && create_if_block( state, component );
+
+	return {
+		create: function () {
+			if ( if_block ) if_block.create();
+			if_block_anchor = createComment();
+		},
+
+		mount: function ( target, anchor ) {
+			if ( if_block ) if_block.mount( target, anchor );
+			insertNode( if_block_anchor, target, anchor );
+		},
+
+		update: function ( changed, state ) {
+			if ( state.foo ) {
+				if ( !if_block ) {
+					if_block = create_if_block( state, component );
+					if_block.create();
+					if_block.mount( if_block_anchor.parentNode, if_block_anchor );
+				}
+			} else if ( if_block ) {
+				if_block.unmount();
+				if_block.destroy();
+				if_block = null;
+			}
+		},
+
+		unmount: function () {
+			if ( if_block ) if_block.unmount();
+			detachNode( if_block_anchor );
+		},
+
+		destroy: function () {
+			if ( if_block ) if_block.destroy();
+		}
+	};
+}
+
+function create_if_block ( state, component ) {
+	var p, text;
+
+	return {
+		create: function () {
+			p = createElement( 'p' );
+			text = createText( "foo!" );
+		},
+
+		mount: function ( target, anchor ) {
+			insertNode( p, target, anchor );
+			appendNode( text, p );
+		},
+
+		unmount: function () {
+			detachNode( p );
+		},
+
+		destroy: noop
+	};
+}
+
+function SvelteComponent ( options ) {
+	options = options || {};
+	this._state = options.data || {};
+
+	this._observers = {
+		pre: Object.create( null ),
+		post: Object.create( null )
+	};
+
+	this._handlers = Object.create( null );
+
+	this._root = options._root || this;
+	this._yield = options._yield;
+
+	this._torndown = false;
+
+	this._fragment = create_main_fragment( this._state, this );
+
+	if ( options.target ) {
+		this._fragment.create();
+		this._fragment.mount( options.target, null );
+	}
+}
+
+assign( SvelteComponent.prototype, proto );
+
+SvelteComponent.prototype._set = function _set ( newState ) {
+	var oldState = this._state;
+	this._state = assign( {}, oldState, newState );
+	dispatchObservers( this, this._observers.pre, newState, oldState );
+	this._fragment.update( newState, this._state );
+	dispatchObservers( this, this._observers.post, newState, oldState );
+};
+
+SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
+	this.fire( 'destroy' );
+
+	if ( detach !== false ) this._fragment.unmount();
+	this._fragment.destroy();
+	this._fragment = null;
+
+	this._state = {};
+	this._torndown = true;
+};
+
+export default SvelteComponent;
diff --git a/test/js/samples/if-block-simple/expected.js b/test/js/samples/if-block-simple/expected.js
index fcdd72f55d..548938d59c 100644
--- a/test/js/samples/if-block-simple/expected.js
+++ b/test/js/samples/if-block-simple/expected.js
@@ -1,52 +1,65 @@
-import { appendNode, assign, createComment, createElement, createText, detachNode, dispatchObservers, insertNode, proto } from "svelte/shared.js";
+import { appendNode, assign, createComment, createElement, createText, detachNode, dispatchObservers, insertNode, noop, proto } from "svelte/shared.js";
 
 function create_main_fragment ( state, component ) {
-	var if_block_anchor = createComment();
+	var if_block_anchor;
 
-	var if_block = state.foo && create_if_block( state, component );
+	var if_block = (state.foo) && create_if_block( state, component );
 
 	return {
+		create: function () {
+			if ( if_block ) if_block.create();
+			if_block_anchor = createComment();
+		},
+
 		mount: function ( target, anchor ) {
+			if ( if_block ) if_block.mount( target, anchor );
 			insertNode( if_block_anchor, target, anchor );
-			if ( if_block ) if_block.mount( target, if_block_anchor );
 		},
 
 		update: function ( changed, state ) {
 			if ( state.foo ) {
 				if ( !if_block ) {
 					if_block = create_if_block( state, component );
+					if_block.create();
 					if_block.mount( if_block_anchor.parentNode, if_block_anchor );
 				}
 			} else if ( if_block ) {
-				if_block.destroy( true );
+				if_block.unmount();
+				if_block.destroy();
 				if_block = null;
 			}
 		},
 
-		destroy: function ( detach ) {
-			if ( if_block ) if_block.destroy( detach );
+		unmount: function () {
+			if ( if_block ) if_block.unmount();
+			detachNode( if_block_anchor );
+		},
 
-			if ( detach ) {
-				detachNode( if_block_anchor );
-			}
+		destroy: function () {
+			if ( if_block ) if_block.destroy();
 		}
 	};
 }
 
 function create_if_block ( state, component ) {
-	var p = createElement( 'p' );
-	appendNode( createText( "foo!" ), p );
+	var p, text;
 
 	return {
+		create: function () {
+			p = createElement( 'p' );
+			text = createText( "foo!" );
+		},
+
 		mount: function ( target, anchor ) {
 			insertNode( p, target, anchor );
+			appendNode( text, p );
 		},
 
-		destroy: function ( detach ) {
-			if ( detach ) {
-				detachNode( p );
-			}
-		}
+		unmount: function () {
+			detachNode( p );
+		},
+
+		destroy: noop
 	};
 }
 
@@ -61,13 +74,17 @@ function SvelteComponent ( options ) {
 
 	this._handlers = Object.create( null );
 
-	this._root = options._root;
+	this._root = options._root || this;
 	this._yield = options._yield;
 
 	this._torndown = false;
 
 	this._fragment = create_main_fragment( this._state, this );
-	if ( options.target ) this._fragment.mount( options.target, null );
+
+	if ( options.target ) {
+		this._fragment.create();
+		this._fragment.mount( options.target, null );
+	}
 }
 
 assign( SvelteComponent.prototype, proto );
@@ -76,14 +93,15 @@ SvelteComponent.prototype._set = function _set ( newState ) {
 	var oldState = this._state;
 	this._state = assign( {}, oldState, newState );
 	dispatchObservers( this, this._observers.pre, newState, oldState );
-	if ( this._fragment ) this._fragment.update( newState, this._state );
+	this._fragment.update( newState, this._state );
 	dispatchObservers( this, this._observers.post, newState, oldState );
 };
 
 SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
 	this.fire( 'destroy' );
 
-	this._fragment.destroy( detach !== false );
+	if ( detach !== false ) this._fragment.unmount();
+	this._fragment.destroy();
 	this._fragment = null;
 
 	this._state = {};
diff --git a/test/js/samples/non-imported-component/expected-bundle.js b/test/js/samples/non-imported-component/expected-bundle.js
new file mode 100644
index 0000000000..06e2ea9a7d
--- /dev/null
+++ b/test/js/samples/non-imported-component/expected-bundle.js
@@ -0,0 +1,218 @@
+import Imported from 'Imported.html';
+
+function assign(target) {
+	var k,
+		source,
+		i = 1,
+		len = arguments.length;
+	for (; i < len; i++) {
+		source = arguments[i];
+		for (k in source) target[k] = source[k];
+	}
+
+	return target;
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createText(data) {
+	return document.createTextNode(data);
+}
+
+function differs(a, b) {
+	return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, newState, oldState) {
+	for (var key in group) {
+		if (!(key in newState)) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		if (differs(newValue, oldValue)) {
+			var callbacks = group[key];
+			if (!callbacks) continue;
+
+			for (var i = 0; i < callbacks.length; i += 1) {
+				var callback = callbacks[i];
+				if (callback.__calling) continue;
+
+				callback.__calling = true;
+				callback.call(component, newValue, oldValue);
+				callback.__calling = false;
+			}
+		}
+	}
+}
+
+function get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function fire(eventName, data) {
+	var handlers =
+		eventName in this._handlers && this._handlers[eventName].slice();
+	if (!handlers) return;
+
+	for (var i = 0; i < handlers.length; i += 1) {
+		handlers[i].call(this, data);
+	}
+}
+
+function observe(key, callback, options) {
+	var group = options && options.defer
+		? this._observers.post
+		: this._observers.pre;
+
+	(group[key] || (group[key] = [])).push(callback);
+
+	if (!options || options.init !== false) {
+		callback.__calling = true;
+		callback.call(this, this._state[key]);
+		callback.__calling = false;
+	}
+
+	return {
+		cancel: function() {
+			var index = group[key].indexOf(callback);
+			if (~index) group[key].splice(index, 1);
+		}
+	};
+}
+
+function on(eventName, handler) {
+	if (eventName === 'teardown') return this.on('destroy', handler);
+
+	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
+	handlers.push(handler);
+
+	return {
+		cancel: function() {
+			var index = handlers.indexOf(handler);
+			if (~index) handlers.splice(index, 1);
+		}
+	};
+}
+
+function set(newState) {
+	this._set(assign({}, newState));
+	this._root._flush();
+}
+
+function _flush() {
+	if (!this._renderHooks) return;
+
+	while (this._renderHooks.length) {
+		this._renderHooks.pop()();
+	}
+}
+
+var proto = {
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	_flush: _flush
+};
+
+var template = (function () {
+	return {
+		components: {
+			NonImported
+		}
+	};
+}());
+
+function create_main_fragment ( state, component ) {
+	var text;
+
+	var imported = new Imported({
+		_root: component._root
+	});
+
+	var nonimported = new template.components.NonImported({
+		_root: component._root
+	});
+
+	return {
+		create: function () {
+			imported._fragment.create();
+			text = createText( "\n" );
+			nonimported._fragment.create();
+		},
+
+		mount: function ( target, anchor ) {
+			imported._fragment.mount( target, anchor );
+			insertNode( text, target, anchor );
+			nonimported._fragment.mount( target, anchor );
+		},
+
+		unmount: function () {
+			imported._fragment.unmount();
+			detachNode( text );
+			nonimported._fragment.unmount();
+		},
+
+		destroy: function () {
+			imported.destroy( false );
+			nonimported.destroy( false );
+		}
+	};
+}
+
+function SvelteComponent ( options ) {
+	options = options || {};
+	this._state = options.data || {};
+
+	this._observers = {
+		pre: Object.create( null ),
+		post: Object.create( null )
+	};
+
+	this._handlers = Object.create( null );
+
+	this._root = options._root || this;
+	this._yield = options._yield;
+
+	this._torndown = false;
+	this._renderHooks = [];
+
+	this._fragment = create_main_fragment( this._state, this );
+
+	if ( options.target ) {
+		this._fragment.create();
+		this._fragment.mount( options.target, null );
+	}
+	this._flush();
+}
+
+assign( SvelteComponent.prototype, proto );
+
+SvelteComponent.prototype._set = function _set ( newState ) {
+	var oldState = this._state;
+	this._state = assign( {}, oldState, newState );
+	dispatchObservers( this, this._observers.pre, newState, oldState );
+	dispatchObservers( this, this._observers.post, newState, oldState );
+	this._flush();
+};
+
+SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
+	this.fire( 'destroy' );
+
+	if ( detach !== false ) this._fragment.unmount();
+	this._fragment.destroy();
+	this._fragment = null;
+
+	this._state = {};
+	this._torndown = true;
+};
+
+export default SvelteComponent;
diff --git a/test/js/samples/non-imported-component/expected.js b/test/js/samples/non-imported-component/expected.js
new file mode 100644
index 0000000000..c4ebb32172
--- /dev/null
+++ b/test/js/samples/non-imported-component/expected.js
@@ -0,0 +1,97 @@
+import Imported from 'Imported.html';
+
+import { assign, createText, detachNode, dispatchObservers, insertNode, proto } from "svelte/shared.js";
+
+var template = (function () {
+	return {
+		components: {
+			NonImported
+		}
+	};
+}());
+
+function create_main_fragment ( state, component ) {
+	var text;
+
+	var imported = new Imported({
+		_root: component._root
+	});
+
+	var nonimported = new template.components.NonImported({
+		_root: component._root
+	});
+
+	return {
+		create: function () {
+			imported._fragment.create();
+			text = createText( "\n" );
+			nonimported._fragment.create();
+		},
+
+		mount: function ( target, anchor ) {
+			imported._fragment.mount( target, anchor );
+			insertNode( text, target, anchor );
+			nonimported._fragment.mount( target, anchor );
+		},
+
+		unmount: function () {
+			imported._fragment.unmount();
+			detachNode( text );
+			nonimported._fragment.unmount();
+		},
+
+		destroy: function () {
+			imported.destroy( false );
+			nonimported.destroy( false );
+		}
+	};
+}
+
+function SvelteComponent ( options ) {
+	options = options || {};
+	this._state = options.data || {};
+
+	this._observers = {
+		pre: Object.create( null ),
+		post: Object.create( null )
+	};
+
+	this._handlers = Object.create( null );
+
+	this._root = options._root || this;
+	this._yield = options._yield;
+
+	this._torndown = false;
+	this._renderHooks = [];
+
+	this._fragment = create_main_fragment( this._state, this );
+
+	if ( options.target ) {
+		this._fragment.create();
+		this._fragment.mount( options.target, null );
+	}
+	this._flush();
+}
+
+assign( SvelteComponent.prototype, proto );
+
+SvelteComponent.prototype._set = function _set ( newState ) {
+	var oldState = this._state;
+	this._state = assign( {}, oldState, newState );
+	dispatchObservers( this, this._observers.pre, newState, oldState );
+	dispatchObservers( this, this._observers.post, newState, oldState );
+	this._flush();
+};
+
+SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
+	this.fire( 'destroy' );
+
+	if ( detach !== false ) this._fragment.unmount();
+	this._fragment.destroy();
+	this._fragment = null;
+
+	this._state = {};
+	this._torndown = true;
+};
+
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/non-imported-component/input.html b/test/js/samples/non-imported-component/input.html
new file mode 100644
index 0000000000..f65561020e
--- /dev/null
+++ b/test/js/samples/non-imported-component/input.html
@@ -0,0 +1,13 @@
+<Imported/>
+<NonImported/>
+
+<script>
+	import Imported from 'Imported.html';
+
+	export default {
+		components: {
+			Imported,
+			NonImported
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js
new file mode 100644
index 0000000000..6998c7b5e0
--- /dev/null
+++ b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js
@@ -0,0 +1,186 @@
+function noop() {}
+
+function assign(target) {
+	var k,
+		source,
+		i = 1,
+		len = arguments.length;
+	for (; i < len; i++) {
+		source = arguments[i];
+		for (k in source) target[k] = source[k];
+	}
+
+	return target;
+}
+
+function differs(a, b) {
+	return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, newState, oldState) {
+	for (var key in group) {
+		if (!(key in newState)) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		if (differs(newValue, oldValue)) {
+			var callbacks = group[key];
+			if (!callbacks) continue;
+
+			for (var i = 0; i < callbacks.length; i += 1) {
+				var callback = callbacks[i];
+				if (callback.__calling) continue;
+
+				callback.__calling = true;
+				callback.call(component, newValue, oldValue);
+				callback.__calling = false;
+			}
+		}
+	}
+}
+
+function get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function fire(eventName, data) {
+	var handlers =
+		eventName in this._handlers && this._handlers[eventName].slice();
+	if (!handlers) return;
+
+	for (var i = 0; i < handlers.length; i += 1) {
+		handlers[i].call(this, data);
+	}
+}
+
+function observe(key, callback, options) {
+	var group = options && options.defer
+		? this._observers.post
+		: this._observers.pre;
+
+	(group[key] || (group[key] = [])).push(callback);
+
+	if (!options || options.init !== false) {
+		callback.__calling = true;
+		callback.call(this, this._state[key]);
+		callback.__calling = false;
+	}
+
+	return {
+		cancel: function() {
+			var index = group[key].indexOf(callback);
+			if (~index) group[key].splice(index, 1);
+		}
+	};
+}
+
+function on(eventName, handler) {
+	if (eventName === 'teardown') return this.on('destroy', handler);
+
+	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
+	handlers.push(handler);
+
+	return {
+		cancel: function() {
+			var index = handlers.indexOf(handler);
+			if (~index) handlers.splice(index, 1);
+		}
+	};
+}
+
+function set(newState) {
+	this._set(assign({}, newState));
+	this._root._flush();
+}
+
+function _flush() {
+	if (!this._renderHooks) return;
+
+	while (this._renderHooks.length) {
+		this._renderHooks.pop()();
+	}
+}
+
+var proto = {
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	_flush: _flush
+};
+
+var template = (function () {
+	return {
+		// this test should be removed in v2
+		oncreate () {},
+		ondestroy () {}
+	};
+}());
+
+function create_main_fragment ( state, component ) {
+
+	return {
+		create: noop,
+
+		mount: noop,
+
+		unmount: noop,
+
+		destroy: noop
+	};
+}
+
+function SvelteComponent ( options ) {
+	options = options || {};
+	this._state = options.data || {};
+
+	this._observers = {
+		pre: Object.create( null ),
+		post: Object.create( null )
+	};
+
+	this._handlers = Object.create( null );
+
+	this._root = options._root || this;
+	this._yield = options._yield;
+
+	this._torndown = false;
+
+	this._fragment = create_main_fragment( this._state, this );
+
+	if ( options.target ) {
+		this._fragment.create();
+		this._fragment.mount( options.target, null );
+	}
+
+	if ( options._root ) {
+		options._root._renderHooks.push( template.oncreate.bind( this ) );
+	} else {
+		template.oncreate.call( this );
+	}
+}
+
+assign( SvelteComponent.prototype, proto );
+
+SvelteComponent.prototype._set = function _set ( newState ) {
+	var oldState = this._state;
+	this._state = assign( {}, oldState, newState );
+	dispatchObservers( this, this._observers.pre, newState, oldState );
+	dispatchObservers( this, this._observers.post, newState, oldState );
+};
+
+SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
+	this.fire( 'destroy' );
+	template.ondestroy.call( this );
+
+	if ( detach !== false ) this._fragment.unmount();
+	this._fragment.destroy();
+	this._fragment = null;
+
+	this._state = {};
+	this._torndown = true;
+};
+
+export default SvelteComponent;
diff --git a/test/js/samples/onrender-onteardown-rewritten/expected.js b/test/js/samples/onrender-onteardown-rewritten/expected.js
new file mode 100644
index 0000000000..3869d14cb7
--- /dev/null
+++ b/test/js/samples/onrender-onteardown-rewritten/expected.js
@@ -0,0 +1,75 @@
+import { assign, dispatchObservers, noop, proto } from "svelte/shared.js";
+
+var template = (function () {
+	return {
+		// this test should be removed in v2
+		oncreate () {},
+		ondestroy () {}
+	};
+}());
+
+function create_main_fragment ( state, component ) {
+
+	return {
+		create: noop,
+
+		mount: noop,
+
+		unmount: noop,
+
+		destroy: noop
+	};
+}
+
+function SvelteComponent ( options ) {
+	options = options || {};
+	this._state = options.data || {};
+
+	this._observers = {
+		pre: Object.create( null ),
+		post: Object.create( null )
+	};
+
+	this._handlers = Object.create( null );
+
+	this._root = options._root || this;
+	this._yield = options._yield;
+
+	this._torndown = false;
+
+	this._fragment = create_main_fragment( this._state, this );
+
+	if ( options.target ) {
+		this._fragment.create();
+		this._fragment.mount( options.target, null );
+	}
+
+	if ( options._root ) {
+		options._root._renderHooks.push( template.oncreate.bind( this ) );
+	} else {
+		template.oncreate.call( this );
+	}
+}
+
+assign( SvelteComponent.prototype, proto );
+
+SvelteComponent.prototype._set = function _set ( newState ) {
+	var oldState = this._state;
+	this._state = assign( {}, oldState, newState );
+	dispatchObservers( this, this._observers.pre, newState, oldState );
+	dispatchObservers( this, this._observers.post, newState, oldState );
+};
+
+SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
+	this.fire( 'destroy' );
+	template.ondestroy.call( this );
+
+	if ( detach !== false ) this._fragment.unmount();
+	this._fragment.destroy();
+	this._fragment = null;
+
+	this._state = {};
+	this._torndown = true;
+};
+
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/onrender-onteardown-rewritten/input.html b/test/js/samples/onrender-onteardown-rewritten/input.html
new file mode 100644
index 0000000000..1d3b9e3f7b
--- /dev/null
+++ b/test/js/samples/onrender-onteardown-rewritten/input.html
@@ -0,0 +1,7 @@
+<script>
+	export default {
+		// this test should be removed in v2
+		onrender () {},
+		onteardown () {}
+	};
+</script>
\ No newline at end of file
diff --git a/test/js/samples/use-elements-as-anchors/expected-bundle.js b/test/js/samples/use-elements-as-anchors/expected-bundle.js
new file mode 100644
index 0000000000..4037f07e34
--- /dev/null
+++ b/test/js/samples/use-elements-as-anchors/expected-bundle.js
@@ -0,0 +1,430 @@
+function noop() {}
+
+function assign(target) {
+	var k,
+		source,
+		i = 1,
+		len = arguments.length;
+	for (; i < len; i++) {
+		source = arguments[i];
+		for (k in source) target[k] = source[k];
+	}
+
+	return target;
+}
+
+function appendNode(node, target) {
+	target.appendChild(node);
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function createText(data) {
+	return document.createTextNode(data);
+}
+
+function createComment() {
+	return document.createComment('');
+}
+
+function differs(a, b) {
+	return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, newState, oldState) {
+	for (var key in group) {
+		if (!(key in newState)) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		if (differs(newValue, oldValue)) {
+			var callbacks = group[key];
+			if (!callbacks) continue;
+
+			for (var i = 0; i < callbacks.length; i += 1) {
+				var callback = callbacks[i];
+				if (callback.__calling) continue;
+
+				callback.__calling = true;
+				callback.call(component, newValue, oldValue);
+				callback.__calling = false;
+			}
+		}
+	}
+}
+
+function get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function fire(eventName, data) {
+	var handlers =
+		eventName in this._handlers && this._handlers[eventName].slice();
+	if (!handlers) return;
+
+	for (var i = 0; i < handlers.length; i += 1) {
+		handlers[i].call(this, data);
+	}
+}
+
+function observe(key, callback, options) {
+	var group = options && options.defer
+		? this._observers.post
+		: this._observers.pre;
+
+	(group[key] || (group[key] = [])).push(callback);
+
+	if (!options || options.init !== false) {
+		callback.__calling = true;
+		callback.call(this, this._state[key]);
+		callback.__calling = false;
+	}
+
+	return {
+		cancel: function() {
+			var index = group[key].indexOf(callback);
+			if (~index) group[key].splice(index, 1);
+		}
+	};
+}
+
+function on(eventName, handler) {
+	if (eventName === 'teardown') return this.on('destroy', handler);
+
+	var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
+	handlers.push(handler);
+
+	return {
+		cancel: function() {
+			var index = handlers.indexOf(handler);
+			if (~index) handlers.splice(index, 1);
+		}
+	};
+}
+
+function set(newState) {
+	this._set(assign({}, newState));
+	this._root._flush();
+}
+
+function _flush() {
+	if (!this._renderHooks) return;
+
+	while (this._renderHooks.length) {
+		this._renderHooks.pop()();
+	}
+}
+
+var proto = {
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	_flush: _flush
+};
+
+function create_main_fragment ( state, component ) {
+	var div, text, p, text_1, text_2, text_3, text_4, p_1, text_5, text_6, text_8, if_block_4_anchor;
+
+	var if_block = (state.a) && create_if_block( state, component );
+
+	var if_block_1 = (state.b) && create_if_block_1( state, component );
+
+	var if_block_2 = (state.c) && create_if_block_2( state, component );
+
+	var if_block_3 = (state.d) && create_if_block_3( state, component );
+
+	var if_block_4 = (state.e) && create_if_block_4( state, component );
+
+	return {
+		create: function () {
+			div = createElement( 'div' );
+			if ( if_block ) if_block.create();
+			text = createText( "\n\n\t" );
+			p = createElement( 'p' );
+			text_1 = createText( "this can be used as an anchor" );
+			text_2 = createText( "\n\n\t" );
+			if ( if_block_1 ) if_block_1.create();
+			text_3 = createText( "\n\n\t" );
+			if ( if_block_2 ) if_block_2.create();
+			text_4 = createText( "\n\n\t" );
+			p_1 = createElement( 'p' );
+			text_5 = createText( "so can this" );
+			text_6 = createText( "\n\n\t" );
+			if ( if_block_3 ) if_block_3.create();
+			text_8 = createText( "\n\n" );
+			if ( if_block_4 ) if_block_4.create();
+			if_block_4_anchor = createComment();
+		},
+
+		mount: function ( target, anchor ) {
+			insertNode( div, target, anchor );
+			if ( if_block ) if_block.mount( div, null );
+			appendNode( text, div );
+			appendNode( p, div );
+			appendNode( text_1, p );
+			appendNode( text_2, div );
+			if ( if_block_1 ) if_block_1.mount( div, null );
+			appendNode( text_3, div );
+			if ( if_block_2 ) if_block_2.mount( div, null );
+			appendNode( text_4, div );
+			appendNode( p_1, div );
+			appendNode( text_5, p_1 );
+			appendNode( text_6, div );
+			if ( if_block_3 ) if_block_3.mount( div, null );
+			insertNode( text_8, target, anchor );
+			if ( if_block_4 ) if_block_4.mount( target, anchor );
+			insertNode( if_block_4_anchor, target, anchor );
+		},
+
+		update: function ( changed, state ) {
+			if ( state.a ) {
+				if ( !if_block ) {
+					if_block = create_if_block( state, component );
+					if_block.create();
+					if_block.mount( div, text );
+				}
+			} else if ( if_block ) {
+				if_block.unmount();
+				if_block.destroy();
+				if_block = null;
+			}
+
+			if ( state.b ) {
+				if ( !if_block_1 ) {
+					if_block_1 = create_if_block_1( state, component );
+					if_block_1.create();
+					if_block_1.mount( div, text_3 );
+				}
+			} else if ( if_block_1 ) {
+				if_block_1.unmount();
+				if_block_1.destroy();
+				if_block_1 = null;
+			}
+
+			if ( state.c ) {
+				if ( !if_block_2 ) {
+					if_block_2 = create_if_block_2( state, component );
+					if_block_2.create();
+					if_block_2.mount( div, text_4 );
+				}
+			} else if ( if_block_2 ) {
+				if_block_2.unmount();
+				if_block_2.destroy();
+				if_block_2 = null;
+			}
+
+			if ( state.d ) {
+				if ( !if_block_3 ) {
+					if_block_3 = create_if_block_3( state, component );
+					if_block_3.create();
+					if_block_3.mount( div, null );
+				}
+			} else if ( if_block_3 ) {
+				if_block_3.unmount();
+				if_block_3.destroy();
+				if_block_3 = null;
+			}
+
+			if ( state.e ) {
+				if ( !if_block_4 ) {
+					if_block_4 = create_if_block_4( state, component );
+					if_block_4.create();
+					if_block_4.mount( if_block_4_anchor.parentNode, if_block_4_anchor );
+				}
+			} else if ( if_block_4 ) {
+				if_block_4.unmount();
+				if_block_4.destroy();
+				if_block_4 = null;
+			}
+		},
+
+		unmount: function () {
+			detachNode( div );
+			if ( if_block ) if_block.unmount();
+			if ( if_block_1 ) if_block_1.unmount();
+			if ( if_block_2 ) if_block_2.unmount();
+			if ( if_block_3 ) if_block_3.unmount();
+			detachNode( text_8 );
+			if ( if_block_4 ) if_block_4.unmount();
+			detachNode( if_block_4_anchor );
+		},
+
+		destroy: function () {
+			if ( if_block ) if_block.destroy();
+			if ( if_block_1 ) if_block_1.destroy();
+			if ( if_block_2 ) if_block_2.destroy();
+			if ( if_block_3 ) if_block_3.destroy();
+			if ( if_block_4 ) if_block_4.destroy();
+		}
+	};
+}
+
+function create_if_block ( state, component ) {
+	var p, text;
+
+	return {
+		create: function () {
+			p = createElement( 'p' );
+			text = createText( "a" );
+		},
+
+		mount: function ( target, anchor ) {
+			insertNode( p, target, anchor );
+			appendNode( text, p );
+		},
+
+		unmount: function () {
+			detachNode( p );
+		},
+
+		destroy: noop
+	};
+}
+
+function create_if_block_1 ( state, component ) {
+	var p, text;
+
+	return {
+		create: function () {
+			p = createElement( 'p' );
+			text = createText( "b" );
+		},
+
+		mount: function ( target, anchor ) {
+			insertNode( p, target, anchor );
+			appendNode( text, p );
+		},
+
+		unmount: function () {
+			detachNode( p );
+		},
+
+		destroy: noop
+	};
+}
+
+function create_if_block_2 ( state, component ) {
+	var p, text;
+
+	return {
+		create: function () {
+			p = createElement( 'p' );
+			text = createText( "c" );
+		},
+
+		mount: function ( target, anchor ) {
+			insertNode( p, target, anchor );
+			appendNode( text, p );
+		},
+
+		unmount: function () {
+			detachNode( p );
+		},
+
+		destroy: noop
+	};
+}
+
+function create_if_block_3 ( state, component ) {
+	var p, text;
+
+	return {
+		create: function () {
+			p = createElement( 'p' );
+			text = createText( "d" );
+		},
+
+		mount: function ( target, anchor ) {
+			insertNode( p, target, anchor );
+			appendNode( text, p );
+		},
+
+		unmount: function () {
+			detachNode( p );
+		},
+
+		destroy: noop
+	};
+}
+
+function create_if_block_4 ( state, component ) {
+	var p, text;
+
+	return {
+		create: function () {
+			p = createElement( 'p' );
+			text = createText( "e" );
+		},
+
+		mount: function ( target, anchor ) {
+			insertNode( p, target, anchor );
+			appendNode( text, p );
+		},
+
+		unmount: function () {
+			detachNode( p );
+		},
+
+		destroy: noop
+	};
+}
+
+function SvelteComponent ( options ) {
+	options = options || {};
+	this._state = options.data || {};
+
+	this._observers = {
+		pre: Object.create( null ),
+		post: Object.create( null )
+	};
+
+	this._handlers = Object.create( null );
+
+	this._root = options._root || this;
+	this._yield = options._yield;
+
+	this._torndown = false;
+
+	this._fragment = create_main_fragment( this._state, this );
+
+	if ( options.target ) {
+		this._fragment.create();
+		this._fragment.mount( options.target, null );
+	}
+}
+
+assign( SvelteComponent.prototype, proto );
+
+SvelteComponent.prototype._set = function _set ( newState ) {
+	var oldState = this._state;
+	this._state = assign( {}, oldState, newState );
+	dispatchObservers( this, this._observers.pre, newState, oldState );
+	this._fragment.update( newState, this._state );
+	dispatchObservers( this, this._observers.post, newState, oldState );
+};
+
+SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
+	this.fire( 'destroy' );
+
+	if ( detach !== false ) this._fragment.unmount();
+	this._fragment.destroy();
+	this._fragment = null;
+
+	this._state = {};
+	this._torndown = true;
+};
+
+export default SvelteComponent;
diff --git a/test/js/samples/use-elements-as-anchors/expected.js b/test/js/samples/use-elements-as-anchors/expected.js
new file mode 100644
index 0000000000..524372861e
--- /dev/null
+++ b/test/js/samples/use-elements-as-anchors/expected.js
@@ -0,0 +1,295 @@
+import { appendNode, assign, createComment, createElement, createText, detachNode, dispatchObservers, insertNode, noop, proto } from "svelte/shared.js";
+
+function create_main_fragment ( state, component ) {
+	var div, text, p, text_1, text_2, text_3, text_4, p_1, text_5, text_6, text_8, if_block_4_anchor;
+
+	var if_block = (state.a) && create_if_block( state, component );
+
+	var if_block_1 = (state.b) && create_if_block_1( state, component );
+
+	var if_block_2 = (state.c) && create_if_block_2( state, component );
+
+	var if_block_3 = (state.d) && create_if_block_3( state, component );
+
+	var if_block_4 = (state.e) && create_if_block_4( state, component );
+
+	return {
+		create: function () {
+			div = createElement( 'div' );
+			if ( if_block ) if_block.create();
+			text = createText( "\n\n\t" );
+			p = createElement( 'p' );
+			text_1 = createText( "this can be used as an anchor" );
+			text_2 = createText( "\n\n\t" );
+			if ( if_block_1 ) if_block_1.create();
+			text_3 = createText( "\n\n\t" );
+			if ( if_block_2 ) if_block_2.create();
+			text_4 = createText( "\n\n\t" );
+			p_1 = createElement( 'p' );
+			text_5 = createText( "so can this" );
+			text_6 = createText( "\n\n\t" );
+			if ( if_block_3 ) if_block_3.create();
+			text_8 = createText( "\n\n" );
+			if ( if_block_4 ) if_block_4.create();
+			if_block_4_anchor = createComment();
+		},
+
+		mount: function ( target, anchor ) {
+			insertNode( div, target, anchor );
+			if ( if_block ) if_block.mount( div, null );
+			appendNode( text, div );
+			appendNode( p, div );
+			appendNode( text_1, p );
+			appendNode( text_2, div );
+			if ( if_block_1 ) if_block_1.mount( div, null );
+			appendNode( text_3, div );
+			if ( if_block_2 ) if_block_2.mount( div, null );
+			appendNode( text_4, div );
+			appendNode( p_1, div );
+			appendNode( text_5, p_1 );
+			appendNode( text_6, div );
+			if ( if_block_3 ) if_block_3.mount( div, null );
+			insertNode( text_8, target, anchor );
+			if ( if_block_4 ) if_block_4.mount( target, anchor );
+			insertNode( if_block_4_anchor, target, anchor );
+		},
+
+		update: function ( changed, state ) {
+			if ( state.a ) {
+				if ( !if_block ) {
+					if_block = create_if_block( state, component );
+					if_block.create();
+					if_block.mount( div, text );
+				}
+			} else if ( if_block ) {
+				if_block.unmount();
+				if_block.destroy();
+				if_block = null;
+			}
+
+			if ( state.b ) {
+				if ( !if_block_1 ) {
+					if_block_1 = create_if_block_1( state, component );
+					if_block_1.create();
+					if_block_1.mount( div, text_3 );
+				}
+			} else if ( if_block_1 ) {
+				if_block_1.unmount();
+				if_block_1.destroy();
+				if_block_1 = null;
+			}
+
+			if ( state.c ) {
+				if ( !if_block_2 ) {
+					if_block_2 = create_if_block_2( state, component );
+					if_block_2.create();
+					if_block_2.mount( div, text_4 );
+				}
+			} else if ( if_block_2 ) {
+				if_block_2.unmount();
+				if_block_2.destroy();
+				if_block_2 = null;
+			}
+
+			if ( state.d ) {
+				if ( !if_block_3 ) {
+					if_block_3 = create_if_block_3( state, component );
+					if_block_3.create();
+					if_block_3.mount( div, null );
+				}
+			} else if ( if_block_3 ) {
+				if_block_3.unmount();
+				if_block_3.destroy();
+				if_block_3 = null;
+			}
+
+			if ( state.e ) {
+				if ( !if_block_4 ) {
+					if_block_4 = create_if_block_4( state, component );
+					if_block_4.create();
+					if_block_4.mount( if_block_4_anchor.parentNode, if_block_4_anchor );
+				}
+			} else if ( if_block_4 ) {
+				if_block_4.unmount();
+				if_block_4.destroy();
+				if_block_4 = null;
+			}
+		},
+
+		unmount: function () {
+			detachNode( div );
+			if ( if_block ) if_block.unmount();
+			if ( if_block_1 ) if_block_1.unmount();
+			if ( if_block_2 ) if_block_2.unmount();
+			if ( if_block_3 ) if_block_3.unmount();
+			detachNode( text_8 );
+			if ( if_block_4 ) if_block_4.unmount();
+			detachNode( if_block_4_anchor );
+		},
+
+		destroy: function () {
+			if ( if_block ) if_block.destroy();
+			if ( if_block_1 ) if_block_1.destroy();
+			if ( if_block_2 ) if_block_2.destroy();
+			if ( if_block_3 ) if_block_3.destroy();
+			if ( if_block_4 ) if_block_4.destroy();
+		}
+	};
+}
+
+function create_if_block ( state, component ) {
+	var p, text;
+
+	return {
+		create: function () {
+			p = createElement( 'p' );
+			text = createText( "a" );
+		},
+
+		mount: function ( target, anchor ) {
+			insertNode( p, target, anchor );
+			appendNode( text, p );
+		},
+
+		unmount: function () {
+			detachNode( p );
+		},
+
+		destroy: noop
+	};
+}
+
+function create_if_block_1 ( state, component ) {
+	var p, text;
+
+	return {
+		create: function () {
+			p = createElement( 'p' );
+			text = createText( "b" );
+		},
+
+		mount: function ( target, anchor ) {
+			insertNode( p, target, anchor );
+			appendNode( text, p );
+		},
+
+		unmount: function () {
+			detachNode( p );
+		},
+
+		destroy: noop
+	};
+}
+
+function create_if_block_2 ( state, component ) {
+	var p, text;
+
+	return {
+		create: function () {
+			p = createElement( 'p' );
+			text = createText( "c" );
+		},
+
+		mount: function ( target, anchor ) {
+			insertNode( p, target, anchor );
+			appendNode( text, p );
+		},
+
+		unmount: function () {
+			detachNode( p );
+		},
+
+		destroy: noop
+	};
+}
+
+function create_if_block_3 ( state, component ) {
+	var p, text;
+
+	return {
+		create: function () {
+			p = createElement( 'p' );
+			text = createText( "d" );
+		},
+
+		mount: function ( target, anchor ) {
+			insertNode( p, target, anchor );
+			appendNode( text, p );
+		},
+
+		unmount: function () {
+			detachNode( p );
+		},
+
+		destroy: noop
+	};
+}
+
+function create_if_block_4 ( state, component ) {
+	var p, text;
+
+	return {
+		create: function () {
+			p = createElement( 'p' );
+			text = createText( "e" );
+		},
+
+		mount: function ( target, anchor ) {
+			insertNode( p, target, anchor );
+			appendNode( text, p );
+		},
+
+		unmount: function () {
+			detachNode( p );
+		},
+
+		destroy: noop
+	};
+}
+
+function SvelteComponent ( options ) {
+	options = options || {};
+	this._state = options.data || {};
+
+	this._observers = {
+		pre: Object.create( null ),
+		post: Object.create( null )
+	};
+
+	this._handlers = Object.create( null );
+
+	this._root = options._root || this;
+	this._yield = options._yield;
+
+	this._torndown = false;
+
+	this._fragment = create_main_fragment( this._state, this );
+
+	if ( options.target ) {
+		this._fragment.create();
+		this._fragment.mount( options.target, null );
+	}
+}
+
+assign( SvelteComponent.prototype, proto );
+
+SvelteComponent.prototype._set = function _set ( newState ) {
+	var oldState = this._state;
+	this._state = assign( {}, oldState, newState );
+	dispatchObservers( this, this._observers.pre, newState, oldState );
+	this._fragment.update( newState, this._state );
+	dispatchObservers( this, this._observers.post, newState, oldState );
+};
+
+SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
+	this.fire( 'destroy' );
+
+	if ( detach !== false ) this._fragment.unmount();
+	this._fragment.destroy();
+	this._fragment = null;
+
+	this._state = {};
+	this._torndown = true;
+};
+
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/use-elements-as-anchors/input.html b/test/js/samples/use-elements-as-anchors/input.html
new file mode 100644
index 0000000000..c55e7bd4de
--- /dev/null
+++ b/test/js/samples/use-elements-as-anchors/input.html
@@ -0,0 +1,27 @@
+<div>
+	{{#if a}}
+		<p>a</p>
+	{{/if}}
+
+	<p>this can be used as an anchor</p>
+
+	{{#if b}}
+		<p>b</p>
+	{{/if}}
+
+	{{#if c}}
+		<p>c</p>
+	{{/if}}
+
+	<p>so can this</p>
+
+	{{#if d}}
+		<p>d</p>
+	{{/if}}
+
+	<!-- d can use 'null' as its anchor -->
+</div>
+
+{{#if e}}
+	<p>e</p>
+{{/if}}
\ No newline at end of file
diff --git a/test/js/update.js b/test/js/update.js
new file mode 100644
index 0000000000..a22e4a08b5
--- /dev/null
+++ b/test/js/update.js
@@ -0,0 +1,13 @@
+// this file will replace all the expected.js and expected-bundle.js files with
+// their _actual equivalents. Only use it when you're sure that you haven't
+// broken anything!
+const fs = require("fs");
+const glob = require("glob");
+
+glob.sync("samples/*/_actual*", { cwd: __dirname }).forEach(file => {
+	const actual = fs.readFileSync(`${__dirname}/${file}`, "utf-8");
+	fs.writeFileSync(
+		`${__dirname}/${file.replace("_actual", "expected")}`,
+		actual
+	);
+});
diff --git a/test/parser/index.js b/test/parser/index.js
index fb18cf1623..6bdd1b6376 100644
--- a/test/parser/index.js
+++ b/test/parser/index.js
@@ -1,61 +1,77 @@
 import assert from 'assert';
-import * as fs from 'fs';
+import fs from 'fs';
 import { svelte } from '../helpers.js';
 
-describe( 'parse', () => {
-	fs.readdirSync( 'test/parser/samples' ).forEach( dir => {
-		if ( dir[0] === '.' ) return;
+describe('parse', () => {
+	fs.readdirSync('test/parser/samples').forEach(dir => {
+		if (dir[0] === '.') return;
 
 		// add .solo to a sample directory name to only run that test
-		const solo = /\.solo$/.test( dir );
+		const solo = /\.solo$/.test(dir);
 
-		if ( solo && process.env.CI ) {
-			throw new Error( `Forgot to remove '.solo' from test parser/samples/${dir}` );
+		if (solo && process.env.CI) {
+			throw new Error(
+				`Forgot to remove '.solo' from test parser/samples/${dir}`
+			);
 		}
 
-		( solo ? it.only : it )( dir, () => {
-			const input = fs.readFileSync( `test/parser/samples/${dir}/input.html`, 'utf-8' ).replace( /\s+$/, '' );
+		(solo ? it.only : it)(dir, () => {
+			const input = fs
+				.readFileSync(`test/parser/samples/${dir}/input.html`, 'utf-8')
+				.replace(/\s+$/, '');
 
 			try {
-				const actual = svelte.parse( input );
-				fs.writeFileSync( `test/parser/samples/${dir}/_actual.json`, JSON.stringify( actual, null, '\t' ) );
-				const expected = require( `./samples/${dir}/output.json` );
+				const actual = svelte.parse(input);
+				fs.writeFileSync(
+					`test/parser/samples/${dir}/_actual.json`,
+					JSON.stringify(actual, null, '\t')
+				);
+				const expected = require(`./samples/${dir}/output.json`);
 
-				assert.deepEqual( actual.html, expected.html );
-				assert.deepEqual( actual.css, expected.css );
-				assert.deepEqual( actual.js, expected.js );
-			} catch ( err ) {
-				if ( err.name !== 'ParseError' ) throw err;
+				assert.deepEqual(actual.html, expected.html);
+				assert.deepEqual(actual.css, expected.css);
+				assert.deepEqual(actual.js, expected.js);
+			} catch (err) {
+				if (err.name !== 'ParseError') throw err;
 
 				try {
-					const expected = require( `./samples/${dir}/error.json` );
+					const expected = require(`./samples/${dir}/error.json`);
 
-					assert.equal( err.message, expected.message );
-					assert.deepEqual( err.loc, expected.loc );
-					assert.equal( err.pos, expected.pos );
-				} catch ( err2 ) {
+					assert.equal(err.message, expected.message);
+					assert.deepEqual(err.loc, expected.loc);
+					assert.equal(err.pos, expected.pos);
+				} catch (err2) {
 					throw err2.code === 'MODULE_NOT_FOUND' ? err : err2;
 				}
 			}
 		});
 	});
 
-	it( 'handles errors with options.onerror', () => {
+	it('handles errors with options.onerror', () => {
 		let errored = false;
 
-		svelte.compile( `<h1>unclosed`, {
-			onerror ( err ) {
+		svelte.compile(`<h1>unclosed`, {
+			onerror(err) {
 				errored = true;
-				assert.equal( err.message, `<h1> was left open` );
+				assert.equal(err.message, `<h1> was left open`);
 			}
 		});
 
-		assert.ok( errored );
+		assert.ok(errored);
 	});
 
-	it( 'throws without options.onerror', () => {
-		assert.throws( () => {
-			svelte.compile( `<h1>unclosed` );
-		}, /<h1> was left open/ );
+	it('throws without options.onerror', () => {
+		assert.throws(() => {
+			svelte.compile(`<h1>unclosed`);
+		}, /<h1> was left open/);
+	});
+
+	it('includes AST in svelte.compile output', () => {
+		const dir = fs.readdirSync('test/parser/samples')[0];
+		const source = fs.readFileSync(`test/parser/samples/${dir}/input.html`, 'utf-8');
+
+		const { ast } = svelte.compile(source);
+		const parsed = svelte.parse(source);
+		assert.deepEqual(ast, parsed);
 	});
 });
diff --git a/test/parser/samples/attribute-dynamic-boolean/output.json b/test/parser/samples/attribute-dynamic-boolean/output.json
index c4e1417c10..af1635a55d 100644
--- a/test/parser/samples/attribute-dynamic-boolean/output.json
+++ b/test/parser/samples/attribute-dynamic-boolean/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 3179574701,
 	"html": {
 		"start": 0,
 		"end": 45,
@@ -21,9 +22,9 @@
 								"end": 32,
 								"type": "MustacheTag",
 								"expression": {
+									"type": "Identifier",
 									"start": 22,
 									"end": 30,
-									"type": "Identifier",
 									"name": "readonly"
 								}
 							}
@@ -36,4 +37,4 @@
 	},
 	"css": null,
 	"js": 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 a097655e2a..aef0e5cb63 100644
--- a/test/parser/samples/attribute-dynamic-reserved/output.json
+++ b/test/parser/samples/attribute-dynamic-reserved/output.json
@@ -1,5 +1,5 @@
 {
-	"hash": 3305933215,
+	"hash": 2788845841,
 	"html": {
 		"start": 0,
 		"end": 29,
diff --git a/test/parser/samples/attribute-dynamic/output.json b/test/parser/samples/attribute-dynamic/output.json
index 2f1cc44454..79ef81065f 100644
--- a/test/parser/samples/attribute-dynamic/output.json
+++ b/test/parser/samples/attribute-dynamic/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 804348386,
 	"html": {
 		"start": 0,
 		"end": 46,
@@ -27,9 +28,9 @@
 								"end": 28,
 								"type": "MustacheTag",
 								"expression": {
+									"type": "Identifier",
 									"start": 21,
 									"end": 26,
-									"type": "Identifier",
 									"name": "color"
 								}
 							},
@@ -48,9 +49,9 @@
 						"end": 40,
 						"type": "MustacheTag",
 						"expression": {
+							"type": "Identifier",
 							"start": 33,
 							"end": 38,
-							"type": "Identifier",
 							"name": "color"
 						}
 					}
@@ -60,4 +61,4 @@
 	},
 	"css": null,
 	"js": 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 4dcc1f561b..974084bcdd 100644
--- a/test/parser/samples/attribute-escaped/output.json
+++ b/test/parser/samples/attribute-escaped/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 1563956934,
 	"html": {
 		"start": 0,
 		"end": 41,
@@ -31,4 +32,4 @@
 	},
 	"css": null,
 	"js": 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 30112ec629..81af977b51 100644
--- a/test/parser/samples/attribute-multiple/output.json
+++ b/test/parser/samples/attribute-multiple/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 507039402,
 	"html": {
 		"start": 0,
 		"end": 28,
@@ -45,4 +46,4 @@
 	},
 	"css": null,
 	"js": 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 979a8820ad..b6578c13eb 100644
--- a/test/parser/samples/attribute-shorthand/output.json
+++ b/test/parser/samples/attribute-shorthand/output.json
@@ -1,5 +1,5 @@
 {
-	"hash": 4120363214,
+	"hash": 1705925892,
 	"html": {
 		"start": 0,
 		"end": 10,
@@ -18,9 +18,9 @@
 						"name": "id",
 						"value": [
 							{
+								"type": "AttributeShorthand",
 								"start": 6,
 								"end": 8,
-								"type": "AttributeShorthand",
 								"expression": {
 									"type": "Identifier",
 									"start": 6,
diff --git a/test/parser/samples/attribute-static-boolean/output.json b/test/parser/samples/attribute-static-boolean/output.json
index 5a7f79bee3..21429893fd 100644
--- a/test/parser/samples/attribute-static-boolean/output.json
+++ b/test/parser/samples/attribute-static-boolean/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 606864228,
 	"html": {
 		"start": 0,
 		"end": 30,
@@ -24,4 +25,4 @@
 	},
 	"css": null,
 	"js": 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 5cc13ffabf..394f95f458 100644
--- a/test/parser/samples/attribute-static/output.json
+++ b/test/parser/samples/attribute-static/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 1493227373,
 	"html": {
 		"start": 0,
 		"end": 23,
@@ -31,4 +32,4 @@
 	},
 	"css": null,
 	"js": 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 c2a788b0a7..474d925b2e 100644
--- a/test/parser/samples/attribute-unquoted/output.json
+++ b/test/parser/samples/attribute-unquoted/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 3488539025,
 	"html": {
 		"start": 0,
 		"end": 21,
@@ -31,4 +32,4 @@
 	},
 	"css": null,
 	"js": 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 ba22c66d33..8a7b615cf4 100644
--- a/test/parser/samples/binding-shorthand/output.json
+++ b/test/parser/samples/binding-shorthand/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 3088875001,
 	"html": {
 		"start": 0,
 		"end": 18,
@@ -29,4 +30,4 @@
 	},
 	"css": null,
 	"js": null
-}
+}
\ No newline at end of file
diff --git a/test/parser/samples/binding/output.json b/test/parser/samples/binding/output.json
index f307779950..74f2059f59 100644
--- a/test/parser/samples/binding/output.json
+++ b/test/parser/samples/binding/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 1937205193,
 	"html": {
 		"start": 0,
 		"end": 25,
@@ -16,9 +17,9 @@
 						"type": "Binding",
 						"name": "value",
 						"value": {
+							"type": "Identifier",
 							"start": 19,
 							"end": 23,
-							"type": "Identifier",
 							"name": "name"
 						}
 					}
@@ -29,4 +30,4 @@
 	},
 	"css": null,
 	"js": null
-}
+}
\ No newline at end of file
diff --git a/test/parser/samples/comment/output.json b/test/parser/samples/comment/output.json
index 635c0fc2e0..e77c968b6b 100644
--- a/test/parser/samples/comment/output.json
+++ b/test/parser/samples/comment/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 3294612990,
 	"html": {
 		"start": 0,
 		"end": 18,
@@ -14,4 +15,4 @@
 	},
 	"css": null,
 	"js": 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 4f39e826e7..cb3e50ec3b 100644
--- a/test/parser/samples/convert-entities-in-element/output.json
+++ b/test/parser/samples/convert-entities-in-element/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 2365862121,
 	"html": {
 		"start": 0,
 		"end": 24,
@@ -23,4 +24,4 @@
 	},
 	"css": null,
 	"js": 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 f5124865c8..479bae3064 100644
--- a/test/parser/samples/convert-entities/output.json
+++ b/test/parser/samples/convert-entities/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 156753432,
 	"html": {
 		"start": 0,
 		"end": 17,
@@ -14,4 +15,4 @@
 	},
 	"css": null,
 	"js": null
-}
+}
\ No newline at end of file
diff --git a/test/parser/samples/css/output.json b/test/parser/samples/css/output.json
index 72c2a139db..4650ccea46 100644
--- a/test/parser/samples/css/output.json
+++ b/test/parser/samples/css/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 1147407419,
 	"html": {
 		"start": 0,
 		"end": 14,
@@ -18,6 +19,12 @@
 						"data": "foo"
 					}
 				]
+			},
+			{
+				"start": 14,
+				"end": 16,
+				"type": "Text",
+				"data": "\n\n"
 			}
 		]
 	},
@@ -25,65 +32,65 @@
 		"start": 16,
 		"end": 56,
 		"attributes": [],
-		"content": {
-			"start": 23,
-			"end": 48,
-			"styles": "\n\tdiv {\n\t\tcolor: red;\n\t}\n"
-		},
 		"children": [
 			{
 				"type": "Rule",
-				"start": 25,
-				"end": 47,
 				"selector": {
 					"type": "SelectorList",
-					"start": 25,
-					"end": 28,
 					"children": [
 						{
 							"type": "Selector",
-							"start": 25,
-							"end": 28,
 							"children": [
 								{
 									"type": "TypeSelector",
+									"name": "div",
 									"start": 25,
-									"end": 28,
-									"name": "div"
+									"end": 28
 								}
-							]
+							],
+							"start": 25,
+							"end": 28
 						}
-					]
+					],
+					"start": 25,
+					"end": 28
 				},
 				"block": {
 					"type": "Block",
-					"start": 29,
-					"end": 47,
 					"children": [
 						{
 							"type": "Declaration",
-							"start": 33,
-							"end": 43,
 							"important": false,
 							"property": "color",
 							"value": {
 								"type": "Value",
-								"start": 39,
-								"end": 43,
 								"children": [
 									{
 										"type": "Identifier",
+										"name": "red",
 										"start": 40,
-										"end": 43,
-										"name": "red"
+										"end": 43
 									}
-								]
-							}
+								],
+								"start": 39,
+								"end": 43
+							},
+							"start": 33,
+							"end": 43
 						}
-					]
-				}
+					],
+					"start": 29,
+					"end": 47
+				},
+				"start": 25,
+				"end": 47
 			}
-		]
+		],
+		"content": {
+			"start": 23,
+			"end": 48,
+			"styles": "\n\tdiv {\n\t\tcolor: red;\n\t}\n"
+		}
 	},
 	"js": 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 8d82d5a677..0dadad5f65 100644
--- a/test/parser/samples/each-block-else/output.json
+++ b/test/parser/samples/each-block-else/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 3238289871,
 	"html": {
 		"start": 0,
 		"end": 84,
@@ -9,12 +10,11 @@
 				"end": 84,
 				"type": "EachBlock",
 				"expression": {
+					"type": "Identifier",
 					"start": 8,
 					"end": 15,
-					"type": "Identifier",
 					"name": "animals"
 				},
-				"context": "animal",
 				"children": [
 					{
 						"start": 29,
@@ -28,40 +28,41 @@
 								"end": 42,
 								"type": "MustacheTag",
 								"expression": {
+									"type": "Identifier",
 									"start": 34,
 									"end": 40,
-									"type": "Identifier",
 									"name": "animal"
 								}
 							}
 						]
 					}
 				],
+				"context": "animal",
 				"else": {
+					"start": 55,
+					"end": 75,
+					"type": "ElseBlock",
 					"children": [
 						{
+							"start": 57,
+							"end": 74,
+							"type": "Element",
+							"name": "p",
 							"attributes": [],
 							"children": [
 								{
-									"data": "no animals",
-									"end": 70,
 									"start": 60,
-									"type": "Text"
+									"end": 70,
+									"type": "Text",
+									"data": "no animals"
 								}
-							],
-							"end": 74,
-							"name": "p",
-							"start": 57,
-							"type": "Element"
+							]
 						}
-					],
-					"end": 75,
-					"start": 55,
-					"type": "ElseBlock"
+					]
 				}
 			}
 		]
 	},
 	"css": null,
 	"js": 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 46c4ac34eb..fc8954d6ad 100644
--- a/test/parser/samples/each-block-indexed/output.json
+++ b/test/parser/samples/each-block-indexed/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 2841674990,
 	"html": {
 		"start": 0,
 		"end": 66,
@@ -9,13 +10,11 @@
 				"end": 66,
 				"type": "EachBlock",
 				"expression": {
+					"type": "Identifier",
 					"start": 8,
 					"end": 15,
-					"type": "Identifier",
 					"name": "animals"
 				},
-				"context": "animal",
-				"index": "i",
 				"children": [
 					{
 						"start": 32,
@@ -29,9 +28,9 @@
 								"end": 40,
 								"type": "MustacheTag",
 								"expression": {
+									"type": "Identifier",
 									"start": 37,
 									"end": 38,
-									"type": "Identifier",
 									"name": "i"
 								}
 							},
@@ -46,18 +45,20 @@
 								"end": 52,
 								"type": "MustacheTag",
 								"expression": {
+									"type": "Identifier",
 									"start": 44,
 									"end": 50,
-									"type": "Identifier",
 									"name": "animal"
 								}
 							}
 						]
 					}
-				]
+				],
+				"context": "animal",
+				"index": "i"
 			}
 		]
 	},
 	"css": null,
 	"js": 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 3ace8016ec..1a16afb82b 100644
--- a/test/parser/samples/each-block-keyed/output.json
+++ b/test/parser/samples/each-block-keyed/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 2025411181,
 	"html": {
 		"start": 0,
 		"end": 54,
@@ -9,13 +10,11 @@
 				"end": 54,
 				"type": "EachBlock",
 				"expression": {
+					"type": "Identifier",
 					"start": 8,
 					"end": 13,
-					"type": "Identifier",
 					"name": "todos"
 				},
-				"context": "todo",
-				"key": "id",
 				"children": [
 					{
 						"start": 29,
@@ -29,18 +28,20 @@
 								"end": 40,
 								"type": "MustacheTag",
 								"expression": {
+									"type": "Identifier",
 									"start": 34,
 									"end": 38,
-									"type": "Identifier",
 									"name": "todo"
 								}
 							}
 						]
 					}
-				]
+				],
+				"context": "todo",
+				"key": "id"
 			}
 		]
 	},
 	"css": null,
 	"js": 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 d0534c3206..e549faca39 100644
--- a/test/parser/samples/each-block/output.json
+++ b/test/parser/samples/each-block/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 220340986,
 	"html": {
 		"start": 0,
 		"end": 56,
@@ -9,12 +10,11 @@
 				"end": 56,
 				"type": "EachBlock",
 				"expression": {
+					"type": "Identifier",
 					"start": 8,
 					"end": 15,
-					"type": "Identifier",
 					"name": "animals"
 				},
-				"context": "animal",
 				"children": [
 					{
 						"start": 29,
@@ -28,18 +28,19 @@
 								"end": 42,
 								"type": "MustacheTag",
 								"expression": {
+									"type": "Identifier",
 									"start": 34,
 									"end": 40,
-									"type": "Identifier",
 									"name": "animal"
 								}
 							}
 						]
 					}
-				]
+				],
+				"context": "animal"
 			}
 		]
 	},
 	"css": null,
 	"js": 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 131b081edc..fd6799e192 100644
--- a/test/parser/samples/element-with-mustache/output.json
+++ b/test/parser/samples/element-with-mustache/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 1265376132,
 	"html": {
 		"start": 0,
 		"end": 24,
@@ -22,9 +23,9 @@
 						"end": 18,
 						"type": "MustacheTag",
 						"expression": {
+							"type": "Identifier",
 							"start": 12,
 							"end": 16,
-							"type": "Identifier",
 							"name": "name"
 						}
 					},
@@ -40,4 +41,4 @@
 	},
 	"css": null,
 	"js": 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 a93a083da1..22cae35547 100644
--- a/test/parser/samples/element-with-text/output.json
+++ b/test/parser/samples/element-with-text/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 611274658,
 	"html": {
 		"start": 0,
 		"end": 17,
@@ -23,4 +24,4 @@
 	},
 	"css": null,
 	"js": null
-}
+}
\ No newline at end of file
diff --git a/test/parser/samples/elements/output.json b/test/parser/samples/elements/output.json
index 79608f9132..7b4e6bffe1 100644
--- a/test/parser/samples/elements/output.json
+++ b/test/parser/samples/elements/output.json
@@ -1,23 +1,28 @@
 {
-    "html": {
-        "start": 0,
-        "end": 15,
-        "type": "Fragment",
-        "children": [{
-            "attributes": [{
-                "end": 14,
-                "name": "html",
-                "start": 10,
-                "type": "Attribute",
-                "value": true
-            }],
-            "children": [],
-            "end": 15,
-            "name": "!doctype",
-            "start": 0,
-            "type": "Element"
-        }]
-    },
-    "css": null,
-    "js": null
-}
+	"hash": 825536165,
+	"html": {
+		"start": 0,
+		"end": 15,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 15,
+				"type": "Element",
+				"name": "!doctype",
+				"attributes": [
+					{
+						"start": 10,
+						"end": 14,
+						"type": "Attribute",
+						"name": "html",
+						"value": true
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/error-binding-rvalue/error.json b/test/parser/samples/error-binding-rvalue/error.json
new file mode 100644
index 0000000000..85b4a6f9ac
--- /dev/null
+++ b/test/parser/samples/error-binding-rvalue/error.json
@@ -0,0 +1,8 @@
+{
+	"message": "Cannot bind to rvalue",
+	"pos": 19,
+	"loc": {
+		"line": 1,
+		"column": 19
+	}
+}
\ No newline at end of file
diff --git a/test/parser/samples/error-binding-rvalue/input.html b/test/parser/samples/error-binding-rvalue/input.html
new file mode 100644
index 0000000000..0b1f716c23
--- /dev/null
+++ b/test/parser/samples/error-binding-rvalue/input.html
@@ -0,0 +1 @@
+<input bind:value='a + b'>
\ 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 1a1f27d3d9..2b5844bb1b 100644
--- a/test/parser/samples/event-handler/output.json
+++ b/test/parser/samples/event-handler/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 4260626221,
 	"html": {
 		"start": 0,
 		"end": 101,
@@ -16,48 +17,48 @@
 						"type": "EventHandler",
 						"name": "click",
 						"expression": {
+							"type": "CallExpression",
 							"start": 18,
 							"end": 44,
-							"type": "CallExpression",
 							"callee": {
+								"type": "Identifier",
 								"start": 18,
 								"end": 21,
-								"type": "Identifier",
 								"name": "set"
 							},
 							"arguments": [
 								{
+									"type": "ObjectExpression",
 									"start": 22,
 									"end": 43,
-									"type": "ObjectExpression",
 									"properties": [
 										{
+											"type": "Property",
 											"start": 24,
 											"end": 41,
-											"type": "Property",
-											"kind": "init",
-											"computed": false,
 											"method": false,
 											"shorthand": false,
+											"computed": false,
 											"key": {
+												"type": "Identifier",
 												"start": 24,
 												"end": 31,
-												"type": "Identifier",
 												"name": "visible"
 											},
 											"value": {
+												"type": "UnaryExpression",
 												"start": 33,
 												"end": 41,
-												"type": "UnaryExpression",
 												"operator": "!",
 												"prefix": true,
 												"argument": {
+													"type": "Identifier",
 													"start": 34,
 													"end": 41,
-													"type": "Identifier",
 													"name": "visible"
 												}
-											}
+											},
+											"kind": "init"
 										}
 									]
 								}
@@ -67,10 +68,10 @@
 				],
 				"children": [
 					{
-						"data": "toggle",
 						"start": 46,
 						"end": 52,
-						"type": "Text"
+						"type": "Text",
+						"data": "toggle"
 					}
 				]
 			},
@@ -85,10 +86,10 @@
 				"end": 101,
 				"type": "IfBlock",
 				"expression": {
-					"end": 76,
-					"name": "visible",
+					"type": "Identifier",
 					"start": 69,
-					"type": "Identifier"
+					"end": 76,
+					"name": "visible"
 				},
 				"children": [
 					{
@@ -99,10 +100,10 @@
 						"attributes": [],
 						"children": [
 							{
-								"data": "hello!",
-								"end": 89,
 								"start": 83,
-								"type": "Text"
+								"end": 89,
+								"type": "Text",
+								"data": "hello!"
 							}
 						]
 					}
@@ -112,4 +113,4 @@
 	},
 	"css": null,
 	"js": 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 db3923559b..af2c611220 100644
--- a/test/parser/samples/if-block-else/output.json
+++ b/test/parser/samples/if-block-else/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 3134964533,
 	"html": {
 		"start": 0,
 		"end": 56,
@@ -9,9 +10,9 @@
 				"end": 56,
 				"type": "IfBlock",
 				"expression": {
+					"type": "Identifier",
 					"start": 6,
 					"end": 9,
-					"type": "Identifier",
 					"name": "foo"
 				},
 				"children": [
@@ -58,4 +59,4 @@
 	},
 	"css": null,
 	"js": 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 743758a970..a2d61f2464 100644
--- a/test/parser/samples/if-block-elseif/output.json
+++ b/test/parser/samples/if-block-elseif/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 985817334,
 	"html": {
 		"start": 0,
 		"end": 93,
@@ -9,20 +10,20 @@
 				"end": 93,
 				"type": "IfBlock",
 				"expression": {
+					"type": "BinaryExpression",
 					"start": 6,
 					"end": 12,
-					"type": "BinaryExpression",
-					"operator": ">",
 					"left": {
+						"type": "Identifier",
 						"start": 6,
 						"end": 7,
-						"type": "Identifier",
 						"name": "x"
 					},
+					"operator": ">",
 					"right": {
+						"type": "Literal",
 						"start": 10,
 						"end": 12,
-						"type": "Literal",
 						"value": 10,
 						"raw": "10"
 					}
@@ -55,20 +56,20 @@
 							"type": "IfBlock",
 							"elseif": true,
 							"expression": {
+								"type": "BinaryExpression",
 								"start": 53,
 								"end": 58,
-								"type": "BinaryExpression",
-								"operator": "<",
 								"left": {
+									"type": "Identifier",
 									"start": 53,
 									"end": 54,
-									"type": "Identifier",
 									"name": "x"
 								},
+								"operator": "<",
 								"right": {
+									"type": "Literal",
 									"start": 57,
 									"end": 58,
-									"type": "Literal",
 									"value": 5,
 									"raw": "5"
 								}
@@ -98,4 +99,4 @@
 	},
 	"css": null,
 	"js": null
-}
+}
\ No newline at end of file
diff --git a/test/parser/samples/if-block/output.json b/test/parser/samples/if-block/output.json
index e1019ba1d7..d523d41596 100644
--- a/test/parser/samples/if-block/output.json
+++ b/test/parser/samples/if-block/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 2374871934,
 	"html": {
 		"start": 0,
 		"end": 21,
@@ -9,9 +10,9 @@
 				"end": 21,
 				"type": "IfBlock",
 				"expression": {
+					"type": "Identifier",
 					"start": 6,
 					"end": 9,
-					"type": "Identifier",
 					"name": "foo"
 				},
 				"children": [
@@ -27,4 +28,4 @@
 	},
 	"css": null,
 	"js": 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 3263fa8e40..f2aca52f68 100644
--- a/test/parser/samples/implicitly-closed-li/output.json
+++ b/test/parser/samples/implicitly-closed-li/output.json
@@ -1,5 +1,5 @@
 {
-	"hash": 3806276940,
+	"hash": 126082492,
 	"html": {
 		"start": 0,
 		"end": 31,
@@ -12,6 +12,12 @@
 				"name": "ul",
 				"attributes": [],
 				"children": [
+					{
+						"start": 4,
+						"end": 6,
+						"type": "Text",
+						"data": "\n\t"
+					},
 					{
 						"start": 6,
 						"end": 13,
@@ -23,7 +29,7 @@
 								"start": 10,
 								"end": 13,
 								"type": "Text",
-								"data": "a"
+								"data": "a\n\t"
 							}
 						]
 					},
@@ -38,7 +44,7 @@
 								"start": 17,
 								"end": 20,
 								"type": "Text",
-								"data": "b"
+								"data": "b\n\t"
 							}
 						]
 					},
diff --git a/test/parser/samples/nbsp/output.json b/test/parser/samples/nbsp/output.json
index d8cbb594f6..8b7d487f16 100644
--- a/test/parser/samples/nbsp/output.json
+++ b/test/parser/samples/nbsp/output.json
@@ -1,5 +1,5 @@
 {
-	"hash": 2678229240,
+	"hash": 4049070444,
 	"html": {
 		"start": 0,
 		"end": 19,
diff --git a/test/parser/samples/raw-mustaches/output.json b/test/parser/samples/raw-mustaches/output.json
index 4acedf34ea..e4a1b91c6c 100644
--- a/test/parser/samples/raw-mustaches/output.json
+++ b/test/parser/samples/raw-mustaches/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 183399343,
 	"html": {
 		"start": 0,
 		"end": 30,
@@ -11,14 +12,20 @@
 				"name": "p",
 				"attributes": [],
 				"children": [
+					{
+						"start": 3,
+						"end": 4,
+						"type": "Text",
+						"data": " "
+					},
 					{
 						"start": 4,
 						"end": 14,
 						"type": "RawMustacheTag",
 						"expression": {
+							"type": "Identifier",
 							"start": 7,
 							"end": 11,
-							"type": "Identifier",
 							"name": "raw1"
 						}
 					},
@@ -33,11 +40,17 @@
 						"end": 25,
 						"type": "RawMustacheTag",
 						"expression": {
+							"type": "Identifier",
 							"start": 18,
 							"end": 22,
-							"type": "Identifier",
 							"name": "raw2"
 						}
+					},
+					{
+						"start": 25,
+						"end": 26,
+						"type": "Text",
+						"data": " "
 					}
 				]
 			}
@@ -45,4 +58,4 @@
 	},
 	"css": null,
 	"js": null
-}
+}
\ No newline at end of file
diff --git a/test/parser/samples/refs/output.json b/test/parser/samples/refs/output.json
index c158de0848..37761abaff 100644
--- a/test/parser/samples/refs/output.json
+++ b/test/parser/samples/refs/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 850398275,
 	"html": {
 		"start": 0,
 		"end": 25,
@@ -23,4 +24,4 @@
 	},
 	"css": null,
 	"js": null
-}
+}
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-only/output.json b/test/parser/samples/script-comment-only/output.json
index 0e8e7877df..1dcc6fe1f4 100644
--- a/test/parser/samples/script-comment-only/output.json
+++ b/test/parser/samples/script-comment-only/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 3451341610,
 	"html": {
 		"start": 0,
 		"end": 11,
@@ -11,9 +12,15 @@
 				"name": "div",
 				"attributes": [],
 				"children": []
+			},
+			{
+				"start": 11,
+				"end": 13,
+				"type": "Text",
+				"data": "\n\n"
 			}
 		]
 	},
 	"css": null,
 	"js": null
-}
+}
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-trailing-multiline/output.json b/test/parser/samples/script-comment-trailing-multiline/output.json
index f97eb78052..4319919ee5 100644
--- a/test/parser/samples/script-comment-trailing-multiline/output.json
+++ b/test/parser/samples/script-comment-trailing-multiline/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 1378757574,
 	"html": {
 		"start": 0,
 		"end": 24,
@@ -22,9 +23,9 @@
 						"end": 18,
 						"type": "MustacheTag",
 						"expression": {
+							"type": "Identifier",
 							"start": 12,
 							"end": 16,
-							"type": "Identifier",
 							"name": "name"
 						}
 					},
@@ -35,6 +36,12 @@
 						"data": "!"
 					}
 				]
+			},
+			{
+				"start": 24,
+				"end": 26,
+				"type": "Text",
+				"data": "\n\n"
 			}
 		]
 	},
@@ -49,73 +56,73 @@
 			"end": 134,
 			"body": [
 				{
+					"type": "ExportDefaultDeclaration",
+					"start": 36,
+					"end": 95,
 					"declaration": {
+						"type": "ObjectExpression",
 						"start": 51,
 						"end": 94,
-						"type": "ObjectExpression",
 						"properties": [
 							{
+								"type": "Property",
 								"start": 55,
 								"end": 91,
-								"type": "Property",
+								"method": false,
+								"shorthand": false,
 								"computed": false,
 								"key": {
+									"type": "Identifier",
 									"start": 55,
 									"end": 59,
-									"type": "Identifier",
 									"name": "data"
 								},
-								"kind": "init",
-								"method": false,
-								"shorthand": false,
 								"value": {
+									"type": "ArrowFunctionExpression",
 									"start": 61,
 									"end": 91,
-									"type": "ArrowFunctionExpression",
+									"id": null,
+									"generator": false,
+									"expression": true,
 									"async": false,
+									"params": [],
 									"body": {
+										"type": "ObjectExpression",
 										"start": 68,
 										"end": 90,
-										"type": "ObjectExpression",
 										"properties": [
 											{
+												"type": "Property",
 												"start": 73,
 												"end": 86,
-												"type": "Property",
+												"method": false,
+												"shorthand": false,
 												"computed": false,
 												"key": {
+													"type": "Identifier",
 													"start": 73,
 													"end": 77,
-													"type": "Identifier",
 													"name": "name"
 												},
-												"kind": "init",
-												"method": false,
-												"shorthand": false,
 												"value": {
+													"type": "Literal",
 													"start": 79,
 													"end": 86,
-													"type": "Literal",
-													"raw": "'world'",
-													"value": "world"
-												}
+													"value": "world",
+													"raw": "'world'"
+												},
+												"kind": "init"
 											}
 										]
-									},
-									"expression": true,
-									"generator": false,
-									"id": null,
-									"params": []
-								}
+									}
+								},
+								"kind": "init"
 							}
 						]
-					},
-					"end": 95,
-					"start": 36,
-					"type": "ExportDefaultDeclaration"
+					}
 				}
 			],
 			"sourceType": "module"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-trailing/output.json b/test/parser/samples/script-comment-trailing/output.json
index e531599fea..2977d6a7fa 100644
--- a/test/parser/samples/script-comment-trailing/output.json
+++ b/test/parser/samples/script-comment-trailing/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 619854804,
 	"html": {
 		"start": 0,
 		"end": 24,
@@ -22,9 +23,9 @@
 						"end": 18,
 						"type": "MustacheTag",
 						"expression": {
+							"type": "Identifier",
 							"start": 12,
 							"end": 16,
-							"type": "Identifier",
 							"name": "name"
 						}
 					},
@@ -35,6 +36,12 @@
 						"data": "!"
 					}
 				]
+			},
+			{
+				"start": 24,
+				"end": 26,
+				"type": "Text",
+				"data": "\n\n"
 			}
 		]
 	},
@@ -49,73 +56,73 @@
 			"end": 123,
 			"body": [
 				{
+					"type": "ExportDefaultDeclaration",
+					"start": 36,
+					"end": 95,
 					"declaration": {
+						"type": "ObjectExpression",
 						"start": 51,
 						"end": 94,
-						"type": "ObjectExpression",
 						"properties": [
 							{
+								"type": "Property",
 								"start": 55,
 								"end": 91,
-								"type": "Property",
+								"method": false,
+								"shorthand": false,
 								"computed": false,
 								"key": {
+									"type": "Identifier",
 									"start": 55,
 									"end": 59,
-									"type": "Identifier",
 									"name": "data"
 								},
-								"kind": "init",
-								"method": false,
-								"shorthand": false,
 								"value": {
+									"type": "ArrowFunctionExpression",
 									"start": 61,
 									"end": 91,
-									"type": "ArrowFunctionExpression",
+									"id": null,
+									"generator": false,
+									"expression": true,
 									"async": false,
+									"params": [],
 									"body": {
+										"type": "ObjectExpression",
 										"start": 68,
 										"end": 90,
-										"type": "ObjectExpression",
 										"properties": [
 											{
+												"type": "Property",
 												"start": 73,
 												"end": 86,
-												"type": "Property",
+												"method": false,
+												"shorthand": false,
 												"computed": false,
 												"key": {
+													"type": "Identifier",
 													"start": 73,
 													"end": 77,
-													"type": "Identifier",
 													"name": "name"
 												},
-												"kind": "init",
-												"method": false,
-												"shorthand": false,
 												"value": {
+													"type": "Literal",
 													"start": 79,
 													"end": 86,
-													"type": "Literal",
-													"raw": "'world'",
-													"value": "world"
-												}
+													"value": "world",
+													"raw": "'world'"
+												},
+												"kind": "init"
 											}
 										]
-									},
-									"expression": true,
-									"generator": false,
-									"id": null,
-									"params": []
-								}
+									}
+								},
+								"kind": "init"
 							}
 						]
-					},
-					"end": 95,
-					"start": 36,
-					"type": "ExportDefaultDeclaration"
+					}
 				}
 			],
 			"sourceType": "module"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/test/parser/samples/script/output.json b/test/parser/samples/script/output.json
index a6af78759f..5c8acef657 100644
--- a/test/parser/samples/script/output.json
+++ b/test/parser/samples/script/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 388108696,
 	"html": {
 		"start": 0,
 		"end": 24,
@@ -22,9 +23,9 @@
 						"end": 18,
 						"type": "MustacheTag",
 						"expression": {
+							"type": "Identifier",
 							"start": 12,
 							"end": 16,
-							"type": "Identifier",
 							"name": "name"
 						}
 					},
@@ -35,6 +36,12 @@
 						"data": "!"
 					}
 				]
+			},
+			{
+				"start": 24,
+				"end": 26,
+				"type": "Text",
+				"data": "\n\n"
 			}
 		]
 	},
@@ -49,73 +56,73 @@
 			"end": 96,
 			"body": [
 				{
+					"type": "ExportDefaultDeclaration",
+					"start": 36,
+					"end": 95,
 					"declaration": {
+						"type": "ObjectExpression",
 						"start": 51,
 						"end": 94,
-						"type": "ObjectExpression",
 						"properties": [
 							{
+								"type": "Property",
 								"start": 55,
 								"end": 91,
-								"type": "Property",
+								"method": false,
+								"shorthand": false,
 								"computed": false,
 								"key": {
+									"type": "Identifier",
 									"start": 55,
 									"end": 59,
-									"type": "Identifier",
 									"name": "data"
 								},
-								"kind": "init",
-								"method": false,
-								"shorthand": false,
 								"value": {
+									"type": "ArrowFunctionExpression",
 									"start": 61,
 									"end": 91,
-									"type": "ArrowFunctionExpression",
+									"id": null,
+									"generator": false,
+									"expression": true,
 									"async": false,
+									"params": [],
 									"body": {
+										"type": "ObjectExpression",
 										"start": 68,
 										"end": 90,
-										"type": "ObjectExpression",
 										"properties": [
 											{
+												"type": "Property",
 												"start": 73,
 												"end": 86,
-												"type": "Property",
+												"method": false,
+												"shorthand": false,
 												"computed": false,
 												"key": {
+													"type": "Identifier",
 													"start": 73,
 													"end": 77,
-													"type": "Identifier",
 													"name": "name"
 												},
-												"kind": "init",
-												"method": false,
-												"shorthand": false,
 												"value": {
+													"type": "Literal",
 													"start": 79,
 													"end": 86,
-													"type": "Literal",
-													"raw": "'world'",
-													"value": "world"
-												}
+													"value": "world",
+													"raw": "'world'"
+												},
+												"kind": "init"
 											}
 										]
-									},
-									"expression": true,
-									"generator": false,
-									"id": null,
-									"params": []
-								}
+									}
+								},
+								"kind": "init"
 							}
 						]
-					},
-					"end": 95,
-					"start": 36,
-					"type": "ExportDefaultDeclaration"
+					}
 				}
 			],
 			"sourceType": "module"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/test/parser/samples/self-closing-element/output.json b/test/parser/samples/self-closing-element/output.json
index 5cba18b6a0..80c1ef5bde 100644
--- a/test/parser/samples/self-closing-element/output.json
+++ b/test/parser/samples/self-closing-element/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 4200201687,
 	"html": {
 		"start": 0,
 		"end": 6,
@@ -16,4 +17,4 @@
 	},
 	"css": null,
 	"js": 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 fd5c1543e4..f9c788bd2f 100644
--- a/test/parser/samples/self-reference/output.json
+++ b/test/parser/samples/self-reference/output.json
@@ -1,5 +1,5 @@
 {
-	"hash": 1792372370,
+	"hash": 216762188,
 	"html": {
 		"start": 0,
 		"end": 57,
diff --git a/test/parser/samples/space-between-mustaches/output.json b/test/parser/samples/space-between-mustaches/output.json
index 03a01a64c4..854608fb29 100644
--- a/test/parser/samples/space-between-mustaches/output.json
+++ b/test/parser/samples/space-between-mustaches/output.json
@@ -1,4 +1,5 @@
 {
+	"hash": 1185019088,
 	"html": {
 		"start": 0,
 		"end": 30,
@@ -11,14 +12,20 @@
 				"name": "p",
 				"attributes": [],
 				"children": [
+					{
+						"start": 3,
+						"end": 4,
+						"type": "Text",
+						"data": " "
+					},
 					{
 						"start": 4,
 						"end": 9,
 						"type": "MustacheTag",
 						"expression": {
+							"type": "Identifier",
 							"start": 6,
 							"end": 7,
-							"type": "Identifier",
 							"name": "a"
 						}
 					},
@@ -33,9 +40,9 @@
 						"end": 15,
 						"type": "MustacheTag",
 						"expression": {
+							"type": "Identifier",
 							"start": 12,
 							"end": 13,
-							"type": "Identifier",
 							"name": "b"
 						}
 					},
@@ -50,9 +57,9 @@
 						"end": 23,
 						"type": "MustacheTag",
 						"expression": {
+							"type": "Identifier",
 							"start": 20,
 							"end": 21,
-							"type": "Identifier",
 							"name": "c"
 						}
 					},
@@ -60,7 +67,7 @@
 						"start": 23,
 						"end": 26,
 						"type": "Text",
-						"data": " :"
+						"data": " : "
 					}
 				]
 			}
@@ -68,4 +75,4 @@
 	},
 	"css": null,
 	"js": null
-}
+}
\ No newline at end of file
diff --git a/test/parser/samples/textarea-children/input.html b/test/parser/samples/textarea-children/input.html
new file mode 100644
index 0000000000..de50c807d6
--- /dev/null
+++ b/test/parser/samples/textarea-children/input.html
@@ -0,0 +1,3 @@
+<textarea>
+	<p>not actually an element. {{foo}}</p>
+</textarea>
\ No newline at end of file
diff --git a/test/parser/samples/textarea-children/output.json b/test/parser/samples/textarea-children/output.json
new file mode 100644
index 0000000000..d4ea6f04bb
--- /dev/null
+++ b/test/parser/samples/textarea-children/output.json
@@ -0,0 +1,44 @@
+{
+	"hash": 2992234421,
+	"html": {
+		"start": 0,
+		"end": 63,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 63,
+				"type": "Element",
+				"name": "textarea",
+				"attributes": [],
+				"children": [
+					{
+						"start": 10,
+						"end": 40,
+						"type": "Text",
+						"data": "\n\t<p>not actually an element. "
+					},
+					{
+						"start": 40,
+						"end": 47,
+						"type": "MustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 42,
+							"end": 45,
+							"name": "foo"
+						}
+					},
+					{
+						"start": 47,
+						"end": 52,
+						"type": "Text",
+						"data": "</p>\n"
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/transition-intro-no-params/input.html b/test/parser/samples/transition-intro-no-params/input.html
new file mode 100644
index 0000000000..e5e4171434
--- /dev/null
+++ b/test/parser/samples/transition-intro-no-params/input.html
@@ -0,0 +1 @@
+<div in:fade>fades in</div>
\ 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
new file mode 100644
index 0000000000..cca469ca3e
--- /dev/null
+++ b/test/parser/samples/transition-intro-no-params/output.json
@@ -0,0 +1,37 @@
+{
+	"hash": 503236647,
+	"html": {
+		"start": 0,
+		"end": 27,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 27,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 12,
+						"type": "Transition",
+						"name": "fade",
+						"intro": true,
+						"outro": false,
+						"expression": null
+					}
+				],
+				"children": [
+					{
+						"start": 13,
+						"end": 21,
+						"type": "Text",
+						"data": "fades in"
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/transition-intro/input.html b/test/parser/samples/transition-intro/input.html
new file mode 100644
index 0000000000..db14cfcb2f
--- /dev/null
+++ b/test/parser/samples/transition-intro/input.html
@@ -0,0 +1 @@
+<div in:style='{opacity: 0}'>fades in</div>
\ No newline at end of file
diff --git a/test/parser/samples/transition-intro/output.json b/test/parser/samples/transition-intro/output.json
new file mode 100644
index 0000000000..54ec4da93d
--- /dev/null
+++ b/test/parser/samples/transition-intro/output.json
@@ -0,0 +1,65 @@
+{
+	"hash": 3731674194,
+	"html": {
+		"start": 0,
+		"end": 43,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 43,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 28,
+						"type": "Transition",
+						"name": "style",
+						"intro": true,
+						"outro": false,
+						"expression": {
+							"type": "ObjectExpression",
+							"start": 15,
+							"end": 27,
+							"properties": [
+								{
+									"type": "Property",
+									"start": 16,
+									"end": 26,
+									"method": false,
+									"shorthand": false,
+									"computed": false,
+									"key": {
+										"type": "Identifier",
+										"start": 16,
+										"end": 23,
+										"name": "opacity"
+									},
+									"value": {
+										"type": "Literal",
+										"start": 25,
+										"end": 26,
+										"value": 0,
+										"raw": "0"
+									},
+									"kind": "init"
+								}
+							]
+						}
+					}
+				],
+				"children": [
+					{
+						"start": 29,
+						"end": 37,
+						"type": "Text",
+						"data": "fades in"
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": 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 796829a365..c057bd1f1e 100644
--- a/test/parser/samples/whitespace-leading-trailing/output.json
+++ b/test/parser/samples/whitespace-leading-trailing/output.json
@@ -1,9 +1,16 @@
 {
+	"hash": 424837432,
 	"html": {
 		"start": 6,
 		"end": 36,
 		"type": "Fragment",
 		"children": [
+			{
+				"start": 0,
+				"end": 6,
+				"type": "Text",
+				"data": "\n\n\t\t\t\t"
+			},
 			{
 				"start": 6,
 				"end": 36,
@@ -23,4 +30,4 @@
 	},
 	"css": null,
 	"js": null
-}
+}
\ No newline at end of file
diff --git a/test/parser/samples/whitespace-normal/input.html b/test/parser/samples/whitespace-normal/input.html
new file mode 100644
index 0000000000..372184ebf3
--- /dev/null
+++ b/test/parser/samples/whitespace-normal/input.html
@@ -0,0 +1 @@
+<h1>Hello <strong>{{name}}! </strong><span>How are you?</span></h1>
diff --git a/test/parser/samples/whitespace-normal/output.json b/test/parser/samples/whitespace-normal/output.json
new file mode 100644
index 0000000000..5b609c8e36
--- /dev/null
+++ b/test/parser/samples/whitespace-normal/output.json
@@ -0,0 +1,68 @@
+{
+	"hash": 2961389466,
+	"html": {
+		"start": 0,
+		"end": 67,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 67,
+				"type": "Element",
+				"name": "h1",
+				"attributes": [],
+				"children": [
+					{
+						"start": 4,
+						"end": 10,
+						"type": "Text",
+						"data": "Hello "
+					},
+					{
+						"start": 10,
+						"end": 37,
+						"type": "Element",
+						"name": "strong",
+						"attributes": [],
+						"children": [
+							{
+								"start": 18,
+								"end": 26,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 20,
+									"end": 24,
+									"name": "name"
+								}
+							},
+							{
+								"start": 26,
+								"end": 28,
+								"type": "Text",
+								"data": "! "
+							}
+						]
+					},
+					{
+						"start": 37,
+						"end": 62,
+						"type": "Element",
+						"name": "span",
+						"attributes": [],
+						"children": [
+							{
+								"start": 43,
+								"end": 55,
+								"type": "Text",
+								"data": "How are you?"
+							}
+						]
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/yield/output.json b/test/parser/samples/yield/output.json
index 227da6561f..2f98abe91f 100644
--- a/test/parser/samples/yield/output.json
+++ b/test/parser/samples/yield/output.json
@@ -1,14 +1,17 @@
 {
-  "html": {
-    "start": 0,
-    "end": 9,
-    "type": "Fragment",
-    "children": [
-      {
-        "start": 0,
-        "end": 9,
-        "type": "YieldTag"
-      }
-    ]
-  }
-}
+	"hash": 3659433152,
+	"html": {
+		"start": 0,
+		"end": 9,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 9,
+				"type": "YieldTag"
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/update.js b/test/parser/update.js
new file mode 100644
index 0000000000..7c8e89ab76
--- /dev/null
+++ b/test/parser/update.js
@@ -0,0 +1,13 @@
+// this file will replace all the expected.js and expected-bundle.js files with
+// their _actual equivalents. Only use it when you're sure that you haven't
+// broken anything!
+const fs = require("fs");
+const glob = require("glob");
+
+glob.sync("samples/*/_actual.json", { cwd: __dirname }).forEach(file => {
+	const actual = fs.readFileSync(`${__dirname}/${file}`, "utf-8");
+	fs.writeFileSync(
+		`${__dirname}/${file.replace("_actual", "output")}`,
+		actual
+	);
+});
diff --git a/test/runtime/index.js b/test/runtime/index.js
index e67192cbc6..16d5820f0b 100644
--- a/test/runtime/index.js
+++ b/test/runtime/index.js
@@ -1,108 +1,146 @@
-import spaces from '../../src/utils/spaces.js';
-import assert from 'assert';
-import * as path from 'path';
-import * as fs from 'fs';
-import * as acorn from 'acorn';
-import * as babel from 'babel-core';
-
-import { addLineNumbers, loadConfig, loadSvelte, env, setupHtmlEqual } from '../helpers.js';
+import assert from "assert";
+import * as path from "path";
+import * as fs from "fs";
+import * as acorn from "acorn";
+import { transitionManager } from "../../shared.js";
+
+import {
+	showOutput,
+	loadConfig,
+	loadSvelte,
+	env,
+	setupHtmlEqual,
+	spaces
+} from "../helpers.js";
 
 let svelte;
 
-let showCompiledCode = false;
 let compileOptions = null;
 
-function getName ( filename ) {
-	const base = path.basename( filename ).replace( '.html', '' );
-	return base[0].toUpperCase() + base.slice( 1 );
+function getName(filename) {
+	const base = path.basename(filename).replace(".html", "");
+	return base[0].toUpperCase() + base.slice(1);
 }
 
-const nodeVersionMatch = /^v(\d)/.exec( process.version );
+const nodeVersionMatch = /^v(\d)/.exec(process.version);
 const legacy = +nodeVersionMatch[1] < 6;
-const babelrc = require( '../../package.json' ).babel;
+const babelrc = require("../../package.json").babel;
 
-require.extensions[ '.html' ] = function ( module, filename ) {
-	const options = Object.assign({ filename, name: getName( filename ) }, compileOptions );
-	let { code } = svelte.compile( fs.readFileSync( filename, 'utf-8' ), options );
+const Object_assign = Object.assign;
 
-	if ( showCompiledCode ) console.log( addLineNumbers( code ) ); // eslint-disable-line no-console
+describe("runtime", () => {
+	before(() => {
+		svelte = loadSvelte(true);
 
-	if ( legacy ) code = babel.transform( code, babelrc ).code;
+		require.extensions[".html"] = function(module, filename) {
+			const options = Object.assign(
+				{ filename, name: getName(filename) },
+				compileOptions
+			);
+			let { code } = svelte.compile(fs.readFileSync(filename, "utf-8"), options);
 
-	return module._compile( code, filename );
-};
+			if (legacy) code = require('babel-core').transform(code, babelrc).code;
 
-const Object_assign = Object.assign;
+			return module._compile(code, filename);
+		};
 
-describe( 'runtime', () => {
-	before( () => {
-		svelte = loadSvelte( true );
 		return setupHtmlEqual();
 	});
 
-	function runTest ( dir, shared ) {
-		if ( dir[0] === '.' ) return;
+	const failed = new Set();
 
-		const config = loadConfig( `./runtime/samples/${dir}/_config.js` );
+	function runTest(dir, shared, hydrate) {
+		if (dir[0] === ".") return;
 
-		if ( config.solo && process.env.CI ) {
-			throw new Error( 'Forgot to remove `solo: true` from test' );
+		const config = loadConfig(`./runtime/samples/${dir}/_config.js`);
+
+		if (config.solo && process.env.CI) {
+			throw new Error("Forgot to remove `solo: true` from test");
 		}
 
-		( config.skip ? it.skip : config.solo ? it.only : it )( dir, () => {
-			let compiled;
+		(config.skip ? it.skip : config.solo ? it.only : it)(`${dir} (${shared ? 'shared' : 'inline'} helpers)`, () => {
+			if (failed.has(dir)) {
+				// this makes debugging easier, by only printing compiled output once
+				throw new Error('skipping test, already failed');
+			}
+
+			const cwd = path.resolve(`test/runtime/samples/${dir}`);
 
-			showCompiledCode = config.show;
 			compileOptions = config.compileOptions || {};
 			compileOptions.shared = shared;
+			compileOptions.hydratable = hydrate;
 			compileOptions.dev = config.dev;
 
-			try {
-				const source = fs.readFileSync( `test/runtime/samples/${dir}/main.html`, 'utf-8' );
-				compiled = svelte.compile( source, compileOptions );
-			} catch ( err ) {
-				if ( config.compileError ) {
-					config.compileError( err );
-					return;
-				} else {
-					throw err;
-				}
-			}
-
-			const { code } = compiled;
-
 			// check that no ES2015+ syntax slipped in
-			if ( !config.allowES2015 ) {
+			if (!config.allowES2015) {
 				try {
-					const startIndex = code.indexOf( 'function create_main_fragment' ); // may change!
-					if ( startIndex === -1 ) throw new Error( 'missing create_main_fragment' );
-					const es5 = spaces( startIndex ) + code.slice( startIndex ).replace( /export default .+/, '' );
-					acorn.parse( es5, { ecmaVersion: 5 });
-				} catch ( err ) {
-					if ( !config.show ) console.log( addLineNumbers( code ) ); // eslint-disable-line no-console
+					const source = fs.readFileSync(
+						`test/runtime/samples/${dir}/main.html`,
+						"utf-8"
+					);
+					const { code } = svelte.compile(source, compileOptions);
+					const startIndex = code.indexOf("function create_main_fragment"); // may change!
+					if (startIndex === -1)
+						throw new Error("missing create_main_fragment");
+					const es5 =
+						code.slice(0, startIndex).split('\n').map(x => spaces(x.length)).join('\n') +
+						code.slice(startIndex).replace(/export default .+/, "");
+					acorn.parse(es5, { ecmaVersion: 5 });
+				} catch (err) {
+					failed.add(dir);
+					showOutput(cwd, { shared }); // eslint-disable-line no-console
 					throw err;
 				}
 			}
 
-			Object.keys( require.cache ).filter( x => x.endsWith( '.html' ) ).forEach( file => {
-				delete require.cache[ file ];
-			});
+			Object.keys(require.cache)
+				.filter(x => x.endsWith(".html"))
+				.forEach(file => {
+					delete require.cache[file];
+				});
 
 			let SvelteComponent;
 
-			try {
-				SvelteComponent = require( `./samples/${dir}/main.html` ).default;
-			} catch ( err ) {
-				if ( !config.show ) console.log( addLineNumbers( code ) ); // eslint-disable-line no-console
-				throw err;
-			}
-
 			let unintendedError = null;
 
 			return env()
-				.then( window => {
+				.then(window => {
+					// set of hacks to support transition tests
+					transitionManager.running = false;
+					transitionManager.transitions = [];
+
+					const raf = {
+						time: 0,
+						callback: null,
+						tick: now => {
+							raf.time = now;
+							if (raf.callback) raf.callback();
+						}
+					};
+					window.performance = { now: () => raf.time };
+					global.requestAnimationFrame = cb => {
+						let called = false;
+						raf.callback = () => {
+							if (!called) {
+								called = true;
+								cb();
+							}
+						};
+					};
+
+					global.window = window;
+
+					try {
+						SvelteComponent = require(`./samples/${dir}/main.html`).default;
+					} catch (err) {
+						showOutput(cwd, { shared }); // eslint-disable-line no-console
+						throw err;
+					}
+
 					Object.assign = () => {
-						throw new Error( 'cannot use Object.assign in generated code, as it is not supported everywhere' );
+						throw new Error(
+							"cannot use Object.assign in generated code, as it is not supported everywhere"
+						);
 					};
 
 					global.window = window;
@@ -110,16 +148,17 @@ describe( 'runtime', () => {
 					// Put the constructor on window for testing
 					window.SvelteComponent = SvelteComponent;
 
-					const target = window.document.querySelector( 'main' );
+					const target = window.document.querySelector("main");
 
 					const warnings = [];
 					const warn = console.warn;
 					console.warn = warning => {
-						warnings.push( warning );
+						warnings.push(warning);
 					};
 
 					const component = new SvelteComponent({
 						target,
+						hydrate,
 						data: config.data
 					});
 
@@ -127,69 +166,87 @@ describe( 'runtime', () => {
 
 					console.warn = warn;
 
-					if ( config.error ) {
+					if (config.error) {
 						unintendedError = true;
-						throw new Error( 'Expected a runtime error' );
+						throw new Error("Expected a runtime error");
 					}
 
-					if ( config.warnings ) {
-						assert.deepEqual( warnings, config.warnings );
-					} else if ( warnings.length ) {
+					if (config.warnings) {
+						assert.deepEqual(warnings, config.warnings);
+					} else if (warnings.length) {
 						unintendedError = true;
-						throw new Error( 'Received unexpected warnings' );
+						throw new Error("Received unexpected warnings");
 					}
 
-					if ( config.html ) {
-						assert.htmlEqual( target.innerHTML, config.html );
+					if (config.html) {
+						assert.htmlEqual(target.innerHTML, config.html);
 					}
 
 					Object.assign = Object_assign;
 
-					if ( config.test ) {
-						config.test( assert, component, target, window );
+					if (config.test) {
+						config.test(assert, component, target, window, raf);
 					} else {
 						component.destroy();
-						assert.equal( target.innerHTML, '' );
+						assert.equal(target.innerHTML, "");
 					}
 				})
-				.catch( err => {
+				.catch(err => {
 					Object.assign = Object_assign;
 
-					if ( config.error && !unintendedError ) {
-						config.error( assert, err );
-					}
-
-					else {
-						if ( !config.show ) console.log( addLineNumbers( code ) ); // eslint-disable-line no-console
+					if (config.error && !unintendedError) {
+						config.error(assert, err);
+					} else {
+						failed.add(dir);
+						showOutput(cwd, { shared }); // eslint-disable-line no-console
 						throw err;
 					}
+				})
+				.then(() => {
+					if (config.show) showOutput(cwd, { shared });
 				});
 		});
 	}
 
-	describe( 'inline helpers', () => {
-		fs.readdirSync( 'test/runtime/samples' ).forEach( dir => {
-			runTest( dir, null );
-		});
+	const shared = path.resolve("shared.js");
+	fs.readdirSync("test/runtime/samples").forEach(dir => {
+		runTest(dir, shared, false);
+		runTest(dir, shared, true);
+		runTest(dir, null, false);
 	});
 
-	describe( 'shared helpers', () => {
-		fs.readdirSync( 'test/runtime/samples' ).forEach( dir => {
-			runTest( dir, path.resolve( 'shared.js' ) );
+	it("fails if options.target is missing in dev mode", () => {
+		const { code } = svelte.compile(`<div></div>`, {
+			format: "iife",
+			name: "SvelteComponent",
+			dev: true
 		});
+
+		const SvelteComponent = eval(
+			`(function () { ${code}; return SvelteComponent; }())`
+		);
+
+		assert.throws(() => {
+			new SvelteComponent();
+		}, /'target' is a required option/);
 	});
 
-	it( 'fails if options.target is missing in dev mode', () => {
-		const { code } = svelte.compile( `<div></div>`, {
-			format: 'iife',
-			name: 'SvelteComponent',
+	it("fails if options.hydrate is true but the component is non-hydratable", () => {
+		const { code } = svelte.compile(`<div></div>`, {
+			format: "iife",
+			name: "SvelteComponent",
 			dev: true
 		});
 
-		const SvelteComponent = eval( `(function () { ${code}; return SvelteComponent; }())` );
+		const SvelteComponent = eval(
+			`(function () { ${code}; return SvelteComponent; }())`
+		);
 
-		assert.throws( () => {
-			new SvelteComponent();
-		}, /'target' is a required option/ );
+		assert.throws(() => {
+			new SvelteComponent({
+				target: {},
+				hydrate: true
+			});
+		}, /options.hydrate only works if the component was compiled with the `hydratable: true` option/);
 	});
 });
diff --git a/test/runtime/samples/attribute-dynamic-type/_config.js b/test/runtime/samples/attribute-dynamic-type/_config.js
new file mode 100644
index 0000000000..93a4e28acd
--- /dev/null
+++ b/test/runtime/samples/attribute-dynamic-type/_config.js
@@ -0,0 +1,19 @@
+export default {
+	'skip-ssr': true,
+
+	data: {
+		inputType: 'text',
+		inputValue: 42
+	},
+
+	html: `<input type="text">`,
+
+	test(assert, component, target) {
+		const input = target.querySelector('input');
+		assert.equal(input.type, 'text');
+		assert.equal(input.value, '42');
+
+		component.set({ inputType: 'number' });
+		assert.equal(input.type, 'number');
+	}
+};
diff --git a/test/runtime/samples/attribute-dynamic-type/main.html b/test/runtime/samples/attribute-dynamic-type/main.html
new file mode 100644
index 0000000000..5bafd96cb3
--- /dev/null
+++ b/test/runtime/samples/attribute-dynamic-type/main.html
@@ -0,0 +1 @@
+<input type='{{inputType}}' value='{{inputValue}}'>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-indirect/_config.js b/test/runtime/samples/binding-indirect/_config.js
new file mode 100644
index 0000000000..9fdfa23a25
--- /dev/null
+++ b/test/runtime/samples/binding-indirect/_config.js
@@ -0,0 +1,91 @@
+const tasks = [
+	{ description: 'put your left leg in', done: false },
+	{ description: 'your left leg out', done: false },
+	{ description: 'in, out, in, out', done: false },
+	{ description: 'shake it all about', done: false }
+];
+
+export default {
+	'skip-ssr': true,
+	allowES2015: true,
+
+	data: {
+		tasks,
+		selected: tasks[0]
+	},
+
+	html: `
+		<select>
+			<option value='[object Object]'>put your left leg in</option>
+			<option value='[object Object]'>your left leg out</option>
+			<option value='[object Object]'>in, out, in, out</option>
+			<option value='[object Object]'>shake it all about</option>
+		</select>
+
+		<label>
+			<input type='checkbox'> put your left leg in
+		</label>
+
+		<h2>Pending tasks</h2>
+		<p>put your left leg in</p>
+		<p>your left leg out</p>
+		<p>in, out, in, out</p>
+		<p>shake it all about</p>
+	`,
+
+	test(assert, component, target, window) {
+		const input = target.querySelector('input');
+		const select = target.querySelector('select');
+		const options = target.querySelectorAll('option');
+
+		const change = new window.Event('change');
+
+		input.checked = true;
+		input.dispatchEvent(change);
+
+		assert.ok(component.get('tasks')[0].done);
+		assert.htmlEqual(target.innerHTML, `
+			<select>
+				<option value='[object Object]'>put your left leg in</option>
+				<option value='[object Object]'>your left leg out</option>
+				<option value='[object Object]'>in, out, in, out</option>
+				<option value='[object Object]'>shake it all about</option>
+			</select>
+
+			<label>
+				<input type='checkbox'> put your left leg in
+			</label>
+
+			<h2>Pending tasks</h2>
+			<p>your left leg out</p>
+			<p>in, out, in, out</p>
+			<p>shake it all about</p>
+		`);
+
+		options[1].selected = true;
+		select.dispatchEvent(change);
+		assert.equal(component.get('selected'), tasks[1]);
+		assert.ok(!input.checked);
+
+		input.checked = true;
+		input.dispatchEvent(change);
+
+		assert.ok(component.get('tasks')[1].done);
+		assert.htmlEqual(target.innerHTML, `
+			<select>
+				<option value='[object Object]'>put your left leg in</option>
+				<option value='[object Object]'>your left leg out</option>
+				<option value='[object Object]'>in, out, in, out</option>
+				<option value='[object Object]'>shake it all about</option>
+			</select>
+
+			<label>
+				<input type='checkbox'> your left leg out
+			</label>
+
+			<h2>Pending tasks</h2>
+			<p>in, out, in, out</p>
+			<p>shake it all about</p>
+		`);
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/binding-indirect/main.html b/test/runtime/samples/binding-indirect/main.html
new file mode 100644
index 0000000000..e1ab12c82f
--- /dev/null
+++ b/test/runtime/samples/binding-indirect/main.html
@@ -0,0 +1,14 @@
+<select bind:value='selected'>
+	{{#each tasks as task}}
+		<option value='{{task}}'>{{task.description}}</option>
+	{{/each}}
+</select>
+
+<label>
+	<input type='checkbox' bind:checked='selected.done'> {{selected.description}}
+</label>
+
+<h2>Pending tasks</h2>
+{{#each tasks.filter(t => !t.done) as task}}
+	<p>{{task.description}}</p>
+{{/each}}
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-number/_config.js b/test/runtime/samples/binding-input-number/_config.js
index 35ab5375a2..8fd406a2c4 100644
--- a/test/runtime/samples/binding-input-number/_config.js
+++ b/test/runtime/samples/binding-input-number/_config.js
@@ -29,5 +29,15 @@ export default {
 			<input type='number'>
 			<p>number 44</p>
 		` );
+
+		// empty string should be treated as undefined
+		input.value = '';
+		input.dispatchEvent( event );
+
+		assert.equal( component.get( 'count' ), undefined );
+		assert.htmlEqual( target.innerHTML, `
+			<input type='number'>
+			<p>undefined undefined</p>
+		` );
 	}
 };
diff --git a/test/runtime/samples/binding-input-text-deep-computed-dynamic/_config.js b/test/runtime/samples/binding-input-text-deep-computed-dynamic/_config.js
new file mode 100644
index 0000000000..de74cba3c4
--- /dev/null
+++ b/test/runtime/samples/binding-input-text-deep-computed-dynamic/_config.js
@@ -0,0 +1,55 @@
+export default {
+	data: {
+		prop: 'bar',
+		obj: {
+			foo: 'a',
+			bar: 'b',
+			baz: 'c'
+		}
+	},
+
+	html: `
+		<input>
+		<pre>{"foo":"a","bar":"b","baz":"c"}</pre>
+	`,
+
+	test ( assert, component, target, window ) {
+		const input = target.querySelector( 'input' );
+		const event = new window.Event( 'input' );
+
+		assert.equal( input.value, 'b' );
+
+		// edit bar
+		input.value = 'e';
+		input.dispatchEvent( event );
+
+		assert.htmlEqual( target.innerHTML, `
+			<input>
+			<pre>{"foo":"a","bar":"e","baz":"c"}</pre>
+		` );
+
+		// edit baz
+		component.set({ prop: 'baz' });
+		assert.equal( input.value, 'c' );
+
+		input.value = 'f';
+		input.dispatchEvent( event );
+
+		assert.htmlEqual( target.innerHTML, `
+			<input>
+			<pre>{"foo":"a","bar":"e","baz":"f"}</pre>
+		` );
+
+		// edit foo
+		component.set({ prop: 'foo' });
+		assert.equal( input.value, 'a' );
+
+		input.value = 'd';
+		input.dispatchEvent( event );
+
+		assert.htmlEqual( target.innerHTML, `
+			<input>
+			<pre>{"foo":"d","bar":"e","baz":"f"}</pre>
+		` );
+	}
+};
diff --git a/test/runtime/samples/binding-input-text-deep-computed-dynamic/main.html b/test/runtime/samples/binding-input-text-deep-computed-dynamic/main.html
new file mode 100644
index 0000000000..3a95b383e4
--- /dev/null
+++ b/test/runtime/samples/binding-input-text-deep-computed-dynamic/main.html
@@ -0,0 +1,2 @@
+<input bind:value='obj[prop]'>
+<pre>{{JSON.stringify(obj)}}</pre>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-text-deep-computed/_config.js b/test/runtime/samples/binding-input-text-deep-computed/_config.js
new file mode 100644
index 0000000000..597395ed52
--- /dev/null
+++ b/test/runtime/samples/binding-input-text-deep-computed/_config.js
@@ -0,0 +1,30 @@
+export default {
+	data: {
+		prop: 'name',
+		user: {
+			name: 'alice'
+		}
+	},
+
+	html: `<input>\n<p>hello alice</p>`,
+
+	test ( assert, component, target, window ) {
+		const input = target.querySelector( 'input' );
+
+		assert.equal( input.value, 'alice' );
+
+		const event = new window.Event( 'input' );
+
+		input.value = 'bob';
+		input.dispatchEvent( event );
+
+		assert.equal( target.innerHTML, `<input>\n<p>hello bob</p>` );
+
+		const user = component.get( 'user' );
+		user.name = 'carol';
+
+		component.set({ user });
+		assert.equal( input.value, 'carol' );
+		assert.equal( target.innerHTML, `<input>\n<p>hello carol</p>` );
+	}
+};
diff --git a/test/runtime/samples/binding-input-text-deep-computed/main.html b/test/runtime/samples/binding-input-text-deep-computed/main.html
new file mode 100644
index 0000000000..281849a4d0
--- /dev/null
+++ b/test/runtime/samples/binding-input-text-deep-computed/main.html
@@ -0,0 +1,2 @@
+<input bind:value='user[prop]'>
+<p>hello {{user.name}}</p>
diff --git a/test/runtime/samples/binding-input-text-deep-contextual-computed-dynamic/_config.js b/test/runtime/samples/binding-input-text-deep-contextual-computed-dynamic/_config.js
new file mode 100644
index 0000000000..5a16a691bf
--- /dev/null
+++ b/test/runtime/samples/binding-input-text-deep-contextual-computed-dynamic/_config.js
@@ -0,0 +1,55 @@
+export default {
+	data: {
+		prop: 'bar',
+		objects: [{
+			foo: 'a',
+			bar: 'b',
+			baz: 'c'
+		}]
+	},
+
+	html: `
+		<input>
+		<pre>{"foo":"a","bar":"b","baz":"c"}</pre>
+	`,
+
+	test ( assert, component, target, window ) {
+		const input = target.querySelector( 'input' );
+		const event = new window.Event( 'input' );
+
+		assert.equal( input.value, 'b' );
+
+		// edit bar
+		input.value = 'e';
+		input.dispatchEvent( event );
+
+		assert.htmlEqual( target.innerHTML, `
+			<input>
+			<pre>{"foo":"a","bar":"e","baz":"c"}</pre>
+		` );
+
+		// edit baz
+		component.set({ prop: 'baz' });
+		assert.equal( input.value, 'c' );
+
+		input.value = 'f';
+		input.dispatchEvent( event );
+
+		assert.htmlEqual( target.innerHTML, `
+			<input>
+			<pre>{"foo":"a","bar":"e","baz":"f"}</pre>
+		` );
+
+		// edit foo
+		component.set({ prop: 'foo' });
+		assert.equal( input.value, 'a' );
+
+		input.value = 'd';
+		input.dispatchEvent( event );
+
+		assert.htmlEqual( target.innerHTML, `
+			<input>
+			<pre>{"foo":"d","bar":"e","baz":"f"}</pre>
+		` );
+	}
+};
diff --git a/test/runtime/samples/binding-input-text-deep-contextual-computed-dynamic/main.html b/test/runtime/samples/binding-input-text-deep-contextual-computed-dynamic/main.html
new file mode 100644
index 0000000000..b2f36850f4
--- /dev/null
+++ b/test/runtime/samples/binding-input-text-deep-contextual-computed-dynamic/main.html
@@ -0,0 +1,4 @@
+{{#each objects as obj}}
+	<input bind:value='obj[prop]'>
+	<pre>{{JSON.stringify(obj)}}</pre>
+{{/each}}
\ No newline at end of file
diff --git a/test/runtime/samples/binding-select-initial-value-undefined/_config.js b/test/runtime/samples/binding-select-initial-value-undefined/_config.js
new file mode 100644
index 0000000000..d5944ae815
--- /dev/null
+++ b/test/runtime/samples/binding-select-initial-value-undefined/_config.js
@@ -0,0 +1,25 @@
+export default {
+	'skip-ssr': true, // TODO would be nice to fix this in SSR as well
+
+	html: `
+		<p>selected: a</p>
+
+		<select>
+			<option>a</option>
+			<option>b</option>
+			<option>c</option>
+		</select>
+
+		<p>selected: a</p>
+	`,
+
+	test ( assert, component, target ) {
+		const select = target.querySelector( 'select' );
+		const options = [ ...target.querySelectorAll( 'option' ) ];
+
+		assert.equal( select.value, 'a' );
+		assert.ok( options[0].selected );
+
+		component.destroy();
+	}
+};
diff --git a/test/runtime/samples/binding-select-initial-value-undefined/main.html b/test/runtime/samples/binding-select-initial-value-undefined/main.html
new file mode 100644
index 0000000000..ea15402240
--- /dev/null
+++ b/test/runtime/samples/binding-select-initial-value-undefined/main.html
@@ -0,0 +1,9 @@
+<p>selected: {{selected}}</p>
+
+<select bind:value='selected'>
+	<option>a</option>
+	<option>b</option>
+	<option>c</option>
+</select>
+
+<p>selected: {{selected}}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-select-initial-value/_config.js b/test/runtime/samples/binding-select-initial-value/_config.js
index f6b685fd7e..99a7129262 100644
--- a/test/runtime/samples/binding-select-initial-value/_config.js
+++ b/test/runtime/samples/binding-select-initial-value/_config.js
@@ -1,6 +1,4 @@
 export default {
-	skip: true, // selectedOptions doesn't work in JSDOM???
-
 	html: `
 		<p>selected: b</p>
 
diff --git a/test/runtime/samples/binding-select-initial-value/main.html b/test/runtime/samples/binding-select-initial-value/main.html
index d7d02194c8..ea15402240 100644
--- a/test/runtime/samples/binding-select-initial-value/main.html
+++ b/test/runtime/samples/binding-select-initial-value/main.html
@@ -1,9 +1,9 @@
 <p>selected: {{selected}}</p>
 
 <select bind:value='selected'>
-	<option value="a">a</option>
-	<option value="b">b</option>
-	<option value="c">c</option>
+	<option>a</option>
+	<option>b</option>
+	<option>c</option>
 </select>
 
 <p>selected: {{selected}}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-select-multiple/_config.js b/test/runtime/samples/binding-select-multiple/_config.js
index 89b0da9658..ec4f3dfe4e 100644
--- a/test/runtime/samples/binding-select-multiple/_config.js
+++ b/test/runtime/samples/binding-select-multiple/_config.js
@@ -1,12 +1,12 @@
 export default {
-	skip: true, // selectedOptions doesn't work in JSDOM???
+	skip: true, // JSDOM
 
 	data: {
 		selected: [ 'two', 'three' ]
 	},
 
 	html: `
-		<select>
+		<select multiple>
 			<option>one</option>
 			<option>two</option>
 			<option>three</option>
@@ -26,7 +26,7 @@ export default {
 
 		assert.deepEqual( component.get( 'selected' ), [ 'three' ] );
 		assert.htmlEqual( target.innerHTML, `
-			<select>
+			<select multiple>
 				<option>one</option>
 				<option>two</option>
 				<option>three</option>
@@ -40,7 +40,7 @@ export default {
 
 		assert.deepEqual( component.get( 'selected' ), [ 'one', 'three' ] );
 		assert.htmlEqual( target.innerHTML, `
-			<select>
+			<select multiple>
 				<option>one</option>
 				<option>two</option>
 				<option>three</option>
@@ -56,7 +56,7 @@ export default {
 		assert.ok( !options[2].selected );
 
 		assert.htmlEqual( target.innerHTML, `
-			<select>
+			<select multiple>
 				<option>one</option>
 				<option>two</option>
 				<option>three</option>
diff --git a/test/runtime/samples/binding-select/_config.js b/test/runtime/samples/binding-select/_config.js
index 85cf6e9e1a..7fce00f327 100644
--- a/test/runtime/samples/binding-select/_config.js
+++ b/test/runtime/samples/binding-select/_config.js
@@ -1,6 +1,4 @@
 export default {
-	skip: true, // selectedOptions doesn't work in JSDOM???
-
 	html: `
 		<p>selected: one</p>
 
@@ -13,6 +11,10 @@ export default {
 		<p>selected: one</p>
 	`,
 
+	data: {
+		selected: 'one'
+	},
+
 	test ( assert, component, target, window ) {
 		const select = target.querySelector( 'select' );
 		const options = [ ...target.querySelectorAll( 'option' ) ];
diff --git a/test/runtime/samples/component-binding-computed/Nested.html b/test/runtime/samples/component-binding-computed/Nested.html
new file mode 100644
index 0000000000..ca75184db2
--- /dev/null
+++ b/test/runtime/samples/component-binding-computed/Nested.html
@@ -0,0 +1,3 @@
+<label>
+	{{field}} <input bind:value>
+</label>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-computed/_config.js b/test/runtime/samples/component-binding-computed/_config.js
new file mode 100644
index 0000000000..08590c4954
--- /dev/null
+++ b/test/runtime/samples/component-binding-computed/_config.js
@@ -0,0 +1,34 @@
+export default {
+	html: `
+		<label>firstname <input></label>
+		<label>lastname <input></label>
+	`,
+
+	test ( assert, component, target, window ) {
+		const input = new window.Event( 'input' );
+		const inputs = target.querySelectorAll( 'input' );
+
+		inputs[0].value = 'Ada';
+		inputs[0].dispatchEvent(input);
+		assert.deepEqual(component.get('values'), {
+			firstname: 'Ada',
+			lastname: ''
+		});
+
+		inputs[1].value = 'Lovelace';
+		inputs[1].dispatchEvent(input);
+		assert.deepEqual(component.get('values'), {
+			firstname: 'Ada',
+			lastname: 'Lovelace'
+		});
+
+		component.set({
+			values: {
+				firstname: 'Grace',
+				lastname: 'Hopper'
+			}
+		});
+		assert.equal(inputs[0].value, 'Grace');
+		assert.equal(inputs[1].value, 'Hopper');
+	}
+};
diff --git a/test/runtime/samples/component-binding-computed/main.html b/test/runtime/samples/component-binding-computed/main.html
new file mode 100644
index 0000000000..9ac402fec8
--- /dev/null
+++ b/test/runtime/samples/component-binding-computed/main.html
@@ -0,0 +1,22 @@
+{{#each fields as field}}
+	<Nested :field bind:value='values[field]'/>
+{{/each}}
+
+<script>
+	import Nested from './Nested.html';
+
+	export default {
+		data: function () {
+			return {
+				fields: ['firstname', 'lastname'],
+				values: {
+					firstname: '',
+					lastname: ''
+				}
+			};
+		},
+		components: {
+			Nested
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/component-if-placement/Component.html b/test/runtime/samples/component-if-placement/Component.html
new file mode 100644
index 0000000000..e229cff5cc
--- /dev/null
+++ b/test/runtime/samples/component-if-placement/Component.html
@@ -0,0 +1,3 @@
+{{#if true}}
+	<span>Component</span>
+{{/if}}
diff --git a/test/runtime/samples/component-if-placement/_config.js b/test/runtime/samples/component-if-placement/_config.js
new file mode 100644
index 0000000000..9b0a74df19
--- /dev/null
+++ b/test/runtime/samples/component-if-placement/_config.js
@@ -0,0 +1,20 @@
+export default {
+	data: {
+		flag: true
+	},
+
+	html: `
+		<span>Before</span>
+		<span>Component</span>
+		<span>After</span>
+	`,
+
+	test ( assert, component, target ) {
+		component.set( { flag: false } );
+		assert.htmlEqual( target.innerHTML, `
+			<span>Before</span>
+			<span>Component</span>
+			<span>After</span>
+		`);
+	}
+};
diff --git a/test/runtime/samples/component-if-placement/main.html b/test/runtime/samples/component-if-placement/main.html
new file mode 100644
index 0000000000..abb45738ba
--- /dev/null
+++ b/test/runtime/samples/component-if-placement/main.html
@@ -0,0 +1,14 @@
+<span>Before</span>
+{{#if flag}}
+	<Component/>
+{{else}}
+	<Component/>
+{{/if}}
+<span>After</span>
+
+<script>
+	import Component from './Component.html';
+	export default {
+		components: { Component }
+	};
+</script>
diff --git a/test/runtime/samples/component-nested-deep/Level1.html b/test/runtime/samples/component-nested-deep/Level1.html
new file mode 100644
index 0000000000..d483c9a0c0
--- /dev/null
+++ b/test/runtime/samples/component-nested-deep/Level1.html
@@ -0,0 +1,15 @@
+<Level2>
+	<Level3 />
+</Level2>
+
+<script>
+	import Level2 from './Level2.html';
+	import Level3 from './Level3.html';
+	
+	export default {
+		components: {
+			Level2,
+			Level3
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/component-nested-deep/Level2.html b/test/runtime/samples/component-nested-deep/Level2.html
new file mode 100644
index 0000000000..3ab519e45c
--- /dev/null
+++ b/test/runtime/samples/component-nested-deep/Level2.html
@@ -0,0 +1,12 @@
+<span>level 2</span>
+{{yield}}
+
+<script>
+	import Level3 from './Level3.html';
+	
+	export default {
+		components: {
+			Level3
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/component-nested-deep/Level3.html b/test/runtime/samples/component-nested-deep/Level3.html
new file mode 100644
index 0000000000..b153e7e37a
--- /dev/null
+++ b/test/runtime/samples/component-nested-deep/Level3.html
@@ -0,0 +1 @@
+<span>level 3</span>
\ No newline at end of file
diff --git a/test/runtime/samples/component-nested-deep/_config.js b/test/runtime/samples/component-nested-deep/_config.js
new file mode 100644
index 0000000000..63b70fe41d
--- /dev/null
+++ b/test/runtime/samples/component-nested-deep/_config.js
@@ -0,0 +1,5 @@
+export default {
+	test(assert, component) {
+		component.refs.l1.destroy();
+	}
+};
diff --git a/test/runtime/samples/component-nested-deep/main.html b/test/runtime/samples/component-nested-deep/main.html
new file mode 100644
index 0000000000..d4882d5a6f
--- /dev/null
+++ b/test/runtime/samples/component-nested-deep/main.html
@@ -0,0 +1,11 @@
+<Level1 ref:l1 />
+
+<script>
+	import Level1 from './Level1.html';
+	
+	export default {
+		components: {
+			Level1
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/component-nested-deeper/Level1.html b/test/runtime/samples/component-nested-deeper/Level1.html
new file mode 100644
index 0000000000..0789b14445
--- /dev/null
+++ b/test/runtime/samples/component-nested-deeper/Level1.html
@@ -0,0 +1,22 @@
+<div class="level1">
+	{{#each values as value}}
+		<h4>level 1 #{{value}}</h4>
+		<Level2 condition="{{value % 2}}">
+			<Level3>
+				<span>And more stuff goes in here</span>
+			</Level3>
+		</Level2>
+	{{/each}}
+</div>
+
+<script>
+	import Level2 from './Level2.html';
+	import Level3 from './Level3.html';
+	
+	export default {
+		components: {
+			Level2,
+			Level3
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/component-nested-deeper/Level2.html b/test/runtime/samples/component-nested-deeper/Level2.html
new file mode 100644
index 0000000000..6742c7d7f9
--- /dev/null
+++ b/test/runtime/samples/component-nested-deeper/Level2.html
@@ -0,0 +1,8 @@
+<div class="level2" ref:wat>
+	<h4>level 2</h4>
+	{{#if condition}}
+		<span>TRUE! {{yield}}</span>
+	{{else}}
+		<span>FALSE! {{yield}}</span>
+	{{/if}}
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-nested-deeper/Level3.html b/test/runtime/samples/component-nested-deeper/Level3.html
new file mode 100644
index 0000000000..e09fc525a8
--- /dev/null
+++ b/test/runtime/samples/component-nested-deeper/Level3.html
@@ -0,0 +1,4 @@
+<div class="level3" ref:thingy>
+	<h4>level 3</h4>
+	{{yield}}
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-nested-deeper/_config.js b/test/runtime/samples/component-nested-deeper/_config.js
new file mode 100644
index 0000000000..8c525fedd4
--- /dev/null
+++ b/test/runtime/samples/component-nested-deeper/_config.js
@@ -0,0 +1,9 @@
+export default {
+	data: {
+		values: [1, 2, 3, 4]
+	},
+
+	test(assert, component) {
+		component.set({ values: [2, 3] });
+	}
+};
diff --git a/test/runtime/samples/component-nested-deeper/main.html b/test/runtime/samples/component-nested-deeper/main.html
new file mode 100644
index 0000000000..5ad2d9d319
--- /dev/null
+++ b/test/runtime/samples/component-nested-deeper/main.html
@@ -0,0 +1,11 @@
+<Level1 :values/>
+
+<script>
+	import Level1 from './Level1.html';
+	
+	export default {
+		components: {
+			Level1
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-follows-element/Foo.html b/test/runtime/samples/component-yield-follows-element/Foo.html
new file mode 100644
index 0000000000..1e619f2ecd
--- /dev/null
+++ b/test/runtime/samples/component-yield-follows-element/Foo.html
@@ -0,0 +1,2 @@
+<div>before</div>
+{{yield}}
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-follows-element/_config.js b/test/runtime/samples/component-yield-follows-element/_config.js
new file mode 100644
index 0000000000..93703c7dab
--- /dev/null
+++ b/test/runtime/samples/component-yield-follows-element/_config.js
@@ -0,0 +1,6 @@
+export default {
+	html: `
+		<div>before</div>
+		test
+	`
+};
diff --git a/test/runtime/samples/component-yield-follows-element/main.html b/test/runtime/samples/component-yield-follows-element/main.html
new file mode 100644
index 0000000000..15747d9d53
--- /dev/null
+++ b/test/runtime/samples/component-yield-follows-element/main.html
@@ -0,0 +1,11 @@
+<Foo>test</Foo>
+
+<script>
+	import Foo from './Foo.html';
+
+	export default {
+		components: {
+			Foo
+		}
+	};
+</script>
diff --git a/test/runtime/samples/component-yield-nested-if/Inner.html b/test/runtime/samples/component-yield-nested-if/Inner.html
new file mode 100644
index 0000000000..d87e45af56
--- /dev/null
+++ b/test/runtime/samples/component-yield-nested-if/Inner.html
@@ -0,0 +1 @@
+Inner
diff --git a/test/runtime/samples/component-yield-nested-if/Outer.html b/test/runtime/samples/component-yield-nested-if/Outer.html
new file mode 100644
index 0000000000..c9557e4532
--- /dev/null
+++ b/test/runtime/samples/component-yield-nested-if/Outer.html
@@ -0,0 +1,3 @@
+{{#if foo}}
+	{{yield}}
+{{/if}}
diff --git a/test/runtime/samples/component-yield-nested-if/_config.js b/test/runtime/samples/component-yield-nested-if/_config.js
new file mode 100644
index 0000000000..44548b2f16
--- /dev/null
+++ b/test/runtime/samples/component-yield-nested-if/_config.js
@@ -0,0 +1,14 @@
+export default {
+	html: `
+		One
+		Inner
+	`,
+
+	test ( assert, component, target ) {
+		component.set({ foo: false });
+		assert.htmlEqual( target.innerHTML, `` );
+
+		component.set({ foo: true });
+		assert.htmlEqual( target.innerHTML, `One\nInner` );
+	}
+};
diff --git a/test/runtime/samples/component-yield-nested-if/main.html b/test/runtime/samples/component-yield-nested-if/main.html
new file mode 100644
index 0000000000..fbdaf0cb6f
--- /dev/null
+++ b/test/runtime/samples/component-yield-nested-if/main.html
@@ -0,0 +1,14 @@
+<Outer :foo>
+	One
+	<Inner/>
+</Outer>
+
+<script>
+	import Outer from './Outer.html';
+	import Inner from './Inner.html';
+
+	export default {
+		data: () => ({ foo: true }),
+		components: { Outer, Inner }
+	};
+</script>
diff --git a/test/runtime/samples/component-yield-placement/Modal.html b/test/runtime/samples/component-yield-placement/Modal.html
new file mode 100644
index 0000000000..0085a3ef7f
--- /dev/null
+++ b/test/runtime/samples/component-yield-placement/Modal.html
@@ -0,0 +1,6 @@
+<div class='modal-background' on:click='destroy()'></div>
+
+<div class='modal'>
+	{{yield}}
+	<button on:click='destroy()'>close modal</button>
+</div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-placement/_config.js b/test/runtime/samples/component-yield-placement/_config.js
new file mode 100644
index 0000000000..6e5a7d4b73
--- /dev/null
+++ b/test/runtime/samples/component-yield-placement/_config.js
@@ -0,0 +1,25 @@
+export default {
+	data: {
+		showModal: true
+	},
+
+	html: `
+		<div class='modal-background'></div>
+
+		<div class='modal'>
+			<h2>Hello!</h2>
+			<button>close modal</button>
+		</div>
+	`,
+
+	test ( assert, component, target, window ) {
+		const button = target.querySelector( 'button' );
+		const click = new window.MouseEvent( 'click' );
+
+		button.dispatchEvent( click );
+
+		assert.htmlEqual( target.innerHTML, `
+			<button>show modal</button>
+		`);
+	}
+};
diff --git a/test/runtime/samples/component-yield-placement/main.html b/test/runtime/samples/component-yield-placement/main.html
new file mode 100644
index 0000000000..ac8366a9c7
--- /dev/null
+++ b/test/runtime/samples/component-yield-placement/main.html
@@ -0,0 +1,15 @@
+{{#if showModal}}
+	<Modal on:destroy='set({ showModal: false })'>
+		<h2>Hello!</h2>
+	</Modal>
+{{else}}
+	<button on:click='set({ showModal: true })'>show modal</button>
+{{/if}}
+
+<script>
+	import Modal from './Modal.html';
+
+	export default {
+		components: { Modal }
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/deconflict-self/_config.js b/test/runtime/samples/deconflict-self/_config.js
new file mode 100644
index 0000000000..86341e7379
--- /dev/null
+++ b/test/runtime/samples/deconflict-self/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: `<p>nested component</p>`
+};
diff --git a/test/runtime/samples/deconflict-self/main.html b/test/runtime/samples/deconflict-self/main.html
new file mode 100644
index 0000000000..a9ddc8ac69
--- /dev/null
+++ b/test/runtime/samples/deconflict-self/main.html
@@ -0,0 +1,9 @@
+<Main/>
+
+<script>
+	import Main from './nested/main.html';
+
+	export default {
+		components: { Main }
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/deconflict-self/nested/main.html b/test/runtime/samples/deconflict-self/nested/main.html
new file mode 100644
index 0000000000..5996328206
--- /dev/null
+++ b/test/runtime/samples/deconflict-self/nested/main.html
@@ -0,0 +1 @@
+<p>nested component</p>
\ No newline at end of file
diff --git a/test/runtime/samples/each-block-containing-component-in-if/Nested.html b/test/runtime/samples/each-block-containing-component-in-if/Nested.html
new file mode 100644
index 0000000000..b9d76a696d
--- /dev/null
+++ b/test/runtime/samples/each-block-containing-component-in-if/Nested.html
@@ -0,0 +1,5 @@
+{{#if show}}
+	{{#each fields as field}}
+		<span>{{field}}</span>
+	{{/each}}
+{{/if}}
\ No newline at end of file
diff --git a/test/runtime/samples/each-block-containing-component-in-if/_config.js b/test/runtime/samples/each-block-containing-component-in-if/_config.js
new file mode 100644
index 0000000000..bfee6beb20
--- /dev/null
+++ b/test/runtime/samples/each-block-containing-component-in-if/_config.js
@@ -0,0 +1,36 @@
+export default {
+	data: {
+		show: false,
+		fields: [1, 2]
+	},
+
+	html: `<div></div>`,
+
+	test ( assert, component, target ) {
+		component.set({
+			show: true,
+			fields: [1, 2, 3]
+		});
+
+		assert.htmlEqual( target.innerHTML, `
+			<div>
+				<span>1</span>	
+				<span>2</span>
+				<span>3</span>
+			</div>
+		` );
+
+		component.set({
+			fields: [1, 2, 3, 4]
+		});
+
+		assert.htmlEqual( target.innerHTML, `
+			<div>
+				<span>1</span>	
+				<span>2</span>
+				<span>3</span>
+				<span>4</span>
+			</div>
+		` );
+	}
+};
diff --git a/test/runtime/samples/each-block-containing-component-in-if/main.html b/test/runtime/samples/each-block-containing-component-in-if/main.html
new file mode 100644
index 0000000000..9a6bbfd10f
--- /dev/null
+++ b/test/runtime/samples/each-block-containing-component-in-if/main.html
@@ -0,0 +1,13 @@
+<div>
+	<Nested :show :fields/>
+</div>
+
+<script>
+	import Nested from './Nested.html';
+
+	export default {
+		components: {
+			Nested
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/each-block-else-starts-empty/_config.js b/test/runtime/samples/each-block-else-starts-empty/_config.js
new file mode 100644
index 0000000000..c12ca2c746
--- /dev/null
+++ b/test/runtime/samples/each-block-else-starts-empty/_config.js
@@ -0,0 +1,21 @@
+export default {
+	data: {
+		animals: [],
+		foo: 'something else'
+	},
+
+	html: `
+		before
+		<p>no animals, but rather something else</p>
+		after
+	`,
+
+	test ( assert, component, target ) {
+		component.set({ animals: ['wombat'] });
+		assert.htmlEqual( target.innerHTML, `
+			before
+			<p>wombat</p>
+			after
+		` );
+	}
+};
diff --git a/test/runtime/samples/each-block-else-starts-empty/main.html b/test/runtime/samples/each-block-else-starts-empty/main.html
new file mode 100644
index 0000000000..6c13e5fb23
--- /dev/null
+++ b/test/runtime/samples/each-block-else-starts-empty/main.html
@@ -0,0 +1,7 @@
+before
+{{#each animals as animal}}
+	<p>{{animal}}</p>
+{{else}}
+	<p>no animals, but rather {{foo}}</p>
+{{/each}}
+after
diff --git a/test/runtime/samples/each-block-keyed-dynamic/_config.js b/test/runtime/samples/each-block-keyed-dynamic/_config.js
new file mode 100644
index 0000000000..93832a7658
--- /dev/null
+++ b/test/runtime/samples/each-block-keyed-dynamic/_config.js
@@ -0,0 +1,35 @@
+export default {
+	data: {
+		todos: [
+			{ id: 123, description: 'buy milk' },
+			{ id: 234, description: 'drink milk' }
+		]
+	},
+
+	html: `
+		<p>buy milk</p>
+		<p>drink milk</p>
+	`,
+
+	test ( assert, component, target ) {
+		const [ p1, p2 ] = target.querySelectorAll( 'p' );
+
+		component.set({
+			todos: [
+				{ id: 123, description: 'buy beer' },
+				{ id: 234, description: 'drink beer' }
+			]
+		});
+		assert.htmlEqual( target.innerHTML, `
+			<p>buy beer</p>
+			<p>drink beer</p>
+		` );
+
+		const [ p3, p4 ] = target.querySelectorAll( 'p' );
+
+		assert.equal( p1, p3 );
+		assert.equal( p2, p4 );
+
+		component.destroy();
+	}
+};
diff --git a/test/runtime/samples/each-block-keyed-dynamic/main.html b/test/runtime/samples/each-block-keyed-dynamic/main.html
new file mode 100644
index 0000000000..7d5b90a9f8
--- /dev/null
+++ b/test/runtime/samples/each-block-keyed-dynamic/main.html
@@ -0,0 +1,3 @@
+{{#each todos as todo @id}}
+	<p>{{todo.description}}</p>
+{{/each}}
diff --git a/test/runtime/samples/each-block-keyed-random-permute/_config.js b/test/runtime/samples/each-block-keyed-random-permute/_config.js
new file mode 100644
index 0000000000..c14c4cd0f7
--- /dev/null
+++ b/test/runtime/samples/each-block-keyed-random-permute/_config.js
@@ -0,0 +1,48 @@
+const VALUES = Array.from( 'abcdefghijklmnopqrstuvwxyz' );
+
+function toObjects ( array ) {
+	return array.split( '' ).map( x => ({ id: x }) );
+}
+
+function permute () {
+	const values = VALUES.slice();
+	const number = Math.floor(Math.random() * VALUES.length);
+	const permuted = [];
+	for (let i = 0; i < number; i++) {
+		permuted.push( ...values.splice( Math.floor( Math.random() * ( number - i ) ), 1 ) );
+	}
+
+	return permuted.join( '' );
+}
+
+export default {
+	data: {
+		values: toObjects( 'abc' )
+	},
+
+	html: `(a)(b)(c)`,
+
+	test ( assert, component, target ) {
+		function test ( sequence ) {
+			component.set({ values: toObjects( sequence ) });
+			assert.htmlEqual( target.innerHTML, sequence.split( '' ).map( x => `(${x})` ).join( '' ) );
+		}
+
+		// first, some fixed tests so that we can debug them
+		test( 'abc' );
+		test( 'abcd' );
+		test( 'abecd' );
+		test( 'fabecd' );
+		test( 'fabed' );
+		test( 'beadf' );
+		test( 'ghbeadf' );
+		test( 'gf' );
+		test( 'gc' );
+		test( 'g' );
+		test( '' );
+		test( 'abc' );
+
+		// then, we party
+		for ( let i = 0; i < 100; i += 1 ) test( permute() );
+	}
+};
diff --git a/test/runtime/samples/each-block-keyed-random-permute/main.html b/test/runtime/samples/each-block-keyed-random-permute/main.html
new file mode 100644
index 0000000000..a6aa4b621d
--- /dev/null
+++ b/test/runtime/samples/each-block-keyed-random-permute/main.html
@@ -0,0 +1,3 @@
+{{#each values as value @id}}
+	({{value.id}})
+{{/each}}
diff --git a/test/runtime/samples/empty-style-block/_config.js b/test/runtime/samples/empty-style-block/_config.js
new file mode 100644
index 0000000000..0375bad029
--- /dev/null
+++ b/test/runtime/samples/empty-style-block/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: '',
+};
diff --git a/test/runtime/samples/empty-style-block/main.html b/test/runtime/samples/empty-style-block/main.html
new file mode 100644
index 0000000000..6f29e9e9f9
--- /dev/null
+++ b/test/runtime/samples/empty-style-block/main.html
@@ -0,0 +1 @@
+<style></style>
diff --git a/test/runtime/samples/escape-template-literals/_config.js b/test/runtime/samples/escape-template-literals/_config.js
new file mode 100644
index 0000000000..df22784ba7
--- /dev/null
+++ b/test/runtime/samples/escape-template-literals/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: '<code>`${foo}\\n`</code>'
+};
diff --git a/test/runtime/samples/escape-template-literals/main.html b/test/runtime/samples/escape-template-literals/main.html
new file mode 100644
index 0000000000..4705d114d2
--- /dev/null
+++ b/test/runtime/samples/escape-template-literals/main.html
@@ -0,0 +1 @@
+<code>`${foo}\n`</code>
diff --git a/test/runtime/samples/event-handler-destroy/_config.js b/test/runtime/samples/event-handler-destroy/_config.js
new file mode 100644
index 0000000000..417f0da041
--- /dev/null
+++ b/test/runtime/samples/event-handler-destroy/_config.js
@@ -0,0 +1,20 @@
+export default {
+	html: `
+		<button>destroy</button>
+	`,
+
+	test ( assert, component, target, window ) {
+		const button = target.querySelector( 'button' );
+		const event = new window.MouseEvent( 'click' );
+
+		let destroyed = false;
+		component.on( 'destroy', () => {
+			destroyed = true;
+		});
+
+		button.dispatchEvent( event );
+		assert.htmlEqual( target.innerHTML, `` );
+
+		assert.ok( destroyed );
+	}
+};
diff --git a/test/runtime/samples/event-handler-destroy/main.html b/test/runtime/samples/event-handler-destroy/main.html
new file mode 100644
index 0000000000..01b2bb8221
--- /dev/null
+++ b/test/runtime/samples/event-handler-destroy/main.html
@@ -0,0 +1 @@
+<button on:click='destroy()'>destroy</button>
\ No newline at end of file
diff --git a/test/runtime/samples/event-handler-sanitize/_config.js b/test/runtime/samples/event-handler-sanitize/_config.js
new file mode 100644
index 0000000000..2037f292f2
--- /dev/null
+++ b/test/runtime/samples/event-handler-sanitize/_config.js
@@ -0,0 +1,21 @@
+export default {
+	html: `
+		<div>toggle</div>
+	`,
+
+	test ( assert, component, target, window ) {
+		const div = target.querySelector( 'div' );
+		const event = new window.MouseEvent( 'some-event' );
+
+		div.dispatchEvent( event );
+		assert.htmlEqual( target.innerHTML, `
+			<div>toggle</div>
+			<p>hello!</p>
+		` );
+
+		div.dispatchEvent( event );
+		assert.htmlEqual( target.innerHTML, `
+			<div>toggle</div>
+		` );
+	}
+};
diff --git a/test/runtime/samples/event-handler-sanitize/main.html b/test/runtime/samples/event-handler-sanitize/main.html
new file mode 100644
index 0000000000..eb8e10f825
--- /dev/null
+++ b/test/runtime/samples/event-handler-sanitize/main.html
@@ -0,0 +1,5 @@
+<div on:some-event='set({ visible: !visible })'>toggle</div>
+
+{{#if visible}}
+	<p>hello!</p>
+{{/if}}
diff --git a/test/runtime/samples/helpers-not-call-expression/_config.js b/test/runtime/samples/helpers-not-call-expression/_config.js
new file mode 100644
index 0000000000..0b65615c81
--- /dev/null
+++ b/test/runtime/samples/helpers-not-call-expression/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: '<p>1,4,9</p>'
+};
diff --git a/test/runtime/samples/helpers-not-call-expression/main.html b/test/runtime/samples/helpers-not-call-expression/main.html
new file mode 100644
index 0000000000..e59a83eab8
--- /dev/null
+++ b/test/runtime/samples/helpers-not-call-expression/main.html
@@ -0,0 +1,15 @@
+<p>{{numbers.map(square)}}</p>
+
+<script>
+	export default {
+		data () {
+			return {
+				numbers: [ 1, 2, 3 ]
+			};
+		},
+
+		helpers: {
+			square: num => num * num
+		}
+	};
+</script>
diff --git a/test/runtime/samples/html-entities/_config.js b/test/runtime/samples/html-entities/_config.js
new file mode 100644
index 0000000000..1591f31a53
--- /dev/null
+++ b/test/runtime/samples/html-entities/_config.js
@@ -0,0 +1,14 @@
+export default {
+	html: `
+		<span>*</span>
+		<span>*</span>
+		<span>*</span>
+		<span>*</span>
+
+		<span></span>
+		<span>A</span>
+		<span>€</span>
+
+		<span>&notanentity;</span>
+	`
+};
\ No newline at end of file
diff --git a/test/runtime/samples/html-entities/main.html b/test/runtime/samples/html-entities/main.html
new file mode 100644
index 0000000000..04d9846e78
--- /dev/null
+++ b/test/runtime/samples/html-entities/main.html
@@ -0,0 +1,10 @@
+<span>&ast;</span>
+<span>&midast;</span>
+<span>&#x0002A;</span>
+<span>&#42;</span>
+
+<span>&#10;</span>
+<span>&#65;</span>
+<span>&#128;</span>
+
+<span>&notanentity;</span>
diff --git a/test/runtime/samples/if-block-or/_config.js b/test/runtime/samples/if-block-or/_config.js
new file mode 100644
index 0000000000..ffecd6ca86
--- /dev/null
+++ b/test/runtime/samples/if-block-or/_config.js
@@ -0,0 +1,15 @@
+export default {
+	data: {
+		a: true,
+		b: false
+	},
+
+	html: '<p>i am visible</p>',
+
+	test ( assert, component, target ) {
+		component.set({ a: false });
+		assert.htmlEqual( target.innerHTML, '' );
+		component.set({ b: true });
+		assert.htmlEqual( target.innerHTML, '<p>i am visible</p>' );
+	}
+};
diff --git a/test/runtime/samples/if-block-or/main.html b/test/runtime/samples/if-block-or/main.html
new file mode 100644
index 0000000000..68d6158688
--- /dev/null
+++ b/test/runtime/samples/if-block-or/main.html
@@ -0,0 +1,3 @@
+{{#if a || b}}
+	<p>i am visible</p>
+{{/if}}
diff --git a/test/runtime/samples/if-block-widget/_config.js b/test/runtime/samples/if-block-widget/_config.js
index 40d9d050e9..b82b4dfeb9 100644
--- a/test/runtime/samples/if-block-widget/_config.js
+++ b/test/runtime/samples/if-block-widget/_config.js
@@ -2,11 +2,26 @@ export default {
 	data: {
 		visible: true
 	},
-	html: 'before\n<p>Widget</p><!---->\nafter',
+
+	html: `
+		before
+		<p>Widget</p>
+		after
+	`,
+
 	test ( assert, component, target ) {
 		component.set({ visible: false });
-		assert.equal( target.innerHTML, 'before\n<!---->\nafter' );
+		assert.htmlEqual( target.innerHTML, `
+			before
+
+			after
+		` );
+
 		component.set({ visible: true });
-		assert.equal( target.innerHTML, 'before\n<p>Widget</p><!---->\nafter' );
+		assert.htmlEqual( target.innerHTML, `
+			before
+			<p>Widget</p>
+			after
+		` );
 	}
 };
diff --git a/test/runtime/samples/paren-wrapped-expressions/_config.js b/test/runtime/samples/paren-wrapped-expressions/_config.js
new file mode 100644
index 0000000000..4b784625ce
--- /dev/null
+++ b/test/runtime/samples/paren-wrapped-expressions/_config.js
@@ -0,0 +1,16 @@
+export default {
+	data: {
+		a: 'foo',
+		b: true,
+		c: [ 1, 2, 3 ],
+	},
+
+	html: `
+		<span>foo</span>
+		<span class="foo"></span>
+		<span>true</span>
+		<span>1</span>
+		<span>2</span>
+		<span>3</span>
+	`
+};
diff --git a/test/runtime/samples/paren-wrapped-expressions/main.html b/test/runtime/samples/paren-wrapped-expressions/main.html
new file mode 100644
index 0000000000..ec4b4152c4
--- /dev/null
+++ b/test/runtime/samples/paren-wrapped-expressions/main.html
@@ -0,0 +1,8 @@
+<span>{{ (a) }}</span>
+<span class='{{ (a) }}'></span>
+{{#if (b) }}
+	<span>true</span>
+{{/if}}
+{{#each (c) as x}}
+	<span>{{x}}</span>
+{{/each}}
diff --git a/test/runtime/samples/select-change-handler/_config.js b/test/runtime/samples/select-change-handler/_config.js
new file mode 100644
index 0000000000..015c8182b4
--- /dev/null
+++ b/test/runtime/samples/select-change-handler/_config.js
@@ -0,0 +1,22 @@
+export default {
+	data: {
+		options: [ { id: 'a' }, { id: 'b' }, { id: 'c' } ],
+		selected: 'b'
+	},
+
+	test ( assert, component, target, window ) {
+		const select = target.querySelector( 'select' );
+		assert.equal( select.value, 'b' );
+
+		const event = new window.Event( 'change' );
+
+		select.value = 'c';
+		select.dispatchEvent( event );
+
+		assert.equal( select.value, 'c' );
+		assert.equal( component.get( 'lastChangedTo' ), 'c' );
+		assert.equal( component.get( 'selected' ), 'c' );
+
+		component.destroy();
+	}
+};
diff --git a/test/runtime/samples/select-change-handler/main.html b/test/runtime/samples/select-change-handler/main.html
new file mode 100644
index 0000000000..48376dfa93
--- /dev/null
+++ b/test/runtime/samples/select-change-handler/main.html
@@ -0,0 +1,15 @@
+<select bind:value="selected" on:change="updateLastChangedTo(selected)">
+	{{#each options as option}}
+		<option value="{{option.id}}">{{option.id}}</option>
+	{{/each}}
+</select>
+
+<script>
+	export default {
+		methods: {
+			updateLastChangedTo(result) {
+				this.set({ lastChangedTo: result });
+			}
+		}
+	};
+</script>
diff --git a/test/runtime/samples/select-one-way-bind-object/_config.js b/test/runtime/samples/select-one-way-bind-object/_config.js
index 946eaabceb..0d7ddaccad 100644
--- a/test/runtime/samples/select-one-way-bind-object/_config.js
+++ b/test/runtime/samples/select-one-way-bind-object/_config.js
@@ -1,8 +1,6 @@
 const items = [ {}, {} ];
 
 export default {
-	skip: true, // JSDOM quirks
-
 	'skip-ssr': true,
 
 	data: {
diff --git a/test/runtime/samples/select-props/_config.js b/test/runtime/samples/select-props/_config.js
new file mode 100644
index 0000000000..1d4d390094
--- /dev/null
+++ b/test/runtime/samples/select-props/_config.js
@@ -0,0 +1,15 @@
+export default {
+	test ( assert, component, target, window ) {
+		const selects = document.querySelectorAll( 'select' );
+
+		const event1 = new window.Event( 'change' );
+		selects[0].value = 'b';
+		selects[0].dispatchEvent(event1);
+
+		const event2 = new window.Event( 'change' );
+		selects[1].value = 'b';
+		selects[1].dispatchEvent(event2);
+
+		assert.deepEqual( component.get( 'log' ), [ 1, 2 ] );
+	}
+};
diff --git a/test/runtime/samples/select-props/main.html b/test/runtime/samples/select-props/main.html
new file mode 100644
index 0000000000..7decc88fb7
--- /dev/null
+++ b/test/runtime/samples/select-props/main.html
@@ -0,0 +1,19 @@
+{{#each foo as bar}}
+	<select on:change='handler(bar)'>
+		<option>a</option>
+		<option>b</option>
+	</select>
+{{/each}}
+
+<script>
+	export default {
+		data: () => ({ foo: [ 1, 2 ], log: [] }),
+		methods: {
+			handler ( bar ) {
+				let { log } = this.get();
+				log.push( bar );
+				this.set( { log } );
+			}
+		}
+	}
+</script>
diff --git a/test/runtime/samples/self-reference/_config.js b/test/runtime/samples/self-reference/_config.js
index ea6e33fb88..dabb467833 100644
--- a/test/runtime/samples/self-reference/_config.js
+++ b/test/runtime/samples/self-reference/_config.js
@@ -1,6 +1,4 @@
 export default {
-	// solo: true,
-
 	data: {
 		depth: 5
 	},
diff --git a/test/runtime/samples/sigil-static-#/_config.js b/test/runtime/samples/sigil-static-#/_config.js
new file mode 100644
index 0000000000..747ddc2a94
--- /dev/null
+++ b/test/runtime/samples/sigil-static-#/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: `#foo`
+};
\ No newline at end of file
diff --git a/test/runtime/samples/sigil-static-#/main.html b/test/runtime/samples/sigil-static-#/main.html
new file mode 100644
index 0000000000..5529b9b4ce
--- /dev/null
+++ b/test/runtime/samples/sigil-static-#/main.html
@@ -0,0 +1 @@
+#foo
\ No newline at end of file
diff --git a/test/runtime/samples/sigil-static-@/_config.js b/test/runtime/samples/sigil-static-@/_config.js
new file mode 100644
index 0000000000..ada3a602ab
--- /dev/null
+++ b/test/runtime/samples/sigil-static-@/_config.js
@@ -0,0 +1,3 @@
+export default {
+	html: `@foo`
+};
\ No newline at end of file
diff --git a/test/runtime/samples/sigil-static-@/main.html b/test/runtime/samples/sigil-static-@/main.html
new file mode 100644
index 0000000000..d88b8ee03d
--- /dev/null
+++ b/test/runtime/samples/sigil-static-@/main.html
@@ -0,0 +1 @@
+@foo
\ No newline at end of file
diff --git a/test/runtime/samples/svg/_config.js b/test/runtime/samples/svg/_config.js
index 44f6c8aa71..37d94a1609 100644
--- a/test/runtime/samples/svg/_config.js
+++ b/test/runtime/samples/svg/_config.js
@@ -5,7 +5,9 @@ export default {
 		width: 100,
 		height: 100
 	},
+
 	html: `<svg><rect x="0" y="0" width="100" height="100"></rect></svg>`,
+
 	test ( assert, component, target ) {
 		const svg = target.querySelector( 'svg' );
 		const rect = target.querySelector( 'rect' );
diff --git a/test/runtime/samples/textarea-children/_config.js b/test/runtime/samples/textarea-children/_config.js
new file mode 100644
index 0000000000..f21519b26a
--- /dev/null
+++ b/test/runtime/samples/textarea-children/_config.js
@@ -0,0 +1,17 @@
+export default {
+	'skip-ssr': true, // SSR behaviour is awkwardly different
+
+	data: {
+		foo: 42
+	},
+
+	html: `<textarea></textarea>`,
+
+	test ( assert, component, target ) {
+		const textarea = target.querySelector( 'textarea' );
+		assert.strictEqual( textarea.value, `\n\t<p>not actually an element. 42</p>\n` );
+
+		component.set({ foo: 43 });
+		assert.strictEqual( textarea.value, `\n\t<p>not actually an element. 43</p>\n` );
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/textarea-children/main.html b/test/runtime/samples/textarea-children/main.html
new file mode 100644
index 0000000000..de50c807d6
--- /dev/null
+++ b/test/runtime/samples/textarea-children/main.html
@@ -0,0 +1,3 @@
+<textarea>
+	<p>not actually an element. {{foo}}</p>
+</textarea>
\ No newline at end of file
diff --git a/test/runtime/samples/textarea-value/_config.js b/test/runtime/samples/textarea-value/_config.js
new file mode 100644
index 0000000000..89ff63508c
--- /dev/null
+++ b/test/runtime/samples/textarea-value/_config.js
@@ -0,0 +1,17 @@
+export default {
+	'skip-ssr': true, // SSR behaviour is awkwardly different
+
+	data: {
+		foo: 42
+	},
+
+	html: `<textarea></textarea>`,
+
+	test ( assert, component, target ) {
+		const textarea = target.querySelector( 'textarea' );
+		assert.strictEqual( textarea.value, '42' );
+
+		component.set({ foo: 43 });
+		assert.strictEqual( textarea.value, '43' );
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/textarea-value/main.html b/test/runtime/samples/textarea-value/main.html
new file mode 100644
index 0000000000..215166ab10
--- /dev/null
+++ b/test/runtime/samples/textarea-value/main.html
@@ -0,0 +1 @@
+<textarea value='{{foo}}'/>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-css-delay/_config.js b/test/runtime/samples/transition-css-delay/_config.js
new file mode 100644
index 0000000000..e51ae5c6c8
--- /dev/null
+++ b/test/runtime/samples/transition-css-delay/_config.js
@@ -0,0 +1,12 @@
+export default {
+	test ( assert, component, target, window, raf ) {
+		component.set({ visible: true });
+		const div = target.querySelector( 'div' );
+		assert.strictEqual( div.style.opacity, '0' );
+
+		raf.tick( 50 );
+		assert.strictEqual( div.style.opacity, '' );
+
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-css-delay/main.html b/test/runtime/samples/transition-css-delay/main.html
new file mode 100644
index 0000000000..cd46050a9f
--- /dev/null
+++ b/test/runtime/samples/transition-css-delay/main.html
@@ -0,0 +1,19 @@
+{{#if visible}}
+	<div transition:foo>delayed</div>
+{{/if}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node, params ) {
+				return {
+					delay: 50,
+					duration: 100,
+					css: t => {
+						return `opacity: ${t}`;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-delay-in-out/_config.js b/test/runtime/samples/transition-js-delay-in-out/_config.js
new file mode 100644
index 0000000000..6e97f19c3b
--- /dev/null
+++ b/test/runtime/samples/transition-js-delay-in-out/_config.js
@@ -0,0 +1,24 @@
+export default {
+	test ( assert, component, target, window, raf ) {
+		component.set({ visible: true });
+		const div = target.querySelector( 'div' );
+		assert.equal( div.foo, 0 );
+
+		raf.tick( 50 );
+		assert.equal( div.foo, 0 );
+
+		raf.tick( 150 );
+		assert.equal( div.foo, 1 );
+
+		component.set({ visible: false });
+		assert.equal( div.bar, undefined );
+
+		raf.tick( 200 );
+		assert.equal( div.bar, 1 );
+
+		raf.tick( 300 );
+		assert.equal( div.bar, 0 );
+
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-delay-in-out/main.html b/test/runtime/samples/transition-js-delay-in-out/main.html
new file mode 100644
index 0000000000..6a0a3f88a7
--- /dev/null
+++ b/test/runtime/samples/transition-js-delay-in-out/main.html
@@ -0,0 +1,29 @@
+{{#if visible}}
+	<div in:foo out:bar>delayed</div>
+{{/if}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node, params ) {
+				return {
+					delay: 50,
+					duration: 100,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			},
+
+			bar: function ( node, params ) {
+				return {
+					delay: 50,
+					duration: 100,
+					tick: t => {
+						node.bar = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-delay/_config.js b/test/runtime/samples/transition-js-delay/_config.js
new file mode 100644
index 0000000000..eab832ca3f
--- /dev/null
+++ b/test/runtime/samples/transition-js-delay/_config.js
@@ -0,0 +1,29 @@
+export default {
+	test ( assert, component, target, window, raf ) {
+		component.set({ visible: true });
+		const div = target.querySelector( 'div' );
+		assert.equal( div.foo, 0 );
+
+		raf.tick( 50 );
+		assert.equal( div.foo, 0 );
+
+		raf.tick( 100 );
+		assert.equal( div.foo, 0.5 );
+
+		component.set({ visible: false });
+
+		raf.tick( 125 );
+		assert.equal( div.foo, 0.75 );
+
+		raf.tick( 150 );
+		assert.equal( div.foo, 1 );
+
+		raf.tick( 175 );
+		assert.equal( div.foo, 0.75 );
+
+		raf.tick( 250 );
+		assert.equal( div.foo, 0 );
+
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-delay/main.html b/test/runtime/samples/transition-js-delay/main.html
new file mode 100644
index 0000000000..a4277f34ce
--- /dev/null
+++ b/test/runtime/samples/transition-js-delay/main.html
@@ -0,0 +1,19 @@
+{{#if visible}}
+	<div transition:foo>delayed</div>
+{{/if}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node, params ) {
+				return {
+					delay: 50,
+					duration: 100,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-dynamic-if-block-bidi/_config.js b/test/runtime/samples/transition-js-dynamic-if-block-bidi/_config.js
new file mode 100644
index 0000000000..65dece1a13
--- /dev/null
+++ b/test/runtime/samples/transition-js-dynamic-if-block-bidi/_config.js
@@ -0,0 +1,37 @@
+export default {
+	data: {
+		name: 'world'
+	},
+
+	test ( assert, component, target, window, raf ) {
+		global.count = 0;
+
+		component.set({ visible: true });
+		assert.equal( global.count, 1 );
+		const div = target.querySelector( 'div' );
+		assert.equal( div.foo, 0 );
+
+		raf.tick( 75 );
+		component.set({ name: 'everybody' });
+		assert.equal( div.foo, 0.75 );
+		assert.htmlEqual( div.innerHTML, 'hello everybody!' );
+
+		component.set({ visible: false, name: 'again' });
+		assert.htmlEqual( div.innerHTML, 'hello everybody!' );
+
+		raf.tick( 125 );
+		assert.equal( div.foo, 0.25 );
+
+		component.set({ visible: true });
+		raf.tick( 175 );
+		assert.equal( div.foo, 0.75 );
+		assert.htmlEqual( div.innerHTML, 'hello again!' );
+
+		raf.tick( 200 );
+		assert.equal( div.foo, 1 );
+
+		raf.tick( 225 );
+
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-dynamic-if-block-bidi/main.html b/test/runtime/samples/transition-js-dynamic-if-block-bidi/main.html
new file mode 100644
index 0000000000..576b4efc2e
--- /dev/null
+++ b/test/runtime/samples/transition-js-dynamic-if-block-bidi/main.html
@@ -0,0 +1,19 @@
+{{#if visible}}
+	<div transition:foo>hello {{name}}!</div>
+{{/if}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node, params ) {
+				global.count += 1;
+				return {
+					duration: 100,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-each-block-intro-outro/_config.js b/test/runtime/samples/transition-js-each-block-intro-outro/_config.js
new file mode 100644
index 0000000000..da79b64d55
--- /dev/null
+++ b/test/runtime/samples/transition-js-each-block-intro-outro/_config.js
@@ -0,0 +1,43 @@
+export default {
+	data: {
+		visible: false,
+		things: [ 'a', 'b', 'c' ]
+	},
+
+	test ( assert, component, target, window, raf ) {
+		component.set({ visible: true });
+		const divs = target.querySelectorAll( 'div' );
+		assert.equal( divs[0].foo, 0 );
+		assert.equal( divs[1].foo, 0 );
+		assert.equal( divs[2].foo, 0 );
+
+		raf.tick( 50 );
+		assert.equal( divs[0].foo, 0.5 );
+		assert.equal( divs[1].foo, 0.5 );
+		assert.equal( divs[2].foo, 0.5 );
+
+		component.set({ visible: false });
+
+		raf.tick( 70 );
+		assert.equal( divs[0].foo, 0.7 );
+		assert.equal( divs[1].foo, 0.7 );
+		assert.equal( divs[2].foo, 0.7 );
+
+		assert.equal( divs[0].bar, 0.8 );
+		assert.equal( divs[1].bar, 0.8 );
+		assert.equal( divs[2].bar, 0.8 );
+
+		component.set({ visible: true });
+
+		raf.tick( 100 );
+		assert.equal( divs[0].foo, 0.3 );
+		assert.equal( divs[1].foo, 0.3 );
+		assert.equal( divs[2].foo, 0.3 );
+
+		assert.equal( divs[0].bar, 1 );
+		assert.equal( divs[1].bar, 1 );
+		assert.equal( divs[2].bar, 1 );
+
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-each-block-intro-outro/main.html b/test/runtime/samples/transition-js-each-block-intro-outro/main.html
new file mode 100644
index 0000000000..9652a43859
--- /dev/null
+++ b/test/runtime/samples/transition-js-each-block-intro-outro/main.html
@@ -0,0 +1,29 @@
+{{#each things as thing}}
+	{{#if visible}}
+		<div in:foo out:bar>{{thing}}</div>
+	{{/if}}
+{{/each}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node, params ) {
+				return {
+					duration: 100,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			},
+
+			bar: function ( node, params ) {
+				return {
+					duration: 100,
+					tick: t => {
+						node.bar = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-each-block-intro/_config.js b/test/runtime/samples/transition-js-each-block-intro/_config.js
new file mode 100644
index 0000000000..7deb8c97a9
--- /dev/null
+++ b/test/runtime/samples/transition-js-each-block-intro/_config.js
@@ -0,0 +1,32 @@
+export default {
+	data: {
+		things: [ 'a', 'b', 'c' ]
+	},
+
+	test ( assert, component, target, window, raf ) {
+		let divs = target.querySelectorAll( 'div' );
+		assert.equal( divs[0].foo, 0 );
+		assert.equal( divs[1].foo, 0 );
+		assert.equal( divs[2].foo, 0 );
+
+		raf.tick( 50 );
+		assert.equal( divs[0].foo, 0.5 );
+		assert.equal( divs[1].foo, 0.5 );
+		assert.equal( divs[2].foo, 0.5 );
+
+		component.set({ things: [ 'a', 'b', 'c', 'd' ] });
+		divs = target.querySelectorAll( 'div' );
+		assert.equal( divs[0].foo, 0.5 );
+		assert.equal( divs[1].foo, 0.5 );
+		assert.equal( divs[2].foo, 0.5 );
+		assert.equal( divs[3].foo, 0 );
+
+		raf.tick( 75 );
+		assert.equal( divs[0].foo, 0.75 );
+		assert.equal( divs[1].foo, 0.75 );
+		assert.equal( divs[2].foo, 0.75 );
+		assert.equal( divs[3].foo, 0.25 );
+
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-each-block-intro/main.html b/test/runtime/samples/transition-js-each-block-intro/main.html
new file mode 100644
index 0000000000..7f12ef1d8f
--- /dev/null
+++ b/test/runtime/samples/transition-js-each-block-intro/main.html
@@ -0,0 +1,18 @@
+{{#each things as thing}}
+	<div in:foo>{{thing}}</div>
+{{/each}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node, params ) {
+				return {
+					duration: 100,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-each-block-keyed-intro-outro/_config.js b/test/runtime/samples/transition-js-each-block-keyed-intro-outro/_config.js
new file mode 100644
index 0000000000..0b5c3a1d1a
--- /dev/null
+++ b/test/runtime/samples/transition-js-each-block-keyed-intro-outro/_config.js
@@ -0,0 +1,65 @@
+export default {
+	data: {
+		things: [
+			{ name: 'a' },
+			{ name: 'b' },
+			{ name: 'c' }
+		]
+	},
+
+	test ( assert, component, target, window, raf ) {
+		const divs = target.querySelectorAll( 'div' );
+		divs[0].i = 0; // for debugging
+		divs[1].i = 1;
+		divs[2].i = 2;
+
+		assert.equal( divs[0].foo, 0 );
+		assert.equal( divs[1].foo, 0 );
+		assert.equal( divs[2].foo, 0 );
+
+		raf.tick( 100 );
+		assert.equal( divs[0].foo, 1 );
+		assert.equal( divs[1].foo, 1 );
+		assert.equal( divs[2].foo, 1 );
+
+		component.set({
+			things: [
+				{ name: 'a' },
+				{ name: 'c' }
+			]
+		});
+
+		const divs2 = target.querySelectorAll( 'div' );
+		assert.strictEqual( divs[0], divs2[0] );
+		assert.strictEqual( divs[1], divs2[1] );
+		assert.strictEqual( divs[2], divs2[2] );
+
+		raf.tick( 150 );
+		assert.equal( divs[0].foo, 1 );
+		assert.equal( divs[1].foo, 0.5 );
+		assert.equal( divs[2].foo, 1 );
+
+		component.set({
+			things: [
+				{ name: 'a' },
+				{ name: 'b' },
+				{ name: 'c' }
+			]
+		});
+
+		raf.tick( 175 );
+		assert.equal( divs[0].foo, 1 );
+		assert.equal( divs[1].foo, 0.75 );
+		assert.equal( divs[2].foo, 1 );
+
+		raf.tick( 225 );
+		const divs3 = target.querySelectorAll( 'div' );
+		assert.strictEqual( divs[0], divs3[0] );
+		assert.strictEqual( divs[1], divs3[1] );
+		assert.strictEqual( divs[2], divs3[2] );
+
+		assert.equal( divs[0].foo, 1 );
+		assert.equal( divs[1].foo, 1 );
+		assert.equal( divs[2].foo, 1 );
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-each-block-keyed-intro-outro/main.html b/test/runtime/samples/transition-js-each-block-keyed-intro-outro/main.html
new file mode 100644
index 0000000000..c755bb12e6
--- /dev/null
+++ b/test/runtime/samples/transition-js-each-block-keyed-intro-outro/main.html
@@ -0,0 +1,18 @@
+{{#each things as thing @name}}
+	<div transition:foo>{{thing.name}}</div>
+{{/each}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node, params ) {
+				return {
+					duration: 100,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-each-block-keyed-intro/_config.js b/test/runtime/samples/transition-js-each-block-keyed-intro/_config.js
new file mode 100644
index 0000000000..dc61ac5ea4
--- /dev/null
+++ b/test/runtime/samples/transition-js-each-block-keyed-intro/_config.js
@@ -0,0 +1,49 @@
+export default {
+	data: {
+		things: [
+			{ name: 'a' },
+			{ name: 'b' },
+			{ name: 'c' }
+		]
+	},
+
+	test ( assert, component, target, window, raf ) {
+		let divs = target.querySelectorAll( 'div' );
+		assert.equal( divs[0].foo, 0 );
+		assert.equal( divs[1].foo, 0 );
+		assert.equal( divs[2].foo, 0 );
+
+		raf.tick( 50 );
+		assert.equal( divs[0].foo, 0.5 );
+		assert.equal( divs[1].foo, 0.5 );
+		assert.equal( divs[2].foo, 0.5 );
+
+		component.set({
+			things: [
+				{ name: 'a' },
+				{ name: 'woo!' },
+				{ name: 'b' },
+				{ name: 'c' }
+			]
+		});
+		assert.htmlEqual( target.innerHTML, `
+			<div>a</div>
+			<div>woo!</div>
+			<div>b</div>
+			<div>c</div>
+		` );
+		divs = target.querySelectorAll( 'div' );
+		assert.equal( divs[0].foo, 0.5 );
+		assert.equal( divs[1].foo, 0 );
+		assert.equal( divs[2].foo, 0.5 );
+		assert.equal( divs[3].foo, 0.5 );
+
+		raf.tick( 75 );
+		assert.equal( divs[0].foo, 0.75 );
+		assert.equal( divs[1].foo, 0.25 );
+		assert.equal( divs[2].foo, 0.75 );
+		assert.equal( divs[3].foo, 0.75 );
+
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-each-block-keyed-intro/main.html b/test/runtime/samples/transition-js-each-block-keyed-intro/main.html
new file mode 100644
index 0000000000..d9442d0d6f
--- /dev/null
+++ b/test/runtime/samples/transition-js-each-block-keyed-intro/main.html
@@ -0,0 +1,18 @@
+{{#each things as thing @name}}
+	<div in:foo>{{thing.name}}</div>
+{{/each}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node, params ) {
+				return {
+					duration: 100,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-each-block-keyed-outro/_config.js b/test/runtime/samples/transition-js-each-block-keyed-outro/_config.js
new file mode 100644
index 0000000000..567a671d2c
--- /dev/null
+++ b/test/runtime/samples/transition-js-each-block-keyed-outro/_config.js
@@ -0,0 +1,30 @@
+export default {
+	data: {
+		things: [
+			{ name: 'a' },
+			{ name: 'b' },
+			{ name: 'c' }
+		]
+	},
+
+	test ( assert, component, target, window, raf ) {
+		const divs = target.querySelectorAll( 'div' );
+
+		component.set({
+			things: [
+				{ name: 'a' },
+				{ name: 'c' }
+			]
+		});
+
+		const divs2 = target.querySelectorAll( 'div' );
+		assert.strictEqual( divs[0], divs2[0] );
+		assert.strictEqual( divs[1], divs2[1] );
+		assert.strictEqual( divs[2], divs2[2] );
+
+		raf.tick( 50 );
+		assert.equal( divs[0].foo, undefined );
+		assert.equal( divs[1].foo, 0.5 );
+		assert.equal( divs[2].foo, undefined );
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-each-block-keyed-outro/main.html b/test/runtime/samples/transition-js-each-block-keyed-outro/main.html
new file mode 100644
index 0000000000..2e73512529
--- /dev/null
+++ b/test/runtime/samples/transition-js-each-block-keyed-outro/main.html
@@ -0,0 +1,18 @@
+{{#each things as thing @name}}
+	<div out:foo>{{thing.name}}</div>
+{{/each}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node, params ) {
+				return {
+					duration: 100,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-each-block-outro/_config.js b/test/runtime/samples/transition-js-each-block-outro/_config.js
new file mode 100644
index 0000000000..5e8b99d88d
--- /dev/null
+++ b/test/runtime/samples/transition-js-each-block-outro/_config.js
@@ -0,0 +1,16 @@
+export default {
+	data: {
+		things: [ 'a', 'b', 'c' ]
+	},
+
+	test ( assert, component, target, window, raf ) {
+		const divs = target.querySelectorAll( 'div' );
+
+		component.set({ things: [ 'a' ] });
+
+		raf.tick( 50 );
+		assert.equal( divs[0].foo, undefined );
+		assert.equal( divs[1].foo, 0.5 );
+		assert.equal( divs[2].foo, 0.5 );
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-each-block-outro/main.html b/test/runtime/samples/transition-js-each-block-outro/main.html
new file mode 100644
index 0000000000..494132c9be
--- /dev/null
+++ b/test/runtime/samples/transition-js-each-block-outro/main.html
@@ -0,0 +1,18 @@
+{{#each things as thing}}
+	<div out:foo>{{thing}}</div>
+{{/each}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node, params ) {
+				return {
+					duration: 100,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-bidi/_config.js b/test/runtime/samples/transition-js-if-block-bidi/_config.js
new file mode 100644
index 0000000000..8a6db10074
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-block-bidi/_config.js
@@ -0,0 +1,30 @@
+export default {
+	test ( assert, component, target, window, raf ) {
+		global.count = 0;
+
+		component.set({ visible: true });
+		assert.equal( global.count, 1 );
+		const div = target.querySelector( 'div' );
+		assert.equal( div.foo, 0 );
+
+		raf.tick( 300 );
+		assert.equal( div.foo, 0.75 );
+
+		component.set({ visible: false });
+		assert.equal( global.count, 1 );
+
+		raf.tick( 500 );
+		assert.equal( div.foo, 0.25 );
+
+		component.set({ visible: true });
+		raf.tick( 700 );
+		assert.equal( div.foo, 0.75 );
+
+		raf.tick( 800 );
+		assert.equal( div.foo, 1 );
+
+		raf.tick( 900 );
+
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-bidi/main.html b/test/runtime/samples/transition-js-if-block-bidi/main.html
new file mode 100644
index 0000000000..31ffd90bc1
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-block-bidi/main.html
@@ -0,0 +1,19 @@
+{{#if visible}}
+	<div transition:foo>foo bidi</div>
+{{/if}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node, params ) {
+				global.count += 1;
+				return {
+					duration: 400,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/_config.js b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/_config.js
new file mode 100644
index 0000000000..60115a0351
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/_config.js
@@ -0,0 +1,32 @@
+export default {
+	data: {
+		foo: false,
+		threshold: 5
+	},
+
+	html: `
+		<div>1</div>
+		<div>2</div>
+		<div>3</div>
+		<div>4</div>
+		<div>5</div>
+	`,
+
+	test ( assert, component, target, window, raf ) {
+		const divs = target.querySelectorAll('div');
+
+		raf.tick(100);
+
+		component.set({ threshold: 4 });
+
+		raf.tick( 200 );
+		assert.htmlEqual(target.innerHTML, `
+			<div>1</div>
+			<div>2</div>
+			<div>3</div>
+			<div>4</div>
+		`);
+
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/main.html b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/main.html
new file mode 100644
index 0000000000..d68c95e8b0
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/main.html
@@ -0,0 +1,26 @@
+{{#each [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] as number}}
+	{{#if foo}}
+		{{#if threshold >= number}}
+			<div transition:foo>{{number}}</div>
+		{{/if}}
+	{{else}}
+		{{#if threshold >= number}}
+			<div transition:foo>{{number}}</div>
+		{{/if}}
+	{{/if}}
+{{/each}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node ) {
+				return {
+					duration: 100,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/_config.js b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/_config.js
new file mode 100644
index 0000000000..bcb5a9e05f
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/_config.js
@@ -0,0 +1,37 @@
+export default {
+	data: {
+		foo: false,
+		threshold: 5
+	},
+
+	html: `
+		<div>1</div>
+		<div>2</div>
+		<div>3</div>
+		<div>4</div>
+		<div>5</div>
+	`,
+
+	test ( assert, component, target, window, raf ) {
+		const divs = target.querySelectorAll('div');
+
+		raf.tick(100);
+
+		component.set({ threshold: 4 });
+		raf.tick(150);
+		component.set({ threshold: 5 });
+		raf.tick(200);
+
+		component.set({ threshold: 5.5 });
+
+		assert.htmlEqual(target.innerHTML, `
+			<div>1</div>
+			<div>2</div>
+			<div>3</div>
+			<div>4</div>
+			<div>5</div>
+		`);
+
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/main.html b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/main.html
new file mode 100644
index 0000000000..d68c95e8b0
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/main.html
@@ -0,0 +1,26 @@
+{{#each [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] as number}}
+	{{#if foo}}
+		{{#if threshold >= number}}
+			<div transition:foo>{{number}}</div>
+		{{/if}}
+	{{else}}
+		{{#if threshold >= number}}
+			<div transition:foo>{{number}}</div>
+		{{/if}}
+	{{/if}}
+{{/each}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node ) {
+				return {
+					duration: 100,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-in-each-block-bidi/_config.js b/test/runtime/samples/transition-js-if-block-in-each-block-bidi/_config.js
new file mode 100644
index 0000000000..f7ce778056
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-block-in-each-block-bidi/_config.js
@@ -0,0 +1,45 @@
+export default {
+	data: {
+		threshold: 5
+	},
+
+	html: `
+		<div>1</div>
+		<div>2</div>
+		<div>3</div>
+		<div>4</div>
+		<div>5</div>
+	`,
+
+	test ( assert, component, target, window, raf ) {
+		const divs = target.querySelectorAll('div');
+
+		assert.equal(divs[0].foo, 0);
+
+		raf.tick(100);
+		assert.equal(divs[0].foo, 1);
+
+		component.set({ threshold: 4 });
+		assert.equal( divs[4].foo, 1 );
+
+		raf.tick( 200 );
+		assert.htmlEqual(target.innerHTML, `
+			<div>1</div>
+			<div>2</div>
+			<div>3</div>
+			<div>4</div>
+		`);
+
+		component.set({ threshold: 3 });
+		assert.equal( divs[3].foo, 1 );
+
+		raf.tick( 300 );
+		assert.htmlEqual(target.innerHTML, `
+			<div>1</div>
+			<div>2</div>
+			<div>3</div>
+		`);
+
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-in-each-block-bidi/main.html b/test/runtime/samples/transition-js-if-block-in-each-block-bidi/main.html
new file mode 100644
index 0000000000..754c4a5bfd
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-block-in-each-block-bidi/main.html
@@ -0,0 +1,20 @@
+{{#each [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] as number}} 
+	{{#if threshold >= number}}
+		<div transition:foo>{{number}}</div>
+	{{/if}}
+{{/each}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node ) {
+				return {
+					duration: 100,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-intro-outro/_config.js b/test/runtime/samples/transition-js-if-block-intro-outro/_config.js
new file mode 100644
index 0000000000..146ac082d5
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-block-intro-outro/_config.js
@@ -0,0 +1,46 @@
+export default {
+	test ( assert, component, target, window, raf ) {
+		component.set({ visible: true });
+		let div = target.querySelector( 'div' );
+		assert.equal( div.foo, 0 );
+
+		raf.tick( 200 );
+		assert.equal( div.foo, 0.5 );
+
+		raf.tick( 400 );
+		assert.equal( div.foo, 1 );
+
+		raf.tick( 500 );
+		assert.equal( div.foo, 1 );
+
+		component.set({ visible: false });
+		raf.tick( 600 );
+		assert.equal( div.foo, 1 );
+		assert.equal( div.bar, 0.75 );
+
+		raf.tick( 900 );
+		assert.equal( div.foo, 1 );
+		assert.equal( div.bar, 0 );
+
+		// test outro before intro complete
+		raf.tick( 1000 );
+		component.set({ visible: true });
+		div = target.querySelector( 'div' );
+
+		raf.tick( 1200 );
+		assert.equal( div.foo, 0.5 );
+
+		component.set({ visible: false });
+		raf.tick( 1300 );
+		assert.equal( div.foo, 0.75 );
+		assert.equal( div.bar, 0.75 );
+
+		raf.tick( 1400 );
+		assert.equal( div.foo, 1 );
+		assert.equal( div.bar, 0.5 );
+
+		raf.tick( 2000 );
+
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-intro-outro/main.html b/test/runtime/samples/transition-js-if-block-intro-outro/main.html
new file mode 100644
index 0000000000..d752e63722
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-block-intro-outro/main.html
@@ -0,0 +1,27 @@
+{{#if visible}}
+	<div in:foo out:bar>foo then bar</div>
+{{/if}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node, params ) {
+				return {
+					duration: 400,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			},
+
+			bar: function ( node, params ) {
+				return {
+					duration: 400,
+					tick: t => {
+						node.bar = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-intro/_config.js b/test/runtime/samples/transition-js-if-block-intro/_config.js
new file mode 100644
index 0000000000..04d3c6245e
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-block-intro/_config.js
@@ -0,0 +1,17 @@
+export default {
+	test ( assert, component, target, window, raf ) {
+		component.set({ visible: true });
+		const div = target.querySelector( 'div' );
+		assert.equal( window.getComputedStyle( div ).opacity, 0 );
+
+		raf.tick( 200 );
+		assert.equal( window.getComputedStyle( div ).opacity, 0.5 );
+
+		raf.tick( 400 );
+		assert.equal( window.getComputedStyle( div ).opacity, 1 );
+
+		raf.tick( 500 );
+
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-block-intro/main.html b/test/runtime/samples/transition-js-if-block-intro/main.html
new file mode 100644
index 0000000000..9a3b4f34b8
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-block-intro/main.html
@@ -0,0 +1,18 @@
+{{#if visible}}
+	<div in:fade>fades in</div>
+{{/if}}
+
+<script>
+	export default {
+		transitions: {
+			fade: function ( node, params ) {
+				return {
+					duration: 400,
+					tick: t => {
+						node.style.opacity = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-else-block-dynamic-outro/_config.js b/test/runtime/samples/transition-js-if-else-block-dynamic-outro/_config.js
new file mode 100644
index 0000000000..3ea7079830
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-else-block-dynamic-outro/_config.js
@@ -0,0 +1,22 @@
+export default {
+	data: {
+		z: 'z'
+	},
+
+	test ( assert, component, target, window, raf ) {
+		assert.equal( target.querySelector( 'div' ), component.refs.no );
+
+		component.set({ x: true });
+
+		raf.tick( 25 );
+		assert.equal( component.refs.yes.foo, undefined );
+		assert.equal( component.refs.no.foo, 0.75 );
+
+		raf.tick( 75 );
+		assert.equal( component.refs.yes.foo, undefined );
+		assert.equal( component.refs.no.foo, 0.25 );
+
+		raf.tick( 100 );
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-else-block-dynamic-outro/main.html b/test/runtime/samples/transition-js-if-else-block-dynamic-outro/main.html
new file mode 100644
index 0000000000..aa1ca15fef
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-else-block-dynamic-outro/main.html
@@ -0,0 +1,20 @@
+{{#if x}}
+	<div ref:yes out:foo>{{z}}</div>
+{{else}}
+	<div ref:no out:foo>{{z}}</div>
+{{/if}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node, params ) {
+				return {
+					duration: 100,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-else-block-intro/_config.js b/test/runtime/samples/transition-js-if-else-block-intro/_config.js
new file mode 100644
index 0000000000..768b16567c
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-else-block-intro/_config.js
@@ -0,0 +1,21 @@
+export default {
+	test ( assert, component, target, window, raf ) {
+		assert.equal( target.querySelector( 'div' ), component.refs.no );
+		assert.equal( component.refs.no.foo, 0 );
+
+		raf.tick( 200 );
+		assert.equal( component.refs.no.foo, 0.5 );
+
+		raf.tick( 500 );
+		component.set({ x: true });
+		assert.equal( component.refs.no, undefined );
+		assert.equal( component.refs.yes.foo, 0 );
+
+		raf.tick( 700 );
+		assert.equal( component.refs.yes.foo, 0.5 );
+
+		raf.tick( 1000 );
+
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-else-block-intro/main.html b/test/runtime/samples/transition-js-if-else-block-intro/main.html
new file mode 100644
index 0000000000..1b30160b02
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-else-block-intro/main.html
@@ -0,0 +1,20 @@
+{{#if x}}
+	<div ref:yes in:foo>yes</div>
+{{else}}
+	<div ref:no in:foo>no</div>
+{{/if}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node, params ) {
+				return {
+					duration: 400,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-else-block-outro/_config.js b/test/runtime/samples/transition-js-if-else-block-outro/_config.js
new file mode 100644
index 0000000000..98053c817b
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-else-block-outro/_config.js
@@ -0,0 +1,18 @@
+export default {
+	test ( assert, component, target, window, raf ) {
+		assert.equal( target.querySelector( 'div' ), component.refs.no );
+
+		component.set({ x: true });
+
+		raf.tick( 25 );
+		assert.equal( component.refs.yes.foo, undefined );
+		assert.equal( component.refs.no.foo, 0.75 );
+
+		raf.tick( 75 );
+		assert.equal( component.refs.yes.foo, undefined );
+		assert.equal( component.refs.no.foo, 0.25 );
+
+		raf.tick( 100 );
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-else-block-outro/main.html b/test/runtime/samples/transition-js-if-else-block-outro/main.html
new file mode 100644
index 0000000000..47cc670d1f
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-else-block-outro/main.html
@@ -0,0 +1,20 @@
+{{#if x}}
+	<div ref:yes out:foo>yes</div>
+{{else}}
+	<div ref:no out:foo>no</div>
+{{/if}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node, params ) {
+				return {
+					duration: 100,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-elseif-block-outro/_config.js b/test/runtime/samples/transition-js-if-elseif-block-outro/_config.js
new file mode 100644
index 0000000000..fad2d41e3b
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-elseif-block-outro/_config.js
@@ -0,0 +1,23 @@
+export default {
+	data: {
+		x: false,
+		y: true
+	},
+
+	test ( assert, component, target, window, raf ) {
+		assert.equal( target.querySelector( 'div' ), component.refs.no );
+
+		component.set({ x: true, y: false });
+
+		raf.tick( 25 );
+		assert.equal( component.refs.yes.foo, undefined );
+		assert.equal( component.refs.no.foo, 0.75 );
+
+		raf.tick( 75 );
+		assert.equal( component.refs.yes.foo, undefined );
+		assert.equal( component.refs.no.foo, 0.25 );
+
+		raf.tick( 100 );
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-if-elseif-block-outro/main.html b/test/runtime/samples/transition-js-if-elseif-block-outro/main.html
new file mode 100644
index 0000000000..7b45898ab5
--- /dev/null
+++ b/test/runtime/samples/transition-js-if-elseif-block-outro/main.html
@@ -0,0 +1,20 @@
+{{#if x}}
+	<div ref:yes out:foo>yes</div>
+{{elseif y}}
+	<div ref:no out:foo>no</div>
+{{/if}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node, params ) {
+				return {
+					duration: 100,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-initial/_config.js b/test/runtime/samples/transition-js-initial/_config.js
new file mode 100644
index 0000000000..f6501ed920
--- /dev/null
+++ b/test/runtime/samples/transition-js-initial/_config.js
@@ -0,0 +1,11 @@
+export default {
+	test ( assert, component, target, window, raf ) {
+		const div = target.querySelector( 'div' );
+		assert.equal( div.foo, 0 );
+
+		raf.tick(50);
+		assert.equal( div.foo, 0.5 );
+
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-initial/main.html b/test/runtime/samples/transition-js-initial/main.html
new file mode 100644
index 0000000000..13ffdc40a8
--- /dev/null
+++ b/test/runtime/samples/transition-js-initial/main.html
@@ -0,0 +1,16 @@
+<div transition:foo></div>
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node, params ) {
+				return {
+					duration: 100,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/whitespace-normal/_config.js b/test/runtime/samples/whitespace-normal/_config.js
new file mode 100644
index 0000000000..a196aa2236
--- /dev/null
+++ b/test/runtime/samples/whitespace-normal/_config.js
@@ -0,0 +1,12 @@
+export default {
+	data: {
+		name: 'world'
+	},
+
+	test ( assert, component, target ) {
+		assert.equal(
+			target.textContent,
+			`Hello world! How are you?`
+		);
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/whitespace-normal/main.html b/test/runtime/samples/whitespace-normal/main.html
new file mode 100644
index 0000000000..372184ebf3
--- /dev/null
+++ b/test/runtime/samples/whitespace-normal/main.html
@@ -0,0 +1 @@
+<h1>Hello <strong>{{name}}! </strong><span>How are you?</span></h1>
diff --git a/test/server-side-rendering/index.js b/test/server-side-rendering/index.js
index 66f2699fff..1d2c801ae1 100644
--- a/test/server-side-rendering/index.js
+++ b/test/server-side-rendering/index.js
@@ -1,126 +1,106 @@
-import assert from 'assert';
-import * as fs from 'fs';
-import * as path from 'path';
-
-import { addLineNumbers, loadConfig, setupHtmlEqual, svelte, tryToLoadJson } from '../helpers.js';
-
-function tryToReadFile ( file ) {
+import assert from "assert";
+import * as fs from "fs";
+import * as path from "path";
+import glob from 'glob';
+
+import {
+	showOutput,
+	loadConfig,
+	setupHtmlEqual,
+	tryToLoadJson
+} from "../helpers.js";
+
+function tryToReadFile(file) {
 	try {
-		return fs.readFileSync( file, 'utf-8' );
-	} catch ( err ) {
-		if ( err.code !== 'ENOENT' ) throw err;
+		return fs.readFileSync(file, "utf-8");
+	} catch (err) {
+		if (err.code !== "ENOENT") throw err;
 		return null;
 	}
 }
 
-function capitalize ( str ) {
-	return str[0].toUpperCase() + str.slice( 1 );
-}
-
-describe( 'ssr', () => {
-	before( () => {
-		require( process.env.COVERAGE ?
-			'../../src/server-side-rendering/register.js' :
-			'../../ssr/register' );
+describe("ssr", () => {
+	before(() => {
+		require(process.env.COVERAGE
+			? "../../src/server-side-rendering/register.js"
+			: "../../ssr/register");
 
 		return setupHtmlEqual();
 	});
 
-	fs.readdirSync( 'test/server-side-rendering/samples' ).forEach( dir => {
-		if ( dir[0] === '.' ) return;
+	fs.readdirSync("test/server-side-rendering/samples").forEach(dir => {
+		if (dir[0] === ".") return;
 
 		// add .solo to a sample directory name to only run that test, or
 		// .show to always show the output. or both
-		const solo = /\.solo/.test( dir );
-		let show = /\.show/.test( dir );
+		const solo = /\.solo/.test(dir);
+		const show = /\.show/.test(dir);
 
-		if ( solo && process.env.CI ) {
-			throw new Error( 'Forgot to remove `solo: true` from test' );
+		if (solo && process.env.CI) {
+			throw new Error("Forgot to remove `solo: true` from test");
 		}
 
-		( solo ? it.only : it )( dir, () => {
-			dir = path.resolve( 'test/server-side-rendering/samples', dir );
-			const component = require( `${dir}/main.html` );
-
-			const expectedHtml = tryToReadFile( `${dir}/_expected.html` );
-			const expectedCss = tryToReadFile( `${dir}/_expected.css` ) || '';
+		(solo ? it.only : it)(dir, () => {
+			dir = path.resolve("test/server-side-rendering/samples", dir);
+			try {
+				const component = require(`${dir}/main.html`);
 
-			const data = tryToLoadJson( `${dir}/data.json` );
-			let html;
-			let css;
-			let error;
+				const expectedHtml = tryToReadFile(`${dir}/_expected.html`);
+				const expectedCss = tryToReadFile(`${dir}/_expected.css`) || "";
 
-			try {
-				html = component.render( data );
-				css = component.renderCss().css;
-			} catch ( e ) {
-				show = true;
-				error = e;
-			}
+				const data = tryToLoadJson(`${dir}/data.json`);
 
-			if ( show ) {
-				fs.readdirSync( dir ).forEach( file => {
-					if ( file[0] === '_' ) return;
-					const source = fs.readFileSync( `${dir}/${file}`, 'utf-8' );
-					const name = capitalize( file.slice( 0, -path.extname( file ).length ) );
-					const { code } = svelte.compile( source, { generate: 'ssr', name });
-					console.group( file );
-					console.log( addLineNumbers( code ) );
-					console.groupEnd();
-				});
-			}
+				const html = component.render(data);
+				const css = component.renderCss().css;
 
-			if ( error ) throw error;
+				fs.writeFileSync(`${dir}/_actual.html`, html);
+				if (css) fs.writeFileSync(`${dir}/_actual.css`, css);
 
-			fs.writeFileSync( `${dir}/_actual.html`, html );
-			if ( css ) fs.writeFileSync( `${dir}/_actual.css`, css );
+				assert.htmlEqual(html, expectedHtml);
+				assert.equal(
+					css.replace(/^\s+/gm, ""),
+					expectedCss.replace(/^\s+/gm, "")
+				);
 
-			assert.htmlEqual( html, expectedHtml );
-			assert.equal( css.replace( /^\s+/gm, '' ), expectedCss.replace( /^\s+/gm, '' ) );
+				if (show) showOutput(dir, { generate: 'ssr' });
+			} catch (err) {
+				showOutput(dir, { generate: 'ssr' });
+				throw err;
+			}
 		});
 	});
 
 	// duplicate client-side tests, as far as possible
-	fs.readdirSync( 'test/runtime/samples' ).forEach( dir => {
-		if ( dir[0] === '.' ) return;
+	fs.readdirSync("test/runtime/samples").forEach(dir => {
+		if (dir[0] === ".") return;
 
-		const config = loadConfig( `./runtime/samples/${dir}/_config.js` );
+		const config = loadConfig(`./runtime/samples/${dir}/_config.js`);
 
-		if ( config.solo && process.env.CI ) {
-			throw new Error( 'Forgot to remove `solo: true` from test' );
+		if (config.solo && process.env.CI) {
+			throw new Error("Forgot to remove `solo: true` from test");
 		}
 
-		if ( config['skip-ssr'] ) return;
+		if (config["skip-ssr"]) return;
 
-		( config.skip ? it.skip : config.solo ? it.only : it )( dir, () => {
-			let compiled;
-
-			try {
-				const source = fs.readFileSync( `test/runtime/samples/${dir}/main.html`, 'utf-8' );
-				compiled = svelte.compile( source, { generate: 'ssr' });
-			} catch ( err ) {
-				if ( config.compileError ) {
-					config.compileError( err );
-					return;
-				} else {
-					throw err;
-				}
-			}
+		(config.skip ? it.skip : config.solo ? it.only : it)(dir, () => {
+			const cwd = path.resolve("test/runtime/samples", dir);
 
-			const resolved = require.resolve( `../runtime/samples/${dir}/main.html` );
-			delete require.cache[ resolved ];
+			glob.sync('**/*.html', { cwd: `test/runtime/samples/${dir}` }).forEach(file => {
+				const resolved = require.resolve(`../runtime/samples/${dir}/${file}`);
+				delete require.cache[resolved];
+			});
 
-			const component = require( resolved );
+			const component = require(`../runtime/samples/${dir}/main.html`);
 			let html;
 
 			try {
-				html = component.render( config.data );
+				html = component.render(config.data);
 
-				if ( config.html ) {
-					assert.htmlEqual( html, config.html );
+				if (config.html) {
+					assert.htmlEqual(html, config.html);
 				}
-			} catch ( err ) {
-				console.log( addLineNumbers( compiled.code ) ); // eslint-disable-line no-console
+			} catch (err) {
+				showOutput(cwd, { generate: "ssr" });
 				throw err;
 			}
 		});
diff --git a/test/server-side-rendering/samples/comment/_actual.html b/test/server-side-rendering/samples/comment/_actual.html
index e2adc073dc..0dfdacc02b 100644
--- a/test/server-side-rendering/samples/comment/_actual.html
+++ b/test/server-side-rendering/samples/comment/_actual.html
@@ -1,3 +1,3 @@
 <p>before</p>
-	
-	<p>after</p>
\ No newline at end of file
+
+<p>after</p>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/component-data-dynamic/_actual.html b/test/server-side-rendering/samples/component-data-dynamic/_actual.html
index 6aedef46ee..e8984936d9 100644
--- a/test/server-side-rendering/samples/component-data-dynamic/_actual.html
+++ b/test/server-side-rendering/samples/component-data-dynamic/_actual.html
@@ -1,4 +1,6 @@
-<div><p>foo: lol</p>
-	<p>baz: 42 (number)</p>
-	<p>qux: this is a piece of string</p>
-	<p>quux: core</p></div>
\ No newline at end of file
+<div>
+	<p>foo: lol</p>
+<p>baz: 42 (number)</p>
+<p>qux: this is a piece of string</p>
+<p>quux: core</p>
+</div>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/component-data-empty/_actual.html b/test/server-side-rendering/samples/component-data-empty/_actual.html
index dab5ab5387..85fe1fe733 100644
--- a/test/server-side-rendering/samples/component-data-empty/_actual.html
+++ b/test/server-side-rendering/samples/component-data-empty/_actual.html
@@ -1 +1,3 @@
-<div><p>foo: ''</p></div>
\ No newline at end of file
+<div>
+	<p>foo: ''</p>
+</div>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/component-data-static/_actual.html b/test/server-side-rendering/samples/component-data-static/_actual.html
index 15a2100d4a..93f7e1839a 100644
--- a/test/server-side-rendering/samples/component-data-static/_actual.html
+++ b/test/server-side-rendering/samples/component-data-static/_actual.html
@@ -1,2 +1,4 @@
-<div><p>foo: bar</p>
-	<p>baz: 42 (number)</p></div>
\ No newline at end of file
+<div>
+	<p>foo: bar</p>
+<p>baz: 42 (number)</p>
+</div>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/component-yield/_actual.html b/test/server-side-rendering/samples/component-yield/_actual.html
index 3c0acf1a81..49139417a2 100644
--- a/test/server-side-rendering/samples/component-yield/_actual.html
+++ b/test/server-side-rendering/samples/component-yield/_actual.html
@@ -1 +1,3 @@
-<div><p>Hello</p></div>
\ No newline at end of file
+<div>
+	<p>Hello</p>
+</div>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/component/_actual.html b/test/server-side-rendering/samples/component/_actual.html
index 715d1a85c3..88145945c3 100644
--- a/test/server-side-rendering/samples/component/_actual.html
+++ b/test/server-side-rendering/samples/component/_actual.html
@@ -1 +1,3 @@
-<div><p>i am a widget</p></div>
\ No newline at end of file
+<div>
+	<p>i am a widget</p>
+</div>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/computed/_actual.html b/test/server-side-rendering/samples/computed/_actual.html
index 099eebe604..6386593ee9 100644
--- a/test/server-side-rendering/samples/computed/_actual.html
+++ b/test/server-side-rendering/samples/computed/_actual.html
@@ -1,2 +1,2 @@
 <p>1 + 2 = 3</p>
-	<p>3 * 3 = 9</p>
\ No newline at end of file
+<p>3 * 3 = 9</p>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/empty-elements-closed/_actual.html b/test/server-side-rendering/samples/empty-elements-closed/_actual.html
index 643f5b6b49..cb9b2cdcad 100644
--- a/test/server-side-rendering/samples/empty-elements-closed/_actual.html
+++ b/test/server-side-rendering/samples/empty-elements-closed/_actual.html
@@ -1,2 +1,2 @@
 <a></a>
-	<p></p>
\ No newline at end of file
+<p></p>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/import-non-component/_actual.html b/test/server-side-rendering/samples/import-non-component/_actual.html
index 893a7b890b..25e562b3df 100644
--- a/test/server-side-rendering/samples/import-non-component/_actual.html
+++ b/test/server-side-rendering/samples/import-non-component/_actual.html
@@ -1,2 +1,2 @@
 <div>i got 99 problems</div>
-	<div>the answer is 42</div>
\ No newline at end of file
+<div>the answer is 42</div>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/styles-nested/_actual.css b/test/server-side-rendering/samples/styles-nested/_actual.css
index b8796d3a0e..37d529499e 100644
--- a/test/server-side-rendering/samples/styles-nested/_actual.css
+++ b/test/server-side-rendering/samples/styles-nested/_actual.css
@@ -1,14 +1,14 @@
 
-	div[svelte-4188175681], [svelte-4188175681] div {
+	div[svelte-1408461649], [svelte-1408461649] div {
 		color: red;
 	}
 
 
-	div[svelte-146600313], [svelte-146600313] div {
+	div[svelte-54999591], [svelte-54999591] div {
 		color: green;
 	}
 
 
-	div[svelte-1506185237], [svelte-1506185237] div {
+	div[svelte-2385185803], [svelte-2385185803] div {
 		color: blue;
 	}
diff --git a/test/server-side-rendering/samples/styles-nested/_actual.html b/test/server-side-rendering/samples/styles-nested/_actual.html
index 1962e54454..5164539855 100644
--- a/test/server-side-rendering/samples/styles-nested/_actual.html
+++ b/test/server-side-rendering/samples/styles-nested/_actual.html
@@ -1,5 +1,5 @@
-<div svelte-4188175681>red</div>
-	<div svelte-146600313>green: foo</div>
-	<div svelte-1506185237>blue: foo</div>
-	<div svelte-146600313>green: bar</div>
-	<div svelte-1506185237>blue: bar</div>
\ No newline at end of file
+<div svelte-1408461649>red</div>
+<div svelte-54999591>green: foo</div>
+<div svelte-2385185803>blue: foo</div>
+<div svelte-54999591>green: bar</div>
+<div svelte-2385185803>blue: bar</div>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/styles-nested/_expected.css b/test/server-side-rendering/samples/styles-nested/_expected.css
index d837c4e221..37d529499e 100644
--- a/test/server-side-rendering/samples/styles-nested/_expected.css
+++ b/test/server-side-rendering/samples/styles-nested/_expected.css
@@ -1,11 +1,14 @@
-div[svelte-4188175681], [svelte-4188175681] div {
-	color: red;
-}
 
-div[svelte-146600313], [svelte-146600313] div {
-	color: green;
-}
+	div[svelte-1408461649], [svelte-1408461649] div {
+		color: red;
+	}
 
-div[svelte-1506185237], [svelte-1506185237] div {
-	color: blue;
-}
+
+	div[svelte-54999591], [svelte-54999591] div {
+		color: green;
+	}
+
+
+	div[svelte-2385185803], [svelte-2385185803] div {
+		color: blue;
+	}
diff --git a/test/server-side-rendering/samples/styles-nested/_expected.html b/test/server-side-rendering/samples/styles-nested/_expected.html
index a8d6d4f5d8..5164539855 100644
--- a/test/server-side-rendering/samples/styles-nested/_expected.html
+++ b/test/server-side-rendering/samples/styles-nested/_expected.html
@@ -1,5 +1,5 @@
-<div svelte-4188175681>red</div>
-<div svelte-146600313>green: foo</div>
-<div svelte-1506185237>blue: foo</div>
-<div svelte-146600313>green: bar</div>
-<div svelte-1506185237>blue: bar</div>
+<div svelte-1408461649>red</div>
+<div svelte-54999591>green: foo</div>
+<div svelte-2385185803>blue: foo</div>
+<div svelte-54999591>green: bar</div>
+<div svelte-2385185803>blue: bar</div>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/styles/_actual.css b/test/server-side-rendering/samples/styles/_actual.css
index ee9575d9a8..0d52d6d95f 100644
--- a/test/server-side-rendering/samples/styles/_actual.css
+++ b/test/server-side-rendering/samples/styles/_actual.css
@@ -1,4 +1,4 @@
 
-	div[svelte-281576708], [svelte-281576708] div {
+	div[svelte-2278551596], [svelte-2278551596] div {
 		color: red;
 	}
diff --git a/test/server-side-rendering/samples/styles/_actual.html b/test/server-side-rendering/samples/styles/_actual.html
index 9752d45d81..e0ab016f48 100644
--- a/test/server-side-rendering/samples/styles/_actual.html
+++ b/test/server-side-rendering/samples/styles/_actual.html
@@ -1 +1 @@
-<div svelte-281576708>red</div>
\ No newline at end of file
+<div svelte-2278551596>red</div>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/styles/_expected.css b/test/server-side-rendering/samples/styles/_expected.css
index e26c4b8a4e..0d52d6d95f 100644
--- a/test/server-side-rendering/samples/styles/_expected.css
+++ b/test/server-side-rendering/samples/styles/_expected.css
@@ -1,3 +1,4 @@
-div[svelte-281576708], [svelte-281576708] div {
-	color: red;
-}
+
+	div[svelte-2278551596], [svelte-2278551596] div {
+		color: red;
+	}
diff --git a/test/server-side-rendering/samples/styles/_expected.html b/test/server-side-rendering/samples/styles/_expected.html
index afb992c94a..e0ab016f48 100644
--- a/test/server-side-rendering/samples/styles/_expected.html
+++ b/test/server-side-rendering/samples/styles/_expected.html
@@ -1 +1 @@
-<div svelte-281576708>red</div>
+<div svelte-2278551596>red</div>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/textarea-children/_expected.html b/test/server-side-rendering/samples/textarea-children/_expected.html
new file mode 100644
index 0000000000..792567e4ca
--- /dev/null
+++ b/test/server-side-rendering/samples/textarea-children/_expected.html
@@ -0,0 +1,3 @@
+<textarea>
+	<p>not actually an element. 42</p>
+</textarea>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/textarea-children/main.html b/test/server-side-rendering/samples/textarea-children/main.html
new file mode 100644
index 0000000000..7209683448
--- /dev/null
+++ b/test/server-side-rendering/samples/textarea-children/main.html
@@ -0,0 +1,11 @@
+<textarea>
+	<p>not actually an element. {{foo}}</p>
+</textarea>
+
+<script>
+	export default {
+		data () {
+			return { foo: 42 };
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/textarea-value/_expected.html b/test/server-side-rendering/samples/textarea-value/_expected.html
new file mode 100644
index 0000000000..cd39aabde5
--- /dev/null
+++ b/test/server-side-rendering/samples/textarea-value/_expected.html
@@ -0,0 +1 @@
+<textarea>42</textarea>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/textarea-value/main.html b/test/server-side-rendering/samples/textarea-value/main.html
new file mode 100644
index 0000000000..33375b5785
--- /dev/null
+++ b/test/server-side-rendering/samples/textarea-value/main.html
@@ -0,0 +1,9 @@
+<textarea value='{{foo}}'/>
+
+<script>
+	export default {
+		data () {
+			return { foo: 42 };
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/setup.js b/test/setup.js
index c51e5d75e6..b649bc2250 100644
--- a/test/setup.js
+++ b/test/setup.js
@@ -1,9 +1,9 @@
-const nodeVersionMatch = /^v(\d)/.exec( process.version );
+const nodeVersionMatch = /^v(\d)/.exec(process.version);
 const legacy = +nodeVersionMatch[1] < 6;
-const babelrc = require( '../package.json' ).babel;
+const babelrc = require("../package.json").babel;
 
-if ( legacy ) {
-	require( 'babel-register' )( babelrc );
+if (legacy) {
+	require("babel-register")(babelrc);
 } else {
-	require( 'reify' );
-}
\ No newline at end of file
+	require("reify");
+}
diff --git a/test/sourcemaps/index.js b/test/sourcemaps/index.js
index 986630c14d..f4aaabb069 100644
--- a/test/sourcemaps/index.js
+++ b/test/sourcemaps/index.js
@@ -1,41 +1,51 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import assert from 'assert';
-import { svelte, exists } from '../helpers.js';
-import { SourceMapConsumer } from 'source-map';
-import { getLocator } from 'locate-character';
+import * as fs from "fs";
+import * as path from "path";
+import assert from "assert";
+import { svelte, exists } from "../helpers.js";
+import { SourceMapConsumer } from "source-map";
+import { getLocator } from "locate-character";
 
-describe( 'sourcemaps', () => {
-	fs.readdirSync( 'test/sourcemaps/samples' ).forEach( dir => {
-		if ( dir[0] === '.' ) return;
+describe("sourcemaps", () => {
+	fs.readdirSync("test/sourcemaps/samples").forEach(dir => {
+		if (dir[0] === ".") return;
 
-		const solo = exists( `test/sourcemaps/samples/${dir}/solo` );
+		const solo = exists(`test/sourcemaps/samples/${dir}/solo`);
 
-		if ( solo && process.env.CI ) {
-			throw new Error( 'Forgot to remove `solo: true` from test' );
+		if (solo && process.env.CI) {
+			throw new Error("Forgot to remove `solo: true` from test");
 		}
 
-		( solo ? it.only : it )( dir, () => {
-			const filename = path.resolve( `test/sourcemaps/samples/${dir}/input.html` );
-			const outputFilename = path.resolve( `test/sourcemaps/samples/${dir}/output.js` );
+		(solo ? it.only : it)(dir, () => {
+			const filename = path.resolve(
+				`test/sourcemaps/samples/${dir}/input.html`
+			);
+			const outputFilename = path.resolve(
+				`test/sourcemaps/samples/${dir}/output.js`
+			);
 
-			const input = fs.readFileSync( filename, 'utf-8' ).replace( /\s+$/, '' );
-			const { code, map } = svelte.compile( input, {
+			const input = fs.readFileSync(filename, "utf-8").replace(/\s+$/, "");
+			const { code, map } = svelte.compile(input, {
 				filename,
 				outputFilename
 			});
 
-			fs.writeFileSync( outputFilename, `${code}\n//# sourceMappingURL=output.js.map` );
-			fs.writeFileSync( `${outputFilename}.map`, JSON.stringify( map, null, '  ' ) );
+			fs.writeFileSync(
+				outputFilename,
+				`${code}\n//# sourceMappingURL=output.js.map`
+			);
+			fs.writeFileSync(
+				`${outputFilename}.map`,
+				JSON.stringify(map, null, "  ")
+			);
 
-			assert.deepEqual( map.sources, [ 'input.html' ]);
+			assert.deepEqual(map.sources, ["input.html"]);
 
-			const { test } = require( `./samples/${dir}/test.js` );
+			const { test } = require(`./samples/${dir}/test.js`);
 
-			const smc = new SourceMapConsumer( map );
+			const smc = new SourceMapConsumer(map);
 
-			const locateInSource = getLocator( input );
-			const locateInGenerated = getLocator( code );
+			const locateInSource = getLocator(input);
+			const locateInGenerated = getLocator(code);
 
 			test({ assert, code, map, smc, locateInSource, locateInGenerated });
 		});
diff --git a/test/test.js b/test/test.js
index 36cbe00280..b501fd81a0 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1,11 +1,11 @@
-const glob = require( 'glob' );
+const glob = require("glob");
 
-require( './setup' );
+require("./setup");
 
-glob.sync( '**/__test__.js', { cwd: 'src' }).forEach( function ( file ) {
-	require( '../src/' + file );
+glob.sync("**/__test__.js", { cwd: "src" }).forEach(function(file) {
+	require("../src/" + file);
 });
 
-glob.sync( '*/index.js', { cwd: 'test' }).forEach( function ( file ) {
-	require( './' + file );
-});
\ No newline at end of file
+glob.sync("*/index.js", { cwd: "test" }).forEach(function(file) {
+	require("./" + file);
+});
diff --git a/test/validator/index.js b/test/validator/index.js
index 8ebe0be294..5a63958c9c 100644
--- a/test/validator/index.js
+++ b/test/validator/index.js
@@ -1,30 +1,30 @@
-import * as fs from 'fs';
-import assert from 'assert';
-import { svelte, tryToLoadJson } from '../helpers.js';
+import * as fs from "fs";
+import assert from "assert";
+import { svelte, tryToLoadJson } from "../helpers.js";
 
-describe( 'validate', () => {
-	fs.readdirSync( 'test/validator/samples' ).forEach( dir => {
-		if ( dir[0] === '.' ) return;
+describe("validate", () => {
+	fs.readdirSync("test/validator/samples").forEach(dir => {
+		if (dir[0] === ".") return;
 
 		// add .solo to a sample directory name to only run that test
-		const solo = /\.solo/.test( dir );
+		const solo = /\.solo/.test(dir);
 
-		if ( solo && process.env.CI ) {
-			throw new Error( 'Forgot to remove `solo: true` from test' );
+		if (solo && process.env.CI) {
+			throw new Error("Forgot to remove `solo: true` from test");
 		}
 
-		( solo ? it.only : it )( dir, () => {
+		(solo ? it.only : it)(dir, () => {
 			const filename = `test/validator/samples/${dir}/input.html`;
-			const input = fs.readFileSync( filename, 'utf-8' ).replace( /\s+$/, '' );
+			const input = fs.readFileSync(filename, "utf-8").replace(/\s+$/, "");
 
 			try {
-				const parsed = svelte.parse( input );
+				const parsed = svelte.parse(input);
 
 				const errors = [];
 				const warnings = [];
 
-				svelte.validate( parsed, input, {
-					onerror ( error ) {
+				svelte.validate(parsed, input, {
+					onerror(error) {
 						errors.push({
 							message: error.message,
 							pos: error.pos,
@@ -32,7 +32,7 @@ describe( 'validate', () => {
 						});
 					},
 
-					onwarn ( warning ) {
+					onwarn(warning) {
 						warnings.push({
 							message: warning.message,
 							pos: warning.pos,
@@ -41,40 +41,42 @@ describe( 'validate', () => {
 					}
 				});
 
-				const expectedErrors = tryToLoadJson( `test/validator/samples/${dir}/errors.json` ) || [];
-				const expectedWarnings = tryToLoadJson( `test/validator/samples/${dir}/warnings.json` ) || [];
+				const expectedErrors =
+					tryToLoadJson(`test/validator/samples/${dir}/errors.json`) || [];
+				const expectedWarnings =
+					tryToLoadJson(`test/validator/samples/${dir}/warnings.json`) || [];
 
-				assert.deepEqual( errors, expectedErrors );
-				assert.deepEqual( warnings, expectedWarnings );
-			} catch ( err ) {
-				if ( err.name !== 'ParseError' ) throw err;
+				assert.deepEqual(errors, expectedErrors);
+				assert.deepEqual(warnings, expectedWarnings);
+			} catch (err) {
+				if (err.name !== "ParseError") throw err;
 
 				try {
-					const expected = require( `./samples/${dir}/errors.json` )[0];
+					const expected = require(`./samples/${dir}/errors.json`)[0];
 
-					assert.equal( err.message, expected.message );
-					assert.deepEqual( err.loc, expected.loc );
-					assert.equal( err.pos, expected.pos );
-				} catch ( err2 ) {
-					throw err2.code === 'MODULE_NOT_FOUND' ? err : err2;
+					assert.equal(err.message, expected.message);
+					assert.deepEqual(err.loc, expected.loc);
+					assert.equal(err.pos, expected.pos);
+				} catch (err2) {
+					throw err2.code === "MODULE_NOT_FOUND" ? err : err2;
 				}
 			}
 		});
 	});
 
-	it( 'errors if options.name is illegal', () => {
-		assert.throws( () => {
-			svelte.compile( '<div></div>', {
-				name: 'not.valid'
+	it("errors if options.name is illegal", () => {
+		assert.throws(() => {
+			svelte.compile("<div></div>", {
+				name: "not.valid"
 			});
-		}, /options\.name must be a valid identifier/ );
+		}, /options\.name must be a valid identifier/);
 	});
 
-	it( 'warns if options.name is not capitalised', () => {
+	it("warns if options.name is not capitalised", () => {
 		const warnings = [];
-		svelte.compile( '<div></div>', {
-			name: 'lowercase',
-			onwarn ( warning ) {
+		svelte.compile("<div></div>", {
+			name: "lowercase",
+			onwarn(warning) {
 				warnings.push({
 					message: warning.message,
 					pos: warning.pos,
@@ -82,6 +84,12 @@ describe( 'validate', () => {
 				});
 			}
 		});
-		assert.deepEqual( warnings, [ { message: 'options.name should be capitalised', pos: undefined, loc: undefined } ] );
+		assert.deepEqual(warnings, [
+			{
+				message: "options.name should be capitalised",
+				pos: undefined,
+				loc: undefined
+			}
+		]);
 	});
 });
diff --git a/test/validator/samples/binding-input-checked/errors.json b/test/validator/samples/binding-input-checked/errors.json
new file mode 100644
index 0000000000..05747dc96c
--- /dev/null
+++ b/test/validator/samples/binding-input-checked/errors.json
@@ -0,0 +1,8 @@
+[{
+	"message": "'checked' binding can only be used with <input type=\"checkbox\">",
+	"loc": {
+		"line": 1,
+		"column": 7
+	},
+	"pos": 7
+}]
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-checked/input.html b/test/validator/samples/binding-input-checked/input.html
new file mode 100644
index 0000000000..9990d3c596
--- /dev/null
+++ b/test/validator/samples/binding-input-checked/input.html
@@ -0,0 +1 @@
+<input bind:checked='foo'>
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-static-type/errors.json b/test/validator/samples/binding-input-static-type/errors.json
new file mode 100644
index 0000000000..fbc8284ec4
--- /dev/null
+++ b/test/validator/samples/binding-input-static-type/errors.json
@@ -0,0 +1,8 @@
+[{
+	"message": "'type' attribute cannot be dynamic if input uses two-way binding",
+	"loc": {
+		"line": 1,
+		"column": 24
+	},
+	"pos": 24
+}]
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-static-type/input.html b/test/validator/samples/binding-input-static-type/input.html
new file mode 100644
index 0000000000..4f54010bdc
--- /dev/null
+++ b/test/validator/samples/binding-input-static-type/input.html
@@ -0,0 +1 @@
+<input bind:value='foo' type='{{inputType}}'>
\ No newline at end of file
diff --git a/test/validator/samples/helper-clash-context/input.html b/test/validator/samples/helper-clash-context/input.html
new file mode 100644
index 0000000000..85f6faf117
--- /dev/null
+++ b/test/validator/samples/helper-clash-context/input.html
@@ -0,0 +1,17 @@
+{{#each things as thing}}
+	{{thing}}
+{{/each}}
+
+<script>
+	export default {
+		data () {
+			return { things: [ 'a', 'b', 'c' ] };
+		},
+
+		helpers: {
+			thing: function ( x ) {
+				return x;
+			}
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/validator/samples/helper-clash-context/warnings.json b/test/validator/samples/helper-clash-context/warnings.json
new file mode 100644
index 0000000000..e71b4edb59
--- /dev/null
+++ b/test/validator/samples/helper-clash-context/warnings.json
@@ -0,0 +1,8 @@
+[{
+	"message": "Context clashes with a helper. Rename one or the other to eliminate any ambiguity",
+	"loc": {
+		"line": 1,
+		"column": 18
+	},
+	"pos": 18
+}]
\ No newline at end of file
diff --git a/test/validator/samples/method-nonexistent-helper/errors.json b/test/validator/samples/method-nonexistent-helper/warnings.json
similarity index 54%
rename from test/validator/samples/method-nonexistent-helper/errors.json
rename to test/validator/samples/method-nonexistent-helper/warnings.json
index 80183498ca..02512426a1 100644
--- a/test/validator/samples/method-nonexistent-helper/errors.json
+++ b/test/validator/samples/method-nonexistent-helper/warnings.json
@@ -1,5 +1,5 @@
 [{
-	"message": "'foo' is an invalid callee (should be one of this.*, event.*, set, fire or bar). 'foo' exists on 'helpers', did you put it in the wrong place?",
+	"message": "'foo' is an invalid callee (should be one of this.*, event.*, set, fire, destroy or bar). 'foo' exists on 'helpers', did you put it in the wrong place?",
 	"pos": 18,
 	"loc": {
 		"line": 1,
diff --git a/test/validator/samples/method-nonexistent/errors.json b/test/validator/samples/method-nonexistent/warnings.json
similarity index 75%
rename from test/validator/samples/method-nonexistent/errors.json
rename to test/validator/samples/method-nonexistent/warnings.json
index 2eaf6c215d..8debbf8132 100644
--- a/test/validator/samples/method-nonexistent/errors.json
+++ b/test/validator/samples/method-nonexistent/warnings.json
@@ -1,5 +1,5 @@
 [{
-	"message": "'foo' is an invalid callee (should be one of this.*, event.*, set, fire or bar)",
+	"message": "'foo' is an invalid callee (should be one of this.*, event.*, set, fire, destroy or bar)",
 	"pos": 18,
 	"loc": {
 		"line": 1,
diff --git a/test/validator/samples/missing-component/input.html b/test/validator/samples/missing-component/input.html
new file mode 100644
index 0000000000..2b689d711c
--- /dev/null
+++ b/test/validator/samples/missing-component/input.html
@@ -0,0 +1,3 @@
+<div>
+	<Widget/>
+</div>
\ No newline at end of file
diff --git a/test/validator/samples/missing-component/warnings.json b/test/validator/samples/missing-component/warnings.json
new file mode 100644
index 0000000000..c3a3be4d02
--- /dev/null
+++ b/test/validator/samples/missing-component/warnings.json
@@ -0,0 +1,8 @@
+[{
+	"message": "Widget component is not defined",
+	"loc": {
+		"line": 2,
+		"column": 1
+	},
+	"pos": 7
+}]
\ No newline at end of file
diff --git a/test/validator/samples/textarea-value-children/errors.json b/test/validator/samples/textarea-value-children/errors.json
new file mode 100644
index 0000000000..21282fb93b
--- /dev/null
+++ b/test/validator/samples/textarea-value-children/errors.json
@@ -0,0 +1,8 @@
+[{
+	"message": "A <textarea> can have either a value attribute or (equivalently) child content, but not both",
+	"loc": {
+		"line": 1,
+		"column": 10
+	},
+	"pos": 10
+}]
\ No newline at end of file
diff --git a/test/validator/samples/textarea-value-children/input.html b/test/validator/samples/textarea-value-children/input.html
new file mode 100644
index 0000000000..70ba6d5a1f
--- /dev/null
+++ b/test/validator/samples/textarea-value-children/input.html
@@ -0,0 +1,3 @@
+<textarea value='{{foo}}'>
+	some illegal text
+</textarea>
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-in-transition/errors.json b/test/validator/samples/transition-duplicate-in-transition/errors.json
new file mode 100644
index 0000000000..c48f56ede9
--- /dev/null
+++ b/test/validator/samples/transition-duplicate-in-transition/errors.json
@@ -0,0 +1,8 @@
+[{
+	"message": "An element cannot have both an 'in' directive and a 'transition' directive",
+	"loc": {
+		"line": 1,
+		"column": 12
+	},
+	"pos": 12
+}]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-in-transition/input.html b/test/validator/samples/transition-duplicate-in-transition/input.html
new file mode 100644
index 0000000000..6f47e754f4
--- /dev/null
+++ b/test/validator/samples/transition-duplicate-in-transition/input.html
@@ -0,0 +1,10 @@
+<div in:foo transition:bar>...</div>
+
+<script>
+	export default {
+		transitions: {
+			foo,
+			bar
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-in/errors.json b/test/validator/samples/transition-duplicate-in/errors.json
new file mode 100644
index 0000000000..a3cc8b0ec5
--- /dev/null
+++ b/test/validator/samples/transition-duplicate-in/errors.json
@@ -0,0 +1,8 @@
+[{
+	"message": "An element can only have one 'in' directive",
+	"loc": {
+		"line": 1,
+		"column": 12
+	},
+	"pos": 12
+}]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-in/input.html b/test/validator/samples/transition-duplicate-in/input.html
new file mode 100644
index 0000000000..b9a9218f8e
--- /dev/null
+++ b/test/validator/samples/transition-duplicate-in/input.html
@@ -0,0 +1,10 @@
+<div in:foo in:bar>...</div>
+
+<script>
+	export default {
+		transitions: {
+			foo,
+			bar
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-out-transition/errors.json b/test/validator/samples/transition-duplicate-out-transition/errors.json
new file mode 100644
index 0000000000..f4bfa61ef0
--- /dev/null
+++ b/test/validator/samples/transition-duplicate-out-transition/errors.json
@@ -0,0 +1,8 @@
+[{
+	"message": "An element cannot have both an 'out' directive and a 'transition' directive",
+	"loc": {
+		"line": 1,
+		"column": 13
+	},
+	"pos": 13
+}]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-out-transition/input.html b/test/validator/samples/transition-duplicate-out-transition/input.html
new file mode 100644
index 0000000000..ae2582b942
--- /dev/null
+++ b/test/validator/samples/transition-duplicate-out-transition/input.html
@@ -0,0 +1,10 @@
+<div out:foo transition:bar>...</div>
+
+<script>
+	export default {
+		transitions: {
+			foo,
+			bar
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-out/errors.json b/test/validator/samples/transition-duplicate-out/errors.json
new file mode 100644
index 0000000000..988dc02bbe
--- /dev/null
+++ b/test/validator/samples/transition-duplicate-out/errors.json
@@ -0,0 +1,8 @@
+[{
+	"message": "An element can only have one 'out' directive",
+	"loc": {
+		"line": 1,
+		"column": 13
+	},
+	"pos": 13
+}]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-out/input.html b/test/validator/samples/transition-duplicate-out/input.html
new file mode 100644
index 0000000000..949dae8638
--- /dev/null
+++ b/test/validator/samples/transition-duplicate-out/input.html
@@ -0,0 +1,10 @@
+<div out:foo out:bar>...</div>
+
+<script>
+	export default {
+		transitions: {
+			foo,
+			bar
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-transition-in/errors.json b/test/validator/samples/transition-duplicate-transition-in/errors.json
new file mode 100644
index 0000000000..678ad4dd38
--- /dev/null
+++ b/test/validator/samples/transition-duplicate-transition-in/errors.json
@@ -0,0 +1,8 @@
+[{
+	"message": "An element cannot have both a 'transition' directive and an 'in' directive",
+	"loc": {
+		"line": 1,
+		"column": 20
+	},
+	"pos": 20
+}]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-transition-in/input.html b/test/validator/samples/transition-duplicate-transition-in/input.html
new file mode 100644
index 0000000000..bc105c2079
--- /dev/null
+++ b/test/validator/samples/transition-duplicate-transition-in/input.html
@@ -0,0 +1,10 @@
+<div transition:foo in:bar>...</div>
+
+<script>
+	export default {
+		transitions: {
+			foo,
+			bar
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-transition-out/errors.json b/test/validator/samples/transition-duplicate-transition-out/errors.json
new file mode 100644
index 0000000000..31dc180b5a
--- /dev/null
+++ b/test/validator/samples/transition-duplicate-transition-out/errors.json
@@ -0,0 +1,8 @@
+[{
+	"message": "An element cannot have both a 'transition' directive and an 'out' directive",
+	"loc": {
+		"line": 1,
+		"column": 20
+	},
+	"pos": 20
+}]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-transition-out/input.html b/test/validator/samples/transition-duplicate-transition-out/input.html
new file mode 100644
index 0000000000..ac82cb064e
--- /dev/null
+++ b/test/validator/samples/transition-duplicate-transition-out/input.html
@@ -0,0 +1,10 @@
+<div transition:foo out:bar>...</div>
+
+<script>
+	export default {
+		transitions: {
+			foo,
+			bar
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-transition/errors.json b/test/validator/samples/transition-duplicate-transition/errors.json
new file mode 100644
index 0000000000..585ff37451
--- /dev/null
+++ b/test/validator/samples/transition-duplicate-transition/errors.json
@@ -0,0 +1,8 @@
+[{
+	"message": "An element can only have one 'transition' directive",
+	"loc": {
+		"line": 1,
+		"column": 20
+	},
+	"pos": 20
+}]
\ No newline at end of file
diff --git a/test/validator/samples/transition-duplicate-transition/input.html b/test/validator/samples/transition-duplicate-transition/input.html
new file mode 100644
index 0000000000..29af279564
--- /dev/null
+++ b/test/validator/samples/transition-duplicate-transition/input.html
@@ -0,0 +1,10 @@
+<div transition:foo transition:bar>...</div>
+
+<script>
+	export default {
+		transitions: {
+			foo,
+			bar
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/validator/samples/transition-missing/errors.json b/test/validator/samples/transition-missing/errors.json
new file mode 100644
index 0000000000..4f2b88c2f6
--- /dev/null
+++ b/test/validator/samples/transition-missing/errors.json
@@ -0,0 +1,8 @@
+[{
+	"message": "Missing transition 'foo'",
+	"loc": {
+		"line": 1,
+		"column": 5
+	},
+	"pos": 5
+}]
\ No newline at end of file
diff --git a/test/validator/samples/transition-missing/input.html b/test/validator/samples/transition-missing/input.html
new file mode 100644
index 0000000000..5d0e1b7067
--- /dev/null
+++ b/test/validator/samples/transition-missing/input.html
@@ -0,0 +1 @@
+<div in:foo>...</div>
\ No newline at end of file
diff --git a/test/validator/samples/window-binding-invalid-innerwidth/errors.json b/test/validator/samples/window-binding-invalid-innerwidth/errors.json
new file mode 100644
index 0000000000..d4c5e99d18
--- /dev/null
+++ b/test/validator/samples/window-binding-invalid-innerwidth/errors.json
@@ -0,0 +1,8 @@
+[{
+	"message": "'innerwidth' is not a valid binding on <:Window> (did you mean 'innerWidth'?)",
+	"loc": {
+		"line": 1,
+		"column": 9
+	},
+	"pos": 9
+}]
\ No newline at end of file
diff --git a/test/validator/samples/window-binding-invalid-innerwidth/input.html b/test/validator/samples/window-binding-invalid-innerwidth/input.html
new file mode 100644
index 0000000000..867e2c92dd
--- /dev/null
+++ b/test/validator/samples/window-binding-invalid-innerwidth/input.html
@@ -0,0 +1 @@
+<:Window bind:innerwidth='w'/>
\ No newline at end of file
diff --git a/test/validator/samples/window-binding-invalid-value/errors.json b/test/validator/samples/window-binding-invalid-value/errors.json
new file mode 100644
index 0000000000..7f0c3f8b25
--- /dev/null
+++ b/test/validator/samples/window-binding-invalid-value/errors.json
@@ -0,0 +1,8 @@
+[{
+	"message": "Bindings on <:Window/> must be to top-level properties, e.g. 'baz' rather than 'foo.bar.baz'",
+	"loc": {
+		"line": 1,
+		"column": 26
+	},
+	"pos": 26
+}]
\ No newline at end of file
diff --git a/test/validator/samples/window-binding-invalid-value/input.html b/test/validator/samples/window-binding-invalid-value/input.html
new file mode 100644
index 0000000000..aa0bb48fae
--- /dev/null
+++ b/test/validator/samples/window-binding-invalid-value/input.html
@@ -0,0 +1 @@
+<:Window bind:innerWidth='foo.bar.baz'/>
\ No newline at end of file
diff --git a/test/validator/samples/window-binding-invalid-width/errors.json b/test/validator/samples/window-binding-invalid-width/errors.json
new file mode 100644
index 0000000000..b24b359611
--- /dev/null
+++ b/test/validator/samples/window-binding-invalid-width/errors.json
@@ -0,0 +1,8 @@
+[{
+	"message": "'width' is not a valid binding on <:Window> (did you mean 'innerWidth'?)",
+	"loc": {
+		"line": 1,
+		"column": 9
+	},
+	"pos": 9
+}]
\ No newline at end of file
diff --git a/test/validator/samples/window-binding-invalid-width/input.html b/test/validator/samples/window-binding-invalid-width/input.html
new file mode 100644
index 0000000000..5b8348a818
--- /dev/null
+++ b/test/validator/samples/window-binding-invalid-width/input.html
@@ -0,0 +1 @@
+<:Window bind:width='w'/>
\ No newline at end of file
diff --git a/test/validator/samples/window-binding-invalid/errors.json b/test/validator/samples/window-binding-invalid/errors.json
new file mode 100644
index 0000000000..f2a36540ec
--- /dev/null
+++ b/test/validator/samples/window-binding-invalid/errors.json
@@ -0,0 +1,8 @@
+[{
+	"message": "'potato' is not a valid binding on <:Window> — valid bindings are innerWidth, innerHeight, outerWidth, outerHeight, scrollX or scrollY",
+	"loc": {
+		"line": 1,
+		"column": 9
+	},
+	"pos": 9
+}]
\ No newline at end of file
diff --git a/test/validator/samples/window-binding-invalid/input.html b/test/validator/samples/window-binding-invalid/input.html
new file mode 100644
index 0000000000..3897b664b5
--- /dev/null
+++ b/test/validator/samples/window-binding-invalid/input.html
@@ -0,0 +1 @@
+<:Window bind:potato='foo'/>
\ No newline at end of file
diff --git a/test/validator/samples/window-event-invalid/input.html b/test/validator/samples/window-event-invalid/input.html
new file mode 100644
index 0000000000..c9c32eecac
--- /dev/null
+++ b/test/validator/samples/window-event-invalid/input.html
@@ -0,0 +1 @@
+<:Window on:resize='resize()'/>
\ No newline at end of file
diff --git a/test/validator/samples/window-event-invalid/warnings.json b/test/validator/samples/window-event-invalid/warnings.json
new file mode 100644
index 0000000000..425c657cb1
--- /dev/null
+++ b/test/validator/samples/window-event-invalid/warnings.json
@@ -0,0 +1,8 @@
+[{
+	"message": "'resize' is an invalid callee (should be one of this.*, event.*, set, fire or destroy)",
+	"loc": {
+		"line": 1,
+		"column": 20
+	},
+	"pos": 20
+}]
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000000..75be5f0764
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "noImplicitAny": true,
+        "diagnostics": true,
+        "noImplicitThis": true,
+        "noEmitOnError": true,
+        "allowJs": true,
+        "lib": ["es5", "es6", "dom"]
+    },
+    "target": "ES5",
+    "include": [
+        "src"
+    ],
+    "exclude": [
+        "node_modules"
+    ]
+}
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 0000000000..a3b9fbe5a4
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,3044 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/mocha@^2.2.41":
+  version "2.2.41"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.41.tgz#e27cf0817153eb9f2713b2d3f6c68f1e1c3ca608"
+
+"@types/node@^7.0.22":
+  version "7.0.27"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.27.tgz#ba5e1a87aca2b4f5817289615ffe56472927687e"
+
+abab@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
+
+acorn-es7-plugin@~1.1.0:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz#f2ee1f3228a90eead1245f9ab1922eb2e71d336b"
+
+acorn-globals@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
+  dependencies:
+    acorn "^4.0.4"
+
+acorn-jsx@^3.0.0, acorn-jsx@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
+  dependencies:
+    acorn "^3.0.4"
+
+acorn-object-spread@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-object-spread/-/acorn-object-spread-1.0.0.tgz#48ead0f4a8eb16995a17a0db9ffc6acaada4ba68"
+  dependencies:
+    acorn "^3.1.0"
+
+acorn@^3.0.4, acorn@^3.1.0, acorn@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+
+acorn@^4.0.1, acorn@^4.0.4, acorn@~4.0.5:
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0"
+
+acorn@^5.0.1:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
+
+ajv-keywords@^1.0.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
+
+ajv@^4.7.0, ajv@^4.9.1:
+  version "4.11.7"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.7.tgz#8655a5d86d0824985cc471a1d913fb6729a0ec48"
+  dependencies:
+    co "^4.6.0"
+    json-stable-stringify "^1.0.1"
+
+align-text@^0.1.1, align-text@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  dependencies:
+    kind-of "^3.0.2"
+    longest "^1.0.1"
+    repeat-string "^1.5.2"
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+
+ansi-escapes@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
+append-transform@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
+  dependencies:
+    default-require-extensions "^1.0.0"
+
+archy@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
+
+argparse@^1.0.7:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  dependencies:
+    sprintf-js "~1.0.2"
+
+argv@>=0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/argv/-/argv-0.0.2.tgz#ecbd16f8949b157183711b1bda334f37840185ab"
+
+arr-diff@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  dependencies:
+    arr-flatten "^1.0.1"
+
+arr-flatten@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1"
+
+array-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+
+array-unique@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+
+arrify@^1.0.0, arrify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+
+asn1@~0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
+assert-plus@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+
+ast-types@^0.9.5:
+  version "0.9.11"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.11.tgz#371177bb59232ff5ceaa1d09ee5cad705b1a5aa9"
+
+async@^1.4.0:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+
+aws-sign2@~0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+
+aws4@^1.2.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+
+babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
+  dependencies:
+    chalk "^1.1.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+babel-core@^6.23.1, babel-core@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.1.tgz#8c428564dce1e1f41fb337ec34f4c3b022b5ad83"
+  dependencies:
+    babel-code-frame "^6.22.0"
+    babel-generator "^6.24.1"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+    babylon "^6.11.0"
+    convert-source-map "^1.1.0"
+    debug "^2.1.1"
+    json5 "^0.5.0"
+    lodash "^4.2.0"
+    minimatch "^3.0.2"
+    path-is-absolute "^1.0.0"
+    private "^0.1.6"
+    slash "^1.0.0"
+    source-map "^0.5.0"
+
+babel-generator@^6.18.0, babel-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.1.tgz#e715f486c58ded25649d888944d52aa07c5d9497"
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.2.0"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
+babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
+  dependencies:
+    babel-helper-explode-assignable-expression "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-call-delegate@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-define-map@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz#7a9747f258d8947d32d515f6aa1c7bd02204a080"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+    lodash "^4.2.0"
+
+babel-helper-explode-assignable-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-function-name@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
+  dependencies:
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-get-function-arity@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-hoist-variables@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-optimise-call-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-regex@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz#d36e22fab1008d79d88648e32116868128456ce8"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+    lodash "^4.2.0"
+
+babel-helper-remap-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-replace-supers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
+  dependencies:
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helpers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-messages@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-check-es2015-constants@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-istanbul@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-3.1.2.tgz#11d5abde18425ec24b5d648c7e0b5d25cd354a22"
+  dependencies:
+    find-up "^1.1.2"
+    istanbul-lib-instrument "^1.4.2"
+    object-assign "^4.1.0"
+    test-exclude "^3.3.0"
+
+babel-plugin-syntax-async-functions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
+
+babel-plugin-syntax-exponentiation-operator@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
+
+babel-plugin-syntax-trailing-function-commas@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
+
+babel-plugin-transform-async-to-generator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.24.1"
+    babel-plugin-syntax-async-functions "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-arrow-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoping@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+    lodash "^4.2.0"
+
+babel-plugin-transform-es2015-classes@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
+  dependencies:
+    babel-helper-define-map "^6.24.1"
+    babel-helper-function-name "^6.24.1"
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-helper-replace-supers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-computed-properties@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-destructuring@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-for-of@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-function-name@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
+  dependencies:
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz#d3e310b40ef664a36622200097c6d440298f2bfe"
+  dependencies:
+    babel-plugin-transform-strict-mode "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-umd@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
+  dependencies:
+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-object-super@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
+  dependencies:
+    babel-helper-replace-supers "^6.24.1"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-parameters@^6.23.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
+  dependencies:
+    babel-helper-call-delegate "^6.24.1"
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-spread@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-sticky-regex@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-template-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-unicode-regex@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    regexpu-core "^2.0.0"
+
+babel-plugin-transform-exponentiation-operator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
+  dependencies:
+    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
+    babel-plugin-syntax-exponentiation-operator "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-regenerator@^6.22.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz#b8da305ad43c3c99b4848e4fe4037b770d23c418"
+  dependencies:
+    regenerator-transform "0.9.11"
+
+babel-plugin-transform-strict-mode@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-preset-env@^1.2.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.4.0.tgz#c8e02a3bcc7792f23cded68e0355b9d4c28f0f7a"
+  dependencies:
+    babel-plugin-check-es2015-constants "^6.22.0"
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-to-generator "^6.22.0"
+    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoping "^6.23.0"
+    babel-plugin-transform-es2015-classes "^6.23.0"
+    babel-plugin-transform-es2015-computed-properties "^6.22.0"
+    babel-plugin-transform-es2015-destructuring "^6.23.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
+    babel-plugin-transform-es2015-for-of "^6.23.0"
+    babel-plugin-transform-es2015-function-name "^6.22.0"
+    babel-plugin-transform-es2015-literals "^6.22.0"
+    babel-plugin-transform-es2015-modules-amd "^6.22.0"
+    babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-umd "^6.23.0"
+    babel-plugin-transform-es2015-object-super "^6.22.0"
+    babel-plugin-transform-es2015-parameters "^6.23.0"
+    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
+    babel-plugin-transform-es2015-spread "^6.22.0"
+    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
+    babel-plugin-transform-es2015-template-literals "^6.22.0"
+    babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
+    babel-plugin-transform-exponentiation-operator "^6.22.0"
+    babel-plugin-transform-regenerator "^6.22.0"
+    browserslist "^1.4.0"
+    invariant "^2.2.2"
+
+babel-register@^6.23.0, babel-register@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.1.tgz#7e10e13a2f71065bdfad5a1787ba45bca6ded75f"
+  dependencies:
+    babel-core "^6.24.1"
+    babel-runtime "^6.22.0"
+    core-js "^2.4.0"
+    home-or-tmp "^2.0.0"
+    lodash "^4.2.0"
+    mkdirp "^0.5.1"
+    source-map-support "^0.4.2"
+
+babel-runtime@^6.18.0, babel-runtime@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.10.0"
+
+babel-template@^6.16.0, babel-template@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+    babylon "^6.11.0"
+    lodash "^4.2.0"
+
+babel-traverse@^6.18.0, babel-traverse@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.24.1.tgz#ab36673fd356f9a0948659e7b338d5feadb31695"
+  dependencies:
+    babel-code-frame "^6.22.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+    babylon "^6.15.0"
+    debug "^2.2.0"
+    globals "^9.0.0"
+    invariant "^2.2.0"
+    lodash "^4.2.0"
+
+babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975"
+  dependencies:
+    babel-runtime "^6.22.0"
+    esutils "^2.0.2"
+    lodash "^4.2.0"
+    to-fast-properties "^1.0.1"
+
+babel@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel/-/babel-6.23.0.tgz#d0d1e7d803e974765beea3232d4e153c0efb90f4"
+
+babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0:
+  version "6.17.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.0.tgz#37da948878488b9c4e3c4038893fa3314b3fc932"
+
+balanced-match@^0.4.1:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+  dependencies:
+    tweetnacl "^0.14.3"
+
+boom@2.x.x:
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  dependencies:
+    hoek "2.x.x"
+
+brace-expansion@^1.0.0:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
+  dependencies:
+    balanced-match "^0.4.1"
+    concat-map "0.0.1"
+
+braces@^1.8.2:
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  dependencies:
+    expand-range "^1.8.1"
+    preserve "^0.2.0"
+    repeat-element "^1.1.2"
+
+browser-resolve@^1.11.0:
+  version "1.11.2"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
+  dependencies:
+    resolve "1.1.7"
+
+browser-stdout@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
+
+browserslist@^1.4.0:
+  version "1.7.7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
+  dependencies:
+    caniuse-db "^1.0.30000639"
+    electron-to-chromium "^1.2.7"
+
+buble@^0.15.0:
+  version "0.15.2"
+  resolved "https://registry.yarnpkg.com/buble/-/buble-0.15.2.tgz#547fc47483f8e5e8176d82aa5ebccb183b02d613"
+  dependencies:
+    acorn "^3.3.0"
+    acorn-jsx "^3.0.1"
+    acorn-object-spread "^1.0.0"
+    chalk "^1.1.3"
+    magic-string "^0.14.0"
+    minimist "^1.2.0"
+    os-homedir "^1.0.1"
+
+buffer-shims@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
+
+builtin-modules@^1.0.0, builtin-modules@^1.1.0, builtin-modules@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+
+caching-transform@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-1.0.1.tgz#6dbdb2f20f8d8fbce79f3e94e9d1742dcdf5c0a1"
+  dependencies:
+    md5-hex "^1.2.0"
+    mkdirp "^0.5.1"
+    write-file-atomic "^1.1.4"
+
+caller-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
+  dependencies:
+    callsites "^0.2.0"
+
+callsites@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+
+camelcase@^1.0.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+
+camelcase@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+
+caniuse-db@^1.0.30000639:
+  version "1.0.30000662"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000662.tgz#616b17a525b52fec14611f88af3d5a9b5438c050"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+
+center-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  dependencies:
+    align-text "^0.1.3"
+    lazy-cache "^1.0.3"
+
+chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+circular-json@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
+
+cli-cursor@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
+  dependencies:
+    restore-cursor "^1.0.1"
+
+cli-width@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
+
+cliui@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  dependencies:
+    center-align "^0.1.1"
+    right-align "^0.1.1"
+    wordwrap "0.0.2"
+
+cliui@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wrap-ansi "^2.0.0"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+
+codecov@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/codecov/-/codecov-1.0.1.tgz#97260ceac0e96b8eda8d562006558a53a139dffd"
+  dependencies:
+    argv ">=0.0.2"
+    execSync "1.0.2"
+    request ">=2.42.0"
+    urlgrey ">=0.4.0"
+
+combined-stream@^1.0.5, combined-stream@~1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+
+compare-versions@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-2.0.1.tgz#1edc1f93687fd97a325c59f55e45a07db106aca6"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+concat-stream@^1.5.2:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+console-group@^0.3.2:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/console-group/-/console-group-0.3.3.tgz#6d8eb6b9d6b757a2895284f62d09c7ad43f2bbce"
+
+contains-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
+
+content-type-parser@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.1.tgz#c3e56988c53c65127fb46d4032a3a900246fdc94"
+
+convert-source-map@^1.1.0, convert-source-map@^1.3.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
+
+core-js@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
+
+core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+
+cross-spawn@^4:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
+  dependencies:
+    lru-cache "^4.0.1"
+    which "^1.2.9"
+
+cryptiles@2.x.x:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  dependencies:
+    boom "2.x.x"
+
+css-tree@1.0.0-alpha16:
+  version "1.0.0-alpha16"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha16.tgz#6cb2cdff6947259dfdaf790626333a862de948b0"
+  dependencies:
+    source-map "^0.5.3"
+
+cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
+
+"cssstyle@>= 0.2.37 < 0.3.0":
+  version "0.2.37"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
+  dependencies:
+    cssom "0.3.x"
+
+d@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  dependencies:
+    es5-ext "^0.10.9"
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  dependencies:
+    assert-plus "^1.0.0"
+
+debug-log@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
+
+debug@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
+  dependencies:
+    ms "0.7.1"
+
+debug@2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
+  dependencies:
+    ms "0.7.2"
+
+debug@^2.1.1, debug@^2.2.0:
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.4.tgz#7586a9b3c39741c0282ae33445c4e8ac74734fe0"
+  dependencies:
+    ms "0.7.3"
+
+decamelize@^1.0.0, decamelize@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+
+default-require-extensions@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
+  dependencies:
+    strip-bom "^2.0.0"
+
+del@^2.0.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  dependencies:
+    globby "^5.0.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    rimraf "^2.2.8"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+
+detect-indent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  dependencies:
+    repeating "^2.0.0"
+
+diff@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
+
+doctrine@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+  dependencies:
+    esutils "^2.0.2"
+    isarray "^1.0.0"
+
+doctrine@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
+  dependencies:
+    esutils "^2.0.2"
+    isarray "^1.0.0"
+
+dom-serializer@0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+  dependencies:
+    domelementtype "~1.1.1"
+    entities "~1.1.1"
+
+domelementtype@1, domelementtype@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
+
+domelementtype@~1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+
+domhandler@^2.3.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
+  dependencies:
+    domelementtype "1"
+
+domutils@^1.5.1:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
+  dependencies:
+    jsbn "~0.1.0"
+
+electron-to-chromium@^1.2.7:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.8.tgz#b2c8a2c79bb89fbbfd3724d9555e15095b5f5fb6"
+
+entities@^1.1.1, entities@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+
+error-ex@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
+  dependencies:
+    is-arrayish "^0.2.1"
+
+es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14:
+  version "0.10.15"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.15.tgz#c330a5934c1ee21284a7c081a86e5fd937c91ea6"
+  dependencies:
+    es6-iterator "2"
+    es6-symbol "~3.1"
+
+es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
+  dependencies:
+    d "1"
+    es5-ext "^0.10.14"
+    es6-symbol "^3.1"
+
+es6-map@^0.1.3:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-set "~0.1.5"
+    es6-symbol "~3.1.1"
+    event-emitter "~0.3.5"
+
+es6-set@~0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-symbol "3.1.1"
+    event-emitter "~0.3.5"
+
+es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
+es6-weak-map@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
+  dependencies:
+    d "1"
+    es5-ext "^0.10.14"
+    es6-iterator "^2.0.1"
+    es6-symbol "^3.1.1"
+
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+escodegen@^1.6.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
+  dependencies:
+    esprima "^2.7.1"
+    estraverse "^1.9.1"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.2.0"
+
+escope@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
+  dependencies:
+    es6-map "^0.1.3"
+    es6-weak-map "^2.0.1"
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-import-resolver-node@^0.2.0:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.2.3.tgz#5add8106e8c928db2cba232bcd9efa846e3da16c"
+  dependencies:
+    debug "^2.2.0"
+    object-assign "^4.0.1"
+    resolve "^1.1.6"
+
+eslint-module-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.0.0.tgz#a6f8c21d901358759cdc35dbac1982ae1ee58bce"
+  dependencies:
+    debug "2.2.0"
+    pkg-dir "^1.0.0"
+
+eslint-plugin-html@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-3.0.0.tgz#2c982a71b9d965654f0f3a52358735821a1a4239"
+  dependencies:
+    htmlparser2 "^3.8.2"
+
+eslint-plugin-import@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.2.0.tgz#72ba306fad305d67c4816348a4699a4229ac8b4e"
+  dependencies:
+    builtin-modules "^1.1.1"
+    contains-path "^0.1.0"
+    debug "^2.2.0"
+    doctrine "1.5.0"
+    eslint-import-resolver-node "^0.2.0"
+    eslint-module-utils "^2.0.0"
+    has "^1.0.1"
+    lodash.cond "^4.3.0"
+    minimatch "^3.0.3"
+    pkg-up "^1.0.0"
+
+eslint@^3.12.2:
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
+  dependencies:
+    babel-code-frame "^6.16.0"
+    chalk "^1.1.3"
+    concat-stream "^1.5.2"
+    debug "^2.1.1"
+    doctrine "^2.0.0"
+    escope "^3.6.0"
+    espree "^3.4.0"
+    esquery "^1.0.0"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    file-entry-cache "^2.0.0"
+    glob "^7.0.3"
+    globals "^9.14.0"
+    ignore "^3.2.0"
+    imurmurhash "^0.1.4"
+    inquirer "^0.12.0"
+    is-my-json-valid "^2.10.0"
+    is-resolvable "^1.0.0"
+    js-yaml "^3.5.1"
+    json-stable-stringify "^1.0.0"
+    levn "^0.3.0"
+    lodash "^4.0.0"
+    mkdirp "^0.5.0"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.1"
+    pluralize "^1.2.1"
+    progress "^1.1.8"
+    require-uncached "^1.0.2"
+    shelljs "^0.7.5"
+    strip-bom "^3.0.0"
+    strip-json-comments "~2.0.1"
+    table "^3.7.8"
+    text-table "~0.2.0"
+    user-home "^2.0.0"
+
+espree@^3.4.0:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.2.tgz#38dbdedbedc95b8961a1fbf04734a8f6a9c8c592"
+  dependencies:
+    acorn "^5.0.1"
+    acorn-jsx "^3.0.0"
+
+esprima@^2.7.1:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+
+esprima@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
+esquery@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
+  dependencies:
+    estraverse "^4.0.0"
+
+esrecurse@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220"
+  dependencies:
+    estraverse "~4.1.0"
+    object-assign "^4.0.1"
+
+estraverse@^1.9.1:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
+
+estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+
+estraverse@~4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
+
+estree-walker@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e"
+
+estree-walker@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa"
+
+esutils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+
+event-emitter@~0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
+execSync@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/execSync/-/execSync-1.0.2.tgz#1f42eda582225180053224ecdd3fd1960fdb3139"
+  dependencies:
+    temp "~0.5.1"
+
+exit-hook@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
+
+expand-brackets@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  dependencies:
+    is-posix-bracket "^0.1.0"
+
+expand-range@^1.8.1:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  dependencies:
+    fill-range "^2.1.0"
+
+extend@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
+
+extglob@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  dependencies:
+    is-extglob "^1.0.0"
+
+extsprintf@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
+
+fast-levenshtein@~2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+
+figures@^1.3.5:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
+  dependencies:
+    escape-string-regexp "^1.0.5"
+    object-assign "^4.1.0"
+
+file-entry-cache@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
+  dependencies:
+    flat-cache "^1.2.1"
+    object-assign "^4.0.1"
+
+filename-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
+
+fill-range@^2.1.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  dependencies:
+    is-number "^2.1.0"
+    isobject "^2.0.0"
+    randomatic "^1.1.3"
+    repeat-element "^1.1.2"
+    repeat-string "^1.5.2"
+
+find-cache-dir@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
+  dependencies:
+    commondir "^1.0.1"
+    mkdirp "^0.5.1"
+    pkg-dir "^1.0.0"
+
+find-up@^1.0.0, find-up@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  dependencies:
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+flat-cache@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96"
+  dependencies:
+    circular-json "^0.3.1"
+    del "^2.0.2"
+    graceful-fs "^4.1.2"
+    write "^0.2.1"
+
+for-in@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+
+for-own@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  dependencies:
+    for-in "^1.0.1"
+
+foreground-child@^1.3.3, foreground-child@^1.5.3:
+  version "1.5.6"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-1.5.6.tgz#4fd71ad2dfde96789b980a5c0a295937cb2f5ce9"
+  dependencies:
+    cross-spawn "^4"
+    signal-exit "^3.0.0"
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+
+form-data@~2.1.1:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.12"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+function-bind@^1.0.2:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
+
+fuzzyset.js@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/fuzzyset.js/-/fuzzyset.js-0.0.1.tgz#979e22f9451b4b38f051f7937c919dbacc692958"
+
+generate-function@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
+
+generate-object-property@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+  dependencies:
+    is-property "^1.0.0"
+
+get-caller-file@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  dependencies:
+    assert-plus "^1.0.0"
+
+glob-base@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  dependencies:
+    glob-parent "^2.0.0"
+    is-glob "^2.0.0"
+
+glob-parent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  dependencies:
+    is-glob "^2.0.0"
+
+glob@7.1.1, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.2"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globals@^9.0.0, globals@^9.14.0:
+  version "9.17.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286"
+
+globby@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  dependencies:
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.2:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+
+graceful-fs@~1:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364"
+
+"graceful-readlink@>= 1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+
+growl@1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
+
+handlebars@^4.0.3:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.6.tgz#2ce4484850537f9c97a8026d5399b935c4ed4ed7"
+  dependencies:
+    async "^1.4.0"
+    optimist "^0.6.1"
+    source-map "^0.4.4"
+  optionalDependencies:
+    uglify-js "^2.6"
+
+har-schema@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+
+har-validator@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
+  dependencies:
+    ajv "^4.9.1"
+    har-schema "^1.0.5"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+
+has@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+  dependencies:
+    function-bind "^1.0.2"
+
+hawk@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  dependencies:
+    boom "2.x.x"
+    cryptiles "2.x.x"
+    hoek "2.x.x"
+    sntp "1.x.x"
+
+hoek@2.x.x:
+  version "2.16.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+
+home-or-tmp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.1"
+
+hosted-git-info@^2.1.4:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
+
+html-encoding-sniffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz#79bf7a785ea495fe66165e734153f363ff5437da"
+  dependencies:
+    whatwg-encoding "^1.0.1"
+
+htmlparser2@^3.8.2:
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
+  dependencies:
+    domelementtype "^1.3.0"
+    domhandler "^2.3.0"
+    domutils "^1.5.1"
+    entities "^1.1.1"
+    inherits "^2.0.1"
+    readable-stream "^2.0.2"
+
+http-signature@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  dependencies:
+    assert-plus "^0.2.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+iconv-lite@0.4.13:
+  version "0.4.13"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
+
+ignore@^3.2.0:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.7.tgz#4810ca5f1d8eca5595213a34b94f2eb4ed926bbd"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+inquirer@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
+  dependencies:
+    ansi-escapes "^1.1.0"
+    ansi-regex "^2.0.0"
+    chalk "^1.0.0"
+    cli-cursor "^1.0.1"
+    cli-width "^2.0.0"
+    figures "^1.3.5"
+    lodash "^4.3.0"
+    readline2 "^1.0.1"
+    run-async "^0.1.0"
+    rx-lite "^3.1.2"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.0"
+    through "^2.3.6"
+
+interpret@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
+
+invariant@^2.2.0, invariant@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+  dependencies:
+    loose-envify "^1.0.0"
+
+invert-kv@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+
+is-buffer@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
+
+is-builtin-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  dependencies:
+    builtin-modules "^1.0.0"
+
+is-dotfile@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d"
+
+is-equal-shallow@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  dependencies:
+    is-primitive "^2.0.0"
+
+is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+
+is-extglob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+
+is-finite@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+
+is-glob@^2.0.0, is-glob@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  dependencies:
+    is-extglob "^1.0.0"
+
+is-my-json-valid@^2.10.0:
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
+  dependencies:
+    generate-function "^2.0.0"
+    generate-object-property "^1.1.0"
+    jsonpointer "^4.0.0"
+    xtend "^4.0.0"
+
+is-number@^2.0.2, is-number@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-path-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+
+is-path-in-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
+  dependencies:
+    is-path-inside "^1.0.0"
+
+is-path-inside@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f"
+  dependencies:
+    path-is-inside "^1.0.1"
+
+is-posix-bracket@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+
+is-primitive@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+
+is-property@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+
+is-resolvable@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.0.tgz#8df57c61ea2e3c501408d100fb013cf8d6e0cc62"
+  dependencies:
+    tryit "^1.0.1"
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+
+is-utf8@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  dependencies:
+    isarray "1.0.0"
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+
+istanbul-lib-coverage@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.2.tgz#87a0c015b6910651cb3b184814dfb339337e25e1"
+
+istanbul-lib-hook@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.5.tgz#6ca3d16d60c5f4082da39f7c5cd38ea8a772b88e"
+  dependencies:
+    append-transform "^0.4.0"
+
+istanbul-lib-instrument@^1.4.2, istanbul-lib-instrument@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.0.tgz#b8e0dc25709bb44e17336ab47b7bb5c97c23f659"
+  dependencies:
+    babel-generator "^6.18.0"
+    babel-template "^6.16.0"
+    babel-traverse "^6.18.0"
+    babel-types "^6.18.0"
+    babylon "^6.13.0"
+    istanbul-lib-coverage "^1.0.2"
+    semver "^5.3.0"
+
+istanbul-lib-report@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0.tgz#d83dac7f26566b521585569367fe84ccfc7aaecb"
+  dependencies:
+    istanbul-lib-coverage "^1.0.2"
+    mkdirp "^0.5.1"
+    path-parse "^1.0.5"
+    supports-color "^3.1.2"
+
+istanbul-lib-source-maps@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.1.1.tgz#f8c8c2e8f2160d1d91526d97e5bd63b2079af71c"
+  dependencies:
+    istanbul-lib-coverage "^1.0.2"
+    mkdirp "^0.5.1"
+    rimraf "^2.4.4"
+    source-map "^0.5.3"
+
+istanbul-reports@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.2.tgz#4e8366abe6fa746cc1cd6633f108de12cc6ac6fa"
+  dependencies:
+    handlebars "^4.0.3"
+
+jodid25519@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967"
+  dependencies:
+    jsbn "~0.1.0"
+
+js-tokens@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
+
+js-yaml@^3.5.1:
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.3.tgz#33a05ec481c850c8875929166fe1beb61c728766"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^3.1.1"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+
+jsdom@^9.9.1:
+  version "9.12.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4"
+  dependencies:
+    abab "^1.0.3"
+    acorn "^4.0.4"
+    acorn-globals "^3.1.0"
+    array-equal "^1.0.0"
+    content-type-parser "^1.0.1"
+    cssom ">= 0.3.2 < 0.4.0"
+    cssstyle ">= 0.2.37 < 0.3.0"
+    escodegen "^1.6.1"
+    html-encoding-sniffer "^1.0.1"
+    nwmatcher ">= 1.3.9 < 2.0.0"
+    parse5 "^1.5.1"
+    request "^2.79.0"
+    sax "^1.2.1"
+    symbol-tree "^3.2.1"
+    tough-cookie "^2.3.2"
+    webidl-conversions "^4.0.0"
+    whatwg-encoding "^1.0.1"
+    whatwg-url "^4.3.0"
+    xml-name-validator "^2.0.1"
+
+jsesc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+
+jsesc@~0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+
+json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  dependencies:
+    jsonify "~0.0.0"
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+
+json3@3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+
+json5@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+
+jsonify@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+
+jsonpointer@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+
+jsprim@^1.2.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.0.2"
+    json-schema "0.2.3"
+    verror "1.3.6"
+
+kind-of@^3.0.2:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.0.tgz#b58abe4d5c044ad33726a8c1525b48cf891bff07"
+  dependencies:
+    is-buffer "^1.1.5"
+
+lazy-cache@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+
+lcid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  dependencies:
+    invert-kv "^1.0.0"
+
+levn@^0.3.0, levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+load-json-file@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    strip-bom "^2.0.0"
+
+locate-character@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/locate-character/-/locate-character-2.0.0.tgz#8eb94df3a899e53c8d4cee6d13c9effb76213699"
+
+lodash._baseassign@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
+  dependencies:
+    lodash._basecopy "^3.0.0"
+    lodash.keys "^3.0.0"
+
+lodash._basecopy@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
+
+lodash._basecreate@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821"
+
+lodash._getnative@^3.0.0:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+
+lodash._isiterateecall@^3.0.0:
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
+
+lodash.cond@^4.3.0:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
+
+lodash.create@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7"
+  dependencies:
+    lodash._baseassign "^3.0.0"
+    lodash._basecreate "^3.0.0"
+    lodash._isiterateecall "^3.0.0"
+
+lodash.isarguments@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+
+lodash.isarray@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+
+lodash.keys@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
+  dependencies:
+    lodash._getnative "^3.0.0"
+    lodash.isarguments "^3.0.0"
+    lodash.isarray "^3.0.0"
+
+lodash@^4.0.0, lodash@^4.13.1, lodash@^4.2.0, lodash@^4.3.0:
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+
+longest@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+
+loose-envify@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  dependencies:
+    js-tokens "^3.0.0"
+
+lru-cache@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
+  dependencies:
+    pseudomap "^1.0.1"
+    yallist "^2.0.0"
+
+magic-string@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.14.0.tgz#57224aef1701caeed273b17a39a956e72b172462"
+  dependencies:
+    vlq "^0.2.1"
+
+magic-string@^0.19.0, magic-string@~0.19.0:
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.19.0.tgz#198948217254e3e0b93080e01146b7c73b2a06b2"
+  dependencies:
+    vlq "^0.2.1"
+
+magic-string@^0.21.1:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.21.3.tgz#87e201009ebfde6f46dc5757305a70af71e31624"
+  dependencies:
+    vlq "^0.2.1"
+
+md5-hex@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4"
+  dependencies:
+    md5-o-matic "^0.1.1"
+
+md5-o-matic@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/md5-o-matic/-/md5-o-matic-0.1.1.tgz#822bccd65e117c514fab176b25945d54100a03c3"
+
+merge-source-map@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.3.tgz#da1415f2722a5119db07b14c4f973410863a2abf"
+  dependencies:
+    source-map "^0.5.3"
+
+micromatch@^2.3.11:
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  dependencies:
+    arr-diff "^2.0.0"
+    array-unique "^0.2.1"
+    braces "^1.8.2"
+    expand-brackets "^0.1.4"
+    extglob "^0.3.1"
+    filename-regex "^2.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.1"
+    kind-of "^3.0.2"
+    normalize-path "^2.0.1"
+    object.omit "^2.0.0"
+    parse-glob "^3.0.4"
+    regex-cache "^0.4.2"
+
+mime-db@~1.27.0:
+  version "1.27.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
+
+mime-types@^2.1.12, mime-types@~2.1.7:
+  version "2.1.15"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
+  dependencies:
+    mime-db "~1.27.0"
+
+minimatch@^3.0.2, minimatch@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
+  dependencies:
+    brace-expansion "^1.0.0"
+
+minimist@0.0.8, minimist@~0.0.1:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+minimist@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
+mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
+mocha@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.3.0.tgz#d29b7428d3f52c82e2e65df1ecb7064e1aabbfb5"
+  dependencies:
+    browser-stdout "1.3.0"
+    commander "2.9.0"
+    debug "2.6.0"
+    diff "3.2.0"
+    escape-string-regexp "1.0.5"
+    glob "7.1.1"
+    growl "1.9.2"
+    json3 "3.3.2"
+    lodash.create "3.1.1"
+    mkdirp "0.5.1"
+    supports-color "3.1.2"
+
+ms@0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
+
+ms@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
+
+ms@0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
+
+mute-stream@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+
+node-resolve@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/node-resolve/-/node-resolve-1.3.3.tgz#74c7f5d3373e4bb2f60182e3a96dde0f8aacb0ce"
+  dependencies:
+    is-builtin-module "^1.0.0"
+    lodash "^4.13.1"
+
+normalize-package-data@^2.3.2:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
+  dependencies:
+    hosted-git-info "^2.1.4"
+    is-builtin-module "^1.0.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-path@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+
+"nwmatcher@>= 1.3.9 < 2.0.0":
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.3.9.tgz#8bab486ff7fa3dfd086656bbe8b17116d3692d2a"
+
+nyc@^10.0.0:
+  version "10.2.2"
+  resolved "https://registry.yarnpkg.com/nyc/-/nyc-10.2.2.tgz#1b1c8ca4636d810cb3e281558dc9fcb08389f204"
+  dependencies:
+    archy "^1.0.0"
+    arrify "^1.0.1"
+    caching-transform "^1.0.0"
+    convert-source-map "^1.3.0"
+    debug-log "^1.0.1"
+    default-require-extensions "^1.0.0"
+    find-cache-dir "^0.1.1"
+    find-up "^1.1.2"
+    foreground-child "^1.5.3"
+    glob "^7.0.6"
+    istanbul-lib-coverage "^1.0.2"
+    istanbul-lib-hook "^1.0.5"
+    istanbul-lib-instrument "^1.7.0"
+    istanbul-lib-report "^1.0.0"
+    istanbul-lib-source-maps "^1.1.1"
+    istanbul-reports "^1.0.2"
+    md5-hex "^1.2.0"
+    merge-source-map "^1.0.2"
+    micromatch "^2.3.11"
+    mkdirp "^0.5.0"
+    resolve-from "^2.0.0"
+    rimraf "^2.5.4"
+    signal-exit "^3.0.1"
+    spawn-wrap "1.2.4"
+    test-exclude "^4.0.0"
+    yargs "^7.0.2"
+    yargs-parser "^4.0.2"
+
+oauth-sign@~0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+
+object-assign@^4.0.1, object-assign@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+object.omit@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  dependencies:
+    for-own "^0.1.4"
+    is-extendable "^0.1.1"
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+onetime@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+
+optimist@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  dependencies:
+    minimist "~0.0.1"
+    wordwrap "~0.0.2"
+
+optionator@^0.8.1, optionator@^0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.4"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    wordwrap "~1.0.0"
+
+os-homedir@^1.0.0, os-homedir@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+
+os-locale@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  dependencies:
+    lcid "^1.0.0"
+
+os-tmpdir@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+
+parse-glob@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  dependencies:
+    glob-base "^0.3.0"
+    is-dotfile "^1.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.0"
+
+parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  dependencies:
+    error-ex "^1.2.0"
+
+parse5@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
+
+path-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  dependencies:
+    pinkie-promise "^2.0.0"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+path-is-inside@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+
+path-parse@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+
+path-type@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  dependencies:
+    graceful-fs "^4.1.2"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+performance-now@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+
+pify@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+
+pkg-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
+  dependencies:
+    find-up "^1.0.0"
+
+pkg-up@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-1.0.0.tgz#3e08fb461525c4421624a33b9f7e6d0af5b05a26"
+  dependencies:
+    find-up "^1.0.0"
+
+pluralize@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+
+preserve@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+
+prettier@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.4.1.tgz#3526cc46aea102e980db5b70cabe2020910ef142"
+
+private@^0.1.6:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
+
+process-nextick-args@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+
+progress@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
+
+pseudomap@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+
+punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
+qs@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+
+randomatic@^1.1.3:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
+  dependencies:
+    is-number "^2.0.2"
+    kind-of "^3.0.2"
+
+read-pkg-up@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  dependencies:
+    find-up "^1.0.0"
+    read-pkg "^1.0.0"
+
+read-pkg@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  dependencies:
+    load-json-file "^1.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^1.0.0"
+
+readable-stream@^2.0.2, readable-stream@^2.2.2:
+  version "2.2.9"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
+  dependencies:
+    buffer-shims "~1.0.0"
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    string_decoder "~1.0.0"
+    util-deprecate "~1.0.1"
+
+readline2@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    mute-stream "0.0.5"
+
+rechoir@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  dependencies:
+    resolve "^1.1.6"
+
+regenerate@^1.2.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
+
+regenerator-runtime@^0.10.0:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.4.tgz#74cb6598d3ba2eb18694e968a40e2b3b4df9cf93"
+
+regenerator-transform@0.9.11:
+  version "0.9.11"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.11.tgz#3a7d067520cb7b7176769eb5ff868691befe1283"
+  dependencies:
+    babel-runtime "^6.18.0"
+    babel-types "^6.19.0"
+    private "^0.1.6"
+
+regex-cache@^0.4.2:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
+  dependencies:
+    is-equal-shallow "^0.1.3"
+    is-primitive "^2.0.0"
+
+regexpu-core@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
+regjsgen@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+
+regjsparser@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  dependencies:
+    jsesc "~0.5.0"
+
+reify@^0.4.4:
+  version "0.4.16"
+  resolved "https://registry.yarnpkg.com/reify/-/reify-0.4.16.tgz#d852914a692beced4d32bc0549d9d13a8d466a77"
+  dependencies:
+    acorn "~4.0.5"
+    acorn-es7-plugin "~1.1.0"
+    ast-types "^0.9.5"
+    magic-string "~0.19.0"
+
+remove-trailing-separator@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
+
+repeat-element@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
+
+repeat-string@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+
+repeating@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  dependencies:
+    is-finite "^1.0.0"
+
+request@>=2.42.0, request@^2.79.0:
+  version "2.81.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~4.2.1"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    oauth-sign "~0.8.1"
+    performance-now "^0.2.0"
+    qs "~6.4.0"
+    safe-buffer "^5.0.1"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.0.0"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+
+require-relative@0.8.7:
+  version "0.8.7"
+  resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
+
+require-uncached@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+  dependencies:
+    caller-path "^0.1.0"
+    resolve-from "^1.0.0"
+
+resolve-from@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
+
+resolve-from@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
+
+resolve@1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+
+resolve@^1.1.6, resolve@^1.1.7:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
+  dependencies:
+    path-parse "^1.0.5"
+
+restore-cursor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
+  dependencies:
+    exit-hook "^1.0.0"
+    onetime "^1.0.0"
+
+right-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  dependencies:
+    align-text "^0.1.1"
+
+rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.4, rimraf@^2.5.4:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
+  dependencies:
+    glob "^7.0.5"
+
+rimraf@~2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.1.4.tgz#5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2"
+  optionalDependencies:
+    graceful-fs "~1"
+
+rollup-plugin-buble@^0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-buble/-/rollup-plugin-buble-0.15.0.tgz#83c3e89c7fd2266c7918f41ba3980313519c7fd0"
+  dependencies:
+    buble "^0.15.0"
+    rollup-pluginutils "^1.5.0"
+
+rollup-plugin-commonjs@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-7.1.0.tgz#c3a772c2e4a5fa13507f5c578b66cc13b0cb8a79"
+  dependencies:
+    acorn "^4.0.1"
+    estree-walker "^0.3.0"
+    magic-string "^0.19.0"
+    resolve "^1.1.7"
+    rollup-pluginutils "^2.0.1"
+
+rollup-plugin-json@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-2.1.1.tgz#933390dff3c9e3e654157d61304c5e167fc58623"
+  dependencies:
+    rollup-pluginutils "^1.5.2"
+
+rollup-plugin-node-resolve@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-2.1.1.tgz#cbb783b0d15b02794d58915350b2f0d902b8ddc8"
+  dependencies:
+    browser-resolve "^1.11.0"
+    builtin-modules "^1.1.0"
+    resolve "^1.1.6"
+
+rollup-plugin-typescript@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-typescript/-/rollup-plugin-typescript-0.8.1.tgz#2ff7eecc21cf6bb2b43fc27e5b688952ce71924a"
+  dependencies:
+    compare-versions "2.0.1"
+    object-assign "^4.0.1"
+    rollup-pluginutils "^1.3.1"
+    tippex "^2.1.1"
+    typescript "^1.8.9"
+
+rollup-pluginutils@^1.3.1, rollup-pluginutils@^1.5.0, rollup-pluginutils@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408"
+  dependencies:
+    estree-walker "^0.2.1"
+    minimatch "^3.0.2"
+
+rollup-pluginutils@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz#7ec95b3573f6543a46a6461bd9a7c544525d0fc0"
+  dependencies:
+    estree-walker "^0.3.0"
+    micromatch "^2.3.11"
+
+rollup-watch@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/rollup-watch/-/rollup-watch-3.2.2.tgz#5e574232e9ef36da9177f46946d8080cb267354b"
+  dependencies:
+    require-relative "0.8.7"
+
+rollup@^0.43.0:
+  version "0.43.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.43.0.tgz#b36bdb75fa5e0823b6de8aee18ff7b5655520543"
+  dependencies:
+    source-map-support "^0.4.0"
+
+run-async@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
+  dependencies:
+    once "^1.3.0"
+
+rx-lite@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
+
+safe-buffer@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
+
+sax@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
+
+"semver@2 || 3 || 4 || 5", semver@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+
+shelljs@^0.7.5:
+  version "0.7.7"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
+
+signal-exit@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-2.1.2.tgz#375879b1f92ebc3b334480d038dc546a6d558564"
+
+signal-exit@^3.0.0, signal-exit@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+
+slice-ansi@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
+
+slide@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+
+sntp@1.x.x:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  dependencies:
+    hoek "2.x.x"
+
+source-map-support@^0.4.0, source-map-support@^0.4.2, source-map-support@^0.4.8:
+  version "0.4.14"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.14.tgz#9d4463772598b86271b4f523f6c1f4e02a7d6aef"
+  dependencies:
+    source-map "^0.5.6"
+
+source-map@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+
+source-map@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
+  dependencies:
+    amdefine ">=0.0.4"
+
+spawn-wrap@1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.2.4.tgz#920eb211a769c093eebfbd5b0e7a5d2e68ab2e40"
+  dependencies:
+    foreground-child "^1.3.3"
+    mkdirp "^0.5.0"
+    os-homedir "^1.0.1"
+    rimraf "^2.3.3"
+    signal-exit "^2.0.0"
+    which "^1.2.4"
+
+spdx-correct@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+  dependencies:
+    spdx-license-ids "^1.0.2"
+
+spdx-expression-parse@~1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+
+spdx-license-ids@^1.0.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+
+sshpk@^1.7.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.0.tgz#ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    dashdash "^1.12.0"
+    getpass "^0.1.1"
+  optionalDependencies:
+    bcrypt-pbkdf "^1.0.0"
+    ecc-jsbn "~0.1.1"
+    jodid25519 "^1.0.0"
+    jsbn "~0.1.0"
+    tweetnacl "~0.14.0"
+
+string-width@^1.0.1, string-width@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+string-width@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.0.0.tgz#635c5436cc72a6e0c387ceca278d4e2eec52687e"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^3.0.0"
+
+string_decoder@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667"
+  dependencies:
+    buffer-shims "~1.0.0"
+
+stringstream@~0.0.4:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-bom@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  dependencies:
+    is-utf8 "^0.2.0"
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+
+supports-color@3.1.2, supports-color@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
+  dependencies:
+    has-flag "^1.0.0"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+
+symbol-tree@^3.2.1:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+
+table@^3.7.8:
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
+  dependencies:
+    ajv "^4.7.0"
+    ajv-keywords "^1.0.0"
+    chalk "^1.1.1"
+    lodash "^4.0.0"
+    slice-ansi "0.0.4"
+    string-width "^2.0.0"
+
+temp@~0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.5.1.tgz#77ab19c79aa7b593cbe4fac2441768cad987b8df"
+  dependencies:
+    rimraf "~2.1.4"
+
+test-exclude@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-3.3.0.tgz#7a17ca1239988c98367b0621456dbb7d4bc38977"
+  dependencies:
+    arrify "^1.0.1"
+    micromatch "^2.3.11"
+    object-assign "^4.1.0"
+    read-pkg-up "^1.0.1"
+    require-main-filename "^1.0.1"
+
+test-exclude@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.0.3.tgz#86a13ce3effcc60e6c90403cf31a27a60ac6c4e7"
+  dependencies:
+    arrify "^1.0.1"
+    micromatch "^2.3.11"
+    object-assign "^4.1.0"
+    read-pkg-up "^1.0.1"
+    require-main-filename "^1.0.1"
+
+text-table@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
+tippex@^2.1.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/tippex/-/tippex-2.3.1.tgz#a2fd5b7087d7cbfb20c9806a6c16108c2c0fafda"
+
+to-fast-properties@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320"
+
+tough-cookie@^2.3.2, tough-cookie@~2.3.0:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
+  dependencies:
+    punycode "^1.4.1"
+
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+
+trim-right@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+
+tryit@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  dependencies:
+    prelude-ls "~1.1.2"
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+
+typescript@^1.8.9:
+  version "1.8.10"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-1.8.10.tgz#b475d6e0dff0bf50f296e5ca6ef9fbb5c7320f1e"
+
+typescript@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.2.tgz#f0f045e196f69a72f06b25fd3bd39d01c3ce9984"
+
+uglify-js@^2.6:
+  version "2.8.22"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.22.tgz#d54934778a8da14903fa29a326fb24c0ab51a1a0"
+  dependencies:
+    source-map "~0.5.1"
+    yargs "~3.10.0"
+  optionalDependencies:
+    uglify-to-browserify "~1.0.0"
+
+uglify-to-browserify@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+
+urlgrey@>=0.4.0:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/urlgrey/-/urlgrey-0.4.4.tgz#892fe95960805e85519f1cd4389f2cb4cbb7652f"
+
+user-home@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
+  dependencies:
+    os-homedir "^1.0.0"
+
+util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+
+uuid@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  dependencies:
+    spdx-correct "~1.0.0"
+    spdx-expression-parse "~1.0.0"
+
+verror@1.3.6:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"
+  dependencies:
+    extsprintf "1.0.2"
+
+vlq@^0.2.1:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.2.tgz#e316d5257b40b86bb43cb8d5fea5d7f54d6b0ca1"
+
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+
+webidl-conversions@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
+
+whatwg-encoding@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz#3c6c451a198ee7aec55b1ec61d0920c67801a5f4"
+  dependencies:
+    iconv-lite "0.4.13"
+
+whatwg-url@^4.3.0:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.7.1.tgz#df4dc2e3f25a63b1fa5b32ed6d6c139577d690de"
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
+which-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+
+which@^1.2.4, which@^1.2.9:
+  version "1.2.14"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
+  dependencies:
+    isexe "^2.0.0"
+
+window-size@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+
+wordwrap@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+
+wordwrap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
+write-file-atomic@^1.1.4:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.3.tgz#831dd22d491bdc135180bb996a0eb3f8bf587791"
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    slide "^1.1.5"
+
+write@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
+  dependencies:
+    mkdirp "^0.5.1"
+
+xml-name-validator@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
+
+xtend@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+
+y18n@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+
+yallist@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+
+yargs-parser@^4.0.2:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
+  dependencies:
+    camelcase "^3.0.0"
+
+yargs-parser@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+  dependencies:
+    camelcase "^3.0.0"
+
+yargs@^7.0.2:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
+  dependencies:
+    camelcase "^3.0.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.2"
+    which-module "^1.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^5.0.0"
+
+yargs@~3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  dependencies:
+    camelcase "^1.0.2"
+    cliui "^2.1.0"
+    decamelize "^1.0.0"
+    window-size "0.1.0"