From eebd47d02b504ce34ca440ca00ad3aea70451344 Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sun, 8 Apr 2018 11:25:02 -0700
Subject: [PATCH 01/15] add v2 parser tests, handle single curly tags

---
 src/interfaces.ts                             |   2 +
 src/parse/index.ts                            |   4 +
 src/parse/state/fragment.ts                   |   2 +-
 src/parse/state/mustache.ts                   |   4 +-
 src/parse/state/text.ts                       |   2 +-
 test/parser/index.js                          |  22 ++-
 .../samples/action-with-call/_actual-v2.json  |  47 +++++
 .../samples/action-with-call/input-v2.html    |   1 +
 .../samples/action-with-call/output-v2.json   |  47 +++++
 .../action-with-identifier/_actual-v2.json    |  33 ++++
 .../action-with-identifier/input-v2.html      |   1 +
 .../action-with-identifier/output-v2.json     |  33 ++++
 .../action-with-literal/_actual-v2.json       |  34 ++++
 .../samples/action-with-literal/input-v2.html |   1 +
 .../action-with-literal/output-v2.json        |  34 ++++
 test/parser/samples/action/_actual-v2.json    |  28 +++
 test/parser/samples/action/input-v2.html      |   1 +
 test/parser/samples/action/output-v2.json     |  28 +++
 .../attribute-dynamic-boolean/_actual-v2.json |  35 ++++
 .../attribute-dynamic-boolean/input-v2.html   |   1 +
 .../attribute-dynamic-boolean/output-v2.json  |  40 ++++
 .../_actual-v2.json                           |  35 ++++
 .../attribute-dynamic-reserved/input-v2.html  |   1 +
 .../attribute-dynamic-reserved/output-v2.json |  40 ++++
 .../samples/attribute-dynamic/_actual-v2.json |  42 ++++
 .../samples/attribute-dynamic/input-v2.html   |   1 +
 .../samples/attribute-dynamic/output-v2.json  |  64 ++++++
 .../samples/attribute-escaped/_actual-v2.json |  35 ++++
 .../samples/attribute-escaped/input-v2.html   |   1 +
 .../samples/attribute-escaped/output-v2.json  |  35 ++++
 .../attribute-multiple/_actual-v2.json        |  49 +++++
 .../samples/attribute-multiple/input-v2.html  |   1 +
 .../samples/attribute-multiple/output-v2.json |  49 +++++
 .../attribute-shorthand/_actual-v2.json       |  40 ++++
 .../samples/attribute-shorthand/input-v2.html |   1 +
 .../attribute-shorthand/output-v2.json        |  40 ++++
 .../attribute-static-boolean/_actual-v2.json  |  28 +++
 .../attribute-static-boolean/input-v2.html    |   1 +
 .../attribute-static-boolean/output-v2.json   |  28 +++
 .../samples/attribute-static/_actual-v2.json  |  35 ++++
 .../samples/attribute-static/input-v2.html    |   1 +
 .../samples/attribute-static/output-v2.json   |  35 ++++
 .../attribute-unique-error/input-v2.html      |   1 +
 .../attribute-unquoted/_actual-v2.json        |  35 ++++
 .../samples/attribute-unquoted/input-v2.html  |   1 +
 .../samples/attribute-unquoted/output-v2.json |  35 ++++
 .../samples/await-then-catch/_actual-v2.json  |  81 ++++++++
 .../samples/await-then-catch/input-v2.html    |   7 +
 .../samples/await-then-catch/output-v2.json   | 161 ++++++++++++++++
 .../samples/binding-shorthand/_actual-v2.json |  33 ++++
 .../samples/binding-shorthand/input-v2.html   |   1 +
 .../samples/binding-shorthand/output-v2.json  |  33 ++++
 test/parser/samples/binding/_actual-v2.json   |  33 ++++
 test/parser/samples/binding/input-v2.html     |   1 +
 test/parser/samples/binding/output-v2.json    |  33 ++++
 test/parser/samples/comment/_actual-v2.json   |  18 ++
 test/parser/samples/comment/input-v2.html     |   1 +
 test/parser/samples/comment/output-v2.json    |  18 ++
 .../samples/component-dynamic/_actual-v2.json |  68 +++++++
 .../samples/component-dynamic/input-v2.html   |   1 +
 .../samples/component-dynamic/output-v2.json  |  43 +++++
 .../_actual-v2.json                           |  27 +++
 .../convert-entities-in-element/input-v2.html |   1 +
 .../output-v2.json                            |  27 +++
 .../samples/convert-entities/_actual-v2.json  |  18 ++
 .../samples/convert-entities/input-v2.html    |   1 +
 .../samples/convert-entities/output-v2.json   |  18 ++
 .../samples/css-ref-selector/_actual-v2.json  |  96 +++++++++
 .../samples/css-ref-selector/input-v2.html    |   7 +
 .../samples/css-ref-selector/output-v2.json   |  96 +++++++++
 test/parser/samples/css/_actual-v2.json       |  96 +++++++++
 test/parser/samples/css/input-v2.html         |   7 +
 test/parser/samples/css/output-v2.json        |  96 +++++++++
 .../samples/dynamic-import/_actual-v2.json    | 182 ++++++++++++++++++
 .../samples/dynamic-import/input-v2.html      |   9 +
 .../samples/dynamic-import/output-v2.json     | 182 ++++++++++++++++++
 .../each-block-destructured/_actual-v2.json   |  39 ++++
 .../each-block-destructured/input-v2.html     |   3 +
 .../each-block-destructured/output-v2.json    |  67 +++++++
 .../samples/each-block-else/_actual-v2.json   |  60 ++++++
 .../samples/each-block-else/input-v2.html     |   5 +
 .../samples/each-block-else/output-v2.json    |  68 +++++++
 .../each-block-indexed/_actual-v2.json        |  39 ++++
 .../samples/each-block-indexed/input-v2.html  |   3 +
 .../samples/each-block-indexed/output-v2.json |  64 ++++++
 .../samples/each-block-keyed/_actual-v2.json  |  39 ++++
 .../samples/each-block-keyed/input-v2.html    |   3 +
 .../samples/each-block-keyed/output-v2.json   |  47 +++++
 .../parser/samples/each-block/_actual-v2.json |  39 ++++
 test/parser/samples/each-block/input-v2.html  |   3 +
 test/parser/samples/each-block/output-v2.json |  46 +++++
 .../element-with-mustache/_actual-v2.json     |  44 +++++
 .../element-with-mustache/input-v2.html       |   1 +
 .../element-with-mustache/output-v2.json      |  44 +++++
 .../samples/element-with-text/_actual-v2.json |  27 +++
 .../samples/element-with-text/input-v2.html   |   1 +
 .../samples/element-with-text/output-v2.json  |  27 +++
 test/parser/samples/elements/_actual-v2.json  |  28 +++
 test/parser/samples/elements/input-v2.html    |   1 +
 test/parser/samples/elements/output-v2.json   |  28 +++
 .../error-binding-disabled/input-v2.html      |   1 +
 .../error-binding-mustaches/input-v2.html     |   1 +
 .../error-binding-rvalue/input-v2.html        |   1 +
 .../error-comment-unclosed/input-v2.html      |   1 +
 test/parser/samples/error-css/input-v2.html   |   3 +
 .../samples/error-event-handler/input-v2.html |   1 +
 .../error-illegal-expression/input-v2.html    |   1 +
 .../error-multiple-styles/input-v2.html       |  13 ++
 .../samples/error-ref-value/input-v2.html     |   1 +
 .../error-script-unclosed/input-v2.html       |   3 +
 .../error-self-reference/input-v2.html        |   1 +
 .../input-v2.html                             |   1 +
 .../input-v2.html                             |   1 +
 .../input-v2.html                             |   2 +
 .../input-v2.html                             |   1 +
 .../error-unmatched-closing-tag/input-v2.html |   1 +
 .../samples/error-void-closing/input-v2.html  |   1 +
 .../error-window-children/input-v2.html       |   1 +
 .../error-window-duplicate/input-v2.html      |   2 +
 .../error-window-inside-block/input-v2.html   |   3 +
 .../error-window-inside-element/input-v2.html |   3 +
 .../error-window-inside-element/input.html    |   2 +-
 .../samples/event-handler/_actual-v2.json     | 109 +++++++++++
 .../samples/event-handler/input-v2.html       |   5 +
 .../samples/event-handler/output-v2.json      | 116 +++++++++++
 .../samples/if-block-else/_actual-v2.json     |  60 ++++++
 .../samples/if-block-else/input-v2.html       |   5 +
 .../samples/if-block-else/output-v2.json      |  62 ++++++
 .../samples/if-block-elseif/input-v2.html     |   5 +
 test/parser/samples/if-block/_actual-v2.json  |  18 ++
 test/parser/samples/if-block/input-v2.html    |   1 +
 test/parser/samples/if-block/output-v2.json   |  31 +++
 .../implicitly-closed-li/_actual-v2.json      |  72 +++++++
 .../implicitly-closed-li/input-v2.html        |   5 +
 .../implicitly-closed-li/output-v2.json       |  72 +++++++
 test/parser/samples/nbsp/_actual-v2.json      |  27 +++
 test/parser/samples/nbsp/input-v2.html        |   1 +
 test/parser/samples/nbsp/output-v2.json       |  27 +++
 .../samples/raw-mustaches/_actual-v2.json     |  27 +++
 .../samples/raw-mustaches/input-v2.html       |   1 +
 .../samples/raw-mustaches/output-v2.json      |  61 ++++++
 test/parser/samples/refs/_actual-v2.json      |  27 +++
 test/parser/samples/refs/input-v2.html        |   1 +
 test/parser/samples/refs/output-v2.json       |  27 +++
 .../script-comment-only/_actual-v2.json       |  26 +++
 .../samples/script-comment-only/input-v2.html |   5 +
 .../script-comment-only/output-v2.json        |  26 +++
 .../_actual-v2.json                           | 111 +++++++++++
 .../input-v2.html                             |  13 ++
 .../output-v2.json                            | 128 ++++++++++++
 .../script-comment-trailing/_actual-v2.json   | 111 +++++++++++
 .../script-comment-trailing/input-v2.html     |  11 ++
 .../script-comment-trailing/output-v2.json    | 128 ++++++++++++
 test/parser/samples/script/_actual-v2.json    | 111 +++++++++++
 test/parser/samples/script/input-v2.html      |   9 +
 test/parser/samples/script/output-v2.json     | 128 ++++++++++++
 .../self-closing-element/_actual-v2.json      |  20 ++
 .../self-closing-element/input-v2.html        |   1 +
 .../self-closing-element/output-v2.json       |  20 ++
 .../samples/self-reference/_actual-v2.json    |  47 +++++
 .../samples/self-reference/input-v2.html      |   3 +
 .../samples/self-reference/output-v2.json     |  79 ++++++++
 .../space-between-mustaches/_actual-v2.json   |  27 +++
 .../space-between-mustaches/input-v2.html     |   1 +
 .../space-between-mustaches/output-v2.json    |  78 ++++++++
 test/parser/samples/spread/_actual-v2.json    |  28 +++
 test/parser/samples/spread/input-v2.html      |   1 +
 test/parser/samples/spread/output-v2.json     |  32 +++
 .../samples/textarea-children/_actual-v2.json |  27 +++
 .../samples/textarea-children/input-v2.html   |   3 +
 .../samples/textarea-children/output-v2.json  |  44 +++++
 .../_actual-v2.json                           |  37 ++++
 .../transition-intro-no-params/input-v2.html  |   1 +
 .../transition-intro-no-params/output-v2.json |  37 ++++
 .../samples/transition-intro/_actual-v2.json  |  65 +++++++
 .../samples/transition-intro/input-v2.html    |   1 +
 .../samples/transition-intro/output-v2.json   |  65 +++++++
 .../unusual-identifier/_actual-v2.json        |  39 ++++
 .../samples/unusual-identifier/input-v2.html  |   3 +
 .../samples/unusual-identifier/output-v2.json |  46 +++++
 .../_actual-v2.json                           |  33 ++++
 .../whitespace-leading-trailing/input-v2.html |   3 +
 .../output-v2.json                            |  33 ++++
 .../samples/whitespace-normal/_actual-v2.json |  57 ++++++
 .../samples/whitespace-normal/input-v2.html   |   1 +
 .../samples/whitespace-normal/output-v2.json  |  68 +++++++
 test/parser/samples/yield/_actual-v2.json     |  20 ++
 test/parser/samples/yield/input-v2.html       |   1 +
 test/parser/samples/yield/output-v2.json      |  20 ++
 189 files changed, 5701 insertions(+), 7 deletions(-)
 create mode 100644 test/parser/samples/action-with-call/_actual-v2.json
 create mode 100644 test/parser/samples/action-with-call/input-v2.html
 create mode 100644 test/parser/samples/action-with-call/output-v2.json
 create mode 100644 test/parser/samples/action-with-identifier/_actual-v2.json
 create mode 100644 test/parser/samples/action-with-identifier/input-v2.html
 create mode 100644 test/parser/samples/action-with-identifier/output-v2.json
 create mode 100644 test/parser/samples/action-with-literal/_actual-v2.json
 create mode 100644 test/parser/samples/action-with-literal/input-v2.html
 create mode 100644 test/parser/samples/action-with-literal/output-v2.json
 create mode 100644 test/parser/samples/action/_actual-v2.json
 create mode 100644 test/parser/samples/action/input-v2.html
 create mode 100644 test/parser/samples/action/output-v2.json
 create mode 100644 test/parser/samples/attribute-dynamic-boolean/_actual-v2.json
 create mode 100644 test/parser/samples/attribute-dynamic-boolean/input-v2.html
 create mode 100644 test/parser/samples/attribute-dynamic-boolean/output-v2.json
 create mode 100644 test/parser/samples/attribute-dynamic-reserved/_actual-v2.json
 create mode 100644 test/parser/samples/attribute-dynamic-reserved/input-v2.html
 create mode 100644 test/parser/samples/attribute-dynamic-reserved/output-v2.json
 create mode 100644 test/parser/samples/attribute-dynamic/_actual-v2.json
 create mode 100644 test/parser/samples/attribute-dynamic/input-v2.html
 create mode 100644 test/parser/samples/attribute-dynamic/output-v2.json
 create mode 100644 test/parser/samples/attribute-escaped/_actual-v2.json
 create mode 100644 test/parser/samples/attribute-escaped/input-v2.html
 create mode 100644 test/parser/samples/attribute-escaped/output-v2.json
 create mode 100644 test/parser/samples/attribute-multiple/_actual-v2.json
 create mode 100644 test/parser/samples/attribute-multiple/input-v2.html
 create mode 100644 test/parser/samples/attribute-multiple/output-v2.json
 create mode 100644 test/parser/samples/attribute-shorthand/_actual-v2.json
 create mode 100644 test/parser/samples/attribute-shorthand/input-v2.html
 create mode 100644 test/parser/samples/attribute-shorthand/output-v2.json
 create mode 100644 test/parser/samples/attribute-static-boolean/_actual-v2.json
 create mode 100644 test/parser/samples/attribute-static-boolean/input-v2.html
 create mode 100644 test/parser/samples/attribute-static-boolean/output-v2.json
 create mode 100644 test/parser/samples/attribute-static/_actual-v2.json
 create mode 100644 test/parser/samples/attribute-static/input-v2.html
 create mode 100644 test/parser/samples/attribute-static/output-v2.json
 create mode 100644 test/parser/samples/attribute-unique-error/input-v2.html
 create mode 100644 test/parser/samples/attribute-unquoted/_actual-v2.json
 create mode 100644 test/parser/samples/attribute-unquoted/input-v2.html
 create mode 100644 test/parser/samples/attribute-unquoted/output-v2.json
 create mode 100644 test/parser/samples/await-then-catch/_actual-v2.json
 create mode 100644 test/parser/samples/await-then-catch/input-v2.html
 create mode 100644 test/parser/samples/await-then-catch/output-v2.json
 create mode 100644 test/parser/samples/binding-shorthand/_actual-v2.json
 create mode 100644 test/parser/samples/binding-shorthand/input-v2.html
 create mode 100644 test/parser/samples/binding-shorthand/output-v2.json
 create mode 100644 test/parser/samples/binding/_actual-v2.json
 create mode 100644 test/parser/samples/binding/input-v2.html
 create mode 100644 test/parser/samples/binding/output-v2.json
 create mode 100644 test/parser/samples/comment/_actual-v2.json
 create mode 100644 test/parser/samples/comment/input-v2.html
 create mode 100644 test/parser/samples/comment/output-v2.json
 create mode 100644 test/parser/samples/component-dynamic/_actual-v2.json
 create mode 100644 test/parser/samples/component-dynamic/input-v2.html
 create mode 100644 test/parser/samples/component-dynamic/output-v2.json
 create mode 100644 test/parser/samples/convert-entities-in-element/_actual-v2.json
 create mode 100644 test/parser/samples/convert-entities-in-element/input-v2.html
 create mode 100644 test/parser/samples/convert-entities-in-element/output-v2.json
 create mode 100644 test/parser/samples/convert-entities/_actual-v2.json
 create mode 100644 test/parser/samples/convert-entities/input-v2.html
 create mode 100644 test/parser/samples/convert-entities/output-v2.json
 create mode 100644 test/parser/samples/css-ref-selector/_actual-v2.json
 create mode 100644 test/parser/samples/css-ref-selector/input-v2.html
 create mode 100644 test/parser/samples/css-ref-selector/output-v2.json
 create mode 100644 test/parser/samples/css/_actual-v2.json
 create mode 100644 test/parser/samples/css/input-v2.html
 create mode 100644 test/parser/samples/css/output-v2.json
 create mode 100644 test/parser/samples/dynamic-import/_actual-v2.json
 create mode 100644 test/parser/samples/dynamic-import/input-v2.html
 create mode 100644 test/parser/samples/dynamic-import/output-v2.json
 create mode 100644 test/parser/samples/each-block-destructured/_actual-v2.json
 create mode 100644 test/parser/samples/each-block-destructured/input-v2.html
 create mode 100644 test/parser/samples/each-block-destructured/output-v2.json
 create mode 100644 test/parser/samples/each-block-else/_actual-v2.json
 create mode 100644 test/parser/samples/each-block-else/input-v2.html
 create mode 100644 test/parser/samples/each-block-else/output-v2.json
 create mode 100644 test/parser/samples/each-block-indexed/_actual-v2.json
 create mode 100644 test/parser/samples/each-block-indexed/input-v2.html
 create mode 100644 test/parser/samples/each-block-indexed/output-v2.json
 create mode 100644 test/parser/samples/each-block-keyed/_actual-v2.json
 create mode 100644 test/parser/samples/each-block-keyed/input-v2.html
 create mode 100644 test/parser/samples/each-block-keyed/output-v2.json
 create mode 100644 test/parser/samples/each-block/_actual-v2.json
 create mode 100644 test/parser/samples/each-block/input-v2.html
 create mode 100644 test/parser/samples/each-block/output-v2.json
 create mode 100644 test/parser/samples/element-with-mustache/_actual-v2.json
 create mode 100644 test/parser/samples/element-with-mustache/input-v2.html
 create mode 100644 test/parser/samples/element-with-mustache/output-v2.json
 create mode 100644 test/parser/samples/element-with-text/_actual-v2.json
 create mode 100644 test/parser/samples/element-with-text/input-v2.html
 create mode 100644 test/parser/samples/element-with-text/output-v2.json
 create mode 100644 test/parser/samples/elements/_actual-v2.json
 create mode 100644 test/parser/samples/elements/input-v2.html
 create mode 100644 test/parser/samples/elements/output-v2.json
 create mode 100644 test/parser/samples/error-binding-disabled/input-v2.html
 create mode 100644 test/parser/samples/error-binding-mustaches/input-v2.html
 create mode 100644 test/parser/samples/error-binding-rvalue/input-v2.html
 create mode 100644 test/parser/samples/error-comment-unclosed/input-v2.html
 create mode 100644 test/parser/samples/error-css/input-v2.html
 create mode 100644 test/parser/samples/error-event-handler/input-v2.html
 create mode 100644 test/parser/samples/error-illegal-expression/input-v2.html
 create mode 100644 test/parser/samples/error-multiple-styles/input-v2.html
 create mode 100644 test/parser/samples/error-ref-value/input-v2.html
 create mode 100644 test/parser/samples/error-script-unclosed/input-v2.html
 create mode 100644 test/parser/samples/error-self-reference/input-v2.html
 create mode 100644 test/parser/samples/error-unexpected-end-of-input-b/input-v2.html
 create mode 100644 test/parser/samples/error-unexpected-end-of-input-c/input-v2.html
 create mode 100644 test/parser/samples/error-unexpected-end-of-input-d/input-v2.html
 create mode 100644 test/parser/samples/error-unexpected-end-of-input/input-v2.html
 create mode 100644 test/parser/samples/error-unmatched-closing-tag/input-v2.html
 create mode 100644 test/parser/samples/error-void-closing/input-v2.html
 create mode 100644 test/parser/samples/error-window-children/input-v2.html
 create mode 100644 test/parser/samples/error-window-duplicate/input-v2.html
 create mode 100644 test/parser/samples/error-window-inside-block/input-v2.html
 create mode 100644 test/parser/samples/error-window-inside-element/input-v2.html
 create mode 100644 test/parser/samples/event-handler/_actual-v2.json
 create mode 100644 test/parser/samples/event-handler/input-v2.html
 create mode 100644 test/parser/samples/event-handler/output-v2.json
 create mode 100644 test/parser/samples/if-block-else/_actual-v2.json
 create mode 100644 test/parser/samples/if-block-else/input-v2.html
 create mode 100644 test/parser/samples/if-block-else/output-v2.json
 create mode 100644 test/parser/samples/if-block-elseif/input-v2.html
 create mode 100644 test/parser/samples/if-block/_actual-v2.json
 create mode 100644 test/parser/samples/if-block/input-v2.html
 create mode 100644 test/parser/samples/if-block/output-v2.json
 create mode 100644 test/parser/samples/implicitly-closed-li/_actual-v2.json
 create mode 100644 test/parser/samples/implicitly-closed-li/input-v2.html
 create mode 100644 test/parser/samples/implicitly-closed-li/output-v2.json
 create mode 100644 test/parser/samples/nbsp/_actual-v2.json
 create mode 100644 test/parser/samples/nbsp/input-v2.html
 create mode 100644 test/parser/samples/nbsp/output-v2.json
 create mode 100644 test/parser/samples/raw-mustaches/_actual-v2.json
 create mode 100644 test/parser/samples/raw-mustaches/input-v2.html
 create mode 100644 test/parser/samples/raw-mustaches/output-v2.json
 create mode 100644 test/parser/samples/refs/_actual-v2.json
 create mode 100644 test/parser/samples/refs/input-v2.html
 create mode 100644 test/parser/samples/refs/output-v2.json
 create mode 100644 test/parser/samples/script-comment-only/_actual-v2.json
 create mode 100644 test/parser/samples/script-comment-only/input-v2.html
 create mode 100644 test/parser/samples/script-comment-only/output-v2.json
 create mode 100644 test/parser/samples/script-comment-trailing-multiline/_actual-v2.json
 create mode 100644 test/parser/samples/script-comment-trailing-multiline/input-v2.html
 create mode 100644 test/parser/samples/script-comment-trailing-multiline/output-v2.json
 create mode 100644 test/parser/samples/script-comment-trailing/_actual-v2.json
 create mode 100644 test/parser/samples/script-comment-trailing/input-v2.html
 create mode 100644 test/parser/samples/script-comment-trailing/output-v2.json
 create mode 100644 test/parser/samples/script/_actual-v2.json
 create mode 100644 test/parser/samples/script/input-v2.html
 create mode 100644 test/parser/samples/script/output-v2.json
 create mode 100644 test/parser/samples/self-closing-element/_actual-v2.json
 create mode 100644 test/parser/samples/self-closing-element/input-v2.html
 create mode 100644 test/parser/samples/self-closing-element/output-v2.json
 create mode 100644 test/parser/samples/self-reference/_actual-v2.json
 create mode 100644 test/parser/samples/self-reference/input-v2.html
 create mode 100644 test/parser/samples/self-reference/output-v2.json
 create mode 100644 test/parser/samples/space-between-mustaches/_actual-v2.json
 create mode 100644 test/parser/samples/space-between-mustaches/input-v2.html
 create mode 100644 test/parser/samples/space-between-mustaches/output-v2.json
 create mode 100644 test/parser/samples/spread/_actual-v2.json
 create mode 100644 test/parser/samples/spread/input-v2.html
 create mode 100644 test/parser/samples/spread/output-v2.json
 create mode 100644 test/parser/samples/textarea-children/_actual-v2.json
 create mode 100644 test/parser/samples/textarea-children/input-v2.html
 create mode 100644 test/parser/samples/textarea-children/output-v2.json
 create mode 100644 test/parser/samples/transition-intro-no-params/_actual-v2.json
 create mode 100644 test/parser/samples/transition-intro-no-params/input-v2.html
 create mode 100644 test/parser/samples/transition-intro-no-params/output-v2.json
 create mode 100644 test/parser/samples/transition-intro/_actual-v2.json
 create mode 100644 test/parser/samples/transition-intro/input-v2.html
 create mode 100644 test/parser/samples/transition-intro/output-v2.json
 create mode 100644 test/parser/samples/unusual-identifier/_actual-v2.json
 create mode 100644 test/parser/samples/unusual-identifier/input-v2.html
 create mode 100644 test/parser/samples/unusual-identifier/output-v2.json
 create mode 100644 test/parser/samples/whitespace-leading-trailing/_actual-v2.json
 create mode 100644 test/parser/samples/whitespace-leading-trailing/input-v2.html
 create mode 100644 test/parser/samples/whitespace-leading-trailing/output-v2.json
 create mode 100644 test/parser/samples/whitespace-normal/_actual-v2.json
 create mode 100644 test/parser/samples/whitespace-normal/input-v2.html
 create mode 100644 test/parser/samples/whitespace-normal/output-v2.json
 create mode 100644 test/parser/samples/yield/_actual-v2.json
 create mode 100644 test/parser/samples/yield/input-v2.html
 create mode 100644 test/parser/samples/yield/output-v2.json

diff --git a/src/interfaces.ts b/src/interfaces.ts
index d44c6a030c5d..dc3fb614c159 100644
--- a/src/interfaces.ts
+++ b/src/interfaces.ts
@@ -66,6 +66,8 @@ export interface CompileOptions {
 
 	onerror?: (error: Error) => void;
 	onwarn?: (warning: Warning) => void;
+
+	parser?: 'v2';
 }
 
 export interface GenerateOptions {
diff --git a/src/parse/index.ts b/src/parse/index.ts
index 3e782214773b..b7656a426a67 100644
--- a/src/parse/index.ts
+++ b/src/parse/index.ts
@@ -13,11 +13,13 @@ import error from '../utils/error';
 interface ParserOptions {
 	filename?: string;
 	bind?: boolean;
+	parser?: 'v2';
 }
 
 type ParserState = (parser: Parser) => (ParserState | void);
 
 export class Parser {
+	readonly v2: boolean;
 	readonly template: string;
 	readonly filename?: string;
 
@@ -32,6 +34,8 @@ export class Parser {
 	allowBindings: boolean;
 
 	constructor(template: string, options: ParserOptions) {
+		this.v2 = options.parser === 'v2';
+
 		if (typeof template !== 'string') {
 			throw new TypeError('Template must be a string');
 		}
diff --git a/src/parse/state/fragment.ts b/src/parse/state/fragment.ts
index c82b3e2f8a48..b2e6cb4c32c9 100644
--- a/src/parse/state/fragment.ts
+++ b/src/parse/state/fragment.ts
@@ -8,7 +8,7 @@ export default function fragment(parser: Parser) {
 		return tag;
 	}
 
-	if (parser.match('{{')) {
+	if (parser.match(parser.v2 ? '{' : '{{')) {
 		return mustache;
 	}
 
diff --git a/src/parse/state/mustache.ts b/src/parse/state/mustache.ts
index 0a255b125602..8da2560fb2f5 100644
--- a/src/parse/state/mustache.ts
+++ b/src/parse/state/mustache.ts
@@ -32,7 +32,7 @@ function trimWhitespace(block: Node, trimBefore: boolean, trimAfter: boolean) {
 
 export default function mustache(parser: Parser) {
 	const start = parser.index;
-	parser.index += 2;
+	parser.index += parser.v2 ? 1 : 2;
 
 	parser.allowWhitespace();
 
@@ -329,7 +329,7 @@ export default function mustache(parser: Parser) {
 		const expression = readExpression(parser);
 
 		parser.allowWhitespace();
-		parser.eat('}}', true);
+		parser.eat(parser.v2 ? '}' : '}}', true);
 
 		parser.current().children.push({
 			start,
diff --git a/src/parse/state/text.ts b/src/parse/state/text.ts
index bdd625569cb7..29da8f928a6b 100644
--- a/src/parse/state/text.ts
+++ b/src/parse/state/text.ts
@@ -9,7 +9,7 @@ export default function text(parser: Parser) {
 	while (
 		parser.index < parser.template.length &&
 		!parser.match('<') &&
-		!parser.match('{{')
+		!parser.match(parser.v2 ? '{' : '{{')
 	) {
 		data += parser.template[parser.index++];
 	}
diff --git a/test/parser/index.js b/test/parser/index.js
index 7467e31b0c99..d0417c8bfa3e 100644
--- a/test/parser/index.js
+++ b/test/parser/index.js
@@ -2,7 +2,7 @@ import assert from 'assert';
 import fs from 'fs';
 import { svelte, tryToLoadJson } from '../helpers.js';
 
-describe('parse', () => {
+describe.only('parse', () => {
 	fs.readdirSync('test/parser/samples').forEach(dir => {
 		if (dir[0] === '.') return;
 
@@ -20,19 +20,37 @@ describe('parse', () => {
 				.readFileSync(`test/parser/samples/${dir}/input.html`, 'utf-8')
 				.replace(/\s+$/, '');
 
+			const input_v2 = fs
+				.readFileSync(`test/parser/samples/${dir}/input-v2.html`, 'utf-8')
+				.replace(/\s+$/, '');
+
 			const options = tryToLoadJson(`test/parser/samples/${dir}/options.json`) || {};
 
 			try {
 				const actual = svelte.parse(input, options);
+				const expected = require(`./samples/${dir}/output.json`);
+
 				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);
+
+				// TODO remove v1 tests
+				const actual_v2 = svelte.parse(input_v2, Object.assign({ parser: 'v2' }, options));
+				const expected_v2 = require(`./samples/${dir}/output-v2.json`);
+
+				fs.writeFileSync(
+					`test/parser/samples/${dir}/_actual-v2.json`,
+					JSON.stringify(actual_v2, null, '\t')
+				);
+
+				assert.deepEqual(actual_v2.html, expected_v2.html);
+				assert.deepEqual(actual_v2.css, expected_v2.css);
+				assert.deepEqual(actual_v2.js, expected_v2.js);
 			} catch (err) {
 				if (err.name !== 'ParseError') throw err;
 
diff --git a/test/parser/samples/action-with-call/_actual-v2.json b/test/parser/samples/action-with-call/_actual-v2.json
new file mode 100644
index 000000000000..b7bc908e2482
--- /dev/null
+++ b/test/parser/samples/action-with-call/_actual-v2.json
@@ -0,0 +1,47 @@
+{
+	"hash": "1eefngx",
+	"html": {
+		"start": 0,
+		"end": 38,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 38,
+				"type": "Element",
+				"name": "input",
+				"attributes": [
+					{
+						"start": 7,
+						"end": 37,
+						"type": "Action",
+						"name": "tooltip",
+						"expression": {
+							"type": "CallExpression",
+							"start": 20,
+							"end": 36,
+							"callee": {
+								"type": "Identifier",
+								"start": 20,
+								"end": 21,
+								"name": "t"
+							},
+							"arguments": [
+								{
+									"type": "Literal",
+									"start": 22,
+									"end": 35,
+									"value": "tooltip msg",
+									"raw": "'tooltip msg'"
+								}
+							]
+						}
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/action-with-call/input-v2.html b/test/parser/samples/action-with-call/input-v2.html
new file mode 100644
index 000000000000..246bf02c59c3
--- /dev/null
+++ b/test/parser/samples/action-with-call/input-v2.html
@@ -0,0 +1 @@
+<input use:tooltip="t('tooltip msg')">
diff --git a/test/parser/samples/action-with-call/output-v2.json b/test/parser/samples/action-with-call/output-v2.json
new file mode 100644
index 000000000000..f5cc6824f3d9
--- /dev/null
+++ b/test/parser/samples/action-with-call/output-v2.json
@@ -0,0 +1,47 @@
+{
+	"hash": 1937205193,
+	"html": {
+		"start": 0,
+		"end": 38,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 38,
+				"type": "Element",
+				"name": "input",
+				"attributes": [
+					{
+						"start": 7,
+						"end": 37,
+						"type": "Action",
+						"name": "tooltip",
+						"expression": {
+							"type": "CallExpression",
+							"start": 20,
+							"end": 36,
+							"callee": {
+								"type": "Identifier",
+								"start": 20,
+								"end": 21,
+								"name": "t"
+							},
+							"arguments": [
+								{
+									"type": "Literal",
+									"start": 22,
+									"end": 35,
+									"value": "tooltip msg",
+									"raw": "'tooltip msg'"
+								}
+							]
+						}
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/action-with-identifier/_actual-v2.json b/test/parser/samples/action-with-identifier/_actual-v2.json
new file mode 100644
index 000000000000..6c6daa34b2b1
--- /dev/null
+++ b/test/parser/samples/action-with-identifier/_actual-v2.json
@@ -0,0 +1,33 @@
+{
+	"hash": "1vce0rr",
+	"html": {
+		"start": 0,
+		"end": 29,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 29,
+				"type": "Element",
+				"name": "input",
+				"attributes": [
+					{
+						"start": 7,
+						"end": 28,
+						"type": "Action",
+						"name": "tooltip",
+						"expression": {
+							"type": "Identifier",
+							"start": 20,
+							"end": 27,
+							"name": "message"
+						}
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/action-with-identifier/input-v2.html b/test/parser/samples/action-with-identifier/input-v2.html
new file mode 100644
index 000000000000..14a65e83ed72
--- /dev/null
+++ b/test/parser/samples/action-with-identifier/input-v2.html
@@ -0,0 +1 @@
+<input use:tooltip="message">
diff --git a/test/parser/samples/action-with-identifier/output-v2.json b/test/parser/samples/action-with-identifier/output-v2.json
new file mode 100644
index 000000000000..6c39ed94bc16
--- /dev/null
+++ b/test/parser/samples/action-with-identifier/output-v2.json
@@ -0,0 +1,33 @@
+{
+	"hash": 1937205193,
+	"html": {
+		"start": 0,
+		"end": 29,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 29,
+				"type": "Element",
+				"name": "input",
+				"attributes": [
+					{
+						"start": 7,
+						"end": 28,
+						"type": "Action",
+						"name": "tooltip",
+						"expression": {
+							"type": "Identifier",
+							"start": 20,
+							"end": 27,
+							"name": "message"
+						}
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/action-with-literal/_actual-v2.json b/test/parser/samples/action-with-literal/_actual-v2.json
new file mode 100644
index 000000000000..472b5a306d3b
--- /dev/null
+++ b/test/parser/samples/action-with-literal/_actual-v2.json
@@ -0,0 +1,34 @@
+{
+	"hash": "1pm9eh0",
+	"html": {
+		"start": 0,
+		"end": 35,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 35,
+				"type": "Element",
+				"name": "input",
+				"attributes": [
+					{
+						"start": 7,
+						"end": 34,
+						"type": "Action",
+						"name": "tooltip",
+						"expression": {
+							"type": "Literal",
+							"start": 20,
+							"end": 33,
+							"value": "tooltip msg",
+							"raw": "'tooltip msg'"
+						}
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/action-with-literal/input-v2.html b/test/parser/samples/action-with-literal/input-v2.html
new file mode 100644
index 000000000000..60e16eacfc7c
--- /dev/null
+++ b/test/parser/samples/action-with-literal/input-v2.html
@@ -0,0 +1 @@
+<input use:tooltip="'tooltip msg'">
diff --git a/test/parser/samples/action-with-literal/output-v2.json b/test/parser/samples/action-with-literal/output-v2.json
new file mode 100644
index 000000000000..0da031888714
--- /dev/null
+++ b/test/parser/samples/action-with-literal/output-v2.json
@@ -0,0 +1,34 @@
+{
+	"hash": 1937205193,
+	"html": {
+		"start": 0,
+		"end": 35,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 35,
+				"type": "Element",
+				"name": "input",
+				"attributes": [
+					{
+						"start": 7,
+						"end": 34,
+						"type": "Action",
+						"name": "tooltip",
+						"expression": {
+							"type": "Literal",
+							"start": 20,
+							"end": 33,
+							"value": "tooltip msg",
+							"raw": "'tooltip msg'"
+						}
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/action/_actual-v2.json b/test/parser/samples/action/_actual-v2.json
new file mode 100644
index 000000000000..0746bd601a0f
--- /dev/null
+++ b/test/parser/samples/action/_actual-v2.json
@@ -0,0 +1,28 @@
+{
+	"hash": "1e3ix5",
+	"html": {
+		"start": 0,
+		"end": 21,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 21,
+				"type": "Element",
+				"name": "input",
+				"attributes": [
+					{
+						"start": 7,
+						"end": 20,
+						"type": "Action",
+						"name": "autofocus",
+						"expression": null
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/action/input-v2.html b/test/parser/samples/action/input-v2.html
new file mode 100644
index 000000000000..64409c2a6507
--- /dev/null
+++ b/test/parser/samples/action/input-v2.html
@@ -0,0 +1 @@
+<input use:autofocus>
diff --git a/test/parser/samples/action/output-v2.json b/test/parser/samples/action/output-v2.json
new file mode 100644
index 000000000000..597ae297a533
--- /dev/null
+++ b/test/parser/samples/action/output-v2.json
@@ -0,0 +1,28 @@
+{
+	"hash": 1937205193,
+	"html": {
+		"start": 0,
+		"end": 21,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 21,
+				"type": "Element",
+				"name": "input",
+				"attributes": [
+					{
+						"start": 7,
+						"end": 20,
+						"type": "Action",
+						"name": "autofocus",
+						"expression": null
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic-boolean/_actual-v2.json b/test/parser/samples/attribute-dynamic-boolean/_actual-v2.json
new file mode 100644
index 000000000000..c843275a4fba
--- /dev/null
+++ b/test/parser/samples/attribute-dynamic-boolean/_actual-v2.json
@@ -0,0 +1,35 @@
+{
+	"hash": "7xolfv",
+	"html": {
+		"start": 0,
+		"end": 41,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 41,
+				"type": "Element",
+				"name": "textarea",
+				"attributes": [
+					{
+						"start": 10,
+						"end": 29,
+						"type": "Attribute",
+						"name": "readonly",
+						"value": [
+							{
+								"start": 19,
+								"end": 29,
+								"type": "Text",
+								"data": "{readonly}"
+							}
+						]
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic-boolean/input-v2.html b/test/parser/samples/attribute-dynamic-boolean/input-v2.html
new file mode 100644
index 000000000000..ba531f2f8116
--- /dev/null
+++ b/test/parser/samples/attribute-dynamic-boolean/input-v2.html
@@ -0,0 +1 @@
+<textarea readonly={readonly}></textarea>
diff --git a/test/parser/samples/attribute-dynamic-boolean/output-v2.json b/test/parser/samples/attribute-dynamic-boolean/output-v2.json
new file mode 100644
index 000000000000..af1635a55d95
--- /dev/null
+++ b/test/parser/samples/attribute-dynamic-boolean/output-v2.json
@@ -0,0 +1,40 @@
+{
+	"hash": 3179574701,
+	"html": {
+		"start": 0,
+		"end": 45,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 45,
+				"type": "Element",
+				"name": "textarea",
+				"attributes": [
+					{
+						"start": 10,
+						"end": 33,
+						"type": "Attribute",
+						"name": "readonly",
+						"value": [
+							{
+								"start": 20,
+								"end": 32,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 22,
+									"end": 30,
+									"name": "readonly"
+								}
+							}
+						]
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic-reserved/_actual-v2.json b/test/parser/samples/attribute-dynamic-reserved/_actual-v2.json
new file mode 100644
index 000000000000..76b70ef261aa
--- /dev/null
+++ b/test/parser/samples/attribute-dynamic-reserved/_actual-v2.json
@@ -0,0 +1,35 @@
+{
+	"hash": "l0cddf",
+	"html": {
+		"start": 0,
+		"end": 25,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 25,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 18,
+						"type": "Attribute",
+						"name": "class",
+						"value": [
+							{
+								"start": 11,
+								"end": 18,
+								"type": "Text",
+								"data": "{class}"
+							}
+						]
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic-reserved/input-v2.html b/test/parser/samples/attribute-dynamic-reserved/input-v2.html
new file mode 100644
index 000000000000..d973a9dea043
--- /dev/null
+++ b/test/parser/samples/attribute-dynamic-reserved/input-v2.html
@@ -0,0 +1 @@
+<div class={class}></div>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic-reserved/output-v2.json b/test/parser/samples/attribute-dynamic-reserved/output-v2.json
new file mode 100644
index 000000000000..aef0e5cb63ca
--- /dev/null
+++ b/test/parser/samples/attribute-dynamic-reserved/output-v2.json
@@ -0,0 +1,40 @@
+{
+	"hash": 2788845841,
+	"html": {
+		"start": 0,
+		"end": 29,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 29,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 22,
+						"type": "Attribute",
+						"name": "class",
+						"value": [
+							{
+								"start": 12,
+								"end": 21,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 14,
+									"end": 19,
+									"name": "class"
+								}
+							}
+						]
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic/_actual-v2.json b/test/parser/samples/attribute-dynamic/_actual-v2.json
new file mode 100644
index 000000000000..06f82de54aba
--- /dev/null
+++ b/test/parser/samples/attribute-dynamic/_actual-v2.json
@@ -0,0 +1,42 @@
+{
+	"hash": "ehtsx6",
+	"html": {
+		"start": 0,
+		"end": 42,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 42,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 28,
+						"type": "Attribute",
+						"name": "style",
+						"value": [
+							{
+								"start": 12,
+								"end": 27,
+								"type": "Text",
+								"data": "color: {color};"
+							}
+						]
+					}
+				],
+				"children": [
+					{
+						"start": 29,
+						"end": 36,
+						"type": "Text",
+						"data": "{color}"
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic/input-v2.html b/test/parser/samples/attribute-dynamic/input-v2.html
new file mode 100644
index 000000000000..9171ae22a77e
--- /dev/null
+++ b/test/parser/samples/attribute-dynamic/input-v2.html
@@ -0,0 +1 @@
+<div style='color: {color};'>{color}</div>
diff --git a/test/parser/samples/attribute-dynamic/output-v2.json b/test/parser/samples/attribute-dynamic/output-v2.json
new file mode 100644
index 000000000000..79ef81065fc7
--- /dev/null
+++ b/test/parser/samples/attribute-dynamic/output-v2.json
@@ -0,0 +1,64 @@
+{
+	"hash": 804348386,
+	"html": {
+		"start": 0,
+		"end": 46,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 46,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 30,
+						"type": "Attribute",
+						"name": "style",
+						"value": [
+							{
+								"start": 12,
+								"end": 19,
+								"type": "Text",
+								"data": "color: "
+							},
+							{
+								"start": 19,
+								"end": 28,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 21,
+									"end": 26,
+									"name": "color"
+								}
+							},
+							{
+								"start": 28,
+								"end": 29,
+								"type": "Text",
+								"data": ";"
+							}
+						]
+					}
+				],
+				"children": [
+					{
+						"start": 31,
+						"end": 40,
+						"type": "MustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 33,
+							"end": 38,
+							"name": "color"
+						}
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-escaped/_actual-v2.json b/test/parser/samples/attribute-escaped/_actual-v2.json
new file mode 100644
index 000000000000..d048a3d94599
--- /dev/null
+++ b/test/parser/samples/attribute-escaped/_actual-v2.json
@@ -0,0 +1,35 @@
+{
+	"hash": "pv50w6",
+	"html": {
+		"start": 0,
+		"end": 41,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 41,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 34,
+						"type": "Attribute",
+						"name": "data-foo",
+						"value": [
+							{
+								"start": 15,
+								"end": 33,
+								"type": "Text",
+								"data": "\"quoted\""
+							}
+						]
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-escaped/input-v2.html b/test/parser/samples/attribute-escaped/input-v2.html
new file mode 100644
index 000000000000..82186dcee47b
--- /dev/null
+++ b/test/parser/samples/attribute-escaped/input-v2.html
@@ -0,0 +1 @@
+<div data-foo='&quot;quoted&quot;'></div>
diff --git a/test/parser/samples/attribute-escaped/output-v2.json b/test/parser/samples/attribute-escaped/output-v2.json
new file mode 100644
index 000000000000..974084bcdde3
--- /dev/null
+++ b/test/parser/samples/attribute-escaped/output-v2.json
@@ -0,0 +1,35 @@
+{
+	"hash": 1563956934,
+	"html": {
+		"start": 0,
+		"end": 41,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 41,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 34,
+						"type": "Attribute",
+						"name": "data-foo",
+						"value": [
+							{
+								"start": 15,
+								"end": 33,
+								"type": "Text",
+								"data": "\"quoted\""
+							}
+						]
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-multiple/_actual-v2.json b/test/parser/samples/attribute-multiple/_actual-v2.json
new file mode 100644
index 000000000000..b185127d5657
--- /dev/null
+++ b/test/parser/samples/attribute-multiple/_actual-v2.json
@@ -0,0 +1,49 @@
+{
+	"hash": "8dvm3u",
+	"html": {
+		"start": 0,
+		"end": 28,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 28,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 11,
+						"type": "Attribute",
+						"name": "id",
+						"value": [
+							{
+								"start": 9,
+								"end": 10,
+								"type": "Text",
+								"data": "x"
+							}
+						]
+					},
+					{
+						"start": 12,
+						"end": 21,
+						"type": "Attribute",
+						"name": "class",
+						"value": [
+							{
+								"start": 19,
+								"end": 20,
+								"type": "Text",
+								"data": "y"
+							}
+						]
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-multiple/input-v2.html b/test/parser/samples/attribute-multiple/input-v2.html
new file mode 100644
index 000000000000..6f61bd628983
--- /dev/null
+++ b/test/parser/samples/attribute-multiple/input-v2.html
@@ -0,0 +1 @@
+<div id='x' class='y'></div>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-multiple/output-v2.json b/test/parser/samples/attribute-multiple/output-v2.json
new file mode 100644
index 000000000000..81af977b51a1
--- /dev/null
+++ b/test/parser/samples/attribute-multiple/output-v2.json
@@ -0,0 +1,49 @@
+{
+	"hash": 507039402,
+	"html": {
+		"start": 0,
+		"end": 28,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 28,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 11,
+						"type": "Attribute",
+						"name": "id",
+						"value": [
+							{
+								"start": 9,
+								"end": 10,
+								"type": "Text",
+								"data": "x"
+							}
+						]
+					},
+					{
+						"start": 12,
+						"end": 21,
+						"type": "Attribute",
+						"name": "class",
+						"value": [
+							{
+								"start": 19,
+								"end": 20,
+								"type": "Text",
+								"data": "y"
+							}
+						]
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-shorthand/_actual-v2.json b/test/parser/samples/attribute-shorthand/_actual-v2.json
new file mode 100644
index 000000000000..01b3ae38b220
--- /dev/null
+++ b/test/parser/samples/attribute-shorthand/_actual-v2.json
@@ -0,0 +1,40 @@
+{
+	"hash": "s7nwuc",
+	"html": {
+		"start": 0,
+		"end": 10,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 10,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 8,
+						"type": "Attribute",
+						"name": "id",
+						"value": [
+							{
+								"type": "AttributeShorthand",
+								"start": 6,
+								"end": 8,
+								"expression": {
+									"type": "Identifier",
+									"start": 6,
+									"end": 8,
+									"name": "id"
+								}
+							}
+						]
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-shorthand/input-v2.html b/test/parser/samples/attribute-shorthand/input-v2.html
new file mode 100644
index 000000000000..e26deafb3a3d
--- /dev/null
+++ b/test/parser/samples/attribute-shorthand/input-v2.html
@@ -0,0 +1 @@
+<div :id/>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-shorthand/output-v2.json b/test/parser/samples/attribute-shorthand/output-v2.json
new file mode 100644
index 000000000000..b6578c13eb51
--- /dev/null
+++ b/test/parser/samples/attribute-shorthand/output-v2.json
@@ -0,0 +1,40 @@
+{
+	"hash": 1705925892,
+	"html": {
+		"start": 0,
+		"end": 10,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 10,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 8,
+						"type": "Attribute",
+						"name": "id",
+						"value": [
+							{
+								"type": "AttributeShorthand",
+								"start": 6,
+								"end": 8,
+								"expression": {
+									"type": "Identifier",
+									"start": 6,
+									"end": 8,
+									"name": "id"
+								}
+							}
+						]
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-static-boolean/_actual-v2.json b/test/parser/samples/attribute-static-boolean/_actual-v2.json
new file mode 100644
index 000000000000..a70a135f2a6e
--- /dev/null
+++ b/test/parser/samples/attribute-static-boolean/_actual-v2.json
@@ -0,0 +1,28 @@
+{
+	"hash": "a1b7fo",
+	"html": {
+		"start": 0,
+		"end": 30,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 30,
+				"type": "Element",
+				"name": "textarea",
+				"attributes": [
+					{
+						"start": 10,
+						"end": 18,
+						"type": "Attribute",
+						"name": "readonly",
+						"value": true
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-static-boolean/input-v2.html b/test/parser/samples/attribute-static-boolean/input-v2.html
new file mode 100644
index 000000000000..1536f3e1e882
--- /dev/null
+++ b/test/parser/samples/attribute-static-boolean/input-v2.html
@@ -0,0 +1 @@
+<textarea readonly></textarea>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-static-boolean/output-v2.json b/test/parser/samples/attribute-static-boolean/output-v2.json
new file mode 100644
index 000000000000..21429893fd7d
--- /dev/null
+++ b/test/parser/samples/attribute-static-boolean/output-v2.json
@@ -0,0 +1,28 @@
+{
+	"hash": 606864228,
+	"html": {
+		"start": 0,
+		"end": 30,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 30,
+				"type": "Element",
+				"name": "textarea",
+				"attributes": [
+					{
+						"start": 10,
+						"end": 18,
+						"type": "Attribute",
+						"name": "readonly",
+						"value": true
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-static/_actual-v2.json b/test/parser/samples/attribute-static/_actual-v2.json
new file mode 100644
index 000000000000..28dc91df40f1
--- /dev/null
+++ b/test/parser/samples/attribute-static/_actual-v2.json
@@ -0,0 +1,35 @@
+{
+	"hash": "op11m5",
+	"html": {
+		"start": 0,
+		"end": 23,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 23,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 16,
+						"type": "Attribute",
+						"name": "class",
+						"value": [
+							{
+								"start": 12,
+								"end": 15,
+								"type": "Text",
+								"data": "foo"
+							}
+						]
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-static/input-v2.html b/test/parser/samples/attribute-static/input-v2.html
new file mode 100644
index 000000000000..c6a8a8c95d59
--- /dev/null
+++ b/test/parser/samples/attribute-static/input-v2.html
@@ -0,0 +1 @@
+<div class='foo'></div>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-static/output-v2.json b/test/parser/samples/attribute-static/output-v2.json
new file mode 100644
index 000000000000..394f95f4580e
--- /dev/null
+++ b/test/parser/samples/attribute-static/output-v2.json
@@ -0,0 +1,35 @@
+{
+	"hash": 1493227373,
+	"html": {
+		"start": 0,
+		"end": 23,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 23,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 16,
+						"type": "Attribute",
+						"name": "class",
+						"value": [
+							{
+								"start": 12,
+								"end": 15,
+								"type": "Text",
+								"data": "foo"
+							}
+						]
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-unique-error/input-v2.html b/test/parser/samples/attribute-unique-error/input-v2.html
new file mode 100644
index 000000000000..37fec733b3ce
--- /dev/null
+++ b/test/parser/samples/attribute-unique-error/input-v2.html
@@ -0,0 +1 @@
+<div class='foo' class='bar'></div>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-unquoted/_actual-v2.json b/test/parser/samples/attribute-unquoted/_actual-v2.json
new file mode 100644
index 000000000000..583e8814d6a1
--- /dev/null
+++ b/test/parser/samples/attribute-unquoted/_actual-v2.json
@@ -0,0 +1,35 @@
+{
+	"hash": "1lozhxt",
+	"html": {
+		"start": 0,
+		"end": 21,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 21,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 14,
+						"type": "Attribute",
+						"name": "class",
+						"value": [
+							{
+								"start": 11,
+								"end": 14,
+								"type": "Text",
+								"data": "foo"
+							}
+						]
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-unquoted/input-v2.html b/test/parser/samples/attribute-unquoted/input-v2.html
new file mode 100644
index 000000000000..4bab0df72f3e
--- /dev/null
+++ b/test/parser/samples/attribute-unquoted/input-v2.html
@@ -0,0 +1 @@
+<div class=foo></div>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-unquoted/output-v2.json b/test/parser/samples/attribute-unquoted/output-v2.json
new file mode 100644
index 000000000000..474d925b2e47
--- /dev/null
+++ b/test/parser/samples/attribute-unquoted/output-v2.json
@@ -0,0 +1,35 @@
+{
+	"hash": 3488539025,
+	"html": {
+		"start": 0,
+		"end": 21,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 21,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 14,
+						"type": "Attribute",
+						"name": "class",
+						"value": [
+							{
+								"start": 11,
+								"end": 14,
+								"type": "Text",
+								"data": "foo"
+							}
+						]
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/await-then-catch/_actual-v2.json b/test/parser/samples/await-then-catch/_actual-v2.json
new file mode 100644
index 000000000000..cfe0ab813487
--- /dev/null
+++ b/test/parser/samples/await-then-catch/_actual-v2.json
@@ -0,0 +1,81 @@
+{
+	"hash": "1rt0tho",
+	"html": {
+		"start": 0,
+		"end": 149,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 21,
+				"type": "Text",
+				"data": "{#await thePromise}\n\t"
+			},
+			{
+				"start": 21,
+				"end": 38,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 24,
+						"end": 34,
+						"type": "Text",
+						"data": "loading..."
+					}
+				]
+			},
+			{
+				"start": 38,
+				"end": 57,
+				"type": "Text",
+				"data": "\n{:then theValue}\n\t"
+			},
+			{
+				"start": 57,
+				"end": 87,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 60,
+						"end": 83,
+						"type": "Text",
+						"data": "the value is {theValue}"
+					}
+				]
+			},
+			{
+				"start": 87,
+				"end": 107,
+				"type": "Text",
+				"data": "\n{:catch theError}\n\t"
+			},
+			{
+				"start": 107,
+				"end": 140,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 110,
+						"end": 136,
+						"type": "Text",
+						"data": "oh no! {theError.message}}"
+					}
+				]
+			},
+			{
+				"start": 140,
+				"end": 149,
+				"type": "Text",
+				"data": "\n{/await}"
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/await-then-catch/input-v2.html b/test/parser/samples/await-then-catch/input-v2.html
new file mode 100644
index 000000000000..b4038bec8ccb
--- /dev/null
+++ b/test/parser/samples/await-then-catch/input-v2.html
@@ -0,0 +1,7 @@
+{#await thePromise}
+	<p>loading...</p>
+{:then theValue}
+	<p>the value is {theValue}</p>
+{:catch theError}
+	<p>oh no! {theError.message}}</p>
+{/await}
\ No newline at end of file
diff --git a/test/parser/samples/await-then-catch/output-v2.json b/test/parser/samples/await-then-catch/output-v2.json
new file mode 100644
index 000000000000..4f149e6a0cba
--- /dev/null
+++ b/test/parser/samples/await-then-catch/output-v2.json
@@ -0,0 +1,161 @@
+{
+	"hash": 1040536517,
+	"html": {
+		"start": 0,
+		"end": 158,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 158,
+				"type": "AwaitBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 9,
+					"end": 19,
+					"name": "thePromise"
+				},
+				"value": "theValue",
+				"error": "theError",
+				"pending": {
+					"start": 21,
+					"end": 41,
+					"type": "PendingBlock",
+					"children": [
+						{
+							"start": 21,
+							"end": 23,
+							"type": "Text",
+							"data": "\n\t"
+						},
+						{
+							"start": 23,
+							"end": 40,
+							"type": "Element",
+							"name": "p",
+							"attributes": [],
+							"children": [
+								{
+									"start": 26,
+									"end": 36,
+									"type": "Text",
+									"data": "loading..."
+								}
+							]
+						},
+						{
+							"start": 40,
+							"end": 41,
+							"type": "Text",
+							"data": "\n"
+						}
+					]
+				},
+				"then": {
+					"start": 41,
+					"end": 93,
+					"type": "ThenBlock",
+					"children": [
+						{
+							"start": 58,
+							"end": 60,
+							"type": "Text",
+							"data": "\n\t"
+						},
+						{
+							"start": 60,
+							"end": 92,
+							"type": "Element",
+							"name": "p",
+							"attributes": [],
+							"children": [
+								{
+									"start": 63,
+									"end": 76,
+									"type": "Text",
+									"data": "the value is "
+								},
+								{
+									"start": 76,
+									"end": 88,
+									"type": "MustacheTag",
+									"expression": {
+										"type": "Identifier",
+										"start": 78,
+										"end": 86,
+										"name": "theValue"
+									}
+								}
+							]
+						},
+						{
+							"start": 92,
+							"end": 93,
+							"type": "Text",
+							"data": "\n"
+						}
+					]
+				},
+				"catch": {
+					"start": 93,
+					"end": 148,
+					"type": "CatchBlock",
+					"children": [
+						{
+							"start": 111,
+							"end": 113,
+							"type": "Text",
+							"data": "\n\t"
+						},
+						{
+							"start": 113,
+							"end": 147,
+							"type": "Element",
+							"name": "p",
+							"attributes": [],
+							"children": [
+								{
+									"start": 116,
+									"end": 123,
+									"type": "Text",
+									"data": "oh no! "
+								},
+								{
+									"start": 123,
+									"end": 143,
+									"type": "MustacheTag",
+									"expression": {
+										"type": "MemberExpression",
+										"start": 125,
+										"end": 141,
+										"object": {
+											"type": "Identifier",
+											"start": 125,
+											"end": 133,
+											"name": "theError"
+										},
+										"property": {
+											"type": "Identifier",
+											"start": 134,
+											"end": 141,
+											"name": "message"
+										},
+										"computed": false
+									}
+								}
+							]
+						},
+						{
+							"start": 147,
+							"end": 148,
+							"type": "Text",
+							"data": "\n"
+						}
+					]
+				}
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/binding-shorthand/_actual-v2.json b/test/parser/samples/binding-shorthand/_actual-v2.json
new file mode 100644
index 000000000000..de159d6516cd
--- /dev/null
+++ b/test/parser/samples/binding-shorthand/_actual-v2.json
@@ -0,0 +1,33 @@
+{
+	"hash": "1f31b7d",
+	"html": {
+		"start": 0,
+		"end": 18,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 18,
+				"type": "Element",
+				"name": "Widget",
+				"attributes": [
+					{
+						"start": 8,
+						"end": 16,
+						"type": "Binding",
+						"name": "foo",
+						"value": {
+							"type": "Identifier",
+							"start": 13,
+							"end": 16,
+							"name": "foo"
+						}
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/binding-shorthand/input-v2.html b/test/parser/samples/binding-shorthand/input-v2.html
new file mode 100644
index 000000000000..7f8116bdded9
--- /dev/null
+++ b/test/parser/samples/binding-shorthand/input-v2.html
@@ -0,0 +1 @@
+<Widget bind:foo/>
\ No newline at end of file
diff --git a/test/parser/samples/binding-shorthand/output-v2.json b/test/parser/samples/binding-shorthand/output-v2.json
new file mode 100644
index 000000000000..8a7b615cf420
--- /dev/null
+++ b/test/parser/samples/binding-shorthand/output-v2.json
@@ -0,0 +1,33 @@
+{
+	"hash": 3088875001,
+	"html": {
+		"start": 0,
+		"end": 18,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 18,
+				"type": "Element",
+				"name": "Widget",
+				"attributes": [
+					{
+						"start": 8,
+						"end": 16,
+						"type": "Binding",
+						"name": "foo",
+						"value": {
+							"type": "Identifier",
+							"start": 13,
+							"end": 16,
+							"name": "foo"
+						}
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/binding/_actual-v2.json b/test/parser/samples/binding/_actual-v2.json
new file mode 100644
index 000000000000..c124e9caf46d
--- /dev/null
+++ b/test/parser/samples/binding/_actual-v2.json
@@ -0,0 +1,33 @@
+{
+	"hash": "w1d13d",
+	"html": {
+		"start": 0,
+		"end": 25,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 25,
+				"type": "Element",
+				"name": "input",
+				"attributes": [
+					{
+						"start": 7,
+						"end": 24,
+						"type": "Binding",
+						"name": "value",
+						"value": {
+							"type": "Identifier",
+							"start": 19,
+							"end": 23,
+							"name": "name"
+						}
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/binding/input-v2.html b/test/parser/samples/binding/input-v2.html
new file mode 100644
index 000000000000..3af20a9ced1b
--- /dev/null
+++ b/test/parser/samples/binding/input-v2.html
@@ -0,0 +1 @@
+<input bind:value='name'>
\ No newline at end of file
diff --git a/test/parser/samples/binding/output-v2.json b/test/parser/samples/binding/output-v2.json
new file mode 100644
index 000000000000..74f2059f5929
--- /dev/null
+++ b/test/parser/samples/binding/output-v2.json
@@ -0,0 +1,33 @@
+{
+	"hash": 1937205193,
+	"html": {
+		"start": 0,
+		"end": 25,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 25,
+				"type": "Element",
+				"name": "input",
+				"attributes": [
+					{
+						"start": 7,
+						"end": 24,
+						"type": "Binding",
+						"name": "value",
+						"value": {
+							"type": "Identifier",
+							"start": 19,
+							"end": 23,
+							"name": "name"
+						}
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/comment/_actual-v2.json b/test/parser/samples/comment/_actual-v2.json
new file mode 100644
index 000000000000..3dde7da39dcc
--- /dev/null
+++ b/test/parser/samples/comment/_actual-v2.json
@@ -0,0 +1,18 @@
+{
+	"hash": "1ihizni",
+	"html": {
+		"start": 0,
+		"end": 18,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 18,
+				"type": "Comment",
+				"data": " a comment "
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/comment/input-v2.html b/test/parser/samples/comment/input-v2.html
new file mode 100644
index 000000000000..3b3ffe3222f9
--- /dev/null
+++ b/test/parser/samples/comment/input-v2.html
@@ -0,0 +1 @@
+<!-- a comment -->
\ No newline at end of file
diff --git a/test/parser/samples/comment/output-v2.json b/test/parser/samples/comment/output-v2.json
new file mode 100644
index 000000000000..e77c968b6b6b
--- /dev/null
+++ b/test/parser/samples/comment/output-v2.json
@@ -0,0 +1,18 @@
+{
+	"hash": 3294612990,
+	"html": {
+		"start": 0,
+		"end": 18,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 18,
+				"type": "Comment",
+				"data": " a comment "
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/component-dynamic/_actual-v2.json b/test/parser/samples/component-dynamic/_actual-v2.json
new file mode 100644
index 000000000000..9e6525a8cabd
--- /dev/null
+++ b/test/parser/samples/component-dynamic/_actual-v2.json
@@ -0,0 +1,68 @@
+{
+	"hash": "7yh2k2",
+	"html": {
+		"start": 0,
+		"end": 55,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 55,
+				"type": "Element",
+				"name": "svelte:component",
+				"attributes": [
+					{
+						"start": 18,
+						"end": 23,
+						"type": "Attribute",
+						"name": "{foo",
+						"value": true
+					},
+					{
+						"start": 23,
+						"end": 25,
+						"type": "Attribute",
+						"name": "?",
+						"value": true
+					},
+					{
+						"start": 25,
+						"end": 29,
+						"type": "Attribute",
+						"name": "Foo",
+						"value": true
+					},
+					{
+						"start": 29,
+						"end": 30,
+						"type": "Attribute",
+						"name": "",
+						"value": [
+							{
+								"type": "AttributeShorthand",
+								"start": 30,
+								"end": 30,
+								"expression": {
+									"type": "Identifier",
+									"start": 30,
+									"end": 30,
+									"name": ""
+								}
+							}
+						]
+					},
+					{
+						"start": 31,
+						"end": 35,
+						"type": "Attribute",
+						"name": "Bar}",
+						"value": true
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/component-dynamic/input-v2.html b/test/parser/samples/component-dynamic/input-v2.html
new file mode 100644
index 000000000000..d692cce9b875
--- /dev/null
+++ b/test/parser/samples/component-dynamic/input-v2.html
@@ -0,0 +1 @@
+<svelte:component {foo ? Foo : Bar}></svelte:component>
\ No newline at end of file
diff --git a/test/parser/samples/component-dynamic/output-v2.json b/test/parser/samples/component-dynamic/output-v2.json
new file mode 100644
index 000000000000..614c28c0a9f7
--- /dev/null
+++ b/test/parser/samples/component-dynamic/output-v2.json
@@ -0,0 +1,43 @@
+{
+	"hash": 410218696,
+	"html": {
+		"start": 0,
+		"end": 43,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 43,
+				"type": "Element",
+				"name": ":Component",
+				"attributes": [],
+				"children": [],
+				"expression": {
+					"type": "ConditionalExpression",
+					"start": 13,
+					"end": 28,
+					"test": {
+						"type": "Identifier",
+						"start": 13,
+						"end": 16,
+						"name": "foo"
+					},
+					"consequent": {
+						"type": "Identifier",
+						"start": 19,
+						"end": 22,
+						"name": "Foo"
+					},
+					"alternate": {
+						"type": "Identifier",
+						"start": 25,
+						"end": 28,
+						"name": "Bar"
+					}
+				}
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/convert-entities-in-element/_actual-v2.json b/test/parser/samples/convert-entities-in-element/_actual-v2.json
new file mode 100644
index 000000000000..4946333f3f1d
--- /dev/null
+++ b/test/parser/samples/convert-entities-in-element/_actual-v2.json
@@ -0,0 +1,27 @@
+{
+	"hash": "134kmw9",
+	"html": {
+		"start": 0,
+		"end": 24,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 24,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 3,
+						"end": 20,
+						"type": "Text",
+						"data": "Hello & World"
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/convert-entities-in-element/input-v2.html b/test/parser/samples/convert-entities-in-element/input-v2.html
new file mode 100644
index 000000000000..f05dc391ad3e
--- /dev/null
+++ b/test/parser/samples/convert-entities-in-element/input-v2.html
@@ -0,0 +1 @@
+<p>Hello &amp; World</p>
\ No newline at end of file
diff --git a/test/parser/samples/convert-entities-in-element/output-v2.json b/test/parser/samples/convert-entities-in-element/output-v2.json
new file mode 100644
index 000000000000..cb3e50ec3b2c
--- /dev/null
+++ b/test/parser/samples/convert-entities-in-element/output-v2.json
@@ -0,0 +1,27 @@
+{
+	"hash": 2365862121,
+	"html": {
+		"start": 0,
+		"end": 24,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 24,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 3,
+						"end": 20,
+						"type": "Text",
+						"data": "Hello & World"
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/convert-entities/_actual-v2.json b/test/parser/samples/convert-entities/_actual-v2.json
new file mode 100644
index 000000000000..2a2deedc9951
--- /dev/null
+++ b/test/parser/samples/convert-entities/_actual-v2.json
@@ -0,0 +1,18 @@
+{
+	"hash": "2lbrq0",
+	"html": {
+		"start": 0,
+		"end": 17,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 17,
+				"type": "Text",
+				"data": "Hello & World"
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/convert-entities/input-v2.html b/test/parser/samples/convert-entities/input-v2.html
new file mode 100644
index 000000000000..161463ec5858
--- /dev/null
+++ b/test/parser/samples/convert-entities/input-v2.html
@@ -0,0 +1 @@
+Hello &amp; World
\ No newline at end of file
diff --git a/test/parser/samples/convert-entities/output-v2.json b/test/parser/samples/convert-entities/output-v2.json
new file mode 100644
index 000000000000..479bae306482
--- /dev/null
+++ b/test/parser/samples/convert-entities/output-v2.json
@@ -0,0 +1,18 @@
+{
+	"hash": 156753432,
+	"html": {
+		"start": 0,
+		"end": 17,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 17,
+				"type": "Text",
+				"data": "Hello & World"
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/css-ref-selector/_actual-v2.json b/test/parser/samples/css-ref-selector/_actual-v2.json
new file mode 100644
index 000000000000..5edf24cd19bd
--- /dev/null
+++ b/test/parser/samples/css-ref-selector/_actual-v2.json
@@ -0,0 +1,96 @@
+{
+	"hash": "i9aush",
+	"html": {
+		"start": 0,
+		"end": 14,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 14,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 12,
+						"type": "Ref",
+						"name": "foo"
+					}
+				],
+				"children": []
+			},
+			{
+				"start": 14,
+				"end": 16,
+				"type": "Text",
+				"data": "\n\n"
+			}
+		]
+	},
+	"css": {
+		"start": 16,
+		"end": 60,
+		"attributes": [],
+		"children": [
+			{
+				"type": "Rule",
+				"selector": {
+					"type": "SelectorList",
+					"children": [
+						{
+							"type": "Selector",
+							"children": [
+								{
+									"type": "RefSelector",
+									"start": 25,
+									"end": 32,
+									"name": "foo"
+								}
+							],
+							"start": 25,
+							"end": 32
+						}
+					],
+					"start": 25,
+					"end": 32
+				},
+				"block": {
+					"type": "Block",
+					"children": [
+						{
+							"type": "Declaration",
+							"important": false,
+							"property": "color",
+							"value": {
+								"type": "Value",
+								"children": [
+									{
+										"type": "Identifier",
+										"name": "red",
+										"start": 44,
+										"end": 47
+									}
+								],
+								"start": 43,
+								"end": 47
+							},
+							"start": 37,
+							"end": 47
+						}
+					],
+					"start": 33,
+					"end": 51
+				},
+				"start": 25,
+				"end": 51
+			}
+		],
+		"content": {
+			"start": 23,
+			"end": 52,
+			"styles": "\n\tref:foo {\n\t\tcolor: red;\n\t}\n"
+		}
+	},
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/css-ref-selector/input-v2.html b/test/parser/samples/css-ref-selector/input-v2.html
new file mode 100644
index 000000000000..696075f93f0c
--- /dev/null
+++ b/test/parser/samples/css-ref-selector/input-v2.html
@@ -0,0 +1,7 @@
+<div ref:foo/>
+
+<style>
+	ref:foo {
+		color: red;
+	}
+</style>
\ No newline at end of file
diff --git a/test/parser/samples/css-ref-selector/output-v2.json b/test/parser/samples/css-ref-selector/output-v2.json
new file mode 100644
index 000000000000..2ddafc4aae16
--- /dev/null
+++ b/test/parser/samples/css-ref-selector/output-v2.json
@@ -0,0 +1,96 @@
+{
+	"hash": 1104014177,
+	"html": {
+		"start": 0,
+		"end": 14,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 14,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 12,
+						"type": "Ref",
+						"name": "foo"
+					}
+				],
+				"children": []
+			},
+			{
+				"start": 14,
+				"end": 16,
+				"type": "Text",
+				"data": "\n\n"
+			}
+		]
+	},
+	"css": {
+		"start": 16,
+		"end": 60,
+		"attributes": [],
+		"children": [
+			{
+				"type": "Rule",
+				"selector": {
+					"type": "SelectorList",
+					"children": [
+						{
+							"type": "Selector",
+							"children": [
+								{
+									"type": "RefSelector",
+									"start": 25,
+									"end": 32,
+									"name": "foo"
+								}
+							],
+							"start": 25,
+							"end": 32
+						}
+					],
+					"start": 25,
+					"end": 32
+				},
+				"block": {
+					"type": "Block",
+					"children": [
+						{
+							"type": "Declaration",
+							"important": false,
+							"property": "color",
+							"value": {
+								"type": "Value",
+								"children": [
+									{
+										"type": "Identifier",
+										"name": "red",
+										"start": 44,
+										"end": 47
+									}
+								],
+								"start": 43,
+								"end": 47
+							},
+							"start": 37,
+							"end": 47
+						}
+					],
+					"start": 33,
+					"end": 51
+				},
+				"start": 25,
+				"end": 51
+			}
+		],
+		"content": {
+			"start": 23,
+			"end": 52,
+			"styles": "\n\tref:foo {\n\t\tcolor: red;\n\t}\n"
+		}
+	},
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/css/_actual-v2.json b/test/parser/samples/css/_actual-v2.json
new file mode 100644
index 000000000000..316e6e72a598
--- /dev/null
+++ b/test/parser/samples/css/_actual-v2.json
@@ -0,0 +1,96 @@
+{
+	"hash": "iz4x8b",
+	"html": {
+		"start": 0,
+		"end": 14,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 14,
+				"type": "Element",
+				"name": "div",
+				"attributes": [],
+				"children": [
+					{
+						"start": 5,
+						"end": 8,
+						"type": "Text",
+						"data": "foo"
+					}
+				]
+			},
+			{
+				"start": 14,
+				"end": 16,
+				"type": "Text",
+				"data": "\n\n"
+			}
+		]
+	},
+	"css": {
+		"start": 16,
+		"end": 56,
+		"attributes": [],
+		"children": [
+			{
+				"type": "Rule",
+				"selector": {
+					"type": "SelectorList",
+					"children": [
+						{
+							"type": "Selector",
+							"children": [
+								{
+									"type": "TypeSelector",
+									"name": "div",
+									"start": 25,
+									"end": 28
+								}
+							],
+							"start": 25,
+							"end": 28
+						}
+					],
+					"start": 25,
+					"end": 28
+				},
+				"block": {
+					"type": "Block",
+					"children": [
+						{
+							"type": "Declaration",
+							"important": false,
+							"property": "color",
+							"value": {
+								"type": "Value",
+								"children": [
+									{
+										"type": "Identifier",
+										"name": "red",
+										"start": 40,
+										"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/css/input-v2.html b/test/parser/samples/css/input-v2.html
new file mode 100644
index 000000000000..a573bcf778a3
--- /dev/null
+++ b/test/parser/samples/css/input-v2.html
@@ -0,0 +1,7 @@
+<div>foo</div>
+
+<style>
+	div {
+		color: red;
+	}
+</style>
\ No newline at end of file
diff --git a/test/parser/samples/css/output-v2.json b/test/parser/samples/css/output-v2.json
new file mode 100644
index 000000000000..4650ccea46bb
--- /dev/null
+++ b/test/parser/samples/css/output-v2.json
@@ -0,0 +1,96 @@
+{
+	"hash": 1147407419,
+	"html": {
+		"start": 0,
+		"end": 14,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 14,
+				"type": "Element",
+				"name": "div",
+				"attributes": [],
+				"children": [
+					{
+						"start": 5,
+						"end": 8,
+						"type": "Text",
+						"data": "foo"
+					}
+				]
+			},
+			{
+				"start": 14,
+				"end": 16,
+				"type": "Text",
+				"data": "\n\n"
+			}
+		]
+	},
+	"css": {
+		"start": 16,
+		"end": 56,
+		"attributes": [],
+		"children": [
+			{
+				"type": "Rule",
+				"selector": {
+					"type": "SelectorList",
+					"children": [
+						{
+							"type": "Selector",
+							"children": [
+								{
+									"type": "TypeSelector",
+									"name": "div",
+									"start": 25,
+									"end": 28
+								}
+							],
+							"start": 25,
+							"end": 28
+						}
+					],
+					"start": 25,
+					"end": 28
+				},
+				"block": {
+					"type": "Block",
+					"children": [
+						{
+							"type": "Declaration",
+							"important": false,
+							"property": "color",
+							"value": {
+								"type": "Value",
+								"children": [
+									{
+										"type": "Identifier",
+										"name": "red",
+										"start": 40,
+										"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/dynamic-import/_actual-v2.json b/test/parser/samples/dynamic-import/_actual-v2.json
new file mode 100644
index 000000000000..5a1b7b0680bd
--- /dev/null
+++ b/test/parser/samples/dynamic-import/_actual-v2.json
@@ -0,0 +1,182 @@
+{
+	"hash": "uvuf1h",
+	"html": {
+		"start": null,
+		"end": null,
+		"type": "Fragment",
+		"children": []
+	},
+	"css": null,
+	"js": {
+		"start": 0,
+		"end": 131,
+		"attributes": [],
+		"content": {
+			"type": "Program",
+			"start": 8,
+			"end": 122,
+			"body": [
+				{
+					"type": "ExportDefaultDeclaration",
+					"start": 10,
+					"end": 121,
+					"declaration": {
+						"type": "ObjectExpression",
+						"start": 25,
+						"end": 121,
+						"properties": [
+							{
+								"type": "Property",
+								"start": 29,
+								"end": 118,
+								"method": true,
+								"shorthand": false,
+								"computed": false,
+								"key": {
+									"type": "Identifier",
+									"start": 29,
+									"end": 37,
+									"name": "oncreate"
+								},
+								"kind": "init",
+								"value": {
+									"type": "FunctionExpression",
+									"start": 37,
+									"end": 118,
+									"id": null,
+									"generator": false,
+									"expression": false,
+									"async": false,
+									"params": [],
+									"body": {
+										"type": "BlockStatement",
+										"start": 40,
+										"end": 118,
+										"body": [
+											{
+												"type": "ExpressionStatement",
+												"start": 45,
+												"end": 114,
+												"expression": {
+													"type": "CallExpression",
+													"start": 45,
+													"end": 113,
+													"callee": {
+														"type": "MemberExpression",
+														"start": 45,
+														"end": 68,
+														"object": {
+															"type": "CallExpression",
+															"start": 45,
+															"end": 63,
+															"callee": {
+																"type": "Import",
+																"start": 45,
+																"end": 51
+															},
+															"arguments": [
+																{
+																	"type": "Literal",
+																	"start": 52,
+																	"end": 62,
+																	"value": "./foo.js",
+																	"raw": "'./foo.js'"
+																}
+															]
+														},
+														"property": {
+															"type": "Identifier",
+															"start": 64,
+															"end": 68,
+															"name": "then"
+														},
+														"computed": false
+													},
+													"arguments": [
+														{
+															"type": "ArrowFunctionExpression",
+															"start": 69,
+															"end": 112,
+															"id": null,
+															"generator": false,
+															"expression": false,
+															"async": false,
+															"params": [
+																{
+																	"type": "Identifier",
+																	"start": 69,
+																	"end": 72,
+																	"name": "foo"
+																}
+															],
+															"body": {
+																"type": "BlockStatement",
+																"start": 76,
+																"end": 112,
+																"body": [
+																	{
+																		"type": "ExpressionStatement",
+																		"start": 82,
+																		"end": 107,
+																		"expression": {
+																			"type": "CallExpression",
+																			"start": 82,
+																			"end": 106,
+																			"callee": {
+																				"type": "MemberExpression",
+																				"start": 82,
+																				"end": 93,
+																				"object": {
+																					"type": "Identifier",
+																					"start": 82,
+																					"end": 89,
+																					"name": "console"
+																				},
+																				"property": {
+																					"type": "Identifier",
+																					"start": 90,
+																					"end": 93,
+																					"name": "log"
+																				},
+																				"computed": false
+																			},
+																			"arguments": [
+																				{
+																					"type": "MemberExpression",
+																					"start": 94,
+																					"end": 105,
+																					"object": {
+																						"type": "Identifier",
+																						"start": 94,
+																						"end": 97,
+																						"name": "foo"
+																					},
+																					"property": {
+																						"type": "Identifier",
+																						"start": 98,
+																						"end": 105,
+																						"name": "default"
+																					},
+																					"computed": false
+																				}
+																			]
+																		}
+																	}
+																]
+															}
+														}
+													]
+												}
+											}
+										]
+									}
+								}
+							}
+						]
+					}
+				}
+			],
+			"sourceType": "module"
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/parser/samples/dynamic-import/input-v2.html b/test/parser/samples/dynamic-import/input-v2.html
new file mode 100644
index 000000000000..553ca6c38c5d
--- /dev/null
+++ b/test/parser/samples/dynamic-import/input-v2.html
@@ -0,0 +1,9 @@
+<script>
+	export default {
+		oncreate() {
+			import('./foo.js').then(foo => {
+				console.log(foo.default);
+			});
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/test/parser/samples/dynamic-import/output-v2.json b/test/parser/samples/dynamic-import/output-v2.json
new file mode 100644
index 000000000000..b27a780a58e4
--- /dev/null
+++ b/test/parser/samples/dynamic-import/output-v2.json
@@ -0,0 +1,182 @@
+{
+	"hash": 1867472549,
+	"html": {
+		"start": null,
+		"end": null,
+		"type": "Fragment",
+		"children": []
+	},
+	"css": null,
+	"js": {
+		"start": 0,
+		"end": 131,
+		"attributes": [],
+		"content": {
+			"type": "Program",
+			"start": 8,
+			"end": 122,
+			"body": [
+				{
+					"type": "ExportDefaultDeclaration",
+					"start": 10,
+					"end": 121,
+					"declaration": {
+						"type": "ObjectExpression",
+						"start": 25,
+						"end": 121,
+						"properties": [
+							{
+								"type": "Property",
+								"start": 29,
+								"end": 118,
+								"method": true,
+								"shorthand": false,
+								"computed": false,
+								"key": {
+									"type": "Identifier",
+									"start": 29,
+									"end": 37,
+									"name": "oncreate"
+								},
+								"kind": "init",
+								"value": {
+									"type": "FunctionExpression",
+									"start": 37,
+									"end": 118,
+									"id": null,
+									"generator": false,
+									"expression": false,
+									"async": false,
+									"params": [],
+									"body": {
+										"type": "BlockStatement",
+										"start": 40,
+										"end": 118,
+										"body": [
+											{
+												"type": "ExpressionStatement",
+												"start": 45,
+												"end": 114,
+												"expression": {
+													"type": "CallExpression",
+													"start": 45,
+													"end": 113,
+													"callee": {
+														"type": "MemberExpression",
+														"start": 45,
+														"end": 68,
+														"object": {
+															"type": "CallExpression",
+															"start": 45,
+															"end": 63,
+															"callee": {
+																"type": "Import",
+																"start": 45,
+																"end": 51
+															},
+															"arguments": [
+																{
+																	"type": "Literal",
+																	"start": 52,
+																	"end": 62,
+																	"value": "./foo.js",
+																	"raw": "'./foo.js'"
+																}
+															]
+														},
+														"property": {
+															"type": "Identifier",
+															"start": 64,
+															"end": 68,
+															"name": "then"
+														},
+														"computed": false
+													},
+													"arguments": [
+														{
+															"type": "ArrowFunctionExpression",
+															"start": 69,
+															"end": 112,
+															"id": null,
+															"generator": false,
+															"expression": false,
+															"async": false,
+															"params": [
+																{
+																	"type": "Identifier",
+																	"start": 69,
+																	"end": 72,
+																	"name": "foo"
+																}
+															],
+															"body": {
+																"type": "BlockStatement",
+																"start": 76,
+																"end": 112,
+																"body": [
+																	{
+																		"type": "ExpressionStatement",
+																		"start": 82,
+																		"end": 107,
+																		"expression": {
+																			"type": "CallExpression",
+																			"start": 82,
+																			"end": 106,
+																			"callee": {
+																				"type": "MemberExpression",
+																				"start": 82,
+																				"end": 93,
+																				"object": {
+																					"type": "Identifier",
+																					"start": 82,
+																					"end": 89,
+																					"name": "console"
+																				},
+																				"property": {
+																					"type": "Identifier",
+																					"start": 90,
+																					"end": 93,
+																					"name": "log"
+																				},
+																				"computed": false
+																			},
+																			"arguments": [
+																				{
+																					"type": "MemberExpression",
+																					"start": 94,
+																					"end": 105,
+																					"object": {
+																						"type": "Identifier",
+																						"start": 94,
+																						"end": 97,
+																						"name": "foo"
+																					},
+																					"property": {
+																						"type": "Identifier",
+																						"start": 98,
+																						"end": 105,
+																						"name": "default"
+																					},
+																					"computed": false
+																				}
+																			]
+																		}
+																	}
+																]
+															}
+														}
+													]
+												}
+											}
+										]
+									}
+								}
+							}
+						]
+					}
+				}
+			],
+			"sourceType": "module"
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/parser/samples/each-block-destructured/_actual-v2.json b/test/parser/samples/each-block-destructured/_actual-v2.json
new file mode 100644
index 000000000000..97b69a5730f3
--- /dev/null
+++ b/test/parser/samples/each-block-destructured/_actual-v2.json
@@ -0,0 +1,39 @@
+{
+	"hash": "gtdm5e",
+	"html": {
+		"start": 0,
+		"end": 62,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 33,
+				"type": "Text",
+				"data": "{#each animals as [key, value]}\n\t"
+			},
+			{
+				"start": 33,
+				"end": 54,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 36,
+						"end": 50,
+						"type": "Text",
+						"data": "{key}: {value}"
+					}
+				]
+			},
+			{
+				"start": 54,
+				"end": 62,
+				"type": "Text",
+				"data": "\n{/each}"
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/each-block-destructured/input-v2.html b/test/parser/samples/each-block-destructured/input-v2.html
new file mode 100644
index 000000000000..4ddf33ef8585
--- /dev/null
+++ b/test/parser/samples/each-block-destructured/input-v2.html
@@ -0,0 +1,3 @@
+{#each animals as [key, value]}
+	<p>{key}: {value}</p>
+{/each}
diff --git a/test/parser/samples/each-block-destructured/output-v2.json b/test/parser/samples/each-block-destructured/output-v2.json
new file mode 100644
index 000000000000..897fec88b82a
--- /dev/null
+++ b/test/parser/samples/each-block-destructured/output-v2.json
@@ -0,0 +1,67 @@
+{
+	"hash": 2621498076,
+	"html": {
+		"start": 0,
+		"end": 70,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 70,
+				"type": "EachBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 8,
+					"end": 15,
+					"name": "animals"
+				},
+				"children": [
+					{
+						"start": 35,
+						"end": 60,
+						"type": "Element",
+						"name": "p",
+						"attributes": [],
+						"children": [
+							{
+								"start": 38,
+								"end": 45,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 40,
+									"end": 43,
+									"name": "key"
+								}
+							},
+							{
+								"start": 45,
+								"end": 47,
+								"type": "Text",
+								"data": ": "
+							},
+							{
+								"start": 47,
+								"end": 56,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 49,
+									"end": 54,
+									"name": "value"
+								}
+							}
+						]
+					}
+				],
+				"destructuredContexts": [
+					"key",
+					"value"
+				],
+				"context": "key_value"
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/each-block-else/_actual-v2.json b/test/parser/samples/each-block-else/_actual-v2.json
new file mode 100644
index 000000000000..af7b618bf8e0
--- /dev/null
+++ b/test/parser/samples/each-block-else/_actual-v2.json
@@ -0,0 +1,60 @@
+{
+	"hash": "ljl07n",
+	"html": {
+		"start": 0,
+		"end": 77,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 27,
+				"type": "Text",
+				"data": "{#each animals as animal}\n\t"
+			},
+			{
+				"start": 27,
+				"end": 42,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 30,
+						"end": 38,
+						"type": "Text",
+						"data": "{animal}"
+					}
+				]
+			},
+			{
+				"start": 42,
+				"end": 52,
+				"type": "Text",
+				"data": "\n{:else}\n\t"
+			},
+			{
+				"start": 52,
+				"end": 69,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 55,
+						"end": 65,
+						"type": "Text",
+						"data": "no animals"
+					}
+				]
+			},
+			{
+				"start": 69,
+				"end": 77,
+				"type": "Text",
+				"data": "\n{/each}"
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/each-block-else/input-v2.html b/test/parser/samples/each-block-else/input-v2.html
new file mode 100644
index 000000000000..dc96d8b946be
--- /dev/null
+++ b/test/parser/samples/each-block-else/input-v2.html
@@ -0,0 +1,5 @@
+{#each animals as animal}
+	<p>{animal}</p>
+{:else}
+	<p>no animals</p>
+{/each}
diff --git a/test/parser/samples/each-block-else/output-v2.json b/test/parser/samples/each-block-else/output-v2.json
new file mode 100644
index 000000000000..0dadad5f650f
--- /dev/null
+++ b/test/parser/samples/each-block-else/output-v2.json
@@ -0,0 +1,68 @@
+{
+	"hash": 3238289871,
+	"html": {
+		"start": 0,
+		"end": 84,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 84,
+				"type": "EachBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 8,
+					"end": 15,
+					"name": "animals"
+				},
+				"children": [
+					{
+						"start": 29,
+						"end": 46,
+						"type": "Element",
+						"name": "p",
+						"attributes": [],
+						"children": [
+							{
+								"start": 32,
+								"end": 42,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 34,
+									"end": 40,
+									"name": "animal"
+								}
+							}
+						]
+					}
+				],
+				"context": "animal",
+				"else": {
+					"start": 55,
+					"end": 75,
+					"type": "ElseBlock",
+					"children": [
+						{
+							"start": 57,
+							"end": 74,
+							"type": "Element",
+							"name": "p",
+							"attributes": [],
+							"children": [
+								{
+									"start": 60,
+									"end": 70,
+									"type": "Text",
+									"data": "no animals"
+								}
+							]
+						}
+					]
+				}
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/each-block-indexed/_actual-v2.json b/test/parser/samples/each-block-indexed/_actual-v2.json
new file mode 100644
index 000000000000..576bc5301403
--- /dev/null
+++ b/test/parser/samples/each-block-indexed/_actual-v2.json
@@ -0,0 +1,39 @@
+{
+	"hash": "1143n2g",
+	"html": {
+		"start": 0,
+		"end": 58,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 30,
+				"type": "Text",
+				"data": "{#each animals as animal, i}\n\t"
+			},
+			{
+				"start": 30,
+				"end": 50,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 33,
+						"end": 46,
+						"type": "Text",
+						"data": "{i}: {animal}"
+					}
+				]
+			},
+			{
+				"start": 50,
+				"end": 58,
+				"type": "Text",
+				"data": "\n{/each}"
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/each-block-indexed/input-v2.html b/test/parser/samples/each-block-indexed/input-v2.html
new file mode 100644
index 000000000000..d5602ec82c06
--- /dev/null
+++ b/test/parser/samples/each-block-indexed/input-v2.html
@@ -0,0 +1,3 @@
+{#each animals as animal, i}
+	<p>{i}: {animal}</p>
+{/each}
diff --git a/test/parser/samples/each-block-indexed/output-v2.json b/test/parser/samples/each-block-indexed/output-v2.json
new file mode 100644
index 000000000000..fc8954d6ad96
--- /dev/null
+++ b/test/parser/samples/each-block-indexed/output-v2.json
@@ -0,0 +1,64 @@
+{
+	"hash": 2841674990,
+	"html": {
+		"start": 0,
+		"end": 66,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 66,
+				"type": "EachBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 8,
+					"end": 15,
+					"name": "animals"
+				},
+				"children": [
+					{
+						"start": 32,
+						"end": 56,
+						"type": "Element",
+						"name": "p",
+						"attributes": [],
+						"children": [
+							{
+								"start": 35,
+								"end": 40,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 37,
+									"end": 38,
+									"name": "i"
+								}
+							},
+							{
+								"start": 40,
+								"end": 42,
+								"type": "Text",
+								"data": ": "
+							},
+							{
+								"start": 42,
+								"end": 52,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 44,
+									"end": 50,
+									"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/_actual-v2.json b/test/parser/samples/each-block-keyed/_actual-v2.json
new file mode 100644
index 000000000000..c039c98ce95a
--- /dev/null
+++ b/test/parser/samples/each-block-keyed/_actual-v2.json
@@ -0,0 +1,39 @@
+{
+	"hash": "3sm0ec",
+	"html": {
+		"start": 0,
+		"end": 56,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 35,
+				"type": "Text",
+				"data": "{#each todos as todo key todo.id}\n\t"
+			},
+			{
+				"start": 35,
+				"end": 48,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 38,
+						"end": 44,
+						"type": "Text",
+						"data": "{todo}"
+					}
+				]
+			},
+			{
+				"start": 48,
+				"end": 56,
+				"type": "Text",
+				"data": "\n{/each}"
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/each-block-keyed/input-v2.html b/test/parser/samples/each-block-keyed/input-v2.html
new file mode 100644
index 000000000000..3cc00ce93e39
--- /dev/null
+++ b/test/parser/samples/each-block-keyed/input-v2.html
@@ -0,0 +1,3 @@
+{#each todos as todo key todo.id}
+	<p>{todo}</p>
+{/each}
diff --git a/test/parser/samples/each-block-keyed/output-v2.json b/test/parser/samples/each-block-keyed/output-v2.json
new file mode 100644
index 000000000000..1a16afb82b31
--- /dev/null
+++ b/test/parser/samples/each-block-keyed/output-v2.json
@@ -0,0 +1,47 @@
+{
+	"hash": 2025411181,
+	"html": {
+		"start": 0,
+		"end": 54,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 54,
+				"type": "EachBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 8,
+					"end": 13,
+					"name": "todos"
+				},
+				"children": [
+					{
+						"start": 29,
+						"end": 44,
+						"type": "Element",
+						"name": "p",
+						"attributes": [],
+						"children": [
+							{
+								"start": 32,
+								"end": 40,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 34,
+									"end": 38,
+									"name": "todo"
+								}
+							}
+						]
+					}
+				],
+				"context": "todo",
+				"key": "id"
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/each-block/_actual-v2.json b/test/parser/samples/each-block/_actual-v2.json
new file mode 100644
index 000000000000..314ef918a50c
--- /dev/null
+++ b/test/parser/samples/each-block/_actual-v2.json
@@ -0,0 +1,39 @@
+{
+	"hash": "mzeq0s",
+	"html": {
+		"start": 0,
+		"end": 50,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 27,
+				"type": "Text",
+				"data": "{#each animals as animal}\n\t"
+			},
+			{
+				"start": 27,
+				"end": 42,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 30,
+						"end": 38,
+						"type": "Text",
+						"data": "{animal}"
+					}
+				]
+			},
+			{
+				"start": 42,
+				"end": 50,
+				"type": "Text",
+				"data": "\n{/each}"
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/each-block/input-v2.html b/test/parser/samples/each-block/input-v2.html
new file mode 100644
index 000000000000..83a5e88ddd2a
--- /dev/null
+++ b/test/parser/samples/each-block/input-v2.html
@@ -0,0 +1,3 @@
+{#each animals as animal}
+	<p>{animal}</p>
+{/each}
diff --git a/test/parser/samples/each-block/output-v2.json b/test/parser/samples/each-block/output-v2.json
new file mode 100644
index 000000000000..e549faca3953
--- /dev/null
+++ b/test/parser/samples/each-block/output-v2.json
@@ -0,0 +1,46 @@
+{
+	"hash": 220340986,
+	"html": {
+		"start": 0,
+		"end": 56,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 56,
+				"type": "EachBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 8,
+					"end": 15,
+					"name": "animals"
+				},
+				"children": [
+					{
+						"start": 29,
+						"end": 46,
+						"type": "Element",
+						"name": "p",
+						"attributes": [],
+						"children": [
+							{
+								"start": 32,
+								"end": 42,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 34,
+									"end": 40,
+									"name": "animal"
+								}
+							}
+						]
+					}
+				],
+				"context": "animal"
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/element-with-mustache/_actual-v2.json b/test/parser/samples/element-with-mustache/_actual-v2.json
new file mode 100644
index 000000000000..a65459a200a8
--- /dev/null
+++ b/test/parser/samples/element-with-mustache/_actual-v2.json
@@ -0,0 +1,44 @@
+{
+	"hash": "9fs56",
+	"html": {
+		"start": 0,
+		"end": 22,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 22,
+				"type": "Element",
+				"name": "h1",
+				"attributes": [],
+				"children": [
+					{
+						"start": 4,
+						"end": 10,
+						"type": "Text",
+						"data": "hello "
+					},
+					{
+						"start": 10,
+						"end": 16,
+						"type": "MustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 11,
+							"end": 15,
+							"name": "name"
+						}
+					},
+					{
+						"start": 16,
+						"end": 17,
+						"type": "Text",
+						"data": "!"
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/element-with-mustache/input-v2.html b/test/parser/samples/element-with-mustache/input-v2.html
new file mode 100644
index 000000000000..1e9232da02fd
--- /dev/null
+++ b/test/parser/samples/element-with-mustache/input-v2.html
@@ -0,0 +1 @@
+<h1>hello {name}!</h1>
diff --git a/test/parser/samples/element-with-mustache/output-v2.json b/test/parser/samples/element-with-mustache/output-v2.json
new file mode 100644
index 000000000000..76e71dc3278f
--- /dev/null
+++ b/test/parser/samples/element-with-mustache/output-v2.json
@@ -0,0 +1,44 @@
+{
+	"hash": 1265376132,
+	"html": {
+		"start": 0,
+		"end": 22,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 22,
+				"type": "Element",
+				"name": "h1",
+				"attributes": [],
+				"children": [
+					{
+						"start": 4,
+						"end": 10,
+						"type": "Text",
+						"data": "hello "
+					},
+					{
+						"start": 10,
+						"end": 16,
+						"type": "MustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 11,
+							"end": 15,
+							"name": "name"
+						}
+					},
+					{
+						"start": 16,
+						"end": 17,
+						"type": "Text",
+						"data": "!"
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/element-with-text/_actual-v2.json b/test/parser/samples/element-with-text/_actual-v2.json
new file mode 100644
index 000000000000..ee940e82e7df
--- /dev/null
+++ b/test/parser/samples/element-with-text/_actual-v2.json
@@ -0,0 +1,27 @@
+{
+	"hash": "a3xqjm",
+	"html": {
+		"start": 0,
+		"end": 17,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 17,
+				"type": "Element",
+				"name": "span",
+				"attributes": [],
+				"children": [
+					{
+						"start": 6,
+						"end": 10,
+						"type": "Text",
+						"data": "test"
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/element-with-text/input-v2.html b/test/parser/samples/element-with-text/input-v2.html
new file mode 100644
index 000000000000..fcf3199655df
--- /dev/null
+++ b/test/parser/samples/element-with-text/input-v2.html
@@ -0,0 +1 @@
+<span>test</span>
\ No newline at end of file
diff --git a/test/parser/samples/element-with-text/output-v2.json b/test/parser/samples/element-with-text/output-v2.json
new file mode 100644
index 000000000000..22cae35547ca
--- /dev/null
+++ b/test/parser/samples/element-with-text/output-v2.json
@@ -0,0 +1,27 @@
+{
+	"hash": 611274658,
+	"html": {
+		"start": 0,
+		"end": 17,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 17,
+				"type": "Element",
+				"name": "span",
+				"attributes": [],
+				"children": [
+					{
+						"start": 6,
+						"end": 10,
+						"type": "Text",
+						"data": "test"
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/elements/_actual-v2.json b/test/parser/samples/elements/_actual-v2.json
new file mode 100644
index 000000000000..14de5ea00d40
--- /dev/null
+++ b/test/parser/samples/elements/_actual-v2.json
@@ -0,0 +1,28 @@
+{
+	"hash": "dni3s5",
+	"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/elements/input-v2.html b/test/parser/samples/elements/input-v2.html
new file mode 100644
index 000000000000..937d25b42e2e
--- /dev/null
+++ b/test/parser/samples/elements/input-v2.html
@@ -0,0 +1 @@
+<!doctype html>
\ No newline at end of file
diff --git a/test/parser/samples/elements/output-v2.json b/test/parser/samples/elements/output-v2.json
new file mode 100644
index 000000000000..7b4e6bffe12e
--- /dev/null
+++ b/test/parser/samples/elements/output-v2.json
@@ -0,0 +1,28 @@
+{
+	"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-disabled/input-v2.html b/test/parser/samples/error-binding-disabled/input-v2.html
new file mode 100644
index 000000000000..3af20a9ced1b
--- /dev/null
+++ b/test/parser/samples/error-binding-disabled/input-v2.html
@@ -0,0 +1 @@
+<input bind:value='name'>
\ No newline at end of file
diff --git a/test/parser/samples/error-binding-mustaches/input-v2.html b/test/parser/samples/error-binding-mustaches/input-v2.html
new file mode 100644
index 000000000000..2629696c9ec8
--- /dev/null
+++ b/test/parser/samples/error-binding-mustaches/input-v2.html
@@ -0,0 +1 @@
+<input bind:value='{foo}'>
diff --git a/test/parser/samples/error-binding-rvalue/input-v2.html b/test/parser/samples/error-binding-rvalue/input-v2.html
new file mode 100644
index 000000000000..0b1f716c237e
--- /dev/null
+++ b/test/parser/samples/error-binding-rvalue/input-v2.html
@@ -0,0 +1 @@
+<input bind:value='a + b'>
\ No newline at end of file
diff --git a/test/parser/samples/error-comment-unclosed/input-v2.html b/test/parser/samples/error-comment-unclosed/input-v2.html
new file mode 100644
index 000000000000..fe6d748e1b04
--- /dev/null
+++ b/test/parser/samples/error-comment-unclosed/input-v2.html
@@ -0,0 +1 @@
+<!-- an unclosed comment
\ No newline at end of file
diff --git a/test/parser/samples/error-css/input-v2.html b/test/parser/samples/error-css/input-v2.html
new file mode 100644
index 000000000000..d073ec625845
--- /dev/null
+++ b/test/parser/samples/error-css/input-v2.html
@@ -0,0 +1,3 @@
+<style>
+	this is not css
+</style>
\ No newline at end of file
diff --git a/test/parser/samples/error-event-handler/input-v2.html b/test/parser/samples/error-event-handler/input-v2.html
new file mode 100644
index 000000000000..612b5ba399bf
--- /dev/null
+++ b/test/parser/samples/error-event-handler/input-v2.html
@@ -0,0 +1 @@
+<div on:click='foo'></div>
\ No newline at end of file
diff --git a/test/parser/samples/error-illegal-expression/input-v2.html b/test/parser/samples/error-illegal-expression/input-v2.html
new file mode 100644
index 000000000000..2d1cf18d2ac4
--- /dev/null
+++ b/test/parser/samples/error-illegal-expression/input-v2.html
@@ -0,0 +1 @@
+{42 = nope}
diff --git a/test/parser/samples/error-multiple-styles/input-v2.html b/test/parser/samples/error-multiple-styles/input-v2.html
new file mode 100644
index 000000000000..d86e7824ff25
--- /dev/null
+++ b/test/parser/samples/error-multiple-styles/input-v2.html
@@ -0,0 +1,13 @@
+<div>foo</div>
+
+<style>
+	div {
+		color: red;
+	}
+</style>
+
+<style>
+	div {
+		color: blue;
+	}
+</style>
\ No newline at end of file
diff --git a/test/parser/samples/error-ref-value/input-v2.html b/test/parser/samples/error-ref-value/input-v2.html
new file mode 100644
index 000000000000..8ad19958e3b4
--- /dev/null
+++ b/test/parser/samples/error-ref-value/input-v2.html
@@ -0,0 +1 @@
+<div ref:foo='bar'></div>
\ No newline at end of file
diff --git a/test/parser/samples/error-script-unclosed/input-v2.html b/test/parser/samples/error-script-unclosed/input-v2.html
new file mode 100644
index 000000000000..133b653ef960
--- /dev/null
+++ b/test/parser/samples/error-script-unclosed/input-v2.html
@@ -0,0 +1,3 @@
+<h1>Hello {name}!</h1>
+
+<script>
\ No newline at end of file
diff --git a/test/parser/samples/error-self-reference/input-v2.html b/test/parser/samples/error-self-reference/input-v2.html
new file mode 100644
index 000000000000..51a466059061
--- /dev/null
+++ b/test/parser/samples/error-self-reference/input-v2.html
@@ -0,0 +1 @@
+<svelte:self/>
\ No newline at end of file
diff --git a/test/parser/samples/error-unexpected-end-of-input-b/input-v2.html b/test/parser/samples/error-unexpected-end-of-input-b/input-v2.html
new file mode 100644
index 000000000000..044e45f78b96
--- /dev/null
+++ b/test/parser/samples/error-unexpected-end-of-input-b/input-v2.html
@@ -0,0 +1 @@
+<d
\ No newline at end of file
diff --git a/test/parser/samples/error-unexpected-end-of-input-c/input-v2.html b/test/parser/samples/error-unexpected-end-of-input-c/input-v2.html
new file mode 100644
index 000000000000..c5fa78456dbd
--- /dev/null
+++ b/test/parser/samples/error-unexpected-end-of-input-c/input-v2.html
@@ -0,0 +1 @@
+<
\ No newline at end of file
diff --git a/test/parser/samples/error-unexpected-end-of-input-d/input-v2.html b/test/parser/samples/error-unexpected-end-of-input-d/input-v2.html
new file mode 100644
index 000000000000..560d2a198421
--- /dev/null
+++ b/test/parser/samples/error-unexpected-end-of-input-d/input-v2.html
@@ -0,0 +1,2 @@
+{#if foo}
+	<p>foo</p>
\ No newline at end of file
diff --git a/test/parser/samples/error-unexpected-end-of-input/input-v2.html b/test/parser/samples/error-unexpected-end-of-input/input-v2.html
new file mode 100644
index 000000000000..5790c0cccc9c
--- /dev/null
+++ b/test/parser/samples/error-unexpected-end-of-input/input-v2.html
@@ -0,0 +1 @@
+<div>
\ No newline at end of file
diff --git a/test/parser/samples/error-unmatched-closing-tag/input-v2.html b/test/parser/samples/error-unmatched-closing-tag/input-v2.html
new file mode 100644
index 000000000000..7f5eaa32ef17
--- /dev/null
+++ b/test/parser/samples/error-unmatched-closing-tag/input-v2.html
@@ -0,0 +1 @@
+</div>
\ No newline at end of file
diff --git a/test/parser/samples/error-void-closing/input-v2.html b/test/parser/samples/error-void-closing/input-v2.html
new file mode 100644
index 000000000000..4f4d77ad673d
--- /dev/null
+++ b/test/parser/samples/error-void-closing/input-v2.html
@@ -0,0 +1 @@
+<input>this is illegal!</input>
\ No newline at end of file
diff --git a/test/parser/samples/error-window-children/input-v2.html b/test/parser/samples/error-window-children/input-v2.html
new file mode 100644
index 000000000000..caba78c9cf13
--- /dev/null
+++ b/test/parser/samples/error-window-children/input-v2.html
@@ -0,0 +1 @@
+<svelte:window>contents</svelte:window>
\ No newline at end of file
diff --git a/test/parser/samples/error-window-duplicate/input-v2.html b/test/parser/samples/error-window-duplicate/input-v2.html
new file mode 100644
index 000000000000..7f6a0285248c
--- /dev/null
+++ b/test/parser/samples/error-window-duplicate/input-v2.html
@@ -0,0 +1,2 @@
+<svelte:window/>
+<svelte:window/>
\ No newline at end of file
diff --git a/test/parser/samples/error-window-inside-block/input-v2.html b/test/parser/samples/error-window-inside-block/input-v2.html
new file mode 100644
index 000000000000..e106e061e3c9
--- /dev/null
+++ b/test/parser/samples/error-window-inside-block/input-v2.html
@@ -0,0 +1,3 @@
+{#if foo}
+	<svelte:window/>
+{/if}
\ No newline at end of file
diff --git a/test/parser/samples/error-window-inside-element/input-v2.html b/test/parser/samples/error-window-inside-element/input-v2.html
new file mode 100644
index 000000000000..a10a0f479a0b
--- /dev/null
+++ b/test/parser/samples/error-window-inside-element/input-v2.html
@@ -0,0 +1,3 @@
+<div>
+	<svelte:window/>
+</div>
\ No newline at end of file
diff --git a/test/parser/samples/error-window-inside-element/input.html b/test/parser/samples/error-window-inside-element/input.html
index edda05bfbbc7..083de6a7d36c 100644
--- a/test/parser/samples/error-window-inside-element/input.html
+++ b/test/parser/samples/error-window-inside-element/input.html
@@ -1,3 +1,3 @@
 <div>
 	<:Window/>
-</div>>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/test/parser/samples/event-handler/_actual-v2.json b/test/parser/samples/event-handler/_actual-v2.json
new file mode 100644
index 000000000000..ce290b00e068
--- /dev/null
+++ b/test/parser/samples/event-handler/_actual-v2.json
@@ -0,0 +1,109 @@
+{
+	"hash": "qi54it",
+	"html": {
+		"start": 0,
+		"end": 97,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 61,
+				"type": "Element",
+				"name": "button",
+				"attributes": [
+					{
+						"start": 8,
+						"end": 45,
+						"type": "EventHandler",
+						"name": "click",
+						"expression": {
+							"type": "CallExpression",
+							"start": 18,
+							"end": 44,
+							"callee": {
+								"type": "Identifier",
+								"start": 18,
+								"end": 21,
+								"name": "set"
+							},
+							"arguments": [
+								{
+									"type": "ObjectExpression",
+									"start": 22,
+									"end": 43,
+									"properties": [
+										{
+											"type": "Property",
+											"start": 24,
+											"end": 41,
+											"method": false,
+											"shorthand": false,
+											"computed": false,
+											"key": {
+												"type": "Identifier",
+												"start": 24,
+												"end": 31,
+												"name": "visible"
+											},
+											"value": {
+												"type": "UnaryExpression",
+												"start": 33,
+												"end": 41,
+												"operator": "!",
+												"prefix": true,
+												"argument": {
+													"type": "Identifier",
+													"start": 34,
+													"end": 41,
+													"name": "visible"
+												}
+											},
+											"kind": "init"
+										}
+									]
+								}
+							]
+						}
+					}
+				],
+				"children": [
+					{
+						"start": 46,
+						"end": 52,
+						"type": "Text",
+						"data": "toggle"
+					}
+				]
+			},
+			{
+				"start": 61,
+				"end": 78,
+				"type": "Text",
+				"data": "\n\n{#if visible}\n\t"
+			},
+			{
+				"start": 78,
+				"end": 91,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 81,
+						"end": 87,
+						"type": "Text",
+						"data": "hello!"
+					}
+				]
+			},
+			{
+				"start": 91,
+				"end": 97,
+				"type": "Text",
+				"data": "\n{/if}"
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/event-handler/input-v2.html b/test/parser/samples/event-handler/input-v2.html
new file mode 100644
index 000000000000..731fe32e7518
--- /dev/null
+++ b/test/parser/samples/event-handler/input-v2.html
@@ -0,0 +1,5 @@
+<button on:click='set({ visible: !visible })'>toggle</button>
+
+{#if visible}
+	<p>hello!</p>
+{/if}
diff --git a/test/parser/samples/event-handler/output-v2.json b/test/parser/samples/event-handler/output-v2.json
new file mode 100644
index 000000000000..2b5844bb1bbf
--- /dev/null
+++ b/test/parser/samples/event-handler/output-v2.json
@@ -0,0 +1,116 @@
+{
+	"hash": 4260626221,
+	"html": {
+		"start": 0,
+		"end": 101,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 61,
+				"type": "Element",
+				"name": "button",
+				"attributes": [
+					{
+						"start": 8,
+						"end": 45,
+						"type": "EventHandler",
+						"name": "click",
+						"expression": {
+							"type": "CallExpression",
+							"start": 18,
+							"end": 44,
+							"callee": {
+								"type": "Identifier",
+								"start": 18,
+								"end": 21,
+								"name": "set"
+							},
+							"arguments": [
+								{
+									"type": "ObjectExpression",
+									"start": 22,
+									"end": 43,
+									"properties": [
+										{
+											"type": "Property",
+											"start": 24,
+											"end": 41,
+											"method": false,
+											"shorthand": false,
+											"computed": false,
+											"key": {
+												"type": "Identifier",
+												"start": 24,
+												"end": 31,
+												"name": "visible"
+											},
+											"value": {
+												"type": "UnaryExpression",
+												"start": 33,
+												"end": 41,
+												"operator": "!",
+												"prefix": true,
+												"argument": {
+													"type": "Identifier",
+													"start": 34,
+													"end": 41,
+													"name": "visible"
+												}
+											},
+											"kind": "init"
+										}
+									]
+								}
+							]
+						}
+					}
+				],
+				"children": [
+					{
+						"start": 46,
+						"end": 52,
+						"type": "Text",
+						"data": "toggle"
+					}
+				]
+			},
+			{
+				"start": 61,
+				"end": 63,
+				"type": "Text",
+				"data": "\n\n"
+			},
+			{
+				"start": 63,
+				"end": 101,
+				"type": "IfBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 69,
+					"end": 76,
+					"name": "visible"
+				},
+				"children": [
+					{
+						"start": 80,
+						"end": 93,
+						"type": "Element",
+						"name": "p",
+						"attributes": [],
+						"children": [
+							{
+								"start": 83,
+								"end": 89,
+								"type": "Text",
+								"data": "hello!"
+							}
+						]
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/if-block-else/_actual-v2.json b/test/parser/samples/if-block-else/_actual-v2.json
new file mode 100644
index 000000000000..2fffac3d3ea5
--- /dev/null
+++ b/test/parser/samples/if-block-else/_actual-v2.json
@@ -0,0 +1,60 @@
+{
+	"hash": "dbh411",
+	"html": {
+		"start": 0,
+		"end": 51,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 11,
+				"type": "Text",
+				"data": "{#if foo}\n\t"
+			},
+			{
+				"start": 11,
+				"end": 21,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 14,
+						"end": 17,
+						"type": "Text",
+						"data": "foo"
+					}
+				]
+			},
+			{
+				"start": 21,
+				"end": 31,
+				"type": "Text",
+				"data": "\n{:else}\n\t"
+			},
+			{
+				"start": 31,
+				"end": 45,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 34,
+						"end": 41,
+						"type": "Text",
+						"data": "not foo"
+					}
+				]
+			},
+			{
+				"start": 45,
+				"end": 51,
+				"type": "Text",
+				"data": "\n{/if}"
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/if-block-else/input-v2.html b/test/parser/samples/if-block-else/input-v2.html
new file mode 100644
index 000000000000..28b41c046c07
--- /dev/null
+++ b/test/parser/samples/if-block-else/input-v2.html
@@ -0,0 +1,5 @@
+{#if foo}
+	<p>foo</p>
+{:else}
+	<p>not foo</p>
+{/if}
diff --git a/test/parser/samples/if-block-else/output-v2.json b/test/parser/samples/if-block-else/output-v2.json
new file mode 100644
index 000000000000..af2c611220b1
--- /dev/null
+++ b/test/parser/samples/if-block-else/output-v2.json
@@ -0,0 +1,62 @@
+{
+	"hash": 3134964533,
+	"html": {
+		"start": 0,
+		"end": 56,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 56,
+				"type": "IfBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 6,
+					"end": 9,
+					"name": "foo"
+				},
+				"children": [
+					{
+						"start": 13,
+						"end": 23,
+						"type": "Element",
+						"name": "p",
+						"attributes": [],
+						"children": [
+							{
+								"start": 16,
+								"end": 19,
+								"type": "Text",
+								"data": "foo"
+							}
+						]
+					}
+				],
+				"else": {
+					"start": 32,
+					"end": 49,
+					"type": "ElseBlock",
+					"children": [
+						{
+							"start": 34,
+							"end": 48,
+							"type": "Element",
+							"name": "p",
+							"attributes": [],
+							"children": [
+								{
+									"start": 37,
+									"end": 44,
+									"type": "Text",
+									"data": "not foo"
+								}
+							]
+						}
+					]
+				}
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/if-block-elseif/input-v2.html b/test/parser/samples/if-block-elseif/input-v2.html
new file mode 100644
index 000000000000..a3bd474af72e
--- /dev/null
+++ b/test/parser/samples/if-block-elseif/input-v2.html
@@ -0,0 +1,5 @@
+{#if x > 10}
+	<p>x is greater than 10</p>
+{:elseif x < 5}
+	<p>x is less than 5</p>
+{/if}
diff --git a/test/parser/samples/if-block/_actual-v2.json b/test/parser/samples/if-block/_actual-v2.json
new file mode 100644
index 000000000000..74de1716e8b2
--- /dev/null
+++ b/test/parser/samples/if-block/_actual-v2.json
@@ -0,0 +1,18 @@
+{
+	"hash": "w7ju0y",
+	"html": {
+		"start": 0,
+		"end": 17,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 17,
+				"type": "Text",
+				"data": "{#if foo}bar{/if}"
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/if-block/input-v2.html b/test/parser/samples/if-block/input-v2.html
new file mode 100644
index 000000000000..5851347a88d7
--- /dev/null
+++ b/test/parser/samples/if-block/input-v2.html
@@ -0,0 +1 @@
+{#if foo}bar{/if}
diff --git a/test/parser/samples/if-block/output-v2.json b/test/parser/samples/if-block/output-v2.json
new file mode 100644
index 000000000000..d523d415964f
--- /dev/null
+++ b/test/parser/samples/if-block/output-v2.json
@@ -0,0 +1,31 @@
+{
+	"hash": 2374871934,
+	"html": {
+		"start": 0,
+		"end": 21,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 21,
+				"type": "IfBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 6,
+					"end": 9,
+					"name": "foo"
+				},
+				"children": [
+					{
+						"start": 11,
+						"end": 14,
+						"type": "Text",
+						"data": "bar"
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/implicitly-closed-li/_actual-v2.json b/test/parser/samples/implicitly-closed-li/_actual-v2.json
new file mode 100644
index 000000000000..883505ace06a
--- /dev/null
+++ b/test/parser/samples/implicitly-closed-li/_actual-v2.json
@@ -0,0 +1,72 @@
+{
+	"hash": "232dvg",
+	"html": {
+		"start": 0,
+		"end": 31,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 31,
+				"type": "Element",
+				"name": "ul",
+				"attributes": [],
+				"children": [
+					{
+						"start": 4,
+						"end": 6,
+						"type": "Text",
+						"data": "\n\t"
+					},
+					{
+						"start": 6,
+						"end": 13,
+						"type": "Element",
+						"name": "li",
+						"attributes": [],
+						"children": [
+							{
+								"start": 10,
+								"end": 13,
+								"type": "Text",
+								"data": "a\n\t"
+							}
+						]
+					},
+					{
+						"start": 13,
+						"end": 20,
+						"type": "Element",
+						"name": "li",
+						"attributes": [],
+						"children": [
+							{
+								"start": 17,
+								"end": 20,
+								"type": "Text",
+								"data": "b\n\t"
+							}
+						]
+					},
+					{
+						"start": 20,
+						"end": 26,
+						"type": "Element",
+						"name": "li",
+						"attributes": [],
+						"children": [
+							{
+								"start": 24,
+								"end": 26,
+								"type": "Text",
+								"data": "c\n"
+							}
+						]
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/implicitly-closed-li/input-v2.html b/test/parser/samples/implicitly-closed-li/input-v2.html
new file mode 100644
index 000000000000..14fc1168baae
--- /dev/null
+++ b/test/parser/samples/implicitly-closed-li/input-v2.html
@@ -0,0 +1,5 @@
+<ul>
+	<li>a
+	<li>b
+	<li>c
+</ul>
\ No newline at end of file
diff --git a/test/parser/samples/implicitly-closed-li/output-v2.json b/test/parser/samples/implicitly-closed-li/output-v2.json
new file mode 100644
index 000000000000..f2aca52f6872
--- /dev/null
+++ b/test/parser/samples/implicitly-closed-li/output-v2.json
@@ -0,0 +1,72 @@
+{
+	"hash": 126082492,
+	"html": {
+		"start": 0,
+		"end": 31,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 31,
+				"type": "Element",
+				"name": "ul",
+				"attributes": [],
+				"children": [
+					{
+						"start": 4,
+						"end": 6,
+						"type": "Text",
+						"data": "\n\t"
+					},
+					{
+						"start": 6,
+						"end": 13,
+						"type": "Element",
+						"name": "li",
+						"attributes": [],
+						"children": [
+							{
+								"start": 10,
+								"end": 13,
+								"type": "Text",
+								"data": "a\n\t"
+							}
+						]
+					},
+					{
+						"start": 13,
+						"end": 20,
+						"type": "Element",
+						"name": "li",
+						"attributes": [],
+						"children": [
+							{
+								"start": 17,
+								"end": 20,
+								"type": "Text",
+								"data": "b\n\t"
+							}
+						]
+					},
+					{
+						"start": 20,
+						"end": 26,
+						"type": "Element",
+						"name": "li",
+						"attributes": [],
+						"children": [
+							{
+								"start": 24,
+								"end": 26,
+								"type": "Text",
+								"data": "c\n"
+							}
+						]
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/nbsp/_actual-v2.json b/test/parser/samples/nbsp/_actual-v2.json
new file mode 100644
index 000000000000..48f4643a9db8
--- /dev/null
+++ b/test/parser/samples/nbsp/_actual-v2.json
@@ -0,0 +1,27 @@
+{
+	"hash": "1uypmr0",
+	"html": {
+		"start": 0,
+		"end": 19,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 19,
+				"type": "Element",
+				"name": "span",
+				"attributes": [],
+				"children": [
+					{
+						"start": 6,
+						"end": 12,
+						"type": "Text",
+						"data": " "
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/nbsp/input-v2.html b/test/parser/samples/nbsp/input-v2.html
new file mode 100644
index 000000000000..11cd588757a4
--- /dev/null
+++ b/test/parser/samples/nbsp/input-v2.html
@@ -0,0 +1 @@
+<span>&nbsp;</span>
\ No newline at end of file
diff --git a/test/parser/samples/nbsp/output-v2.json b/test/parser/samples/nbsp/output-v2.json
new file mode 100644
index 000000000000..8b7d487f160f
--- /dev/null
+++ b/test/parser/samples/nbsp/output-v2.json
@@ -0,0 +1,27 @@
+{
+	"hash": 4049070444,
+	"html": {
+		"start": 0,
+		"end": 19,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 19,
+				"type": "Element",
+				"name": "span",
+				"attributes": [],
+				"children": [
+					{
+						"start": 6,
+						"end": 12,
+						"type": "Text",
+						"data": " "
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/raw-mustaches/_actual-v2.json b/test/parser/samples/raw-mustaches/_actual-v2.json
new file mode 100644
index 000000000000..1d3445d24efb
--- /dev/null
+++ b/test/parser/samples/raw-mustaches/_actual-v2.json
@@ -0,0 +1,27 @@
+{
+	"hash": "9m9gjd",
+	"html": {
+		"start": 0,
+		"end": 34,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 34,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 3,
+						"end": 30,
+						"type": "Text",
+						"data": " {@html raw1} {@html raw2} "
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/raw-mustaches/input-v2.html b/test/parser/samples/raw-mustaches/input-v2.html
new file mode 100644
index 000000000000..979697835fe9
--- /dev/null
+++ b/test/parser/samples/raw-mustaches/input-v2.html
@@ -0,0 +1 @@
+<p> {@html raw1} {@html raw2} </p>
diff --git a/test/parser/samples/raw-mustaches/output-v2.json b/test/parser/samples/raw-mustaches/output-v2.json
new file mode 100644
index 000000000000..e4a1b91c6c40
--- /dev/null
+++ b/test/parser/samples/raw-mustaches/output-v2.json
@@ -0,0 +1,61 @@
+{
+	"hash": 183399343,
+	"html": {
+		"start": 0,
+		"end": 30,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 30,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 3,
+						"end": 4,
+						"type": "Text",
+						"data": " "
+					},
+					{
+						"start": 4,
+						"end": 14,
+						"type": "RawMustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 7,
+							"end": 11,
+							"name": "raw1"
+						}
+					},
+					{
+						"start": 14,
+						"end": 15,
+						"type": "Text",
+						"data": " "
+					},
+					{
+						"start": 15,
+						"end": 25,
+						"type": "RawMustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 18,
+							"end": 22,
+							"name": "raw2"
+						}
+					},
+					{
+						"start": 25,
+						"end": 26,
+						"type": "Text",
+						"data": " "
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/refs/_actual-v2.json b/test/parser/samples/refs/_actual-v2.json
new file mode 100644
index 000000000000..72d1c864ce63
--- /dev/null
+++ b/test/parser/samples/refs/_actual-v2.json
@@ -0,0 +1,27 @@
+{
+	"hash": "e2azib",
+	"html": {
+		"start": 0,
+		"end": 25,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 25,
+				"type": "Element",
+				"name": "canvas",
+				"attributes": [
+					{
+						"start": 8,
+						"end": 15,
+						"type": "Ref",
+						"name": "foo"
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/refs/input-v2.html b/test/parser/samples/refs/input-v2.html
new file mode 100644
index 000000000000..fccbae26904c
--- /dev/null
+++ b/test/parser/samples/refs/input-v2.html
@@ -0,0 +1 @@
+<canvas ref:foo></canvas>
\ No newline at end of file
diff --git a/test/parser/samples/refs/output-v2.json b/test/parser/samples/refs/output-v2.json
new file mode 100644
index 000000000000..37761abaff76
--- /dev/null
+++ b/test/parser/samples/refs/output-v2.json
@@ -0,0 +1,27 @@
+{
+	"hash": 850398275,
+	"html": {
+		"start": 0,
+		"end": 25,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 25,
+				"type": "Element",
+				"name": "canvas",
+				"attributes": [
+					{
+						"start": 8,
+						"end": 15,
+						"type": "Ref",
+						"name": "foo"
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-only/_actual-v2.json b/test/parser/samples/script-comment-only/_actual-v2.json
new file mode 100644
index 000000000000..a1371cc31513
--- /dev/null
+++ b/test/parser/samples/script-comment-only/_actual-v2.json
@@ -0,0 +1,26 @@
+{
+	"hash": "1l2u88a",
+	"html": {
+		"start": 0,
+		"end": 11,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 11,
+				"type": "Element",
+				"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-only/input-v2.html b/test/parser/samples/script-comment-only/input-v2.html
new file mode 100644
index 000000000000..334e686c3094
--- /dev/null
+++ b/test/parser/samples/script-comment-only/input-v2.html
@@ -0,0 +1,5 @@
+<div></div>
+
+<script>
+	// TODO write some code
+</script>
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-only/output-v2.json b/test/parser/samples/script-comment-only/output-v2.json
new file mode 100644
index 000000000000..1dcc6fe1f4fb
--- /dev/null
+++ b/test/parser/samples/script-comment-only/output-v2.json
@@ -0,0 +1,26 @@
+{
+	"hash": 3451341610,
+	"html": {
+		"start": 0,
+		"end": 11,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 11,
+				"type": "Element",
+				"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/_actual-v2.json b/test/parser/samples/script-comment-trailing-multiline/_actual-v2.json
new file mode 100644
index 000000000000..4d68bedef77f
--- /dev/null
+++ b/test/parser/samples/script-comment-trailing-multiline/_actual-v2.json
@@ -0,0 +1,111 @@
+{
+	"hash": "lvjec0",
+	"html": {
+		"start": 0,
+		"end": 22,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 22,
+				"type": "Element",
+				"name": "h1",
+				"attributes": [],
+				"children": [
+					{
+						"start": 4,
+						"end": 17,
+						"type": "Text",
+						"data": "Hello {name}!"
+					}
+				]
+			},
+			{
+				"start": 22,
+				"end": 24,
+				"type": "Text",
+				"data": "\n\n"
+			}
+		]
+	},
+	"css": null,
+	"js": {
+		"start": 24,
+		"end": 141,
+		"attributes": [],
+		"content": {
+			"type": "Program",
+			"start": 32,
+			"end": 132,
+			"body": [
+				{
+					"type": "ExportDefaultDeclaration",
+					"start": 34,
+					"end": 93,
+					"declaration": {
+						"type": "ObjectExpression",
+						"start": 49,
+						"end": 92,
+						"properties": [
+							{
+								"type": "Property",
+								"start": 53,
+								"end": 89,
+								"method": false,
+								"shorthand": false,
+								"computed": false,
+								"key": {
+									"type": "Identifier",
+									"start": 53,
+									"end": 57,
+									"name": "data"
+								},
+								"value": {
+									"type": "ArrowFunctionExpression",
+									"start": 59,
+									"end": 89,
+									"id": null,
+									"generator": false,
+									"expression": true,
+									"async": false,
+									"params": [],
+									"body": {
+										"type": "ObjectExpression",
+										"start": 66,
+										"end": 88,
+										"properties": [
+											{
+												"type": "Property",
+												"start": 71,
+												"end": 84,
+												"method": false,
+												"shorthand": false,
+												"computed": false,
+												"key": {
+													"type": "Identifier",
+													"start": 71,
+													"end": 75,
+													"name": "name"
+												},
+												"value": {
+													"type": "Literal",
+													"start": 77,
+													"end": 84,
+													"value": "world",
+													"raw": "'world'"
+												},
+												"kind": "init"
+											}
+										]
+									}
+								},
+								"kind": "init"
+							}
+						]
+					}
+				}
+			],
+			"sourceType": "module"
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-trailing-multiline/input-v2.html b/test/parser/samples/script-comment-trailing-multiline/input-v2.html
new file mode 100644
index 000000000000..dff2dc428f2c
--- /dev/null
+++ b/test/parser/samples/script-comment-trailing-multiline/input-v2.html
@@ -0,0 +1,13 @@
+<h1>Hello {name}!</h1>
+
+<script>
+	export default {
+		data: () => ({
+			name: 'world'
+		})
+	};
+
+	/*
+		trailing multiline comment
+	*/
+</script>
diff --git a/test/parser/samples/script-comment-trailing-multiline/output-v2.json b/test/parser/samples/script-comment-trailing-multiline/output-v2.json
new file mode 100644
index 000000000000..4319919ee5da
--- /dev/null
+++ b/test/parser/samples/script-comment-trailing-multiline/output-v2.json
@@ -0,0 +1,128 @@
+{
+	"hash": 1378757574,
+	"html": {
+		"start": 0,
+		"end": 24,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 24,
+				"type": "Element",
+				"name": "h1",
+				"attributes": [],
+				"children": [
+					{
+						"start": 4,
+						"end": 10,
+						"type": "Text",
+						"data": "Hello "
+					},
+					{
+						"start": 10,
+						"end": 18,
+						"type": "MustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 12,
+							"end": 16,
+							"name": "name"
+						}
+					},
+					{
+						"start": 18,
+						"end": 19,
+						"type": "Text",
+						"data": "!"
+					}
+				]
+			},
+			{
+				"start": 24,
+				"end": 26,
+				"type": "Text",
+				"data": "\n\n"
+			}
+		]
+	},
+	"css": null,
+	"js": {
+		"start": 26,
+		"end": 143,
+		"attributes": [],
+		"content": {
+			"type": "Program",
+			"start": 34,
+			"end": 134,
+			"body": [
+				{
+					"type": "ExportDefaultDeclaration",
+					"start": 36,
+					"end": 95,
+					"declaration": {
+						"type": "ObjectExpression",
+						"start": 51,
+						"end": 94,
+						"properties": [
+							{
+								"type": "Property",
+								"start": 55,
+								"end": 91,
+								"method": false,
+								"shorthand": false,
+								"computed": false,
+								"key": {
+									"type": "Identifier",
+									"start": 55,
+									"end": 59,
+									"name": "data"
+								},
+								"value": {
+									"type": "ArrowFunctionExpression",
+									"start": 61,
+									"end": 91,
+									"id": null,
+									"generator": false,
+									"expression": true,
+									"async": false,
+									"params": [],
+									"body": {
+										"type": "ObjectExpression",
+										"start": 68,
+										"end": 90,
+										"properties": [
+											{
+												"type": "Property",
+												"start": 73,
+												"end": 86,
+												"method": false,
+												"shorthand": false,
+												"computed": false,
+												"key": {
+													"type": "Identifier",
+													"start": 73,
+													"end": 77,
+													"name": "name"
+												},
+												"value": {
+													"type": "Literal",
+													"start": 79,
+													"end": 86,
+													"value": "world",
+													"raw": "'world'"
+												},
+												"kind": "init"
+											}
+										]
+									}
+								},
+								"kind": "init"
+							}
+						]
+					}
+				}
+			],
+			"sourceType": "module"
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-trailing/_actual-v2.json b/test/parser/samples/script-comment-trailing/_actual-v2.json
new file mode 100644
index 000000000000..6d0fe047ef93
--- /dev/null
+++ b/test/parser/samples/script-comment-trailing/_actual-v2.json
@@ -0,0 +1,111 @@
+{
+	"hash": "19sno7e",
+	"html": {
+		"start": 0,
+		"end": 22,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 22,
+				"type": "Element",
+				"name": "h1",
+				"attributes": [],
+				"children": [
+					{
+						"start": 4,
+						"end": 17,
+						"type": "Text",
+						"data": "Hello {name}!"
+					}
+				]
+			},
+			{
+				"start": 22,
+				"end": 24,
+				"type": "Text",
+				"data": "\n\n"
+			}
+		]
+	},
+	"css": null,
+	"js": {
+		"start": 24,
+		"end": 130,
+		"attributes": [],
+		"content": {
+			"type": "Program",
+			"start": 32,
+			"end": 121,
+			"body": [
+				{
+					"type": "ExportDefaultDeclaration",
+					"start": 34,
+					"end": 93,
+					"declaration": {
+						"type": "ObjectExpression",
+						"start": 49,
+						"end": 92,
+						"properties": [
+							{
+								"type": "Property",
+								"start": 53,
+								"end": 89,
+								"method": false,
+								"shorthand": false,
+								"computed": false,
+								"key": {
+									"type": "Identifier",
+									"start": 53,
+									"end": 57,
+									"name": "data"
+								},
+								"value": {
+									"type": "ArrowFunctionExpression",
+									"start": 59,
+									"end": 89,
+									"id": null,
+									"generator": false,
+									"expression": true,
+									"async": false,
+									"params": [],
+									"body": {
+										"type": "ObjectExpression",
+										"start": 66,
+										"end": 88,
+										"properties": [
+											{
+												"type": "Property",
+												"start": 71,
+												"end": 84,
+												"method": false,
+												"shorthand": false,
+												"computed": false,
+												"key": {
+													"type": "Identifier",
+													"start": 71,
+													"end": 75,
+													"name": "name"
+												},
+												"value": {
+													"type": "Literal",
+													"start": 77,
+													"end": 84,
+													"value": "world",
+													"raw": "'world'"
+												},
+												"kind": "init"
+											}
+										]
+									}
+								},
+								"kind": "init"
+							}
+						]
+					}
+				}
+			],
+			"sourceType": "module"
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-trailing/input-v2.html b/test/parser/samples/script-comment-trailing/input-v2.html
new file mode 100644
index 000000000000..d126aad2fbae
--- /dev/null
+++ b/test/parser/samples/script-comment-trailing/input-v2.html
@@ -0,0 +1,11 @@
+<h1>Hello {name}!</h1>
+
+<script>
+	export default {
+		data: () => ({
+			name: 'world'
+		})
+	};
+
+	// trailing line comment
+</script>
diff --git a/test/parser/samples/script-comment-trailing/output-v2.json b/test/parser/samples/script-comment-trailing/output-v2.json
new file mode 100644
index 000000000000..2977d6a7faca
--- /dev/null
+++ b/test/parser/samples/script-comment-trailing/output-v2.json
@@ -0,0 +1,128 @@
+{
+	"hash": 619854804,
+	"html": {
+		"start": 0,
+		"end": 24,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 24,
+				"type": "Element",
+				"name": "h1",
+				"attributes": [],
+				"children": [
+					{
+						"start": 4,
+						"end": 10,
+						"type": "Text",
+						"data": "Hello "
+					},
+					{
+						"start": 10,
+						"end": 18,
+						"type": "MustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 12,
+							"end": 16,
+							"name": "name"
+						}
+					},
+					{
+						"start": 18,
+						"end": 19,
+						"type": "Text",
+						"data": "!"
+					}
+				]
+			},
+			{
+				"start": 24,
+				"end": 26,
+				"type": "Text",
+				"data": "\n\n"
+			}
+		]
+	},
+	"css": null,
+	"js": {
+		"start": 26,
+		"end": 132,
+		"attributes": [],
+		"content": {
+			"type": "Program",
+			"start": 34,
+			"end": 123,
+			"body": [
+				{
+					"type": "ExportDefaultDeclaration",
+					"start": 36,
+					"end": 95,
+					"declaration": {
+						"type": "ObjectExpression",
+						"start": 51,
+						"end": 94,
+						"properties": [
+							{
+								"type": "Property",
+								"start": 55,
+								"end": 91,
+								"method": false,
+								"shorthand": false,
+								"computed": false,
+								"key": {
+									"type": "Identifier",
+									"start": 55,
+									"end": 59,
+									"name": "data"
+								},
+								"value": {
+									"type": "ArrowFunctionExpression",
+									"start": 61,
+									"end": 91,
+									"id": null,
+									"generator": false,
+									"expression": true,
+									"async": false,
+									"params": [],
+									"body": {
+										"type": "ObjectExpression",
+										"start": 68,
+										"end": 90,
+										"properties": [
+											{
+												"type": "Property",
+												"start": 73,
+												"end": 86,
+												"method": false,
+												"shorthand": false,
+												"computed": false,
+												"key": {
+													"type": "Identifier",
+													"start": 73,
+													"end": 77,
+													"name": "name"
+												},
+												"value": {
+													"type": "Literal",
+													"start": 79,
+													"end": 86,
+													"value": "world",
+													"raw": "'world'"
+												},
+												"kind": "init"
+											}
+										]
+									}
+								},
+								"kind": "init"
+							}
+						]
+					}
+				}
+			],
+			"sourceType": "module"
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/parser/samples/script/_actual-v2.json b/test/parser/samples/script/_actual-v2.json
new file mode 100644
index 000000000000..ddc8d043c50d
--- /dev/null
+++ b/test/parser/samples/script/_actual-v2.json
@@ -0,0 +1,111 @@
+{
+	"hash": "6jy7zq",
+	"html": {
+		"start": 0,
+		"end": 22,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 22,
+				"type": "Element",
+				"name": "h1",
+				"attributes": [],
+				"children": [
+					{
+						"start": 4,
+						"end": 17,
+						"type": "Text",
+						"data": "Hello {name}!"
+					}
+				]
+			},
+			{
+				"start": 22,
+				"end": 24,
+				"type": "Text",
+				"data": "\n\n"
+			}
+		]
+	},
+	"css": null,
+	"js": {
+		"start": 24,
+		"end": 103,
+		"attributes": [],
+		"content": {
+			"type": "Program",
+			"start": 32,
+			"end": 94,
+			"body": [
+				{
+					"type": "ExportDefaultDeclaration",
+					"start": 34,
+					"end": 93,
+					"declaration": {
+						"type": "ObjectExpression",
+						"start": 49,
+						"end": 92,
+						"properties": [
+							{
+								"type": "Property",
+								"start": 53,
+								"end": 89,
+								"method": false,
+								"shorthand": false,
+								"computed": false,
+								"key": {
+									"type": "Identifier",
+									"start": 53,
+									"end": 57,
+									"name": "data"
+								},
+								"value": {
+									"type": "ArrowFunctionExpression",
+									"start": 59,
+									"end": 89,
+									"id": null,
+									"generator": false,
+									"expression": true,
+									"async": false,
+									"params": [],
+									"body": {
+										"type": "ObjectExpression",
+										"start": 66,
+										"end": 88,
+										"properties": [
+											{
+												"type": "Property",
+												"start": 71,
+												"end": 84,
+												"method": false,
+												"shorthand": false,
+												"computed": false,
+												"key": {
+													"type": "Identifier",
+													"start": 71,
+													"end": 75,
+													"name": "name"
+												},
+												"value": {
+													"type": "Literal",
+													"start": 77,
+													"end": 84,
+													"value": "world",
+													"raw": "'world'"
+												},
+												"kind": "init"
+											}
+										]
+									}
+								},
+								"kind": "init"
+							}
+						]
+					}
+				}
+			],
+			"sourceType": "module"
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/parser/samples/script/input-v2.html b/test/parser/samples/script/input-v2.html
new file mode 100644
index 000000000000..afd9e23a7311
--- /dev/null
+++ b/test/parser/samples/script/input-v2.html
@@ -0,0 +1,9 @@
+<h1>Hello {name}!</h1>
+
+<script>
+	export default {
+		data: () => ({
+			name: 'world'
+		})
+	};
+</script>
diff --git a/test/parser/samples/script/output-v2.json b/test/parser/samples/script/output-v2.json
new file mode 100644
index 000000000000..5c8acef657ba
--- /dev/null
+++ b/test/parser/samples/script/output-v2.json
@@ -0,0 +1,128 @@
+{
+	"hash": 388108696,
+	"html": {
+		"start": 0,
+		"end": 24,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 24,
+				"type": "Element",
+				"name": "h1",
+				"attributes": [],
+				"children": [
+					{
+						"start": 4,
+						"end": 10,
+						"type": "Text",
+						"data": "Hello "
+					},
+					{
+						"start": 10,
+						"end": 18,
+						"type": "MustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 12,
+							"end": 16,
+							"name": "name"
+						}
+					},
+					{
+						"start": 18,
+						"end": 19,
+						"type": "Text",
+						"data": "!"
+					}
+				]
+			},
+			{
+				"start": 24,
+				"end": 26,
+				"type": "Text",
+				"data": "\n\n"
+			}
+		]
+	},
+	"css": null,
+	"js": {
+		"start": 26,
+		"end": 105,
+		"attributes": [],
+		"content": {
+			"type": "Program",
+			"start": 34,
+			"end": 96,
+			"body": [
+				{
+					"type": "ExportDefaultDeclaration",
+					"start": 36,
+					"end": 95,
+					"declaration": {
+						"type": "ObjectExpression",
+						"start": 51,
+						"end": 94,
+						"properties": [
+							{
+								"type": "Property",
+								"start": 55,
+								"end": 91,
+								"method": false,
+								"shorthand": false,
+								"computed": false,
+								"key": {
+									"type": "Identifier",
+									"start": 55,
+									"end": 59,
+									"name": "data"
+								},
+								"value": {
+									"type": "ArrowFunctionExpression",
+									"start": 61,
+									"end": 91,
+									"id": null,
+									"generator": false,
+									"expression": true,
+									"async": false,
+									"params": [],
+									"body": {
+										"type": "ObjectExpression",
+										"start": 68,
+										"end": 90,
+										"properties": [
+											{
+												"type": "Property",
+												"start": 73,
+												"end": 86,
+												"method": false,
+												"shorthand": false,
+												"computed": false,
+												"key": {
+													"type": "Identifier",
+													"start": 73,
+													"end": 77,
+													"name": "name"
+												},
+												"value": {
+													"type": "Literal",
+													"start": 79,
+													"end": 86,
+													"value": "world",
+													"raw": "'world'"
+												},
+												"kind": "init"
+											}
+										]
+									}
+								},
+								"kind": "init"
+							}
+						]
+					}
+				}
+			],
+			"sourceType": "module"
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/parser/samples/self-closing-element/_actual-v2.json b/test/parser/samples/self-closing-element/_actual-v2.json
new file mode 100644
index 000000000000..f36d243df10e
--- /dev/null
+++ b/test/parser/samples/self-closing-element/_actual-v2.json
@@ -0,0 +1,20 @@
+{
+	"hash": "1xgowd3",
+	"html": {
+		"start": 0,
+		"end": 6,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 6,
+				"type": "Element",
+				"name": "div",
+				"attributes": [],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/self-closing-element/input-v2.html b/test/parser/samples/self-closing-element/input-v2.html
new file mode 100644
index 000000000000..78e7012b8224
--- /dev/null
+++ b/test/parser/samples/self-closing-element/input-v2.html
@@ -0,0 +1 @@
+<div/>
\ No newline at end of file
diff --git a/test/parser/samples/self-closing-element/output-v2.json b/test/parser/samples/self-closing-element/output-v2.json
new file mode 100644
index 000000000000..80c1ef5bde64
--- /dev/null
+++ b/test/parser/samples/self-closing-element/output-v2.json
@@ -0,0 +1,20 @@
+{
+	"hash": 4200201687,
+	"html": {
+		"start": 0,
+		"end": 6,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 6,
+				"type": "Element",
+				"name": "div",
+				"attributes": [],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/self-reference/_actual-v2.json b/test/parser/samples/self-reference/_actual-v2.json
new file mode 100644
index 000000000000..db449c7cb154
--- /dev/null
+++ b/test/parser/samples/self-reference/_actual-v2.json
@@ -0,0 +1,47 @@
+{
+	"hash": "1wh7lqr",
+	"html": {
+		"start": 0,
+		"end": 57,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 17,
+				"type": "Text",
+				"data": "{#if depth > 1}\n\t"
+			},
+			{
+				"start": 17,
+				"end": 51,
+				"type": "Element",
+				"name": "svelte:self",
+				"attributes": [
+					{
+						"start": 30,
+						"end": 49,
+						"type": "Attribute",
+						"name": "depth",
+						"value": [
+							{
+								"start": 37,
+								"end": 48,
+								"type": "Text",
+								"data": "{depth - 1}"
+							}
+						]
+					}
+				],
+				"children": []
+			},
+			{
+				"start": 51,
+				"end": 57,
+				"type": "Text",
+				"data": "\n{/if}"
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/self-reference/input-v2.html b/test/parser/samples/self-reference/input-v2.html
new file mode 100644
index 000000000000..241a266b7bc6
--- /dev/null
+++ b/test/parser/samples/self-reference/input-v2.html
@@ -0,0 +1,3 @@
+{#if depth > 1}
+	<svelte:self depth='{depth - 1}'/>
+{/if}
\ No newline at end of file
diff --git a/test/parser/samples/self-reference/output-v2.json b/test/parser/samples/self-reference/output-v2.json
new file mode 100644
index 000000000000..f9c788bd2f12
--- /dev/null
+++ b/test/parser/samples/self-reference/output-v2.json
@@ -0,0 +1,79 @@
+{
+	"hash": 216762188,
+	"html": {
+		"start": 0,
+		"end": 57,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 57,
+				"type": "IfBlock",
+				"expression": {
+					"type": "BinaryExpression",
+					"start": 6,
+					"end": 15,
+					"left": {
+						"type": "Identifier",
+						"start": 6,
+						"end": 11,
+						"name": "depth"
+					},
+					"operator": ">",
+					"right": {
+						"type": "Literal",
+						"start": 14,
+						"end": 15,
+						"value": 1,
+						"raw": "1"
+					}
+				},
+				"children": [
+					{
+						"start": 19,
+						"end": 49,
+						"type": "Element",
+						"name": ":Self",
+						"attributes": [
+							{
+								"start": 26,
+								"end": 47,
+								"type": "Attribute",
+								"name": "depth",
+								"value": [
+									{
+										"start": 33,
+										"end": 46,
+										"type": "MustacheTag",
+										"expression": {
+											"type": "BinaryExpression",
+											"start": 35,
+											"end": 44,
+											"left": {
+												"type": "Identifier",
+												"start": 35,
+												"end": 40,
+												"name": "depth"
+											},
+											"operator": "-",
+											"right": {
+												"type": "Literal",
+												"start": 43,
+												"end": 44,
+												"value": 1,
+												"raw": "1"
+											}
+										}
+									}
+								]
+							}
+						],
+						"children": []
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/space-between-mustaches/_actual-v2.json b/test/parser/samples/space-between-mustaches/_actual-v2.json
new file mode 100644
index 000000000000..767a93da367a
--- /dev/null
+++ b/test/parser/samples/space-between-mustaches/_actual-v2.json
@@ -0,0 +1,27 @@
+{
+	"hash": "1n7rpsi",
+	"html": {
+		"start": 0,
+		"end": 24,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 24,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 3,
+						"end": 20,
+						"type": "Text",
+						"data": " {a} {b} : {c} : "
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/space-between-mustaches/input-v2.html b/test/parser/samples/space-between-mustaches/input-v2.html
new file mode 100644
index 000000000000..0dd099df11c4
--- /dev/null
+++ b/test/parser/samples/space-between-mustaches/input-v2.html
@@ -0,0 +1 @@
+<p> {a} {b} : {c} : </p>
diff --git a/test/parser/samples/space-between-mustaches/output-v2.json b/test/parser/samples/space-between-mustaches/output-v2.json
new file mode 100644
index 000000000000..854608fb292a
--- /dev/null
+++ b/test/parser/samples/space-between-mustaches/output-v2.json
@@ -0,0 +1,78 @@
+{
+	"hash": 1185019088,
+	"html": {
+		"start": 0,
+		"end": 30,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 30,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 3,
+						"end": 4,
+						"type": "Text",
+						"data": " "
+					},
+					{
+						"start": 4,
+						"end": 9,
+						"type": "MustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 6,
+							"end": 7,
+							"name": "a"
+						}
+					},
+					{
+						"start": 9,
+						"end": 10,
+						"type": "Text",
+						"data": " "
+					},
+					{
+						"start": 10,
+						"end": 15,
+						"type": "MustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 12,
+							"end": 13,
+							"name": "b"
+						}
+					},
+					{
+						"start": 15,
+						"end": 18,
+						"type": "Text",
+						"data": " : "
+					},
+					{
+						"start": 18,
+						"end": 23,
+						"type": "MustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 20,
+							"end": 21,
+							"name": "c"
+						}
+					},
+					{
+						"start": 23,
+						"end": 26,
+						"type": "Text",
+						"data": " : "
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/spread/_actual-v2.json b/test/parser/samples/spread/_actual-v2.json
new file mode 100644
index 000000000000..48ef177cd7a2
--- /dev/null
+++ b/test/parser/samples/spread/_actual-v2.json
@@ -0,0 +1,28 @@
+{
+	"hash": "z82kse",
+	"html": {
+		"start": 0,
+		"end": 22,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 22,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 15,
+						"type": "Attribute",
+						"name": "{...props}",
+						"value": true
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/spread/input-v2.html b/test/parser/samples/spread/input-v2.html
new file mode 100644
index 000000000000..836425cae3b0
--- /dev/null
+++ b/test/parser/samples/spread/input-v2.html
@@ -0,0 +1 @@
+<div {...props}></div>
diff --git a/test/parser/samples/spread/output-v2.json b/test/parser/samples/spread/output-v2.json
new file mode 100644
index 000000000000..09fa0b3027e3
--- /dev/null
+++ b/test/parser/samples/spread/output-v2.json
@@ -0,0 +1,32 @@
+{
+	"hash": "phg0l6",
+	"html": {
+		"start": 0,
+		"end": 24,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 24,
+				"type": "Element",
+				"name": "div",
+				"attributes": [
+					{
+						"start": 5,
+						"end": 17,
+						"type": "Spread",
+						"expression": {
+							"type": "Identifier",
+							"start": 10,
+							"end": 15,
+							"name": "props"
+						}
+					}
+				],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/textarea-children/_actual-v2.json b/test/parser/samples/textarea-children/_actual-v2.json
new file mode 100644
index 000000000000..12a5b9917319
--- /dev/null
+++ b/test/parser/samples/textarea-children/_actual-v2.json
@@ -0,0 +1,27 @@
+{
+	"hash": "1uyqul7",
+	"html": {
+		"start": 0,
+		"end": 61,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 61,
+				"type": "Element",
+				"name": "textarea",
+				"attributes": [],
+				"children": [
+					{
+						"start": 10,
+						"end": 50,
+						"type": "Text",
+						"data": "\n\t<p>not actually an element. {foo}</p>\n"
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/textarea-children/input-v2.html b/test/parser/samples/textarea-children/input-v2.html
new file mode 100644
index 000000000000..6cc3072e5cb1
--- /dev/null
+++ b/test/parser/samples/textarea-children/input-v2.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-v2.json b/test/parser/samples/textarea-children/output-v2.json
new file mode 100644
index 000000000000..d4ea6f04bb5a
--- /dev/null
+++ b/test/parser/samples/textarea-children/output-v2.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/_actual-v2.json b/test/parser/samples/transition-intro-no-params/_actual-v2.json
new file mode 100644
index 000000000000..6c3b0f0c2749
--- /dev/null
+++ b/test/parser/samples/transition-intro-no-params/_actual-v2.json
@@ -0,0 +1,37 @@
+{
+	"hash": "8bm3vr",
+	"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",
+						"expression": null,
+						"intro": true,
+						"outro": false
+					}
+				],
+				"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-no-params/input-v2.html b/test/parser/samples/transition-intro-no-params/input-v2.html
new file mode 100644
index 000000000000..e5e417143449
--- /dev/null
+++ b/test/parser/samples/transition-intro-no-params/input-v2.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-v2.json b/test/parser/samples/transition-intro-no-params/output-v2.json
new file mode 100644
index 000000000000..cca469ca3e24
--- /dev/null
+++ b/test/parser/samples/transition-intro-no-params/output-v2.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/_actual-v2.json b/test/parser/samples/transition-intro/_actual-v2.json
new file mode 100644
index 000000000000..655d06c8feea
--- /dev/null
+++ b/test/parser/samples/transition-intro/_actual-v2.json
@@ -0,0 +1,65 @@
+{
+	"hash": "1ppqq8i",
+	"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",
+						"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"
+								}
+							]
+						},
+						"intro": true,
+						"outro": false
+					}
+				],
+				"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/transition-intro/input-v2.html b/test/parser/samples/transition-intro/input-v2.html
new file mode 100644
index 000000000000..db14cfcb2f0d
--- /dev/null
+++ b/test/parser/samples/transition-intro/input-v2.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-v2.json b/test/parser/samples/transition-intro/output-v2.json
new file mode 100644
index 000000000000..54ec4da93dd1
--- /dev/null
+++ b/test/parser/samples/transition-intro/output-v2.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/unusual-identifier/_actual-v2.json b/test/parser/samples/unusual-identifier/_actual-v2.json
new file mode 100644
index 000000000000..1a6cb72eb488
--- /dev/null
+++ b/test/parser/samples/unusual-identifier/_actual-v2.json
@@ -0,0 +1,39 @@
+{
+	"hash": "8weqxs",
+	"html": {
+		"start": 0,
+		"end": 41,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 22,
+				"type": "Text",
+				"data": "{#each things as 𐊧}\n\t"
+			},
+			{
+				"start": 22,
+				"end": 33,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 25,
+						"end": 29,
+						"type": "Text",
+						"data": "{𐊧}"
+					}
+				]
+			},
+			{
+				"start": 33,
+				"end": 41,
+				"type": "Text",
+				"data": "\n{/each}"
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/unusual-identifier/input-v2.html b/test/parser/samples/unusual-identifier/input-v2.html
new file mode 100644
index 000000000000..192f632ceb48
--- /dev/null
+++ b/test/parser/samples/unusual-identifier/input-v2.html
@@ -0,0 +1,3 @@
+{#each things as 𐊧}
+	<p>{𐊧}</p>
+{/each}
\ No newline at end of file
diff --git a/test/parser/samples/unusual-identifier/output-v2.json b/test/parser/samples/unusual-identifier/output-v2.json
new file mode 100644
index 000000000000..6434526df596
--- /dev/null
+++ b/test/parser/samples/unusual-identifier/output-v2.json
@@ -0,0 +1,46 @@
+{
+	"hash": 795130236,
+	"html": {
+		"start": 0,
+		"end": 47,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 47,
+				"type": "EachBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 8,
+					"end": 14,
+					"name": "things"
+				},
+				"children": [
+					{
+						"start": 24,
+						"end": 37,
+						"type": "Element",
+						"name": "p",
+						"attributes": [],
+						"children": [
+							{
+								"start": 27,
+								"end": 33,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 29,
+									"end": 31,
+									"name": "𐊧"
+								}
+							}
+						]
+					}
+				],
+				"context": "𐊧"
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/whitespace-leading-trailing/_actual-v2.json b/test/parser/samples/whitespace-leading-trailing/_actual-v2.json
new file mode 100644
index 000000000000..432480cf699d
--- /dev/null
+++ b/test/parser/samples/whitespace-leading-trailing/_actual-v2.json
@@ -0,0 +1,33 @@
+{
+	"hash": "70xqns",
+	"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,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 9,
+						"end": 32,
+						"type": "Text",
+						"data": "just chillin' over here"
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/whitespace-leading-trailing/input-v2.html b/test/parser/samples/whitespace-leading-trailing/input-v2.html
new file mode 100644
index 000000000000..c784c14e9e4e
--- /dev/null
+++ b/test/parser/samples/whitespace-leading-trailing/input-v2.html
@@ -0,0 +1,3 @@
+
+
+				<p>just chillin' over here</p>
\ No newline at end of file
diff --git a/test/parser/samples/whitespace-leading-trailing/output-v2.json b/test/parser/samples/whitespace-leading-trailing/output-v2.json
new file mode 100644
index 000000000000..c057bd1f1e57
--- /dev/null
+++ b/test/parser/samples/whitespace-leading-trailing/output-v2.json
@@ -0,0 +1,33 @@
+{
+	"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,
+				"type": "Element",
+				"name": "p",
+				"attributes": [],
+				"children": [
+					{
+						"start": 9,
+						"end": 32,
+						"type": "Text",
+						"data": "just chillin' over here"
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/whitespace-normal/_actual-v2.json b/test/parser/samples/whitespace-normal/_actual-v2.json
new file mode 100644
index 000000000000..d0a9c66d6a7e
--- /dev/null
+++ b/test/parser/samples/whitespace-normal/_actual-v2.json
@@ -0,0 +1,57 @@
+{
+	"hash": "1827l8g",
+	"html": {
+		"start": 0,
+		"end": 65,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 65,
+				"type": "Element",
+				"name": "h1",
+				"attributes": [],
+				"children": [
+					{
+						"start": 4,
+						"end": 10,
+						"type": "Text",
+						"data": "Hello "
+					},
+					{
+						"start": 10,
+						"end": 35,
+						"type": "Element",
+						"name": "strong",
+						"attributes": [],
+						"children": [
+							{
+								"start": 18,
+								"end": 26,
+								"type": "Text",
+								"data": "{name}! "
+							}
+						]
+					},
+					{
+						"start": 35,
+						"end": 60,
+						"type": "Element",
+						"name": "span",
+						"attributes": [],
+						"children": [
+							{
+								"start": 41,
+								"end": 53,
+								"type": "Text",
+								"data": "How are you?"
+							}
+						]
+					}
+				]
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/whitespace-normal/input-v2.html b/test/parser/samples/whitespace-normal/input-v2.html
new file mode 100644
index 000000000000..c845c255dd29
--- /dev/null
+++ b/test/parser/samples/whitespace-normal/input-v2.html
@@ -0,0 +1 @@
+<h1>Hello <strong>{name}! </strong><span>How are you?</span></h1>
diff --git a/test/parser/samples/whitespace-normal/output-v2.json b/test/parser/samples/whitespace-normal/output-v2.json
new file mode 100644
index 000000000000..5b609c8e3680
--- /dev/null
+++ b/test/parser/samples/whitespace-normal/output-v2.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/_actual-v2.json b/test/parser/samples/yield/_actual-v2.json
new file mode 100644
index 000000000000..cc8cf371768e
--- /dev/null
+++ b/test/parser/samples/yield/_actual-v2.json
@@ -0,0 +1,20 @@
+{
+	"hash": "1oiqcow",
+	"html": {
+		"start": 0,
+		"end": 9,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 9,
+				"type": "Element",
+				"name": "slot",
+				"attributes": [],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/yield/input-v2.html b/test/parser/samples/yield/input-v2.html
new file mode 100644
index 000000000000..fb5c4b157d1c
--- /dev/null
+++ b/test/parser/samples/yield/input-v2.html
@@ -0,0 +1 @@
+{{yield}}
\ No newline at end of file
diff --git a/test/parser/samples/yield/output-v2.json b/test/parser/samples/yield/output-v2.json
new file mode 100644
index 000000000000..d3f3e602a603
--- /dev/null
+++ b/test/parser/samples/yield/output-v2.json
@@ -0,0 +1,20 @@
+{
+	"hash": 3659433152,
+	"html": {
+		"start": 0,
+		"end": 9,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 9,
+				"type": "Element",
+				"name": "slot",
+				"attributes": [],
+				"children": []
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file

From cc0055cf823fbc6786f824d2447e3dd1539f4c5c Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Tue, 10 Apr 2018 21:48:03 -0400
Subject: [PATCH 02/15] update parser for v2

---
 src/parse/read/expression.ts                  |   2 +-
 src/parse/state/mustache.ts                   |  60 +++--
 src/parse/state/tag.ts                        |  16 +-
 .../attribute-dynamic-boolean/_actual-v2.json |   9 +-
 .../attribute-dynamic-boolean/output-v2.json  |  16 +-
 .../_actual-v2.json                           |   9 +-
 .../attribute-dynamic-reserved/output-v2.json |  16 +-
 .../samples/attribute-dynamic/_actual-v2.json |  28 ++-
 .../samples/attribute-dynamic/output-v2.json  |  26 +--
 .../samples/await-then-catch/_actual-v2.json  | 216 ++++++++++++------
 .../samples/await-then-catch/input-v2.html    |   2 +-
 .../samples/await-then-catch/output-v2.json   |  94 ++++----
 .../samples/component-dynamic/_actual-v2.json |  65 ++----
 .../samples/component-dynamic/output-v2.json  |  24 +-
 .../each-block-destructured/_actual-v2.json   |  70 ++++--
 .../each-block-destructured/output-v2.json    |  34 +--
 .../samples/each-block-else/_actual-v2.json   |  92 ++++----
 .../samples/each-block-else/output-v2.json    |  34 +--
 .../each-block-indexed/_actual-v2.json        |  67 ++++--
 .../samples/each-block-indexed/output-v2.json |  34 +--
 .../parser/samples/each-block/_actual-v2.json |  49 ++--
 test/parser/samples/each-block/output-v2.json |  22 +-
 .../samples/event-handler/_actual-v2.json     |  41 ++--
 .../samples/event-handler/output-v2.json      |  18 +-
 .../samples/if-block-else/_actual-v2.json     |  86 +++----
 .../samples/if-block-else/output-v2.json      |  30 +--
 .../samples/if-block-elseif/_actual-v2.json   | 102 +++++++++
 .../samples/if-block-elseif/output-v2.json    | 102 +++++++++
 test/parser/samples/if-block/_actual-v2.json  |  17 +-
 test/parser/samples/if-block/output-v2.json   |  14 +-
 .../samples/raw-mustaches/_actual-v2.json     |  36 ++-
 .../samples/raw-mustaches/output-v2.json      |  28 +--
 .../_actual-v2.json                           |  19 +-
 .../output-v2.json                            |  64 +++---
 .../script-comment-trailing/_actual-v2.json   |  19 +-
 .../script-comment-trailing/output-v2.json    |  64 +++---
 test/parser/samples/script/_actual-v2.json    |  19 +-
 test/parser/samples/script/output-v2.json     |  64 +++---
 .../samples/self-reference/_actual-v2.json    |  88 ++++---
 .../samples/self-reference/output-v2.json     |  40 ++--
 .../space-between-mustaches/_actual-v2.json   |  53 ++++-
 .../space-between-mustaches/output-v2.json    |  40 ++--
 test/parser/samples/spread/_actual-v2.json    |  10 +-
 test/parser/samples/spread/output-v2.json     |  12 +-
 .../samples/textarea-children/_actual-v2.json |  19 +-
 .../samples/textarea-children/output-v2.json  |  16 +-
 .../unusual-identifier/_actual-v2.json        |  49 ++--
 .../samples/unusual-identifier/output-v2.json |  22 +-
 .../samples/whitespace-normal/_actual-v2.json |  13 +-
 .../samples/whitespace-normal/output-v2.json  |  26 +--
 test/parser/samples/yield/_actual-v2.json     |  17 +-
 test/parser/samples/yield/input-v2.html       |   2 +-
 test/parser/samples/yield/output-v2.json      |  17 +-
 53 files changed, 1373 insertions(+), 759 deletions(-)
 create mode 100644 test/parser/samples/if-block-elseif/_actual-v2.json
 create mode 100644 test/parser/samples/if-block-elseif/output-v2.json

diff --git a/src/parse/read/expression.ts b/src/parse/read/expression.ts
index c8c3054274f4..606f8f92a7c4 100644
--- a/src/parse/read/expression.ts
+++ b/src/parse/read/expression.ts
@@ -6,7 +6,7 @@ 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*}}/);
+	const name = parser.readUntil(parser.v2 ? /\s*}/ : /\s*}}/);
 	if (name && /^[a-z]+$/.test(name)) {
 		const end = start + name.length;
 
diff --git a/src/parse/state/mustache.ts b/src/parse/state/mustache.ts
index 8da2560fb2f5..a73237cf2104 100644
--- a/src/parse/state/mustache.ts
+++ b/src/parse/state/mustache.ts
@@ -61,7 +61,7 @@ export default function mustache(parser: Parser) {
 
 		parser.eat(expected, true);
 		parser.allowWhitespace();
-		parser.eat('}}', true);
+		parser.eat(parser.v2 ? '}' : '}}', true);
 
 		while (block.elseif) {
 			block.end = parser.index;
@@ -83,7 +83,7 @@ export default function mustache(parser: Parser) {
 
 		block.end = parser.index;
 		parser.stack.pop();
-	} else if (parser.eat('elseif')) {
+	} else if (parser.eat(parser.v2 ? ':elseif' : 'elseif')) {
 		const block = parser.current();
 		if (block.type !== 'IfBlock')
 			parser.error(
@@ -95,7 +95,7 @@ export default function mustache(parser: Parser) {
 		const expression = readExpression(parser);
 
 		parser.allowWhitespace();
-		parser.eat('}}', true);
+		parser.eat(parser.v2 ? '}' : '}}', true);
 
 		block.else = {
 			start: parser.index,
@@ -114,7 +114,7 @@ export default function mustache(parser: Parser) {
 		};
 
 		parser.stack.push(block.else.children[0]);
-	} else if (parser.eat('else')) {
+	} else if (parser.eat(parser.v2 ? ':else' : 'else')) {
 		const block = parser.current();
 		if (block.type !== 'IfBlock' && block.type !== 'EachBlock') {
 			parser.error(
@@ -123,7 +123,7 @@ export default function mustache(parser: Parser) {
 		}
 
 		parser.allowWhitespace();
-		parser.eat('}}', true);
+		parser.eat(parser.v2 ? '}' : '}}', true);
 
 		block.else = {
 			start: parser.index,
@@ -133,7 +133,7 @@ export default function mustache(parser: Parser) {
 		};
 
 		parser.stack.push(block.else);
-	} else if (parser.eat('then')) {
+	} else if (parser.eat(parser.v2 ? ':then' : 'then')) {
 		// TODO DRY out this and the next section
 		const pendingBlock = parser.current();
 		if (pendingBlock.type === 'PendingBlock') {
@@ -145,7 +145,7 @@ export default function mustache(parser: Parser) {
 			awaitBlock.value = parser.readIdentifier();
 
 			parser.allowWhitespace();
-			parser.eat('}}', true);
+			parser.eat(parser.v2 ? '}' : '}}', true);
 
 			const thenBlock: Node = {
 				start,
@@ -157,7 +157,7 @@ export default function mustache(parser: Parser) {
 			awaitBlock.then = thenBlock;
 			parser.stack.push(thenBlock);
 		}
-	} else if (parser.eat('catch')) {
+	} else if (parser.eat(parser.v2 ? ':catch' : 'catch')) {
 		const thenBlock = parser.current();
 		if (thenBlock.type === 'ThenBlock') {
 			thenBlock.end = start;
@@ -168,7 +168,7 @@ export default function mustache(parser: Parser) {
 			awaitBlock.error = parser.readIdentifier();
 
 			parser.allowWhitespace();
-			parser.eat('}}', true);
+			parser.eat(parser.v2 ? '}' : '}}', true);
 
 			const catchBlock: Node = {
 				start,
@@ -288,7 +288,7 @@ export default function mustache(parser: Parser) {
 			parser.allowWhitespace();
 		}
 
-		parser.eat('}}', true);
+		parser.eat(parser.v2 ? '}' : '}}', true);
 
 		parser.current().children.push(block);
 		parser.stack.push(block);
@@ -302,22 +302,40 @@ export default function mustache(parser: Parser) {
 		// {{yield}}
 		// TODO deprecate
 		parser.allowWhitespace();
-		parser.eat('}}', true);
 
-		parser.current().children.push({
-			start,
-			end: parser.index,
-			type: 'Element',
-			name: 'slot',
-			attributes: [],
-			children: []
-		});
-	} else if (parser.eat('{')) {
+		if (parser.v2) {
+			const expressionEnd = parser.index;
+
+			parser.eat('}', true);
+			parser.current().children.push({
+				start,
+				end: parser.index,
+				type: 'MustacheTag',
+				expression: {
+					start: expressionEnd - 5,
+					end: expressionEnd,
+					type: 'Identifier',
+					name: 'yield'
+				}
+			});
+		} else {
+			parser.eat('}}', true);
+
+			parser.current().children.push({
+				start,
+				end: parser.index,
+				type: 'Element',
+				name: 'slot',
+				attributes: [],
+				children: []
+			});
+		}
+	} else if (parser.eat(parser.v2 ? '@html' : '{')) {
 		// {{{raw}}} mustache
 		const expression = readExpression(parser);
 
 		parser.allowWhitespace();
-		parser.eat('}}}', true);
+		parser.eat(parser.v2 ? '}' : '}}}', true);
 
 		parser.current().children.push({
 			start,
diff --git a/src/parse/state/tag.ts b/src/parse/state/tag.ts
index 4f7e7a117b41..e1dbfcf6c6b8 100644
--- a/src/parse/state/tag.ts
+++ b/src/parse/state/tag.ts
@@ -170,7 +170,7 @@ export default function tag(parser: Parser) {
 		}
 	}
 
-	if (name === COMPONENT) {
+	if (name === (parser.v2 ? 'svelte:component' : ':Component')) {
 		parser.eat('{', true);
 		element.expression = readExpression(parser);
 		parser.allowWhitespace();
@@ -249,6 +249,10 @@ export default function tag(parser: Parser) {
 function readTagName(parser: Parser) {
 	const start = parser.index;
 
+	// TODO hoist these back to the top, post-v2
+	const SELF = parser.v2 ? 'svelte:self' : ':Self';
+	const COMPONENT = parser.v2 ? 'svelte:component' : ':Component';
+
 	if (parser.eat(SELF)) {
 		// check we're inside a block, otherwise this
 		// will cause infinite recursion
@@ -289,14 +293,14 @@ function readTagName(parser: Parser) {
 function readAttribute(parser: Parser, uniqueNames: Set<string>) {
 	const start = parser.index;
 
-	if (parser.eat('{{')) {
+	if (parser.eat(parser.v2 ? '{' : '{{')) {
 		parser.allowWhitespace();
 		parser.eat('...', true, 'Expected spread operator (...)');
 
 		const expression = readExpression(parser);
 
 		parser.allowWhitespace();
-		parser.eat('}}', true);
+		parser.eat(parser.v2 ? '}' : '}}', true);
 
 		return {
 			start,
@@ -369,7 +373,7 @@ function readSequence(parser: Parser, done: () => boolean) {
 			});
 
 			return chunks;
-		} else if (parser.eat('{{')) {
+		} else if (parser.eat(parser.v2 ? '{' : '{{')) {
 			if (currentChunk.data) {
 				currentChunk.end = index;
 				chunks.push(currentChunk);
@@ -377,9 +381,7 @@ function readSequence(parser: Parser, done: () => boolean) {
 
 			const expression = readExpression(parser);
 			parser.allowWhitespace();
-			if (!parser.eat('}}')) {
-				parser.error(`Expected }}`);
-			}
+			parser.eat(parser.v2 ? '}' : '}}', true);
 
 			chunks.push({
 				start: index,
diff --git a/test/parser/samples/attribute-dynamic-boolean/_actual-v2.json b/test/parser/samples/attribute-dynamic-boolean/_actual-v2.json
index c843275a4fba..4d08df34a0d6 100644
--- a/test/parser/samples/attribute-dynamic-boolean/_actual-v2.json
+++ b/test/parser/samples/attribute-dynamic-boolean/_actual-v2.json
@@ -20,8 +20,13 @@
 							{
 								"start": 19,
 								"end": 29,
-								"type": "Text",
-								"data": "{readonly}"
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 20,
+									"end": 28,
+									"name": "readonly"
+								}
 							}
 						]
 					}
diff --git a/test/parser/samples/attribute-dynamic-boolean/output-v2.json b/test/parser/samples/attribute-dynamic-boolean/output-v2.json
index af1635a55d95..4d08df34a0d6 100644
--- a/test/parser/samples/attribute-dynamic-boolean/output-v2.json
+++ b/test/parser/samples/attribute-dynamic-boolean/output-v2.json
@@ -1,30 +1,30 @@
 {
-	"hash": 3179574701,
+	"hash": "7xolfv",
 	"html": {
 		"start": 0,
-		"end": 45,
+		"end": 41,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 45,
+				"end": 41,
 				"type": "Element",
 				"name": "textarea",
 				"attributes": [
 					{
 						"start": 10,
-						"end": 33,
+						"end": 29,
 						"type": "Attribute",
 						"name": "readonly",
 						"value": [
 							{
-								"start": 20,
-								"end": 32,
+								"start": 19,
+								"end": 29,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 22,
-									"end": 30,
+									"start": 20,
+									"end": 28,
 									"name": "readonly"
 								}
 							}
diff --git a/test/parser/samples/attribute-dynamic-reserved/_actual-v2.json b/test/parser/samples/attribute-dynamic-reserved/_actual-v2.json
index 76b70ef261aa..4b6506b0cdf1 100644
--- a/test/parser/samples/attribute-dynamic-reserved/_actual-v2.json
+++ b/test/parser/samples/attribute-dynamic-reserved/_actual-v2.json
@@ -20,8 +20,13 @@
 							{
 								"start": 11,
 								"end": 18,
-								"type": "Text",
-								"data": "{class}"
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 12,
+									"end": 17,
+									"name": "class"
+								}
 							}
 						]
 					}
diff --git a/test/parser/samples/attribute-dynamic-reserved/output-v2.json b/test/parser/samples/attribute-dynamic-reserved/output-v2.json
index aef0e5cb63ca..4b6506b0cdf1 100644
--- a/test/parser/samples/attribute-dynamic-reserved/output-v2.json
+++ b/test/parser/samples/attribute-dynamic-reserved/output-v2.json
@@ -1,30 +1,30 @@
 {
-	"hash": 2788845841,
+	"hash": "l0cddf",
 	"html": {
 		"start": 0,
-		"end": 29,
+		"end": 25,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 29,
+				"end": 25,
 				"type": "Element",
 				"name": "div",
 				"attributes": [
 					{
 						"start": 5,
-						"end": 22,
+						"end": 18,
 						"type": "Attribute",
 						"name": "class",
 						"value": [
 							{
-								"start": 12,
-								"end": 21,
+								"start": 11,
+								"end": 18,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 14,
-									"end": 19,
+									"start": 12,
+									"end": 17,
 									"name": "class"
 								}
 							}
diff --git a/test/parser/samples/attribute-dynamic/_actual-v2.json b/test/parser/samples/attribute-dynamic/_actual-v2.json
index 06f82de54aba..7ccb40d313fa 100644
--- a/test/parser/samples/attribute-dynamic/_actual-v2.json
+++ b/test/parser/samples/attribute-dynamic/_actual-v2.json
@@ -19,9 +19,26 @@
 						"value": [
 							{
 								"start": 12,
+								"end": 19,
+								"type": "Text",
+								"data": "color: "
+							},
+							{
+								"start": 19,
+								"end": 26,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 20,
+									"end": 25,
+									"name": "color"
+								}
+							},
+							{
+								"start": 26,
 								"end": 27,
 								"type": "Text",
-								"data": "color: {color};"
+								"data": ";"
 							}
 						]
 					}
@@ -30,8 +47,13 @@
 					{
 						"start": 29,
 						"end": 36,
-						"type": "Text",
-						"data": "{color}"
+						"type": "MustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 30,
+							"end": 35,
+							"name": "color"
+						}
 					}
 				]
 			}
diff --git a/test/parser/samples/attribute-dynamic/output-v2.json b/test/parser/samples/attribute-dynamic/output-v2.json
index 79ef81065fc7..7ccb40d313fa 100644
--- a/test/parser/samples/attribute-dynamic/output-v2.json
+++ b/test/parser/samples/attribute-dynamic/output-v2.json
@@ -1,19 +1,19 @@
 {
-	"hash": 804348386,
+	"hash": "ehtsx6",
 	"html": {
 		"start": 0,
-		"end": 46,
+		"end": 42,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 46,
+				"end": 42,
 				"type": "Element",
 				"name": "div",
 				"attributes": [
 					{
 						"start": 5,
-						"end": 30,
+						"end": 28,
 						"type": "Attribute",
 						"name": "style",
 						"value": [
@@ -25,18 +25,18 @@
 							},
 							{
 								"start": 19,
-								"end": 28,
+								"end": 26,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 21,
-									"end": 26,
+									"start": 20,
+									"end": 25,
 									"name": "color"
 								}
 							},
 							{
-								"start": 28,
-								"end": 29,
+								"start": 26,
+								"end": 27,
 								"type": "Text",
 								"data": ";"
 							}
@@ -45,13 +45,13 @@
 				],
 				"children": [
 					{
-						"start": 31,
-						"end": 40,
+						"start": 29,
+						"end": 36,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 33,
-							"end": 38,
+							"start": 30,
+							"end": 35,
 							"name": "color"
 						}
 					}
diff --git a/test/parser/samples/await-then-catch/_actual-v2.json b/test/parser/samples/await-then-catch/_actual-v2.json
index cfe0ab813487..22ad4242e354 100644
--- a/test/parser/samples/await-then-catch/_actual-v2.json
+++ b/test/parser/samples/await-then-catch/_actual-v2.json
@@ -1,78 +1,158 @@
 {
-	"hash": "1rt0tho",
+	"hash": "1b28gs9",
 	"html": {
 		"start": 0,
-		"end": 149,
+		"end": 148,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 21,
-				"type": "Text",
-				"data": "{#await thePromise}\n\t"
-			},
-			{
-				"start": 21,
-				"end": 38,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
-				"children": [
-					{
-						"start": 24,
-						"end": 34,
-						"type": "Text",
-						"data": "loading..."
-					}
-				]
-			},
-			{
-				"start": 38,
-				"end": 57,
-				"type": "Text",
-				"data": "\n{:then theValue}\n\t"
-			},
-			{
-				"start": 57,
-				"end": 87,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
-				"children": [
-					{
-						"start": 60,
-						"end": 83,
-						"type": "Text",
-						"data": "the value is {theValue}"
-					}
-				]
-			},
-			{
-				"start": 87,
-				"end": 107,
-				"type": "Text",
-				"data": "\n{:catch theError}\n\t"
-			},
-			{
-				"start": 107,
-				"end": 140,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
-				"children": [
-					{
-						"start": 110,
-						"end": 136,
-						"type": "Text",
-						"data": "oh no! {theError.message}}"
-					}
-				]
-			},
-			{
-				"start": 140,
-				"end": 149,
-				"type": "Text",
-				"data": "\n{/await}"
+				"end": 148,
+				"type": "AwaitBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 8,
+					"end": 18,
+					"name": "thePromise"
+				},
+				"value": "theValue",
+				"error": "theError",
+				"pending": {
+					"start": 19,
+					"end": 39,
+					"type": "PendingBlock",
+					"children": [
+						{
+							"start": 19,
+							"end": 21,
+							"type": "Text",
+							"data": "\n\t"
+						},
+						{
+							"start": 21,
+							"end": 38,
+							"type": "Element",
+							"name": "p",
+							"attributes": [],
+							"children": [
+								{
+									"start": 24,
+									"end": 34,
+									"type": "Text",
+									"data": "loading..."
+								}
+							]
+						},
+						{
+							"start": 38,
+							"end": 39,
+							"type": "Text",
+							"data": "\n"
+						}
+					]
+				},
+				"then": {
+					"start": 39,
+					"end": 88,
+					"type": "ThenBlock",
+					"children": [
+						{
+							"start": 55,
+							"end": 57,
+							"type": "Text",
+							"data": "\n\t"
+						},
+						{
+							"start": 57,
+							"end": 87,
+							"type": "Element",
+							"name": "p",
+							"attributes": [],
+							"children": [
+								{
+									"start": 60,
+									"end": 73,
+									"type": "Text",
+									"data": "the value is "
+								},
+								{
+									"start": 73,
+									"end": 83,
+									"type": "MustacheTag",
+									"expression": {
+										"type": "Identifier",
+										"start": 74,
+										"end": 82,
+										"name": "theValue"
+									}
+								}
+							]
+						},
+						{
+							"start": 87,
+							"end": 88,
+							"type": "Text",
+							"data": "\n"
+						}
+					]
+				},
+				"catch": {
+					"start": 88,
+					"end": 140,
+					"type": "CatchBlock",
+					"children": [
+						{
+							"start": 105,
+							"end": 107,
+							"type": "Text",
+							"data": "\n\t"
+						},
+						{
+							"start": 107,
+							"end": 139,
+							"type": "Element",
+							"name": "p",
+							"attributes": [],
+							"children": [
+								{
+									"start": 110,
+									"end": 117,
+									"type": "Text",
+									"data": "oh no! "
+								},
+								{
+									"start": 117,
+									"end": 135,
+									"type": "MustacheTag",
+									"expression": {
+										"type": "MemberExpression",
+										"start": 118,
+										"end": 134,
+										"object": {
+											"type": "Identifier",
+											"start": 118,
+											"end": 126,
+											"name": "theError"
+										},
+										"property": {
+											"type": "Identifier",
+											"start": 127,
+											"end": 134,
+											"name": "message"
+										},
+										"computed": false
+									}
+								}
+							]
+						},
+						{
+							"start": 139,
+							"end": 140,
+							"type": "Text",
+							"data": "\n"
+						}
+					]
+				}
 			}
 		]
 	},
diff --git a/test/parser/samples/await-then-catch/input-v2.html b/test/parser/samples/await-then-catch/input-v2.html
index b4038bec8ccb..79f5162ace24 100644
--- a/test/parser/samples/await-then-catch/input-v2.html
+++ b/test/parser/samples/await-then-catch/input-v2.html
@@ -3,5 +3,5 @@
 {:then theValue}
 	<p>the value is {theValue}</p>
 {:catch theError}
-	<p>oh no! {theError.message}}</p>
+	<p>oh no! {theError.message}</p>
 {/await}
\ No newline at end of file
diff --git a/test/parser/samples/await-then-catch/output-v2.json b/test/parser/samples/await-then-catch/output-v2.json
index 4f149e6a0cba..22ad4242e354 100644
--- a/test/parser/samples/await-then-catch/output-v2.json
+++ b/test/parser/samples/await-then-catch/output-v2.json
@@ -1,143 +1,143 @@
 {
-	"hash": 1040536517,
+	"hash": "1b28gs9",
 	"html": {
 		"start": 0,
-		"end": 158,
+		"end": 148,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 158,
+				"end": 148,
 				"type": "AwaitBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 9,
-					"end": 19,
+					"start": 8,
+					"end": 18,
 					"name": "thePromise"
 				},
 				"value": "theValue",
 				"error": "theError",
 				"pending": {
-					"start": 21,
-					"end": 41,
+					"start": 19,
+					"end": 39,
 					"type": "PendingBlock",
 					"children": [
 						{
-							"start": 21,
-							"end": 23,
+							"start": 19,
+							"end": 21,
 							"type": "Text",
 							"data": "\n\t"
 						},
 						{
-							"start": 23,
-							"end": 40,
+							"start": 21,
+							"end": 38,
 							"type": "Element",
 							"name": "p",
 							"attributes": [],
 							"children": [
 								{
-									"start": 26,
-									"end": 36,
+									"start": 24,
+									"end": 34,
 									"type": "Text",
 									"data": "loading..."
 								}
 							]
 						},
 						{
-							"start": 40,
-							"end": 41,
+							"start": 38,
+							"end": 39,
 							"type": "Text",
 							"data": "\n"
 						}
 					]
 				},
 				"then": {
-					"start": 41,
-					"end": 93,
+					"start": 39,
+					"end": 88,
 					"type": "ThenBlock",
 					"children": [
 						{
-							"start": 58,
-							"end": 60,
+							"start": 55,
+							"end": 57,
 							"type": "Text",
 							"data": "\n\t"
 						},
 						{
-							"start": 60,
-							"end": 92,
+							"start": 57,
+							"end": 87,
 							"type": "Element",
 							"name": "p",
 							"attributes": [],
 							"children": [
 								{
-									"start": 63,
-									"end": 76,
+									"start": 60,
+									"end": 73,
 									"type": "Text",
 									"data": "the value is "
 								},
 								{
-									"start": 76,
-									"end": 88,
+									"start": 73,
+									"end": 83,
 									"type": "MustacheTag",
 									"expression": {
 										"type": "Identifier",
-										"start": 78,
-										"end": 86,
+										"start": 74,
+										"end": 82,
 										"name": "theValue"
 									}
 								}
 							]
 						},
 						{
-							"start": 92,
-							"end": 93,
+							"start": 87,
+							"end": 88,
 							"type": "Text",
 							"data": "\n"
 						}
 					]
 				},
 				"catch": {
-					"start": 93,
-					"end": 148,
+					"start": 88,
+					"end": 140,
 					"type": "CatchBlock",
 					"children": [
 						{
-							"start": 111,
-							"end": 113,
+							"start": 105,
+							"end": 107,
 							"type": "Text",
 							"data": "\n\t"
 						},
 						{
-							"start": 113,
-							"end": 147,
+							"start": 107,
+							"end": 139,
 							"type": "Element",
 							"name": "p",
 							"attributes": [],
 							"children": [
 								{
-									"start": 116,
-									"end": 123,
+									"start": 110,
+									"end": 117,
 									"type": "Text",
 									"data": "oh no! "
 								},
 								{
-									"start": 123,
-									"end": 143,
+									"start": 117,
+									"end": 135,
 									"type": "MustacheTag",
 									"expression": {
 										"type": "MemberExpression",
-										"start": 125,
-										"end": 141,
+										"start": 118,
+										"end": 134,
 										"object": {
 											"type": "Identifier",
-											"start": 125,
-											"end": 133,
+											"start": 118,
+											"end": 126,
 											"name": "theError"
 										},
 										"property": {
 											"type": "Identifier",
-											"start": 134,
-											"end": 141,
+											"start": 127,
+											"end": 134,
 											"name": "message"
 										},
 										"computed": false
@@ -146,8 +146,8 @@
 							]
 						},
 						{
-							"start": 147,
-							"end": 148,
+							"start": 139,
+							"end": 140,
 							"type": "Text",
 							"data": "\n"
 						}
diff --git a/test/parser/samples/component-dynamic/_actual-v2.json b/test/parser/samples/component-dynamic/_actual-v2.json
index 9e6525a8cabd..6080a11e9e6e 100644
--- a/test/parser/samples/component-dynamic/_actual-v2.json
+++ b/test/parser/samples/component-dynamic/_actual-v2.json
@@ -10,56 +10,31 @@
 				"end": 55,
 				"type": "Element",
 				"name": "svelte:component",
-				"attributes": [
-					{
-						"start": 18,
-						"end": 23,
-						"type": "Attribute",
-						"name": "{foo",
-						"value": true
+				"attributes": [],
+				"children": [],
+				"expression": {
+					"type": "ConditionalExpression",
+					"start": 19,
+					"end": 34,
+					"test": {
+						"type": "Identifier",
+						"start": 19,
+						"end": 22,
+						"name": "foo"
 					},
-					{
-						"start": 23,
-						"end": 25,
-						"type": "Attribute",
-						"name": "?",
-						"value": true
-					},
-					{
+					"consequent": {
+						"type": "Identifier",
 						"start": 25,
-						"end": 29,
-						"type": "Attribute",
-						"name": "Foo",
-						"value": true
-					},
-					{
-						"start": 29,
-						"end": 30,
-						"type": "Attribute",
-						"name": "",
-						"value": [
-							{
-								"type": "AttributeShorthand",
-								"start": 30,
-								"end": 30,
-								"expression": {
-									"type": "Identifier",
-									"start": 30,
-									"end": 30,
-									"name": ""
-								}
-							}
-						]
+						"end": 28,
+						"name": "Foo"
 					},
-					{
+					"alternate": {
+						"type": "Identifier",
 						"start": 31,
-						"end": 35,
-						"type": "Attribute",
-						"name": "Bar}",
-						"value": true
+						"end": 34,
+						"name": "Bar"
 					}
-				],
-				"children": []
+				}
 			}
 		]
 	},
diff --git a/test/parser/samples/component-dynamic/output-v2.json b/test/parser/samples/component-dynamic/output-v2.json
index 614c28c0a9f7..6080a11e9e6e 100644
--- a/test/parser/samples/component-dynamic/output-v2.json
+++ b/test/parser/samples/component-dynamic/output-v2.json
@@ -1,37 +1,37 @@
 {
-	"hash": 410218696,
+	"hash": "7yh2k2",
 	"html": {
 		"start": 0,
-		"end": 43,
+		"end": 55,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 43,
+				"end": 55,
 				"type": "Element",
-				"name": ":Component",
+				"name": "svelte:component",
 				"attributes": [],
 				"children": [],
 				"expression": {
 					"type": "ConditionalExpression",
-					"start": 13,
-					"end": 28,
+					"start": 19,
+					"end": 34,
 					"test": {
 						"type": "Identifier",
-						"start": 13,
-						"end": 16,
+						"start": 19,
+						"end": 22,
 						"name": "foo"
 					},
 					"consequent": {
 						"type": "Identifier",
-						"start": 19,
-						"end": 22,
+						"start": 25,
+						"end": 28,
 						"name": "Foo"
 					},
 					"alternate": {
 						"type": "Identifier",
-						"start": 25,
-						"end": 28,
+						"start": 31,
+						"end": 34,
 						"name": "Bar"
 					}
 				}
diff --git a/test/parser/samples/each-block-destructured/_actual-v2.json b/test/parser/samples/each-block-destructured/_actual-v2.json
index 97b69a5730f3..38d5ddc770ec 100644
--- a/test/parser/samples/each-block-destructured/_actual-v2.json
+++ b/test/parser/samples/each-block-destructured/_actual-v2.json
@@ -7,30 +7,58 @@
 		"children": [
 			{
 				"start": 0,
-				"end": 33,
-				"type": "Text",
-				"data": "{#each animals as [key, value]}\n\t"
-			},
-			{
-				"start": 33,
-				"end": 54,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
+				"end": 62,
+				"type": "EachBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 7,
+					"end": 14,
+					"name": "animals"
+				},
 				"children": [
 					{
-						"start": 36,
-						"end": 50,
-						"type": "Text",
-						"data": "{key}: {value}"
+						"start": 33,
+						"end": 54,
+						"type": "Element",
+						"name": "p",
+						"attributes": [],
+						"children": [
+							{
+								"start": 36,
+								"end": 41,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 37,
+									"end": 40,
+									"name": "key"
+								}
+							},
+							{
+								"start": 41,
+								"end": 43,
+								"type": "Text",
+								"data": ": "
+							},
+							{
+								"start": 43,
+								"end": 50,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 44,
+									"end": 49,
+									"name": "value"
+								}
+							}
+						]
 					}
-				]
-			},
-			{
-				"start": 54,
-				"end": 62,
-				"type": "Text",
-				"data": "\n{/each}"
+				],
+				"destructuredContexts": [
+					"key",
+					"value"
+				],
+				"context": "key_value"
 			}
 		]
 	},
diff --git a/test/parser/samples/each-block-destructured/output-v2.json b/test/parser/samples/each-block-destructured/output-v2.json
index 897fec88b82a..38d5ddc770ec 100644
--- a/test/parser/samples/each-block-destructured/output-v2.json
+++ b/test/parser/samples/each-block-destructured/output-v2.json
@@ -1,53 +1,53 @@
 {
-	"hash": 2621498076,
+	"hash": "gtdm5e",
 	"html": {
 		"start": 0,
-		"end": 70,
+		"end": 62,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 70,
+				"end": 62,
 				"type": "EachBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 8,
-					"end": 15,
+					"start": 7,
+					"end": 14,
 					"name": "animals"
 				},
 				"children": [
 					{
-						"start": 35,
-						"end": 60,
+						"start": 33,
+						"end": 54,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 38,
-								"end": 45,
+								"start": 36,
+								"end": 41,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 40,
-									"end": 43,
+									"start": 37,
+									"end": 40,
 									"name": "key"
 								}
 							},
 							{
-								"start": 45,
-								"end": 47,
+								"start": 41,
+								"end": 43,
 								"type": "Text",
 								"data": ": "
 							},
 							{
-								"start": 47,
-								"end": 56,
+								"start": 43,
+								"end": 50,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 49,
-									"end": 54,
+									"start": 44,
+									"end": 49,
 									"name": "value"
 								}
 							}
diff --git a/test/parser/samples/each-block-else/_actual-v2.json b/test/parser/samples/each-block-else/_actual-v2.json
index af7b618bf8e0..9f8c5da79ba8 100644
--- a/test/parser/samples/each-block-else/_actual-v2.json
+++ b/test/parser/samples/each-block-else/_actual-v2.json
@@ -7,51 +7,59 @@
 		"children": [
 			{
 				"start": 0,
-				"end": 27,
-				"type": "Text",
-				"data": "{#each animals as animal}\n\t"
-			},
-			{
-				"start": 27,
-				"end": 42,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
-				"children": [
-					{
-						"start": 30,
-						"end": 38,
-						"type": "Text",
-						"data": "{animal}"
-					}
-				]
-			},
-			{
-				"start": 42,
-				"end": 52,
-				"type": "Text",
-				"data": "\n{:else}\n\t"
-			},
-			{
-				"start": 52,
-				"end": 69,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
+				"end": 77,
+				"type": "EachBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 7,
+					"end": 14,
+					"name": "animals"
+				},
 				"children": [
 					{
-						"start": 55,
-						"end": 65,
-						"type": "Text",
-						"data": "no animals"
+						"start": 27,
+						"end": 42,
+						"type": "Element",
+						"name": "p",
+						"attributes": [],
+						"children": [
+							{
+								"start": 30,
+								"end": 38,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 31,
+									"end": 37,
+									"name": "animal"
+								}
+							}
+						]
 					}
-				]
-			},
-			{
-				"start": 69,
-				"end": 77,
-				"type": "Text",
-				"data": "\n{/each}"
+				],
+				"context": "animal",
+				"else": {
+					"start": 50,
+					"end": 70,
+					"type": "ElseBlock",
+					"children": [
+						{
+							"start": 52,
+							"end": 69,
+							"type": "Element",
+							"name": "p",
+							"attributes": [],
+							"children": [
+								{
+									"start": 55,
+									"end": 65,
+									"type": "Text",
+									"data": "no animals"
+								}
+							]
+						}
+					]
+				}
 			}
 		]
 	},
diff --git a/test/parser/samples/each-block-else/output-v2.json b/test/parser/samples/each-block-else/output-v2.json
index 0dadad5f650f..9f8c5da79ba8 100644
--- a/test/parser/samples/each-block-else/output-v2.json
+++ b/test/parser/samples/each-block-else/output-v2.json
@@ -1,36 +1,36 @@
 {
-	"hash": 3238289871,
+	"hash": "ljl07n",
 	"html": {
 		"start": 0,
-		"end": 84,
+		"end": 77,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 84,
+				"end": 77,
 				"type": "EachBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 8,
-					"end": 15,
+					"start": 7,
+					"end": 14,
 					"name": "animals"
 				},
 				"children": [
 					{
-						"start": 29,
-						"end": 46,
+						"start": 27,
+						"end": 42,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 32,
-								"end": 42,
+								"start": 30,
+								"end": 38,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 34,
-									"end": 40,
+									"start": 31,
+									"end": 37,
 									"name": "animal"
 								}
 							}
@@ -39,20 +39,20 @@
 				],
 				"context": "animal",
 				"else": {
-					"start": 55,
-					"end": 75,
+					"start": 50,
+					"end": 70,
 					"type": "ElseBlock",
 					"children": [
 						{
-							"start": 57,
-							"end": 74,
+							"start": 52,
+							"end": 69,
 							"type": "Element",
 							"name": "p",
 							"attributes": [],
 							"children": [
 								{
-									"start": 60,
-									"end": 70,
+									"start": 55,
+									"end": 65,
 									"type": "Text",
 									"data": "no animals"
 								}
diff --git a/test/parser/samples/each-block-indexed/_actual-v2.json b/test/parser/samples/each-block-indexed/_actual-v2.json
index 576bc5301403..9ffa02aaa871 100644
--- a/test/parser/samples/each-block-indexed/_actual-v2.json
+++ b/test/parser/samples/each-block-indexed/_actual-v2.json
@@ -7,30 +7,55 @@
 		"children": [
 			{
 				"start": 0,
-				"end": 30,
-				"type": "Text",
-				"data": "{#each animals as animal, i}\n\t"
-			},
-			{
-				"start": 30,
-				"end": 50,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
+				"end": 58,
+				"type": "EachBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 7,
+					"end": 14,
+					"name": "animals"
+				},
 				"children": [
 					{
-						"start": 33,
-						"end": 46,
-						"type": "Text",
-						"data": "{i}: {animal}"
+						"start": 30,
+						"end": 50,
+						"type": "Element",
+						"name": "p",
+						"attributes": [],
+						"children": [
+							{
+								"start": 33,
+								"end": 36,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 34,
+									"end": 35,
+									"name": "i"
+								}
+							},
+							{
+								"start": 36,
+								"end": 38,
+								"type": "Text",
+								"data": ": "
+							},
+							{
+								"start": 38,
+								"end": 46,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 39,
+									"end": 45,
+									"name": "animal"
+								}
+							}
+						]
 					}
-				]
-			},
-			{
-				"start": 50,
-				"end": 58,
-				"type": "Text",
-				"data": "\n{/each}"
+				],
+				"context": "animal",
+				"index": "i"
 			}
 		]
 	},
diff --git a/test/parser/samples/each-block-indexed/output-v2.json b/test/parser/samples/each-block-indexed/output-v2.json
index fc8954d6ad96..9ffa02aaa871 100644
--- a/test/parser/samples/each-block-indexed/output-v2.json
+++ b/test/parser/samples/each-block-indexed/output-v2.json
@@ -1,53 +1,53 @@
 {
-	"hash": 2841674990,
+	"hash": "1143n2g",
 	"html": {
 		"start": 0,
-		"end": 66,
+		"end": 58,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 66,
+				"end": 58,
 				"type": "EachBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 8,
-					"end": 15,
+					"start": 7,
+					"end": 14,
 					"name": "animals"
 				},
 				"children": [
 					{
-						"start": 32,
-						"end": 56,
+						"start": 30,
+						"end": 50,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 35,
-								"end": 40,
+								"start": 33,
+								"end": 36,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 37,
-									"end": 38,
+									"start": 34,
+									"end": 35,
 									"name": "i"
 								}
 							},
 							{
-								"start": 40,
-								"end": 42,
+								"start": 36,
+								"end": 38,
 								"type": "Text",
 								"data": ": "
 							},
 							{
-								"start": 42,
-								"end": 52,
+								"start": 38,
+								"end": 46,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 44,
-									"end": 50,
+									"start": 39,
+									"end": 45,
 									"name": "animal"
 								}
 							}
diff --git a/test/parser/samples/each-block/_actual-v2.json b/test/parser/samples/each-block/_actual-v2.json
index 314ef918a50c..7df4a20eba77 100644
--- a/test/parser/samples/each-block/_actual-v2.json
+++ b/test/parser/samples/each-block/_actual-v2.json
@@ -7,30 +7,37 @@
 		"children": [
 			{
 				"start": 0,
-				"end": 27,
-				"type": "Text",
-				"data": "{#each animals as animal}\n\t"
-			},
-			{
-				"start": 27,
-				"end": 42,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
+				"end": 50,
+				"type": "EachBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 7,
+					"end": 14,
+					"name": "animals"
+				},
 				"children": [
 					{
-						"start": 30,
-						"end": 38,
-						"type": "Text",
-						"data": "{animal}"
+						"start": 27,
+						"end": 42,
+						"type": "Element",
+						"name": "p",
+						"attributes": [],
+						"children": [
+							{
+								"start": 30,
+								"end": 38,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 31,
+									"end": 37,
+									"name": "animal"
+								}
+							}
+						]
 					}
-				]
-			},
-			{
-				"start": 42,
-				"end": 50,
-				"type": "Text",
-				"data": "\n{/each}"
+				],
+				"context": "animal"
 			}
 		]
 	},
diff --git a/test/parser/samples/each-block/output-v2.json b/test/parser/samples/each-block/output-v2.json
index e549faca3953..7df4a20eba77 100644
--- a/test/parser/samples/each-block/output-v2.json
+++ b/test/parser/samples/each-block/output-v2.json
@@ -1,36 +1,36 @@
 {
-	"hash": 220340986,
+	"hash": "mzeq0s",
 	"html": {
 		"start": 0,
-		"end": 56,
+		"end": 50,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 56,
+				"end": 50,
 				"type": "EachBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 8,
-					"end": 15,
+					"start": 7,
+					"end": 14,
 					"name": "animals"
 				},
 				"children": [
 					{
-						"start": 29,
-						"end": 46,
+						"start": 27,
+						"end": 42,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 32,
-								"end": 42,
+								"start": 30,
+								"end": 38,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 34,
-									"end": 40,
+									"start": 31,
+									"end": 37,
 									"name": "animal"
 								}
 							}
diff --git a/test/parser/samples/event-handler/_actual-v2.json b/test/parser/samples/event-handler/_actual-v2.json
index ce290b00e068..0d98c325c3c8 100644
--- a/test/parser/samples/event-handler/_actual-v2.json
+++ b/test/parser/samples/event-handler/_actual-v2.json
@@ -77,30 +77,37 @@
 			},
 			{
 				"start": 61,
-				"end": 78,
+				"end": 63,
 				"type": "Text",
-				"data": "\n\n{#if visible}\n\t"
+				"data": "\n\n"
 			},
 			{
-				"start": 78,
-				"end": 91,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
+				"start": 63,
+				"end": 97,
+				"type": "IfBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 68,
+					"end": 75,
+					"name": "visible"
+				},
 				"children": [
 					{
-						"start": 81,
-						"end": 87,
-						"type": "Text",
-						"data": "hello!"
+						"start": 78,
+						"end": 91,
+						"type": "Element",
+						"name": "p",
+						"attributes": [],
+						"children": [
+							{
+								"start": 81,
+								"end": 87,
+								"type": "Text",
+								"data": "hello!"
+							}
+						]
 					}
 				]
-			},
-			{
-				"start": 91,
-				"end": 97,
-				"type": "Text",
-				"data": "\n{/if}"
 			}
 		]
 	},
diff --git a/test/parser/samples/event-handler/output-v2.json b/test/parser/samples/event-handler/output-v2.json
index 2b5844bb1bbf..0d98c325c3c8 100644
--- a/test/parser/samples/event-handler/output-v2.json
+++ b/test/parser/samples/event-handler/output-v2.json
@@ -1,8 +1,8 @@
 {
-	"hash": 4260626221,
+	"hash": "qi54it",
 	"html": {
 		"start": 0,
-		"end": 101,
+		"end": 97,
 		"type": "Fragment",
 		"children": [
 			{
@@ -83,25 +83,25 @@
 			},
 			{
 				"start": 63,
-				"end": 101,
+				"end": 97,
 				"type": "IfBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 69,
-					"end": 76,
+					"start": 68,
+					"end": 75,
 					"name": "visible"
 				},
 				"children": [
 					{
-						"start": 80,
-						"end": 93,
+						"start": 78,
+						"end": 91,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 83,
-								"end": 89,
+								"start": 81,
+								"end": 87,
 								"type": "Text",
 								"data": "hello!"
 							}
diff --git a/test/parser/samples/if-block-else/_actual-v2.json b/test/parser/samples/if-block-else/_actual-v2.json
index 2fffac3d3ea5..b922778f7eb9 100644
--- a/test/parser/samples/if-block-else/_actual-v2.json
+++ b/test/parser/samples/if-block-else/_actual-v2.json
@@ -7,51 +7,53 @@
 		"children": [
 			{
 				"start": 0,
-				"end": 11,
-				"type": "Text",
-				"data": "{#if foo}\n\t"
-			},
-			{
-				"start": 11,
-				"end": 21,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
-				"children": [
-					{
-						"start": 14,
-						"end": 17,
-						"type": "Text",
-						"data": "foo"
-					}
-				]
-			},
-			{
-				"start": 21,
-				"end": 31,
-				"type": "Text",
-				"data": "\n{:else}\n\t"
-			},
-			{
-				"start": 31,
-				"end": 45,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
+				"end": 51,
+				"type": "IfBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 5,
+					"end": 8,
+					"name": "foo"
+				},
 				"children": [
 					{
-						"start": 34,
-						"end": 41,
-						"type": "Text",
-						"data": "not foo"
+						"start": 11,
+						"end": 21,
+						"type": "Element",
+						"name": "p",
+						"attributes": [],
+						"children": [
+							{
+								"start": 14,
+								"end": 17,
+								"type": "Text",
+								"data": "foo"
+							}
+						]
 					}
-				]
-			},
-			{
-				"start": 45,
-				"end": 51,
-				"type": "Text",
-				"data": "\n{/if}"
+				],
+				"else": {
+					"start": 29,
+					"end": 46,
+					"type": "ElseBlock",
+					"children": [
+						{
+							"start": 31,
+							"end": 45,
+							"type": "Element",
+							"name": "p",
+							"attributes": [],
+							"children": [
+								{
+									"start": 34,
+									"end": 41,
+									"type": "Text",
+									"data": "not foo"
+								}
+							]
+						}
+					]
+				}
 			}
 		]
 	},
diff --git a/test/parser/samples/if-block-else/output-v2.json b/test/parser/samples/if-block-else/output-v2.json
index af2c611220b1..b922778f7eb9 100644
--- a/test/parser/samples/if-block-else/output-v2.json
+++ b/test/parser/samples/if-block-else/output-v2.json
@@ -1,31 +1,31 @@
 {
-	"hash": 3134964533,
+	"hash": "dbh411",
 	"html": {
 		"start": 0,
-		"end": 56,
+		"end": 51,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 56,
+				"end": 51,
 				"type": "IfBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 6,
-					"end": 9,
+					"start": 5,
+					"end": 8,
 					"name": "foo"
 				},
 				"children": [
 					{
-						"start": 13,
-						"end": 23,
+						"start": 11,
+						"end": 21,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 16,
-								"end": 19,
+								"start": 14,
+								"end": 17,
 								"type": "Text",
 								"data": "foo"
 							}
@@ -33,20 +33,20 @@
 					}
 				],
 				"else": {
-					"start": 32,
-					"end": 49,
+					"start": 29,
+					"end": 46,
 					"type": "ElseBlock",
 					"children": [
 						{
-							"start": 34,
-							"end": 48,
+							"start": 31,
+							"end": 45,
 							"type": "Element",
 							"name": "p",
 							"attributes": [],
 							"children": [
 								{
-									"start": 37,
-									"end": 44,
+									"start": 34,
+									"end": 41,
 									"type": "Text",
 									"data": "not foo"
 								}
diff --git a/test/parser/samples/if-block-elseif/_actual-v2.json b/test/parser/samples/if-block-elseif/_actual-v2.json
new file mode 100644
index 000000000000..758e3ee17a58
--- /dev/null
+++ b/test/parser/samples/if-block-elseif/_actual-v2.json
@@ -0,0 +1,102 @@
+{
+	"hash": "tzpuwu",
+	"html": {
+		"start": 0,
+		"end": 88,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 88,
+				"type": "IfBlock",
+				"expression": {
+					"type": "BinaryExpression",
+					"start": 5,
+					"end": 11,
+					"left": {
+						"type": "Identifier",
+						"start": 5,
+						"end": 6,
+						"name": "x"
+					},
+					"operator": ">",
+					"right": {
+						"type": "Literal",
+						"start": 9,
+						"end": 11,
+						"value": 10,
+						"raw": "10"
+					}
+				},
+				"children": [
+					{
+						"start": 14,
+						"end": 41,
+						"type": "Element",
+						"name": "p",
+						"attributes": [],
+						"children": [
+							{
+								"start": 17,
+								"end": 37,
+								"type": "Text",
+								"data": "x is greater than 10"
+							}
+						]
+					}
+				],
+				"else": {
+					"start": 57,
+					"end": 83,
+					"type": "ElseBlock",
+					"children": [
+						{
+							"start": 57,
+							"end": 88,
+							"type": "IfBlock",
+							"elseif": true,
+							"expression": {
+								"type": "BinaryExpression",
+								"start": 51,
+								"end": 56,
+								"left": {
+									"type": "Identifier",
+									"start": 51,
+									"end": 52,
+									"name": "x"
+								},
+								"operator": "<",
+								"right": {
+									"type": "Literal",
+									"start": 55,
+									"end": 56,
+									"value": 5,
+									"raw": "5"
+								}
+							},
+							"children": [
+								{
+									"start": 59,
+									"end": 82,
+									"type": "Element",
+									"name": "p",
+									"attributes": [],
+									"children": [
+										{
+											"start": 62,
+											"end": 78,
+											"type": "Text",
+											"data": "x is less than 5"
+										}
+									]
+								}
+							]
+						}
+					]
+				}
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/if-block-elseif/output-v2.json b/test/parser/samples/if-block-elseif/output-v2.json
new file mode 100644
index 000000000000..758e3ee17a58
--- /dev/null
+++ b/test/parser/samples/if-block-elseif/output-v2.json
@@ -0,0 +1,102 @@
+{
+	"hash": "tzpuwu",
+	"html": {
+		"start": 0,
+		"end": 88,
+		"type": "Fragment",
+		"children": [
+			{
+				"start": 0,
+				"end": 88,
+				"type": "IfBlock",
+				"expression": {
+					"type": "BinaryExpression",
+					"start": 5,
+					"end": 11,
+					"left": {
+						"type": "Identifier",
+						"start": 5,
+						"end": 6,
+						"name": "x"
+					},
+					"operator": ">",
+					"right": {
+						"type": "Literal",
+						"start": 9,
+						"end": 11,
+						"value": 10,
+						"raw": "10"
+					}
+				},
+				"children": [
+					{
+						"start": 14,
+						"end": 41,
+						"type": "Element",
+						"name": "p",
+						"attributes": [],
+						"children": [
+							{
+								"start": 17,
+								"end": 37,
+								"type": "Text",
+								"data": "x is greater than 10"
+							}
+						]
+					}
+				],
+				"else": {
+					"start": 57,
+					"end": 83,
+					"type": "ElseBlock",
+					"children": [
+						{
+							"start": 57,
+							"end": 88,
+							"type": "IfBlock",
+							"elseif": true,
+							"expression": {
+								"type": "BinaryExpression",
+								"start": 51,
+								"end": 56,
+								"left": {
+									"type": "Identifier",
+									"start": 51,
+									"end": 52,
+									"name": "x"
+								},
+								"operator": "<",
+								"right": {
+									"type": "Literal",
+									"start": 55,
+									"end": 56,
+									"value": 5,
+									"raw": "5"
+								}
+							},
+							"children": [
+								{
+									"start": 59,
+									"end": 82,
+									"type": "Element",
+									"name": "p",
+									"attributes": [],
+									"children": [
+										{
+											"start": 62,
+											"end": 78,
+											"type": "Text",
+											"data": "x is less than 5"
+										}
+									]
+								}
+							]
+						}
+					]
+				}
+			}
+		]
+	},
+	"css": null,
+	"js": null
+}
\ No newline at end of file
diff --git a/test/parser/samples/if-block/_actual-v2.json b/test/parser/samples/if-block/_actual-v2.json
index 74de1716e8b2..25ac00f73d59 100644
--- a/test/parser/samples/if-block/_actual-v2.json
+++ b/test/parser/samples/if-block/_actual-v2.json
@@ -8,8 +8,21 @@
 			{
 				"start": 0,
 				"end": 17,
-				"type": "Text",
-				"data": "{#if foo}bar{/if}"
+				"type": "IfBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 5,
+					"end": 8,
+					"name": "foo"
+				},
+				"children": [
+					{
+						"start": 9,
+						"end": 12,
+						"type": "Text",
+						"data": "bar"
+					}
+				]
 			}
 		]
 	},
diff --git a/test/parser/samples/if-block/output-v2.json b/test/parser/samples/if-block/output-v2.json
index d523d415964f..25ac00f73d59 100644
--- a/test/parser/samples/if-block/output-v2.json
+++ b/test/parser/samples/if-block/output-v2.json
@@ -1,24 +1,24 @@
 {
-	"hash": 2374871934,
+	"hash": "w7ju0y",
 	"html": {
 		"start": 0,
-		"end": 21,
+		"end": 17,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 21,
+				"end": 17,
 				"type": "IfBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 6,
-					"end": 9,
+					"start": 5,
+					"end": 8,
 					"name": "foo"
 				},
 				"children": [
 					{
-						"start": 11,
-						"end": 14,
+						"start": 9,
+						"end": 12,
 						"type": "Text",
 						"data": "bar"
 					}
diff --git a/test/parser/samples/raw-mustaches/_actual-v2.json b/test/parser/samples/raw-mustaches/_actual-v2.json
index 1d3445d24efb..983b401968c6 100644
--- a/test/parser/samples/raw-mustaches/_actual-v2.json
+++ b/test/parser/samples/raw-mustaches/_actual-v2.json
@@ -14,9 +14,43 @@
 				"children": [
 					{
 						"start": 3,
+						"end": 4,
+						"type": "Text",
+						"data": " "
+					},
+					{
+						"start": 4,
+						"end": 16,
+						"type": "RawMustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 11,
+							"end": 15,
+							"name": "raw1"
+						}
+					},
+					{
+						"start": 16,
+						"end": 17,
+						"type": "Text",
+						"data": " "
+					},
+					{
+						"start": 17,
+						"end": 29,
+						"type": "RawMustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 24,
+							"end": 28,
+							"name": "raw2"
+						}
+					},
+					{
+						"start": 29,
 						"end": 30,
 						"type": "Text",
-						"data": " {@html raw1} {@html raw2} "
+						"data": " "
 					}
 				]
 			}
diff --git a/test/parser/samples/raw-mustaches/output-v2.json b/test/parser/samples/raw-mustaches/output-v2.json
index e4a1b91c6c40..983b401968c6 100644
--- a/test/parser/samples/raw-mustaches/output-v2.json
+++ b/test/parser/samples/raw-mustaches/output-v2.json
@@ -1,13 +1,13 @@
 {
-	"hash": 183399343,
+	"hash": "9m9gjd",
 	"html": {
 		"start": 0,
-		"end": 30,
+		"end": 34,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 30,
+				"end": 34,
 				"type": "Element",
 				"name": "p",
 				"attributes": [],
@@ -20,35 +20,35 @@
 					},
 					{
 						"start": 4,
-						"end": 14,
+						"end": 16,
 						"type": "RawMustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 7,
-							"end": 11,
+							"start": 11,
+							"end": 15,
 							"name": "raw1"
 						}
 					},
 					{
-						"start": 14,
-						"end": 15,
+						"start": 16,
+						"end": 17,
 						"type": "Text",
 						"data": " "
 					},
 					{
-						"start": 15,
-						"end": 25,
+						"start": 17,
+						"end": 29,
 						"type": "RawMustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 18,
-							"end": 22,
+							"start": 24,
+							"end": 28,
 							"name": "raw2"
 						}
 					},
 					{
-						"start": 25,
-						"end": 26,
+						"start": 29,
+						"end": 30,
 						"type": "Text",
 						"data": " "
 					}
diff --git a/test/parser/samples/script-comment-trailing-multiline/_actual-v2.json b/test/parser/samples/script-comment-trailing-multiline/_actual-v2.json
index 4d68bedef77f..4517795aa738 100644
--- a/test/parser/samples/script-comment-trailing-multiline/_actual-v2.json
+++ b/test/parser/samples/script-comment-trailing-multiline/_actual-v2.json
@@ -14,9 +14,26 @@
 				"children": [
 					{
 						"start": 4,
+						"end": 10,
+						"type": "Text",
+						"data": "Hello "
+					},
+					{
+						"start": 10,
+						"end": 16,
+						"type": "MustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 11,
+							"end": 15,
+							"name": "name"
+						}
+					},
+					{
+						"start": 16,
 						"end": 17,
 						"type": "Text",
-						"data": "Hello {name}!"
+						"data": "!"
 					}
 				]
 			},
diff --git a/test/parser/samples/script-comment-trailing-multiline/output-v2.json b/test/parser/samples/script-comment-trailing-multiline/output-v2.json
index 4319919ee5da..4517795aa738 100644
--- a/test/parser/samples/script-comment-trailing-multiline/output-v2.json
+++ b/test/parser/samples/script-comment-trailing-multiline/output-v2.json
@@ -1,13 +1,13 @@
 {
-	"hash": 1378757574,
+	"hash": "lvjec0",
 	"html": {
 		"start": 0,
-		"end": 24,
+		"end": 22,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 24,
+				"end": 22,
 				"type": "Element",
 				"name": "h1",
 				"attributes": [],
@@ -20,26 +20,26 @@
 					},
 					{
 						"start": 10,
-						"end": 18,
+						"end": 16,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 12,
-							"end": 16,
+							"start": 11,
+							"end": 15,
 							"name": "name"
 						}
 					},
 					{
-						"start": 18,
-						"end": 19,
+						"start": 16,
+						"end": 17,
 						"type": "Text",
 						"data": "!"
 					}
 				]
 			},
 			{
-				"start": 24,
-				"end": 26,
+				"start": 22,
+				"end": 24,
 				"type": "Text",
 				"data": "\n\n"
 			}
@@ -47,40 +47,40 @@
 	},
 	"css": null,
 	"js": {
-		"start": 26,
-		"end": 143,
+		"start": 24,
+		"end": 141,
 		"attributes": [],
 		"content": {
 			"type": "Program",
-			"start": 34,
-			"end": 134,
+			"start": 32,
+			"end": 132,
 			"body": [
 				{
 					"type": "ExportDefaultDeclaration",
-					"start": 36,
-					"end": 95,
+					"start": 34,
+					"end": 93,
 					"declaration": {
 						"type": "ObjectExpression",
-						"start": 51,
-						"end": 94,
+						"start": 49,
+						"end": 92,
 						"properties": [
 							{
 								"type": "Property",
-								"start": 55,
-								"end": 91,
+								"start": 53,
+								"end": 89,
 								"method": false,
 								"shorthand": false,
 								"computed": false,
 								"key": {
 									"type": "Identifier",
-									"start": 55,
-									"end": 59,
+									"start": 53,
+									"end": 57,
 									"name": "data"
 								},
 								"value": {
 									"type": "ArrowFunctionExpression",
-									"start": 61,
-									"end": 91,
+									"start": 59,
+									"end": 89,
 									"id": null,
 									"generator": false,
 									"expression": true,
@@ -88,26 +88,26 @@
 									"params": [],
 									"body": {
 										"type": "ObjectExpression",
-										"start": 68,
-										"end": 90,
+										"start": 66,
+										"end": 88,
 										"properties": [
 											{
 												"type": "Property",
-												"start": 73,
-												"end": 86,
+												"start": 71,
+												"end": 84,
 												"method": false,
 												"shorthand": false,
 												"computed": false,
 												"key": {
 													"type": "Identifier",
-													"start": 73,
-													"end": 77,
+													"start": 71,
+													"end": 75,
 													"name": "name"
 												},
 												"value": {
 													"type": "Literal",
-													"start": 79,
-													"end": 86,
+													"start": 77,
+													"end": 84,
 													"value": "world",
 													"raw": "'world'"
 												},
diff --git a/test/parser/samples/script-comment-trailing/_actual-v2.json b/test/parser/samples/script-comment-trailing/_actual-v2.json
index 6d0fe047ef93..0ec47a45597d 100644
--- a/test/parser/samples/script-comment-trailing/_actual-v2.json
+++ b/test/parser/samples/script-comment-trailing/_actual-v2.json
@@ -14,9 +14,26 @@
 				"children": [
 					{
 						"start": 4,
+						"end": 10,
+						"type": "Text",
+						"data": "Hello "
+					},
+					{
+						"start": 10,
+						"end": 16,
+						"type": "MustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 11,
+							"end": 15,
+							"name": "name"
+						}
+					},
+					{
+						"start": 16,
 						"end": 17,
 						"type": "Text",
-						"data": "Hello {name}!"
+						"data": "!"
 					}
 				]
 			},
diff --git a/test/parser/samples/script-comment-trailing/output-v2.json b/test/parser/samples/script-comment-trailing/output-v2.json
index 2977d6a7faca..0ec47a45597d 100644
--- a/test/parser/samples/script-comment-trailing/output-v2.json
+++ b/test/parser/samples/script-comment-trailing/output-v2.json
@@ -1,13 +1,13 @@
 {
-	"hash": 619854804,
+	"hash": "19sno7e",
 	"html": {
 		"start": 0,
-		"end": 24,
+		"end": 22,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 24,
+				"end": 22,
 				"type": "Element",
 				"name": "h1",
 				"attributes": [],
@@ -20,26 +20,26 @@
 					},
 					{
 						"start": 10,
-						"end": 18,
+						"end": 16,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 12,
-							"end": 16,
+							"start": 11,
+							"end": 15,
 							"name": "name"
 						}
 					},
 					{
-						"start": 18,
-						"end": 19,
+						"start": 16,
+						"end": 17,
 						"type": "Text",
 						"data": "!"
 					}
 				]
 			},
 			{
-				"start": 24,
-				"end": 26,
+				"start": 22,
+				"end": 24,
 				"type": "Text",
 				"data": "\n\n"
 			}
@@ -47,40 +47,40 @@
 	},
 	"css": null,
 	"js": {
-		"start": 26,
-		"end": 132,
+		"start": 24,
+		"end": 130,
 		"attributes": [],
 		"content": {
 			"type": "Program",
-			"start": 34,
-			"end": 123,
+			"start": 32,
+			"end": 121,
 			"body": [
 				{
 					"type": "ExportDefaultDeclaration",
-					"start": 36,
-					"end": 95,
+					"start": 34,
+					"end": 93,
 					"declaration": {
 						"type": "ObjectExpression",
-						"start": 51,
-						"end": 94,
+						"start": 49,
+						"end": 92,
 						"properties": [
 							{
 								"type": "Property",
-								"start": 55,
-								"end": 91,
+								"start": 53,
+								"end": 89,
 								"method": false,
 								"shorthand": false,
 								"computed": false,
 								"key": {
 									"type": "Identifier",
-									"start": 55,
-									"end": 59,
+									"start": 53,
+									"end": 57,
 									"name": "data"
 								},
 								"value": {
 									"type": "ArrowFunctionExpression",
-									"start": 61,
-									"end": 91,
+									"start": 59,
+									"end": 89,
 									"id": null,
 									"generator": false,
 									"expression": true,
@@ -88,26 +88,26 @@
 									"params": [],
 									"body": {
 										"type": "ObjectExpression",
-										"start": 68,
-										"end": 90,
+										"start": 66,
+										"end": 88,
 										"properties": [
 											{
 												"type": "Property",
-												"start": 73,
-												"end": 86,
+												"start": 71,
+												"end": 84,
 												"method": false,
 												"shorthand": false,
 												"computed": false,
 												"key": {
 													"type": "Identifier",
-													"start": 73,
-													"end": 77,
+													"start": 71,
+													"end": 75,
 													"name": "name"
 												},
 												"value": {
 													"type": "Literal",
-													"start": 79,
-													"end": 86,
+													"start": 77,
+													"end": 84,
 													"value": "world",
 													"raw": "'world'"
 												},
diff --git a/test/parser/samples/script/_actual-v2.json b/test/parser/samples/script/_actual-v2.json
index ddc8d043c50d..1a68ead9b6ce 100644
--- a/test/parser/samples/script/_actual-v2.json
+++ b/test/parser/samples/script/_actual-v2.json
@@ -14,9 +14,26 @@
 				"children": [
 					{
 						"start": 4,
+						"end": 10,
+						"type": "Text",
+						"data": "Hello "
+					},
+					{
+						"start": 10,
+						"end": 16,
+						"type": "MustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 11,
+							"end": 15,
+							"name": "name"
+						}
+					},
+					{
+						"start": 16,
 						"end": 17,
 						"type": "Text",
-						"data": "Hello {name}!"
+						"data": "!"
 					}
 				]
 			},
diff --git a/test/parser/samples/script/output-v2.json b/test/parser/samples/script/output-v2.json
index 5c8acef657ba..1a68ead9b6ce 100644
--- a/test/parser/samples/script/output-v2.json
+++ b/test/parser/samples/script/output-v2.json
@@ -1,13 +1,13 @@
 {
-	"hash": 388108696,
+	"hash": "6jy7zq",
 	"html": {
 		"start": 0,
-		"end": 24,
+		"end": 22,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 24,
+				"end": 22,
 				"type": "Element",
 				"name": "h1",
 				"attributes": [],
@@ -20,26 +20,26 @@
 					},
 					{
 						"start": 10,
-						"end": 18,
+						"end": 16,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 12,
-							"end": 16,
+							"start": 11,
+							"end": 15,
 							"name": "name"
 						}
 					},
 					{
-						"start": 18,
-						"end": 19,
+						"start": 16,
+						"end": 17,
 						"type": "Text",
 						"data": "!"
 					}
 				]
 			},
 			{
-				"start": 24,
-				"end": 26,
+				"start": 22,
+				"end": 24,
 				"type": "Text",
 				"data": "\n\n"
 			}
@@ -47,40 +47,40 @@
 	},
 	"css": null,
 	"js": {
-		"start": 26,
-		"end": 105,
+		"start": 24,
+		"end": 103,
 		"attributes": [],
 		"content": {
 			"type": "Program",
-			"start": 34,
-			"end": 96,
+			"start": 32,
+			"end": 94,
 			"body": [
 				{
 					"type": "ExportDefaultDeclaration",
-					"start": 36,
-					"end": 95,
+					"start": 34,
+					"end": 93,
 					"declaration": {
 						"type": "ObjectExpression",
-						"start": 51,
-						"end": 94,
+						"start": 49,
+						"end": 92,
 						"properties": [
 							{
 								"type": "Property",
-								"start": 55,
-								"end": 91,
+								"start": 53,
+								"end": 89,
 								"method": false,
 								"shorthand": false,
 								"computed": false,
 								"key": {
 									"type": "Identifier",
-									"start": 55,
-									"end": 59,
+									"start": 53,
+									"end": 57,
 									"name": "data"
 								},
 								"value": {
 									"type": "ArrowFunctionExpression",
-									"start": 61,
-									"end": 91,
+									"start": 59,
+									"end": 89,
 									"id": null,
 									"generator": false,
 									"expression": true,
@@ -88,26 +88,26 @@
 									"params": [],
 									"body": {
 										"type": "ObjectExpression",
-										"start": 68,
-										"end": 90,
+										"start": 66,
+										"end": 88,
 										"properties": [
 											{
 												"type": "Property",
-												"start": 73,
-												"end": 86,
+												"start": 71,
+												"end": 84,
 												"method": false,
 												"shorthand": false,
 												"computed": false,
 												"key": {
 													"type": "Identifier",
-													"start": 73,
-													"end": 77,
+													"start": 71,
+													"end": 75,
 													"name": "name"
 												},
 												"value": {
 													"type": "Literal",
-													"start": 79,
-													"end": 86,
+													"start": 77,
+													"end": 84,
 													"value": "world",
 													"raw": "'world'"
 												},
diff --git a/test/parser/samples/self-reference/_actual-v2.json b/test/parser/samples/self-reference/_actual-v2.json
index db449c7cb154..ced5eabc410b 100644
--- a/test/parser/samples/self-reference/_actual-v2.json
+++ b/test/parser/samples/self-reference/_actual-v2.json
@@ -7,38 +7,70 @@
 		"children": [
 			{
 				"start": 0,
-				"end": 17,
-				"type": "Text",
-				"data": "{#if depth > 1}\n\t"
-			},
-			{
-				"start": 17,
-				"end": 51,
-				"type": "Element",
-				"name": "svelte:self",
-				"attributes": [
+				"end": 57,
+				"type": "IfBlock",
+				"expression": {
+					"type": "BinaryExpression",
+					"start": 5,
+					"end": 14,
+					"left": {
+						"type": "Identifier",
+						"start": 5,
+						"end": 10,
+						"name": "depth"
+					},
+					"operator": ">",
+					"right": {
+						"type": "Literal",
+						"start": 13,
+						"end": 14,
+						"value": 1,
+						"raw": "1"
+					}
+				},
+				"children": [
 					{
-						"start": 30,
-						"end": 49,
-						"type": "Attribute",
-						"name": "depth",
-						"value": [
+						"start": 17,
+						"end": 51,
+						"type": "Element",
+						"name": "svelte:self",
+						"attributes": [
 							{
-								"start": 37,
-								"end": 48,
-								"type": "Text",
-								"data": "{depth - 1}"
+								"start": 30,
+								"end": 49,
+								"type": "Attribute",
+								"name": "depth",
+								"value": [
+									{
+										"start": 37,
+										"end": 48,
+										"type": "MustacheTag",
+										"expression": {
+											"type": "BinaryExpression",
+											"start": 38,
+											"end": 47,
+											"left": {
+												"type": "Identifier",
+												"start": 38,
+												"end": 43,
+												"name": "depth"
+											},
+											"operator": "-",
+											"right": {
+												"type": "Literal",
+												"start": 46,
+												"end": 47,
+												"value": 1,
+												"raw": "1"
+											}
+										}
+									}
+								]
 							}
-						]
+						],
+						"children": []
 					}
-				],
-				"children": []
-			},
-			{
-				"start": 51,
-				"end": 57,
-				"type": "Text",
-				"data": "\n{/if}"
+				]
 			}
 		]
 	},
diff --git a/test/parser/samples/self-reference/output-v2.json b/test/parser/samples/self-reference/output-v2.json
index f9c788bd2f12..ced5eabc410b 100644
--- a/test/parser/samples/self-reference/output-v2.json
+++ b/test/parser/samples/self-reference/output-v2.json
@@ -1,5 +1,5 @@
 {
-	"hash": 216762188,
+	"hash": "1wh7lqr",
 	"html": {
 		"start": 0,
 		"end": 57,
@@ -11,55 +11,55 @@
 				"type": "IfBlock",
 				"expression": {
 					"type": "BinaryExpression",
-					"start": 6,
-					"end": 15,
+					"start": 5,
+					"end": 14,
 					"left": {
 						"type": "Identifier",
-						"start": 6,
-						"end": 11,
+						"start": 5,
+						"end": 10,
 						"name": "depth"
 					},
 					"operator": ">",
 					"right": {
 						"type": "Literal",
-						"start": 14,
-						"end": 15,
+						"start": 13,
+						"end": 14,
 						"value": 1,
 						"raw": "1"
 					}
 				},
 				"children": [
 					{
-						"start": 19,
-						"end": 49,
+						"start": 17,
+						"end": 51,
 						"type": "Element",
-						"name": ":Self",
+						"name": "svelte:self",
 						"attributes": [
 							{
-								"start": 26,
-								"end": 47,
+								"start": 30,
+								"end": 49,
 								"type": "Attribute",
 								"name": "depth",
 								"value": [
 									{
-										"start": 33,
-										"end": 46,
+										"start": 37,
+										"end": 48,
 										"type": "MustacheTag",
 										"expression": {
 											"type": "BinaryExpression",
-											"start": 35,
-											"end": 44,
+											"start": 38,
+											"end": 47,
 											"left": {
 												"type": "Identifier",
-												"start": 35,
-												"end": 40,
+												"start": 38,
+												"end": 43,
 												"name": "depth"
 											},
 											"operator": "-",
 											"right": {
 												"type": "Literal",
-												"start": 43,
-												"end": 44,
+												"start": 46,
+												"end": 47,
 												"value": 1,
 												"raw": "1"
 											}
diff --git a/test/parser/samples/space-between-mustaches/_actual-v2.json b/test/parser/samples/space-between-mustaches/_actual-v2.json
index 767a93da367a..b6b5c1a4df10 100644
--- a/test/parser/samples/space-between-mustaches/_actual-v2.json
+++ b/test/parser/samples/space-between-mustaches/_actual-v2.json
@@ -14,9 +14,60 @@
 				"children": [
 					{
 						"start": 3,
+						"end": 4,
+						"type": "Text",
+						"data": " "
+					},
+					{
+						"start": 4,
+						"end": 7,
+						"type": "MustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 5,
+							"end": 6,
+							"name": "a"
+						}
+					},
+					{
+						"start": 7,
+						"end": 8,
+						"type": "Text",
+						"data": " "
+					},
+					{
+						"start": 8,
+						"end": 11,
+						"type": "MustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 9,
+							"end": 10,
+							"name": "b"
+						}
+					},
+					{
+						"start": 11,
+						"end": 14,
+						"type": "Text",
+						"data": " : "
+					},
+					{
+						"start": 14,
+						"end": 17,
+						"type": "MustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 15,
+							"end": 16,
+							"name": "c"
+						}
+					},
+					{
+						"start": 17,
 						"end": 20,
 						"type": "Text",
-						"data": " {a} {b} : {c} : "
+						"data": " : "
 					}
 				]
 			}
diff --git a/test/parser/samples/space-between-mustaches/output-v2.json b/test/parser/samples/space-between-mustaches/output-v2.json
index 854608fb292a..b6b5c1a4df10 100644
--- a/test/parser/samples/space-between-mustaches/output-v2.json
+++ b/test/parser/samples/space-between-mustaches/output-v2.json
@@ -1,13 +1,13 @@
 {
-	"hash": 1185019088,
+	"hash": "1n7rpsi",
 	"html": {
 		"start": 0,
-		"end": 30,
+		"end": 24,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 30,
+				"end": 24,
 				"type": "Element",
 				"name": "p",
 				"attributes": [],
@@ -20,52 +20,52 @@
 					},
 					{
 						"start": 4,
-						"end": 9,
+						"end": 7,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 6,
-							"end": 7,
+							"start": 5,
+							"end": 6,
 							"name": "a"
 						}
 					},
 					{
-						"start": 9,
-						"end": 10,
+						"start": 7,
+						"end": 8,
 						"type": "Text",
 						"data": " "
 					},
 					{
-						"start": 10,
-						"end": 15,
+						"start": 8,
+						"end": 11,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 12,
-							"end": 13,
+							"start": 9,
+							"end": 10,
 							"name": "b"
 						}
 					},
 					{
-						"start": 15,
-						"end": 18,
+						"start": 11,
+						"end": 14,
 						"type": "Text",
 						"data": " : "
 					},
 					{
-						"start": 18,
-						"end": 23,
+						"start": 14,
+						"end": 17,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 20,
-							"end": 21,
+							"start": 15,
+							"end": 16,
 							"name": "c"
 						}
 					},
 					{
-						"start": 23,
-						"end": 26,
+						"start": 17,
+						"end": 20,
 						"type": "Text",
 						"data": " : "
 					}
diff --git a/test/parser/samples/spread/_actual-v2.json b/test/parser/samples/spread/_actual-v2.json
index 48ef177cd7a2..e9c53e744696 100644
--- a/test/parser/samples/spread/_actual-v2.json
+++ b/test/parser/samples/spread/_actual-v2.json
@@ -14,9 +14,13 @@
 					{
 						"start": 5,
 						"end": 15,
-						"type": "Attribute",
-						"name": "{...props}",
-						"value": true
+						"type": "Spread",
+						"expression": {
+							"type": "Identifier",
+							"start": 9,
+							"end": 14,
+							"name": "props"
+						}
 					}
 				],
 				"children": []
diff --git a/test/parser/samples/spread/output-v2.json b/test/parser/samples/spread/output-v2.json
index 09fa0b3027e3..e9c53e744696 100644
--- a/test/parser/samples/spread/output-v2.json
+++ b/test/parser/samples/spread/output-v2.json
@@ -1,24 +1,24 @@
 {
-	"hash": "phg0l6",
+	"hash": "z82kse",
 	"html": {
 		"start": 0,
-		"end": 24,
+		"end": 22,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 24,
+				"end": 22,
 				"type": "Element",
 				"name": "div",
 				"attributes": [
 					{
 						"start": 5,
-						"end": 17,
+						"end": 15,
 						"type": "Spread",
 						"expression": {
 							"type": "Identifier",
-							"start": 10,
-							"end": 15,
+							"start": 9,
+							"end": 14,
 							"name": "props"
 						}
 					}
diff --git a/test/parser/samples/textarea-children/_actual-v2.json b/test/parser/samples/textarea-children/_actual-v2.json
index 12a5b9917319..2e219bb75098 100644
--- a/test/parser/samples/textarea-children/_actual-v2.json
+++ b/test/parser/samples/textarea-children/_actual-v2.json
@@ -14,9 +14,26 @@
 				"children": [
 					{
 						"start": 10,
+						"end": 40,
+						"type": "Text",
+						"data": "\n\t<p>not actually an element. "
+					},
+					{
+						"start": 40,
+						"end": 45,
+						"type": "MustacheTag",
+						"expression": {
+							"type": "Identifier",
+							"start": 41,
+							"end": 44,
+							"name": "foo"
+						}
+					},
+					{
+						"start": 45,
 						"end": 50,
 						"type": "Text",
-						"data": "\n\t<p>not actually an element. {foo}</p>\n"
+						"data": "</p>\n"
 					}
 				]
 			}
diff --git a/test/parser/samples/textarea-children/output-v2.json b/test/parser/samples/textarea-children/output-v2.json
index d4ea6f04bb5a..2e219bb75098 100644
--- a/test/parser/samples/textarea-children/output-v2.json
+++ b/test/parser/samples/textarea-children/output-v2.json
@@ -1,13 +1,13 @@
 {
-	"hash": 2992234421,
+	"hash": "1uyqul7",
 	"html": {
 		"start": 0,
-		"end": 63,
+		"end": 61,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 63,
+				"end": 61,
 				"type": "Element",
 				"name": "textarea",
 				"attributes": [],
@@ -20,18 +20,18 @@
 					},
 					{
 						"start": 40,
-						"end": 47,
+						"end": 45,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 42,
-							"end": 45,
+							"start": 41,
+							"end": 44,
 							"name": "foo"
 						}
 					},
 					{
-						"start": 47,
-						"end": 52,
+						"start": 45,
+						"end": 50,
 						"type": "Text",
 						"data": "</p>\n"
 					}
diff --git a/test/parser/samples/unusual-identifier/_actual-v2.json b/test/parser/samples/unusual-identifier/_actual-v2.json
index 1a6cb72eb488..e4a290c0a689 100644
--- a/test/parser/samples/unusual-identifier/_actual-v2.json
+++ b/test/parser/samples/unusual-identifier/_actual-v2.json
@@ -7,30 +7,37 @@
 		"children": [
 			{
 				"start": 0,
-				"end": 22,
-				"type": "Text",
-				"data": "{#each things as 𐊧}\n\t"
-			},
-			{
-				"start": 22,
-				"end": 33,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
+				"end": 41,
+				"type": "EachBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 7,
+					"end": 13,
+					"name": "things"
+				},
 				"children": [
 					{
-						"start": 25,
-						"end": 29,
-						"type": "Text",
-						"data": "{𐊧}"
+						"start": 22,
+						"end": 33,
+						"type": "Element",
+						"name": "p",
+						"attributes": [],
+						"children": [
+							{
+								"start": 25,
+								"end": 29,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 26,
+									"end": 28,
+									"name": "𐊧"
+								}
+							}
+						]
 					}
-				]
-			},
-			{
-				"start": 33,
-				"end": 41,
-				"type": "Text",
-				"data": "\n{/each}"
+				],
+				"context": "𐊧"
 			}
 		]
 	},
diff --git a/test/parser/samples/unusual-identifier/output-v2.json b/test/parser/samples/unusual-identifier/output-v2.json
index 6434526df596..e4a290c0a689 100644
--- a/test/parser/samples/unusual-identifier/output-v2.json
+++ b/test/parser/samples/unusual-identifier/output-v2.json
@@ -1,36 +1,36 @@
 {
-	"hash": 795130236,
+	"hash": "8weqxs",
 	"html": {
 		"start": 0,
-		"end": 47,
+		"end": 41,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 47,
+				"end": 41,
 				"type": "EachBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 8,
-					"end": 14,
+					"start": 7,
+					"end": 13,
 					"name": "things"
 				},
 				"children": [
 					{
-						"start": 24,
-						"end": 37,
+						"start": 22,
+						"end": 33,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 27,
-								"end": 33,
+								"start": 25,
+								"end": 29,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 29,
-									"end": 31,
+									"start": 26,
+									"end": 28,
 									"name": "𐊧"
 								}
 							}
diff --git a/test/parser/samples/whitespace-normal/_actual-v2.json b/test/parser/samples/whitespace-normal/_actual-v2.json
index d0a9c66d6a7e..e9d6a39b089c 100644
--- a/test/parser/samples/whitespace-normal/_actual-v2.json
+++ b/test/parser/samples/whitespace-normal/_actual-v2.json
@@ -27,9 +27,20 @@
 						"children": [
 							{
 								"start": 18,
+								"end": 24,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 19,
+									"end": 23,
+									"name": "name"
+								}
+							},
+							{
+								"start": 24,
 								"end": 26,
 								"type": "Text",
-								"data": "{name}! "
+								"data": "! "
 							}
 						]
 					},
diff --git a/test/parser/samples/whitespace-normal/output-v2.json b/test/parser/samples/whitespace-normal/output-v2.json
index 5b609c8e3680..e9d6a39b089c 100644
--- a/test/parser/samples/whitespace-normal/output-v2.json
+++ b/test/parser/samples/whitespace-normal/output-v2.json
@@ -1,13 +1,13 @@
 {
-	"hash": 2961389466,
+	"hash": "1827l8g",
 	"html": {
 		"start": 0,
-		"end": 67,
+		"end": 65,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 67,
+				"end": 65,
 				"type": "Element",
 				"name": "h1",
 				"attributes": [],
@@ -20,40 +20,40 @@
 					},
 					{
 						"start": 10,
-						"end": 37,
+						"end": 35,
 						"type": "Element",
 						"name": "strong",
 						"attributes": [],
 						"children": [
 							{
 								"start": 18,
-								"end": 26,
+								"end": 24,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 20,
-									"end": 24,
+									"start": 19,
+									"end": 23,
 									"name": "name"
 								}
 							},
 							{
-								"start": 26,
-								"end": 28,
+								"start": 24,
+								"end": 26,
 								"type": "Text",
 								"data": "! "
 							}
 						]
 					},
 					{
-						"start": 37,
-						"end": 62,
+						"start": 35,
+						"end": 60,
 						"type": "Element",
 						"name": "span",
 						"attributes": [],
 						"children": [
 							{
-								"start": 43,
-								"end": 55,
+								"start": 41,
+								"end": 53,
 								"type": "Text",
 								"data": "How are you?"
 							}
diff --git a/test/parser/samples/yield/_actual-v2.json b/test/parser/samples/yield/_actual-v2.json
index cc8cf371768e..da5ed52d0e6e 100644
--- a/test/parser/samples/yield/_actual-v2.json
+++ b/test/parser/samples/yield/_actual-v2.json
@@ -1,17 +1,20 @@
 {
-	"hash": "1oiqcow",
+	"hash": "1na2f8c",
 	"html": {
 		"start": 0,
-		"end": 9,
+		"end": 7,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 9,
-				"type": "Element",
-				"name": "slot",
-				"attributes": [],
-				"children": []
+				"end": 7,
+				"type": "MustacheTag",
+				"expression": {
+					"start": 1,
+					"end": 6,
+					"type": "Identifier",
+					"name": "yield"
+				}
 			}
 		]
 	},
diff --git a/test/parser/samples/yield/input-v2.html b/test/parser/samples/yield/input-v2.html
index fb5c4b157d1c..f5e8aad05330 100644
--- a/test/parser/samples/yield/input-v2.html
+++ b/test/parser/samples/yield/input-v2.html
@@ -1 +1 @@
-{{yield}}
\ No newline at end of file
+{yield}
\ No newline at end of file
diff --git a/test/parser/samples/yield/output-v2.json b/test/parser/samples/yield/output-v2.json
index d3f3e602a603..da5ed52d0e6e 100644
--- a/test/parser/samples/yield/output-v2.json
+++ b/test/parser/samples/yield/output-v2.json
@@ -1,17 +1,20 @@
 {
-	"hash": 3659433152,
+	"hash": "1na2f8c",
 	"html": {
 		"start": 0,
-		"end": 9,
+		"end": 7,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 9,
-				"type": "Element",
-				"name": "slot",
-				"attributes": [],
-				"children": []
+				"end": 7,
+				"type": "MustacheTag",
+				"expression": {
+					"start": 1,
+					"end": 6,
+					"type": "Identifier",
+					"name": "yield"
+				}
 			}
 		]
 	},

From 90a372ebf3243b799a4fa52bf3af132725869aed Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Tue, 10 Apr 2018 22:49:21 -0400
Subject: [PATCH 03/15] brute force new keyed each block syntax

---
 src/parse/state/mustache.ts                   | 20 +++++++-
 test/parser/index.js                          |  2 +-
 .../samples/each-block-keyed/_actual-v2.json  | 50 +++++++++++--------
 .../samples/each-block-keyed/output-v2.json   | 22 ++++----
 test/parser/samples/yield/input.html          |  2 +-
 5 files changed, 61 insertions(+), 35 deletions(-)

diff --git a/src/parse/state/mustache.ts b/src/parse/state/mustache.ts
index a73237cf2104..de4d00037bad 100644
--- a/src/parse/state/mustache.ts
+++ b/src/parse/state/mustache.ts
@@ -274,7 +274,25 @@ export default function mustache(parser: Parser) {
 				parser.allowWhitespace();
 			}
 
-			if (parser.eat('@')) {
+			if (parser.eat('key')) {
+				parser.requireWhitespace();
+
+				const expression = readExpression(parser);
+
+				// TODO eventually, we should accept any expression, and turn
+				// it into a function. For now, assume that every expression
+				// follows the `foo.id` pattern, and equates to `@id`
+				if (
+					expression.type !== 'MemberExpression' ||
+					expression.property.computed ||
+					expression.property.type !== 'Identifier'
+				) {
+					parser.error('invalid key', expression.start);
+				}
+
+				block.key = expression.property.name;
+				parser.allowWhitespace();
+			} else if (parser.eat('@')) {
 				block.key = parser.readIdentifier();
 				if (!block.key) parser.error(`Expected name`);
 				parser.allowWhitespace();
diff --git a/test/parser/index.js b/test/parser/index.js
index d0417c8bfa3e..0bdb4ad74075 100644
--- a/test/parser/index.js
+++ b/test/parser/index.js
@@ -2,7 +2,7 @@ import assert from 'assert';
 import fs from 'fs';
 import { svelte, tryToLoadJson } from '../helpers.js';
 
-describe.only('parse', () => {
+describe('parse', () => {
 	fs.readdirSync('test/parser/samples').forEach(dir => {
 		if (dir[0] === '.') return;
 
diff --git a/test/parser/samples/each-block-keyed/_actual-v2.json b/test/parser/samples/each-block-keyed/_actual-v2.json
index c039c98ce95a..514682b77024 100644
--- a/test/parser/samples/each-block-keyed/_actual-v2.json
+++ b/test/parser/samples/each-block-keyed/_actual-v2.json
@@ -7,30 +7,38 @@
 		"children": [
 			{
 				"start": 0,
-				"end": 35,
-				"type": "Text",
-				"data": "{#each todos as todo key todo.id}\n\t"
-			},
-			{
-				"start": 35,
-				"end": 48,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
+				"end": 56,
+				"type": "EachBlock",
+				"expression": {
+					"type": "Identifier",
+					"start": 7,
+					"end": 12,
+					"name": "todos"
+				},
 				"children": [
 					{
-						"start": 38,
-						"end": 44,
-						"type": "Text",
-						"data": "{todo}"
+						"start": 35,
+						"end": 48,
+						"type": "Element",
+						"name": "p",
+						"attributes": [],
+						"children": [
+							{
+								"start": 38,
+								"end": 44,
+								"type": "MustacheTag",
+								"expression": {
+									"type": "Identifier",
+									"start": 39,
+									"end": 43,
+									"name": "todo"
+								}
+							}
+						]
 					}
-				]
-			},
-			{
-				"start": 48,
-				"end": 56,
-				"type": "Text",
-				"data": "\n{/each}"
+				],
+				"context": "todo",
+				"key": "id"
 			}
 		]
 	},
diff --git a/test/parser/samples/each-block-keyed/output-v2.json b/test/parser/samples/each-block-keyed/output-v2.json
index 1a16afb82b31..514682b77024 100644
--- a/test/parser/samples/each-block-keyed/output-v2.json
+++ b/test/parser/samples/each-block-keyed/output-v2.json
@@ -1,36 +1,36 @@
 {
-	"hash": 2025411181,
+	"hash": "3sm0ec",
 	"html": {
 		"start": 0,
-		"end": 54,
+		"end": 56,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 54,
+				"end": 56,
 				"type": "EachBlock",
 				"expression": {
 					"type": "Identifier",
-					"start": 8,
-					"end": 13,
+					"start": 7,
+					"end": 12,
 					"name": "todos"
 				},
 				"children": [
 					{
-						"start": 29,
-						"end": 44,
+						"start": 35,
+						"end": 48,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 32,
-								"end": 40,
+								"start": 38,
+								"end": 44,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 34,
-									"end": 38,
+									"start": 39,
+									"end": 43,
 									"name": "todo"
 								}
 							}
diff --git a/test/parser/samples/yield/input.html b/test/parser/samples/yield/input.html
index 889d9eeadc10..fb5c4b157d1c 100644
--- a/test/parser/samples/yield/input.html
+++ b/test/parser/samples/yield/input.html
@@ -1 +1 @@
-{{yield}}
+{{yield}}
\ No newline at end of file

From 258466ebbeb6dfaa6b81d7c3aa731e8f9d7c0bff Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 12 Apr 2018 23:11:28 -0400
Subject: [PATCH 04/15] attribute shorthand

---
 .gitignore                                    |   1 +
 src/parse/state/tag.ts                        |  51 ++++-
 .../samples/action-with-call/_actual-v2.json  |  47 -----
 .../action-with-identifier/_actual-v2.json    |  33 ----
 .../action-with-literal/_actual-v2.json       |  34 ----
 test/parser/samples/action/_actual-v2.json    |  28 ---
 .../attribute-dynamic-boolean/_actual-v2.json |  40 ----
 .../_actual-v2.json                           |  40 ----
 .../samples/attribute-dynamic/_actual-v2.json |  64 ------
 .../samples/attribute-escaped/_actual-v2.json |  35 ----
 .../attribute-multiple/_actual-v2.json        |  49 -----
 .../attribute-shorthand/_actual-v2.json       |  40 ----
 .../samples/attribute-shorthand/input-v2.html |   2 +-
 .../attribute-shorthand/output-v2.json        |   6 +-
 .../attribute-static-boolean/_actual-v2.json  |  28 ---
 .../samples/attribute-static/_actual-v2.json  |  35 ----
 .../attribute-unquoted/_actual-v2.json        |  35 ----
 .../samples/await-then-catch/_actual-v2.json  | 161 ----------------
 .../samples/binding-shorthand/_actual-v2.json |  33 ----
 test/parser/samples/binding/_actual-v2.json   |  33 ----
 test/parser/samples/comment/_actual-v2.json   |  18 --
 .../samples/component-dynamic/_actual-v2.json |  43 -----
 .../_actual-v2.json                           |  27 ---
 .../samples/convert-entities/_actual-v2.json  |  18 --
 .../samples/css-ref-selector/_actual-v2.json  |  96 ---------
 test/parser/samples/css/_actual-v2.json       |  96 ---------
 .../samples/dynamic-import/_actual-v2.json    | 182 ------------------
 .../each-block-destructured/_actual-v2.json   |  67 -------
 .../samples/each-block-else/_actual-v2.json   |  68 -------
 .../each-block-indexed/_actual-v2.json        |  64 ------
 .../samples/each-block-keyed/_actual-v2.json  |  47 -----
 .../parser/samples/each-block/_actual-v2.json |  46 -----
 .../element-with-mustache/_actual-v2.json     |  44 -----
 .../samples/element-with-text/_actual-v2.json |  27 ---
 test/parser/samples/elements/_actual-v2.json  |  28 ---
 .../samples/event-handler/_actual-v2.json     | 116 -----------
 .../samples/if-block-else/_actual-v2.json     |  62 ------
 .../samples/if-block-elseif/_actual-v2.json   | 102 ----------
 test/parser/samples/if-block/_actual-v2.json  |  31 ---
 .../implicitly-closed-li/_actual-v2.json      |  72 -------
 test/parser/samples/nbsp/_actual-v2.json      |  27 ---
 .../samples/raw-mustaches/_actual-v2.json     |  61 ------
 test/parser/samples/refs/_actual-v2.json      |  27 ---
 .../script-comment-only/_actual-v2.json       |  26 ---
 .../_actual-v2.json                           | 128 ------------
 .../script-comment-trailing/_actual-v2.json   | 128 ------------
 test/parser/samples/script/_actual-v2.json    | 128 ------------
 .../self-closing-element/_actual-v2.json      |  20 --
 .../samples/self-reference/_actual-v2.json    |  79 --------
 .../space-between-mustaches/_actual-v2.json   |  78 --------
 test/parser/samples/spread/_actual-v2.json    |  32 ---
 .../samples/textarea-children/_actual-v2.json |  44 -----
 .../_actual-v2.json                           |  37 ----
 .../samples/transition-intro/_actual-v2.json  |  65 -------
 .../unusual-identifier/_actual-v2.json        |  46 -----
 .../_actual-v2.json                           |  33 ----
 .../samples/whitespace-normal/_actual-v2.json |  68 -------
 test/parser/samples/yield/_actual-v2.json     |  23 ---
 58 files changed, 46 insertions(+), 3053 deletions(-)
 delete mode 100644 test/parser/samples/action-with-call/_actual-v2.json
 delete mode 100644 test/parser/samples/action-with-identifier/_actual-v2.json
 delete mode 100644 test/parser/samples/action-with-literal/_actual-v2.json
 delete mode 100644 test/parser/samples/action/_actual-v2.json
 delete mode 100644 test/parser/samples/attribute-dynamic-boolean/_actual-v2.json
 delete mode 100644 test/parser/samples/attribute-dynamic-reserved/_actual-v2.json
 delete mode 100644 test/parser/samples/attribute-dynamic/_actual-v2.json
 delete mode 100644 test/parser/samples/attribute-escaped/_actual-v2.json
 delete mode 100644 test/parser/samples/attribute-multiple/_actual-v2.json
 delete mode 100644 test/parser/samples/attribute-shorthand/_actual-v2.json
 delete mode 100644 test/parser/samples/attribute-static-boolean/_actual-v2.json
 delete mode 100644 test/parser/samples/attribute-static/_actual-v2.json
 delete mode 100644 test/parser/samples/attribute-unquoted/_actual-v2.json
 delete mode 100644 test/parser/samples/await-then-catch/_actual-v2.json
 delete mode 100644 test/parser/samples/binding-shorthand/_actual-v2.json
 delete mode 100644 test/parser/samples/binding/_actual-v2.json
 delete mode 100644 test/parser/samples/comment/_actual-v2.json
 delete mode 100644 test/parser/samples/component-dynamic/_actual-v2.json
 delete mode 100644 test/parser/samples/convert-entities-in-element/_actual-v2.json
 delete mode 100644 test/parser/samples/convert-entities/_actual-v2.json
 delete mode 100644 test/parser/samples/css-ref-selector/_actual-v2.json
 delete mode 100644 test/parser/samples/css/_actual-v2.json
 delete mode 100644 test/parser/samples/dynamic-import/_actual-v2.json
 delete mode 100644 test/parser/samples/each-block-destructured/_actual-v2.json
 delete mode 100644 test/parser/samples/each-block-else/_actual-v2.json
 delete mode 100644 test/parser/samples/each-block-indexed/_actual-v2.json
 delete mode 100644 test/parser/samples/each-block-keyed/_actual-v2.json
 delete mode 100644 test/parser/samples/each-block/_actual-v2.json
 delete mode 100644 test/parser/samples/element-with-mustache/_actual-v2.json
 delete mode 100644 test/parser/samples/element-with-text/_actual-v2.json
 delete mode 100644 test/parser/samples/elements/_actual-v2.json
 delete mode 100644 test/parser/samples/event-handler/_actual-v2.json
 delete mode 100644 test/parser/samples/if-block-else/_actual-v2.json
 delete mode 100644 test/parser/samples/if-block-elseif/_actual-v2.json
 delete mode 100644 test/parser/samples/if-block/_actual-v2.json
 delete mode 100644 test/parser/samples/implicitly-closed-li/_actual-v2.json
 delete mode 100644 test/parser/samples/nbsp/_actual-v2.json
 delete mode 100644 test/parser/samples/raw-mustaches/_actual-v2.json
 delete mode 100644 test/parser/samples/refs/_actual-v2.json
 delete mode 100644 test/parser/samples/script-comment-only/_actual-v2.json
 delete mode 100644 test/parser/samples/script-comment-trailing-multiline/_actual-v2.json
 delete mode 100644 test/parser/samples/script-comment-trailing/_actual-v2.json
 delete mode 100644 test/parser/samples/script/_actual-v2.json
 delete mode 100644 test/parser/samples/self-closing-element/_actual-v2.json
 delete mode 100644 test/parser/samples/self-reference/_actual-v2.json
 delete mode 100644 test/parser/samples/space-between-mustaches/_actual-v2.json
 delete mode 100644 test/parser/samples/spread/_actual-v2.json
 delete mode 100644 test/parser/samples/textarea-children/_actual-v2.json
 delete mode 100644 test/parser/samples/transition-intro-no-params/_actual-v2.json
 delete mode 100644 test/parser/samples/transition-intro/_actual-v2.json
 delete mode 100644 test/parser/samples/unusual-identifier/_actual-v2.json
 delete mode 100644 test/parser/samples/whitespace-leading-trailing/_actual-v2.json
 delete mode 100644 test/parser/samples/whitespace-normal/_actual-v2.json
 delete mode 100644 test/parser/samples/yield/_actual-v2.json

diff --git a/.gitignore b/.gitignore
index 052b68756215..39e5add714e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ coverage.lcov
 test/sourcemaps/samples/*/output.js
 test/sourcemaps/samples/*/output.js.map
 _actual.*
+_actual-v2.*
 _actual-bundle.*
 src/generators/dom/shared.ts
 package-lock.json
diff --git a/src/parse/state/tag.ts b/src/parse/state/tag.ts
index e1dbfcf6c6b8..d2f4f8a702ba 100644
--- a/src/parse/state/tag.ts
+++ b/src/parse/state/tag.ts
@@ -295,19 +295,50 @@ function readAttribute(parser: Parser, uniqueNames: Set<string>) {
 
 	if (parser.eat(parser.v2 ? '{' : '{{')) {
 		parser.allowWhitespace();
-		parser.eat('...', true, 'Expected spread operator (...)');
 
-		const expression = readExpression(parser);
+		const spread = parser.eat('...');
 
-		parser.allowWhitespace();
-		parser.eat(parser.v2 ? '}' : '}}', true);
+		if (parser.eat('...')) {
+			const expression = readExpression(parser);
 
-		return {
-			start,
-			end: parser.index,
-			type: 'Spread',
-			expression
-		};
+			parser.allowWhitespace();
+			parser.eat(parser.v2 ? '}' : '}}', true);
+
+			return {
+				start,
+				end: parser.index,
+				type: 'Spread',
+				expression
+			};
+		} else {
+			if (!parser.v2) {
+				parser.error('Expected spread operator (...)');
+			}
+
+			const valueStart = parser.index;
+
+			const name = parser.readIdentifier();
+			parser.allowWhitespace();
+			parser.eat('}', true);
+
+			return {
+				start,
+				end: parser.index,
+				type: 'Attribute',
+				name,
+				value: [{
+					start: valueStart,
+					end: valueStart + name.length,
+					type: 'AttributeShorthand',
+					expression: {
+						start: valueStart,
+						end: valueStart + name.length,
+						type: 'Identifier',
+						name
+					}
+				}]
+			};
+		}
 	}
 
 	let name = parser.readUntil(/(\s|=|\/|>)/);
diff --git a/test/parser/samples/action-with-call/_actual-v2.json b/test/parser/samples/action-with-call/_actual-v2.json
deleted file mode 100644
index b7bc908e2482..000000000000
--- a/test/parser/samples/action-with-call/_actual-v2.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"hash": "1eefngx",
-	"html": {
-		"start": 0,
-		"end": 38,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 38,
-				"type": "Element",
-				"name": "input",
-				"attributes": [
-					{
-						"start": 7,
-						"end": 37,
-						"type": "Action",
-						"name": "tooltip",
-						"expression": {
-							"type": "CallExpression",
-							"start": 20,
-							"end": 36,
-							"callee": {
-								"type": "Identifier",
-								"start": 20,
-								"end": 21,
-								"name": "t"
-							},
-							"arguments": [
-								{
-									"type": "Literal",
-									"start": 22,
-									"end": 35,
-									"value": "tooltip msg",
-									"raw": "'tooltip msg'"
-								}
-							]
-						}
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/action-with-identifier/_actual-v2.json b/test/parser/samples/action-with-identifier/_actual-v2.json
deleted file mode 100644
index 6c6daa34b2b1..000000000000
--- a/test/parser/samples/action-with-identifier/_actual-v2.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"hash": "1vce0rr",
-	"html": {
-		"start": 0,
-		"end": 29,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 29,
-				"type": "Element",
-				"name": "input",
-				"attributes": [
-					{
-						"start": 7,
-						"end": 28,
-						"type": "Action",
-						"name": "tooltip",
-						"expression": {
-							"type": "Identifier",
-							"start": 20,
-							"end": 27,
-							"name": "message"
-						}
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/action-with-literal/_actual-v2.json b/test/parser/samples/action-with-literal/_actual-v2.json
deleted file mode 100644
index 472b5a306d3b..000000000000
--- a/test/parser/samples/action-with-literal/_actual-v2.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"hash": "1pm9eh0",
-	"html": {
-		"start": 0,
-		"end": 35,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 35,
-				"type": "Element",
-				"name": "input",
-				"attributes": [
-					{
-						"start": 7,
-						"end": 34,
-						"type": "Action",
-						"name": "tooltip",
-						"expression": {
-							"type": "Literal",
-							"start": 20,
-							"end": 33,
-							"value": "tooltip msg",
-							"raw": "'tooltip msg'"
-						}
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/action/_actual-v2.json b/test/parser/samples/action/_actual-v2.json
deleted file mode 100644
index 0746bd601a0f..000000000000
--- a/test/parser/samples/action/_actual-v2.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"hash": "1e3ix5",
-	"html": {
-		"start": 0,
-		"end": 21,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 21,
-				"type": "Element",
-				"name": "input",
-				"attributes": [
-					{
-						"start": 7,
-						"end": 20,
-						"type": "Action",
-						"name": "autofocus",
-						"expression": null
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic-boolean/_actual-v2.json b/test/parser/samples/attribute-dynamic-boolean/_actual-v2.json
deleted file mode 100644
index 4d08df34a0d6..000000000000
--- a/test/parser/samples/attribute-dynamic-boolean/_actual-v2.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"hash": "7xolfv",
-	"html": {
-		"start": 0,
-		"end": 41,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 41,
-				"type": "Element",
-				"name": "textarea",
-				"attributes": [
-					{
-						"start": 10,
-						"end": 29,
-						"type": "Attribute",
-						"name": "readonly",
-						"value": [
-							{
-								"start": 19,
-								"end": 29,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 20,
-									"end": 28,
-									"name": "readonly"
-								}
-							}
-						]
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic-reserved/_actual-v2.json b/test/parser/samples/attribute-dynamic-reserved/_actual-v2.json
deleted file mode 100644
index 4b6506b0cdf1..000000000000
--- a/test/parser/samples/attribute-dynamic-reserved/_actual-v2.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"hash": "l0cddf",
-	"html": {
-		"start": 0,
-		"end": 25,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 25,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 18,
-						"type": "Attribute",
-						"name": "class",
-						"value": [
-							{
-								"start": 11,
-								"end": 18,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 12,
-									"end": 17,
-									"name": "class"
-								}
-							}
-						]
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic/_actual-v2.json b/test/parser/samples/attribute-dynamic/_actual-v2.json
deleted file mode 100644
index 7ccb40d313fa..000000000000
--- a/test/parser/samples/attribute-dynamic/_actual-v2.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-	"hash": "ehtsx6",
-	"html": {
-		"start": 0,
-		"end": 42,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 42,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 28,
-						"type": "Attribute",
-						"name": "style",
-						"value": [
-							{
-								"start": 12,
-								"end": 19,
-								"type": "Text",
-								"data": "color: "
-							},
-							{
-								"start": 19,
-								"end": 26,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 20,
-									"end": 25,
-									"name": "color"
-								}
-							},
-							{
-								"start": 26,
-								"end": 27,
-								"type": "Text",
-								"data": ";"
-							}
-						]
-					}
-				],
-				"children": [
-					{
-						"start": 29,
-						"end": 36,
-						"type": "MustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 30,
-							"end": 35,
-							"name": "color"
-						}
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-escaped/_actual-v2.json b/test/parser/samples/attribute-escaped/_actual-v2.json
deleted file mode 100644
index d048a3d94599..000000000000
--- a/test/parser/samples/attribute-escaped/_actual-v2.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"hash": "pv50w6",
-	"html": {
-		"start": 0,
-		"end": 41,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 41,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 34,
-						"type": "Attribute",
-						"name": "data-foo",
-						"value": [
-							{
-								"start": 15,
-								"end": 33,
-								"type": "Text",
-								"data": "\"quoted\""
-							}
-						]
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-multiple/_actual-v2.json b/test/parser/samples/attribute-multiple/_actual-v2.json
deleted file mode 100644
index b185127d5657..000000000000
--- a/test/parser/samples/attribute-multiple/_actual-v2.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-	"hash": "8dvm3u",
-	"html": {
-		"start": 0,
-		"end": 28,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 28,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 11,
-						"type": "Attribute",
-						"name": "id",
-						"value": [
-							{
-								"start": 9,
-								"end": 10,
-								"type": "Text",
-								"data": "x"
-							}
-						]
-					},
-					{
-						"start": 12,
-						"end": 21,
-						"type": "Attribute",
-						"name": "class",
-						"value": [
-							{
-								"start": 19,
-								"end": 20,
-								"type": "Text",
-								"data": "y"
-							}
-						]
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-shorthand/_actual-v2.json b/test/parser/samples/attribute-shorthand/_actual-v2.json
deleted file mode 100644
index 01b3ae38b220..000000000000
--- a/test/parser/samples/attribute-shorthand/_actual-v2.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"hash": "s7nwuc",
-	"html": {
-		"start": 0,
-		"end": 10,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 10,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 8,
-						"type": "Attribute",
-						"name": "id",
-						"value": [
-							{
-								"type": "AttributeShorthand",
-								"start": 6,
-								"end": 8,
-								"expression": {
-									"type": "Identifier",
-									"start": 6,
-									"end": 8,
-									"name": "id"
-								}
-							}
-						]
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-shorthand/input-v2.html b/test/parser/samples/attribute-shorthand/input-v2.html
index e26deafb3a3d..35468de00697 100644
--- a/test/parser/samples/attribute-shorthand/input-v2.html
+++ b/test/parser/samples/attribute-shorthand/input-v2.html
@@ -1 +1 @@
-<div :id/>
\ No newline at end of file
+<div {id}/>
\ No newline at end of file
diff --git a/test/parser/samples/attribute-shorthand/output-v2.json b/test/parser/samples/attribute-shorthand/output-v2.json
index b6578c13eb51..598356350b99 100644
--- a/test/parser/samples/attribute-shorthand/output-v2.json
+++ b/test/parser/samples/attribute-shorthand/output-v2.json
@@ -2,18 +2,18 @@
 	"hash": 1705925892,
 	"html": {
 		"start": 0,
-		"end": 10,
+		"end": 11,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 10,
+				"end": 11,
 				"type": "Element",
 				"name": "div",
 				"attributes": [
 					{
 						"start": 5,
-						"end": 8,
+						"end": 9,
 						"type": "Attribute",
 						"name": "id",
 						"value": [
diff --git a/test/parser/samples/attribute-static-boolean/_actual-v2.json b/test/parser/samples/attribute-static-boolean/_actual-v2.json
deleted file mode 100644
index a70a135f2a6e..000000000000
--- a/test/parser/samples/attribute-static-boolean/_actual-v2.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"hash": "a1b7fo",
-	"html": {
-		"start": 0,
-		"end": 30,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 30,
-				"type": "Element",
-				"name": "textarea",
-				"attributes": [
-					{
-						"start": 10,
-						"end": 18,
-						"type": "Attribute",
-						"name": "readonly",
-						"value": true
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-static/_actual-v2.json b/test/parser/samples/attribute-static/_actual-v2.json
deleted file mode 100644
index 28dc91df40f1..000000000000
--- a/test/parser/samples/attribute-static/_actual-v2.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"hash": "op11m5",
-	"html": {
-		"start": 0,
-		"end": 23,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 23,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 16,
-						"type": "Attribute",
-						"name": "class",
-						"value": [
-							{
-								"start": 12,
-								"end": 15,
-								"type": "Text",
-								"data": "foo"
-							}
-						]
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/attribute-unquoted/_actual-v2.json b/test/parser/samples/attribute-unquoted/_actual-v2.json
deleted file mode 100644
index 583e8814d6a1..000000000000
--- a/test/parser/samples/attribute-unquoted/_actual-v2.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"hash": "1lozhxt",
-	"html": {
-		"start": 0,
-		"end": 21,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 21,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 14,
-						"type": "Attribute",
-						"name": "class",
-						"value": [
-							{
-								"start": 11,
-								"end": 14,
-								"type": "Text",
-								"data": "foo"
-							}
-						]
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/await-then-catch/_actual-v2.json b/test/parser/samples/await-then-catch/_actual-v2.json
deleted file mode 100644
index 22ad4242e354..000000000000
--- a/test/parser/samples/await-then-catch/_actual-v2.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-	"hash": "1b28gs9",
-	"html": {
-		"start": 0,
-		"end": 148,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 148,
-				"type": "AwaitBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 8,
-					"end": 18,
-					"name": "thePromise"
-				},
-				"value": "theValue",
-				"error": "theError",
-				"pending": {
-					"start": 19,
-					"end": 39,
-					"type": "PendingBlock",
-					"children": [
-						{
-							"start": 19,
-							"end": 21,
-							"type": "Text",
-							"data": "\n\t"
-						},
-						{
-							"start": 21,
-							"end": 38,
-							"type": "Element",
-							"name": "p",
-							"attributes": [],
-							"children": [
-								{
-									"start": 24,
-									"end": 34,
-									"type": "Text",
-									"data": "loading..."
-								}
-							]
-						},
-						{
-							"start": 38,
-							"end": 39,
-							"type": "Text",
-							"data": "\n"
-						}
-					]
-				},
-				"then": {
-					"start": 39,
-					"end": 88,
-					"type": "ThenBlock",
-					"children": [
-						{
-							"start": 55,
-							"end": 57,
-							"type": "Text",
-							"data": "\n\t"
-						},
-						{
-							"start": 57,
-							"end": 87,
-							"type": "Element",
-							"name": "p",
-							"attributes": [],
-							"children": [
-								{
-									"start": 60,
-									"end": 73,
-									"type": "Text",
-									"data": "the value is "
-								},
-								{
-									"start": 73,
-									"end": 83,
-									"type": "MustacheTag",
-									"expression": {
-										"type": "Identifier",
-										"start": 74,
-										"end": 82,
-										"name": "theValue"
-									}
-								}
-							]
-						},
-						{
-							"start": 87,
-							"end": 88,
-							"type": "Text",
-							"data": "\n"
-						}
-					]
-				},
-				"catch": {
-					"start": 88,
-					"end": 140,
-					"type": "CatchBlock",
-					"children": [
-						{
-							"start": 105,
-							"end": 107,
-							"type": "Text",
-							"data": "\n\t"
-						},
-						{
-							"start": 107,
-							"end": 139,
-							"type": "Element",
-							"name": "p",
-							"attributes": [],
-							"children": [
-								{
-									"start": 110,
-									"end": 117,
-									"type": "Text",
-									"data": "oh no! "
-								},
-								{
-									"start": 117,
-									"end": 135,
-									"type": "MustacheTag",
-									"expression": {
-										"type": "MemberExpression",
-										"start": 118,
-										"end": 134,
-										"object": {
-											"type": "Identifier",
-											"start": 118,
-											"end": 126,
-											"name": "theError"
-										},
-										"property": {
-											"type": "Identifier",
-											"start": 127,
-											"end": 134,
-											"name": "message"
-										},
-										"computed": false
-									}
-								}
-							]
-						},
-						{
-							"start": 139,
-							"end": 140,
-							"type": "Text",
-							"data": "\n"
-						}
-					]
-				}
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/binding-shorthand/_actual-v2.json b/test/parser/samples/binding-shorthand/_actual-v2.json
deleted file mode 100644
index de159d6516cd..000000000000
--- a/test/parser/samples/binding-shorthand/_actual-v2.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"hash": "1f31b7d",
-	"html": {
-		"start": 0,
-		"end": 18,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 18,
-				"type": "Element",
-				"name": "Widget",
-				"attributes": [
-					{
-						"start": 8,
-						"end": 16,
-						"type": "Binding",
-						"name": "foo",
-						"value": {
-							"type": "Identifier",
-							"start": 13,
-							"end": 16,
-							"name": "foo"
-						}
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/binding/_actual-v2.json b/test/parser/samples/binding/_actual-v2.json
deleted file mode 100644
index c124e9caf46d..000000000000
--- a/test/parser/samples/binding/_actual-v2.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"hash": "w1d13d",
-	"html": {
-		"start": 0,
-		"end": 25,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 25,
-				"type": "Element",
-				"name": "input",
-				"attributes": [
-					{
-						"start": 7,
-						"end": 24,
-						"type": "Binding",
-						"name": "value",
-						"value": {
-							"type": "Identifier",
-							"start": 19,
-							"end": 23,
-							"name": "name"
-						}
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/comment/_actual-v2.json b/test/parser/samples/comment/_actual-v2.json
deleted file mode 100644
index 3dde7da39dcc..000000000000
--- a/test/parser/samples/comment/_actual-v2.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"hash": "1ihizni",
-	"html": {
-		"start": 0,
-		"end": 18,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 18,
-				"type": "Comment",
-				"data": " a comment "
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/component-dynamic/_actual-v2.json b/test/parser/samples/component-dynamic/_actual-v2.json
deleted file mode 100644
index 6080a11e9e6e..000000000000
--- a/test/parser/samples/component-dynamic/_actual-v2.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	"hash": "7yh2k2",
-	"html": {
-		"start": 0,
-		"end": 55,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 55,
-				"type": "Element",
-				"name": "svelte:component",
-				"attributes": [],
-				"children": [],
-				"expression": {
-					"type": "ConditionalExpression",
-					"start": 19,
-					"end": 34,
-					"test": {
-						"type": "Identifier",
-						"start": 19,
-						"end": 22,
-						"name": "foo"
-					},
-					"consequent": {
-						"type": "Identifier",
-						"start": 25,
-						"end": 28,
-						"name": "Foo"
-					},
-					"alternate": {
-						"type": "Identifier",
-						"start": 31,
-						"end": 34,
-						"name": "Bar"
-					}
-				}
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/convert-entities-in-element/_actual-v2.json b/test/parser/samples/convert-entities-in-element/_actual-v2.json
deleted file mode 100644
index 4946333f3f1d..000000000000
--- a/test/parser/samples/convert-entities-in-element/_actual-v2.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"hash": "134kmw9",
-	"html": {
-		"start": 0,
-		"end": 24,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 24,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
-				"children": [
-					{
-						"start": 3,
-						"end": 20,
-						"type": "Text",
-						"data": "Hello & World"
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/convert-entities/_actual-v2.json b/test/parser/samples/convert-entities/_actual-v2.json
deleted file mode 100644
index 2a2deedc9951..000000000000
--- a/test/parser/samples/convert-entities/_actual-v2.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"hash": "2lbrq0",
-	"html": {
-		"start": 0,
-		"end": 17,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 17,
-				"type": "Text",
-				"data": "Hello & World"
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/css-ref-selector/_actual-v2.json b/test/parser/samples/css-ref-selector/_actual-v2.json
deleted file mode 100644
index 5edf24cd19bd..000000000000
--- a/test/parser/samples/css-ref-selector/_actual-v2.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-	"hash": "i9aush",
-	"html": {
-		"start": 0,
-		"end": 14,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 14,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 12,
-						"type": "Ref",
-						"name": "foo"
-					}
-				],
-				"children": []
-			},
-			{
-				"start": 14,
-				"end": 16,
-				"type": "Text",
-				"data": "\n\n"
-			}
-		]
-	},
-	"css": {
-		"start": 16,
-		"end": 60,
-		"attributes": [],
-		"children": [
-			{
-				"type": "Rule",
-				"selector": {
-					"type": "SelectorList",
-					"children": [
-						{
-							"type": "Selector",
-							"children": [
-								{
-									"type": "RefSelector",
-									"start": 25,
-									"end": 32,
-									"name": "foo"
-								}
-							],
-							"start": 25,
-							"end": 32
-						}
-					],
-					"start": 25,
-					"end": 32
-				},
-				"block": {
-					"type": "Block",
-					"children": [
-						{
-							"type": "Declaration",
-							"important": false,
-							"property": "color",
-							"value": {
-								"type": "Value",
-								"children": [
-									{
-										"type": "Identifier",
-										"name": "red",
-										"start": 44,
-										"end": 47
-									}
-								],
-								"start": 43,
-								"end": 47
-							},
-							"start": 37,
-							"end": 47
-						}
-					],
-					"start": 33,
-					"end": 51
-				},
-				"start": 25,
-				"end": 51
-			}
-		],
-		"content": {
-			"start": 23,
-			"end": 52,
-			"styles": "\n\tref:foo {\n\t\tcolor: red;\n\t}\n"
-		}
-	},
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/css/_actual-v2.json b/test/parser/samples/css/_actual-v2.json
deleted file mode 100644
index 316e6e72a598..000000000000
--- a/test/parser/samples/css/_actual-v2.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-	"hash": "iz4x8b",
-	"html": {
-		"start": 0,
-		"end": 14,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 14,
-				"type": "Element",
-				"name": "div",
-				"attributes": [],
-				"children": [
-					{
-						"start": 5,
-						"end": 8,
-						"type": "Text",
-						"data": "foo"
-					}
-				]
-			},
-			{
-				"start": 14,
-				"end": 16,
-				"type": "Text",
-				"data": "\n\n"
-			}
-		]
-	},
-	"css": {
-		"start": 16,
-		"end": 56,
-		"attributes": [],
-		"children": [
-			{
-				"type": "Rule",
-				"selector": {
-					"type": "SelectorList",
-					"children": [
-						{
-							"type": "Selector",
-							"children": [
-								{
-									"type": "TypeSelector",
-									"name": "div",
-									"start": 25,
-									"end": 28
-								}
-							],
-							"start": 25,
-							"end": 28
-						}
-					],
-					"start": 25,
-					"end": 28
-				},
-				"block": {
-					"type": "Block",
-					"children": [
-						{
-							"type": "Declaration",
-							"important": false,
-							"property": "color",
-							"value": {
-								"type": "Value",
-								"children": [
-									{
-										"type": "Identifier",
-										"name": "red",
-										"start": 40,
-										"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/dynamic-import/_actual-v2.json b/test/parser/samples/dynamic-import/_actual-v2.json
deleted file mode 100644
index 5a1b7b0680bd..000000000000
--- a/test/parser/samples/dynamic-import/_actual-v2.json
+++ /dev/null
@@ -1,182 +0,0 @@
-{
-	"hash": "uvuf1h",
-	"html": {
-		"start": null,
-		"end": null,
-		"type": "Fragment",
-		"children": []
-	},
-	"css": null,
-	"js": {
-		"start": 0,
-		"end": 131,
-		"attributes": [],
-		"content": {
-			"type": "Program",
-			"start": 8,
-			"end": 122,
-			"body": [
-				{
-					"type": "ExportDefaultDeclaration",
-					"start": 10,
-					"end": 121,
-					"declaration": {
-						"type": "ObjectExpression",
-						"start": 25,
-						"end": 121,
-						"properties": [
-							{
-								"type": "Property",
-								"start": 29,
-								"end": 118,
-								"method": true,
-								"shorthand": false,
-								"computed": false,
-								"key": {
-									"type": "Identifier",
-									"start": 29,
-									"end": 37,
-									"name": "oncreate"
-								},
-								"kind": "init",
-								"value": {
-									"type": "FunctionExpression",
-									"start": 37,
-									"end": 118,
-									"id": null,
-									"generator": false,
-									"expression": false,
-									"async": false,
-									"params": [],
-									"body": {
-										"type": "BlockStatement",
-										"start": 40,
-										"end": 118,
-										"body": [
-											{
-												"type": "ExpressionStatement",
-												"start": 45,
-												"end": 114,
-												"expression": {
-													"type": "CallExpression",
-													"start": 45,
-													"end": 113,
-													"callee": {
-														"type": "MemberExpression",
-														"start": 45,
-														"end": 68,
-														"object": {
-															"type": "CallExpression",
-															"start": 45,
-															"end": 63,
-															"callee": {
-																"type": "Import",
-																"start": 45,
-																"end": 51
-															},
-															"arguments": [
-																{
-																	"type": "Literal",
-																	"start": 52,
-																	"end": 62,
-																	"value": "./foo.js",
-																	"raw": "'./foo.js'"
-																}
-															]
-														},
-														"property": {
-															"type": "Identifier",
-															"start": 64,
-															"end": 68,
-															"name": "then"
-														},
-														"computed": false
-													},
-													"arguments": [
-														{
-															"type": "ArrowFunctionExpression",
-															"start": 69,
-															"end": 112,
-															"id": null,
-															"generator": false,
-															"expression": false,
-															"async": false,
-															"params": [
-																{
-																	"type": "Identifier",
-																	"start": 69,
-																	"end": 72,
-																	"name": "foo"
-																}
-															],
-															"body": {
-																"type": "BlockStatement",
-																"start": 76,
-																"end": 112,
-																"body": [
-																	{
-																		"type": "ExpressionStatement",
-																		"start": 82,
-																		"end": 107,
-																		"expression": {
-																			"type": "CallExpression",
-																			"start": 82,
-																			"end": 106,
-																			"callee": {
-																				"type": "MemberExpression",
-																				"start": 82,
-																				"end": 93,
-																				"object": {
-																					"type": "Identifier",
-																					"start": 82,
-																					"end": 89,
-																					"name": "console"
-																				},
-																				"property": {
-																					"type": "Identifier",
-																					"start": 90,
-																					"end": 93,
-																					"name": "log"
-																				},
-																				"computed": false
-																			},
-																			"arguments": [
-																				{
-																					"type": "MemberExpression",
-																					"start": 94,
-																					"end": 105,
-																					"object": {
-																						"type": "Identifier",
-																						"start": 94,
-																						"end": 97,
-																						"name": "foo"
-																					},
-																					"property": {
-																						"type": "Identifier",
-																						"start": 98,
-																						"end": 105,
-																						"name": "default"
-																					},
-																					"computed": false
-																				}
-																			]
-																		}
-																	}
-																]
-															}
-														}
-													]
-												}
-											}
-										]
-									}
-								}
-							}
-						]
-					}
-				}
-			],
-			"sourceType": "module"
-		}
-	}
-}
\ No newline at end of file
diff --git a/test/parser/samples/each-block-destructured/_actual-v2.json b/test/parser/samples/each-block-destructured/_actual-v2.json
deleted file mode 100644
index 38d5ddc770ec..000000000000
--- a/test/parser/samples/each-block-destructured/_actual-v2.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-	"hash": "gtdm5e",
-	"html": {
-		"start": 0,
-		"end": 62,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 62,
-				"type": "EachBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 7,
-					"end": 14,
-					"name": "animals"
-				},
-				"children": [
-					{
-						"start": 33,
-						"end": 54,
-						"type": "Element",
-						"name": "p",
-						"attributes": [],
-						"children": [
-							{
-								"start": 36,
-								"end": 41,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 37,
-									"end": 40,
-									"name": "key"
-								}
-							},
-							{
-								"start": 41,
-								"end": 43,
-								"type": "Text",
-								"data": ": "
-							},
-							{
-								"start": 43,
-								"end": 50,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 44,
-									"end": 49,
-									"name": "value"
-								}
-							}
-						]
-					}
-				],
-				"destructuredContexts": [
-					"key",
-					"value"
-				],
-				"context": "key_value"
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/each-block-else/_actual-v2.json b/test/parser/samples/each-block-else/_actual-v2.json
deleted file mode 100644
index 9f8c5da79ba8..000000000000
--- a/test/parser/samples/each-block-else/_actual-v2.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-	"hash": "ljl07n",
-	"html": {
-		"start": 0,
-		"end": 77,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 77,
-				"type": "EachBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 7,
-					"end": 14,
-					"name": "animals"
-				},
-				"children": [
-					{
-						"start": 27,
-						"end": 42,
-						"type": "Element",
-						"name": "p",
-						"attributes": [],
-						"children": [
-							{
-								"start": 30,
-								"end": 38,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 31,
-									"end": 37,
-									"name": "animal"
-								}
-							}
-						]
-					}
-				],
-				"context": "animal",
-				"else": {
-					"start": 50,
-					"end": 70,
-					"type": "ElseBlock",
-					"children": [
-						{
-							"start": 52,
-							"end": 69,
-							"type": "Element",
-							"name": "p",
-							"attributes": [],
-							"children": [
-								{
-									"start": 55,
-									"end": 65,
-									"type": "Text",
-									"data": "no animals"
-								}
-							]
-						}
-					]
-				}
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/each-block-indexed/_actual-v2.json b/test/parser/samples/each-block-indexed/_actual-v2.json
deleted file mode 100644
index 9ffa02aaa871..000000000000
--- a/test/parser/samples/each-block-indexed/_actual-v2.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-	"hash": "1143n2g",
-	"html": {
-		"start": 0,
-		"end": 58,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 58,
-				"type": "EachBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 7,
-					"end": 14,
-					"name": "animals"
-				},
-				"children": [
-					{
-						"start": 30,
-						"end": 50,
-						"type": "Element",
-						"name": "p",
-						"attributes": [],
-						"children": [
-							{
-								"start": 33,
-								"end": 36,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 34,
-									"end": 35,
-									"name": "i"
-								}
-							},
-							{
-								"start": 36,
-								"end": 38,
-								"type": "Text",
-								"data": ": "
-							},
-							{
-								"start": 38,
-								"end": 46,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 39,
-									"end": 45,
-									"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/_actual-v2.json b/test/parser/samples/each-block-keyed/_actual-v2.json
deleted file mode 100644
index 514682b77024..000000000000
--- a/test/parser/samples/each-block-keyed/_actual-v2.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-	"hash": "3sm0ec",
-	"html": {
-		"start": 0,
-		"end": 56,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 56,
-				"type": "EachBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 7,
-					"end": 12,
-					"name": "todos"
-				},
-				"children": [
-					{
-						"start": 35,
-						"end": 48,
-						"type": "Element",
-						"name": "p",
-						"attributes": [],
-						"children": [
-							{
-								"start": 38,
-								"end": 44,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 39,
-									"end": 43,
-									"name": "todo"
-								}
-							}
-						]
-					}
-				],
-				"context": "todo",
-				"key": "id"
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/each-block/_actual-v2.json b/test/parser/samples/each-block/_actual-v2.json
deleted file mode 100644
index 7df4a20eba77..000000000000
--- a/test/parser/samples/each-block/_actual-v2.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"hash": "mzeq0s",
-	"html": {
-		"start": 0,
-		"end": 50,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 50,
-				"type": "EachBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 7,
-					"end": 14,
-					"name": "animals"
-				},
-				"children": [
-					{
-						"start": 27,
-						"end": 42,
-						"type": "Element",
-						"name": "p",
-						"attributes": [],
-						"children": [
-							{
-								"start": 30,
-								"end": 38,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 31,
-									"end": 37,
-									"name": "animal"
-								}
-							}
-						]
-					}
-				],
-				"context": "animal"
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/element-with-mustache/_actual-v2.json b/test/parser/samples/element-with-mustache/_actual-v2.json
deleted file mode 100644
index a65459a200a8..000000000000
--- a/test/parser/samples/element-with-mustache/_actual-v2.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-	"hash": "9fs56",
-	"html": {
-		"start": 0,
-		"end": 22,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 22,
-				"type": "Element",
-				"name": "h1",
-				"attributes": [],
-				"children": [
-					{
-						"start": 4,
-						"end": 10,
-						"type": "Text",
-						"data": "hello "
-					},
-					{
-						"start": 10,
-						"end": 16,
-						"type": "MustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 11,
-							"end": 15,
-							"name": "name"
-						}
-					},
-					{
-						"start": 16,
-						"end": 17,
-						"type": "Text",
-						"data": "!"
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/element-with-text/_actual-v2.json b/test/parser/samples/element-with-text/_actual-v2.json
deleted file mode 100644
index ee940e82e7df..000000000000
--- a/test/parser/samples/element-with-text/_actual-v2.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"hash": "a3xqjm",
-	"html": {
-		"start": 0,
-		"end": 17,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 17,
-				"type": "Element",
-				"name": "span",
-				"attributes": [],
-				"children": [
-					{
-						"start": 6,
-						"end": 10,
-						"type": "Text",
-						"data": "test"
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/elements/_actual-v2.json b/test/parser/samples/elements/_actual-v2.json
deleted file mode 100644
index 14de5ea00d40..000000000000
--- a/test/parser/samples/elements/_actual-v2.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"hash": "dni3s5",
-	"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/event-handler/_actual-v2.json b/test/parser/samples/event-handler/_actual-v2.json
deleted file mode 100644
index 0d98c325c3c8..000000000000
--- a/test/parser/samples/event-handler/_actual-v2.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-	"hash": "qi54it",
-	"html": {
-		"start": 0,
-		"end": 97,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 61,
-				"type": "Element",
-				"name": "button",
-				"attributes": [
-					{
-						"start": 8,
-						"end": 45,
-						"type": "EventHandler",
-						"name": "click",
-						"expression": {
-							"type": "CallExpression",
-							"start": 18,
-							"end": 44,
-							"callee": {
-								"type": "Identifier",
-								"start": 18,
-								"end": 21,
-								"name": "set"
-							},
-							"arguments": [
-								{
-									"type": "ObjectExpression",
-									"start": 22,
-									"end": 43,
-									"properties": [
-										{
-											"type": "Property",
-											"start": 24,
-											"end": 41,
-											"method": false,
-											"shorthand": false,
-											"computed": false,
-											"key": {
-												"type": "Identifier",
-												"start": 24,
-												"end": 31,
-												"name": "visible"
-											},
-											"value": {
-												"type": "UnaryExpression",
-												"start": 33,
-												"end": 41,
-												"operator": "!",
-												"prefix": true,
-												"argument": {
-													"type": "Identifier",
-													"start": 34,
-													"end": 41,
-													"name": "visible"
-												}
-											},
-											"kind": "init"
-										}
-									]
-								}
-							]
-						}
-					}
-				],
-				"children": [
-					{
-						"start": 46,
-						"end": 52,
-						"type": "Text",
-						"data": "toggle"
-					}
-				]
-			},
-			{
-				"start": 61,
-				"end": 63,
-				"type": "Text",
-				"data": "\n\n"
-			},
-			{
-				"start": 63,
-				"end": 97,
-				"type": "IfBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 68,
-					"end": 75,
-					"name": "visible"
-				},
-				"children": [
-					{
-						"start": 78,
-						"end": 91,
-						"type": "Element",
-						"name": "p",
-						"attributes": [],
-						"children": [
-							{
-								"start": 81,
-								"end": 87,
-								"type": "Text",
-								"data": "hello!"
-							}
-						]
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/if-block-else/_actual-v2.json b/test/parser/samples/if-block-else/_actual-v2.json
deleted file mode 100644
index b922778f7eb9..000000000000
--- a/test/parser/samples/if-block-else/_actual-v2.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-	"hash": "dbh411",
-	"html": {
-		"start": 0,
-		"end": 51,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 51,
-				"type": "IfBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 5,
-					"end": 8,
-					"name": "foo"
-				},
-				"children": [
-					{
-						"start": 11,
-						"end": 21,
-						"type": "Element",
-						"name": "p",
-						"attributes": [],
-						"children": [
-							{
-								"start": 14,
-								"end": 17,
-								"type": "Text",
-								"data": "foo"
-							}
-						]
-					}
-				],
-				"else": {
-					"start": 29,
-					"end": 46,
-					"type": "ElseBlock",
-					"children": [
-						{
-							"start": 31,
-							"end": 45,
-							"type": "Element",
-							"name": "p",
-							"attributes": [],
-							"children": [
-								{
-									"start": 34,
-									"end": 41,
-									"type": "Text",
-									"data": "not foo"
-								}
-							]
-						}
-					]
-				}
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/if-block-elseif/_actual-v2.json b/test/parser/samples/if-block-elseif/_actual-v2.json
deleted file mode 100644
index 758e3ee17a58..000000000000
--- a/test/parser/samples/if-block-elseif/_actual-v2.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-	"hash": "tzpuwu",
-	"html": {
-		"start": 0,
-		"end": 88,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 88,
-				"type": "IfBlock",
-				"expression": {
-					"type": "BinaryExpression",
-					"start": 5,
-					"end": 11,
-					"left": {
-						"type": "Identifier",
-						"start": 5,
-						"end": 6,
-						"name": "x"
-					},
-					"operator": ">",
-					"right": {
-						"type": "Literal",
-						"start": 9,
-						"end": 11,
-						"value": 10,
-						"raw": "10"
-					}
-				},
-				"children": [
-					{
-						"start": 14,
-						"end": 41,
-						"type": "Element",
-						"name": "p",
-						"attributes": [],
-						"children": [
-							{
-								"start": 17,
-								"end": 37,
-								"type": "Text",
-								"data": "x is greater than 10"
-							}
-						]
-					}
-				],
-				"else": {
-					"start": 57,
-					"end": 83,
-					"type": "ElseBlock",
-					"children": [
-						{
-							"start": 57,
-							"end": 88,
-							"type": "IfBlock",
-							"elseif": true,
-							"expression": {
-								"type": "BinaryExpression",
-								"start": 51,
-								"end": 56,
-								"left": {
-									"type": "Identifier",
-									"start": 51,
-									"end": 52,
-									"name": "x"
-								},
-								"operator": "<",
-								"right": {
-									"type": "Literal",
-									"start": 55,
-									"end": 56,
-									"value": 5,
-									"raw": "5"
-								}
-							},
-							"children": [
-								{
-									"start": 59,
-									"end": 82,
-									"type": "Element",
-									"name": "p",
-									"attributes": [],
-									"children": [
-										{
-											"start": 62,
-											"end": 78,
-											"type": "Text",
-											"data": "x is less than 5"
-										}
-									]
-								}
-							]
-						}
-					]
-				}
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/if-block/_actual-v2.json b/test/parser/samples/if-block/_actual-v2.json
deleted file mode 100644
index 25ac00f73d59..000000000000
--- a/test/parser/samples/if-block/_actual-v2.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"hash": "w7ju0y",
-	"html": {
-		"start": 0,
-		"end": 17,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 17,
-				"type": "IfBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 5,
-					"end": 8,
-					"name": "foo"
-				},
-				"children": [
-					{
-						"start": 9,
-						"end": 12,
-						"type": "Text",
-						"data": "bar"
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/implicitly-closed-li/_actual-v2.json b/test/parser/samples/implicitly-closed-li/_actual-v2.json
deleted file mode 100644
index 883505ace06a..000000000000
--- a/test/parser/samples/implicitly-closed-li/_actual-v2.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-	"hash": "232dvg",
-	"html": {
-		"start": 0,
-		"end": 31,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 31,
-				"type": "Element",
-				"name": "ul",
-				"attributes": [],
-				"children": [
-					{
-						"start": 4,
-						"end": 6,
-						"type": "Text",
-						"data": "\n\t"
-					},
-					{
-						"start": 6,
-						"end": 13,
-						"type": "Element",
-						"name": "li",
-						"attributes": [],
-						"children": [
-							{
-								"start": 10,
-								"end": 13,
-								"type": "Text",
-								"data": "a\n\t"
-							}
-						]
-					},
-					{
-						"start": 13,
-						"end": 20,
-						"type": "Element",
-						"name": "li",
-						"attributes": [],
-						"children": [
-							{
-								"start": 17,
-								"end": 20,
-								"type": "Text",
-								"data": "b\n\t"
-							}
-						]
-					},
-					{
-						"start": 20,
-						"end": 26,
-						"type": "Element",
-						"name": "li",
-						"attributes": [],
-						"children": [
-							{
-								"start": 24,
-								"end": 26,
-								"type": "Text",
-								"data": "c\n"
-							}
-						]
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/nbsp/_actual-v2.json b/test/parser/samples/nbsp/_actual-v2.json
deleted file mode 100644
index 48f4643a9db8..000000000000
--- a/test/parser/samples/nbsp/_actual-v2.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"hash": "1uypmr0",
-	"html": {
-		"start": 0,
-		"end": 19,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 19,
-				"type": "Element",
-				"name": "span",
-				"attributes": [],
-				"children": [
-					{
-						"start": 6,
-						"end": 12,
-						"type": "Text",
-						"data": " "
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/raw-mustaches/_actual-v2.json b/test/parser/samples/raw-mustaches/_actual-v2.json
deleted file mode 100644
index 983b401968c6..000000000000
--- a/test/parser/samples/raw-mustaches/_actual-v2.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-	"hash": "9m9gjd",
-	"html": {
-		"start": 0,
-		"end": 34,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 34,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
-				"children": [
-					{
-						"start": 3,
-						"end": 4,
-						"type": "Text",
-						"data": " "
-					},
-					{
-						"start": 4,
-						"end": 16,
-						"type": "RawMustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 11,
-							"end": 15,
-							"name": "raw1"
-						}
-					},
-					{
-						"start": 16,
-						"end": 17,
-						"type": "Text",
-						"data": " "
-					},
-					{
-						"start": 17,
-						"end": 29,
-						"type": "RawMustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 24,
-							"end": 28,
-							"name": "raw2"
-						}
-					},
-					{
-						"start": 29,
-						"end": 30,
-						"type": "Text",
-						"data": " "
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/refs/_actual-v2.json b/test/parser/samples/refs/_actual-v2.json
deleted file mode 100644
index 72d1c864ce63..000000000000
--- a/test/parser/samples/refs/_actual-v2.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"hash": "e2azib",
-	"html": {
-		"start": 0,
-		"end": 25,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 25,
-				"type": "Element",
-				"name": "canvas",
-				"attributes": [
-					{
-						"start": 8,
-						"end": 15,
-						"type": "Ref",
-						"name": "foo"
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-only/_actual-v2.json b/test/parser/samples/script-comment-only/_actual-v2.json
deleted file mode 100644
index a1371cc31513..000000000000
--- a/test/parser/samples/script-comment-only/_actual-v2.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"hash": "1l2u88a",
-	"html": {
-		"start": 0,
-		"end": 11,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 11,
-				"type": "Element",
-				"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/_actual-v2.json b/test/parser/samples/script-comment-trailing-multiline/_actual-v2.json
deleted file mode 100644
index 4517795aa738..000000000000
--- a/test/parser/samples/script-comment-trailing-multiline/_actual-v2.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-	"hash": "lvjec0",
-	"html": {
-		"start": 0,
-		"end": 22,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 22,
-				"type": "Element",
-				"name": "h1",
-				"attributes": [],
-				"children": [
-					{
-						"start": 4,
-						"end": 10,
-						"type": "Text",
-						"data": "Hello "
-					},
-					{
-						"start": 10,
-						"end": 16,
-						"type": "MustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 11,
-							"end": 15,
-							"name": "name"
-						}
-					},
-					{
-						"start": 16,
-						"end": 17,
-						"type": "Text",
-						"data": "!"
-					}
-				]
-			},
-			{
-				"start": 22,
-				"end": 24,
-				"type": "Text",
-				"data": "\n\n"
-			}
-		]
-	},
-	"css": null,
-	"js": {
-		"start": 24,
-		"end": 141,
-		"attributes": [],
-		"content": {
-			"type": "Program",
-			"start": 32,
-			"end": 132,
-			"body": [
-				{
-					"type": "ExportDefaultDeclaration",
-					"start": 34,
-					"end": 93,
-					"declaration": {
-						"type": "ObjectExpression",
-						"start": 49,
-						"end": 92,
-						"properties": [
-							{
-								"type": "Property",
-								"start": 53,
-								"end": 89,
-								"method": false,
-								"shorthand": false,
-								"computed": false,
-								"key": {
-									"type": "Identifier",
-									"start": 53,
-									"end": 57,
-									"name": "data"
-								},
-								"value": {
-									"type": "ArrowFunctionExpression",
-									"start": 59,
-									"end": 89,
-									"id": null,
-									"generator": false,
-									"expression": true,
-									"async": false,
-									"params": [],
-									"body": {
-										"type": "ObjectExpression",
-										"start": 66,
-										"end": 88,
-										"properties": [
-											{
-												"type": "Property",
-												"start": 71,
-												"end": 84,
-												"method": false,
-												"shorthand": false,
-												"computed": false,
-												"key": {
-													"type": "Identifier",
-													"start": 71,
-													"end": 75,
-													"name": "name"
-												},
-												"value": {
-													"type": "Literal",
-													"start": 77,
-													"end": 84,
-													"value": "world",
-													"raw": "'world'"
-												},
-												"kind": "init"
-											}
-										]
-									}
-								},
-								"kind": "init"
-							}
-						]
-					}
-				}
-			],
-			"sourceType": "module"
-		}
-	}
-}
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-trailing/_actual-v2.json b/test/parser/samples/script-comment-trailing/_actual-v2.json
deleted file mode 100644
index 0ec47a45597d..000000000000
--- a/test/parser/samples/script-comment-trailing/_actual-v2.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-	"hash": "19sno7e",
-	"html": {
-		"start": 0,
-		"end": 22,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 22,
-				"type": "Element",
-				"name": "h1",
-				"attributes": [],
-				"children": [
-					{
-						"start": 4,
-						"end": 10,
-						"type": "Text",
-						"data": "Hello "
-					},
-					{
-						"start": 10,
-						"end": 16,
-						"type": "MustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 11,
-							"end": 15,
-							"name": "name"
-						}
-					},
-					{
-						"start": 16,
-						"end": 17,
-						"type": "Text",
-						"data": "!"
-					}
-				]
-			},
-			{
-				"start": 22,
-				"end": 24,
-				"type": "Text",
-				"data": "\n\n"
-			}
-		]
-	},
-	"css": null,
-	"js": {
-		"start": 24,
-		"end": 130,
-		"attributes": [],
-		"content": {
-			"type": "Program",
-			"start": 32,
-			"end": 121,
-			"body": [
-				{
-					"type": "ExportDefaultDeclaration",
-					"start": 34,
-					"end": 93,
-					"declaration": {
-						"type": "ObjectExpression",
-						"start": 49,
-						"end": 92,
-						"properties": [
-							{
-								"type": "Property",
-								"start": 53,
-								"end": 89,
-								"method": false,
-								"shorthand": false,
-								"computed": false,
-								"key": {
-									"type": "Identifier",
-									"start": 53,
-									"end": 57,
-									"name": "data"
-								},
-								"value": {
-									"type": "ArrowFunctionExpression",
-									"start": 59,
-									"end": 89,
-									"id": null,
-									"generator": false,
-									"expression": true,
-									"async": false,
-									"params": [],
-									"body": {
-										"type": "ObjectExpression",
-										"start": 66,
-										"end": 88,
-										"properties": [
-											{
-												"type": "Property",
-												"start": 71,
-												"end": 84,
-												"method": false,
-												"shorthand": false,
-												"computed": false,
-												"key": {
-													"type": "Identifier",
-													"start": 71,
-													"end": 75,
-													"name": "name"
-												},
-												"value": {
-													"type": "Literal",
-													"start": 77,
-													"end": 84,
-													"value": "world",
-													"raw": "'world'"
-												},
-												"kind": "init"
-											}
-										]
-									}
-								},
-								"kind": "init"
-							}
-						]
-					}
-				}
-			],
-			"sourceType": "module"
-		}
-	}
-}
\ No newline at end of file
diff --git a/test/parser/samples/script/_actual-v2.json b/test/parser/samples/script/_actual-v2.json
deleted file mode 100644
index 1a68ead9b6ce..000000000000
--- a/test/parser/samples/script/_actual-v2.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-	"hash": "6jy7zq",
-	"html": {
-		"start": 0,
-		"end": 22,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 22,
-				"type": "Element",
-				"name": "h1",
-				"attributes": [],
-				"children": [
-					{
-						"start": 4,
-						"end": 10,
-						"type": "Text",
-						"data": "Hello "
-					},
-					{
-						"start": 10,
-						"end": 16,
-						"type": "MustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 11,
-							"end": 15,
-							"name": "name"
-						}
-					},
-					{
-						"start": 16,
-						"end": 17,
-						"type": "Text",
-						"data": "!"
-					}
-				]
-			},
-			{
-				"start": 22,
-				"end": 24,
-				"type": "Text",
-				"data": "\n\n"
-			}
-		]
-	},
-	"css": null,
-	"js": {
-		"start": 24,
-		"end": 103,
-		"attributes": [],
-		"content": {
-			"type": "Program",
-			"start": 32,
-			"end": 94,
-			"body": [
-				{
-					"type": "ExportDefaultDeclaration",
-					"start": 34,
-					"end": 93,
-					"declaration": {
-						"type": "ObjectExpression",
-						"start": 49,
-						"end": 92,
-						"properties": [
-							{
-								"type": "Property",
-								"start": 53,
-								"end": 89,
-								"method": false,
-								"shorthand": false,
-								"computed": false,
-								"key": {
-									"type": "Identifier",
-									"start": 53,
-									"end": 57,
-									"name": "data"
-								},
-								"value": {
-									"type": "ArrowFunctionExpression",
-									"start": 59,
-									"end": 89,
-									"id": null,
-									"generator": false,
-									"expression": true,
-									"async": false,
-									"params": [],
-									"body": {
-										"type": "ObjectExpression",
-										"start": 66,
-										"end": 88,
-										"properties": [
-											{
-												"type": "Property",
-												"start": 71,
-												"end": 84,
-												"method": false,
-												"shorthand": false,
-												"computed": false,
-												"key": {
-													"type": "Identifier",
-													"start": 71,
-													"end": 75,
-													"name": "name"
-												},
-												"value": {
-													"type": "Literal",
-													"start": 77,
-													"end": 84,
-													"value": "world",
-													"raw": "'world'"
-												},
-												"kind": "init"
-											}
-										]
-									}
-								},
-								"kind": "init"
-							}
-						]
-					}
-				}
-			],
-			"sourceType": "module"
-		}
-	}
-}
\ No newline at end of file
diff --git a/test/parser/samples/self-closing-element/_actual-v2.json b/test/parser/samples/self-closing-element/_actual-v2.json
deleted file mode 100644
index f36d243df10e..000000000000
--- a/test/parser/samples/self-closing-element/_actual-v2.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"hash": "1xgowd3",
-	"html": {
-		"start": 0,
-		"end": 6,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 6,
-				"type": "Element",
-				"name": "div",
-				"attributes": [],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/self-reference/_actual-v2.json b/test/parser/samples/self-reference/_actual-v2.json
deleted file mode 100644
index ced5eabc410b..000000000000
--- a/test/parser/samples/self-reference/_actual-v2.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-	"hash": "1wh7lqr",
-	"html": {
-		"start": 0,
-		"end": 57,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 57,
-				"type": "IfBlock",
-				"expression": {
-					"type": "BinaryExpression",
-					"start": 5,
-					"end": 14,
-					"left": {
-						"type": "Identifier",
-						"start": 5,
-						"end": 10,
-						"name": "depth"
-					},
-					"operator": ">",
-					"right": {
-						"type": "Literal",
-						"start": 13,
-						"end": 14,
-						"value": 1,
-						"raw": "1"
-					}
-				},
-				"children": [
-					{
-						"start": 17,
-						"end": 51,
-						"type": "Element",
-						"name": "svelte:self",
-						"attributes": [
-							{
-								"start": 30,
-								"end": 49,
-								"type": "Attribute",
-								"name": "depth",
-								"value": [
-									{
-										"start": 37,
-										"end": 48,
-										"type": "MustacheTag",
-										"expression": {
-											"type": "BinaryExpression",
-											"start": 38,
-											"end": 47,
-											"left": {
-												"type": "Identifier",
-												"start": 38,
-												"end": 43,
-												"name": "depth"
-											},
-											"operator": "-",
-											"right": {
-												"type": "Literal",
-												"start": 46,
-												"end": 47,
-												"value": 1,
-												"raw": "1"
-											}
-										}
-									}
-								]
-							}
-						],
-						"children": []
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/space-between-mustaches/_actual-v2.json b/test/parser/samples/space-between-mustaches/_actual-v2.json
deleted file mode 100644
index b6b5c1a4df10..000000000000
--- a/test/parser/samples/space-between-mustaches/_actual-v2.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-	"hash": "1n7rpsi",
-	"html": {
-		"start": 0,
-		"end": 24,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 24,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
-				"children": [
-					{
-						"start": 3,
-						"end": 4,
-						"type": "Text",
-						"data": " "
-					},
-					{
-						"start": 4,
-						"end": 7,
-						"type": "MustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 5,
-							"end": 6,
-							"name": "a"
-						}
-					},
-					{
-						"start": 7,
-						"end": 8,
-						"type": "Text",
-						"data": " "
-					},
-					{
-						"start": 8,
-						"end": 11,
-						"type": "MustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 9,
-							"end": 10,
-							"name": "b"
-						}
-					},
-					{
-						"start": 11,
-						"end": 14,
-						"type": "Text",
-						"data": " : "
-					},
-					{
-						"start": 14,
-						"end": 17,
-						"type": "MustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 15,
-							"end": 16,
-							"name": "c"
-						}
-					},
-					{
-						"start": 17,
-						"end": 20,
-						"type": "Text",
-						"data": " : "
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/spread/_actual-v2.json b/test/parser/samples/spread/_actual-v2.json
deleted file mode 100644
index e9c53e744696..000000000000
--- a/test/parser/samples/spread/_actual-v2.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-	"hash": "z82kse",
-	"html": {
-		"start": 0,
-		"end": 22,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 22,
-				"type": "Element",
-				"name": "div",
-				"attributes": [
-					{
-						"start": 5,
-						"end": 15,
-						"type": "Spread",
-						"expression": {
-							"type": "Identifier",
-							"start": 9,
-							"end": 14,
-							"name": "props"
-						}
-					}
-				],
-				"children": []
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/textarea-children/_actual-v2.json b/test/parser/samples/textarea-children/_actual-v2.json
deleted file mode 100644
index 2e219bb75098..000000000000
--- a/test/parser/samples/textarea-children/_actual-v2.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-	"hash": "1uyqul7",
-	"html": {
-		"start": 0,
-		"end": 61,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 61,
-				"type": "Element",
-				"name": "textarea",
-				"attributes": [],
-				"children": [
-					{
-						"start": 10,
-						"end": 40,
-						"type": "Text",
-						"data": "\n\t<p>not actually an element. "
-					},
-					{
-						"start": 40,
-						"end": 45,
-						"type": "MustacheTag",
-						"expression": {
-							"type": "Identifier",
-							"start": 41,
-							"end": 44,
-							"name": "foo"
-						}
-					},
-					{
-						"start": 45,
-						"end": 50,
-						"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/_actual-v2.json b/test/parser/samples/transition-intro-no-params/_actual-v2.json
deleted file mode 100644
index 6c3b0f0c2749..000000000000
--- a/test/parser/samples/transition-intro-no-params/_actual-v2.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-	"hash": "8bm3vr",
-	"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",
-						"expression": null,
-						"intro": true,
-						"outro": false
-					}
-				],
-				"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/_actual-v2.json b/test/parser/samples/transition-intro/_actual-v2.json
deleted file mode 100644
index 655d06c8feea..000000000000
--- a/test/parser/samples/transition-intro/_actual-v2.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-	"hash": "1ppqq8i",
-	"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",
-						"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"
-								}
-							]
-						},
-						"intro": true,
-						"outro": false
-					}
-				],
-				"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/unusual-identifier/_actual-v2.json b/test/parser/samples/unusual-identifier/_actual-v2.json
deleted file mode 100644
index e4a290c0a689..000000000000
--- a/test/parser/samples/unusual-identifier/_actual-v2.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"hash": "8weqxs",
-	"html": {
-		"start": 0,
-		"end": 41,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 41,
-				"type": "EachBlock",
-				"expression": {
-					"type": "Identifier",
-					"start": 7,
-					"end": 13,
-					"name": "things"
-				},
-				"children": [
-					{
-						"start": 22,
-						"end": 33,
-						"type": "Element",
-						"name": "p",
-						"attributes": [],
-						"children": [
-							{
-								"start": 25,
-								"end": 29,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 26,
-									"end": 28,
-									"name": "𐊧"
-								}
-							}
-						]
-					}
-				],
-				"context": "𐊧"
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/whitespace-leading-trailing/_actual-v2.json b/test/parser/samples/whitespace-leading-trailing/_actual-v2.json
deleted file mode 100644
index 432480cf699d..000000000000
--- a/test/parser/samples/whitespace-leading-trailing/_actual-v2.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"hash": "70xqns",
-	"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,
-				"type": "Element",
-				"name": "p",
-				"attributes": [],
-				"children": [
-					{
-						"start": 9,
-						"end": 32,
-						"type": "Text",
-						"data": "just chillin' over here"
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/whitespace-normal/_actual-v2.json b/test/parser/samples/whitespace-normal/_actual-v2.json
deleted file mode 100644
index e9d6a39b089c..000000000000
--- a/test/parser/samples/whitespace-normal/_actual-v2.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-	"hash": "1827l8g",
-	"html": {
-		"start": 0,
-		"end": 65,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 65,
-				"type": "Element",
-				"name": "h1",
-				"attributes": [],
-				"children": [
-					{
-						"start": 4,
-						"end": 10,
-						"type": "Text",
-						"data": "Hello "
-					},
-					{
-						"start": 10,
-						"end": 35,
-						"type": "Element",
-						"name": "strong",
-						"attributes": [],
-						"children": [
-							{
-								"start": 18,
-								"end": 24,
-								"type": "MustacheTag",
-								"expression": {
-									"type": "Identifier",
-									"start": 19,
-									"end": 23,
-									"name": "name"
-								}
-							},
-							{
-								"start": 24,
-								"end": 26,
-								"type": "Text",
-								"data": "! "
-							}
-						]
-					},
-					{
-						"start": 35,
-						"end": 60,
-						"type": "Element",
-						"name": "span",
-						"attributes": [],
-						"children": [
-							{
-								"start": 41,
-								"end": 53,
-								"type": "Text",
-								"data": "How are you?"
-							}
-						]
-					}
-				]
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file
diff --git a/test/parser/samples/yield/_actual-v2.json b/test/parser/samples/yield/_actual-v2.json
deleted file mode 100644
index da5ed52d0e6e..000000000000
--- a/test/parser/samples/yield/_actual-v2.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"hash": "1na2f8c",
-	"html": {
-		"start": 0,
-		"end": 7,
-		"type": "Fragment",
-		"children": [
-			{
-				"start": 0,
-				"end": 7,
-				"type": "MustacheTag",
-				"expression": {
-					"start": 1,
-					"end": 6,
-					"type": "Identifier",
-					"name": "yield"
-				}
-			}
-		]
-	},
-	"css": null,
-	"js": null
-}
\ No newline at end of file

From 7b5b236e1cd05a1a893fe03c2534edb96905fb5c Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 12 Apr 2018 23:18:38 -0400
Subject: [PATCH 05/15] update length sourcemap hack for v2

---
 src/generators/nodes/EachBlock.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/generators/nodes/EachBlock.ts b/src/generators/nodes/EachBlock.ts
index c267cb0d3318..71ca47aa7e74 100644
--- a/src/generators/nodes/EachBlock.ts
+++ b/src/generators/nodes/EachBlock.ts
@@ -126,7 +126,7 @@ export default class EachBlock extends Node {
 
 		// hack the sourcemap, so that if data is missing the bug
 		// is easy to find
-		let c = this.start + 3;
+		let c = this.start + 2;
 		while (generator.source[c] !== 'e') c += 1;
 		generator.code.overwrite(c, c + 4, 'length');
 		const length = `[✂${c}-${c+4}✂]`;

From 31ee144b9c344b843877a10caee9bafd37ebd54c Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 12 Apr 2018 23:34:37 -0400
Subject: [PATCH 06/15] attribute shorthand

---
 src/parse/state/tag.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/parse/state/tag.ts b/src/parse/state/tag.ts
index d2f4f8a702ba..e29965994dff 100644
--- a/src/parse/state/tag.ts
+++ b/src/parse/state/tag.ts
@@ -296,8 +296,6 @@ function readAttribute(parser: Parser, uniqueNames: Set<string>) {
 	if (parser.eat(parser.v2 ? '{' : '{{')) {
 		parser.allowWhitespace();
 
-		const spread = parser.eat('...');
-
 		if (parser.eat('...')) {
 			const expression = readExpression(parser);
 

From 0edbac615cf23f55c9517243609c45250c29f9aa Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 12 Apr 2018 23:34:46 -0400
Subject: [PATCH 07/15] add validator tests

---
 test/validator/index.js                       | 105 ++++++++++--------
 .../title-no-attributes/errors-v2.json        |  12 ++
 .../samples/title-no-attributes/input-v2.html |   3 +
 3 files changed, 74 insertions(+), 46 deletions(-)
 create mode 100644 test/validator/samples/title-no-attributes/errors-v2.json
 create mode 100644 test/validator/samples/title-no-attributes/input-v2.html

diff --git a/test/validator/index.js b/test/validator/index.js
index ddfbfb8a4add..0ea11204937a 100644
--- a/test/validator/index.js
+++ b/test/validator/index.js
@@ -16,59 +16,72 @@ describe("validate", () => {
 
 		(solo ? it.only : skip ? it.skip : it)(dir, () => {
 			const config = loadConfig(`./validator/samples/${dir}/_config.js`);
-			const filename = `test/validator/samples/${dir}/input.html`;
-			const input = fs.readFileSync(filename, "utf-8").replace(/\s+$/, "");
-
-			const expectedWarnings = tryToLoadJson(`test/validator/samples/${dir}/warnings.json`) || [];
-			const expectedErrors = tryToLoadJson(`test/validator/samples/${dir}/errors.json`);
-			let error;
-
-			try {
-				const warnings = [];
-
-				const { stats } = svelte.compile(input, {
-					onwarn(warning) {
-						warnings.push({
-							message: warning.message,
-							pos: warning.pos,
-							loc: warning.loc,
-							end: warning.end,
-						});
-					},
-					dev: config.dev
-				});
 
-				assert.equal(stats.warnings.length, warnings.length);
-				stats.warnings.forEach((full, i) => {
-					const lite = warnings[i];
-					assert.deepEqual({
-						message: full.message,
-						pos: full.pos,
-						loc: full.loc,
-						end: full.end
-					}, lite);
-				});
+			function test(input, expectedWarnings, expectedErrors) {
+				let error;
+
+				try {
+					const warnings = [];
+
+					const { stats } = svelte.compile(input, {
+						onwarn(warning) {
+							warnings.push({
+								message: warning.message,
+								pos: warning.pos,
+								loc: warning.loc,
+								end: warning.end,
+							});
+						},
+						dev: config.dev
+					});
+
+					assert.equal(stats.warnings.length, warnings.length);
+					stats.warnings.forEach((full, i) => {
+						const lite = warnings[i];
+						assert.deepEqual({
+							message: full.message,
+							pos: full.pos,
+							loc: full.loc,
+							end: full.end
+						}, lite);
+					});
+
+					assert.deepEqual(warnings, expectedWarnings);
+				} catch (e) {
+					error = e;
+				}
 
-				assert.deepEqual(warnings, expectedWarnings);
-			} catch (e) {
-				error = e;
-			}
+				const expected = expectedErrors && expectedErrors[0];
 
-			const expected = expectedErrors && expectedErrors[0];
+				if (error || expected) {
+					if (error && !expected) {
+						throw error;
+					}
 
-			if (error || expected) {
-				if (error && !expected) {
-					throw error;
-				}
+					if (expected && !error) {
+						throw new Error(`Expected an error: ${expected.message}`);
+					}
 
-				if (expected && !error) {
-					throw new Error(`Expected an error: ${expected.message}`);
+					assert.equal(error.message, expected.message);
+					assert.deepEqual(error.loc, expected.loc);
+					assert.deepEqual(error.end, expected.end);
+					assert.equal(error.pos, expected.pos);
 				}
+			}
 
-				assert.equal(error.message, expected.message);
-				assert.deepEqual(error.loc, expected.loc);
-				assert.deepEqual(error.end, expected.end);
-				assert.equal(error.pos, expected.pos);
+			// TODO remove the v1 tests
+			test(
+				fs.readFileSync(`test/validator/samples/${dir}/input.html`, "utf-8").replace(/\s+$/, ""),
+				tryToLoadJson(`test/validator/samples/${dir}/warnings.json`) || [],
+				tryToLoadJson(`test/validator/samples/${dir}/errors.json`)
+			);
+
+			if (fs.existsSync(`test/validator/samples/${dir}/input-v2.html`)) {
+				test(
+					fs.readFileSync(`test/validator/samples/${dir}/input-v2.html`, "utf-8").replace(/\s+$/, ""),
+					tryToLoadJson(`test/validator/samples/${dir}/warnings-v2.json`) || [],
+					tryToLoadJson(`test/validator/samples/${dir}/errors-v2.json`)
+				);
 			}
 		});
 	});
diff --git a/test/validator/samples/title-no-attributes/errors-v2.json b/test/validator/samples/title-no-attributes/errors-v2.json
new file mode 100644
index 000000000000..0491303d0a30
--- /dev/null
+++ b/test/validator/samples/title-no-attributes/errors-v2.json
@@ -0,0 +1,12 @@
+[{
+	"message": "<title> cannot have attributes",
+	"loc": {
+		"line": 2,
+		"column": 8
+	},
+	"end": {
+		"line": 2,
+		"column": 25
+	},
+	"pos": 22
+}]
\ No newline at end of file
diff --git a/test/validator/samples/title-no-attributes/input-v2.html b/test/validator/samples/title-no-attributes/input-v2.html
new file mode 100644
index 000000000000..0e2dbefa731b
--- /dev/null
+++ b/test/validator/samples/title-no-attributes/input-v2.html
@@ -0,0 +1,3 @@
+<svelte:head>
+	<title data-invalid=true>a static title</title>
+</svelte:head>
\ No newline at end of file

From cb514afde460a8e48cc6f21879c8d7ab9f5d192d Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Fri, 13 Apr 2018 11:01:25 -0400
Subject: [PATCH 08/15] more tests, support svelte: elements

---
 src/generators/Generator.ts                   |  2 +-
 src/generators/nodes/Component.ts             |  6 +-
 .../visitors/Component.ts                     |  2 +-
 src/parse/read/directives.ts                  | 29 ++++---
 src/parse/state/tag.ts                        | 11 ++-
 src/validate/html/index.ts                    |  2 +
 src/validate/html/validateElement.ts          |  2 +-
 test/parser/index.js                          | 83 +++++++++----------
 .../attribute-unique-error/error-v2.json      |  8 ++
 .../error-binding-disabled/error-v2.json      |  8 ++
 .../error-binding-mustaches/error-v2.json     |  8 ++
 .../error-binding-rvalue/error-v2.json        |  8 ++
 .../error-comment-unclosed/error-v2.json      |  8 ++
 test/parser/samples/error-css/error-v2.json   |  8 ++
 .../samples/error-event-handler/error-v2.json |  8 ++
 .../error-illegal-expression/error-v2.json    |  8 ++
 .../error-multiple-styles/error-v2.json       |  8 ++
 .../samples/error-ref-value/error-v2.json     |  8 ++
 .../error-script-unclosed/error-v2.json       |  8 ++
 .../error-self-reference/error-v2.json        |  8 ++
 .../error-v2.json                             |  8 ++
 .../error-v2.json                             |  8 ++
 .../error-v2.json                             |  8 ++
 .../error-v2.json                             |  8 ++
 .../error-unmatched-closing-tag/error-v2.json |  8 ++
 .../samples/error-void-closing/error-v2.json  |  8 ++
 .../error-window-children/error-v2.json       |  8 ++
 .../error-window-duplicate/error-v2.json      |  8 ++
 .../error-window-inside-block/error-v2.json   |  8 ++
 .../error-window-inside-element/error-v2.json |  8 ++
 30 files changed, 244 insertions(+), 69 deletions(-)
 create mode 100644 test/parser/samples/attribute-unique-error/error-v2.json
 create mode 100644 test/parser/samples/error-binding-disabled/error-v2.json
 create mode 100644 test/parser/samples/error-binding-mustaches/error-v2.json
 create mode 100644 test/parser/samples/error-binding-rvalue/error-v2.json
 create mode 100644 test/parser/samples/error-comment-unclosed/error-v2.json
 create mode 100644 test/parser/samples/error-css/error-v2.json
 create mode 100644 test/parser/samples/error-event-handler/error-v2.json
 create mode 100644 test/parser/samples/error-illegal-expression/error-v2.json
 create mode 100644 test/parser/samples/error-multiple-styles/error-v2.json
 create mode 100644 test/parser/samples/error-ref-value/error-v2.json
 create mode 100644 test/parser/samples/error-script-unclosed/error-v2.json
 create mode 100644 test/parser/samples/error-self-reference/error-v2.json
 create mode 100644 test/parser/samples/error-unexpected-end-of-input-b/error-v2.json
 create mode 100644 test/parser/samples/error-unexpected-end-of-input-c/error-v2.json
 create mode 100644 test/parser/samples/error-unexpected-end-of-input-d/error-v2.json
 create mode 100644 test/parser/samples/error-unexpected-end-of-input/error-v2.json
 create mode 100644 test/parser/samples/error-unmatched-closing-tag/error-v2.json
 create mode 100644 test/parser/samples/error-void-closing/error-v2.json
 create mode 100644 test/parser/samples/error-window-children/error-v2.json
 create mode 100644 test/parser/samples/error-window-duplicate/error-v2.json
 create mode 100644 test/parser/samples/error-window-inside-block/error-v2.json
 create mode 100644 test/parser/samples/error-window-inside-element/error-v2.json

diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts
index 2879058d6302..ce6c56fc7d80 100644
--- a/src/generators/Generator.ts
+++ b/src/generators/Generator.ts
@@ -791,7 +791,7 @@ export default class Generator {
 
 				node.generator = generator;
 
-				if (node.type === 'Element' && (node.name === ':Component' || node.name === ':Self' || generator.components.has(node.name))) {
+				if (node.type === 'Element' && (node.name === ':Component' || node.name === ':Self' || node.name === 'svelte:component' || node.name === 'svelte:self' || generator.components.has(node.name))) {
 					node.type = 'Component';
 					Object.setPrototypeOf(node, nodes.Component.prototype);
 				} else if (node.type === 'Element' && node.name === 'title' && parentIsHead(parent)) { // TODO do this in parse?
diff --git a/src/generators/nodes/Component.ts b/src/generators/nodes/Component.ts
index 94a186229db2..239dc4bed197 100644
--- a/src/generators/nodes/Component.ts
+++ b/src/generators/nodes/Component.ts
@@ -45,8 +45,8 @@ export default class Component extends Node {
 
 		this.var = block.getUniqueName(
 			(
-				this.name === ':Self' ? this.generator.name :
-				this.name === ':Component' ? 'switch_instance' :
+				(this.name === ':Self' || this.name === 'svelte:self') ? this.generator.name :
+				(this.name === ':Component' || this.name === 'svelte:component') ? 'switch_instance' :
 				this.name
 			).toLowerCase()
 		);
@@ -386,7 +386,7 @@ export default class Component extends Node {
 
 			block.builders.destroy.addLine(`if (${name}) ${name}.destroy(false);`);
 		} else {
-			const expression = this.name === ':Self'
+			const expression = (this.name === ':Self' || this.name === 'svelte:self')
 				? generator.name
 				: `%components-${this.name}`;
 
diff --git a/src/generators/server-side-rendering/visitors/Component.ts b/src/generators/server-side-rendering/visitors/Component.ts
index cfa0b8b132e8..d0df39c9bef1 100644
--- a/src/generators/server-side-rendering/visitors/Component.ts
+++ b/src/generators/server-side-rendering/visitors/Component.ts
@@ -91,7 +91,7 @@ export default function visitComponent(
 	if (isDynamicComponent) block.contextualise(node.expression);
 
 	const expression = (
-		node.name === ':Self' ? generator.name :
+		(node.name === ':Self' || node.name === 'svelte:self') ? generator.name :
 		isDynamicComponent ? `((${node.metadata.snippet}) || __missingComponent)` :
 		`%components-${node.name}`
 	);
diff --git a/src/parse/read/directives.ts b/src/parse/read/directives.ts
index 744da4a2401c..77c0ffe47a36 100644
--- a/src/parse/read/directives.ts
+++ b/src/parse/read/directives.ts
@@ -140,20 +140,25 @@ export function readDirective(
 
 		const expressionStart = parser.index;
 
-		if (parser.eat('{{')) {
-			let message = 'directive values should not be wrapped';
-			const expressionEnd = parser.template.indexOf('}}', expressionStart);
-			if (expressionEnd !== -1) {
-				const value = parser.template.slice(parser.index, expressionEnd);
-				message += ` — use '${value}', not '{{${value}}}'`;
+		try {
+			expression = readExpression(parser, expressionStart, quoteMark);
+			if (directive.allowedExpressionTypes.indexOf(expression.type) === -1) {
+				parser.error(directive.error, expressionStart);
+			}
+		} catch (err) {
+			if (parser.template[expressionStart] === '{') {
+				// assume the mistake was wrapping the directive arguments.
+				// this could yield false positives! but hopefully not too many
+				let message = 'directive values should not be wrapped';
+				const expressionEnd = parser.template.indexOf((parser.v2 ? '}' : '}}'), expressionStart);
+				if (expressionEnd !== -1) {
+					const value = parser.template.slice(expressionStart + (parser.v2 ? 1 : 2), expressionEnd);
+					message += ` — use '${value}', not '${parser.v2 ? `{${value}}` : `{{${value}}}`}'`;
+				}
+				parser.error(message, expressionStart);
 			}
 
-			parser.error(message, expressionStart);
-		}
-
-		expression = readExpression(parser, expressionStart, quoteMark);
-		if (directive.allowedExpressionTypes.indexOf(expression.type) === -1) {
-			parser.error(directive.error, expressionStart);
+			throw err;
 		}
 	}
 
diff --git a/src/parse/state/tag.ts b/src/parse/state/tag.ts
index e29965994dff..ba4fce179f0d 100644
--- a/src/parse/state/tag.ts
+++ b/src/parse/state/tag.ts
@@ -10,12 +10,11 @@ import { Node } from '../../interfaces';
 
 const validTagName = /^\!?[a-zA-Z]{1,}:?[a-zA-Z0-9\-]*/;
 
-const SELF = ':Self';
-const COMPONENT = ':Component';
-
 const metaTags = new Set([
 	':Window',
-	':Head'
+	':Head',
+	'svelte:window',
+	'svelte:head'
 ]);
 
 const specials = new Map([
@@ -85,9 +84,9 @@ export default function tag(parser: Parser) {
 
 	if (metaTags.has(name)) {
 		if (isClosingTag) {
-			if (name === ':Window' && parser.current().children.length) {
+			if ((name === ':Window' || name === 'svelte:window') && parser.current().children.length) {
 				parser.error(
-					`<:Window> cannot have children`,
+					`<${name}> cannot have children`,
 					parser.current().children[0].start
 				);
 			}
diff --git a/src/validate/html/index.ts b/src/validate/html/index.ts
index 36377f40658b..6e2b6b413392 100644
--- a/src/validate/html/index.ts
+++ b/src/validate/html/index.ts
@@ -33,6 +33,8 @@ export default function validateHtml(validator: Validator, html: Node) {
 			const isComponent =
 				node.name === ':Self' ||
 				node.name === ':Component' ||
+				node.name === 'svelte:self' ||
+				node.name === 'svelte:component' ||
 				validator.components.has(node.name);
 
 			validateElement(
diff --git a/src/validate/html/validateElement.ts b/src/validate/html/validateElement.ts
index 00c195a85cc1..b7db93488ef3 100644
--- a/src/validate/html/validateElement.ts
+++ b/src/validate/html/validateElement.ts
@@ -280,7 +280,7 @@ function checkSlotAttribute(validator: Validator, node: Node, attribute: Node, s
 		const parent = stack[i];
 		if (parent.type === 'Element') {
 			// if we're inside a component or a custom element, gravy
-			if (parent.name === ':Self' || parent.name === ':Component' || validator.components.has(parent.name)) return;
+			if (parent.name === ':Self' || parent.name === ':Component' || parent.name === 'svelte:self' || parent.name === 'svelte:component' || validator.components.has(parent.name)) return;
 			if (/-/.test(parent.name)) return;
 		}
 
diff --git a/test/parser/index.js b/test/parser/index.js
index 0bdb4ad74075..dd692f8c6f3b 100644
--- a/test/parser/index.js
+++ b/test/parser/index.js
@@ -16,56 +16,49 @@ describe('parse', () => {
 		}
 
 		(solo ? it.only : it)(dir, () => {
-			const input = fs
-				.readFileSync(`test/parser/samples/${dir}/input.html`, 'utf-8')
-				.replace(/\s+$/, '');
-
-			const input_v2 = fs
-				.readFileSync(`test/parser/samples/${dir}/input-v2.html`, 'utf-8')
-				.replace(/\s+$/, '');
-
 			const options = tryToLoadJson(`test/parser/samples/${dir}/options.json`) || {};
 
-			try {
-				const actual = svelte.parse(input, options);
-				const expected = require(`./samples/${dir}/output.json`);
-
-				fs.writeFileSync(
-					`test/parser/samples/${dir}/_actual.json`,
-					JSON.stringify(actual, null, '\t')
-				);
-
-				assert.deepEqual(actual.html, expected.html);
-				assert.deepEqual(actual.css, expected.css);
-				assert.deepEqual(actual.js, expected.js);
-
-				// TODO remove v1 tests
-				const actual_v2 = svelte.parse(input_v2, Object.assign({ parser: 'v2' }, options));
-				const expected_v2 = require(`./samples/${dir}/output-v2.json`);
-
-				fs.writeFileSync(
-					`test/parser/samples/${dir}/_actual-v2.json`,
-					JSON.stringify(actual_v2, null, '\t')
-				);
-
-				assert.deepEqual(actual_v2.html, expected_v2.html);
-				assert.deepEqual(actual_v2.css, expected_v2.css);
-				assert.deepEqual(actual_v2.js, expected_v2.js);
-			} catch (err) {
-				if (err.name !== 'ParseError') throw err;
-
+			function test(options, input, expectedOutput, expectedError, outputFile) {
 				try {
-					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);
-					assert.equal(err.toString().split('\n')[0], `${expected.message} (${expected.loc.line}:${expected.loc.column})`);
-				} catch (err2) {
-					const e = err2.code === 'MODULE_NOT_FOUND' ? err : err2;
-					throw e;
+					const actual = svelte.parse(input, options);
+
+					fs.writeFileSync(outputFile, JSON.stringify(actual, null, '\t'));
+
+					assert.deepEqual(actual.html, expectedOutput.html);
+					assert.deepEqual(actual.css, expectedOutput.css);
+					assert.deepEqual(actual.js, expectedOutput.js);
+				} catch (err) {
+					if (err.name !== 'ParseError') throw err;
+					if (!expectedError) throw err;
+
+					try {
+						assert.equal(err.message, expectedError.message);
+						assert.deepEqual(err.loc, expectedError.loc);
+						assert.equal(err.pos, expectedError.pos);
+						assert.equal(err.toString().split('\n')[0], `${expectedError.message} (${expectedError.loc.line}:${expectedError.loc.column})`);
+					} catch (err2) {
+						const e = err2.code === 'MODULE_NOT_FOUND' ? err : err2;
+						throw e;
+					}
 				}
 			}
+
+			// TODO remove v1 tests
+			test(
+				options,
+				fs.readFileSync(`test/parser/samples/${dir}/input.html`, 'utf-8').replace(/\s+$/, ''),
+				tryToLoadJson(`test/parser/samples/${dir}/output.json`),
+				tryToLoadJson(`test/parser/samples/${dir}/error.json`),
+				`test/parser/samples/${dir}/_actual.json`
+			);
+
+			test(
+				Object.assign({ parser: 'v2' }, options),
+				fs.readFileSync(`test/parser/samples/${dir}/input-v2.html`, 'utf-8').replace(/\s+$/, ''),
+				tryToLoadJson(`test/parser/samples/${dir}/output-v2.json`),
+				tryToLoadJson(`test/parser/samples/${dir}/error-v2.json`),
+				`test/parser/samples/${dir}/_actual-v2.json`
+			);
 		});
 	});
 
diff --git a/test/parser/samples/attribute-unique-error/error-v2.json b/test/parser/samples/attribute-unique-error/error-v2.json
new file mode 100644
index 000000000000..b4ab7a57b5c3
--- /dev/null
+++ b/test/parser/samples/attribute-unique-error/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "Attributes need to be unique",
+	"loc": {
+		"line": 1,
+		"column": 17
+	},
+	"pos": 17
+}
diff --git a/test/parser/samples/error-binding-disabled/error-v2.json b/test/parser/samples/error-binding-disabled/error-v2.json
new file mode 100644
index 000000000000..36ad59d26f6d
--- /dev/null
+++ b/test/parser/samples/error-binding-disabled/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "Two-way binding is disabled",
+	"loc": {
+		"line": 1,
+		"column": 7
+	},
+	"pos": 7
+}
\ No newline at end of file
diff --git a/test/parser/samples/error-binding-mustaches/error-v2.json b/test/parser/samples/error-binding-mustaches/error-v2.json
new file mode 100644
index 000000000000..92bb2eb1ebf2
--- /dev/null
+++ b/test/parser/samples/error-binding-mustaches/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "directive values should not be wrapped — use 'foo', not '{foo}'",
+	"loc": {
+		"line": 1,
+		"column": 19
+	},
+	"pos": 19
+}
\ No newline at end of file
diff --git a/test/parser/samples/error-binding-rvalue/error-v2.json b/test/parser/samples/error-binding-rvalue/error-v2.json
new file mode 100644
index 000000000000..63f6711cd1d5
--- /dev/null
+++ b/test/parser/samples/error-binding-rvalue/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "Can only bind to an identifier (e.g. `foo`) or a member expression (e.g. `foo.bar` or `foo[baz]`)",
+	"pos": 19,
+	"loc": {
+		"line": 1,
+		"column": 19
+	}
+}
\ No newline at end of file
diff --git a/test/parser/samples/error-comment-unclosed/error-v2.json b/test/parser/samples/error-comment-unclosed/error-v2.json
new file mode 100644
index 000000000000..f392e12fa180
--- /dev/null
+++ b/test/parser/samples/error-comment-unclosed/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "comment was left open, expected -->",
+	"loc": {
+		"line": 1,
+		"column": 24
+	},
+	"pos": 24
+}
diff --git a/test/parser/samples/error-css/error-v2.json b/test/parser/samples/error-css/error-v2.json
new file mode 100644
index 000000000000..177f6d977f90
--- /dev/null
+++ b/test/parser/samples/error-css/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "LeftCurlyBracket is expected",
+	"loc": {
+		"line": 2,
+		"column": 16
+	},
+	"pos": 24
+}
diff --git a/test/parser/samples/error-event-handler/error-v2.json b/test/parser/samples/error-event-handler/error-v2.json
new file mode 100644
index 000000000000..f5e603b06af0
--- /dev/null
+++ b/test/parser/samples/error-event-handler/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "Expected a method call",
+	"loc": {
+		"line": 1,
+		"column": 15
+	},
+	"pos": 15
+}
\ No newline at end of file
diff --git a/test/parser/samples/error-illegal-expression/error-v2.json b/test/parser/samples/error-illegal-expression/error-v2.json
new file mode 100644
index 000000000000..b0b557202c35
--- /dev/null
+++ b/test/parser/samples/error-illegal-expression/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "Assigning to rvalue",
+	"loc": {
+		"line": 1,
+		"column": 1
+	},
+	"pos": 1
+}
diff --git a/test/parser/samples/error-multiple-styles/error-v2.json b/test/parser/samples/error-multiple-styles/error-v2.json
new file mode 100644
index 000000000000..421c5558a77b
--- /dev/null
+++ b/test/parser/samples/error-multiple-styles/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "You can only have one top-level <style> tag per component",
+	"loc": {
+		"line": 9,
+		"column": 0
+	},
+	"pos": 58
+}
diff --git a/test/parser/samples/error-ref-value/error-v2.json b/test/parser/samples/error-ref-value/error-v2.json
new file mode 100644
index 000000000000..963c4656eb1f
--- /dev/null
+++ b/test/parser/samples/error-ref-value/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "ref directives cannot have a value",
+	"loc": {
+		"line": 1,
+		"column": 14
+	},
+	"pos": 14
+}
\ No newline at end of file
diff --git a/test/parser/samples/error-script-unclosed/error-v2.json b/test/parser/samples/error-script-unclosed/error-v2.json
new file mode 100644
index 000000000000..bb7d76e3323d
--- /dev/null
+++ b/test/parser/samples/error-script-unclosed/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "<script> must have a closing tag",
+	"loc": {
+		"line": 3,
+		"column": 8
+	},
+	"pos": 32
+}
\ No newline at end of file
diff --git a/test/parser/samples/error-self-reference/error-v2.json b/test/parser/samples/error-self-reference/error-v2.json
new file mode 100644
index 000000000000..3976f5f101c2
--- /dev/null
+++ b/test/parser/samples/error-self-reference/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "<svelte:self> components can only exist inside if-blocks or each-blocks",
+	"loc": {
+		"line": 1,
+		"column": 1
+	},
+	"pos": 1
+}
\ No newline at end of file
diff --git a/test/parser/samples/error-unexpected-end-of-input-b/error-v2.json b/test/parser/samples/error-unexpected-end-of-input-b/error-v2.json
new file mode 100644
index 000000000000..c3ddfee08dd8
--- /dev/null
+++ b/test/parser/samples/error-unexpected-end-of-input-b/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "Unexpected end of input",
+	"loc": {
+		"line": 1,
+		"column": 2
+	},
+	"pos": 2
+}
diff --git a/test/parser/samples/error-unexpected-end-of-input-c/error-v2.json b/test/parser/samples/error-unexpected-end-of-input-c/error-v2.json
new file mode 100644
index 000000000000..35a42489b995
--- /dev/null
+++ b/test/parser/samples/error-unexpected-end-of-input-c/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "Unexpected end of input",
+	"loc": {
+		"line": 1,
+		"column": 1
+	},
+	"pos": 1
+}
diff --git a/test/parser/samples/error-unexpected-end-of-input-d/error-v2.json b/test/parser/samples/error-unexpected-end-of-input-d/error-v2.json
new file mode 100644
index 000000000000..8a78bbf50110
--- /dev/null
+++ b/test/parser/samples/error-unexpected-end-of-input-d/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "Block was left open",
+	"loc": {
+		"line": 1,
+		"column": 0
+	},
+	"pos": 0
+}
diff --git a/test/parser/samples/error-unexpected-end-of-input/error-v2.json b/test/parser/samples/error-unexpected-end-of-input/error-v2.json
new file mode 100644
index 000000000000..87ecce83bc2e
--- /dev/null
+++ b/test/parser/samples/error-unexpected-end-of-input/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "<div> was left open",
+	"loc": {
+		"line": 1,
+		"column": 0
+	},
+	"pos": 0
+}
diff --git a/test/parser/samples/error-unmatched-closing-tag/error-v2.json b/test/parser/samples/error-unmatched-closing-tag/error-v2.json
new file mode 100644
index 000000000000..3dd72b28daa4
--- /dev/null
+++ b/test/parser/samples/error-unmatched-closing-tag/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "</div> attempted to close an element that was not open",
+	"loc": {
+		"line": 1,
+		"column": 0
+	},
+	"pos": 0
+}
diff --git a/test/parser/samples/error-void-closing/error-v2.json b/test/parser/samples/error-void-closing/error-v2.json
new file mode 100644
index 000000000000..8756a518782f
--- /dev/null
+++ b/test/parser/samples/error-void-closing/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "<input> is a void element and cannot have children, or a closing tag",
+	"loc": {
+		"line": 1,
+		"column": 23
+	},
+	"pos": 23
+}
diff --git a/test/parser/samples/error-window-children/error-v2.json b/test/parser/samples/error-window-children/error-v2.json
new file mode 100644
index 000000000000..53fa535b5549
--- /dev/null
+++ b/test/parser/samples/error-window-children/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "<svelte:window> cannot have children",
+	"loc": {
+		"line": 1,
+		"column": 15
+	},
+	"pos": 15
+}
\ No newline at end of file
diff --git a/test/parser/samples/error-window-duplicate/error-v2.json b/test/parser/samples/error-window-duplicate/error-v2.json
new file mode 100644
index 000000000000..258a6a502898
--- /dev/null
+++ b/test/parser/samples/error-window-duplicate/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "A component can only have one <svelte:window> tag",
+	"loc": {
+		"line": 2,
+		"column": 0
+	},
+	"pos": 17
+}
\ No newline at end of file
diff --git a/test/parser/samples/error-window-inside-block/error-v2.json b/test/parser/samples/error-window-inside-block/error-v2.json
new file mode 100644
index 000000000000..81c05fd42ab8
--- /dev/null
+++ b/test/parser/samples/error-window-inside-block/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "<svelte:window> tags cannot be inside elements or blocks",
+	"loc": {
+		"line": 2,
+		"column": 1
+	},
+	"pos": 11
+}
\ No newline at end of file
diff --git a/test/parser/samples/error-window-inside-element/error-v2.json b/test/parser/samples/error-window-inside-element/error-v2.json
new file mode 100644
index 000000000000..4c786383fc34
--- /dev/null
+++ b/test/parser/samples/error-window-inside-element/error-v2.json
@@ -0,0 +1,8 @@
+{
+	"message": "<svelte:window> tags cannot be inside elements or blocks",
+	"loc": {
+		"line": 2,
+		"column": 1
+	},
+	"pos": 7
+}
\ No newline at end of file

From bb61e6e911b588e19d1bbe811386c66188bd7aac Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Fri, 13 Apr 2018 11:45:03 -0400
Subject: [PATCH 09/15] v2 js tests

---
 src/utils/createDebuggingComment.ts           |   2 +-
 test/js/index.js                              | 110 +++--
 .../_actual-bundle-v2.js                      | 245 ++++++++++
 .../expected-bundle-v2.js                     | 245 ++++++++++
 .../expected-v2.js                            |  63 +++
 .../input-v2.html                             |  30 ++
 .../deconflict-builtins/_actual-bundle-v2.js  | 317 +++++++++++++
 .../deconflict-builtins/expected-bundle-v2.js | 317 +++++++++++++
 .../deconflict-builtins/expected-v2.js        | 124 +++++
 .../samples/deconflict-builtins/input-v2.html |   3 +
 .../_actual-bundle-v2.js                      | 298 ++++++++++++
 .../expected-bundle-v2.js                     | 298 ++++++++++++
 .../expected-v2.js                            |  72 +++
 .../input-v2.html                             |  12 +
 .../do-use-dataset/_actual-bundle-v2.js       | 234 +++++++++
 .../do-use-dataset/expected-bundle-v2.js      | 234 +++++++++
 test/js/samples/do-use-dataset/expected-v2.js |  55 +++
 test/js/samples/do-use-dataset/input-v2.html  |   2 +
 .../_actual-bundle-v2.js                      | 238 ++++++++++
 .../expected-bundle-v2.js                     | 238 ++++++++++
 .../dont-use-dataset-in-legacy/expected-v2.js |  55 +++
 .../dont-use-dataset-in-legacy/input-v2.html  |   2 +
 .../_actual-bundle-v2.js                      | 236 +++++++++
 .../expected-bundle-v2.js                     | 236 +++++++++
 .../dont-use-dataset-in-svg/expected-v2.js    |  53 +++
 .../dont-use-dataset-in-svg/input-v2.html     |   4 +
 .../_actual-bundle-v2.js                      | 364 ++++++++++++++
 .../expected-bundle-v2.js                     | 364 ++++++++++++++
 .../each-block-changed-check/expected-v2.js   | 169 +++++++
 .../each-block-changed-check/input-v2.html    |  13 +
 .../head-no-whitespace/_actual-bundle-v2.js   | 225 +++++++++
 .../head-no-whitespace/expected-bundle-v2.js  | 225 +++++++++
 .../samples/head-no-whitespace/expected-v2.js |  50 ++
 .../samples/head-no-whitespace/input-v2.html  |   4 +
 .../if-block-no-update/_actual-bundle-v2.js   | 283 +++++++++++
 .../if-block-no-update/expected-bundle-v2.js  | 283 +++++++++++
 .../samples/if-block-no-update/expected-v2.js | 104 ++++
 .../samples/if-block-no-update/input-v2.html  |   5 +
 .../if-block-simple/_actual-bundle-v2.js      | 259 ++++++++++
 .../if-block-simple/expected-bundle-v2.js     | 259 ++++++++++
 .../js/samples/if-block-simple/expected-v2.js |  80 ++++
 test/js/samples/if-block-simple/input-v2.html |   3 +
 .../_actual-bundle-v2.js                      | 232 +++++++++
 .../expected-bundle-v2.js                     | 232 +++++++++
 .../expected-v2.js                            |  53 +++
 .../input-v2.html                             |   1 +
 .../_actual-bundle-v2.js                      | 227 +++++++++
 .../expected-bundle-v2.js                     | 227 +++++++++
 .../inline-style-optimized-url/expected-v2.js |  48 ++
 .../inline-style-optimized-url/input-v2.html  |   1 +
 .../_actual-bundle-v2.js                      | 227 +++++++++
 .../expected-bundle-v2.js                     | 227 +++++++++
 .../inline-style-optimized/expected-v2.js     |  48 ++
 .../inline-style-optimized/input-v2.html      |   1 +
 .../_actual-bundle-v2.js                      | 238 ++++++++++
 .../expected-bundle-v2.js                     | 238 ++++++++++
 .../inline-style-unoptimized/expected-v2.js   |  59 +++
 .../inline-style-unoptimized/input-v2.html    |   2 +
 test/js/samples/title/input-v2.html           |   3 +
 .../_actual-bundle-v2.js                      | 449 ++++++++++++++++++
 .../expected-bundle-v2.js                     | 449 ++++++++++++++++++
 .../use-elements-as-anchors/expected-v2.js    | 262 ++++++++++
 .../use-elements-as-anchors/input-v2.html     |  27 ++
 .../_actual-bundle-v2.js                      | 251 ++++++++++
 .../expected-bundle-v2.js                     | 251 ++++++++++
 .../window-binding-scroll/expected-v2.js      |  68 +++
 .../window-binding-scroll/input-v2.html       |   3 +
 67 files changed, 10189 insertions(+), 48 deletions(-)
 create mode 100644 test/js/samples/collapses-text-around-comments/_actual-bundle-v2.js
 create mode 100644 test/js/samples/collapses-text-around-comments/expected-bundle-v2.js
 create mode 100644 test/js/samples/collapses-text-around-comments/expected-v2.js
 create mode 100644 test/js/samples/collapses-text-around-comments/input-v2.html
 create mode 100644 test/js/samples/deconflict-builtins/_actual-bundle-v2.js
 create mode 100644 test/js/samples/deconflict-builtins/expected-bundle-v2.js
 create mode 100644 test/js/samples/deconflict-builtins/expected-v2.js
 create mode 100644 test/js/samples/deconflict-builtins/input-v2.html
 create mode 100644 test/js/samples/dev-warning-missing-data-computed/_actual-bundle-v2.js
 create mode 100644 test/js/samples/dev-warning-missing-data-computed/expected-bundle-v2.js
 create mode 100644 test/js/samples/dev-warning-missing-data-computed/expected-v2.js
 create mode 100644 test/js/samples/dev-warning-missing-data-computed/input-v2.html
 create mode 100644 test/js/samples/do-use-dataset/_actual-bundle-v2.js
 create mode 100644 test/js/samples/do-use-dataset/expected-bundle-v2.js
 create mode 100644 test/js/samples/do-use-dataset/expected-v2.js
 create mode 100644 test/js/samples/do-use-dataset/input-v2.html
 create mode 100644 test/js/samples/dont-use-dataset-in-legacy/_actual-bundle-v2.js
 create mode 100644 test/js/samples/dont-use-dataset-in-legacy/expected-bundle-v2.js
 create mode 100644 test/js/samples/dont-use-dataset-in-legacy/expected-v2.js
 create mode 100644 test/js/samples/dont-use-dataset-in-legacy/input-v2.html
 create mode 100644 test/js/samples/dont-use-dataset-in-svg/_actual-bundle-v2.js
 create mode 100644 test/js/samples/dont-use-dataset-in-svg/expected-bundle-v2.js
 create mode 100644 test/js/samples/dont-use-dataset-in-svg/expected-v2.js
 create mode 100644 test/js/samples/dont-use-dataset-in-svg/input-v2.html
 create mode 100644 test/js/samples/each-block-changed-check/_actual-bundle-v2.js
 create mode 100644 test/js/samples/each-block-changed-check/expected-bundle-v2.js
 create mode 100644 test/js/samples/each-block-changed-check/expected-v2.js
 create mode 100644 test/js/samples/each-block-changed-check/input-v2.html
 create mode 100644 test/js/samples/head-no-whitespace/_actual-bundle-v2.js
 create mode 100644 test/js/samples/head-no-whitespace/expected-bundle-v2.js
 create mode 100644 test/js/samples/head-no-whitespace/expected-v2.js
 create mode 100644 test/js/samples/head-no-whitespace/input-v2.html
 create mode 100644 test/js/samples/if-block-no-update/_actual-bundle-v2.js
 create mode 100644 test/js/samples/if-block-no-update/expected-bundle-v2.js
 create mode 100644 test/js/samples/if-block-no-update/expected-v2.js
 create mode 100644 test/js/samples/if-block-no-update/input-v2.html
 create mode 100644 test/js/samples/if-block-simple/_actual-bundle-v2.js
 create mode 100644 test/js/samples/if-block-simple/expected-bundle-v2.js
 create mode 100644 test/js/samples/if-block-simple/expected-v2.js
 create mode 100644 test/js/samples/if-block-simple/input-v2.html
 create mode 100644 test/js/samples/inline-style-optimized-multiple/_actual-bundle-v2.js
 create mode 100644 test/js/samples/inline-style-optimized-multiple/expected-bundle-v2.js
 create mode 100644 test/js/samples/inline-style-optimized-multiple/expected-v2.js
 create mode 100644 test/js/samples/inline-style-optimized-multiple/input-v2.html
 create mode 100644 test/js/samples/inline-style-optimized-url/_actual-bundle-v2.js
 create mode 100644 test/js/samples/inline-style-optimized-url/expected-bundle-v2.js
 create mode 100644 test/js/samples/inline-style-optimized-url/expected-v2.js
 create mode 100644 test/js/samples/inline-style-optimized-url/input-v2.html
 create mode 100644 test/js/samples/inline-style-optimized/_actual-bundle-v2.js
 create mode 100644 test/js/samples/inline-style-optimized/expected-bundle-v2.js
 create mode 100644 test/js/samples/inline-style-optimized/expected-v2.js
 create mode 100644 test/js/samples/inline-style-optimized/input-v2.html
 create mode 100644 test/js/samples/inline-style-unoptimized/_actual-bundle-v2.js
 create mode 100644 test/js/samples/inline-style-unoptimized/expected-bundle-v2.js
 create mode 100644 test/js/samples/inline-style-unoptimized/expected-v2.js
 create mode 100644 test/js/samples/inline-style-unoptimized/input-v2.html
 create mode 100644 test/js/samples/title/input-v2.html
 create mode 100644 test/js/samples/use-elements-as-anchors/_actual-bundle-v2.js
 create mode 100644 test/js/samples/use-elements-as-anchors/expected-bundle-v2.js
 create mode 100644 test/js/samples/use-elements-as-anchors/expected-v2.js
 create mode 100644 test/js/samples/use-elements-as-anchors/input-v2.html
 create mode 100644 test/js/samples/window-binding-scroll/_actual-bundle-v2.js
 create mode 100644 test/js/samples/window-binding-scroll/expected-bundle-v2.js
 create mode 100644 test/js/samples/window-binding-scroll/expected-v2.js
 create mode 100644 test/js/samples/window-binding-scroll/input-v2.html

diff --git a/src/utils/createDebuggingComment.ts b/src/utils/createDebuggingComment.ts
index 65a3270ebbe2..e967d7e5165b 100644
--- a/src/utils/createDebuggingComment.ts
+++ b/src/utils/createDebuggingComment.ts
@@ -12,7 +12,7 @@ export default function createDebuggingComment(node: Node, generator: DomGenerat
 
 	let d = node.expression ? node.expression.end : c;
 	while (source[d] !== '}') d += 1;
-	d += 2;
+	while (source[d] === '}') d += 1;
 
 	const start = locate(c);
 	const loc = `(${start.line + 1}:${start.column})`;
diff --git a/test/js/index.js b/test/js/index.js
index 07bdc183decb..43f7a4c47e4f 100644
--- a/test/js/index.js
+++ b/test/js/index.js
@@ -4,7 +4,7 @@ import * as path from "path";
 import { rollup } from "rollup";
 import { loadConfig, svelte } from "../helpers.js";
 
-describe("js", () => {
+describe.only("js", () => {
 	fs.readdirSync("test/js/samples").forEach(dir => {
 		if (dir[0] === ".") return;
 
@@ -19,61 +19,77 @@ describe("js", () => {
 			dir = path.resolve("test/js/samples", dir);
 			const config = loadConfig(`${dir}/_config.js`);
 
-			const input = fs
-				.readFileSync(`${dir}/input.html`, "utf-8")
-				.replace(/\s+$/, "");
+			function test(input, v2) {
+				let actual;
 
-			let actual;
+				try {
+					const options = Object.assign(config.options || {}, {
+						shared: true,
+						parser: v2 ? 'v2' : 'v1'
+					});
 
-			try {
-				const options = Object.assign(config.options || {}, {
-					shared: true
-				});
+					actual = svelte.compile(input, options).code.replace(/generated by Svelte v\d+\.\d+\.\d+/, 'generated by Svelte vX.Y.Z');
+				} catch (err) {
+					console.log(err.frame);
+					throw err;
+				}
 
-				actual = svelte.compile(input, options).code.replace(/generated by Svelte v\d+\.\d+\.\d+/, 'generated by Svelte vX.Y.Z');
-			} catch (err) {
-				console.log(err.frame);
-				throw err;
-			}
+				const output = `${dir}/_actual${v2 ? '-v2' : ''}.js`;
 
-			fs.writeFileSync(`${dir}/_actual.js`, actual);
+				fs.writeFileSync(output, actual);
 
-			return rollup({
-				input: `${dir}/_actual.js`,
-				plugins: [
-					{
-						resolveId(importee, importer) {
-							if (!importer) return importee;
-							if (importee === "svelte/shared.js")
-								return path.resolve("shared.js");
-							return null;
+				return rollup({
+					input: output,
+					plugins: [
+						{
+							resolveId(importee, importer) {
+								if (!importer) return importee;
+								if (importee === "svelte/shared.js")
+									return path.resolve("shared.js");
+								return null;
+							}
 						}
-					}
-				]
-			}).then(bundle => {
-				return bundle.generate({ format: "es" });
-			}).then(({ code }) => {
-				fs.writeFileSync(`${dir}/_actual-bundle.js`, code);
+					]
+				}).then(bundle => {
+					return bundle.generate({ format: "es" });
+				}).then(({ code }) => {
+					fs.writeFileSync(`${dir}/_actual-bundle${v2 ? '-v2' : ''}.js`, code);
+
+					const expected = fs.readFileSync(`${dir}/expected${v2 ? '-v2' : ''}.js`, "utf-8");
+					const expectedBundle = fs.readFileSync(
+						`${dir}/expected-bundle${v2 ? '-v2' : ''}.js`,
+						"utf-8"
+					);
 
-				const expected = fs.readFileSync(`${dir}/expected.js`, "utf-8");
-				const expectedBundle = fs.readFileSync(
-					`${dir}/expected-bundle.js`,
-					"utf-8"
-				);
+					assert.equal(
+						actual.trim().replace(/^[ \t]+$/gm, ""),
+						expected.trim().replace(/^[ \t]+$/gm, "")
+					);
 
-				assert.equal(
-					actual.trim().replace(/^[ \t]+$/gm, ""),
-					expected.trim().replace(/^[ \t]+$/gm, "")
-				);
+					assert.equal(
+						code.trim().replace(/^[ \t]+$/gm, ""),
+						expectedBundle.trim().replace(/^[ \t]+$/gm, "")
+					);
+				}).catch(err => {
+					if (err.loc) console.error(err.loc);
+					throw err;
+				});
+			}
 
-				assert.equal(
-					code.trim().replace(/^[ \t]+$/gm, ""),
-					expectedBundle.trim().replace(/^[ \t]+$/gm, "")
-				);
-			}).catch(err => {
-				if (err.loc) console.error(err.loc);
-				throw err;
-			});
+			return Promise.resolve()
+				.then(() => {
+					return test(
+						fs.readFileSync(`${dir}/input.html`, "utf-8").replace(/\s+$/, "")
+					);
+				})
+				.then(() => {
+					if (fs.existsSync(`${dir}/input-v2.html`)) {
+						return test(
+							fs.readFileSync(`${dir}/input-v2.html`, "utf-8").replace(/\s+$/, ""),
+							'v2'
+						);
+					}
+				});
 		});
 	});
 });
diff --git a/test/js/samples/collapses-text-around-comments/_actual-bundle-v2.js b/test/js/samples/collapses-text-around-comments/_actual-bundle-v2.js
new file mode 100644
index 000000000000..83e680be30f1
--- /dev/null
+++ b/test/js/samples/collapses-text-around-comments/_actual-bundle-v2.js
@@ -0,0 +1,245 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+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 blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function data() {
+	return { foo: 42 }
+}
+function add_css() {
+	var style = createElement("style");
+	style.id = 'svelte-1a7i8ec-style';
+	style.textContent = "p.svelte-1a7i8ec,.svelte-1a7i8ec p{color:red}";
+	appendNode(style, document.head);
+}
+
+function create_main_fragment(component, state) {
+	var p, text;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			text = createText(state.foo);
+			this.h();
+		},
+
+		h: function hydrate() {
+			p.className = "svelte-1a7i8ec";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+			appendNode(text, p);
+		},
+
+		p: function update(changed, state) {
+			if (changed.foo) {
+				text.data = state.foo;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign(data(), options.data);
+
+	if (!document.getElementById("svelte-1a7i8ec-style")) add_css();
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/collapses-text-around-comments/expected-bundle-v2.js b/test/js/samples/collapses-text-around-comments/expected-bundle-v2.js
new file mode 100644
index 000000000000..83e680be30f1
--- /dev/null
+++ b/test/js/samples/collapses-text-around-comments/expected-bundle-v2.js
@@ -0,0 +1,245 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+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 blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function data() {
+	return { foo: 42 }
+}
+function add_css() {
+	var style = createElement("style");
+	style.id = 'svelte-1a7i8ec-style';
+	style.textContent = "p.svelte-1a7i8ec,.svelte-1a7i8ec p{color:red}";
+	appendNode(style, document.head);
+}
+
+function create_main_fragment(component, state) {
+	var p, text;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			text = createText(state.foo);
+			this.h();
+		},
+
+		h: function hydrate() {
+			p.className = "svelte-1a7i8ec";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+			appendNode(text, p);
+		},
+
+		p: function update(changed, state) {
+			if (changed.foo) {
+				text.data = state.foo;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign(data(), options.data);
+
+	if (!document.getElementById("svelte-1a7i8ec-style")) add_css();
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/collapses-text-around-comments/expected-v2.js b/test/js/samples/collapses-text-around-comments/expected-v2.js
new file mode 100644
index 000000000000..7bab86334e54
--- /dev/null
+++ b/test/js/samples/collapses-text-around-comments/expected-v2.js
@@ -0,0 +1,63 @@
+/* generated by Svelte vX.Y.Z */
+import { appendNode, assign, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
+
+function data() {
+	return { foo: 42 }
+};
+
+function add_css() {
+	var style = createElement("style");
+	style.id = 'svelte-1a7i8ec-style';
+	style.textContent = "p.svelte-1a7i8ec,.svelte-1a7i8ec p{color:red}";
+	appendNode(style, document.head);
+}
+
+function create_main_fragment(component, state) {
+	var p, text;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			text = createText(state.foo);
+			this.h();
+		},
+
+		h: function hydrate() {
+			p.className = "svelte-1a7i8ec";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+			appendNode(text, p);
+		},
+
+		p: function update(changed, state) {
+			if (changed.foo) {
+				text.data = state.foo;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign(data(), options.data);
+
+	if (!document.getElementById("svelte-1a7i8ec-style")) add_css();
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/collapses-text-around-comments/input-v2.html b/test/js/samples/collapses-text-around-comments/input-v2.html
new file mode 100644
index 000000000000..54c15b792200
--- /dev/null
+++ b/test/js/samples/collapses-text-around-comments/input-v2.html
@@ -0,0 +1,30 @@
+
+<!-- a -->
+
+<!-- b -->
+
+<p>{foo}</p>
+
+<!-- c -->
+
+<!-- d -->
+
+<style>
+	p {
+		color: red;
+	}
+</style>
+
+<!-- e -->
+
+<script>
+	export default {
+		data: function () {
+			return { foo: 42 }
+		}
+	};
+</script>
+
+<!-- f -->
+
+<!-- g -->
\ No newline at end of file
diff --git a/test/js/samples/deconflict-builtins/_actual-bundle-v2.js b/test/js/samples/deconflict-builtins/_actual-bundle-v2.js
new file mode 100644
index 000000000000..6680adfdb427
--- /dev/null
+++ b/test/js/samples/deconflict-builtins/_actual-bundle-v2.js
@@ -0,0 +1,317 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function appendNode(node, target) {
+	target.appendChild(node);
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function destroyEach(iterations) {
+	for (var i = 0; i < iterations.length; i += 1) {
+		if (iterations[i]) iterations[i].d();
+	}
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function createText(data) {
+	return document.createTextNode(data);
+}
+
+function createComment() {
+	return document.createComment('');
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var each_anchor;
+
+	var each_value = state.createElement;
+
+	var each_blocks = [];
+
+	for (var i = 0; i < each_value.length; i += 1) {
+		each_blocks[i] = create_each_block(component, assign(assign({}, state), {
+			each_value: each_value,
+			node: each_value[i],
+			node_index: i
+		}));
+	}
+
+	return {
+		c: function create() {
+			for (var i = 0; i < each_blocks.length; i += 1) {
+				each_blocks[i].c();
+			}
+
+			each_anchor = createComment();
+		},
+
+		m: function mount(target, anchor) {
+			for (var i = 0; i < each_blocks.length; i += 1) {
+				each_blocks[i].m(target, anchor);
+			}
+
+			insertNode(each_anchor, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			var each_value = state.createElement;
+
+			if (changed.createElement) {
+				for (var i = 0; i < each_value.length; i += 1) {
+					var each_context = assign(assign({}, state), {
+						each_value: each_value,
+						node: each_value[i],
+						node_index: i
+					});
+
+					if (each_blocks[i]) {
+						each_blocks[i].p(changed, each_context);
+					} else {
+						each_blocks[i] = create_each_block(component, each_context);
+						each_blocks[i].c();
+						each_blocks[i].m(each_anchor.parentNode, each_anchor);
+					}
+				}
+
+				for (; i < each_blocks.length; i += 1) {
+					each_blocks[i].u();
+					each_blocks[i].d();
+				}
+				each_blocks.length = each_value.length;
+			}
+		},
+
+		u: function unmount() {
+			for (var i = 0; i < each_blocks.length; i += 1) {
+				each_blocks[i].u();
+			}
+
+			detachNode(each_anchor);
+		},
+
+		d: function destroy$$1() {
+			destroyEach(each_blocks);
+		}
+	};
+}
+
+// (1:0) {#each createElement as node}
+function create_each_block(component, state) {
+	var node = state.node, each_value = state.each_value, node_index = state.node_index;
+	var span, text_value = node, text;
+
+	return {
+		c: function create() {
+			span = createElement("span");
+			text = createText(text_value);
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(span, target, anchor);
+			appendNode(text, span);
+		},
+
+		p: function update(changed, state) {
+			node = state.node;
+			each_value = state.each_value;
+			node_index = state.node_index;
+			if ((changed.createElement) && text_value !== (text_value = node)) {
+				text.data = text_value;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(span);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/deconflict-builtins/expected-bundle-v2.js b/test/js/samples/deconflict-builtins/expected-bundle-v2.js
new file mode 100644
index 000000000000..6680adfdb427
--- /dev/null
+++ b/test/js/samples/deconflict-builtins/expected-bundle-v2.js
@@ -0,0 +1,317 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function appendNode(node, target) {
+	target.appendChild(node);
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function destroyEach(iterations) {
+	for (var i = 0; i < iterations.length; i += 1) {
+		if (iterations[i]) iterations[i].d();
+	}
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function createText(data) {
+	return document.createTextNode(data);
+}
+
+function createComment() {
+	return document.createComment('');
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var each_anchor;
+
+	var each_value = state.createElement;
+
+	var each_blocks = [];
+
+	for (var i = 0; i < each_value.length; i += 1) {
+		each_blocks[i] = create_each_block(component, assign(assign({}, state), {
+			each_value: each_value,
+			node: each_value[i],
+			node_index: i
+		}));
+	}
+
+	return {
+		c: function create() {
+			for (var i = 0; i < each_blocks.length; i += 1) {
+				each_blocks[i].c();
+			}
+
+			each_anchor = createComment();
+		},
+
+		m: function mount(target, anchor) {
+			for (var i = 0; i < each_blocks.length; i += 1) {
+				each_blocks[i].m(target, anchor);
+			}
+
+			insertNode(each_anchor, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			var each_value = state.createElement;
+
+			if (changed.createElement) {
+				for (var i = 0; i < each_value.length; i += 1) {
+					var each_context = assign(assign({}, state), {
+						each_value: each_value,
+						node: each_value[i],
+						node_index: i
+					});
+
+					if (each_blocks[i]) {
+						each_blocks[i].p(changed, each_context);
+					} else {
+						each_blocks[i] = create_each_block(component, each_context);
+						each_blocks[i].c();
+						each_blocks[i].m(each_anchor.parentNode, each_anchor);
+					}
+				}
+
+				for (; i < each_blocks.length; i += 1) {
+					each_blocks[i].u();
+					each_blocks[i].d();
+				}
+				each_blocks.length = each_value.length;
+			}
+		},
+
+		u: function unmount() {
+			for (var i = 0; i < each_blocks.length; i += 1) {
+				each_blocks[i].u();
+			}
+
+			detachNode(each_anchor);
+		},
+
+		d: function destroy$$1() {
+			destroyEach(each_blocks);
+		}
+	};
+}
+
+// (1:0) {#each createElement as node}
+function create_each_block(component, state) {
+	var node = state.node, each_value = state.each_value, node_index = state.node_index;
+	var span, text_value = node, text;
+
+	return {
+		c: function create() {
+			span = createElement("span");
+			text = createText(text_value);
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(span, target, anchor);
+			appendNode(text, span);
+		},
+
+		p: function update(changed, state) {
+			node = state.node;
+			each_value = state.each_value;
+			node_index = state.node_index;
+			if ((changed.createElement) && text_value !== (text_value = node)) {
+				text.data = text_value;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(span);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/deconflict-builtins/expected-v2.js b/test/js/samples/deconflict-builtins/expected-v2.js
new file mode 100644
index 000000000000..f6861d255714
--- /dev/null
+++ b/test/js/samples/deconflict-builtins/expected-v2.js
@@ -0,0 +1,124 @@
+/* generated by Svelte vX.Y.Z */
+import { appendNode, assign, createComment, createElement, createText, destroyEach, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
+
+function create_main_fragment(component, state) {
+	var each_anchor;
+
+	var each_value = state.createElement;
+
+	var each_blocks = [];
+
+	for (var i = 0; i < each_value.length; i += 1) {
+		each_blocks[i] = create_each_block(component, assign(assign({}, state), {
+			each_value: each_value,
+			node: each_value[i],
+			node_index: i
+		}));
+	}
+
+	return {
+		c: function create() {
+			for (var i = 0; i < each_blocks.length; i += 1) {
+				each_blocks[i].c();
+			}
+
+			each_anchor = createComment();
+		},
+
+		m: function mount(target, anchor) {
+			for (var i = 0; i < each_blocks.length; i += 1) {
+				each_blocks[i].m(target, anchor);
+			}
+
+			insertNode(each_anchor, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			var each_value = state.createElement;
+
+			if (changed.createElement) {
+				for (var i = 0; i < each_value.length; i += 1) {
+					var each_context = assign(assign({}, state), {
+						each_value: each_value,
+						node: each_value[i],
+						node_index: i
+					});
+
+					if (each_blocks[i]) {
+						each_blocks[i].p(changed, each_context);
+					} else {
+						each_blocks[i] = create_each_block(component, each_context);
+						each_blocks[i].c();
+						each_blocks[i].m(each_anchor.parentNode, each_anchor);
+					}
+				}
+
+				for (; i < each_blocks.length; i += 1) {
+					each_blocks[i].u();
+					each_blocks[i].d();
+				}
+				each_blocks.length = each_value.length;
+			}
+		},
+
+		u: function unmount() {
+			for (var i = 0; i < each_blocks.length; i += 1) {
+				each_blocks[i].u();
+			}
+
+			detachNode(each_anchor);
+		},
+
+		d: function destroy() {
+			destroyEach(each_blocks);
+		}
+	};
+}
+
+// (1:0) {#each createElement as node}
+function create_each_block(component, state) {
+	var node = state.node, each_value = state.each_value, node_index = state.node_index;
+	var span, text_value = node, text;
+
+	return {
+		c: function create() {
+			span = createElement("span");
+			text = createText(text_value);
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(span, target, anchor);
+			appendNode(text, span);
+		},
+
+		p: function update(changed, state) {
+			node = state.node;
+			each_value = state.each_value;
+			node_index = state.node_index;
+			if ((changed.createElement) && text_value !== (text_value = node)) {
+				text.data = text_value;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(span);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/deconflict-builtins/input-v2.html b/test/js/samples/deconflict-builtins/input-v2.html
new file mode 100644
index 000000000000..48a413b32353
--- /dev/null
+++ b/test/js/samples/deconflict-builtins/input-v2.html
@@ -0,0 +1,3 @@
+{#each createElement as node}
+	<span>{node}</span>
+{/each}
\ No newline at end of file
diff --git a/test/js/samples/dev-warning-missing-data-computed/_actual-bundle-v2.js b/test/js/samples/dev-warning-missing-data-computed/_actual-bundle-v2.js
new file mode 100644
index 000000000000..84a148c901d5
--- /dev/null
+++ b/test/js/samples/dev-warning-missing-data-computed/_actual-bundle-v2.js
@@ -0,0 +1,298 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+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 blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function destroyDev(detach) {
+	destroy.call(this, detach);
+	this.destroy = function() {
+		console.warn('Component was already destroyed');
+	};
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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 observeDev(key, callback, options) {
+	var c = (key = '' + key).search(/[.[]/);
+	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);
+	}
+
+	return observe.call(this, key, callback, options);
+}
+
+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 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);
+}
+
+function set(newState) {
+	this._set(assign({}, newState));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function setDev(newState) {
+	if (typeof newState !== 'object') {
+		throw new Error(
+			this._debugName + '.set was called without an object of data key-values to update.'
+		);
+	}
+
+	this._checkReadOnly(newState);
+	set.call(this, newState);
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var protoDev = {
+	destroy: destroyDev,
+	get: get,
+	fire: fire,
+	observe: observeDev,
+	on: onDev,
+	set: setDev,
+	teardown: destroyDev,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function bar(foo) {
+	return foo * 2;
+}
+
+function create_main_fragment(component, state) {
+	var p, text_value = state.Math.max(0, state.foo), text, text_1, text_2;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			text = createText(text_value);
+			text_1 = createText("\n\t");
+			text_2 = createText(state.bar);
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+			appendNode(text, p);
+			appendNode(text_1, p);
+			appendNode(text_2, p);
+		},
+
+		p: function update(changed, state) {
+			if ((changed.Math || changed.foo) && text_value !== (text_value = state.Math.max(0, state.foo))) {
+				text.data = text_value;
+			}
+
+			if (changed.bar) {
+				text_2.data = state.bar;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	this._debugName = '<SvelteComponent>';
+	if (!options || (!options.target && !options.root)) throw new Error("'target' is a required option");
+	init(this, options);
+	this._state = assign({ Math : Math }, options.data);
+	this._recompute({ foo: 1 }, this._state);
+	if (!('foo' in this._state)) console.warn("<SvelteComponent> was created without expected data property 'foo'");
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		if (options.hydrate) throw new Error("options.hydrate only works if the component was compiled with the `hydratable: true` option");
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, protoDev);
+
+SvelteComponent.prototype._checkReadOnly = function _checkReadOnly(newState) {
+	if ('bar' in newState && !this._updatingReadonlyProperty) throw new Error("<SvelteComponent>: Cannot set read-only property 'bar'");
+};
+
+SvelteComponent.prototype._recompute = function _recompute(changed, state) {
+	if (changed.foo) {
+		if (this._differs(state.bar, (state.bar = bar(state.foo)))) changed.bar = true;
+	}
+};
+
+export default SvelteComponent;
diff --git a/test/js/samples/dev-warning-missing-data-computed/expected-bundle-v2.js b/test/js/samples/dev-warning-missing-data-computed/expected-bundle-v2.js
new file mode 100644
index 000000000000..84a148c901d5
--- /dev/null
+++ b/test/js/samples/dev-warning-missing-data-computed/expected-bundle-v2.js
@@ -0,0 +1,298 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+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 blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function destroyDev(detach) {
+	destroy.call(this, detach);
+	this.destroy = function() {
+		console.warn('Component was already destroyed');
+	};
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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 observeDev(key, callback, options) {
+	var c = (key = '' + key).search(/[.[]/);
+	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);
+	}
+
+	return observe.call(this, key, callback, options);
+}
+
+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 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);
+}
+
+function set(newState) {
+	this._set(assign({}, newState));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function setDev(newState) {
+	if (typeof newState !== 'object') {
+		throw new Error(
+			this._debugName + '.set was called without an object of data key-values to update.'
+		);
+	}
+
+	this._checkReadOnly(newState);
+	set.call(this, newState);
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var protoDev = {
+	destroy: destroyDev,
+	get: get,
+	fire: fire,
+	observe: observeDev,
+	on: onDev,
+	set: setDev,
+	teardown: destroyDev,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function bar(foo) {
+	return foo * 2;
+}
+
+function create_main_fragment(component, state) {
+	var p, text_value = state.Math.max(0, state.foo), text, text_1, text_2;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			text = createText(text_value);
+			text_1 = createText("\n\t");
+			text_2 = createText(state.bar);
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+			appendNode(text, p);
+			appendNode(text_1, p);
+			appendNode(text_2, p);
+		},
+
+		p: function update(changed, state) {
+			if ((changed.Math || changed.foo) && text_value !== (text_value = state.Math.max(0, state.foo))) {
+				text.data = text_value;
+			}
+
+			if (changed.bar) {
+				text_2.data = state.bar;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	this._debugName = '<SvelteComponent>';
+	if (!options || (!options.target && !options.root)) throw new Error("'target' is a required option");
+	init(this, options);
+	this._state = assign({ Math : Math }, options.data);
+	this._recompute({ foo: 1 }, this._state);
+	if (!('foo' in this._state)) console.warn("<SvelteComponent> was created without expected data property 'foo'");
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		if (options.hydrate) throw new Error("options.hydrate only works if the component was compiled with the `hydratable: true` option");
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, protoDev);
+
+SvelteComponent.prototype._checkReadOnly = function _checkReadOnly(newState) {
+	if ('bar' in newState && !this._updatingReadonlyProperty) throw new Error("<SvelteComponent>: Cannot set read-only property 'bar'");
+};
+
+SvelteComponent.prototype._recompute = function _recompute(changed, state) {
+	if (changed.foo) {
+		if (this._differs(state.bar, (state.bar = bar(state.foo)))) changed.bar = true;
+	}
+};
+
+export default SvelteComponent;
diff --git a/test/js/samples/dev-warning-missing-data-computed/expected-v2.js b/test/js/samples/dev-warning-missing-data-computed/expected-v2.js
new file mode 100644
index 000000000000..edf4331457b6
--- /dev/null
+++ b/test/js/samples/dev-warning-missing-data-computed/expected-v2.js
@@ -0,0 +1,72 @@
+/* generated by Svelte vX.Y.Z */
+import { appendNode, assign, createElement, createText, detachNode, init, insertNode, noop, protoDev } from "svelte/shared.js";
+
+function bar(foo) {
+	return foo * 2;
+}
+
+function create_main_fragment(component, state) {
+	var p, text_value = state.Math.max(0, state.foo), text, text_1, text_2;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			text = createText(text_value);
+			text_1 = createText("\n\t");
+			text_2 = createText(state.bar);
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+			appendNode(text, p);
+			appendNode(text_1, p);
+			appendNode(text_2, p);
+		},
+
+		p: function update(changed, state) {
+			if ((changed.Math || changed.foo) && text_value !== (text_value = state.Math.max(0, state.foo))) {
+				text.data = text_value;
+			}
+
+			if (changed.bar) {
+				text_2.data = state.bar;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	this._debugName = '<SvelteComponent>';
+	if (!options || (!options.target && !options.root)) throw new Error("'target' is a required option");
+	init(this, options);
+	this._state = assign({ Math : Math }, options.data);
+	this._recompute({ foo: 1 }, this._state);
+	if (!('foo' in this._state)) console.warn("<SvelteComponent> was created without expected data property 'foo'");
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		if (options.hydrate) throw new Error("options.hydrate only works if the component was compiled with the `hydratable: true` option");
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, protoDev);
+
+SvelteComponent.prototype._checkReadOnly = function _checkReadOnly(newState) {
+	if ('bar' in newState && !this._updatingReadonlyProperty) throw new Error("<SvelteComponent>: Cannot set read-only property 'bar'");
+};
+
+SvelteComponent.prototype._recompute = function _recompute(changed, state) {
+	if (changed.foo) {
+		if (this._differs(state.bar, (state.bar = bar(state.foo)))) changed.bar = true;
+	}
+}
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/dev-warning-missing-data-computed/input-v2.html b/test/js/samples/dev-warning-missing-data-computed/input-v2.html
new file mode 100644
index 000000000000..3fbf45860e7a
--- /dev/null
+++ b/test/js/samples/dev-warning-missing-data-computed/input-v2.html
@@ -0,0 +1,12 @@
+<p>
+	{Math.max(0, foo)}
+	{bar}
+</p>
+
+<script>
+	export default {
+		computed: {
+			bar: foo => foo * 2
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/js/samples/do-use-dataset/_actual-bundle-v2.js b/test/js/samples/do-use-dataset/_actual-bundle-v2.js
new file mode 100644
index 000000000000..883194110d60
--- /dev/null
+++ b/test/js/samples/do-use-dataset/_actual-bundle-v2.js
@@ -0,0 +1,234 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+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 blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var div, text, div_1;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			text = createText("\n");
+			div_1 = createElement("div");
+			this.h();
+		},
+
+		h: function hydrate() {
+			div.dataset.foo = "bar";
+			div_1.dataset.foo = state.bar;
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+			insertNode(text, target, anchor);
+			insertNode(div_1, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (changed.bar) {
+				div_1.dataset.foo = state.bar;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+			detachNode(text);
+			detachNode(div_1);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/do-use-dataset/expected-bundle-v2.js b/test/js/samples/do-use-dataset/expected-bundle-v2.js
new file mode 100644
index 000000000000..883194110d60
--- /dev/null
+++ b/test/js/samples/do-use-dataset/expected-bundle-v2.js
@@ -0,0 +1,234 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+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 blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var div, text, div_1;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			text = createText("\n");
+			div_1 = createElement("div");
+			this.h();
+		},
+
+		h: function hydrate() {
+			div.dataset.foo = "bar";
+			div_1.dataset.foo = state.bar;
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+			insertNode(text, target, anchor);
+			insertNode(div_1, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (changed.bar) {
+				div_1.dataset.foo = state.bar;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+			detachNode(text);
+			detachNode(div_1);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/do-use-dataset/expected-v2.js b/test/js/samples/do-use-dataset/expected-v2.js
new file mode 100644
index 000000000000..b88636a606d5
--- /dev/null
+++ b/test/js/samples/do-use-dataset/expected-v2.js
@@ -0,0 +1,55 @@
+/* generated by Svelte vX.Y.Z */
+import { assign, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
+
+function create_main_fragment(component, state) {
+	var div, text, div_1;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			text = createText("\n");
+			div_1 = createElement("div");
+			this.h();
+		},
+
+		h: function hydrate() {
+			div.dataset.foo = "bar";
+			div_1.dataset.foo = state.bar;
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+			insertNode(text, target, anchor);
+			insertNode(div_1, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (changed.bar) {
+				div_1.dataset.foo = state.bar;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+			detachNode(text);
+			detachNode(div_1);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/do-use-dataset/input-v2.html b/test/js/samples/do-use-dataset/input-v2.html
new file mode 100644
index 000000000000..fcd821731e49
--- /dev/null
+++ b/test/js/samples/do-use-dataset/input-v2.html
@@ -0,0 +1,2 @@
+<div data-foo='bar'/>
+<div data-foo='{bar}'/>
diff --git a/test/js/samples/dont-use-dataset-in-legacy/_actual-bundle-v2.js b/test/js/samples/dont-use-dataset-in-legacy/_actual-bundle-v2.js
new file mode 100644
index 000000000000..1e231ec05680
--- /dev/null
+++ b/test/js/samples/dont-use-dataset-in-legacy/_actual-bundle-v2.js
@@ -0,0 +1,238 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+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 blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var div, text, div_1;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			text = createText("\n");
+			div_1 = createElement("div");
+			this.h();
+		},
+
+		h: function hydrate() {
+			setAttribute(div, "data-foo", "bar");
+			setAttribute(div_1, "data-foo", state.bar);
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+			insertNode(text, target, anchor);
+			insertNode(div_1, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (changed.bar) {
+				setAttribute(div_1, "data-foo", state.bar);
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+			detachNode(text);
+			detachNode(div_1);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/dont-use-dataset-in-legacy/expected-bundle-v2.js b/test/js/samples/dont-use-dataset-in-legacy/expected-bundle-v2.js
new file mode 100644
index 000000000000..1e231ec05680
--- /dev/null
+++ b/test/js/samples/dont-use-dataset-in-legacy/expected-bundle-v2.js
@@ -0,0 +1,238 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+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 blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var div, text, div_1;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			text = createText("\n");
+			div_1 = createElement("div");
+			this.h();
+		},
+
+		h: function hydrate() {
+			setAttribute(div, "data-foo", "bar");
+			setAttribute(div_1, "data-foo", state.bar);
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+			insertNode(text, target, anchor);
+			insertNode(div_1, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (changed.bar) {
+				setAttribute(div_1, "data-foo", state.bar);
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+			detachNode(text);
+			detachNode(div_1);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/dont-use-dataset-in-legacy/expected-v2.js b/test/js/samples/dont-use-dataset-in-legacy/expected-v2.js
new file mode 100644
index 000000000000..699da1270b87
--- /dev/null
+++ b/test/js/samples/dont-use-dataset-in-legacy/expected-v2.js
@@ -0,0 +1,55 @@
+/* generated by Svelte vX.Y.Z */
+import { assign, createElement, createText, detachNode, init, insertNode, noop, proto, setAttribute } from "svelte/shared.js";
+
+function create_main_fragment(component, state) {
+	var div, text, div_1;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			text = createText("\n");
+			div_1 = createElement("div");
+			this.h();
+		},
+
+		h: function hydrate() {
+			setAttribute(div, "data-foo", "bar");
+			setAttribute(div_1, "data-foo", state.bar);
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+			insertNode(text, target, anchor);
+			insertNode(div_1, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (changed.bar) {
+				setAttribute(div_1, "data-foo", state.bar);
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+			detachNode(text);
+			detachNode(div_1);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/dont-use-dataset-in-legacy/input-v2.html b/test/js/samples/dont-use-dataset-in-legacy/input-v2.html
new file mode 100644
index 000000000000..fcd821731e49
--- /dev/null
+++ b/test/js/samples/dont-use-dataset-in-legacy/input-v2.html
@@ -0,0 +1,2 @@
+<div data-foo='bar'/>
+<div data-foo='{bar}'/>
diff --git a/test/js/samples/dont-use-dataset-in-svg/_actual-bundle-v2.js b/test/js/samples/dont-use-dataset-in-svg/_actual-bundle-v2.js
new file mode 100644
index 000000000000..0b60ba22e2e4
--- /dev/null
+++ b/test/js/samples/dont-use-dataset-in-svg/_actual-bundle-v2.js
@@ -0,0 +1,236 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function appendNode(node, target) {
+	target.appendChild(node);
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createSvgElement(name) {
+	return document.createElementNS('http://www.w3.org/2000/svg', name);
+}
+
+function setAttribute(node, attribute, value) {
+	node.setAttribute(attribute, value);
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var svg, g, g_1;
+
+	return {
+		c: function create() {
+			svg = createSvgElement("svg");
+			g = createSvgElement("g");
+			g_1 = createSvgElement("g");
+			this.h();
+		},
+
+		h: function hydrate() {
+			setAttribute(g, "data-foo", "bar");
+			setAttribute(g_1, "data-foo", state.bar);
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(svg, target, anchor);
+			appendNode(g, svg);
+			appendNode(g_1, svg);
+		},
+
+		p: function update(changed, state) {
+			if (changed.bar) {
+				setAttribute(g_1, "data-foo", state.bar);
+			}
+		},
+
+		u: function unmount() {
+			detachNode(svg);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/dont-use-dataset-in-svg/expected-bundle-v2.js b/test/js/samples/dont-use-dataset-in-svg/expected-bundle-v2.js
new file mode 100644
index 000000000000..0b60ba22e2e4
--- /dev/null
+++ b/test/js/samples/dont-use-dataset-in-svg/expected-bundle-v2.js
@@ -0,0 +1,236 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function appendNode(node, target) {
+	target.appendChild(node);
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createSvgElement(name) {
+	return document.createElementNS('http://www.w3.org/2000/svg', name);
+}
+
+function setAttribute(node, attribute, value) {
+	node.setAttribute(attribute, value);
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var svg, g, g_1;
+
+	return {
+		c: function create() {
+			svg = createSvgElement("svg");
+			g = createSvgElement("g");
+			g_1 = createSvgElement("g");
+			this.h();
+		},
+
+		h: function hydrate() {
+			setAttribute(g, "data-foo", "bar");
+			setAttribute(g_1, "data-foo", state.bar);
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(svg, target, anchor);
+			appendNode(g, svg);
+			appendNode(g_1, svg);
+		},
+
+		p: function update(changed, state) {
+			if (changed.bar) {
+				setAttribute(g_1, "data-foo", state.bar);
+			}
+		},
+
+		u: function unmount() {
+			detachNode(svg);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/dont-use-dataset-in-svg/expected-v2.js b/test/js/samples/dont-use-dataset-in-svg/expected-v2.js
new file mode 100644
index 000000000000..42693672549b
--- /dev/null
+++ b/test/js/samples/dont-use-dataset-in-svg/expected-v2.js
@@ -0,0 +1,53 @@
+/* generated by Svelte vX.Y.Z */
+import { appendNode, assign, createSvgElement, detachNode, init, insertNode, noop, proto, setAttribute } from "svelte/shared.js";
+
+function create_main_fragment(component, state) {
+	var svg, g, g_1;
+
+	return {
+		c: function create() {
+			svg = createSvgElement("svg");
+			g = createSvgElement("g");
+			g_1 = createSvgElement("g");
+			this.h();
+		},
+
+		h: function hydrate() {
+			setAttribute(g, "data-foo", "bar");
+			setAttribute(g_1, "data-foo", state.bar);
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(svg, target, anchor);
+			appendNode(g, svg);
+			appendNode(g_1, svg);
+		},
+
+		p: function update(changed, state) {
+			if (changed.bar) {
+				setAttribute(g_1, "data-foo", state.bar);
+			}
+		},
+
+		u: function unmount() {
+			detachNode(svg);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/dont-use-dataset-in-svg/input-v2.html b/test/js/samples/dont-use-dataset-in-svg/input-v2.html
new file mode 100644
index 000000000000..3032322b8010
--- /dev/null
+++ b/test/js/samples/dont-use-dataset-in-svg/input-v2.html
@@ -0,0 +1,4 @@
+<svg>
+	<g data-foo='bar'/>
+	<g data-foo='{bar}'/>
+</svg>
diff --git a/test/js/samples/each-block-changed-check/_actual-bundle-v2.js b/test/js/samples/each-block-changed-check/_actual-bundle-v2.js
new file mode 100644
index 000000000000..1ce468ca12c1
--- /dev/null
+++ b/test/js/samples/each-block-changed-check/_actual-bundle-v2.js
@@ -0,0 +1,364 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function appendNode(node, target) {
+	target.appendChild(node);
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function detachAfter(before) {
+	while (before.nextSibling) {
+		before.parentNode.removeChild(before.nextSibling);
+	}
+}
+
+function destroyEach(iterations) {
+	for (var i = 0; i < iterations.length; i += 1) {
+		if (iterations[i]) iterations[i].d();
+	}
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function createText(data) {
+	return document.createTextNode(data);
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var text, p, text_1;
+
+	var each_value = state.comments;
+
+	var each_blocks = [];
+
+	for (var i = 0; i < each_value.length; i += 1) {
+		each_blocks[i] = create_each_block(component, assign(assign({}, state), {
+			each_value: each_value,
+			comment: each_value[i],
+			i: i
+		}));
+	}
+
+	return {
+		c: function create() {
+			for (var i = 0; i < each_blocks.length; i += 1) {
+				each_blocks[i].c();
+			}
+
+			text = createText("\n\n");
+			p = createElement("p");
+			text_1 = createText(state.foo);
+		},
+
+		m: function mount(target, anchor) {
+			for (var i = 0; i < each_blocks.length; i += 1) {
+				each_blocks[i].m(target, anchor);
+			}
+
+			insertNode(text, target, anchor);
+			insertNode(p, target, anchor);
+			appendNode(text_1, p);
+		},
+
+		p: function update(changed, state) {
+			var each_value = state.comments;
+
+			if (changed.comments || changed.elapsed || changed.time) {
+				for (var i = 0; i < each_value.length; i += 1) {
+					var each_context = assign(assign({}, state), {
+						each_value: each_value,
+						comment: each_value[i],
+						i: i
+					});
+
+					if (each_blocks[i]) {
+						each_blocks[i].p(changed, each_context);
+					} else {
+						each_blocks[i] = create_each_block(component, each_context);
+						each_blocks[i].c();
+						each_blocks[i].m(text.parentNode, text);
+					}
+				}
+
+				for (; i < each_blocks.length; i += 1) {
+					each_blocks[i].u();
+					each_blocks[i].d();
+				}
+				each_blocks.length = each_value.length;
+			}
+
+			if (changed.foo) {
+				text_1.data = state.foo;
+			}
+		},
+
+		u: function unmount() {
+			for (var i = 0; i < each_blocks.length; i += 1) {
+				each_blocks[i].u();
+			}
+
+			detachNode(text);
+			detachNode(p);
+		},
+
+		d: function destroy$$1() {
+			destroyEach(each_blocks);
+		}
+	};
+}
+
+// (1:0) {#each comments as comment, i}
+function create_each_block(component, state) {
+	var comment = state.comment, each_value = state.each_value, i = state.i;
+	var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			strong = createElement("strong");
+			text = createText(i);
+			text_1 = createText("\n\n\t\t");
+			span = createElement("span");
+			text_2 = createText(text_2_value);
+			text_3 = createText(" wrote ");
+			text_4 = createText(text_4_value);
+			text_5 = createText(" ago:");
+			text_6 = createText("\n\n\t\t");
+			raw_before = createElement('noscript');
+			this.h();
+		},
+
+		h: function hydrate() {
+			span.className = "meta";
+			div.className = "comment";
+		},
+
+		m: function mount(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);
+			raw_before.insertAdjacentHTML("afterend", raw_value);
+		},
+
+		p: function update(changed, state) {
+			comment = state.comment;
+			each_value = state.each_value;
+			i = state.i;
+			if ((changed.comments) && text_2_value !== (text_2_value = comment.author)) {
+				text_2.data = text_2_value;
+			}
+
+			if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(comment.time, state.time))) {
+				text_4.data = text_4_value;
+			}
+
+			if ((changed.comments) && raw_value !== (raw_value = comment.html)) {
+				detachAfter(raw_before);
+				raw_before.insertAdjacentHTML("afterend", raw_value);
+			}
+		},
+
+		u: function unmount() {
+			detachAfter(raw_before);
+
+			detachNode(div);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/each-block-changed-check/expected-bundle-v2.js b/test/js/samples/each-block-changed-check/expected-bundle-v2.js
new file mode 100644
index 000000000000..1ce468ca12c1
--- /dev/null
+++ b/test/js/samples/each-block-changed-check/expected-bundle-v2.js
@@ -0,0 +1,364 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function appendNode(node, target) {
+	target.appendChild(node);
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function detachAfter(before) {
+	while (before.nextSibling) {
+		before.parentNode.removeChild(before.nextSibling);
+	}
+}
+
+function destroyEach(iterations) {
+	for (var i = 0; i < iterations.length; i += 1) {
+		if (iterations[i]) iterations[i].d();
+	}
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function createText(data) {
+	return document.createTextNode(data);
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var text, p, text_1;
+
+	var each_value = state.comments;
+
+	var each_blocks = [];
+
+	for (var i = 0; i < each_value.length; i += 1) {
+		each_blocks[i] = create_each_block(component, assign(assign({}, state), {
+			each_value: each_value,
+			comment: each_value[i],
+			i: i
+		}));
+	}
+
+	return {
+		c: function create() {
+			for (var i = 0; i < each_blocks.length; i += 1) {
+				each_blocks[i].c();
+			}
+
+			text = createText("\n\n");
+			p = createElement("p");
+			text_1 = createText(state.foo);
+		},
+
+		m: function mount(target, anchor) {
+			for (var i = 0; i < each_blocks.length; i += 1) {
+				each_blocks[i].m(target, anchor);
+			}
+
+			insertNode(text, target, anchor);
+			insertNode(p, target, anchor);
+			appendNode(text_1, p);
+		},
+
+		p: function update(changed, state) {
+			var each_value = state.comments;
+
+			if (changed.comments || changed.elapsed || changed.time) {
+				for (var i = 0; i < each_value.length; i += 1) {
+					var each_context = assign(assign({}, state), {
+						each_value: each_value,
+						comment: each_value[i],
+						i: i
+					});
+
+					if (each_blocks[i]) {
+						each_blocks[i].p(changed, each_context);
+					} else {
+						each_blocks[i] = create_each_block(component, each_context);
+						each_blocks[i].c();
+						each_blocks[i].m(text.parentNode, text);
+					}
+				}
+
+				for (; i < each_blocks.length; i += 1) {
+					each_blocks[i].u();
+					each_blocks[i].d();
+				}
+				each_blocks.length = each_value.length;
+			}
+
+			if (changed.foo) {
+				text_1.data = state.foo;
+			}
+		},
+
+		u: function unmount() {
+			for (var i = 0; i < each_blocks.length; i += 1) {
+				each_blocks[i].u();
+			}
+
+			detachNode(text);
+			detachNode(p);
+		},
+
+		d: function destroy$$1() {
+			destroyEach(each_blocks);
+		}
+	};
+}
+
+// (1:0) {#each comments as comment, i}
+function create_each_block(component, state) {
+	var comment = state.comment, each_value = state.each_value, i = state.i;
+	var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			strong = createElement("strong");
+			text = createText(i);
+			text_1 = createText("\n\n\t\t");
+			span = createElement("span");
+			text_2 = createText(text_2_value);
+			text_3 = createText(" wrote ");
+			text_4 = createText(text_4_value);
+			text_5 = createText(" ago:");
+			text_6 = createText("\n\n\t\t");
+			raw_before = createElement('noscript');
+			this.h();
+		},
+
+		h: function hydrate() {
+			span.className = "meta";
+			div.className = "comment";
+		},
+
+		m: function mount(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);
+			raw_before.insertAdjacentHTML("afterend", raw_value);
+		},
+
+		p: function update(changed, state) {
+			comment = state.comment;
+			each_value = state.each_value;
+			i = state.i;
+			if ((changed.comments) && text_2_value !== (text_2_value = comment.author)) {
+				text_2.data = text_2_value;
+			}
+
+			if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(comment.time, state.time))) {
+				text_4.data = text_4_value;
+			}
+
+			if ((changed.comments) && raw_value !== (raw_value = comment.html)) {
+				detachAfter(raw_before);
+				raw_before.insertAdjacentHTML("afterend", raw_value);
+			}
+		},
+
+		u: function unmount() {
+			detachAfter(raw_before);
+
+			detachNode(div);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/each-block-changed-check/expected-v2.js b/test/js/samples/each-block-changed-check/expected-v2.js
new file mode 100644
index 000000000000..e7e0ccca306f
--- /dev/null
+++ b/test/js/samples/each-block-changed-check/expected-v2.js
@@ -0,0 +1,169 @@
+/* generated by Svelte vX.Y.Z */
+import { appendNode, assign, createElement, createText, destroyEach, detachAfter, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
+
+function create_main_fragment(component, state) {
+	var text, p, text_1;
+
+	var each_value = state.comments;
+
+	var each_blocks = [];
+
+	for (var i = 0; i < each_value.length; i += 1) {
+		each_blocks[i] = create_each_block(component, assign(assign({}, state), {
+			each_value: each_value,
+			comment: each_value[i],
+			i: i
+		}));
+	}
+
+	return {
+		c: function create() {
+			for (var i = 0; i < each_blocks.length; i += 1) {
+				each_blocks[i].c();
+			}
+
+			text = createText("\n\n");
+			p = createElement("p");
+			text_1 = createText(state.foo);
+		},
+
+		m: function mount(target, anchor) {
+			for (var i = 0; i < each_blocks.length; i += 1) {
+				each_blocks[i].m(target, anchor);
+			}
+
+			insertNode(text, target, anchor);
+			insertNode(p, target, anchor);
+			appendNode(text_1, p);
+		},
+
+		p: function update(changed, state) {
+			var each_value = state.comments;
+
+			if (changed.comments || changed.elapsed || changed.time) {
+				for (var i = 0; i < each_value.length; i += 1) {
+					var each_context = assign(assign({}, state), {
+						each_value: each_value,
+						comment: each_value[i],
+						i: i
+					});
+
+					if (each_blocks[i]) {
+						each_blocks[i].p(changed, each_context);
+					} else {
+						each_blocks[i] = create_each_block(component, each_context);
+						each_blocks[i].c();
+						each_blocks[i].m(text.parentNode, text);
+					}
+				}
+
+				for (; i < each_blocks.length; i += 1) {
+					each_blocks[i].u();
+					each_blocks[i].d();
+				}
+				each_blocks.length = each_value.length;
+			}
+
+			if (changed.foo) {
+				text_1.data = state.foo;
+			}
+		},
+
+		u: function unmount() {
+			for (var i = 0; i < each_blocks.length; i += 1) {
+				each_blocks[i].u();
+			}
+
+			detachNode(text);
+			detachNode(p);
+		},
+
+		d: function destroy() {
+			destroyEach(each_blocks);
+		}
+	};
+}
+
+// (1:0) {#each comments as comment, i}
+function create_each_block(component, state) {
+	var comment = state.comment, each_value = state.each_value, i = state.i;
+	var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			strong = createElement("strong");
+			text = createText(i);
+			text_1 = createText("\n\n\t\t");
+			span = createElement("span");
+			text_2 = createText(text_2_value);
+			text_3 = createText(" wrote ");
+			text_4 = createText(text_4_value);
+			text_5 = createText(" ago:");
+			text_6 = createText("\n\n\t\t");
+			raw_before = createElement('noscript');
+			this.h();
+		},
+
+		h: function hydrate() {
+			span.className = "meta";
+			div.className = "comment";
+		},
+
+		m: function mount(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);
+			raw_before.insertAdjacentHTML("afterend", raw_value);
+		},
+
+		p: function update(changed, state) {
+			comment = state.comment;
+			each_value = state.each_value;
+			i = state.i;
+			if ((changed.comments) && text_2_value !== (text_2_value = comment.author)) {
+				text_2.data = text_2_value;
+			}
+
+			if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(comment.time, state.time))) {
+				text_4.data = text_4_value;
+			}
+
+			if ((changed.comments) && raw_value !== (raw_value = comment.html)) {
+				detachAfter(raw_before);
+				raw_before.insertAdjacentHTML("afterend", raw_value);
+			}
+		},
+
+		u: function unmount() {
+			detachAfter(raw_before);
+
+			detachNode(div);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/each-block-changed-check/input-v2.html b/test/js/samples/each-block-changed-check/input-v2.html
new file mode 100644
index 000000000000..b5b5703857c4
--- /dev/null
+++ b/test/js/samples/each-block-changed-check/input-v2.html
@@ -0,0 +1,13 @@
+{#each comments as comment, i}
+	<div class='comment'>
+		<strong>{i}</strong>
+
+		<span class='meta'>
+			{comment.author} wrote {elapsed(comment.time, time)} ago:
+		</span>
+
+		{@html comment.html}
+	</div>
+{/each}
+
+<p>{foo}</p>
\ No newline at end of file
diff --git a/test/js/samples/head-no-whitespace/_actual-bundle-v2.js b/test/js/samples/head-no-whitespace/_actual-bundle-v2.js
new file mode 100644
index 000000000000..396cf8fb8c55
--- /dev/null
+++ b/test/js/samples/head-no-whitespace/_actual-bundle-v2.js
@@ -0,0 +1,225 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function appendNode(node, target) {
+	target.appendChild(node);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var meta, meta_1;
+
+	return {
+		c: function create() {
+			meta = createElement("meta");
+			meta_1 = createElement("meta");
+			this.h();
+		},
+
+		h: function hydrate() {
+			meta.name = "twitter:creator";
+			meta.content = "@sveltejs";
+			meta_1.name = "twitter:title";
+			meta_1.content = "Svelte";
+		},
+
+		m: function mount(target, anchor) {
+			appendNode(meta, document.head);
+			appendNode(meta_1, document.head);
+		},
+
+		p: noop,
+
+		u: function unmount() {
+			detachNode(meta);
+			detachNode(meta_1);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/head-no-whitespace/expected-bundle-v2.js b/test/js/samples/head-no-whitespace/expected-bundle-v2.js
new file mode 100644
index 000000000000..396cf8fb8c55
--- /dev/null
+++ b/test/js/samples/head-no-whitespace/expected-bundle-v2.js
@@ -0,0 +1,225 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function appendNode(node, target) {
+	target.appendChild(node);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var meta, meta_1;
+
+	return {
+		c: function create() {
+			meta = createElement("meta");
+			meta_1 = createElement("meta");
+			this.h();
+		},
+
+		h: function hydrate() {
+			meta.name = "twitter:creator";
+			meta.content = "@sveltejs";
+			meta_1.name = "twitter:title";
+			meta_1.content = "Svelte";
+		},
+
+		m: function mount(target, anchor) {
+			appendNode(meta, document.head);
+			appendNode(meta_1, document.head);
+		},
+
+		p: noop,
+
+		u: function unmount() {
+			detachNode(meta);
+			detachNode(meta_1);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/head-no-whitespace/expected-v2.js b/test/js/samples/head-no-whitespace/expected-v2.js
new file mode 100644
index 000000000000..9818f4211658
--- /dev/null
+++ b/test/js/samples/head-no-whitespace/expected-v2.js
@@ -0,0 +1,50 @@
+/* generated by Svelte vX.Y.Z */
+import { appendNode, assign, createElement, detachNode, init, noop, proto } from "svelte/shared.js";
+
+function create_main_fragment(component, state) {
+	var meta, meta_1;
+
+	return {
+		c: function create() {
+			meta = createElement("meta");
+			meta_1 = createElement("meta");
+			this.h();
+		},
+
+		h: function hydrate() {
+			meta.name = "twitter:creator";
+			meta.content = "@sveltejs";
+			meta_1.name = "twitter:title";
+			meta_1.content = "Svelte";
+		},
+
+		m: function mount(target, anchor) {
+			appendNode(meta, document.head);
+			appendNode(meta_1, document.head);
+		},
+
+		p: noop,
+
+		u: function unmount() {
+			detachNode(meta);
+			detachNode(meta_1);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/head-no-whitespace/input-v2.html b/test/js/samples/head-no-whitespace/input-v2.html
new file mode 100644
index 000000000000..000b643abeb6
--- /dev/null
+++ b/test/js/samples/head-no-whitespace/input-v2.html
@@ -0,0 +1,4 @@
+<svelte:head>
+	<meta name='twitter:creator' content='@sveltejs'>
+	<meta name='twitter:title' content='Svelte'>
+</svelte:head>
\ No newline at end of file
diff --git a/test/js/samples/if-block-no-update/_actual-bundle-v2.js b/test/js/samples/if-block-no-update/_actual-bundle-v2.js
new file mode 100644
index 000000000000..7284a91fa7e8
--- /dev/null
+++ b/test/js/samples/if-block-no-update/_actual-bundle-v2.js
@@ -0,0 +1,283 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function createComment() {
+	return document.createComment('');
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var if_block_anchor;
+
+	function select_block_type(state) {
+		if (state.foo) return create_if_block;
+		return create_if_block_1;
+	}
+
+	var current_block_type = select_block_type(state);
+	var if_block = current_block_type(component, state);
+
+	return {
+		c: function create() {
+			if_block.c();
+			if_block_anchor = createComment();
+		},
+
+		m: function mount(target, anchor) {
+			if_block.m(target, anchor);
+			insertNode(if_block_anchor, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (current_block_type !== (current_block_type = select_block_type(state))) {
+				if_block.u();
+				if_block.d();
+				if_block = current_block_type(component, state);
+				if_block.c();
+				if_block.m(if_block_anchor.parentNode, if_block_anchor);
+			}
+		},
+
+		u: function unmount() {
+			if_block.u();
+			detachNode(if_block_anchor);
+		},
+
+		d: function destroy$$1() {
+			if_block.d();
+		}
+	};
+}
+
+// (1:0) {#if foo}
+function create_if_block(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "foo!";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+// (2:12)  {:else}
+function create_if_block_1(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "not foo!";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/if-block-no-update/expected-bundle-v2.js b/test/js/samples/if-block-no-update/expected-bundle-v2.js
new file mode 100644
index 000000000000..59d3e9656b5e
--- /dev/null
+++ b/test/js/samples/if-block-no-update/expected-bundle-v2.js
@@ -0,0 +1,283 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function createComment() {
+	return document.createComment('');
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var if_block_anchor;
+
+	function select_block_type(state) {
+		if (state.foo) return create_if_block;
+		return create_if_block_1;
+	}
+
+	var current_block_type = select_block_type(state);
+	var if_block = current_block_type(component, state);
+
+	return {
+		c: function create() {
+			if_block.c();
+			if_block_anchor = createComment();
+		},
+
+		m: function mount(target, anchor) {
+			if_block.m(target, anchor);
+			insertNode(if_block_anchor, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (current_block_type !== (current_block_type = select_block_type(state))) {
+				if_block.u();
+				if_block.d();
+				if_block = current_block_type(component, state);
+				if_block.c();
+				if_block.m(if_block_anchor.parentNode, if_block_anchor);
+			}
+		},
+
+		u: function unmount() {
+			if_block.u();
+			detachNode(if_block_anchor);
+		},
+
+		d: function destroy$$1() {
+			if_block.d();
+		}
+	};
+}
+
+// (1:0) {{#if foo}}
+function create_if_block(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "foo!";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+// (3:0) {{else}}
+function create_if_block_1(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "not foo!";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/if-block-no-update/expected-v2.js b/test/js/samples/if-block-no-update/expected-v2.js
new file mode 100644
index 000000000000..c06ff6ee679a
--- /dev/null
+++ b/test/js/samples/if-block-no-update/expected-v2.js
@@ -0,0 +1,104 @@
+/* generated by Svelte vX.Y.Z */
+import { assign, createComment, createElement, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
+
+function create_main_fragment(component, state) {
+	var if_block_anchor;
+
+	function select_block_type(state) {
+		if (state.foo) return create_if_block;
+		return create_if_block_1;
+	}
+
+	var current_block_type = select_block_type(state);
+	var if_block = current_block_type(component, state);
+
+	return {
+		c: function create() {
+			if_block.c();
+			if_block_anchor = createComment();
+		},
+
+		m: function mount(target, anchor) {
+			if_block.m(target, anchor);
+			insertNode(if_block_anchor, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (current_block_type !== (current_block_type = select_block_type(state))) {
+				if_block.u();
+				if_block.d();
+				if_block = current_block_type(component, state);
+				if_block.c();
+				if_block.m(if_block_anchor.parentNode, if_block_anchor);
+			}
+		},
+
+		u: function unmount() {
+			if_block.u();
+			detachNode(if_block_anchor);
+		},
+
+		d: function destroy() {
+			if_block.d();
+		}
+	};
+}
+
+// (1:0) {#if foo}
+function create_if_block(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "foo!";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+// (3:0) {:else}
+function create_if_block_1(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "not foo!";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/if-block-no-update/input-v2.html b/test/js/samples/if-block-no-update/input-v2.html
new file mode 100644
index 000000000000..57de21915969
--- /dev/null
+++ b/test/js/samples/if-block-no-update/input-v2.html
@@ -0,0 +1,5 @@
+{#if foo}
+	<p>foo!</p>
+{:else}
+	<p>not foo!</p>
+{/if}
\ No newline at end of file
diff --git a/test/js/samples/if-block-simple/_actual-bundle-v2.js b/test/js/samples/if-block-simple/_actual-bundle-v2.js
new file mode 100644
index 000000000000..72dbdec8897c
--- /dev/null
+++ b/test/js/samples/if-block-simple/_actual-bundle-v2.js
@@ -0,0 +1,259 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function createComment() {
+	return document.createComment('');
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var if_block_anchor;
+
+	var if_block = (state.foo) && create_if_block(component, state);
+
+	return {
+		c: function create() {
+			if (if_block) if_block.c();
+			if_block_anchor = createComment();
+		},
+
+		m: function mount(target, anchor) {
+			if (if_block) if_block.m(target, anchor);
+			insertNode(if_block_anchor, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (state.foo) {
+				if (!if_block) {
+					if_block = create_if_block(component, state);
+					if_block.c();
+					if_block.m(if_block_anchor.parentNode, if_block_anchor);
+				}
+			} else if (if_block) {
+				if_block.u();
+				if_block.d();
+				if_block = null;
+			}
+		},
+
+		u: function unmount() {
+			if (if_block) if_block.u();
+			detachNode(if_block_anchor);
+		},
+
+		d: function destroy$$1() {
+			if (if_block) if_block.d();
+		}
+	};
+}
+
+// (1:0) {#if foo}
+function create_if_block(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "foo!";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/if-block-simple/expected-bundle-v2.js b/test/js/samples/if-block-simple/expected-bundle-v2.js
new file mode 100644
index 000000000000..72dbdec8897c
--- /dev/null
+++ b/test/js/samples/if-block-simple/expected-bundle-v2.js
@@ -0,0 +1,259 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function createComment() {
+	return document.createComment('');
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var if_block_anchor;
+
+	var if_block = (state.foo) && create_if_block(component, state);
+
+	return {
+		c: function create() {
+			if (if_block) if_block.c();
+			if_block_anchor = createComment();
+		},
+
+		m: function mount(target, anchor) {
+			if (if_block) if_block.m(target, anchor);
+			insertNode(if_block_anchor, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (state.foo) {
+				if (!if_block) {
+					if_block = create_if_block(component, state);
+					if_block.c();
+					if_block.m(if_block_anchor.parentNode, if_block_anchor);
+				}
+			} else if (if_block) {
+				if_block.u();
+				if_block.d();
+				if_block = null;
+			}
+		},
+
+		u: function unmount() {
+			if (if_block) if_block.u();
+			detachNode(if_block_anchor);
+		},
+
+		d: function destroy$$1() {
+			if (if_block) if_block.d();
+		}
+	};
+}
+
+// (1:0) {#if foo}
+function create_if_block(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "foo!";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/if-block-simple/expected-v2.js b/test/js/samples/if-block-simple/expected-v2.js
new file mode 100644
index 000000000000..b3447471d31e
--- /dev/null
+++ b/test/js/samples/if-block-simple/expected-v2.js
@@ -0,0 +1,80 @@
+/* generated by Svelte vX.Y.Z */
+import { assign, createComment, createElement, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
+
+function create_main_fragment(component, state) {
+	var if_block_anchor;
+
+	var if_block = (state.foo) && create_if_block(component, state);
+
+	return {
+		c: function create() {
+			if (if_block) if_block.c();
+			if_block_anchor = createComment();
+		},
+
+		m: function mount(target, anchor) {
+			if (if_block) if_block.m(target, anchor);
+			insertNode(if_block_anchor, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (state.foo) {
+				if (!if_block) {
+					if_block = create_if_block(component, state);
+					if_block.c();
+					if_block.m(if_block_anchor.parentNode, if_block_anchor);
+				}
+			} else if (if_block) {
+				if_block.u();
+				if_block.d();
+				if_block = null;
+			}
+		},
+
+		u: function unmount() {
+			if (if_block) if_block.u();
+			detachNode(if_block_anchor);
+		},
+
+		d: function destroy() {
+			if (if_block) if_block.d();
+		}
+	};
+}
+
+// (1:0) {#if foo}
+function create_if_block(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "foo!";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/if-block-simple/input-v2.html b/test/js/samples/if-block-simple/input-v2.html
new file mode 100644
index 000000000000..e36517e10c2d
--- /dev/null
+++ b/test/js/samples/if-block-simple/input-v2.html
@@ -0,0 +1,3 @@
+{#if foo}
+	<p>foo!</p>
+{/if}
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized-multiple/_actual-bundle-v2.js b/test/js/samples/inline-style-optimized-multiple/_actual-bundle-v2.js
new file mode 100644
index 000000000000..eb528e4ebf0d
--- /dev/null
+++ b/test/js/samples/inline-style-optimized-multiple/_actual-bundle-v2.js
@@ -0,0 +1,232 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function setStyle(node, key, value) {
+	node.style.setProperty(key, value);
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var div;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			this.h();
+		},
+
+		h: function hydrate() {
+			setStyle(div, "color", state.color);
+			setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)");
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (changed.color) {
+				setStyle(div, "color", state.color);
+			}
+
+			if (changed.x || changed.y) {
+				setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)");
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/inline-style-optimized-multiple/expected-bundle-v2.js b/test/js/samples/inline-style-optimized-multiple/expected-bundle-v2.js
new file mode 100644
index 000000000000..eb528e4ebf0d
--- /dev/null
+++ b/test/js/samples/inline-style-optimized-multiple/expected-bundle-v2.js
@@ -0,0 +1,232 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function setStyle(node, key, value) {
+	node.style.setProperty(key, value);
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var div;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			this.h();
+		},
+
+		h: function hydrate() {
+			setStyle(div, "color", state.color);
+			setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)");
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (changed.color) {
+				setStyle(div, "color", state.color);
+			}
+
+			if (changed.x || changed.y) {
+				setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)");
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/inline-style-optimized-multiple/expected-v2.js b/test/js/samples/inline-style-optimized-multiple/expected-v2.js
new file mode 100644
index 000000000000..7a94993b690c
--- /dev/null
+++ b/test/js/samples/inline-style-optimized-multiple/expected-v2.js
@@ -0,0 +1,53 @@
+/* generated by Svelte vX.Y.Z */
+import { assign, createElement, detachNode, init, insertNode, noop, proto, setStyle } from "svelte/shared.js";
+
+function create_main_fragment(component, state) {
+	var div;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			this.h();
+		},
+
+		h: function hydrate() {
+			setStyle(div, "color", state.color);
+			setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)");
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (changed.color) {
+				setStyle(div, "color", state.color);
+			}
+
+			if (changed.x || changed.y) {
+				setStyle(div, "transform", "translate(" + state.x + "px," + state.y + "px)");
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized-multiple/input-v2.html b/test/js/samples/inline-style-optimized-multiple/input-v2.html
new file mode 100644
index 000000000000..d9448e0ab06d
--- /dev/null
+++ b/test/js/samples/inline-style-optimized-multiple/input-v2.html
@@ -0,0 +1 @@
+<div style='color: {color}; transform: translate({x}px,{y}px);'></div>
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized-url/_actual-bundle-v2.js b/test/js/samples/inline-style-optimized-url/_actual-bundle-v2.js
new file mode 100644
index 000000000000..a4d2dda6696e
--- /dev/null
+++ b/test/js/samples/inline-style-optimized-url/_actual-bundle-v2.js
@@ -0,0 +1,227 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function setStyle(node, key, value) {
+	node.style.setProperty(key, value);
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var div;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			this.h();
+		},
+
+		h: function hydrate() {
+			setStyle(div, "background", "url(data:image/png;base64," + state.data + ")");
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (changed.data) {
+				setStyle(div, "background", "url(data:image/png;base64," + state.data + ")");
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/inline-style-optimized-url/expected-bundle-v2.js b/test/js/samples/inline-style-optimized-url/expected-bundle-v2.js
new file mode 100644
index 000000000000..a4d2dda6696e
--- /dev/null
+++ b/test/js/samples/inline-style-optimized-url/expected-bundle-v2.js
@@ -0,0 +1,227 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function setStyle(node, key, value) {
+	node.style.setProperty(key, value);
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var div;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			this.h();
+		},
+
+		h: function hydrate() {
+			setStyle(div, "background", "url(data:image/png;base64," + state.data + ")");
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (changed.data) {
+				setStyle(div, "background", "url(data:image/png;base64," + state.data + ")");
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/inline-style-optimized-url/expected-v2.js b/test/js/samples/inline-style-optimized-url/expected-v2.js
new file mode 100644
index 000000000000..5a27ecfa4948
--- /dev/null
+++ b/test/js/samples/inline-style-optimized-url/expected-v2.js
@@ -0,0 +1,48 @@
+/* generated by Svelte vX.Y.Z */
+import { assign, createElement, detachNode, init, insertNode, noop, proto, setStyle } from "svelte/shared.js";
+
+function create_main_fragment(component, state) {
+	var div;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			this.h();
+		},
+
+		h: function hydrate() {
+			setStyle(div, "background", "url(data:image/png;base64," + state.data + ")");
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (changed.data) {
+				setStyle(div, "background", "url(data:image/png;base64," + state.data + ")");
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized-url/input-v2.html b/test/js/samples/inline-style-optimized-url/input-v2.html
new file mode 100644
index 000000000000..677da52c30f4
--- /dev/null
+++ b/test/js/samples/inline-style-optimized-url/input-v2.html
@@ -0,0 +1 @@
+<div style='background: url(data:image/png;base64,{data})'></div>
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized/_actual-bundle-v2.js b/test/js/samples/inline-style-optimized/_actual-bundle-v2.js
new file mode 100644
index 000000000000..2b78d3932a8a
--- /dev/null
+++ b/test/js/samples/inline-style-optimized/_actual-bundle-v2.js
@@ -0,0 +1,227 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function setStyle(node, key, value) {
+	node.style.setProperty(key, value);
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var div;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			this.h();
+		},
+
+		h: function hydrate() {
+			setStyle(div, "color", state.color);
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (changed.color) {
+				setStyle(div, "color", state.color);
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/inline-style-optimized/expected-bundle-v2.js b/test/js/samples/inline-style-optimized/expected-bundle-v2.js
new file mode 100644
index 000000000000..2b78d3932a8a
--- /dev/null
+++ b/test/js/samples/inline-style-optimized/expected-bundle-v2.js
@@ -0,0 +1,227 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function insertNode(node, target, anchor) {
+	target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+	node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+	return document.createElement(name);
+}
+
+function setStyle(node, key, value) {
+	node.style.setProperty(key, value);
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var div;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			this.h();
+		},
+
+		h: function hydrate() {
+			setStyle(div, "color", state.color);
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (changed.color) {
+				setStyle(div, "color", state.color);
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/inline-style-optimized/expected-v2.js b/test/js/samples/inline-style-optimized/expected-v2.js
new file mode 100644
index 000000000000..86dabe8d21e1
--- /dev/null
+++ b/test/js/samples/inline-style-optimized/expected-v2.js
@@ -0,0 +1,48 @@
+/* generated by Svelte vX.Y.Z */
+import { assign, createElement, detachNode, init, insertNode, noop, proto, setStyle } from "svelte/shared.js";
+
+function create_main_fragment(component, state) {
+	var div;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			this.h();
+		},
+
+		h: function hydrate() {
+			setStyle(div, "color", state.color);
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (changed.color) {
+				setStyle(div, "color", state.color);
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized/input-v2.html b/test/js/samples/inline-style-optimized/input-v2.html
new file mode 100644
index 000000000000..004fd595c94f
--- /dev/null
+++ b/test/js/samples/inline-style-optimized/input-v2.html
@@ -0,0 +1 @@
+<div style='color: {color}'></div>
\ No newline at end of file
diff --git a/test/js/samples/inline-style-unoptimized/_actual-bundle-v2.js b/test/js/samples/inline-style-unoptimized/_actual-bundle-v2.js
new file mode 100644
index 000000000000..670a2c02f64a
--- /dev/null
+++ b/test/js/samples/inline-style-unoptimized/_actual-bundle-v2.js
@@ -0,0 +1,238 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+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 blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var div, text, div_1, div_1_style_value;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			text = createText("\n");
+			div_1 = createElement("div");
+			this.h();
+		},
+
+		h: function hydrate() {
+			div.style.cssText = state.style;
+			div_1.style.cssText = div_1_style_value = "" + state.key + ": " + state.value;
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+			insertNode(text, target, anchor);
+			insertNode(div_1, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (changed.style) {
+				div.style.cssText = state.style;
+			}
+
+			if ((changed.key || changed.value) && div_1_style_value !== (div_1_style_value = "" + state.key + ": " + state.value)) {
+				div_1.style.cssText = div_1_style_value;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+			detachNode(text);
+			detachNode(div_1);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/inline-style-unoptimized/expected-bundle-v2.js b/test/js/samples/inline-style-unoptimized/expected-bundle-v2.js
new file mode 100644
index 000000000000..670a2c02f64a
--- /dev/null
+++ b/test/js/samples/inline-style-unoptimized/expected-bundle-v2.js
@@ -0,0 +1,238 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+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 blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var div, text, div_1, div_1_style_value;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			text = createText("\n");
+			div_1 = createElement("div");
+			this.h();
+		},
+
+		h: function hydrate() {
+			div.style.cssText = state.style;
+			div_1.style.cssText = div_1_style_value = "" + state.key + ": " + state.value;
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+			insertNode(text, target, anchor);
+			insertNode(div_1, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (changed.style) {
+				div.style.cssText = state.style;
+			}
+
+			if ((changed.key || changed.value) && div_1_style_value !== (div_1_style_value = "" + state.key + ": " + state.value)) {
+				div_1.style.cssText = div_1_style_value;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+			detachNode(text);
+			detachNode(div_1);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/inline-style-unoptimized/expected-v2.js b/test/js/samples/inline-style-unoptimized/expected-v2.js
new file mode 100644
index 000000000000..7d7e933c1226
--- /dev/null
+++ b/test/js/samples/inline-style-unoptimized/expected-v2.js
@@ -0,0 +1,59 @@
+/* generated by Svelte vX.Y.Z */
+import { assign, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
+
+function create_main_fragment(component, state) {
+	var div, text, div_1, div_1_style_value;
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			text = createText("\n");
+			div_1 = createElement("div");
+			this.h();
+		},
+
+		h: function hydrate() {
+			div.style.cssText = state.style;
+			div_1.style.cssText = div_1_style_value = "" + state.key + ": " + state.value;
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+			insertNode(text, target, anchor);
+			insertNode(div_1, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (changed.style) {
+				div.style.cssText = state.style;
+			}
+
+			if ((changed.key || changed.value) && div_1_style_value !== (div_1_style_value = "" + state.key + ": " + state.value)) {
+				div_1.style.cssText = div_1_style_value;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+			detachNode(text);
+			detachNode(div_1);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/inline-style-unoptimized/input-v2.html b/test/js/samples/inline-style-unoptimized/input-v2.html
new file mode 100644
index 000000000000..eac76d5b6ede
--- /dev/null
+++ b/test/js/samples/inline-style-unoptimized/input-v2.html
@@ -0,0 +1,2 @@
+<div style='{style}'></div>
+<div style='{key}: {value}'></div>
\ No newline at end of file
diff --git a/test/js/samples/title/input-v2.html b/test/js/samples/title/input-v2.html
new file mode 100644
index 000000000000..0eb2a9519de6
--- /dev/null
+++ b/test/js/samples/title/input-v2.html
@@ -0,0 +1,3 @@
+<svelte:head>
+	<title>a {custom} title</title>
+</svelte:head>
\ No newline at end of file
diff --git a/test/js/samples/use-elements-as-anchors/_actual-bundle-v2.js b/test/js/samples/use-elements-as-anchors/_actual-bundle-v2.js
new file mode 100644
index 000000000000..7aefaab6c8c4
--- /dev/null
+++ b/test/js/samples/use-elements-as-anchors/_actual-bundle-v2.js
@@ -0,0 +1,449 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+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 blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var div, text, p, text_2, text_3, text_4, p_1, text_6, text_8, if_block_4_anchor;
+
+	var if_block = (state.a) && create_if_block(component, state);
+
+	var if_block_1 = (state.b) && create_if_block_1(component, state);
+
+	var if_block_2 = (state.c) && create_if_block_2(component, state);
+
+	var if_block_3 = (state.d) && create_if_block_3(component, state);
+
+	var if_block_4 = (state.e) && create_if_block_4(component, state);
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			if (if_block) if_block.c();
+			text = createText("\n\n\t");
+			p = createElement("p");
+			p.textContent = "this can be used as an anchor";
+			text_2 = createText("\n\n\t");
+			if (if_block_1) if_block_1.c();
+			text_3 = createText("\n\n\t");
+			if (if_block_2) if_block_2.c();
+			text_4 = createText("\n\n\t");
+			p_1 = createElement("p");
+			p_1.textContent = "so can this";
+			text_6 = createText("\n\n\t");
+			if (if_block_3) if_block_3.c();
+			text_8 = createText("\n\n");
+			if (if_block_4) if_block_4.c();
+			if_block_4_anchor = createComment();
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+			if (if_block) if_block.m(div, null);
+			appendNode(text, div);
+			appendNode(p, div);
+			appendNode(text_2, div);
+			if (if_block_1) if_block_1.m(div, null);
+			appendNode(text_3, div);
+			if (if_block_2) if_block_2.m(div, null);
+			appendNode(text_4, div);
+			appendNode(p_1, div);
+			appendNode(text_6, div);
+			if (if_block_3) if_block_3.m(div, null);
+			insertNode(text_8, target, anchor);
+			if (if_block_4) if_block_4.m(target, anchor);
+			insertNode(if_block_4_anchor, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (state.a) {
+				if (!if_block) {
+					if_block = create_if_block(component, state);
+					if_block.c();
+					if_block.m(div, text);
+				}
+			} else if (if_block) {
+				if_block.u();
+				if_block.d();
+				if_block = null;
+			}
+
+			if (state.b) {
+				if (!if_block_1) {
+					if_block_1 = create_if_block_1(component, state);
+					if_block_1.c();
+					if_block_1.m(div, text_3);
+				}
+			} else if (if_block_1) {
+				if_block_1.u();
+				if_block_1.d();
+				if_block_1 = null;
+			}
+
+			if (state.c) {
+				if (!if_block_2) {
+					if_block_2 = create_if_block_2(component, state);
+					if_block_2.c();
+					if_block_2.m(div, text_4);
+				}
+			} else if (if_block_2) {
+				if_block_2.u();
+				if_block_2.d();
+				if_block_2 = null;
+			}
+
+			if (state.d) {
+				if (!if_block_3) {
+					if_block_3 = create_if_block_3(component, state);
+					if_block_3.c();
+					if_block_3.m(div, null);
+				}
+			} else if (if_block_3) {
+				if_block_3.u();
+				if_block_3.d();
+				if_block_3 = null;
+			}
+
+			if (state.e) {
+				if (!if_block_4) {
+					if_block_4 = create_if_block_4(component, state);
+					if_block_4.c();
+					if_block_4.m(if_block_4_anchor.parentNode, if_block_4_anchor);
+				}
+			} else if (if_block_4) {
+				if_block_4.u();
+				if_block_4.d();
+				if_block_4 = null;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+			if (if_block) if_block.u();
+			if (if_block_1) if_block_1.u();
+			if (if_block_2) if_block_2.u();
+			if (if_block_3) if_block_3.u();
+			detachNode(text_8);
+			if (if_block_4) if_block_4.u();
+			detachNode(if_block_4_anchor);
+		},
+
+		d: function destroy$$1() {
+			if (if_block) if_block.d();
+			if (if_block_1) if_block_1.d();
+			if (if_block_2) if_block_2.d();
+			if (if_block_3) if_block_3.d();
+			if (if_block_4) if_block_4.d();
+		}
+	};
+}
+
+// (2:1) {#if a}
+function create_if_block(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "a";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+// (8:1) {#if b}
+function create_if_block_1(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "b";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+// (12:1) {#if c}
+function create_if_block_2(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "c";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+// (18:1) {#if d}
+function create_if_block_3(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "d";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+// (25:0) {#if e}
+function create_if_block_4(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "e";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/use-elements-as-anchors/expected-bundle-v2.js b/test/js/samples/use-elements-as-anchors/expected-bundle-v2.js
new file mode 100644
index 000000000000..7aefaab6c8c4
--- /dev/null
+++ b/test/js/samples/use-elements-as-anchors/expected-bundle-v2.js
@@ -0,0 +1,449 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+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 blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var div, text, p, text_2, text_3, text_4, p_1, text_6, text_8, if_block_4_anchor;
+
+	var if_block = (state.a) && create_if_block(component, state);
+
+	var if_block_1 = (state.b) && create_if_block_1(component, state);
+
+	var if_block_2 = (state.c) && create_if_block_2(component, state);
+
+	var if_block_3 = (state.d) && create_if_block_3(component, state);
+
+	var if_block_4 = (state.e) && create_if_block_4(component, state);
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			if (if_block) if_block.c();
+			text = createText("\n\n\t");
+			p = createElement("p");
+			p.textContent = "this can be used as an anchor";
+			text_2 = createText("\n\n\t");
+			if (if_block_1) if_block_1.c();
+			text_3 = createText("\n\n\t");
+			if (if_block_2) if_block_2.c();
+			text_4 = createText("\n\n\t");
+			p_1 = createElement("p");
+			p_1.textContent = "so can this";
+			text_6 = createText("\n\n\t");
+			if (if_block_3) if_block_3.c();
+			text_8 = createText("\n\n");
+			if (if_block_4) if_block_4.c();
+			if_block_4_anchor = createComment();
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+			if (if_block) if_block.m(div, null);
+			appendNode(text, div);
+			appendNode(p, div);
+			appendNode(text_2, div);
+			if (if_block_1) if_block_1.m(div, null);
+			appendNode(text_3, div);
+			if (if_block_2) if_block_2.m(div, null);
+			appendNode(text_4, div);
+			appendNode(p_1, div);
+			appendNode(text_6, div);
+			if (if_block_3) if_block_3.m(div, null);
+			insertNode(text_8, target, anchor);
+			if (if_block_4) if_block_4.m(target, anchor);
+			insertNode(if_block_4_anchor, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (state.a) {
+				if (!if_block) {
+					if_block = create_if_block(component, state);
+					if_block.c();
+					if_block.m(div, text);
+				}
+			} else if (if_block) {
+				if_block.u();
+				if_block.d();
+				if_block = null;
+			}
+
+			if (state.b) {
+				if (!if_block_1) {
+					if_block_1 = create_if_block_1(component, state);
+					if_block_1.c();
+					if_block_1.m(div, text_3);
+				}
+			} else if (if_block_1) {
+				if_block_1.u();
+				if_block_1.d();
+				if_block_1 = null;
+			}
+
+			if (state.c) {
+				if (!if_block_2) {
+					if_block_2 = create_if_block_2(component, state);
+					if_block_2.c();
+					if_block_2.m(div, text_4);
+				}
+			} else if (if_block_2) {
+				if_block_2.u();
+				if_block_2.d();
+				if_block_2 = null;
+			}
+
+			if (state.d) {
+				if (!if_block_3) {
+					if_block_3 = create_if_block_3(component, state);
+					if_block_3.c();
+					if_block_3.m(div, null);
+				}
+			} else if (if_block_3) {
+				if_block_3.u();
+				if_block_3.d();
+				if_block_3 = null;
+			}
+
+			if (state.e) {
+				if (!if_block_4) {
+					if_block_4 = create_if_block_4(component, state);
+					if_block_4.c();
+					if_block_4.m(if_block_4_anchor.parentNode, if_block_4_anchor);
+				}
+			} else if (if_block_4) {
+				if_block_4.u();
+				if_block_4.d();
+				if_block_4 = null;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+			if (if_block) if_block.u();
+			if (if_block_1) if_block_1.u();
+			if (if_block_2) if_block_2.u();
+			if (if_block_3) if_block_3.u();
+			detachNode(text_8);
+			if (if_block_4) if_block_4.u();
+			detachNode(if_block_4_anchor);
+		},
+
+		d: function destroy$$1() {
+			if (if_block) if_block.d();
+			if (if_block_1) if_block_1.d();
+			if (if_block_2) if_block_2.d();
+			if (if_block_3) if_block_3.d();
+			if (if_block_4) if_block_4.d();
+		}
+	};
+}
+
+// (2:1) {#if a}
+function create_if_block(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "a";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+// (8:1) {#if b}
+function create_if_block_1(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "b";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+// (12:1) {#if c}
+function create_if_block_2(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "c";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+// (18:1) {#if d}
+function create_if_block_3(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "d";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+// (25:0) {#if e}
+function create_if_block_4(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "e";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/use-elements-as-anchors/expected-v2.js b/test/js/samples/use-elements-as-anchors/expected-v2.js
new file mode 100644
index 000000000000..d9cff08d3f98
--- /dev/null
+++ b/test/js/samples/use-elements-as-anchors/expected-v2.js
@@ -0,0 +1,262 @@
+/* generated by Svelte vX.Y.Z */
+import { appendNode, assign, createComment, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
+
+function create_main_fragment(component, state) {
+	var div, text, p, text_2, text_3, text_4, p_1, text_6, text_8, if_block_4_anchor;
+
+	var if_block = (state.a) && create_if_block(component, state);
+
+	var if_block_1 = (state.b) && create_if_block_1(component, state);
+
+	var if_block_2 = (state.c) && create_if_block_2(component, state);
+
+	var if_block_3 = (state.d) && create_if_block_3(component, state);
+
+	var if_block_4 = (state.e) && create_if_block_4(component, state);
+
+	return {
+		c: function create() {
+			div = createElement("div");
+			if (if_block) if_block.c();
+			text = createText("\n\n\t");
+			p = createElement("p");
+			p.textContent = "this can be used as an anchor";
+			text_2 = createText("\n\n\t");
+			if (if_block_1) if_block_1.c();
+			text_3 = createText("\n\n\t");
+			if (if_block_2) if_block_2.c();
+			text_4 = createText("\n\n\t");
+			p_1 = createElement("p");
+			p_1.textContent = "so can this";
+			text_6 = createText("\n\n\t");
+			if (if_block_3) if_block_3.c();
+			text_8 = createText("\n\n");
+			if (if_block_4) if_block_4.c();
+			if_block_4_anchor = createComment();
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(div, target, anchor);
+			if (if_block) if_block.m(div, null);
+			appendNode(text, div);
+			appendNode(p, div);
+			appendNode(text_2, div);
+			if (if_block_1) if_block_1.m(div, null);
+			appendNode(text_3, div);
+			if (if_block_2) if_block_2.m(div, null);
+			appendNode(text_4, div);
+			appendNode(p_1, div);
+			appendNode(text_6, div);
+			if (if_block_3) if_block_3.m(div, null);
+			insertNode(text_8, target, anchor);
+			if (if_block_4) if_block_4.m(target, anchor);
+			insertNode(if_block_4_anchor, target, anchor);
+		},
+
+		p: function update(changed, state) {
+			if (state.a) {
+				if (!if_block) {
+					if_block = create_if_block(component, state);
+					if_block.c();
+					if_block.m(div, text);
+				}
+			} else if (if_block) {
+				if_block.u();
+				if_block.d();
+				if_block = null;
+			}
+
+			if (state.b) {
+				if (!if_block_1) {
+					if_block_1 = create_if_block_1(component, state);
+					if_block_1.c();
+					if_block_1.m(div, text_3);
+				}
+			} else if (if_block_1) {
+				if_block_1.u();
+				if_block_1.d();
+				if_block_1 = null;
+			}
+
+			if (state.c) {
+				if (!if_block_2) {
+					if_block_2 = create_if_block_2(component, state);
+					if_block_2.c();
+					if_block_2.m(div, text_4);
+				}
+			} else if (if_block_2) {
+				if_block_2.u();
+				if_block_2.d();
+				if_block_2 = null;
+			}
+
+			if (state.d) {
+				if (!if_block_3) {
+					if_block_3 = create_if_block_3(component, state);
+					if_block_3.c();
+					if_block_3.m(div, null);
+				}
+			} else if (if_block_3) {
+				if_block_3.u();
+				if_block_3.d();
+				if_block_3 = null;
+			}
+
+			if (state.e) {
+				if (!if_block_4) {
+					if_block_4 = create_if_block_4(component, state);
+					if_block_4.c();
+					if_block_4.m(if_block_4_anchor.parentNode, if_block_4_anchor);
+				}
+			} else if (if_block_4) {
+				if_block_4.u();
+				if_block_4.d();
+				if_block_4 = null;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(div);
+			if (if_block) if_block.u();
+			if (if_block_1) if_block_1.u();
+			if (if_block_2) if_block_2.u();
+			if (if_block_3) if_block_3.u();
+			detachNode(text_8);
+			if (if_block_4) if_block_4.u();
+			detachNode(if_block_4_anchor);
+		},
+
+		d: function destroy() {
+			if (if_block) if_block.d();
+			if (if_block_1) if_block_1.d();
+			if (if_block_2) if_block_2.d();
+			if (if_block_3) if_block_3.d();
+			if (if_block_4) if_block_4.d();
+		}
+	};
+}
+
+// (2:1) {#if a}
+function create_if_block(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "a";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+// (8:1) {#if b}
+function create_if_block_1(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "b";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+// (12:1) {#if c}
+function create_if_block_2(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "c";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+// (18:1) {#if d}
+function create_if_block_3(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "d";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+// (25:0) {#if e}
+function create_if_block_4(component, state) {
+	var p;
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			p.textContent = "e";
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/use-elements-as-anchors/input-v2.html b/test/js/samples/use-elements-as-anchors/input-v2.html
new file mode 100644
index 000000000000..9c18d40f582b
--- /dev/null
+++ b/test/js/samples/use-elements-as-anchors/input-v2.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/samples/window-binding-scroll/_actual-bundle-v2.js b/test/js/samples/window-binding-scroll/_actual-bundle-v2.js
new file mode 100644
index 000000000000..a98de2af6353
--- /dev/null
+++ b/test/js/samples/window-binding-scroll/_actual-bundle-v2.js
@@ -0,0 +1,251 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+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 blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var window_updating = false, clear_window_updating = function() { window_updating = false; }, window_updating_timeout, p, text, text_1;
+
+	function onwindowscroll(event) {
+		if (window_updating) return;
+		window_updating = true;
+
+		component.set({
+			y: this.pageYOffset
+		});
+		window_updating = false;
+	}
+	window.addEventListener("scroll", onwindowscroll);
+
+	component.observe("y", function(y) {
+		window_updating = true;
+		clearTimeout(window_updating_timeout);
+		window.scrollTo(window.pageXOffset, y);
+		window_updating_timeout = setTimeout(clear_window_updating, 100);
+	});
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			text = createText("scrolled to ");
+			text_1 = createText(state.y);
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+			appendNode(text, p);
+			appendNode(text_1, p);
+		},
+
+		p: function update(changed, state) {
+			if (changed.y) {
+				text_1.data = state.y;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: function destroy$$1() {
+			window.removeEventListener("scroll", onwindowscroll);
+		}
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+	this._state.y = window.pageYOffset;
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/window-binding-scroll/expected-bundle-v2.js b/test/js/samples/window-binding-scroll/expected-bundle-v2.js
new file mode 100644
index 000000000000..a98de2af6353
--- /dev/null
+++ b/test/js/samples/window-binding-scroll/expected-bundle-v2.js
@@ -0,0 +1,251 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+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 blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var window_updating = false, clear_window_updating = function() { window_updating = false; }, window_updating_timeout, p, text, text_1;
+
+	function onwindowscroll(event) {
+		if (window_updating) return;
+		window_updating = true;
+
+		component.set({
+			y: this.pageYOffset
+		});
+		window_updating = false;
+	}
+	window.addEventListener("scroll", onwindowscroll);
+
+	component.observe("y", function(y) {
+		window_updating = true;
+		clearTimeout(window_updating_timeout);
+		window.scrollTo(window.pageXOffset, y);
+		window_updating_timeout = setTimeout(clear_window_updating, 100);
+	});
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			text = createText("scrolled to ");
+			text_1 = createText(state.y);
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+			appendNode(text, p);
+			appendNode(text_1, p);
+		},
+
+		p: function update(changed, state) {
+			if (changed.y) {
+				text_1.data = state.y;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: function destroy$$1() {
+			window.removeEventListener("scroll", onwindowscroll);
+		}
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+	this._state.y = window.pageYOffset;
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/window-binding-scroll/expected-v2.js b/test/js/samples/window-binding-scroll/expected-v2.js
new file mode 100644
index 000000000000..59009aeb9b99
--- /dev/null
+++ b/test/js/samples/window-binding-scroll/expected-v2.js
@@ -0,0 +1,68 @@
+/* generated by Svelte vX.Y.Z */
+import { appendNode, assign, createElement, createText, detachNode, init, insertNode, proto } from "svelte/shared.js";
+
+function create_main_fragment(component, state) {
+	var window_updating = false, clear_window_updating = function() { window_updating = false; }, window_updating_timeout, p, text, text_1;
+
+	function onwindowscroll(event) {
+		if (window_updating) return;
+		window_updating = true;
+
+		component.set({
+			y: this.pageYOffset
+		});
+		window_updating = false;
+	}
+	window.addEventListener("scroll", onwindowscroll);
+
+	component.observe("y", function(y) {
+		window_updating = true;
+		clearTimeout(window_updating_timeout);
+		window.scrollTo(window.pageXOffset, y);
+		window_updating_timeout = setTimeout(clear_window_updating, 100);
+	});
+
+	return {
+		c: function create() {
+			p = createElement("p");
+			text = createText("scrolled to ");
+			text_1 = createText(state.y);
+		},
+
+		m: function mount(target, anchor) {
+			insertNode(p, target, anchor);
+			appendNode(text, p);
+			appendNode(text_1, p);
+		},
+
+		p: function update(changed, state) {
+			if (changed.y) {
+				text_1.data = state.y;
+			}
+		},
+
+		u: function unmount() {
+			detachNode(p);
+		},
+
+		d: function destroy() {
+			window.removeEventListener("scroll", onwindowscroll);
+		}
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+	this._state.y = window.pageYOffset;
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/window-binding-scroll/input-v2.html b/test/js/samples/window-binding-scroll/input-v2.html
new file mode 100644
index 000000000000..74ace567ab20
--- /dev/null
+++ b/test/js/samples/window-binding-scroll/input-v2.html
@@ -0,0 +1,3 @@
+<:Window bind:scrollY=y/>
+
+<p>scrolled to {y}</p>
\ No newline at end of file

From 7681939d3e741fb69115368f07c2e27f16b99a3b Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Fri, 13 Apr 2018 11:53:20 -0400
Subject: [PATCH 10/15] fix head/window meta tags

---
 src/parse/state/tag.ts                      |  12 +-
 test/js/samples/title/_actual-bundle-v2.js  | 202 ++++++++++++++++++++
 test/js/samples/title/expected-bundle-v2.js | 202 ++++++++++++++++++++
 test/js/samples/title/expected-v2.js        |  39 ++++
 4 files changed, 449 insertions(+), 6 deletions(-)
 create mode 100644 test/js/samples/title/_actual-bundle-v2.js
 create mode 100644 test/js/samples/title/expected-bundle-v2.js
 create mode 100644 test/js/samples/title/expected-v2.js

diff --git a/src/parse/state/tag.ts b/src/parse/state/tag.ts
index ba4fce179f0d..fbbb62bddb51 100644
--- a/src/parse/state/tag.ts
+++ b/src/parse/state/tag.ts
@@ -10,11 +10,11 @@ import { Node } from '../../interfaces';
 
 const validTagName = /^\!?[a-zA-Z]{1,}:?[a-zA-Z0-9\-]*/;
 
-const metaTags = new Set([
-	':Window',
-	':Head',
-	'svelte:window',
-	'svelte:head'
+const metaTags = new Map([
+	[':Window', 'Window'],
+	[':Head', 'Head'],
+	['svelte:window', 'Window'],
+	['svelte:head', 'Head']
 ]);
 
 const specials = new Map([
@@ -105,7 +105,7 @@ export default function tag(parser: Parser) {
 	}
 
 	const type = metaTags.has(name)
-		? name.slice(1)
+		? metaTags.get(name)
 		: 'Element'; // TODO in v2, capitalised name means 'Component'
 
 	const element: Node = {
diff --git a/test/js/samples/title/_actual-bundle-v2.js b/test/js/samples/title/_actual-bundle-v2.js
new file mode 100644
index 000000000000..83c8815d6fbd
--- /dev/null
+++ b/test/js/samples/title/_actual-bundle-v2.js
@@ -0,0 +1,202 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var title_value;
+
+	document.title = title_value = "a " + state.custom + " title";
+
+	return {
+		c: noop,
+
+		m: noop,
+
+		p: function update(changed, state) {
+			if ((changed.custom) && title_value !== (title_value = "a " + state.custom + " title")) {
+				document.title = title_value;
+			}
+		},
+
+		u: noop,
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/title/expected-bundle-v2.js b/test/js/samples/title/expected-bundle-v2.js
new file mode 100644
index 000000000000..83c8815d6fbd
--- /dev/null
+++ b/test/js/samples/title/expected-bundle-v2.js
@@ -0,0 +1,202 @@
+function noop() {}
+
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
+}
+
+function blankObject() {
+	return Object.create(null);
+}
+
+function destroy(detach) {
+	this.destroy = noop;
+	this.fire('destroy');
+	this.set = this.get = noop;
+
+	if (detach !== false) this._fragment.u();
+	this._fragment.d();
+	this._fragment = this._state = null;
+}
+
+function _differs(a, b) {
+	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+	for (var key in group) {
+		if (!changed[key]) continue;
+
+		var newValue = newState[key];
+		var oldValue = oldState[key];
+
+		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 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 get(key) {
+	return key ? this._state[key] : this._state;
+}
+
+function init(component, options) {
+	component._observers = { pre: blankObject(), post: blankObject() };
+	component._handlers = blankObject();
+	component._bind = options._bind;
+
+	component.options = options;
+	component.root = options.root || component;
+	component.store = component.root.store || options.store;
+}
+
+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));
+	if (this.root._lock) return;
+	this.root._lock = true;
+	callAll(this.root._beforecreate);
+	callAll(this.root._oncreate);
+	callAll(this.root._aftercreate);
+	this.root._lock = false;
+}
+
+function _set(newState) {
+	var oldState = this._state,
+		changed = {},
+		dirty = false;
+
+	for (var key in newState) {
+		if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+	}
+	if (!dirty) return;
+
+	this._state = assign(assign({}, oldState), newState);
+	this._recompute(changed, this._state);
+	if (this._bind) this._bind(changed, this._state);
+
+	if (this._fragment) {
+		dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+		this._fragment.p(changed, this._state);
+		dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+	}
+}
+
+function callAll(fns) {
+	while (fns && fns.length) fns.shift()();
+}
+
+function _mount(target, anchor) {
+	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+}
+
+function _unmount() {
+	if (this._fragment) this._fragment.u();
+}
+
+var proto = {
+	destroy: destroy,
+	get: get,
+	fire: fire,
+	observe: observe,
+	on: on,
+	set: set,
+	teardown: destroy,
+	_recompute: noop,
+	_set: _set,
+	_mount: _mount,
+	_unmount: _unmount,
+	_differs: _differs
+};
+
+/* generated by Svelte vX.Y.Z */
+
+function create_main_fragment(component, state) {
+	var title_value;
+
+	document.title = title_value = "a " + state.custom + " title";
+
+	return {
+		c: noop,
+
+		m: noop,
+
+		p: function update(changed, state) {
+			if ((changed.custom) && title_value !== (title_value = "a " + state.custom + " title")) {
+				document.title = title_value;
+			}
+		},
+
+		u: noop,
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+
+export default SvelteComponent;
diff --git a/test/js/samples/title/expected-v2.js b/test/js/samples/title/expected-v2.js
new file mode 100644
index 000000000000..0e059bbb4c67
--- /dev/null
+++ b/test/js/samples/title/expected-v2.js
@@ -0,0 +1,39 @@
+/* generated by Svelte vX.Y.Z */
+import { assign, init, noop, proto } from "svelte/shared.js";
+
+function create_main_fragment(component, state) {
+	var title_value;
+
+	document.title = title_value = "a " + state.custom + " title";
+
+	return {
+		c: noop,
+
+		m: noop,
+
+		p: function update(changed, state) {
+			if ((changed.custom) && title_value !== (title_value = "a " + state.custom + " title")) {
+				document.title = title_value;
+			}
+		},
+
+		u: noop,
+
+		d: noop
+	};
+}
+
+function SvelteComponent(options) {
+	init(this, options);
+	this._state = assign({}, options.data);
+
+	this._fragment = create_main_fragment(this, this._state);
+
+	if (options.target) {
+		this._fragment.c();
+		this._mount(options.target, options.anchor);
+	}
+}
+
+assign(SvelteComponent.prototype, proto);
+export default SvelteComponent;
\ No newline at end of file

From 94a7ffb9a579767f971bc71aadbd3bc07666313a Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Fri, 13 Apr 2018 12:01:16 -0400
Subject: [PATCH 11/15] fix debugging comments

---
 src/utils/createDebuggingComment.ts                      | 4 ++--
 test/js/samples/if-block-no-update/_actual-bundle-v2.js  | 2 +-
 test/js/samples/if-block-no-update/expected-bundle-v2.js | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/utils/createDebuggingComment.ts b/src/utils/createDebuggingComment.ts
index e967d7e5165b..1eadfd1c933e 100644
--- a/src/utils/createDebuggingComment.ts
+++ b/src/utils/createDebuggingComment.ts
@@ -6,8 +6,8 @@ export default function createDebuggingComment(node: Node, generator: DomGenerat
 
 	let c = node.start;
 	if (node.type === 'ElseBlock') {
-		while (source[c] !== '{') c -= 1;
-		c -= 1;
+		while (source[c - 1] !== '{') c -= 1;
+		while (source[c - 1] === '{') c -= 1;
 	}
 
 	let d = node.expression ? node.expression.end : c;
diff --git a/test/js/samples/if-block-no-update/_actual-bundle-v2.js b/test/js/samples/if-block-no-update/_actual-bundle-v2.js
index 7284a91fa7e8..29d151e15d64 100644
--- a/test/js/samples/if-block-no-update/_actual-bundle-v2.js
+++ b/test/js/samples/if-block-no-update/_actual-bundle-v2.js
@@ -244,7 +244,7 @@ function create_if_block(component, state) {
 	};
 }
 
-// (2:12)  {:else}
+// (3:0) {:else}
 function create_if_block_1(component, state) {
 	var p;
 
diff --git a/test/js/samples/if-block-no-update/expected-bundle-v2.js b/test/js/samples/if-block-no-update/expected-bundle-v2.js
index 59d3e9656b5e..29d151e15d64 100644
--- a/test/js/samples/if-block-no-update/expected-bundle-v2.js
+++ b/test/js/samples/if-block-no-update/expected-bundle-v2.js
@@ -222,7 +222,7 @@ function create_main_fragment(component, state) {
 	};
 }
 
-// (1:0) {{#if foo}}
+// (1:0) {#if foo}
 function create_if_block(component, state) {
 	var p;
 
@@ -244,7 +244,7 @@ function create_if_block(component, state) {
 	};
 }
 
-// (3:0) {{else}}
+// (3:0) {:else}
 function create_if_block_1(component, state) {
 	var p;
 

From e85eda82795e0754127a5e4260cecf5e311166f3 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Fri, 13 Apr 2018 12:02:07 -0400
Subject: [PATCH 12/15] reenable all tests

---
 test/js/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/js/index.js b/test/js/index.js
index 43f7a4c47e4f..ef2a05a09e72 100644
--- a/test/js/index.js
+++ b/test/js/index.js
@@ -4,7 +4,7 @@ import * as path from "path";
 import { rollup } from "rollup";
 import { loadConfig, svelte } from "../helpers.js";
 
-describe.only("js", () => {
+describe("js", () => {
 	fs.readdirSync("test/js/samples").forEach(dir => {
 		if (dir[0] === ".") return;
 

From 9bba8d18d18c821d63626bb41bb177aa4ed9ab24 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sat, 14 Apr 2018 14:01:28 -0400
Subject: [PATCH 13/15] implement dynamic components etc

---
 src/generators/Generator.ts                   |  2 +-
 src/generators/nodes/Component.ts             |  2 +-
 .../visitors/Component.ts                     |  2 +-
 src/parse/state/tag.ts                        | 21 ++++++--
 test/helpers.js                               | 10 +++-
 .../samples/component-dynamic/input-v2.html   |  2 +-
 .../samples/component-dynamic/output-v2.json  | 22 ++++----
 test/runtime/index.js                         | 21 +++++---
 .../samples/action-update/main-v2.html        | 52 +++++++++++++++++++
 .../main-v2.html                              | 13 +++++
 .../main-v2.html                              |  1 +
 .../Green-v2.html                             |  1 +
 .../Red-v2.html                               |  1 +
 .../main-v2.html                              | 15 ++++++
 .../dynamic-component-bindings/main-v2.html   | 12 +++++
 .../dynamic-component-events/main-v2.html     | 12 +++++
 .../Bar-v2.html                               |  1 +
 .../Foo-v2.html                               |  1 +
 .../main-v2.html                              | 14 +++++
 .../dynamic-component-ref/main-v2.html        | 11 ++++
 .../dynamic-component-slot/main-v2.html       | 45 ++++++++++++++++
 .../Bar-v2.html                               |  1 +
 .../Foo-v2.html                               |  1 +
 .../main-v2.html                              | 12 +++++
 .../samples/head-title-dynamic/main-v2.html   |  4 ++
 .../samples/head-title-static/main-v2.html    |  4 ++
 .../samples/self-reference-tree/main-v2.html  | 11 ++++
 .../samples/self-reference/main-v2.html       |  4 ++
 .../window-bind-scroll-update/main-v2.html    |  3 ++
 .../window-binding-resize/main-v2.html        |  3 ++
 .../samples/window-event-context/main-v2.html |  3 ++
 .../samples/window-event-custom/main-v2.html  | 25 +++++++++
 32 files changed, 305 insertions(+), 27 deletions(-)
 create mode 100644 test/runtime/samples/action-update/main-v2.html
 create mode 100644 test/runtime/samples/dev-warning-dynamic-components-misplaced/main-v2.html
 create mode 100644 test/runtime/samples/dev-warning-readonly-window-binding/main-v2.html
 create mode 100644 test/runtime/samples/dynamic-component-bindings-recreated/Green-v2.html
 create mode 100644 test/runtime/samples/dynamic-component-bindings-recreated/Red-v2.html
 create mode 100644 test/runtime/samples/dynamic-component-bindings-recreated/main-v2.html
 create mode 100644 test/runtime/samples/dynamic-component-bindings/main-v2.html
 create mode 100644 test/runtime/samples/dynamic-component-events/main-v2.html
 create mode 100644 test/runtime/samples/dynamic-component-inside-element/Bar-v2.html
 create mode 100644 test/runtime/samples/dynamic-component-inside-element/Foo-v2.html
 create mode 100644 test/runtime/samples/dynamic-component-inside-element/main-v2.html
 create mode 100644 test/runtime/samples/dynamic-component-ref/main-v2.html
 create mode 100644 test/runtime/samples/dynamic-component-slot/main-v2.html
 create mode 100644 test/runtime/samples/dynamic-component-update-existing-instance/Bar-v2.html
 create mode 100644 test/runtime/samples/dynamic-component-update-existing-instance/Foo-v2.html
 create mode 100644 test/runtime/samples/dynamic-component-update-existing-instance/main-v2.html
 create mode 100644 test/runtime/samples/head-title-dynamic/main-v2.html
 create mode 100644 test/runtime/samples/head-title-static/main-v2.html
 create mode 100644 test/runtime/samples/self-reference-tree/main-v2.html
 create mode 100644 test/runtime/samples/self-reference/main-v2.html
 create mode 100644 test/runtime/samples/window-bind-scroll-update/main-v2.html
 create mode 100644 test/runtime/samples/window-binding-resize/main-v2.html
 create mode 100644 test/runtime/samples/window-event-context/main-v2.html
 create mode 100644 test/runtime/samples/window-event-custom/main-v2.html

diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts
index ce6c56fc7d80..6d49faf906d8 100644
--- a/src/generators/Generator.ts
+++ b/src/generators/Generator.ts
@@ -875,7 +875,7 @@ export default class Generator {
 					this.skip();
 				}
 
-				if (node.type === 'Component' && node.name === ':Component') {
+				if (node.type === 'Component' && (node.name === ':Component' || node.name === 'svelte:component')) {
 					node.metadata = contextualise(node.expression, contextDependencies, indexes, false);
 				}
 
diff --git a/src/generators/nodes/Component.ts b/src/generators/nodes/Component.ts
index 239dc4bed197..25d7508ac223 100644
--- a/src/generators/nodes/Component.ts
+++ b/src/generators/nodes/Component.ts
@@ -292,7 +292,7 @@ export default class Component extends Node {
 			`;
 		}
 
-		if (this.name === ':Component') {
+		if (this.name === ':Component' || this.name === 'svelte:component') {
 			const switch_value = block.getUniqueName('switch_value');
 			const switch_props = block.getUniqueName('switch_props');
 
diff --git a/src/generators/server-side-rendering/visitors/Component.ts b/src/generators/server-side-rendering/visitors/Component.ts
index d0df39c9bef1..9c7d7ce930a1 100644
--- a/src/generators/server-side-rendering/visitors/Component.ts
+++ b/src/generators/server-side-rendering/visitors/Component.ts
@@ -87,7 +87,7 @@ export default function visitComponent(
 			.concat(bindingProps)
 			.join(', ')} }`;
 
-	const isDynamicComponent = node.name === ':Component';
+	const isDynamicComponent = node.name === ':Component' || node.name === 'svelte:component';
 	if (isDynamicComponent) block.contextualise(node.expression);
 
 	const expression = (
diff --git a/src/parse/state/tag.ts b/src/parse/state/tag.ts
index fbbb62bddb51..dad44f81fe21 100644
--- a/src/parse/state/tag.ts
+++ b/src/parse/state/tag.ts
@@ -169,7 +169,7 @@ export default function tag(parser: Parser) {
 		}
 	}
 
-	if (name === (parser.v2 ? 'svelte:component' : ':Component')) {
+	if (name === ':Component') {
 		parser.eat('{', true);
 		element.expression = readExpression(parser);
 		parser.allowWhitespace();
@@ -189,6 +189,21 @@ export default function tag(parser: Parser) {
 		parser.allowWhitespace();
 	}
 
+	if (parser.v2 && name === 'svelte:component') {
+		// TODO post v2, treat this just as any other attribute
+		const index = element.attributes.findIndex(attr => attr.name === 'this');
+		if (!~index) {
+			parser.error(`<svelte:component> must have a 'this' attribute`, start);
+		}
+
+		const definition = element.attributes.splice(index, 1)[0];
+		if (definition.value === true || definition.value.length !== 1 || definition.value[0].type === 'Text') {
+			parser.error(`invalid component definition`, definition.start);
+		}
+
+		element.expression = definition.value[0].expression;
+	}
+
 	// special cases – top-level <script> and <style>
 	if (specials.has(name) && parser.stack.length === 1) {
 		const special = specials.get(name);
@@ -348,8 +363,8 @@ function readAttribute(parser: Parser, uniqueNames: Set<string>) {
 
 	parser.allowWhitespace();
 
-	const attribute = readDirective(parser, start, name);
-	if (attribute) return attribute;
+	const directive = readDirective(parser, start, name);
+	if (directive) return directive;
 
 	let value = parser.eat('=') ? readAttributeValue(parser) : true;
 
diff --git a/test/helpers.js b/test/helpers.js
index 82b9cd979874..767c4a113211 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -178,6 +178,13 @@ export function showOutput(cwd, options = {}, compile = svelte.compile) {
 	glob.sync('**/*.html', { cwd }).forEach(file => {
 		if (file[0] === '_') return;
 
+		// TODO remove this post-v2
+		if (/-v2\.html$/.test(file)) {
+			if (!options.v2) return;
+		} else if (options.v2 && fs.existsSync(`${cwd}/${file.replace('.html', '-v2.html')}`)) {
+			return;
+		}
+
 		const name = path.basename(file)
 			.slice(0, -path.extname(file).length)
 			.replace(/^\d/, '_$&')
@@ -187,7 +194,8 @@ export function showOutput(cwd, options = {}, compile = svelte.compile) {
 			fs.readFileSync(`${cwd}/${file}`, 'utf-8'),
 			Object.assign(options, {
 				filename: file,
-				name: capitalise(name)
+				name: capitalise(name),
+				parser: options.v2 ? 'v2' : 'v1'
 			})
 		);
 
diff --git a/test/parser/samples/component-dynamic/input-v2.html b/test/parser/samples/component-dynamic/input-v2.html
index d692cce9b875..1dad5eb269e6 100644
--- a/test/parser/samples/component-dynamic/input-v2.html
+++ b/test/parser/samples/component-dynamic/input-v2.html
@@ -1 +1 @@
-<svelte:component {foo ? Foo : Bar}></svelte:component>
\ No newline at end of file
+<svelte:component this="{foo ? Foo : Bar}"></svelte:component>
\ No newline at end of file
diff --git a/test/parser/samples/component-dynamic/output-v2.json b/test/parser/samples/component-dynamic/output-v2.json
index 6080a11e9e6e..604103ea14f5 100644
--- a/test/parser/samples/component-dynamic/output-v2.json
+++ b/test/parser/samples/component-dynamic/output-v2.json
@@ -1,37 +1,37 @@
 {
-	"hash": "7yh2k2",
+	"hash": "2u5ec3",
 	"html": {
 		"start": 0,
-		"end": 55,
+		"end": 62,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 55,
+				"end": 62,
 				"type": "Element",
 				"name": "svelte:component",
 				"attributes": [],
 				"children": [],
 				"expression": {
 					"type": "ConditionalExpression",
-					"start": 19,
-					"end": 34,
+					"start": 25,
+					"end": 40,
 					"test": {
 						"type": "Identifier",
-						"start": 19,
-						"end": 22,
+						"start": 25,
+						"end": 28,
 						"name": "foo"
 					},
 					"consequent": {
 						"type": "Identifier",
-						"start": 25,
-						"end": 28,
+						"start": 31,
+						"end": 34,
 						"name": "Foo"
 					},
 					"alternate": {
 						"type": "Identifier",
-						"start": 31,
-						"end": 34,
+						"start": 37,
+						"end": 40,
 						"name": "Bar"
 					}
 				}
diff --git a/test/runtime/index.js b/test/runtime/index.js
index 8dfa1d50fd6b..a184bb46d0d8 100644
--- a/test/runtime/index.js
+++ b/test/runtime/index.js
@@ -21,7 +21,7 @@ let compileOptions = null;
 let compile = null;
 
 function getName(filename) {
-	const base = path.basename(filename).replace(".html", "");
+	const base = path.basename(filename).replace('-v2', '').replace(".html", "");
 	return base[0].toUpperCase() + base.slice(1);
 }
 
@@ -46,7 +46,7 @@ describe("runtime", () => {
 
 	const failed = new Set();
 
-	function runTest(dir, shared, hydrate) {
+	function runTest(dir, shared, hydrate, v2) {
 		if (dir[0] === ".") return;
 
 		const config = loadConfig(`./runtime/samples/${dir}/_config.js`);
@@ -55,7 +55,7 @@ describe("runtime", () => {
 			throw new Error("Forgot to remove `solo: true` from test");
 		}
 
-		(config.skip ? it.skip : config.solo ? it.only : it)(`${dir} (${shared ? 'shared' : 'inline'} helpers${hydrate ? ' , hydration' : ''})`, () => {
+		(config.skip ? it.skip : config.solo ? it.only : it)(`${dir} (${shared ? 'shared' : 'inline'} helpers${hydrate ? ', hydration' : ''}${v2 ? ', v2' : ''})`, () => {
 			if (failed.has(dir)) {
 				// this makes debugging easier, by only printing compiled output once
 				throw new Error('skipping test, already failed');
@@ -72,12 +72,13 @@ describe("runtime", () => {
 			compileOptions.dev = config.dev;
 			compileOptions.store = !!config.store;
 			compileOptions.immutable = config.immutable;
+			compileOptions.parser = v2 ? 'v2' : 'v1';
 
 			// check that no ES2015+ syntax slipped in
 			if (!config.allowES2015) {
 				try {
 					const source = fs.readFileSync(
-						`test/runtime/samples/${dir}/main.html`,
+						`test/runtime/samples/${dir}/main${v2 ? '-v2' : ''}.html`,
 						"utf-8"
 					);
 					const { code } = compile(source, compileOptions);
@@ -100,7 +101,7 @@ describe("runtime", () => {
 					if (err.frame) {
 						console.error(chalk.red(err.frame)); // eslint-disable-line no-console
 					}
-					showOutput(cwd, { shared, format: 'cjs', store: !!compileOptions.store }, compile); // eslint-disable-line no-console
+					showOutput(cwd, { shared, format: 'cjs', store: !!compileOptions.store, v2 }, compile); // eslint-disable-line no-console
 					throw err;
 				}
 			}
@@ -143,7 +144,7 @@ describe("runtime", () => {
 					};
 
 					try {
-						SvelteComponent = require(`./samples/${dir}/main.html`);
+						SvelteComponent = require(`./samples/${dir}/main${v2 ? '-v2' : ''}.html`);
 					} catch (err) {
 						showOutput(cwd, { shared, format: 'cjs', hydratable: hydrate, store: !!compileOptions.store }, compile); // eslint-disable-line no-console
 						throw err;
@@ -203,12 +204,12 @@ describe("runtime", () => {
 						config.error(assert, err);
 					} else {
 						failed.add(dir);
-						showOutput(cwd, { shared, format: 'cjs', hydratable: hydrate, store: !!compileOptions.store }, compile); // eslint-disable-line no-console
+						showOutput(cwd, { shared, format: 'cjs', hydratable: hydrate, store: !!compileOptions.store, v2 }, compile); // eslint-disable-line no-console
 						throw err;
 					}
 				})
 				.then(() => {
-					if (config.show) showOutput(cwd, { shared, format: 'cjs', hydratable: hydrate, store: !!compileOptions.store }, compile);
+					if (config.show) showOutput(cwd, { shared, format: 'cjs', hydratable: hydrate, store: !!compileOptions.store, v2 }, compile);
 				});
 		});
 	}
@@ -218,6 +219,10 @@ describe("runtime", () => {
 		runTest(dir, shared, false);
 		runTest(dir, shared, true);
 		runTest(dir, null, false);
+
+		if (fs.existsSync(`test/runtime/samples/${dir}/main-v2.html`)) {
+			runTest(dir, shared, false, true);
+		}
 	});
 
 	it("fails if options.target is missing in dev mode", () => {
diff --git a/test/runtime/samples/action-update/main-v2.html b/test/runtime/samples/action-update/main-v2.html
new file mode 100644
index 000000000000..6b319f5dca3d
--- /dev/null
+++ b/test/runtime/samples/action-update/main-v2.html
@@ -0,0 +1,52 @@
+<button use:tooltip="tooltip">action</button>
+<svelte:window on:keydown="checkForCtrl(event)" on:keyup="checkForCtrl(event)"/>
+
+<script>
+	export default {
+		data() {
+			return { tooltip: 'Perform an Action' };
+		},
+
+		methods: {
+			checkForCtrl(event) {
+				if (event.ctrlKey) {
+					this.set({ tooltip: 'Perform an augmented Action' });
+				} else {
+					this.set({ tooltip: 'Perform an Action' });
+				}
+			}
+		},
+
+		actions: {
+			tooltip(node, text) {
+				let tooltip = null;
+
+				function onMouseEnter() {
+					tooltip = document.createElement('div');
+					tooltip.classList.add('tooltip');
+					tooltip.textContent = text;
+					node.parentNode.appendChild(tooltip);
+				}
+
+				function onMouseLeave() {
+					if (!tooltip) return;
+					tooltip.remove();
+					tooltip = null;
+				}
+
+				node.addEventListener('mouseenter', onMouseEnter);
+				node.addEventListener('mouseleave', onMouseLeave);
+
+				return {
+					update(text) {
+						if (tooltip) tooltip.textContent = text;
+					},
+					destroy() {
+						node.removeEventListener('mouseenter', onMouseEnter);
+						node.removeEventListener('mouseleave', onMouseLeave);
+					}
+				}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/dev-warning-dynamic-components-misplaced/main-v2.html b/test/runtime/samples/dev-warning-dynamic-components-misplaced/main-v2.html
new file mode 100644
index 000000000000..eb6e7d8e8e61
--- /dev/null
+++ b/test/runtime/samples/dev-warning-dynamic-components-misplaced/main-v2.html
@@ -0,0 +1,13 @@
+<svelte:component this="{x ? Foo : Bar}"/>
+
+<script>
+	import Foo from './Foo.html';
+	import Bar from './Bar.html';
+
+	export default {
+		components: {
+			Foo,
+			Bar
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/dev-warning-readonly-window-binding/main-v2.html b/test/runtime/samples/dev-warning-readonly-window-binding/main-v2.html
new file mode 100644
index 000000000000..87b0403ee32e
--- /dev/null
+++ b/test/runtime/samples/dev-warning-readonly-window-binding/main-v2.html
@@ -0,0 +1 @@
+<svelte:window bind:innerWidth='width'/>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings-recreated/Green-v2.html b/test/runtime/samples/dynamic-component-bindings-recreated/Green-v2.html
new file mode 100644
index 000000000000..b4faa1b66263
--- /dev/null
+++ b/test/runtime/samples/dynamic-component-bindings-recreated/Green-v2.html
@@ -0,0 +1 @@
+<p>green {foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings-recreated/Red-v2.html b/test/runtime/samples/dynamic-component-bindings-recreated/Red-v2.html
new file mode 100644
index 000000000000..a3e3c792a03f
--- /dev/null
+++ b/test/runtime/samples/dynamic-component-bindings-recreated/Red-v2.html
@@ -0,0 +1 @@
+<p>red {foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings-recreated/main-v2.html b/test/runtime/samples/dynamic-component-bindings-recreated/main-v2.html
new file mode 100644
index 000000000000..6d748ed21705
--- /dev/null
+++ b/test/runtime/samples/dynamic-component-bindings-recreated/main-v2.html
@@ -0,0 +1,15 @@
+<svelte:component this="{x ? Green : Red}" bind:foo />
+
+<script>
+	import Green from './Green-v2.html';
+	import Red from './Red-v2.html';
+
+	export default {
+		data() {
+			return {
+				Green,
+				Red
+			};
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings/main-v2.html b/test/runtime/samples/dynamic-component-bindings/main-v2.html
new file mode 100644
index 000000000000..020855cb2272
--- /dev/null
+++ b/test/runtime/samples/dynamic-component-bindings/main-v2.html
@@ -0,0 +1,12 @@
+<svelte:component this="{ x ? Foo : Bar }" bind:y bind:z/>
+
+<script>
+	import Foo from './Foo.html';
+	import Bar from './Bar.html';
+
+	export default {
+		data() {
+			return { Foo, Bar };
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-events/main-v2.html b/test/runtime/samples/dynamic-component-events/main-v2.html
new file mode 100644
index 000000000000..5fa66b2c6135
--- /dev/null
+++ b/test/runtime/samples/dynamic-component-events/main-v2.html
@@ -0,0 +1,12 @@
+<svelte:component this="{ x ? Foo : Bar }" on:select='set({ selected: event.id })'/>
+
+<script>
+	import Foo from './Foo.html';
+	import Bar from './Bar.html';
+
+	export default {
+		data() {
+			return { Foo, Bar };
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-inside-element/Bar-v2.html b/test/runtime/samples/dynamic-component-inside-element/Bar-v2.html
new file mode 100644
index 000000000000..79e01b851c34
--- /dev/null
+++ b/test/runtime/samples/dynamic-component-inside-element/Bar-v2.html
@@ -0,0 +1 @@
+<p>{x}, therefore Bar</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-inside-element/Foo-v2.html b/test/runtime/samples/dynamic-component-inside-element/Foo-v2.html
new file mode 100644
index 000000000000..cb35cfc082e4
--- /dev/null
+++ b/test/runtime/samples/dynamic-component-inside-element/Foo-v2.html
@@ -0,0 +1 @@
+<p>{x}, therefore Foo</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-inside-element/main-v2.html b/test/runtime/samples/dynamic-component-inside-element/main-v2.html
new file mode 100644
index 000000000000..e889f2feb01f
--- /dev/null
+++ b/test/runtime/samples/dynamic-component-inside-element/main-v2.html
@@ -0,0 +1,14 @@
+<div>
+	<svelte:component this="{ x ? Foo : Bar }" x='{x}'/>
+</div>
+
+<script>
+	import Foo from './Foo-v2.html';
+	import Bar from './Bar-v2.html';
+
+	export default {
+		data() {
+			return { Foo, Bar };
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-ref/main-v2.html b/test/runtime/samples/dynamic-component-ref/main-v2.html
new file mode 100644
index 000000000000..1d54b172995d
--- /dev/null
+++ b/test/runtime/samples/dynamic-component-ref/main-v2.html
@@ -0,0 +1,11 @@
+<svelte:component this={foo} ref:test/>
+
+<script>
+	import Foo from './Foo.html';
+
+	export default {
+		data() {
+			return { foo: Foo };
+		}
+	};
+</script>
diff --git a/test/runtime/samples/dynamic-component-slot/main-v2.html b/test/runtime/samples/dynamic-component-slot/main-v2.html
new file mode 100644
index 000000000000..e8b5c487ad3d
--- /dev/null
+++ b/test/runtime/samples/dynamic-component-slot/main-v2.html
@@ -0,0 +1,45 @@
+<svelte:component this="{ x ? Foo : Bar }" x='{x}'>
+	<p>element</p>
+
+	{tag}
+
+	{#if foo}
+		<p>foo</p>
+	{:elseif bar}
+		<p>bar</p>
+	{:else}
+		<p>neither foo nor bar</p>
+	{/if}
+
+	text
+
+	{#each things as thing}
+		<span>{thing}</span>
+	{/each}
+
+	<Baz/>
+
+	<div slot='other'>what goes up must come down</div>
+</svelte:component>
+
+<script>
+	import Foo from './Foo.html';
+	import Bar from './Bar.html';
+	import Baz from './Baz.html';
+
+	export default {
+		data() {
+			return {
+				Foo,
+				Bar,
+
+				tag: 'you\'re it',
+				things: ['a', 'b', 'c']
+			};
+		},
+
+		components: {
+			Baz
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-update-existing-instance/Bar-v2.html b/test/runtime/samples/dynamic-component-update-existing-instance/Bar-v2.html
new file mode 100644
index 000000000000..36fa195dcd76
--- /dev/null
+++ b/test/runtime/samples/dynamic-component-update-existing-instance/Bar-v2.html
@@ -0,0 +1 @@
+<p>Bar {x}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-update-existing-instance/Foo-v2.html b/test/runtime/samples/dynamic-component-update-existing-instance/Foo-v2.html
new file mode 100644
index 000000000000..0a9cd0047a46
--- /dev/null
+++ b/test/runtime/samples/dynamic-component-update-existing-instance/Foo-v2.html
@@ -0,0 +1 @@
+<p>Foo {x}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-update-existing-instance/main-v2.html b/test/runtime/samples/dynamic-component-update-existing-instance/main-v2.html
new file mode 100644
index 000000000000..4bdf36f5299b
--- /dev/null
+++ b/test/runtime/samples/dynamic-component-update-existing-instance/main-v2.html
@@ -0,0 +1,12 @@
+<svelte:component this="{ x ? Foo : Bar }" x='{x}'/>
+
+<script>
+	import Foo from './Foo-v2.html';
+	import Bar from './Bar-v2.html';
+
+	export default {
+		data() {
+			return { Foo, Bar };
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/runtime/samples/head-title-dynamic/main-v2.html b/test/runtime/samples/head-title-dynamic/main-v2.html
new file mode 100644
index 000000000000..255f344c0098
--- /dev/null
+++ b/test/runtime/samples/head-title-dynamic/main-v2.html
@@ -0,0 +1,4 @@
+<svelte:head>
+	<title>a {adjective} title</title>
+	<meta name='twitter:creator' content='@sveltejs'>
+</svelte:head>
\ No newline at end of file
diff --git a/test/runtime/samples/head-title-static/main-v2.html b/test/runtime/samples/head-title-static/main-v2.html
new file mode 100644
index 000000000000..7f9da20911ab
--- /dev/null
+++ b/test/runtime/samples/head-title-static/main-v2.html
@@ -0,0 +1,4 @@
+<svelte:head>
+	<title>changed</title>
+	<meta name='twitter:creator' content='@sveltejs'>
+</svelte:head>
\ No newline at end of file
diff --git a/test/runtime/samples/self-reference-tree/main-v2.html b/test/runtime/samples/self-reference-tree/main-v2.html
new file mode 100644
index 000000000000..6663cf95338f
--- /dev/null
+++ b/test/runtime/samples/self-reference-tree/main-v2.html
@@ -0,0 +1,11 @@
+<article class='file {file.type}'>
+	<span class='name'>{file.name}</span>
+
+	{#if file.type === 'folder'}
+		<ul>
+			{#each file.children as child}
+				<li><svelte:self file='{child}'/></li>
+			{/each}
+		</ul>
+	{/if}
+</article>
\ No newline at end of file
diff --git a/test/runtime/samples/self-reference/main-v2.html b/test/runtime/samples/self-reference/main-v2.html
new file mode 100644
index 000000000000..e5581203c30c
--- /dev/null
+++ b/test/runtime/samples/self-reference/main-v2.html
@@ -0,0 +1,4 @@
+<span>{depth}</span>
+{#if depth > 0}
+	<svelte:self depth='{depth - 1}'/>
+{/if}
\ No newline at end of file
diff --git a/test/runtime/samples/window-bind-scroll-update/main-v2.html b/test/runtime/samples/window-bind-scroll-update/main-v2.html
new file mode 100644
index 000000000000..107ebeef8fc6
--- /dev/null
+++ b/test/runtime/samples/window-bind-scroll-update/main-v2.html
@@ -0,0 +1,3 @@
+<svelte:window bind:scrollY/>
+
+<div style='width: 100%; height: 9999px;'></div>
\ No newline at end of file
diff --git a/test/runtime/samples/window-binding-resize/main-v2.html b/test/runtime/samples/window-binding-resize/main-v2.html
new file mode 100644
index 000000000000..54a1762eb83b
--- /dev/null
+++ b/test/runtime/samples/window-binding-resize/main-v2.html
@@ -0,0 +1,3 @@
+<svelte:window bind:innerWidth='width' bind:innerHeight='height'/>
+
+<div>{width}x{height}</div>
\ No newline at end of file
diff --git a/test/runtime/samples/window-event-context/main-v2.html b/test/runtime/samples/window-event-context/main-v2.html
new file mode 100644
index 000000000000..af60672a2ad7
--- /dev/null
+++ b/test/runtime/samples/window-event-context/main-v2.html
@@ -0,0 +1,3 @@
+<svelte:window on:click='set({ foo: !foo })'/>
+
+{foo}
\ No newline at end of file
diff --git a/test/runtime/samples/window-event-custom/main-v2.html b/test/runtime/samples/window-event-custom/main-v2.html
new file mode 100644
index 000000000000..515d5bc4caf0
--- /dev/null
+++ b/test/runtime/samples/window-event-custom/main-v2.html
@@ -0,0 +1,25 @@
+<svelte:window on:esc="set({ escaped: true })" />
+
+<p>escaped: {escaped}</p>
+
+<script>
+	export default {
+		data() {
+			return { escaped: false };
+		},
+
+		events: {
+			esc(node, callback) {
+				function onKeyDown(event) {
+					if (event.which === 27) callback(event);
+				}
+				node.addEventListener('keydown', onKeyDown);
+				return {
+					destroy() {
+						node.removeEventListener('keydown', onKeyDown);
+					}
+				};
+			}
+		}
+	};
+</script>
\ No newline at end of file

From 7576d7dc931088947d59e5e6a6b230de4294863b Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sat, 14 Apr 2018 14:05:01 -0400
Subject: [PATCH 14/15] update keyed each block syntax

---
 src/parse/state/mustache.ts                    |  6 ++++--
 .../samples/each-block-keyed/input-v2.html     |  2 +-
 .../samples/each-block-keyed/output-v2.json    | 18 +++++++++---------
 .../samples/each-block-keyed/main-v2.html      |  3 +++
 4 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 test/runtime/samples/each-block-keyed/main-v2.html

diff --git a/src/parse/state/mustache.ts b/src/parse/state/mustache.ts
index de4d00037bad..41762c2575da 100644
--- a/src/parse/state/mustache.ts
+++ b/src/parse/state/mustache.ts
@@ -274,8 +274,8 @@ export default function mustache(parser: Parser) {
 				parser.allowWhitespace();
 			}
 
-			if (parser.eat('key')) {
-				parser.requireWhitespace();
+			if (parser.eat('(')) {
+				parser.allowWhitespace();
 
 				const expression = readExpression(parser);
 
@@ -292,6 +292,8 @@ export default function mustache(parser: Parser) {
 
 				block.key = expression.property.name;
 				parser.allowWhitespace();
+				parser.eat(')', true);
+				parser.allowWhitespace();
 			} else if (parser.eat('@')) {
 				block.key = parser.readIdentifier();
 				if (!block.key) parser.error(`Expected name`);
diff --git a/test/parser/samples/each-block-keyed/input-v2.html b/test/parser/samples/each-block-keyed/input-v2.html
index 3cc00ce93e39..46348678d448 100644
--- a/test/parser/samples/each-block-keyed/input-v2.html
+++ b/test/parser/samples/each-block-keyed/input-v2.html
@@ -1,3 +1,3 @@
-{#each todos as todo key todo.id}
+{#each todos as todo (todo.id)}
 	<p>{todo}</p>
 {/each}
diff --git a/test/parser/samples/each-block-keyed/output-v2.json b/test/parser/samples/each-block-keyed/output-v2.json
index 514682b77024..461992347b74 100644
--- a/test/parser/samples/each-block-keyed/output-v2.json
+++ b/test/parser/samples/each-block-keyed/output-v2.json
@@ -1,13 +1,13 @@
 {
-	"hash": "3sm0ec",
+	"hash": "1x6az5m",
 	"html": {
 		"start": 0,
-		"end": 56,
+		"end": 54,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 56,
+				"end": 54,
 				"type": "EachBlock",
 				"expression": {
 					"type": "Identifier",
@@ -17,20 +17,20 @@
 				},
 				"children": [
 					{
-						"start": 35,
-						"end": 48,
+						"start": 33,
+						"end": 46,
 						"type": "Element",
 						"name": "p",
 						"attributes": [],
 						"children": [
 							{
-								"start": 38,
-								"end": 44,
+								"start": 36,
+								"end": 42,
 								"type": "MustacheTag",
 								"expression": {
 									"type": "Identifier",
-									"start": 39,
-									"end": 43,
+									"start": 37,
+									"end": 41,
 									"name": "todo"
 								}
 							}
diff --git a/test/runtime/samples/each-block-keyed/main-v2.html b/test/runtime/samples/each-block-keyed/main-v2.html
new file mode 100644
index 000000000000..3be42ebc77b4
--- /dev/null
+++ b/test/runtime/samples/each-block-keyed/main-v2.html
@@ -0,0 +1,3 @@
+{#each todos as todo, i (todo.id)}
+	<p>{i+1}: {todo.description}</p>
+{/each}

From 2b3fe0edc16d67d28caa18d60116269d32a8d960 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sat, 14 Apr 2018 14:17:21 -0400
Subject: [PATCH 15/15] attribute shorthand test

---
 .../samples/attribute-dynamic-shorthand/main-v2.html     | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 test/runtime/samples/attribute-dynamic-shorthand/main-v2.html

diff --git a/test/runtime/samples/attribute-dynamic-shorthand/main-v2.html b/test/runtime/samples/attribute-dynamic-shorthand/main-v2.html
new file mode 100644
index 000000000000..9bbc47727246
--- /dev/null
+++ b/test/runtime/samples/attribute-dynamic-shorthand/main-v2.html
@@ -0,0 +1,9 @@
+<div {id}/>
+
+<script>
+	export default {
+		data: () => ({
+			id: 'foo'
+		})
+	};
+</script>