diff --git a/test/hydration/index.js b/test/hydration/index.js
index e356b8670b..30647cace1 100644
--- a/test/hydration/index.js
+++ b/test/hydration/index.js
@@ -14,7 +14,7 @@ let compileOptions = null;
 
 const sveltePath = process.cwd();
 
-describe.only('hydration', () => {
+describe('hydration', () => {
 	before(() => {
 		const svelte = loadSvelte();
 
diff --git a/test/js/samples/bind-width-height/input.svelte b/test/js/samples/bind-width-height/input.svelte
index 5c53d688ba..1a3bd05eef 100644
--- a/test/js/samples/bind-width-height/input.svelte
+++ b/test/js/samples/bind-width-height/input.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let w;
+	export let h;
+</script>
+
 <div bind:offsetWidth={w} bind:offsetHeight={h}>
 	some content
 </div>
\ No newline at end of file
diff --git a/test/js/samples/debug-empty/expected.js b/test/js/samples/debug-empty/expected.js
index 4a6393388c..c0b24cd269 100644
--- a/test/js/samples/debug-empty/expected.js
+++ b/test/js/samples/debug-empty/expected.js
@@ -14,7 +14,7 @@ function create_fragment(ctx) {
 			text2 = createText("!");
 			text3 = createText("\n");
 			debugger;
-			addLoc(h1, file, 0, 0, 0);
+			addLoc(h1, file, 4, 0, 38);
 		},
 
 		l: function claim(nodes) {
diff --git a/test/js/samples/debug-empty/input.svelte b/test/js/samples/debug-empty/input.svelte
index 11da4f6d15..24f03b00c1 100644
--- a/test/js/samples/debug-empty/input.svelte
+++ b/test/js/samples/debug-empty/input.svelte
@@ -1,2 +1,6 @@
+<script>
+	export let name;
+</script>
+
 <h1>Hello {name}!</h1>
 {@debug}
\ No newline at end of file
diff --git a/test/js/samples/debug-foo-bar-baz-things/expected.js b/test/js/samples/debug-foo-bar-baz-things/expected.js
index b56d333238..9085f4dd99 100644
--- a/test/js/samples/debug-foo-bar-baz-things/expected.js
+++ b/test/js/samples/debug-foo-bar-baz-things/expected.js
@@ -9,7 +9,7 @@ function get_each_context(ctx, list, i) {
 	return child_ctx;
 }
 
-// (1:0) {#each things as thing}
+// (8:0) {#each things as thing}
 function create_each_block(ctx) {
 	var span, text0_value = ctx.thing.name, text0, text1;
 
@@ -24,7 +24,7 @@ function create_each_block(ctx) {
 				console.log({ foo, bar, baz, thing });
 				debugger;
 			}
-			addLoc(span, file, 1, 1, 25);
+			addLoc(span, file, 8, 1, 116);
 		},
 
 		m: function mount(target, anchor) {
@@ -75,7 +75,7 @@ function create_fragment(ctx) {
 			p = createElement("p");
 			text1 = createText("foo: ");
 			text2 = createText(ctx.foo);
-			addLoc(p, file, 5, 0, 91);
+			addLoc(p, file, 12, 0, 182);
 		},
 
 		l: function claim(nodes) {
diff --git a/test/js/samples/debug-foo-bar-baz-things/input.svelte b/test/js/samples/debug-foo-bar-baz-things/input.svelte
index 6fa8611415..df6095c52d 100644
--- a/test/js/samples/debug-foo-bar-baz-things/input.svelte
+++ b/test/js/samples/debug-foo-bar-baz-things/input.svelte
@@ -1,3 +1,10 @@
+<script>
+	export let things;
+	export let foo;
+	export let bar;
+	export let baz;
+</script>
+
 {#each things as thing}
 	<span>{thing.name}</span>
 	{@debug foo, bar, baz, thing}
diff --git a/test/js/samples/debug-foo/expected.js b/test/js/samples/debug-foo/expected.js
index 35d0a1f18f..128139e64b 100644
--- a/test/js/samples/debug-foo/expected.js
+++ b/test/js/samples/debug-foo/expected.js
@@ -9,7 +9,7 @@ function get_each_context(ctx, list, i) {
 	return child_ctx;
 }
 
-// (1:0) {#each things as thing}
+// (6:0) {#each things as thing}
 function create_each_block(ctx) {
 	var span, text0_value = ctx.thing.name, text0, text1;
 
@@ -24,7 +24,7 @@ function create_each_block(ctx) {
 				console.log({ foo });
 				debugger;
 			}
-			addLoc(span, file, 1, 1, 25);
+			addLoc(span, file, 6, 1, 82);
 		},
 
 		m: function mount(target, anchor) {
@@ -75,7 +75,7 @@ function create_fragment(ctx) {
 			p = createElement("p");
 			text1 = createText("foo: ");
 			text2 = createText(ctx.foo);
-			addLoc(p, file, 5, 0, 74);
+			addLoc(p, file, 10, 0, 131);
 		},
 
 		l: function claim(nodes) {
diff --git a/test/js/samples/debug-foo/input.svelte b/test/js/samples/debug-foo/input.svelte
index 6e926a4015..553f080d94 100644
--- a/test/js/samples/debug-foo/input.svelte
+++ b/test/js/samples/debug-foo/input.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let things;
+	export let foo;
+</script>
+
 {#each things as thing}
 	<span>{thing.name}</span>
 	{@debug foo}
diff --git a/test/js/samples/debug-ssr-foo/expected.js b/test/js/samples/debug-ssr-foo/expected.js
index afad023a3f..c7edd8bf0a 100644
--- a/test/js/samples/debug-ssr-foo/expected.js
+++ b/test/js/samples/debug-ssr-foo/expected.js
@@ -4,8 +4,11 @@ import { create_ssr_component, debug, each, escape } from "svelte/internal";
 const SvelteComponent = create_ssr_component(($$result, $$props, $$bindings, $$slots) => {
 	let { things, foo } = $$props;
 
+	if ($$props.things === void 0 && $$bindings.things && things !== void 0) $$bindings.things(things);
+	if ($$props.foo === void 0 && $$bindings.foo && foo !== void 0) $$bindings.foo(foo);
+
 	return `${each(things, (thing) => `<span>${escape(thing.name)}</span>
-		${debug(null, 2, 2, { foo })}`)}
+		${debug(null, 7, 2, { foo })}`)}
 
 	<p>foo: ${escape(foo)}</p>`;
 });
diff --git a/test/js/samples/debug-ssr-foo/input.svelte b/test/js/samples/debug-ssr-foo/input.svelte
index 6e926a4015..553f080d94 100644
--- a/test/js/samples/debug-ssr-foo/input.svelte
+++ b/test/js/samples/debug-ssr-foo/input.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let things;
+	export let foo;
+</script>
+
 {#each things as thing}
 	<span>{thing.name}</span>
 	{@debug foo}
diff --git a/test/js/samples/deconflict-builtins/expected.js b/test/js/samples/deconflict-builtins/expected.js
index 7ad954e330..e81a3a5c41 100644
--- a/test/js/samples/deconflict-builtins/expected.js
+++ b/test/js/samples/deconflict-builtins/expected.js
@@ -7,7 +7,7 @@ function get_each_context(ctx, list, i) {
 	return child_ctx;
 }
 
-// (1:0) {#each createElement as node}
+// (5:0) {#each createElement as node}
 function create_each_block(ctx) {
 	var span, text_value = ctx.node, text;
 
diff --git a/test/js/samples/deconflict-builtins/input.svelte b/test/js/samples/deconflict-builtins/input.svelte
index 48a413b323..01052de947 100644
--- a/test/js/samples/deconflict-builtins/input.svelte
+++ b/test/js/samples/deconflict-builtins/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let createElement;
+</script>
+
 {#each createElement as node}
 	<span>{node}</span>
 {/each}
\ No newline at end of file
diff --git a/test/js/samples/do-use-dataset/input.svelte b/test/js/samples/do-use-dataset/input.svelte
index ffd72ac6ee..e340b2610f 100644
--- a/test/js/samples/do-use-dataset/input.svelte
+++ b/test/js/samples/do-use-dataset/input.svelte
@@ -1,2 +1,6 @@
+<script>
+	export let bar;
+</script>
+
 <div data-foo='bar'/>
 <div data-foo='{bar}'/>
\ No newline at end of file
diff --git a/test/js/samples/dont-invalidate-this/expected.js b/test/js/samples/dont-invalidate-this/expected.js
index db21ccdd64..cc481d26b8 100644
--- a/test/js/samples/dont-invalidate-this/expected.js
+++ b/test/js/samples/dont-invalidate-this/expected.js
@@ -39,4 +39,4 @@ class SvelteComponent extends SvelteComponent_1 {
 	}
 }
 
-export default SvelteComponent;
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/dont-use-dataset-in-legacy/input.svelte b/test/js/samples/dont-use-dataset-in-legacy/input.svelte
index ffd72ac6ee..e340b2610f 100644
--- a/test/js/samples/dont-use-dataset-in-legacy/input.svelte
+++ b/test/js/samples/dont-use-dataset-in-legacy/input.svelte
@@ -1,2 +1,6 @@
+<script>
+	export let bar;
+</script>
+
 <div data-foo='bar'/>
 <div data-foo='{bar}'/>
\ No newline at end of file
diff --git a/test/js/samples/dont-use-dataset-in-svg/input.svelte b/test/js/samples/dont-use-dataset-in-svg/input.svelte
index fe6c4eba9b..969377de33 100644
--- a/test/js/samples/dont-use-dataset-in-svg/input.svelte
+++ b/test/js/samples/dont-use-dataset-in-svg/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let bar;
+</script>
+
 <svg>
 	<g data-foo='bar'/>
 	<g data-foo='{bar}'/>
diff --git a/test/js/samples/each-block-array-literal/expected.js b/test/js/samples/each-block-array-literal/expected.js
index b5499707c3..263b65e00c 100644
--- a/test/js/samples/each-block-array-literal/expected.js
+++ b/test/js/samples/each-block-array-literal/expected.js
@@ -7,7 +7,7 @@ function get_each_context(ctx, list, i) {
 	return child_ctx;
 }
 
-// (1:0) {#each [a, b, c, d, e] as num}
+// (9:0) {#each [a, b, c, d, e] as num}
 function create_each_block(ctx) {
 	var span, text_value = ctx.num, text;
 
diff --git a/test/js/samples/each-block-array-literal/input.svelte b/test/js/samples/each-block-array-literal/input.svelte
index aba508f711..cf25c139e0 100644
--- a/test/js/samples/each-block-array-literal/input.svelte
+++ b/test/js/samples/each-block-array-literal/input.svelte
@@ -1,3 +1,11 @@
+<script>
+	export let a;
+	export let b;
+	export let c;
+	export let d;
+	export let e;
+</script>
+
 {#each [a, b, c, d, e] as num}
 	<span>{num}</span>
 {/each}
\ No newline at end of file
diff --git a/test/js/samples/each-block-changed-check/expected.js b/test/js/samples/each-block-changed-check/expected.js
index 0032b1c720..b535c8db3f 100644
--- a/test/js/samples/each-block-changed-check/expected.js
+++ b/test/js/samples/each-block-changed-check/expected.js
@@ -8,7 +8,7 @@ function get_each_context(ctx, list, i) {
 	return child_ctx;
 }
 
-// (1:0) {#each comments as comment, i}
+// (8:0) {#each comments as comment, i}
 function create_each_block(ctx) {
 	var div, strong, text0, text1, span, text2_value = ctx.comment.author, text2, text3, text4_value = ctx.elapsed(ctx.comment.time, ctx.time), text4, text5, text6, raw_value = ctx.comment.html, raw_before;
 
diff --git a/test/js/samples/each-block-changed-check/input.svelte b/test/js/samples/each-block-changed-check/input.svelte
index b5b5703857..999b346975 100644
--- a/test/js/samples/each-block-changed-check/input.svelte
+++ b/test/js/samples/each-block-changed-check/input.svelte
@@ -1,3 +1,10 @@
+<script>
+	export let comments;
+	export let elapsed;
+	export let time;
+	export let foo;
+</script>
+
 {#each comments as comment, i}
 	<div class='comment'>
 		<strong>{i}</strong>
diff --git a/test/js/samples/each-block-keyed/expected.js b/test/js/samples/each-block-keyed/expected.js
index c2dd23fb96..b21d1a304e 100644
--- a/test/js/samples/each-block-keyed/expected.js
+++ b/test/js/samples/each-block-keyed/expected.js
@@ -7,7 +7,7 @@ function get_each_context(ctx, list, i) {
 	return child_ctx;
 }
 
-// (1:0) {#each things as thing (thing.id)}
+// (5:0) {#each things as thing (thing.id)}
 function create_each_block(key_1, ctx) {
 	var div, text_value = ctx.thing.name, text;
 
diff --git a/test/js/samples/each-block-keyed/input.svelte b/test/js/samples/each-block-keyed/input.svelte
index 909af032e9..e6493dcd58 100644
--- a/test/js/samples/each-block-keyed/input.svelte
+++ b/test/js/samples/each-block-keyed/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let things;
+</script>
+
 {#each things as thing (thing.id)}
 	<div>{thing.name}</div>
 {/each}
\ No newline at end of file
diff --git a/test/js/samples/if-block-no-update/expected.js b/test/js/samples/if-block-no-update/expected.js
index a4c9fbc163..d7030095b4 100644
--- a/test/js/samples/if-block-no-update/expected.js
+++ b/test/js/samples/if-block-no-update/expected.js
@@ -1,7 +1,7 @@
 /* generated by Svelte vX.Y.Z */
 import { SvelteComponent as SvelteComponent_1, createComment, createElement, detachNode, flush, init, insert, noop, safe_not_equal } from "svelte/internal";
 
-// (3:0) {:else}
+// (7:0) {:else}
 function create_else_block(ctx) {
 	var p;
 
@@ -23,7 +23,7 @@ function create_else_block(ctx) {
 	};
 }
 
-// (1:0) {#if foo}
+// (5:0) {#if foo}
 function create_if_block(ctx) {
 	var p;
 
diff --git a/test/js/samples/if-block-no-update/input.svelte b/test/js/samples/if-block-no-update/input.svelte
index 57de219159..c7a0f6a98c 100644
--- a/test/js/samples/if-block-no-update/input.svelte
+++ b/test/js/samples/if-block-no-update/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let foo;
+</script>
+
 {#if foo}
 	<p>foo!</p>
 {:else}
diff --git a/test/js/samples/if-block-simple/expected.js b/test/js/samples/if-block-simple/expected.js
index 76c69b000f..b549415023 100644
--- a/test/js/samples/if-block-simple/expected.js
+++ b/test/js/samples/if-block-simple/expected.js
@@ -1,7 +1,7 @@
 /* generated by Svelte vX.Y.Z */
 import { SvelteComponent as SvelteComponent_1, createComment, createElement, detachNode, flush, init, insert, noop, safe_not_equal } from "svelte/internal";
 
-// (1:0) {#if foo}
+// (5:0) {#if foo}
 function create_if_block(ctx) {
 	var p;
 
diff --git a/test/js/samples/if-block-simple/input.svelte b/test/js/samples/if-block-simple/input.svelte
index e36517e10c..545d81d44a 100644
--- a/test/js/samples/if-block-simple/input.svelte
+++ b/test/js/samples/if-block-simple/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let foo;
+</script>
+
 {#if foo}
 	<p>foo!</p>
 {/if}
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized-multiple/input.svelte b/test/js/samples/inline-style-optimized-multiple/input.svelte
index d9448e0ab0..d5e2beb609 100644
--- a/test/js/samples/inline-style-optimized-multiple/input.svelte
+++ b/test/js/samples/inline-style-optimized-multiple/input.svelte
@@ -1 +1,7 @@
+<script>
+	export let color;
+	export let x;
+	export let y;
+</script>
+
 <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/input.svelte b/test/js/samples/inline-style-optimized-url/input.svelte
index 677da52c30..2e660fe02d 100644
--- a/test/js/samples/inline-style-optimized-url/input.svelte
+++ b/test/js/samples/inline-style-optimized-url/input.svelte
@@ -1 +1,5 @@
+<script>
+	export let data;
+</script>
+
 <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/input.svelte b/test/js/samples/inline-style-optimized/input.svelte
index 004fd595c9..b47ca48093 100644
--- a/test/js/samples/inline-style-optimized/input.svelte
+++ b/test/js/samples/inline-style-optimized/input.svelte
@@ -1 +1,5 @@
+<script>
+	export let color;
+</script>
+
 <div style='color: {color}'></div>
\ No newline at end of file
diff --git a/test/js/samples/inline-style-unoptimized/input.svelte b/test/js/samples/inline-style-unoptimized/input.svelte
index eac76d5b6e..3893fa3f89 100644
--- a/test/js/samples/inline-style-unoptimized/input.svelte
+++ b/test/js/samples/inline-style-unoptimized/input.svelte
@@ -1,2 +1,8 @@
-<div style='{style}'></div>
-<div style='{key}: {value}'></div>
\ No newline at end of file
+<script>
+	export let style;
+	export let key;
+	export let value;
+</script>
+
+<div style={style}></div>
+<div style="{key}: {value}"></div>
\ No newline at end of file
diff --git a/test/js/samples/input-files/input.svelte b/test/js/samples/input-files/input.svelte
index 7c078b4885..f7d4159e37 100644
--- a/test/js/samples/input-files/input.svelte
+++ b/test/js/samples/input-files/input.svelte
@@ -1 +1,5 @@
+<script>
+	export let files;
+</script>
+
 <input type="file" multiple bind:files>
\ No newline at end of file
diff --git a/test/js/samples/input-range/input.svelte b/test/js/samples/input-range/input.svelte
index e080b9a81b..2fa0517f47 100644
--- a/test/js/samples/input-range/input.svelte
+++ b/test/js/samples/input-range/input.svelte
@@ -1 +1,5 @@
+<script>
+	export let value;
+</script>
+
 <input type=range bind:value>
\ No newline at end of file
diff --git a/test/js/samples/input-without-blowback-guard/input.svelte b/test/js/samples/input-without-blowback-guard/input.svelte
index 991c5e33ab..9c5bfa35dc 100644
--- a/test/js/samples/input-without-blowback-guard/input.svelte
+++ b/test/js/samples/input-without-blowback-guard/input.svelte
@@ -1 +1,5 @@
+<script>
+	export let foo;
+</script>
+
 <input type='checkbox' bind:checked={foo}>
\ No newline at end of file
diff --git a/test/js/samples/media-bindings/input.svelte b/test/js/samples/media-bindings/input.svelte
index 3f7a0b66d1..169d5c9341 100644
--- a/test/js/samples/media-bindings/input.svelte
+++ b/test/js/samples/media-bindings/input.svelte
@@ -1 +1,11 @@
+<script>
+	export let buffered;
+	export let seekable;
+	export let played;
+	export let currentTime;
+	export let duration;
+	export let paused;
+	export let volume;
+</script>
+
 <audio bind:buffered bind:seekable bind:played bind:currentTime bind:duration bind:paused bind:volume/>
\ No newline at end of file
diff --git a/test/js/samples/reactive-values-non-writable-dependencies/expected.js b/test/js/samples/reactive-values-non-writable-dependencies/expected.js
index deded0d4e9..45f819a311 100644
--- a/test/js/samples/reactive-values-non-writable-dependencies/expected.js
+++ b/test/js/samples/reactive-values-non-writable-dependencies/expected.js
@@ -17,7 +17,7 @@ let a = 1;
 let b = 2;
 
 function instance($$self, $$props, $$invalidate) {
-
+	
 
 	let max;
 
diff --git a/test/js/samples/select-dynamic-value/input.svelte b/test/js/samples/select-dynamic-value/input.svelte
index 2c7d174d92..4c38d8f37b 100644
--- a/test/js/samples/select-dynamic-value/input.svelte
+++ b/test/js/samples/select-dynamic-value/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let current;
+</script>
+
 <select value={current}>
 	<option value="1">1</option>
 	<option value="2">2</option>
diff --git a/test/js/samples/title/input.svelte b/test/js/samples/title/input.svelte
index 0eb2a9519d..7031f7673a 100644
--- a/test/js/samples/title/input.svelte
+++ b/test/js/samples/title/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let custom;
+</script>
+
 <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/expected.js b/test/js/samples/use-elements-as-anchors/expected.js
index 3cc4d4a09a..a371905dd7 100644
--- a/test/js/samples/use-elements-as-anchors/expected.js
+++ b/test/js/samples/use-elements-as-anchors/expected.js
@@ -1,7 +1,7 @@
 /* generated by Svelte vX.Y.Z */
 import { SvelteComponent as SvelteComponent_1, append, createComment, createElement, createText, detachNode, flush, init, insert, noop, safe_not_equal } from "svelte/internal";
 
-// (2:1) {#if a}
+// (10:1) {#if a}
 function create_if_block_4(ctx) {
 	var p;
 
@@ -23,7 +23,7 @@ function create_if_block_4(ctx) {
 	};
 }
 
-// (8:1) {#if b}
+// (16:1) {#if b}
 function create_if_block_3(ctx) {
 	var p;
 
@@ -45,7 +45,7 @@ function create_if_block_3(ctx) {
 	};
 }
 
-// (12:1) {#if c}
+// (20:1) {#if c}
 function create_if_block_2(ctx) {
 	var p;
 
@@ -67,7 +67,7 @@ function create_if_block_2(ctx) {
 	};
 }
 
-// (18:1) {#if d}
+// (26:1) {#if d}
 function create_if_block_1(ctx) {
 	var p;
 
@@ -89,7 +89,7 @@ function create_if_block_1(ctx) {
 	};
 }
 
-// (25:0) {#if e}
+// (33:0) {#if e}
 function create_if_block(ctx) {
 	var p;
 
diff --git a/test/js/samples/use-elements-as-anchors/input.svelte b/test/js/samples/use-elements-as-anchors/input.svelte
index 9c18d40f58..6bedfe833f 100644
--- a/test/js/samples/use-elements-as-anchors/input.svelte
+++ b/test/js/samples/use-elements-as-anchors/input.svelte
@@ -1,3 +1,11 @@
+<script>
+	export let a;
+	export let b;
+	export let c;
+	export let d;
+	export let e;
+</script>
+
 <div>
 	{#if a}
 		<p>a</p>
diff --git a/test/js/samples/window-binding-scroll/input.svelte b/test/js/samples/window-binding-scroll/input.svelte
index 2dc1aeffeb..f289ed4b7e 100644
--- a/test/js/samples/window-binding-scroll/input.svelte
+++ b/test/js/samples/window-binding-scroll/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let y;
+</script>
+
 <svelte:window bind:scrollY={y}/>
 
 <p>scrolled to {y}</p>
\ No newline at end of file
diff --git a/test/parser/samples/binding-shorthand/input.svelte b/test/parser/samples/binding-shorthand/input.svelte
index 7f8116bdde..6f6c51915c 100644
--- a/test/parser/samples/binding-shorthand/input.svelte
+++ b/test/parser/samples/binding-shorthand/input.svelte
@@ -1 +1,5 @@
+<script>
+	let foo;
+</script>
+
 <Widget bind:foo/>
\ No newline at end of file
diff --git a/test/parser/samples/binding-shorthand/output.json b/test/parser/samples/binding-shorthand/output.json
index 3be1db50b4..8f92101042 100644
--- a/test/parser/samples/binding-shorthand/output.json
+++ b/test/parser/samples/binding-shorthand/output.json
@@ -1,24 +1,30 @@
 {
 	"html": {
-		"start": 0,
-		"end": 18,
+		"start": 30,
+		"end": 48,
 		"type": "Fragment",
 		"children": [
 			{
-				"start": 0,
-				"end": 18,
+				"start": 28,
+				"end": 30,
+				"type": "Text",
+				"data": "\n\n"
+			},
+			{
+				"start": 30,
+				"end": 48,
 				"type": "InlineComponent",
 				"name": "Widget",
 				"attributes": [
 					{
-						"start": 8,
-						"end": 16,
+						"start": 38,
+						"end": 46,
 						"type": "Binding",
 						"name": "foo",
 						"modifiers": [],
 						"expression": {
-							"start": 13,
-							"end": 16,
+							"start": 43,
+							"end": 46,
 							"type": "Identifier",
 							"name": "foo"
 						}
@@ -28,7 +34,37 @@
 			}
 		]
 	},
-	"css": null,
-	"instance": null,
-	"module": null
+	"instance": {
+		"start": 0,
+		"end": 28,
+		"context": "default",
+		"content": {
+			"type": "Program",
+			"start": 8,
+			"end": 19,
+			"body": [
+				{
+					"type": "VariableDeclaration",
+					"start": 10,
+					"end": 18,
+					"declarations": [
+						{
+							"type": "VariableDeclarator",
+							"start": 14,
+							"end": 17,
+							"id": {
+								"type": "Identifier",
+								"start": 14,
+								"end": 17,
+								"name": "foo"
+							},
+							"init": null
+						}
+					],
+					"kind": "let"
+				}
+			],
+			"sourceType": "module"
+		}
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/binding/input.svelte b/test/parser/samples/binding/input.svelte
index d0a0feab8d..33c8b35100 100644
--- a/test/parser/samples/binding/input.svelte
+++ b/test/parser/samples/binding/input.svelte
@@ -1 +1,5 @@
+<script>
+	let name;
+</script>
+
 <input bind:value={name}>
\ No newline at end of file
diff --git a/test/parser/samples/binding/output.json b/test/parser/samples/binding/output.json
index 5dc173c2a2..d084050617 100644
--- a/test/parser/samples/binding/output.json
+++ b/test/parser/samples/binding/output.json
@@ -1,25 +1,31 @@
 {
 	"html": {
-		"start": 0,
-		"end": 25,
+		"start": 31,
+		"end": 56,
 		"type": "Fragment",
 		"children": [
 			{
-				"start": 0,
-				"end": 25,
+				"start": 29,
+				"end": 31,
+				"type": "Text",
+				"data": "\n\n"
+			},
+			{
+				"start": 31,
+				"end": 56,
 				"type": "Element",
 				"name": "input",
 				"attributes": [
 					{
-						"start": 7,
-						"end": 24,
+						"start": 38,
+						"end": 55,
 						"type": "Binding",
 						"name": "value",
 						"modifiers": [],
 						"expression": {
 							"type": "Identifier",
-							"start": 19,
-							"end": 23,
+							"start": 50,
+							"end": 54,
 							"name": "name"
 						}
 					}
@@ -28,7 +34,37 @@
 			}
 		]
 	},
-	"css": null,
-	"instance": null,
-	"module": null
+	"instance": {
+		"start": 0,
+		"end": 29,
+		"context": "default",
+		"content": {
+			"type": "Program",
+			"start": 8,
+			"end": 20,
+			"body": [
+				{
+					"type": "VariableDeclaration",
+					"start": 10,
+					"end": 19,
+					"declarations": [
+						{
+							"type": "VariableDeclarator",
+							"start": 14,
+							"end": 18,
+							"id": {
+								"type": "Identifier",
+								"start": 14,
+								"end": 18,
+								"name": "name"
+							},
+							"init": null
+						}
+					],
+					"kind": "let"
+				}
+			],
+			"sourceType": "module"
+		}
+	}
 }
\ No newline at end of file
diff --git a/test/parser/samples/refs/input.svelte b/test/parser/samples/refs/input.svelte
index 8db9a2bcfc..556cae70db 100644
--- a/test/parser/samples/refs/input.svelte
+++ b/test/parser/samples/refs/input.svelte
@@ -1 +1,5 @@
+<script>
+	let foo;
+</script>
+
 <canvas bind:this={foo}></canvas>
\ No newline at end of file
diff --git a/test/parser/samples/refs/output.json b/test/parser/samples/refs/output.json
index 2cf5054304..d15753b0a2 100644
--- a/test/parser/samples/refs/output.json
+++ b/test/parser/samples/refs/output.json
@@ -1,25 +1,31 @@
 {
 	"html": {
-		"start": 0,
-		"end": 33,
+		"start": 30,
+		"end": 63,
 		"type": "Fragment",
 		"children": [
 			{
-				"start": 0,
-				"end": 33,
+				"start": 28,
+				"end": 30,
+				"type": "Text",
+				"data": "\n\n"
+			},
+			{
+				"start": 30,
+				"end": 63,
 				"type": "Element",
 				"name": "canvas",
 				"attributes": [
 					{
-						"start": 8,
-						"end": 23,
+						"start": 38,
+						"end": 53,
 						"type": "Binding",
 						"name": "this",
 						"modifiers": [],
 						"expression": {
 							"type": "Identifier",
-							"start": 19,
-							"end": 22,
+							"start": 49,
+							"end": 52,
 							"name": "foo"
 						}
 					}
@@ -28,7 +34,37 @@
 			}
 		]
 	},
-	"css": null,
-	"instance": null,
-	"module": null
+	"instance": {
+		"start": 0,
+		"end": 28,
+		"context": "default",
+		"content": {
+			"type": "Program",
+			"start": 8,
+			"end": 19,
+			"body": [
+				{
+					"type": "VariableDeclaration",
+					"start": 10,
+					"end": 18,
+					"declarations": [
+						{
+							"type": "VariableDeclarator",
+							"start": 14,
+							"end": 17,
+							"id": {
+								"type": "Identifier",
+								"start": 14,
+								"end": 17,
+								"name": "foo"
+							},
+							"init": null
+						}
+					],
+					"kind": "let"
+				}
+			],
+			"sourceType": "module"
+		}
+	}
 }
\ No newline at end of file