diff --git a/src/compile/Component.ts b/src/compile/Component.ts
index 004ecb32ca..62c2931f62 100644
--- a/src/compile/Component.ts
+++ b/src/compile/Component.ts
@@ -169,15 +169,6 @@ export default class Component {
 
 			const variable = this.var_lookup.get(subscribable_name);
 			variable.subscribable = true;
-		} else if (!this.ast.instance) {
-			this.add_var({
-				name,
-				export_name: name,
-				implicit: true,
-				mutated: false,
-				referenced: true,
-				writable: true
-			});
 		} else {
 			this.usedNames.add(name);
 		}
@@ -1140,7 +1131,7 @@ export default class Component {
 		return `ctx.${name}`;
 	}
 
-	warn_if_undefined(node, template_scope: TemplateScope, allow_implicit?: boolean) {
+	warn_if_undefined(node, template_scope: TemplateScope) {
 		let { name } = node;
 
 		if (name[0] === '$') {
@@ -1148,14 +1139,16 @@ export default class Component {
 			this.has_reactive_assignments = true;
 		}
 
-		if (allow_implicit && !this.ast.instance && !this.ast.module) return;
 		if (this.var_lookup.has(name)) return;
 		if (template_scope && template_scope.names.has(name)) return;
 		if (globalWhitelist.has(name)) return;
 
+		let message = `'${name}' is not defined`;
+		if (!this.ast.instance) message += `. Consider adding a <script> block with 'export let ${name}' to declare a prop`;
+
 		this.warn(node, {
 			code: 'missing-declaration',
-			message: `'${name}' is not defined`
+			message
 		});
 	}
 }
diff --git a/src/compile/render-dom/index.ts b/src/compile/render-dom/index.ts
index b6b266f27f..bb67b78d9f 100644
--- a/src/compile/render-dom/index.ts
+++ b/src/compile/render-dom/index.ts
@@ -323,28 +323,6 @@ export default function dom(
 		addToSet(all_reactive_dependencies, d.dependencies);
 	});
 
-	let user_code;
-
-	if (component.javascript) {
-		user_code = component.javascript;
-	} else {
-		if (!component.ast.instance && !component.ast.module && (filtered_props.length > 0 || uses_props)) {
-			const statements = [];
-
-			if (filtered_props.length > 0) statements.push(`let { ${filtered_props.map(x => x.name).join(', ')} } = $$props;`);
-
-			reactive_stores.forEach(({ name }) => {
-				if (component.compileOptions.dev) {
-					statements.push(`${component.compileOptions.dev && `@validate_store(${name.slice(1)}, '${name.slice(1)}');`}`);
-				}
-
-				statements.push(`@subscribe($$self, ${name.slice(1)}, $$value => { ${name} = $$value; $$invalidate('${name}', ${name}); });`);
-			});
-
-			user_code = statements.join('\n');
-		}
-	}
-
 	const reactive_store_subscriptions = reactive_stores
 		.filter(store => {
 			const variable = component.var_lookup.get(store.name.slice(1));
@@ -407,7 +385,7 @@ export default function dom(
 
 				${resubscribable_reactive_store_unsubscribers}
 
-				${user_code}
+				${component.javascript}
 
 				${renderer.slots.size && `let { ${[...renderer.slots].map(name => `$$slot_${sanitize(name)}`).join(', ')}, $$scope } = $$props;`}
 
diff --git a/src/compile/render-ssr/index.ts b/src/compile/render-ssr/index.ts
index f4ea4d7f3a..64846f36cb 100644
--- a/src/compile/render-ssr/index.ts
+++ b/src/compile/render-ssr/index.ts
@@ -40,8 +40,6 @@ export default function ssr(
 	// TODO remove this, just use component.vars everywhere
 	const props = component.vars.filter(variable => !variable.module && variable.export_name);
 
-	let user_code;
-
 	if (component.javascript) {
 		component.rewrite_props(({ name }) => {
 			const value = `$${name}`;
@@ -56,22 +54,6 @@ export default function ssr(
 
 			return insert;
 		});
-
-		user_code = component.javascript;
-	} else if (!component.ast.instance && !component.ast.module && (props.length > 0 || component.var_lookup.has('$$props'))) {
-		const statements = [];
-
-		if (props.length > 0) statements.push(`let { ${props.map(x => x.name).join(', ')} } = $$props;`);
-
-		reactive_stores.forEach(({ name }) => {
-			if (component.compileOptions.dev) {
-				statements.push(`${component.compileOptions.dev && `@validate_store(${name.slice(1)}, '${name.slice(1)}');`}`);
-			}
-
-			statements.push(`${name} = @get_store_value(${name.slice(1)});`);
-		});
-
-		user_code = statements.join('\n');
 	}
 
 	// TODO only do this for props with a default value
@@ -121,7 +103,7 @@ export default function ssr(
 				return name;
 			})
 			.join(', ')};`,
-		user_code,
+		component.javascript,
 		parent_bindings.join('\n'),
 		css.code && `$$result.css.add(#css);`,
 		main
diff --git a/src/interfaces.ts b/src/interfaces.ts
index 4ec258c94a..b3e778a48b 100644
--- a/src/interfaces.ts
+++ b/src/interfaces.ts
@@ -85,7 +85,6 @@ export interface Var {
 
 	// used internally, but not exposed
 	global?: boolean;
-	implicit?: boolean; // logic-less template references
 	internal?: boolean; // event handlers, bindings
 	initialised?: boolean;
 	hoistable?: boolean;
diff --git a/test/css/samples/nested/input.svelte b/test/css/samples/nested/input.svelte
index 525860acbe..2f97681c74 100644
--- a/test/css/samples/nested/input.svelte
+++ b/test/css/samples/nested/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let dynamic;
+</script>
+
 <span class='foo'>
 	<span class='bar'>text</span>
 </span>
diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/input.svelte b/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/input.svelte
index dda0d98c7c..e66777cd08 100644
--- a/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/input.svelte
+++ b/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let dynamic;
+</script>
+
 <div>
 	<p data-foo='{dynamic}'>this is styled</p>
 	<p data-foo='baz'>this is unstyled</p>
diff --git a/test/css/samples/spread/input.svelte b/test/css/samples/spread/input.svelte
index ab5f2e937e..aa43e4ae11 100644
--- a/test/css/samples/spread/input.svelte
+++ b/test/css/samples/spread/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let props;
+</script>
+
 <div {...props} >
 	Big red Comic Sans
 </div>
diff --git a/test/css/samples/unused-selector-ternary/_config.js b/test/css/samples/unused-selector-ternary/_config.js
index 68254477d9..4ff2713108 100644
--- a/test/css/samples/unused-selector-ternary/_config.js
+++ b/test/css/samples/unused-selector-ternary/_config.js
@@ -8,22 +8,22 @@ export default {
 		code: `css-unused-selector`,
 		message: "Unused CSS selector",
 		start: {
-			line: 12,
+			line: 16,
 			column: 1,
-			character: 123
+			character: 163
 		},
 		end: {
-			line: 12,
+			line: 16,
 			column: 13,
-			character: 135
+			character: 175
 		},
-		pos: 123,
+		pos: 163,
 		frame: `
-			10:   }
-			11:
-			12:   .maybeactive {
+			14:   }
+			15:
+			16:   .maybeactive {
 			      ^
-			13:     color: green;
-			14:   }`
+			17:     color: green;
+			18:   }`
 	}]
 };
\ No newline at end of file
diff --git a/test/css/samples/unused-selector-ternary/input.svelte b/test/css/samples/unused-selector-ternary/input.svelte
index 728dfa766a..f72592834f 100644
--- a/test/css/samples/unused-selector-ternary/input.svelte
+++ b/test/css/samples/unused-selector-ternary/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let active;
+</script>
+
 <div class='{active ? "active": "inactive"}'></div>
 
 <style>
diff --git a/test/hydration/samples/binding-input/main.svelte b/test/hydration/samples/binding-input/main.svelte
index e521cf7f9e..c26eb9d595 100644
--- a/test/hydration/samples/binding-input/main.svelte
+++ b/test/hydration/samples/binding-input/main.svelte
@@ -1,2 +1,6 @@
+<script>
+	export let name;
+</script>
+
 <input bind:value={name}>
 <p>Hello {name}!</p>
\ No newline at end of file
diff --git a/test/hydration/samples/dynamic-text-changed/main.svelte b/test/hydration/samples/dynamic-text-changed/main.svelte
index 543c6059c4..8532c94ac9 100644
--- a/test/hydration/samples/dynamic-text-changed/main.svelte
+++ b/test/hydration/samples/dynamic-text-changed/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let name;
+</script>
+
 <h1>Hello {name}!</h1>
\ No newline at end of file
diff --git a/test/hydration/samples/dynamic-text/main.svelte b/test/hydration/samples/dynamic-text/main.svelte
index 543c6059c4..8532c94ac9 100644
--- a/test/hydration/samples/dynamic-text/main.svelte
+++ b/test/hydration/samples/dynamic-text/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let name;
+</script>
+
 <h1>Hello {name}!</h1>
\ No newline at end of file
diff --git a/test/hydration/samples/each-block-arg-clash/main.svelte b/test/hydration/samples/each-block-arg-clash/main.svelte
index 7f04cd5e2f..a25f661fc7 100644
--- a/test/hydration/samples/each-block-arg-clash/main.svelte
+++ b/test/hydration/samples/each-block-arg-clash/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let things;
+</script>
+
 <ul>
 	{#each things.foo as foo}
 		<li>{foo}</li>
diff --git a/test/hydration/samples/each-block/main.svelte b/test/hydration/samples/each-block/main.svelte
index 6c5973e9a4..a75df5740b 100644
--- a/test/hydration/samples/each-block/main.svelte
+++ b/test/hydration/samples/each-block/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let things;
+</script>
+
 <ul>
 	{#each things as thing}
 		<li>{thing}</li>
diff --git a/test/hydration/samples/element-attribute-added/main.svelte b/test/hydration/samples/element-attribute-added/main.svelte
index c47595732e..c33bc0981c 100644
--- a/test/hydration/samples/element-attribute-added/main.svelte
+++ b/test/hydration/samples/element-attribute-added/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let className;
+</script>
+
 <div class={className}></div>
\ No newline at end of file
diff --git a/test/hydration/samples/event-handler/main.svelte b/test/hydration/samples/event-handler/main.svelte
index d51636617f..3d1a05ed3e 100644
--- a/test/hydration/samples/event-handler/main.svelte
+++ b/test/hydration/samples/event-handler/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	let clicked;
+</script>
+
 <button on:click='{() => clicked = true}'>click me</button>
 
 {#if clicked}
diff --git a/test/hydration/samples/if-block-anchor/main.svelte b/test/hydration/samples/if-block-anchor/main.svelte
index 59ea50e259..f52627cdd6 100644
--- a/test/hydration/samples/if-block-anchor/main.svelte
+++ b/test/hydration/samples/if-block-anchor/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let foo;
+	export let bar;
+</script>
+
 <div>
 	{#if foo}
 		<p>foo!</p>
diff --git a/test/hydration/samples/if-block-false/main.svelte b/test/hydration/samples/if-block-false/main.svelte
index 5a91401cdb..d2d4e411a0 100644
--- a/test/hydration/samples/if-block-false/main.svelte
+++ b/test/hydration/samples/if-block-false/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let foo;
+</script>
+
 <p>before</p>
 {#if foo}
 	<p>foo!</p>
diff --git a/test/hydration/samples/if-block-update/main.svelte b/test/hydration/samples/if-block-update/main.svelte
index b43dab708f..5c22693283 100644
--- a/test/hydration/samples/if-block-update/main.svelte
+++ b/test/hydration/samples/if-block-update/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let foo;
+	export let bar;
+</script>
+
 {#if foo}
 	<p>foo!</p>
 {/if}
diff --git a/test/hydration/samples/if-block/main.svelte b/test/hydration/samples/if-block/main.svelte
index e36517e10c..545d81d44a 100644
--- a/test/hydration/samples/if-block/main.svelte
+++ b/test/hydration/samples/if-block/main.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/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
diff --git a/test/runtime/samples/attribute-boolean-indeterminate/main.svelte b/test/runtime/samples/attribute-boolean-indeterminate/main.svelte
index ad065fbd13..3ce99d698e 100644
--- a/test/runtime/samples/attribute-boolean-indeterminate/main.svelte
+++ b/test/runtime/samples/attribute-boolean-indeterminate/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let indeterminate;
+</script>
+
 <input type='checkbox' indeterminate='{indeterminate}'>
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-dynamic-multiple/main.svelte b/test/runtime/samples/attribute-dynamic-multiple/main.svelte
index 4cf451668b..1d87cd9b2e 100644
--- a/test/runtime/samples/attribute-dynamic-multiple/main.svelte
+++ b/test/runtime/samples/attribute-dynamic-multiple/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let items;
+</script>
+
 {#each items as item, i}
 	<div class='{item.foo ? "foo" : ""} {item.bar ? "bar" : ""}'>{i + 1}</div>
 {/each}
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-dynamic-type/main.svelte b/test/runtime/samples/attribute-dynamic-type/main.svelte
index 3aa25e3026..c8d7dd817e 100644
--- a/test/runtime/samples/attribute-dynamic-type/main.svelte
+++ b/test/runtime/samples/attribute-dynamic-type/main.svelte
@@ -1 +1,6 @@
+<script>
+	export let inputType;
+	export let inputValue;
+</script>
+
 <input type='{inputType}' value='{inputValue}'>
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-namespaced/main.svelte b/test/runtime/samples/attribute-namespaced/main.svelte
index 57c7286ed9..63cae9e77f 100644
--- a/test/runtime/samples/attribute-namespaced/main.svelte
+++ b/test/runtime/samples/attribute-namespaced/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let foo;
+</script>
+
 <svg>
 	<use xlink:href="#{foo}"/>
 </svg>
\ No newline at end of file
diff --git a/test/runtime/samples/attribute-partial-number/Component.svelte b/test/runtime/samples/attribute-partial-number/Component.svelte
index 039386e88b..02995c7e80 100644
--- a/test/runtime/samples/attribute-partial-number/Component.svelte
+++ b/test/runtime/samples/attribute-partial-number/Component.svelte
@@ -1 +1,5 @@
+<script>
+	export let value;
+</script>
+
 <p data-value="{value}"></p>
diff --git a/test/runtime/samples/attribute-prefer-expression/main.svelte b/test/runtime/samples/attribute-prefer-expression/main.svelte
index 2dd12ded4f..5874626d94 100644
--- a/test/runtime/samples/attribute-prefer-expression/main.svelte
+++ b/test/runtime/samples/attribute-prefer-expression/main.svelte
@@ -1,2 +1,6 @@
+<script>
+	export let foo;
+</script>
+
 <input type='radio' bind:group={foo} value='{false}'>
 <input type='radio' bind:group={foo} value='{true}'>
\ No newline at end of file
diff --git a/test/runtime/samples/await-containing-if/main.svelte b/test/runtime/samples/await-containing-if/main.svelte
index cab07e6499..c7472fd5d7 100644
--- a/test/runtime/samples/await-containing-if/main.svelte
+++ b/test/runtime/samples/await-containing-if/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let thePromise;
+	export let show;
+</script>
+
 <div>
 	{#await thePromise}
 		<p>loading...</p>
diff --git a/test/runtime/samples/await-in-each/main.svelte b/test/runtime/samples/await-in-each/main.svelte
index a928f933aa..8ad9578f25 100644
--- a/test/runtime/samples/await-in-each/main.svelte
+++ b/test/runtime/samples/await-in-each/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let items;
+</script>
+
 {#each items as item}
 	{#await item.data}
 		<p>{item.title}: loading...</p>
diff --git a/test/runtime/samples/await-set-simultaneous/main.svelte b/test/runtime/samples/await-set-simultaneous/main.svelte
index fa32f62f63..638b5e5251 100644
--- a/test/runtime/samples/await-set-simultaneous/main.svelte
+++ b/test/runtime/samples/await-set-simultaneous/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let promise;
+	export let answer;
+</script>
+
 {#if promise}
 	{#await promise}
 		<p>wait for it...</p>
diff --git a/test/runtime/samples/await-then-catch-anchor/main.svelte b/test/runtime/samples/await-then-catch-anchor/main.svelte
index 30a7589e3f..efa66bf7f4 100644
--- a/test/runtime/samples/await-then-catch-anchor/main.svelte
+++ b/test/runtime/samples/await-then-catch-anchor/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let thePromise;
+</script>
+
 <div>
 {#await thePromise}
 <p>loading...</p>
diff --git a/test/runtime/samples/await-then-catch-if/main.svelte b/test/runtime/samples/await-then-catch-if/main.svelte
index f0d6243d31..0759a083d5 100644
--- a/test/runtime/samples/await-then-catch-if/main.svelte
+++ b/test/runtime/samples/await-then-catch-if/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let show;
+	export let thePromise;
+</script>
+
 {#if show}
 	{#await thePromise}
 		<p>loading...</p>
diff --git a/test/runtime/samples/await-then-catch-multiple/main.svelte b/test/runtime/samples/await-then-catch-multiple/main.svelte
index 34cdcb9604..552b4c906f 100644
--- a/test/runtime/samples/await-then-catch-multiple/main.svelte
+++ b/test/runtime/samples/await-then-catch-multiple/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let thePromise;
+</script>
+
 {#await thePromise}
 	<p>loading...</p>
 {:then theValue}
diff --git a/test/runtime/samples/await-then-catch-no-values/main.svelte b/test/runtime/samples/await-then-catch-no-values/main.svelte
index f53591990a..2e72f4a81a 100644
--- a/test/runtime/samples/await-then-catch-no-values/main.svelte
+++ b/test/runtime/samples/await-then-catch-no-values/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let thePromise;
+</script>
+
 {#await thePromise}
 	waiting
 {:then}
diff --git a/test/runtime/samples/await-then-catch-non-promise/main.svelte b/test/runtime/samples/await-then-catch-non-promise/main.svelte
index 79f5162ace..0b842bae3b 100644
--- a/test/runtime/samples/await-then-catch-non-promise/main.svelte
+++ b/test/runtime/samples/await-then-catch-non-promise/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let thePromise;
+</script>
+
 {#await thePromise}
 	<p>loading...</p>
 {:then theValue}
diff --git a/test/runtime/samples/await-then-catch-order/main.svelte b/test/runtime/samples/await-then-catch-order/main.svelte
index 87b37bf27d..e64e05a464 100644
--- a/test/runtime/samples/await-then-catch-order/main.svelte
+++ b/test/runtime/samples/await-then-catch-order/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let thePromise;
+</script>
+
 {#await thePromise}
 	<p>loading...</p>
 {:then theValue}
diff --git a/test/runtime/samples/await-then-catch-static/main.svelte b/test/runtime/samples/await-then-catch-static/main.svelte
index b420fe969c..67e08f542a 100644
--- a/test/runtime/samples/await-then-catch-static/main.svelte
+++ b/test/runtime/samples/await-then-catch-static/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let promise;
+</script>
+
 {#await promise}
 	<p>loading...</p>
 {:then value}
diff --git a/test/runtime/samples/await-then-catch/main.svelte b/test/runtime/samples/await-then-catch/main.svelte
index 79f5162ace..0b842bae3b 100644
--- a/test/runtime/samples/await-then-catch/main.svelte
+++ b/test/runtime/samples/await-then-catch/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let thePromise;
+</script>
+
 {#await thePromise}
 	<p>loading...</p>
 {:then theValue}
diff --git a/test/runtime/samples/await-then-shorthand/main.svelte b/test/runtime/samples/await-then-shorthand/main.svelte
index aa2e3a76b2..ae444afba7 100644
--- a/test/runtime/samples/await-then-shorthand/main.svelte
+++ b/test/runtime/samples/await-then-shorthand/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let thePromise;
+</script>
+
 {#await thePromise then theValue}
 	<p>the value is {theValue}</p>
 {:catch theError}
diff --git a/test/runtime/samples/binding-audio-currenttime-duration-volume/main.svelte b/test/runtime/samples/binding-audio-currenttime-duration-volume/main.svelte
index 929dc42545..68bef624bc 100644
--- a/test/runtime/samples/binding-audio-currenttime-duration-volume/main.svelte
+++ b/test/runtime/samples/binding-audio-currenttime-duration-volume/main.svelte
@@ -1,2 +1,9 @@
+<script>
+	export let t;
+	export let d;
+	export let paused;
+	export let v;
+</script>
+
 <audio bind:currentTime={t} bind:duration={d} bind:paused bind:volume={v}
 	src='music.mp3'></audio>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-indirect/main.svelte b/test/runtime/samples/binding-indirect/main.svelte
index 4f455b3854..0fb0d9d4c9 100644
--- a/test/runtime/samples/binding-indirect/main.svelte
+++ b/test/runtime/samples/binding-indirect/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let selected;
+	export let tasks;
+</script>
+
 <select bind:value={selected}>
 	{#each tasks as task}
 		<option value='{task}'>{task.description}</option>
diff --git a/test/runtime/samples/binding-input-checkbox-group-outside-each/main.svelte b/test/runtime/samples/binding-input-checkbox-group-outside-each/main.svelte
index 1eb5f04ccb..10593c1379 100644
--- a/test/runtime/samples/binding-input-checkbox-group-outside-each/main.svelte
+++ b/test/runtime/samples/binding-input-checkbox-group-outside-each/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let selected;
+	export let values;
+</script>
+
 <label>
 	<input type="checkbox" value="{values[0]}" bind:group={selected} /> {values[0].name}
 </label>
diff --git a/test/runtime/samples/binding-input-checkbox-group/main.svelte b/test/runtime/samples/binding-input-checkbox-group/main.svelte
index bb9bb0abc3..0a6ad19192 100644
--- a/test/runtime/samples/binding-input-checkbox-group/main.svelte
+++ b/test/runtime/samples/binding-input-checkbox-group/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let selected;
+	export let values;
+</script>
+
 {#each values as value}
 	<label>
 		<input type="checkbox" value="{value}" bind:group={selected} /> {value.name}
diff --git a/test/runtime/samples/binding-input-checkbox-indeterminate/main.svelte b/test/runtime/samples/binding-input-checkbox-indeterminate/main.svelte
index 282d9f22e3..712d3180e6 100644
--- a/test/runtime/samples/binding-input-checkbox-indeterminate/main.svelte
+++ b/test/runtime/samples/binding-input-checkbox-indeterminate/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let checked;
+	export let indeterminate;
+</script>
+
 <input type='checkbox' bind:checked bind:indeterminate>
 <p>checked? {checked}</p>
 <p>indeterminate? {indeterminate}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-checkbox/main.svelte b/test/runtime/samples/binding-input-checkbox/main.svelte
index 4adfcdf8b8..1543be0d3c 100644
--- a/test/runtime/samples/binding-input-checkbox/main.svelte
+++ b/test/runtime/samples/binding-input-checkbox/main.svelte
@@ -1,2 +1,6 @@
+<script>
+	export let foo;
+</script>
+
 <input type='checkbox' bind:checked={foo}>
 <p>{foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-number/main.svelte b/test/runtime/samples/binding-input-number/main.svelte
index 3e0edea1c5..e45b09f92c 100644
--- a/test/runtime/samples/binding-input-number/main.svelte
+++ b/test/runtime/samples/binding-input-number/main.svelte
@@ -1,2 +1,6 @@
+<script>
+	export let count;
+</script>
+
 <input type='number' bind:value={count}>
 <p>{typeof count} {count}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-radio-group/main.svelte b/test/runtime/samples/binding-input-radio-group/main.svelte
index cd13f1f3ae..c24623a860 100644
--- a/test/runtime/samples/binding-input-radio-group/main.svelte
+++ b/test/runtime/samples/binding-input-radio-group/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let selected;
+	export let values;
+</script>
+
 {#each values as value}
 	<label>
 		<input type="radio" value="{value}" bind:group={selected} /> {value.name}
diff --git a/test/runtime/samples/binding-input-range-change/main.svelte b/test/runtime/samples/binding-input-range-change/main.svelte
index bf74042e21..9b20b0f02a 100644
--- a/test/runtime/samples/binding-input-range-change/main.svelte
+++ b/test/runtime/samples/binding-input-range-change/main.svelte
@@ -1,2 +1,6 @@
+<script>
+	export let count;
+</script>
+
 <input type='range' bind:value={count}>
 <p>{typeof count} {count}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-range/main.svelte b/test/runtime/samples/binding-input-range/main.svelte
index bf74042e21..9b20b0f02a 100644
--- a/test/runtime/samples/binding-input-range/main.svelte
+++ b/test/runtime/samples/binding-input-range/main.svelte
@@ -1,2 +1,6 @@
+<script>
+	export let count;
+</script>
+
 <input type='range' bind:value={count}>
 <p>{typeof count} {count}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-text-contextual-deconflicted/main.svelte b/test/runtime/samples/binding-input-text-contextual-deconflicted/main.svelte
index ebaa1eda71..e9ffde2fb9 100644
--- a/test/runtime/samples/binding-input-text-contextual-deconflicted/main.svelte
+++ b/test/runtime/samples/binding-input-text-contextual-deconflicted/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let foo;
+	export let items;
+</script>
+
 <div><input bind:value={foo}><p>{foo}</p></div>
 
 {#each items as bar}
diff --git a/test/runtime/samples/binding-input-text-contextual/main.svelte b/test/runtime/samples/binding-input-text-contextual/main.svelte
index 6b6b57a353..a73342ae6b 100644
--- a/test/runtime/samples/binding-input-text-contextual/main.svelte
+++ b/test/runtime/samples/binding-input-text-contextual/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let items;
+</script>
+
 {#each items as item}
 	<div><input bind:value={item}><p>{item}</p></div>
 {/each}
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-text-deconflicted/main.svelte b/test/runtime/samples/binding-input-text-deconflicted/main.svelte
index e349b3779f..8b6f0191ec 100644
--- a/test/runtime/samples/binding-input-text-deconflicted/main.svelte
+++ b/test/runtime/samples/binding-input-text-deconflicted/main.svelte
@@ -1,2 +1,6 @@
+<script>
+	export let component;
+</script>
+
 <h1>Hello {component.name}!</h1>
 <input bind:value={component.name}/>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-text-deep-computed-dynamic/main.svelte b/test/runtime/samples/binding-input-text-deep-computed-dynamic/main.svelte
index a6d438c07d..abd5da8a84 100644
--- a/test/runtime/samples/binding-input-text-deep-computed-dynamic/main.svelte
+++ b/test/runtime/samples/binding-input-text-deep-computed-dynamic/main.svelte
@@ -1,2 +1,7 @@
+<script>
+	export let obj;
+	export let prop;
+</script>
+
 <input bind:value={obj[prop]}>
 <pre>{JSON.stringify(obj)}</pre>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-text-deep-computed/main.svelte b/test/runtime/samples/binding-input-text-deep-computed/main.svelte
index 3a0df8a133..29fd1f0511 100644
--- a/test/runtime/samples/binding-input-text-deep-computed/main.svelte
+++ b/test/runtime/samples/binding-input-text-deep-computed/main.svelte
@@ -1,2 +1,7 @@
+<script>
+	export let user;
+	export let prop;
+</script>
+
 <input bind:value={user[prop]}>
 <p>hello {user.name}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-text-deep-contextual-computed-dynamic/main.svelte b/test/runtime/samples/binding-input-text-deep-contextual-computed-dynamic/main.svelte
index c4cb5878f5..163f6fbb18 100644
--- a/test/runtime/samples/binding-input-text-deep-contextual-computed-dynamic/main.svelte
+++ b/test/runtime/samples/binding-input-text-deep-contextual-computed-dynamic/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let objects;
+	export let prop;
+</script>
+
 {#each objects as obj}
 	<input bind:value={obj[prop]}>
 	<pre>{JSON.stringify(obj)}</pre>
diff --git a/test/runtime/samples/binding-input-text-deep-contextual/main.svelte b/test/runtime/samples/binding-input-text-deep-contextual/main.svelte
index f6a1e7e525..fbc019d669 100644
--- a/test/runtime/samples/binding-input-text-deep-contextual/main.svelte
+++ b/test/runtime/samples/binding-input-text-deep-contextual/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let items;
+</script>
+
 {#each items as item}
 	<div><input bind:value={item.description}><p>{item.description}</p></div>
 {/each}
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-text-deep/main.svelte b/test/runtime/samples/binding-input-text-deep/main.svelte
index b4cf2b2ef7..f517e08c39 100644
--- a/test/runtime/samples/binding-input-text-deep/main.svelte
+++ b/test/runtime/samples/binding-input-text-deep/main.svelte
@@ -1,2 +1,6 @@
+<script>
+	export let user;
+</script>
+
 <input bind:value={user.name}>
 <p>hello {user.name}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-text/main.svelte b/test/runtime/samples/binding-input-text/main.svelte
index 733af3474c..558dc9d538 100644
--- a/test/runtime/samples/binding-input-text/main.svelte
+++ b/test/runtime/samples/binding-input-text/main.svelte
@@ -1,2 +1,6 @@
+<script>
+	export let name;
+</script>
+
 <input bind:value={name}>
 <p>hello {name}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-input-with-event/main.svelte b/test/runtime/samples/binding-input-with-event/main.svelte
index 8f7ed26f25..944099d370 100644
--- a/test/runtime/samples/binding-input-with-event/main.svelte
+++ b/test/runtime/samples/binding-input-with-event/main.svelte
@@ -1 +1,6 @@
+<script>
+	export let a;
+	export let b;
+</script>
+
 <input bind:value={a} on:input='{() => b = 0}'>
\ No newline at end of file
diff --git a/test/runtime/samples/binding-select-implicit-option-value/main.svelte b/test/runtime/samples/binding-select-implicit-option-value/main.svelte
index c743caebdb..a6078d13c6 100644
--- a/test/runtime/samples/binding-select-implicit-option-value/main.svelte
+++ b/test/runtime/samples/binding-select-implicit-option-value/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let foo;
+	export let values;
+</script>
+
 <select bind:value={foo}>
 	{#each values as v}
 		<option>{v}</option>
diff --git a/test/runtime/samples/binding-select-initial-value-undefined/main.svelte b/test/runtime/samples/binding-select-initial-value-undefined/main.svelte
index 1e4b70df6f..5cb1e9fae7 100644
--- a/test/runtime/samples/binding-select-initial-value-undefined/main.svelte
+++ b/test/runtime/samples/binding-select-initial-value-undefined/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let selected;
+</script>
+
 <p>selected: {selected}</p>
 
 <select bind:value={selected}>
diff --git a/test/runtime/samples/binding-select-initial-value/main.svelte b/test/runtime/samples/binding-select-initial-value/main.svelte
index 1e4b70df6f..5cb1e9fae7 100644
--- a/test/runtime/samples/binding-select-initial-value/main.svelte
+++ b/test/runtime/samples/binding-select-initial-value/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let selected;
+</script>
+
 <p>selected: {selected}</p>
 
 <select bind:value={selected}>
diff --git a/test/runtime/samples/binding-select-late/main.svelte b/test/runtime/samples/binding-select-late/main.svelte
index 6c1d2973a2..52cc14528a 100644
--- a/test/runtime/samples/binding-select-late/main.svelte
+++ b/test/runtime/samples/binding-select-late/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let selected;
+	export let items;
+</script>
+
 <select bind:value={selected}>
 	{#each items as item}
 		<option>{item}</option>
diff --git a/test/runtime/samples/binding-select-multiple/main.svelte b/test/runtime/samples/binding-select-multiple/main.svelte
index e97c988c4c..2710d3461d 100644
--- a/test/runtime/samples/binding-select-multiple/main.svelte
+++ b/test/runtime/samples/binding-select-multiple/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let selected;
+</script>
+
 <select multiple bind:value={selected}>
 	<option>one</option>
 	<option>two</option>
diff --git a/test/runtime/samples/binding-select-optgroup/main.svelte b/test/runtime/samples/binding-select-optgroup/main.svelte
index 0a4ef44eb0..faea77cd57 100644
--- a/test/runtime/samples/binding-select-optgroup/main.svelte
+++ b/test/runtime/samples/binding-select-optgroup/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let name;
+</script>
+
 <h1>Hello {name}!</h1>
 
 <select bind:value={name}>
diff --git a/test/runtime/samples/binding-select/main.svelte b/test/runtime/samples/binding-select/main.svelte
index caa1a5b3a7..bf7eaecc84 100644
--- a/test/runtime/samples/binding-select/main.svelte
+++ b/test/runtime/samples/binding-select/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let selected;
+</script>
+
 <p>selected: {selected}</p>
 
 <select bind:value={selected}>
diff --git a/test/runtime/samples/binding-textarea/main.svelte b/test/runtime/samples/binding-textarea/main.svelte
index 5d4177bf92..cecddf624c 100644
--- a/test/runtime/samples/binding-textarea/main.svelte
+++ b/test/runtime/samples/binding-textarea/main.svelte
@@ -1,2 +1,6 @@
+<script>
+	export let value;
+</script>
+
 <textarea bind:value></textarea>
 <p>{value}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/class-in-each/main.svelte b/test/runtime/samples/class-in-each/main.svelte
index 4998de3cea..c7b5d4b1b6 100644
--- a/test/runtime/samples/class-in-each/main.svelte
+++ b/test/runtime/samples/class-in-each/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let things;
+	export let selected;
+</script>
+
 {#each things as thing}
 	<div class:selected="{selected === thing}"></div>
 {/each}
\ No newline at end of file
diff --git a/test/runtime/samples/class-shortcut-with-class/main.svelte b/test/runtime/samples/class-shortcut-with-class/main.svelte
index 72c1d4f8d4..12cde899cc 100644
--- a/test/runtime/samples/class-shortcut-with-class/main.svelte
+++ b/test/runtime/samples/class-shortcut-with-class/main.svelte
@@ -1 +1,8 @@
+<script>
+	export let myClass;
+	export let foo;
+	export let bar;
+	export let unused;
+</script>
+
 <div class={myClass} class:foo class:bar class:unused></div>
\ No newline at end of file
diff --git a/test/runtime/samples/class-shortcut/main.svelte b/test/runtime/samples/class-shortcut/main.svelte
index fe14d4de06..f98b8ed351 100644
--- a/test/runtime/samples/class-shortcut/main.svelte
+++ b/test/runtime/samples/class-shortcut/main.svelte
@@ -1 +1,7 @@
+<script>
+	export let foo;
+	export let bar;
+	export let unused;
+</script>
+
 <div class:foo class:bar class:unused></div>
\ No newline at end of file
diff --git a/test/runtime/samples/class-with-dynamic-attribute/main.svelte b/test/runtime/samples/class-with-dynamic-attribute/main.svelte
index 2097c465d9..3752c025d2 100644
--- a/test/runtime/samples/class-with-dynamic-attribute/main.svelte
+++ b/test/runtime/samples/class-with-dynamic-attribute/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let myClass;
+</script>
+
 <div class={myClass} class:three={true}></div>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-computed/Nested.svelte b/test/runtime/samples/component-binding-computed/Nested.svelte
index 642aa7eb34..e49410b7f7 100644
--- a/test/runtime/samples/component-binding-computed/Nested.svelte
+++ b/test/runtime/samples/component-binding-computed/Nested.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let value;
+	export let field;
+</script>
+
 <label>
 	{field} <input bind:value>
 </label>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-deep-b/ComponentSelector.svelte b/test/runtime/samples/component-binding-deep-b/ComponentSelector.svelte
index 9b55ab769d..f2502fd374 100644
--- a/test/runtime/samples/component-binding-deep-b/ComponentSelector.svelte
+++ b/test/runtime/samples/component-binding-deep-b/ComponentSelector.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let selectedComponent;
+	export let components;
+</script>
+
 <select bind:value={selectedComponent}>
 	{#each components as component}
 		<option value='{component}'>{component.name}.svelte</option>
diff --git a/test/runtime/samples/component-binding-deep-b/Editor.svelte b/test/runtime/samples/component-binding-deep-b/Editor.svelte
index cd3b080a99..3b2692df19 100644
--- a/test/runtime/samples/component-binding-deep-b/Editor.svelte
+++ b/test/runtime/samples/component-binding-deep-b/Editor.svelte
@@ -1 +1,5 @@
+<script>
+	export let code;
+</script>
+
 <textarea bind:value={code}></textarea>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-deep/Widget.svelte b/test/runtime/samples/component-binding-deep/Widget.svelte
index f24d608cd5..3714351783 100644
--- a/test/runtime/samples/component-binding-deep/Widget.svelte
+++ b/test/runtime/samples/component-binding-deep/Widget.svelte
@@ -1 +1,5 @@
+<script>
+	export let value;
+</script>
+
 <input bind:value>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-each-nested/Widget.svelte b/test/runtime/samples/component-binding-each-nested/Widget.svelte
index f24d608cd5..3714351783 100644
--- a/test/runtime/samples/component-binding-each-nested/Widget.svelte
+++ b/test/runtime/samples/component-binding-each-nested/Widget.svelte
@@ -1 +1,5 @@
+<script>
+	export let value;
+</script>
+
 <input bind:value>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-each-object/Widget.svelte b/test/runtime/samples/component-binding-each-object/Widget.svelte
index 176e7ac3cf..d449e6024f 100644
--- a/test/runtime/samples/component-binding-each-object/Widget.svelte
+++ b/test/runtime/samples/component-binding-each-object/Widget.svelte
@@ -1 +1,5 @@
+<script>
+	export let value;
+</script>
+
 <span>{value.id}</span>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-each/Widget.svelte b/test/runtime/samples/component-binding-each/Widget.svelte
index f24d608cd5..3714351783 100644
--- a/test/runtime/samples/component-binding-each/Widget.svelte
+++ b/test/runtime/samples/component-binding-each/Widget.svelte
@@ -1 +1,5 @@
+<script>
+	export let value;
+</script>
+
 <input bind:value>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-nested/Baz.svelte b/test/runtime/samples/component-binding-nested/Baz.svelte
index cd2cb5d0d8..bbfe33482b 100644
--- a/test/runtime/samples/component-binding-nested/Baz.svelte
+++ b/test/runtime/samples/component-binding-nested/Baz.svelte
@@ -1,2 +1,6 @@
+<script>
+	export let x;
+</script>
+
 <button class='baz' on:click='{() => x = "r"}'>baz</button>
 <p>baz x: {x}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-binding-self-destroying/Nested.svelte b/test/runtime/samples/component-binding-self-destroying/Nested.svelte
index a3dc510afc..f0355d16a5 100644
--- a/test/runtime/samples/component-binding-self-destroying/Nested.svelte
+++ b/test/runtime/samples/component-binding-self-destroying/Nested.svelte
@@ -1 +1,5 @@
+<script>
+	export let show;
+</script>
+
 <button on:click="{() => show = false}">Hide</button>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-dynamic-late/Widget.svelte b/test/runtime/samples/component-data-dynamic-late/Widget.svelte
index 242d51b65b..5ac3701e47 100644
--- a/test/runtime/samples/component-data-dynamic-late/Widget.svelte
+++ b/test/runtime/samples/component-data-dynamic-late/Widget.svelte
@@ -1 +1,5 @@
+<script>
+	export let p;
+</script>
+
 <p>{p}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-dynamic-shorthand/Widget.svelte b/test/runtime/samples/component-data-dynamic-shorthand/Widget.svelte
index ca3107eb98..b1be76b4be 100644
--- a/test/runtime/samples/component-data-dynamic-shorthand/Widget.svelte
+++ b/test/runtime/samples/component-data-dynamic-shorthand/Widget.svelte
@@ -1 +1,5 @@
+<script>
+	export let foo;
+</script>
+
 <p>foo: {foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-dynamic/Widget.svelte b/test/runtime/samples/component-data-dynamic/Widget.svelte
index b34c2ef085..a52b8d1eaa 100644
--- a/test/runtime/samples/component-data-dynamic/Widget.svelte
+++ b/test/runtime/samples/component-data-dynamic/Widget.svelte
@@ -1,3 +1,10 @@
+<script>
+	export let foo;
+	export let baz;
+	export let qux;
+	export let quux;
+</script>
+
 <p>foo: {foo}</p>
 <p>baz: {baz} ({typeof baz})</p>
 <p>qux: {qux}</p>
diff --git a/test/runtime/samples/component-data-empty/Widget.svelte b/test/runtime/samples/component-data-empty/Widget.svelte
index d504b84374..f2266de567 100644
--- a/test/runtime/samples/component-data-empty/Widget.svelte
+++ b/test/runtime/samples/component-data-empty/Widget.svelte
@@ -1 +1,5 @@
+<script>
+	export let foo;
+</script>
+
 <p>foo: '{foo}'</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-static-boolean-regression/Link.svelte b/test/runtime/samples/component-data-static-boolean-regression/Link.svelte
index ecb75d4f33..301fd2e4a1 100644
--- a/test/runtime/samples/component-data-static-boolean-regression/Link.svelte
+++ b/test/runtime/samples/component-data-static-boolean-regression/Link.svelte
@@ -1 +1,5 @@
+<script>
+	export let href;
+</script>
+
 <a href={href}>link</a>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-static-boolean/Foo.svelte b/test/runtime/samples/component-data-static-boolean/Foo.svelte
index 780198e0ef..15f9f556de 100644
--- a/test/runtime/samples/component-data-static-boolean/Foo.svelte
+++ b/test/runtime/samples/component-data-static-boolean/Foo.svelte
@@ -1 +1,5 @@
+<script>
+	export let x;
+</script>
+
 <p>x: {x} ({typeof x})</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-data-static/Widget.svelte b/test/runtime/samples/component-data-static/Widget.svelte
index bf52f4acfb..8d0b28a924 100644
--- a/test/runtime/samples/component-data-static/Widget.svelte
+++ b/test/runtime/samples/component-data-static/Widget.svelte
@@ -1,2 +1,7 @@
+<script>
+	export let foo;
+	export let baz;
+</script>
+
 <p>foo: {foo}</p>
 <p>baz: {baz} ({typeof baz})</p>
\ No newline at end of file
diff --git a/test/runtime/samples/component-name-deconflicted/Nested.svelte b/test/runtime/samples/component-name-deconflicted/Nested.svelte
index 03411fbff3..fe7e76dd64 100644
--- a/test/runtime/samples/component-name-deconflicted/Nested.svelte
+++ b/test/runtime/samples/component-name-deconflicted/Nested.svelte
@@ -1 +1,5 @@
+<script>
+	export let nested;
+</script>
+
 <span>{nested}</span>
\ No newline at end of file
diff --git a/test/runtime/samples/component-nested-deeper/Level2.svelte b/test/runtime/samples/component-nested-deeper/Level2.svelte
index 940698ce74..7249b0037b 100644
--- a/test/runtime/samples/component-nested-deeper/Level2.svelte
+++ b/test/runtime/samples/component-nested-deeper/Level2.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let condition;
+</script>
+
 
 
 <div class="level2">
diff --git a/test/runtime/samples/component-slot-let-aliased/Nested.svelte b/test/runtime/samples/component-slot-let-aliased/Nested.svelte
index 38c6ed6cbe..3758adbd7c 100644
--- a/test/runtime/samples/component-slot-let-aliased/Nested.svelte
+++ b/test/runtime/samples/component-slot-let-aliased/Nested.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let things;
+</script>
+
 <div>
 	{#each things as thing}
 		<slot {thing}/>
diff --git a/test/runtime/samples/component-slot-let-destructured/Nested.svelte b/test/runtime/samples/component-slot-let-destructured/Nested.svelte
index 38c6ed6cbe..3758adbd7c 100644
--- a/test/runtime/samples/component-slot-let-destructured/Nested.svelte
+++ b/test/runtime/samples/component-slot-let-destructured/Nested.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let things;
+</script>
+
 <div>
 	{#each things as thing}
 		<slot {thing}/>
diff --git a/test/runtime/samples/component-slot-let-named/Nested.svelte b/test/runtime/samples/component-slot-let-named/Nested.svelte
index d95593fc18..a3b09ff5b2 100644
--- a/test/runtime/samples/component-slot-let-named/Nested.svelte
+++ b/test/runtime/samples/component-slot-let-named/Nested.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let things;
+</script>
+
 <div>
 	{#each things as thing}
 		<slot name="foo" {thing}/>
diff --git a/test/runtime/samples/component-slot-let/Nested.svelte b/test/runtime/samples/component-slot-let/Nested.svelte
index 38c6ed6cbe..3758adbd7c 100644
--- a/test/runtime/samples/component-slot-let/Nested.svelte
+++ b/test/runtime/samples/component-slot-let/Nested.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let things;
+</script>
+
 <div>
 	{#each things as thing}
 		<slot {thing}/>
diff --git a/test/runtime/samples/component-static-at-symbol/Email.svelte b/test/runtime/samples/component-static-at-symbol/Email.svelte
index 8af8c3d3b1..711fefb829 100644
--- a/test/runtime/samples/component-static-at-symbol/Email.svelte
+++ b/test/runtime/samples/component-static-at-symbol/Email.svelte
@@ -1 +1,5 @@
+<script>
+	export let address;
+</script>
+
 <a href='mailto:{address}'>email</a>
\ No newline at end of file
diff --git a/test/runtime/samples/component-yield-nested-if/Outer.svelte b/test/runtime/samples/component-yield-nested-if/Outer.svelte
index 1d5fd34e1a..637bae0dec 100644
--- a/test/runtime/samples/component-yield-nested-if/Outer.svelte
+++ b/test/runtime/samples/component-yield-nested-if/Outer.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let foo;
+</script>
+
 {#if foo}
 	<slot></slot>
 {/if}
\ No newline at end of file
diff --git a/test/runtime/samples/deconflict-contexts/main.svelte b/test/runtime/samples/deconflict-contexts/main.svelte
index 84cdb1bca0..f971a01cf8 100644
--- a/test/runtime/samples/deconflict-contexts/main.svelte
+++ b/test/runtime/samples/deconflict-contexts/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let components;
+</script>
+
 <ul>
 	{#each components as component}
 		<li>{component}</li>
diff --git a/test/runtime/samples/dev-warning-missing-data-binding/main.svelte b/test/runtime/samples/dev-warning-missing-data-binding/main.svelte
index f24d608cd5..3714351783 100644
--- a/test/runtime/samples/dev-warning-missing-data-binding/main.svelte
+++ b/test/runtime/samples/dev-warning-missing-data-binding/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let value;
+</script>
+
 <input bind:value>
\ No newline at end of file
diff --git a/test/runtime/samples/dev-warning-missing-data-component/Foo.svelte b/test/runtime/samples/dev-warning-missing-data-component/Foo.svelte
index 8f26d21baf..95422444cc 100644
--- a/test/runtime/samples/dev-warning-missing-data-component/Foo.svelte
+++ b/test/runtime/samples/dev-warning-missing-data-component/Foo.svelte
@@ -1 +1,6 @@
+<script>
+	export let x;
+	export let y;
+</script>
+
 <div>{x} {y}</div>
\ No newline at end of file
diff --git a/test/runtime/samples/dev-warning-missing-data-each/main.svelte b/test/runtime/samples/dev-warning-missing-data-each/main.svelte
index 6b6a72204e..55ac7a7b47 100644
--- a/test/runtime/samples/dev-warning-missing-data-each/main.svelte
+++ b/test/runtime/samples/dev-warning-missing-data-each/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let letters;
+</script>
+
 {#each letters as letter (letter.id)}
   <div>{letter.char}</div>
 {/each}
\ No newline at end of file
diff --git a/test/runtime/samples/dev-warning-missing-data/main.svelte b/test/runtime/samples/dev-warning-missing-data/main.svelte
index 4efe809843..0e9f45ab16 100644
--- a/test/runtime/samples/dev-warning-missing-data/main.svelte
+++ b/test/runtime/samples/dev-warning-missing-data/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let foo;
+	export let bar;
+</script>
+
 <p>
 	{Math.max(0, foo)}
 	{bar}
diff --git a/test/runtime/samples/dev-warning-readonly-window-binding/main.svelte b/test/runtime/samples/dev-warning-readonly-window-binding/main.svelte
index bd2d50d388..06194394c5 100644
--- a/test/runtime/samples/dev-warning-readonly-window-binding/main.svelte
+++ b/test/runtime/samples/dev-warning-readonly-window-binding/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let width;
+</script>
+
 <svelte:window bind:innerWidth={width}/>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings-recreated/Green.svelte b/test/runtime/samples/dynamic-component-bindings-recreated/Green.svelte
index b4faa1b662..63c2e25090 100644
--- a/test/runtime/samples/dynamic-component-bindings-recreated/Green.svelte
+++ b/test/runtime/samples/dynamic-component-bindings-recreated/Green.svelte
@@ -1 +1,5 @@
+<script>
+	export let foo;
+</script>
+
 <p>green {foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings-recreated/Red.svelte b/test/runtime/samples/dynamic-component-bindings-recreated/Red.svelte
index a3e3c792a0..aaaade509e 100644
--- a/test/runtime/samples/dynamic-component-bindings-recreated/Red.svelte
+++ b/test/runtime/samples/dynamic-component-bindings-recreated/Red.svelte
@@ -1 +1,5 @@
+<script>
+	export let foo;
+</script>
+
 <p>red {foo}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings/Bar.svelte b/test/runtime/samples/dynamic-component-bindings/Bar.svelte
index 71e6fd8acc..7f215faa3f 100644
--- a/test/runtime/samples/dynamic-component-bindings/Bar.svelte
+++ b/test/runtime/samples/dynamic-component-bindings/Bar.svelte
@@ -1,2 +1,6 @@
+<script>
+	export let z;
+</script>
+
 <p>bar</p>
 <input type='checkbox' bind:checked={z}>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-bindings/Foo.svelte b/test/runtime/samples/dynamic-component-bindings/Foo.svelte
index 01faecfa49..5ed139be24 100644
--- a/test/runtime/samples/dynamic-component-bindings/Foo.svelte
+++ b/test/runtime/samples/dynamic-component-bindings/Foo.svelte
@@ -1,2 +1,6 @@
+<script>
+	export let y;
+</script>
+
 <p>foo</p>
 <input bind:value={y}>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-destroy-null/main.svelte b/test/runtime/samples/dynamic-component-destroy-null/main.svelte
index 401b86d1f6..6b58e61267 100644
--- a/test/runtime/samples/dynamic-component-destroy-null/main.svelte
+++ b/test/runtime/samples/dynamic-component-destroy-null/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let x;
+</script>
+
 {#if x}
 	<svelte:component this={null}/>
 {/if}
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-inside-element/Bar.svelte b/test/runtime/samples/dynamic-component-inside-element/Bar.svelte
index 79e01b851c..2a3ebfca74 100644
--- a/test/runtime/samples/dynamic-component-inside-element/Bar.svelte
+++ b/test/runtime/samples/dynamic-component-inside-element/Bar.svelte
@@ -1 +1,5 @@
+<script>
+	export let x;
+</script>
+
 <p>{x}, therefore Bar</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-inside-element/Foo.svelte b/test/runtime/samples/dynamic-component-inside-element/Foo.svelte
index cb35cfc082..d2434520f7 100644
--- a/test/runtime/samples/dynamic-component-inside-element/Foo.svelte
+++ b/test/runtime/samples/dynamic-component-inside-element/Foo.svelte
@@ -1 +1,5 @@
+<script>
+	export let x;
+</script>
+
 <p>{x}, therefore Foo</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-update-existing-instance/Bar.svelte b/test/runtime/samples/dynamic-component-update-existing-instance/Bar.svelte
index 36fa195dcd..6b7e486eba 100644
--- a/test/runtime/samples/dynamic-component-update-existing-instance/Bar.svelte
+++ b/test/runtime/samples/dynamic-component-update-existing-instance/Bar.svelte
@@ -1 +1,5 @@
+<script>
+	export let x;
+</script>
+
 <p>Bar {x}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component-update-existing-instance/Foo.svelte b/test/runtime/samples/dynamic-component-update-existing-instance/Foo.svelte
index 0a9cd0047a..4a4debdb12 100644
--- a/test/runtime/samples/dynamic-component-update-existing-instance/Foo.svelte
+++ b/test/runtime/samples/dynamic-component-update-existing-instance/Foo.svelte
@@ -1 +1,5 @@
+<script>
+	export let x;
+</script>
+
 <p>Foo {x}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component/Bar.svelte b/test/runtime/samples/dynamic-component/Bar.svelte
index 79e01b851c..2a3ebfca74 100644
--- a/test/runtime/samples/dynamic-component/Bar.svelte
+++ b/test/runtime/samples/dynamic-component/Bar.svelte
@@ -1 +1,5 @@
+<script>
+	export let x;
+</script>
+
 <p>{x}, therefore Bar</p>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-component/Foo.svelte b/test/runtime/samples/dynamic-component/Foo.svelte
index cb35cfc082..d2434520f7 100644
--- a/test/runtime/samples/dynamic-component/Foo.svelte
+++ b/test/runtime/samples/dynamic-component/Foo.svelte
@@ -1 +1,5 @@
+<script>
+	export let x;
+</script>
+
 <p>{x}, therefore Foo</p>
\ No newline at end of file
diff --git a/test/runtime/samples/each-block-containing-component-in-if/Nested.svelte b/test/runtime/samples/each-block-containing-component-in-if/Nested.svelte
index 0ceac58d9c..534db38385 100644
--- a/test/runtime/samples/each-block-containing-component-in-if/Nested.svelte
+++ b/test/runtime/samples/each-block-containing-component-in-if/Nested.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let show;
+	export let fields;
+</script>
+
 {#if show}
 	{#each fields as field}
 		<span>{field}</span>
diff --git a/test/runtime/samples/each-block-deconflict-name-context/main.svelte b/test/runtime/samples/each-block-deconflict-name-context/main.svelte
index 391e42ecd0..62c13b2e59 100644
--- a/test/runtime/samples/each-block-deconflict-name-context/main.svelte
+++ b/test/runtime/samples/each-block-deconflict-name-context/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let foo;
+</script>
+
 {#each foo.bar as bar}
 	<input bind:value={bar}>
 {/each}
diff --git a/test/runtime/samples/each-block-destructured-array-sparse/main.svelte b/test/runtime/samples/each-block-destructured-array-sparse/main.svelte
index 7ca8e403d8..587017bc04 100644
--- a/test/runtime/samples/each-block-destructured-array-sparse/main.svelte
+++ b/test/runtime/samples/each-block-destructured-array-sparse/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let animalPawsEntries;
+</script>
+
 {#each animalPawsEntries as [, pawType]}
 	<p>{pawType}</p>
 {/each}
diff --git a/test/runtime/samples/each-block-destructured-array/main.svelte b/test/runtime/samples/each-block-destructured-array/main.svelte
index bf70195880..db93ffa622 100644
--- a/test/runtime/samples/each-block-destructured-array/main.svelte
+++ b/test/runtime/samples/each-block-destructured-array/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let animalPawsEntries;
+</script>
+
 {#each animalPawsEntries as [animal, pawType]}
 	<p>{animal}: {pawType}</p>
 {/each}
diff --git a/test/runtime/samples/each-block-destructured-object-binding/main.svelte b/test/runtime/samples/each-block-destructured-object-binding/main.svelte
index dcdd7c0f6b..37993d83c1 100644
--- a/test/runtime/samples/each-block-destructured-object-binding/main.svelte
+++ b/test/runtime/samples/each-block-destructured-object-binding/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let people;
+</script>
+
 {#each people as { name: { first: f, last: l } } }
 	<input bind:value={f}>
 	<input bind:value={l}>
diff --git a/test/runtime/samples/each-block-destructured-object/main.svelte b/test/runtime/samples/each-block-destructured-object/main.svelte
index d759dabf9b..8432d72335 100644
--- a/test/runtime/samples/each-block-destructured-object/main.svelte
+++ b/test/runtime/samples/each-block-destructured-object/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let animalPawsEntries;
+</script>
+
 {#each animalPawsEntries as { animal, pawType } }
 	<p>{animal}: {pawType}</p>
 {/each}
diff --git a/test/runtime/samples/each-block-dynamic-else-static/main.svelte b/test/runtime/samples/each-block-dynamic-else-static/main.svelte
index 86245d2486..ec8e82913a 100644
--- a/test/runtime/samples/each-block-dynamic-else-static/main.svelte
+++ b/test/runtime/samples/each-block-dynamic-else-static/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let animals;
+</script>
+
 {#each animals as animal}
 	<p>{animal}</p>
 {:else}
diff --git a/test/runtime/samples/each-block-else-starts-empty/main.svelte b/test/runtime/samples/each-block-else-starts-empty/main.svelte
index c202670ed5..3275cb1f83 100644
--- a/test/runtime/samples/each-block-else-starts-empty/main.svelte
+++ b/test/runtime/samples/each-block-else-starts-empty/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let animals;
+	export let foo;
+</script>
+
 before
 {#each animals as animal}
 	<p>{animal}</p>
diff --git a/test/runtime/samples/each-block-else/main.svelte b/test/runtime/samples/each-block-else/main.svelte
index c202670ed5..3275cb1f83 100644
--- a/test/runtime/samples/each-block-else/main.svelte
+++ b/test/runtime/samples/each-block-else/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let animals;
+	export let foo;
+</script>
+
 before
 {#each animals as animal}
 	<p>{animal}</p>
diff --git a/test/runtime/samples/each-block-empty-outro/Thing.svelte b/test/runtime/samples/each-block-empty-outro/Thing.svelte
index 150c8fd252..d3707c7d8b 100644
--- a/test/runtime/samples/each-block-empty-outro/Thing.svelte
+++ b/test/runtime/samples/each-block-empty-outro/Thing.svelte
@@ -1 +1,5 @@
+<script>
+	export let thing;
+</script>
+
 <p>{thing}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/each-block-in-if-block/main.svelte b/test/runtime/samples/each-block-in-if-block/main.svelte
index 4c71f3e5b3..2746fd960a 100644
--- a/test/runtime/samples/each-block-in-if-block/main.svelte
+++ b/test/runtime/samples/each-block-in-if-block/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let fruits;
+</script>
+
 <div>
 	{#if fruits}
 		{#each fruits as fruit (fruit)}
diff --git a/test/runtime/samples/each-block-index-only/main.svelte b/test/runtime/samples/each-block-index-only/main.svelte
index 83fb0e6b8e..d1314cbb82 100644
--- a/test/runtime/samples/each-block-index-only/main.svelte
+++ b/test/runtime/samples/each-block-index-only/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let things;
+</script>
+
 {#each things as _, i}
 	<p>{i}</p>
 {/each}
diff --git a/test/runtime/samples/each-block-indexed/main.svelte b/test/runtime/samples/each-block-indexed/main.svelte
index d5602ec82c..3dc8797481 100644
--- a/test/runtime/samples/each-block-indexed/main.svelte
+++ b/test/runtime/samples/each-block-indexed/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let animals;
+</script>
+
 {#each animals as animal, i}
 	<p>{i}: {animal}</p>
 {/each}
diff --git a/test/runtime/samples/each-block-keyed-dynamic/main.svelte b/test/runtime/samples/each-block-keyed-dynamic/main.svelte
index cc5f25a0ef..0c50a62661 100644
--- a/test/runtime/samples/each-block-keyed-dynamic/main.svelte
+++ b/test/runtime/samples/each-block-keyed-dynamic/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let todos;
+</script>
+
 {#each todos as todo (todo.id)}
 	<p>{todo.description}</p>
 {/each}
diff --git a/test/runtime/samples/each-block-keyed-empty/main.svelte b/test/runtime/samples/each-block-keyed-empty/main.svelte
index 1d45aefa53..f8ee322ce6 100644
--- a/test/runtime/samples/each-block-keyed-empty/main.svelte
+++ b/test/runtime/samples/each-block-keyed-empty/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let x;
+</script>
+
 {#each x as y (y.z)}{/each}
diff --git a/test/runtime/samples/each-block-keyed-non-prop/main.svelte b/test/runtime/samples/each-block-keyed-non-prop/main.svelte
index a3d28bb3e4..9b68992d3d 100644
--- a/test/runtime/samples/each-block-keyed-non-prop/main.svelte
+++ b/test/runtime/samples/each-block-keyed-non-prop/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let words;
+</script>
+
 {#each words as word (word)}
 	<p>{word}</p>
 {/each}
diff --git a/test/runtime/samples/each-block-keyed-random-permute/main.svelte b/test/runtime/samples/each-block-keyed-random-permute/main.svelte
index 1dc93d9fa6..de70e90815 100644
--- a/test/runtime/samples/each-block-keyed-random-permute/main.svelte
+++ b/test/runtime/samples/each-block-keyed-random-permute/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let values;
+</script>
+
 {#each values as value (value.id)}
 	({value.id})
 {/each}
diff --git a/test/runtime/samples/each-block-keyed-siblings/main.svelte b/test/runtime/samples/each-block-keyed-siblings/main.svelte
index 575f0f2d93..561ea34c19 100644
--- a/test/runtime/samples/each-block-keyed-siblings/main.svelte
+++ b/test/runtime/samples/each-block-keyed-siblings/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let ones;
+	export let twos;
+</script>
+
 {#each ones as one (one.text)}
 	<div>{one.text}</div>
 {/each}
diff --git a/test/runtime/samples/each-block-keyed-static/main.svelte b/test/runtime/samples/each-block-keyed-static/main.svelte
index fa1b853d16..96c34dfc27 100644
--- a/test/runtime/samples/each-block-keyed-static/main.svelte
+++ b/test/runtime/samples/each-block-keyed-static/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let x;
+</script>
+
 {#each x as y (y.z)}
 	<p>does not change</p>
 {/each}
diff --git a/test/runtime/samples/each-block-keyed-unshift/Nested.svelte b/test/runtime/samples/each-block-keyed-unshift/Nested.svelte
index 4e9905910b..82df711742 100644
--- a/test/runtime/samples/each-block-keyed-unshift/Nested.svelte
+++ b/test/runtime/samples/each-block-keyed-unshift/Nested.svelte
@@ -1 +1,5 @@
+<script>
+	export let title;
+</script>
+
 <p>{title}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/each-block-keyed/main.svelte b/test/runtime/samples/each-block-keyed/main.svelte
index 3be42ebc77..520072ab2e 100644
--- a/test/runtime/samples/each-block-keyed/main.svelte
+++ b/test/runtime/samples/each-block-keyed/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let todos;
+</script>
+
 {#each todos as todo, i (todo.id)}
 	<p>{i+1}: {todo.description}</p>
 {/each}
diff --git a/test/runtime/samples/each-block-random-permute/main.svelte b/test/runtime/samples/each-block-random-permute/main.svelte
index 310003c701..0e7e2596c2 100644
--- a/test/runtime/samples/each-block-random-permute/main.svelte
+++ b/test/runtime/samples/each-block-random-permute/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let values;
+</script>
+
 {#each values as value}
 	({value})
 {/each}
diff --git a/test/runtime/samples/each-block-static/main.svelte b/test/runtime/samples/each-block-static/main.svelte
index b10d2d4fe6..93ae37cf1a 100644
--- a/test/runtime/samples/each-block-static/main.svelte
+++ b/test/runtime/samples/each-block-static/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let items;
+</script>
+
 {#each items as item}
 	foo
 {/each}
\ No newline at end of file
diff --git a/test/runtime/samples/each-block-text-node/main.svelte b/test/runtime/samples/each-block-text-node/main.svelte
index a25b53ed35..c9be76b431 100644
--- a/test/runtime/samples/each-block-text-node/main.svelte
+++ b/test/runtime/samples/each-block-text-node/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let animals;
+</script>
+
 {#each animals as animal}
 	({animal})
 {/each}
diff --git a/test/runtime/samples/each-block/main.svelte b/test/runtime/samples/each-block/main.svelte
index 83a5e88ddd..947ec6d723 100644
--- a/test/runtime/samples/each-block/main.svelte
+++ b/test/runtime/samples/each-block/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let animals;
+</script>
+
 {#each animals as animal}
 	<p>{animal}</p>
 {/each}
diff --git a/test/runtime/samples/each-blocks-nested-b/main.svelte b/test/runtime/samples/each-blocks-nested-b/main.svelte
index 3e9acfe986..2cfe4be98a 100644
--- a/test/runtime/samples/each-blocks-nested-b/main.svelte
+++ b/test/runtime/samples/each-blocks-nested-b/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let categories;
+</script>
+
 {#each categories as category}
 	{#each category.things as thing}
 		<p>{category.name}: {thing.name}</p>
diff --git a/test/runtime/samples/each-blocks-nested/main.svelte b/test/runtime/samples/each-blocks-nested/main.svelte
index 004bfcbca9..cd5c3f3e8b 100644
--- a/test/runtime/samples/each-blocks-nested/main.svelte
+++ b/test/runtime/samples/each-blocks-nested/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let columns;
+	export let rows;
+</script>
+
 {#each columns as x}
 	{#each rows as y}
 		<div>{x}, {y}</div>
diff --git a/test/runtime/samples/escape-template-literals/Widget.svelte b/test/runtime/samples/escape-template-literals/Widget.svelte
index 5964bdac68..2ba74ee888 100644
--- a/test/runtime/samples/escape-template-literals/Widget.svelte
+++ b/test/runtime/samples/escape-template-literals/Widget.svelte
@@ -1 +1,5 @@
+<script>
+	export let value;
+</script>
+
 <div>{value}</div>
diff --git a/test/runtime/samples/event-handler-deconflicted/main.svelte b/test/runtime/samples/event-handler-deconflicted/main.svelte
index 38c923794e..b34e17e8a3 100644
--- a/test/runtime/samples/event-handler-deconflicted/main.svelte
+++ b/test/runtime/samples/event-handler-deconflicted/main.svelte
@@ -1 +1,6 @@
+<script>
+	export let foo;
+	export let click_handler;
+</script>
+
 <button on:click="{() => foo()}">{click_handler}</button>
\ No newline at end of file
diff --git a/test/runtime/samples/event-handler-each-context/main.svelte b/test/runtime/samples/event-handler-each-context/main.svelte
index 3b22ec529c..e30996b261 100644
--- a/test/runtime/samples/event-handler-each-context/main.svelte
+++ b/test/runtime/samples/event-handler-each-context/main.svelte
@@ -1,3 +1,9 @@
+<script>
+	export let items;
+	export let foo;
+	export let bar;
+</script>
+
 {#each items as item}
 	<button on:click='{() => foo = bar}'>{item}</button>
 {/each}
diff --git a/test/runtime/samples/event-handler-each-deconflicted/main.svelte b/test/runtime/samples/event-handler-each-deconflicted/main.svelte
index 165e535e95..96d20d4d85 100644
--- a/test/runtime/samples/event-handler-each-deconflicted/main.svelte
+++ b/test/runtime/samples/event-handler-each-deconflicted/main.svelte
@@ -1,3 +1,9 @@
+<script>
+	export let foo;
+	export let clicked;
+	export let bar;
+</script>
+
 {#each foo as f}
 	<button on:click='{() => clicked = "foo"}'>foo</button>
 {/each}
diff --git a/test/runtime/samples/event-handler-each/main.svelte b/test/runtime/samples/event-handler-each/main.svelte
index 3d1c5dcfd8..777fdb1c41 100644
--- a/test/runtime/samples/event-handler-each/main.svelte
+++ b/test/runtime/samples/event-handler-each/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let items;
+	export let selected;
+</script>
+
 {#each items as item}
 	<button on:click='{() => selected = item}'>{item}</button>
 {/each}
diff --git a/test/runtime/samples/event-handler-sanitize/main.svelte b/test/runtime/samples/event-handler-sanitize/main.svelte
index 7a5f39aa58..5171820c83 100644
--- a/test/runtime/samples/event-handler-sanitize/main.svelte
+++ b/test/runtime/samples/event-handler-sanitize/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let visible;
+</script>
+
 <div on:some-event='{() => visible = !visible}'>toggle</div>
 
 {#if visible}
diff --git a/test/runtime/samples/event-handler/main.svelte b/test/runtime/samples/event-handler/main.svelte
index 8dcaf1b701..67ce998eee 100644
--- a/test/runtime/samples/event-handler/main.svelte
+++ b/test/runtime/samples/event-handler/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let visible;
+</script>
+
 <button on:click='{() => visible = !visible}'>toggle</button>
 
 {#if visible}
diff --git a/test/runtime/samples/function-in-expression/main.svelte b/test/runtime/samples/function-in-expression/main.svelte
index 895a36e690..272c705165 100644
--- a/test/runtime/samples/function-in-expression/main.svelte
+++ b/test/runtime/samples/function-in-expression/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let numbers;
+</script>
+
 {numbers.filter(x => x % 2).join(', ')}
\ No newline at end of file
diff --git a/test/runtime/samples/get-after-destroy/main.svelte b/test/runtime/samples/get-after-destroy/main.svelte
index ea892526af..0831729fa5 100644
--- a/test/runtime/samples/get-after-destroy/main.svelte
+++ b/test/runtime/samples/get-after-destroy/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let foo;
+</script>
+
 <div>{foo}</div>
\ No newline at end of file
diff --git a/test/runtime/samples/globals-not-dereferenced/main.svelte b/test/runtime/samples/globals-not-dereferenced/main.svelte
index ec39251992..a4a3b59d10 100644
--- a/test/runtime/samples/globals-not-dereferenced/main.svelte
+++ b/test/runtime/samples/globals-not-dereferenced/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let x;
+</script>
+
 {Math.min(x, 5)}
diff --git a/test/runtime/samples/globals-not-overwritten-by-bindings/main.svelte b/test/runtime/samples/globals-not-overwritten-by-bindings/main.svelte
index 9c573a6319..602c8c8805 100644
--- a/test/runtime/samples/globals-not-overwritten-by-bindings/main.svelte
+++ b/test/runtime/samples/globals-not-overwritten-by-bindings/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let todos;
+</script>
+
 {#each Object.keys(todos) as key}
 	<div class='todo {todos[key].done ? "done": ""}'>
 		<input type='checkbox' bind:checked={todos[key].done}>
diff --git a/test/runtime/samples/hash-in-attribute/main.svelte b/test/runtime/samples/hash-in-attribute/main.svelte
index 0d1455b066..f250a8256b 100644
--- a/test/runtime/samples/hash-in-attribute/main.svelte
+++ b/test/runtime/samples/hash-in-attribute/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let links;
+</script>
+
 {#each links as link}
 	<a href="x#{link}">x#{link}</a>
 {/each}
\ No newline at end of file
diff --git a/test/runtime/samples/head-if-block/main.svelte b/test/runtime/samples/head-if-block/main.svelte
index 27d994335d..a6b115bf28 100644
--- a/test/runtime/samples/head-if-block/main.svelte
+++ b/test/runtime/samples/head-if-block/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let condition;
+</script>
+
 <svelte:head>
 	{#if condition}
 		<title>woo!!!</title>
diff --git a/test/runtime/samples/head-title-dynamic-simple/main.svelte b/test/runtime/samples/head-title-dynamic-simple/main.svelte
index d2ff2c596b..7fc54ba1d2 100644
--- a/test/runtime/samples/head-title-dynamic-simple/main.svelte
+++ b/test/runtime/samples/head-title-dynamic-simple/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let foo;
+</script>
+
 <svelte:head>
 	<title>{foo}</title>
 </svelte:head>
\ No newline at end of file
diff --git a/test/runtime/samples/head-title-dynamic/main.svelte b/test/runtime/samples/head-title-dynamic/main.svelte
index 255f344c00..60888e569e 100644
--- a/test/runtime/samples/head-title-dynamic/main.svelte
+++ b/test/runtime/samples/head-title-dynamic/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let adjective;
+</script>
+
 <svelte:head>
 	<title>a {adjective} title</title>
 	<meta name='twitter:creator' content='@sveltejs'>
diff --git a/test/runtime/samples/hello-world/main.svelte b/test/runtime/samples/hello-world/main.svelte
index 4820d55d09..538dc970e9 100644
--- a/test/runtime/samples/hello-world/main.svelte
+++ b/test/runtime/samples/hello-world/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let name;
+</script>
+
 <h1>Hello {name}!</h1>
diff --git a/test/runtime/samples/if-block-else-in-each/main.svelte b/test/runtime/samples/if-block-else-in-each/main.svelte
index 4df229b2e8..96ac5a6cdc 100644
--- a/test/runtime/samples/if-block-else-in-each/main.svelte
+++ b/test/runtime/samples/if-block-else-in-each/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let array;
+</script>
+
 {#each array as item}
 	{#if item}
 		<div>foo</div>
diff --git a/test/runtime/samples/if-block-else/main.svelte b/test/runtime/samples/if-block-else/main.svelte
index 997f503e98..e839f72191 100644
--- a/test/runtime/samples/if-block-else/main.svelte
+++ b/test/runtime/samples/if-block-else/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let foo;
+	export let bar;
+</script>
+
 {#if foo}
 	<p>foo</p>
 {:else}
diff --git a/test/runtime/samples/if-block-elseif-no-else/main.svelte b/test/runtime/samples/if-block-elseif-no-else/main.svelte
index 2566aef258..6d4f324717 100644
--- a/test/runtime/samples/if-block-elseif-no-else/main.svelte
+++ b/test/runtime/samples/if-block-elseif-no-else/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let x;
+</script>
+
 {#if x > 10}
 	<p>x is greater than 10</p>
 {:else if x < 5}
diff --git a/test/runtime/samples/if-block-elseif-text/main.svelte b/test/runtime/samples/if-block-elseif-text/main.svelte
index ea1e1aac43..d1c161f616 100644
--- a/test/runtime/samples/if-block-elseif-text/main.svelte
+++ b/test/runtime/samples/if-block-elseif-text/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let x;
+</script>
+
 before-{#if x > 10}if{:else if x < 5}elseif{:else}else{/if}-after
diff --git a/test/runtime/samples/if-block-elseif/main.svelte b/test/runtime/samples/if-block-elseif/main.svelte
index d4833c7aeb..bf22945159 100644
--- a/test/runtime/samples/if-block-elseif/main.svelte
+++ b/test/runtime/samples/if-block-elseif/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let x;
+</script>
+
 {#if x > 10}
 	<p>x is greater than 10</p>
 {:else if x < 5}
diff --git a/test/runtime/samples/if-block-first/main.svelte b/test/runtime/samples/if-block-first/main.svelte
index bae6f01e10..b8680e7d4c 100644
--- a/test/runtime/samples/if-block-first/main.svelte
+++ b/test/runtime/samples/if-block-first/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let visible;
+</script>
+
 <div>
 	{#if visible}
 		<div>i am visible</div>
diff --git a/test/runtime/samples/if-block-or/main.svelte b/test/runtime/samples/if-block-or/main.svelte
index 8f3713bffb..5e9268fb1d 100644
--- a/test/runtime/samples/if-block-or/main.svelte
+++ b/test/runtime/samples/if-block-or/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let a;
+	export let b;
+</script>
+
 {#if a || b}
 	<p>i am visible</p>
 {/if}
diff --git a/test/runtime/samples/if-block/main.svelte b/test/runtime/samples/if-block/main.svelte
index a54acecb15..828ea910fc 100644
--- a/test/runtime/samples/if-block/main.svelte
+++ b/test/runtime/samples/if-block/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let visible;
+</script>
+
 {#if visible}
 	<p>i am visible</p>
 {/if}
diff --git a/test/runtime/samples/if-in-keyed-each/main.svelte b/test/runtime/samples/if-in-keyed-each/main.svelte
index 65ebcdd330..4cf877b3d7 100644
--- a/test/runtime/samples/if-in-keyed-each/main.svelte
+++ b/test/runtime/samples/if-in-keyed-each/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let items;
+</script>
+
 <ul>
 	{#each items as item (item.id)}
 		{#if item.id}
diff --git a/test/runtime/samples/inline-expressions/main.svelte b/test/runtime/samples/inline-expressions/main.svelte
index e5da1ff551..f51d901912 100644
--- a/test/runtime/samples/inline-expressions/main.svelte
+++ b/test/runtime/samples/inline-expressions/main.svelte
@@ -1 +1,6 @@
+<script>
+	export let a;
+	export let b;
+</script>
+
 <p>{a} + {b} = {a + b}</p>
diff --git a/test/runtime/samples/names-deconflicted-nested/main.svelte b/test/runtime/samples/names-deconflicted-nested/main.svelte
index 4d0b8ae1b6..4942ec5fbc 100644
--- a/test/runtime/samples/names-deconflicted-nested/main.svelte
+++ b/test/runtime/samples/names-deconflicted-nested/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let array;
+</script>
+
 {#each array as row, i}
 	<div>
 		{#each row as cell, j}
diff --git a/test/runtime/samples/names-deconflicted/Widget.svelte b/test/runtime/samples/names-deconflicted/Widget.svelte
index a004758196..a8cc274a6f 100644
--- a/test/runtime/samples/names-deconflicted/Widget.svelte
+++ b/test/runtime/samples/names-deconflicted/Widget.svelte
@@ -1 +1,6 @@
+<script>
+	export let index;
+	export let widget;
+</script>
+
 <p>{index + 1}: {widget.name}</p>
diff --git a/test/runtime/samples/option-without-select/main.svelte b/test/runtime/samples/option-without-select/main.svelte
index b0156e95c5..69dd8b229e 100644
--- a/test/runtime/samples/option-without-select/main.svelte
+++ b/test/runtime/samples/option-without-select/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let foo;
+</script>
+
 <option value='{foo}'>{foo}</option>
\ No newline at end of file
diff --git a/test/runtime/samples/paren-wrapped-expressions/main.svelte b/test/runtime/samples/paren-wrapped-expressions/main.svelte
index f76ea96950..44398b3bd0 100644
--- a/test/runtime/samples/paren-wrapped-expressions/main.svelte
+++ b/test/runtime/samples/paren-wrapped-expressions/main.svelte
@@ -1,3 +1,9 @@
+<script>
+	export let a;
+	export let b;
+	export let c;
+</script>
+
 <span>{ (a) }</span>
 <span class='{ (a) }'></span>
 {#if (b) }
diff --git a/test/runtime/samples/prop-not-action/Nested.svelte b/test/runtime/samples/prop-not-action/Nested.svelte
index b1029d2ad5..7c8cd59210 100644
--- a/test/runtime/samples/prop-not-action/Nested.svelte
+++ b/test/runtime/samples/prop-not-action/Nested.svelte
@@ -1 +1,5 @@
+<script>
+	export let user;
+</script>
+
 <h1>Hello {user.name}!</h1>
\ No newline at end of file
diff --git a/test/runtime/samples/props/RenderProps.svelte b/test/runtime/samples/props/RenderProps.svelte
index ce3fc9abce..7026545f00 100644
--- a/test/runtime/samples/props/RenderProps.svelte
+++ b/test/runtime/samples/props/RenderProps.svelte
@@ -1 +1,3 @@
+<script></script>
+
 <p>{JSON.stringify($$props)}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/raw-anchor-first-child/main.svelte b/test/runtime/samples/raw-anchor-first-child/main.svelte
index 1c882f4e7d..39d7937a7d 100644
--- a/test/runtime/samples/raw-anchor-first-child/main.svelte
+++ b/test/runtime/samples/raw-anchor-first-child/main.svelte
@@ -1 +1,6 @@
+<script>
+	export let raw;
+	export let maybe;
+</script>
+
 <div>{@html raw}{#if maybe}after{/if}</div>
diff --git a/test/runtime/samples/raw-anchor-first-last-child/main.svelte b/test/runtime/samples/raw-anchor-first-last-child/main.svelte
index 610d1f3141..205abb75e8 100644
--- a/test/runtime/samples/raw-anchor-first-last-child/main.svelte
+++ b/test/runtime/samples/raw-anchor-first-last-child/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let raw;
+</script>
+
 <div>{@html raw}</div>
diff --git a/test/runtime/samples/raw-anchor-last-child/main.svelte b/test/runtime/samples/raw-anchor-last-child/main.svelte
index 4267bfa933..48a6b9e5b6 100644
--- a/test/runtime/samples/raw-anchor-last-child/main.svelte
+++ b/test/runtime/samples/raw-anchor-last-child/main.svelte
@@ -1 +1,6 @@
+<script>
+	export let maybe;
+	export let raw;
+</script>
+
 <div>{#if maybe}after{/if}{@html raw}</div>
diff --git a/test/runtime/samples/raw-anchor-next-previous-sibling/main.svelte b/test/runtime/samples/raw-anchor-next-previous-sibling/main.svelte
index 701d85c2b2..963ce1bd91 100644
--- a/test/runtime/samples/raw-anchor-next-previous-sibling/main.svelte
+++ b/test/runtime/samples/raw-anchor-next-previous-sibling/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let raw;
+</script>
+
 before<br>{@html raw}<br>after
diff --git a/test/runtime/samples/raw-anchor-next-sibling/main.svelte b/test/runtime/samples/raw-anchor-next-sibling/main.svelte
index 24472a362e..5add0fc7d3 100644
--- a/test/runtime/samples/raw-anchor-next-sibling/main.svelte
+++ b/test/runtime/samples/raw-anchor-next-sibling/main.svelte
@@ -1 +1,6 @@
+<script>
+	export let raw;
+	export let maybe;
+</script>
+
 before<br>{@html raw}{#if maybe}after{/if}
diff --git a/test/runtime/samples/raw-anchor-previous-sibling/main.svelte b/test/runtime/samples/raw-anchor-previous-sibling/main.svelte
index 24472a362e..5add0fc7d3 100644
--- a/test/runtime/samples/raw-anchor-previous-sibling/main.svelte
+++ b/test/runtime/samples/raw-anchor-previous-sibling/main.svelte
@@ -1 +1,6 @@
+<script>
+	export let raw;
+	export let maybe;
+</script>
+
 before<br>{@html raw}{#if maybe}after{/if}
diff --git a/test/runtime/samples/raw-mustaches-preserved/main.svelte b/test/runtime/samples/raw-mustaches-preserved/main.svelte
index 610d1f3141..205abb75e8 100644
--- a/test/runtime/samples/raw-mustaches-preserved/main.svelte
+++ b/test/runtime/samples/raw-mustaches-preserved/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let raw;
+</script>
+
 <div>{@html raw}</div>
diff --git a/test/runtime/samples/raw-mustaches/main.svelte b/test/runtime/samples/raw-mustaches/main.svelte
index 28c657e9a6..e6b2ed57df 100644
--- a/test/runtime/samples/raw-mustaches/main.svelte
+++ b/test/runtime/samples/raw-mustaches/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let raw;
+</script>
+
 before{@html raw}after
diff --git a/test/runtime/samples/select-bind-array/main.svelte b/test/runtime/samples/select-bind-array/main.svelte
index a863eec89e..4f8a3dda02 100644
--- a/test/runtime/samples/select-bind-array/main.svelte
+++ b/test/runtime/samples/select-bind-array/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let foo;
+	export let items;
+</script>
+
 <select bind:value={foo}>
 	{#each items as item}
 		<option value='{item.id}'>{item.id}</option>
diff --git a/test/runtime/samples/select-bind-in-array/main.svelte b/test/runtime/samples/select-bind-in-array/main.svelte
index 51f33c7611..29a67b0a8b 100644
--- a/test/runtime/samples/select-bind-in-array/main.svelte
+++ b/test/runtime/samples/select-bind-in-array/main.svelte
@@ -1,3 +1,7 @@
+<script>
+  export let items;
+</script>
+
 {#each items as item}
   <select bind:value={item.id}>
     <option value='a'>a</option>
diff --git a/test/runtime/samples/select-one-way-bind-object/main.svelte b/test/runtime/samples/select-one-way-bind-object/main.svelte
index f5422990d3..c940b3a50e 100644
--- a/test/runtime/samples/select-one-way-bind-object/main.svelte
+++ b/test/runtime/samples/select-one-way-bind-object/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let foo;
+	export let items;
+</script>
+
 <select value="{foo}">
 	<option value='{items[0]}'>a</option>
 	<option value='{items[1]}'>b</option>
diff --git a/test/runtime/samples/select-one-way-bind/main.svelte b/test/runtime/samples/select-one-way-bind/main.svelte
index 9764039c25..21ba398e4c 100644
--- a/test/runtime/samples/select-one-way-bind/main.svelte
+++ b/test/runtime/samples/select-one-way-bind/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let foo;
+</script>
+
 <select value="{foo}">
 	<option>a</option>
 	<option>b</option>
diff --git a/test/runtime/samples/select/main.svelte b/test/runtime/samples/select/main.svelte
index 294954edd0..837d0e0fd9 100644
--- a/test/runtime/samples/select/main.svelte
+++ b/test/runtime/samples/select/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let item;
+</script>
+
 <select>
 	<option value="{item.key}">{item.name}</option>
 	<option value="b">Two</option>
diff --git a/test/runtime/samples/self-reference-tree/main.svelte b/test/runtime/samples/self-reference-tree/main.svelte
index 6663cf9533..132f13e859 100644
--- a/test/runtime/samples/self-reference-tree/main.svelte
+++ b/test/runtime/samples/self-reference-tree/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let file;
+</script>
+
 <article class='file {file.type}'>
 	<span class='name'>{file.name}</span>
 
diff --git a/test/runtime/samples/self-reference/main.svelte b/test/runtime/samples/self-reference/main.svelte
index e5581203c3..7c89fc0506 100644
--- a/test/runtime/samples/self-reference/main.svelte
+++ b/test/runtime/samples/self-reference/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let depth;
+</script>
+
 <span>{depth}</span>
 {#if depth > 0}
 	<svelte:self depth='{depth - 1}'/>
diff --git a/test/runtime/samples/set-after-destroy/main.svelte b/test/runtime/samples/set-after-destroy/main.svelte
index 44da74a72d..11d49265a3 100644
--- a/test/runtime/samples/set-after-destroy/main.svelte
+++ b/test/runtime/samples/set-after-destroy/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let x;
+</script>
+
 <div>{x}</div>
\ No newline at end of file
diff --git a/test/runtime/samples/set-null-text-node/main.svelte b/test/runtime/samples/set-null-text-node/main.svelte
index bf9a9ffe59..825f9c7462 100644
--- a/test/runtime/samples/set-null-text-node/main.svelte
+++ b/test/runtime/samples/set-null-text-node/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let foo;
+</script>
+
 foo is {foo}
\ No newline at end of file
diff --git a/test/runtime/samples/sigil-component-attribute/Widget.svelte b/test/runtime/samples/sigil-component-attribute/Widget.svelte
index 5964bdac68..2ba74ee888 100644
--- a/test/runtime/samples/sigil-component-attribute/Widget.svelte
+++ b/test/runtime/samples/sigil-component-attribute/Widget.svelte
@@ -1 +1,5 @@
+<script>
+	export let value;
+</script>
+
 <div>{value}</div>
diff --git a/test/runtime/samples/spread-component-dynamic-undefined/main.svelte b/test/runtime/samples/spread-component-dynamic-undefined/main.svelte
index 435cacaa53..69abad13e6 100644
--- a/test/runtime/samples/spread-component-dynamic-undefined/main.svelte
+++ b/test/runtime/samples/spread-component-dynamic-undefined/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let props;
+</script>
+
 <svelte:component this={undefined} {...props} />
\ No newline at end of file
diff --git a/test/runtime/samples/spread-component-dynamic/Foo.svelte b/test/runtime/samples/spread-component-dynamic/Foo.svelte
index e7884fdfee..4cffe5d3ce 100644
--- a/test/runtime/samples/spread-component-dynamic/Foo.svelte
+++ b/test/runtime/samples/spread-component-dynamic/Foo.svelte
@@ -1 +1,5 @@
+<script>
+	export let a;
+</script>
+
 <p>a: {a}</p>
\ No newline at end of file
diff --git a/test/runtime/samples/spread-component-multiple-dependencies/Widget.svelte b/test/runtime/samples/spread-component-multiple-dependencies/Widget.svelte
index ab2d2d0242..373bf23f51 100644
--- a/test/runtime/samples/spread-component-multiple-dependencies/Widget.svelte
+++ b/test/runtime/samples/spread-component-multiple-dependencies/Widget.svelte
@@ -1 +1,6 @@
+<script>
+	export let foo;
+	export let baz;
+</script>
+
 {foo} {baz}
diff --git a/test/runtime/samples/spread-component-with-bind/Widget.svelte b/test/runtime/samples/spread-component-with-bind/Widget.svelte
index 7d9b108a1a..63d78cdcb5 100644
--- a/test/runtime/samples/spread-component-with-bind/Widget.svelte
+++ b/test/runtime/samples/spread-component-with-bind/Widget.svelte
@@ -1,2 +1,6 @@
+<script>
+	export let value;
+</script>
+
 <p>{value}</p>
 <input bind:value/>
\ No newline at end of file
diff --git a/test/runtime/samples/spread-component/Widget.svelte b/test/runtime/samples/spread-component/Widget.svelte
index a60afb741c..40de25bb55 100644
--- a/test/runtime/samples/spread-component/Widget.svelte
+++ b/test/runtime/samples/spread-component/Widget.svelte
@@ -1,3 +1,10 @@
+<script>
+	export let foo;
+	export let baz;
+	export let qux;
+	export let quux;
+</script>
+
 <p>foo: {foo}</p>
 <p>baz: {baz} ({typeof baz})</p>
 <p>qux: {qux}</p>
diff --git a/test/runtime/samples/spread-each-component/Nested.svelte b/test/runtime/samples/spread-each-component/Nested.svelte
index fb0f25d2e7..c599d10913 100644
--- a/test/runtime/samples/spread-each-component/Nested.svelte
+++ b/test/runtime/samples/spread-each-component/Nested.svelte
@@ -1 +1,6 @@
+<script>
+	export let a;
+	export let b;
+</script>
+
 <div data-a={a} data-b={b}></div>
\ No newline at end of file
diff --git a/test/runtime/samples/spread-each-element/main.svelte b/test/runtime/samples/spread-each-element/main.svelte
index 99ae4eeece..086ac22b6a 100644
--- a/test/runtime/samples/spread-each-element/main.svelte
+++ b/test/runtime/samples/spread-each-element/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let things;
+</script>
+
 {#each things as thing}
 	<div {...thing}></div>
 {/each}
\ No newline at end of file
diff --git a/test/runtime/samples/spread-element-boolean/main.svelte b/test/runtime/samples/spread-element-boolean/main.svelte
index 5cd4df8766..7fa26ed3ab 100644
--- a/test/runtime/samples/spread-element-boolean/main.svelte
+++ b/test/runtime/samples/spread-element-boolean/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let props;
+</script>
+
 <button {...props} >click me</button>
\ No newline at end of file
diff --git a/test/runtime/samples/spread-element-input/main.svelte b/test/runtime/samples/spread-element-input/main.svelte
index 736444749b..c933863b98 100644
--- a/test/runtime/samples/spread-element-input/main.svelte
+++ b/test/runtime/samples/spread-element-input/main.svelte
@@ -1 +1,6 @@
+<script>
+	export let value;
+	export let props;
+</script>
+
 <input bind:value {...props}>
\ No newline at end of file
diff --git a/test/runtime/samples/spread-element-multiple/main.svelte b/test/runtime/samples/spread-element-multiple/main.svelte
index 97272e6946..a71100306e 100644
--- a/test/runtime/samples/spread-element-multiple/main.svelte
+++ b/test/runtime/samples/spread-element-multiple/main.svelte
@@ -1 +1,7 @@
+<script>
+	export let a;
+	export let c;
+	export let d;
+</script>
+
 <div {...a} data-b="b" {...c} data-d={d} >test</div>
\ No newline at end of file
diff --git a/test/runtime/samples/spread-own-props/Widget.svelte b/test/runtime/samples/spread-own-props/Widget.svelte
index a60afb741c..40de25bb55 100644
--- a/test/runtime/samples/spread-own-props/Widget.svelte
+++ b/test/runtime/samples/spread-own-props/Widget.svelte
@@ -1,3 +1,10 @@
+<script>
+	export let foo;
+	export let baz;
+	export let qux;
+	export let quux;
+</script>
+
 <p>foo: {foo}</p>
 <p>baz: {baz} ({typeof baz})</p>
 <p>qux: {qux}</p>
diff --git a/test/runtime/samples/state-deconflicted/main.svelte b/test/runtime/samples/state-deconflicted/main.svelte
index 12ff80a0ed..a03a5a7919 100644
--- a/test/runtime/samples/state-deconflicted/main.svelte
+++ b/test/runtime/samples/state-deconflicted/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let state;
+	export let states;
+</script>
+
 <p>Current state: {state}</p>
 
 <ul>
diff --git a/test/runtime/samples/store-auto-subscribe-implicit/main.svelte b/test/runtime/samples/store-auto-subscribe-implicit/main.svelte
index 1c4fdddad3..849de85acf 100644
--- a/test/runtime/samples/store-auto-subscribe-implicit/main.svelte
+++ b/test/runtime/samples/store-auto-subscribe-implicit/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let count;
+</script>
+
 <button on:click="{() => count.update(n => n + 1)}">count {$count}</button>
\ No newline at end of file
diff --git a/test/runtime/samples/store-contextual/main.svelte b/test/runtime/samples/store-contextual/main.svelte
index f8403eded4..3687271fdd 100644
--- a/test/runtime/samples/store-contextual/main.svelte
+++ b/test/runtime/samples/store-contextual/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let todos;
+</script>
+
 {#each todos as todo}
 	<label>
 		<input type=checkbox on:change={e => todo.update(t => ({ done: e.target.checked, text: t.text }))}>
diff --git a/test/runtime/samples/svg-each-block-anchor/main.svelte b/test/runtime/samples/svg-each-block-anchor/main.svelte
index f9e4a57bd8..fcb0170b6e 100644
--- a/test/runtime/samples/svg-each-block-anchor/main.svelte
+++ b/test/runtime/samples/svg-each-block-anchor/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let foo;
+	export let bar;
+</script>
+
 <svg>
 	{#each foo as x}
 		<g class='foo'></g>
diff --git a/test/runtime/samples/svg-multiple/main.svelte b/test/runtime/samples/svg-multiple/main.svelte
index 93b980cf89..454f486fd1 100644
--- a/test/runtime/samples/svg-multiple/main.svelte
+++ b/test/runtime/samples/svg-multiple/main.svelte
@@ -1,3 +1,10 @@
+<script>
+	export let x;
+	export let y;
+	export let width;
+	export let height;
+</script>
+
 <svg>
 	<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
 </svg>
diff --git a/test/runtime/samples/svg-with-style/main.svelte b/test/runtime/samples/svg-with-style/main.svelte
index 2d5df24f38..424834134e 100644
--- a/test/runtime/samples/svg-with-style/main.svelte
+++ b/test/runtime/samples/svg-with-style/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let x;
+</script>
+
 <svg>
 	<circle cx=50 cy=50 r=50/>
 	<circle class='foo' cx=150 cy=50 r=50/>
diff --git a/test/runtime/samples/svg-xmlns/main.svelte b/test/runtime/samples/svg-xmlns/main.svelte
index 34d5bae10b..a415a12afc 100644
--- a/test/runtime/samples/svg-xmlns/main.svelte
+++ b/test/runtime/samples/svg-xmlns/main.svelte
@@ -1,3 +1,10 @@
+<script>
+	export let x;
+	export let y;
+	export let width;
+	export let height;
+</script>
+
 <svg xmlns='http://www.w3.org/2000/svg'>
 	<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
 </svg>
diff --git a/test/runtime/samples/svg/main.svelte b/test/runtime/samples/svg/main.svelte
index 22f7abf20c..25abd331a4 100644
--- a/test/runtime/samples/svg/main.svelte
+++ b/test/runtime/samples/svg/main.svelte
@@ -1,3 +1,10 @@
+<script>
+	export let x;
+	export let y;
+	export let width;
+	export let height;
+</script>
+
 <svg>
 	<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
 </svg>
diff --git a/test/runtime/samples/textarea-children/main.svelte b/test/runtime/samples/textarea-children/main.svelte
index 6cc3072e5c..6579577ad9 100644
--- a/test/runtime/samples/textarea-children/main.svelte
+++ b/test/runtime/samples/textarea-children/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let foo;
+</script>
+
 <textarea>
 	<p>not actually an element. {foo}</p>
 </textarea>
\ No newline at end of file
diff --git a/test/runtime/samples/textarea-value/main.svelte b/test/runtime/samples/textarea-value/main.svelte
index 9ba2506e48..7eaf783f7f 100644
--- a/test/runtime/samples/textarea-value/main.svelte
+++ b/test/runtime/samples/textarea-value/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let foo;
+</script>
+
 <textarea value='{foo}'/>
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-nested-each-keyed-2/Widget.svelte b/test/runtime/samples/transition-js-nested-each-keyed-2/Widget.svelte
index 9b57a5905c..d24d136080 100644
--- a/test/runtime/samples/transition-js-nested-each-keyed-2/Widget.svelte
+++ b/test/runtime/samples/transition-js-nested-each-keyed-2/Widget.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let things;
+</script>
+
 {#each things as thing (thing)}
   <div></div>
 {/each}
diff --git a/test/runtime/samples/whitespace-each-block/main.svelte b/test/runtime/samples/whitespace-each-block/main.svelte
index cf8511fe39..cdb3a6baec 100644
--- a/test/runtime/samples/whitespace-each-block/main.svelte
+++ b/test/runtime/samples/whitespace-each-block/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let characters;
+</script>
+
 {#each characters as char}
 	<span>{char} </span>
 {/each}
\ No newline at end of file
diff --git a/test/runtime/samples/whitespace-list/main.svelte b/test/runtime/samples/whitespace-list/main.svelte
index c66f7344e5..2fdec4d6a3 100644
--- a/test/runtime/samples/whitespace-list/main.svelte
+++ b/test/runtime/samples/whitespace-list/main.svelte
@@ -1,3 +1,9 @@
+<script>
+	export let one;
+	export let two;
+	export let three;
+</script>
+
 <ul>
 	<li>{one}</li>
 	<li>{two}</li>
diff --git a/test/runtime/samples/whitespace-normal/main.svelte b/test/runtime/samples/whitespace-normal/main.svelte
index c845c255dd..f5cf8316d4 100644
--- a/test/runtime/samples/whitespace-normal/main.svelte
+++ b/test/runtime/samples/whitespace-normal/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let name;
+</script>
+
 <h1>Hello <strong>{name}! </strong><span>How are you?</span></h1>
diff --git a/test/runtime/samples/window-bind-scroll-update/main.svelte b/test/runtime/samples/window-bind-scroll-update/main.svelte
index 107ebeef8f..8f00d15089 100644
--- a/test/runtime/samples/window-bind-scroll-update/main.svelte
+++ b/test/runtime/samples/window-bind-scroll-update/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let scrollY;
+</script>
+
 <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-multiple-handlers/main.svelte b/test/runtime/samples/window-binding-multiple-handlers/main.svelte
index 8b28d53a9f..7601d745e4 100644
--- a/test/runtime/samples/window-binding-multiple-handlers/main.svelte
+++ b/test/runtime/samples/window-binding-multiple-handlers/main.svelte
@@ -1,2 +1,7 @@
+<script>
+	export let width;
+	export let height;
+</script>
+
 <svelte:window bind:innerWidth={width} bind:innerHeight={height}/>
 <button on:click={() => {}}>Click</button>
diff --git a/test/runtime/samples/window-binding-resize/main.svelte b/test/runtime/samples/window-binding-resize/main.svelte
index e156772be7..405f4e6e23 100644
--- a/test/runtime/samples/window-binding-resize/main.svelte
+++ b/test/runtime/samples/window-binding-resize/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let width;
+	export let height;
+</script>
+
 <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.svelte b/test/runtime/samples/window-event-context/main.svelte
index f0e37fd094..4f9dc24ba1 100644
--- a/test/runtime/samples/window-event-context/main.svelte
+++ b/test/runtime/samples/window-event-context/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let foo;
+</script>
+
 <svelte:window on:click='{() => foo = !foo}'/>
 
 {foo}
\ No newline at end of file
diff --git a/test/runtime/samples/window-event/main.svelte b/test/runtime/samples/window-event/main.svelte
index 4bf0eee526..1aa84a0890 100644
--- a/test/runtime/samples/window-event/main.svelte
+++ b/test/runtime/samples/window-event/main.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let width;
+	export let height;
+</script>
+
 <svelte:window on:resize='{() => width = this.innerWidth, height = this.innerHeight}'/>
 
 <div>{width}x{height}</div>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/attribute-dynamic/main.svelte b/test/server-side-rendering/samples/attribute-dynamic/main.svelte
index 1528a49478..07cfce149a 100644
--- a/test/server-side-rendering/samples/attribute-dynamic/main.svelte
+++ b/test/server-side-rendering/samples/attribute-dynamic/main.svelte
@@ -1 +1,6 @@
+<script>
+	export let font;
+	export let color;
+</script>
+
 <div style='font-family: {font}; color: {color};'>{color} {font}</div>
diff --git a/test/server-side-rendering/samples/component-data-dynamic/Widget.svelte b/test/server-side-rendering/samples/component-data-dynamic/Widget.svelte
index a60afb741c..40de25bb55 100644
--- a/test/server-side-rendering/samples/component-data-dynamic/Widget.svelte
+++ b/test/server-side-rendering/samples/component-data-dynamic/Widget.svelte
@@ -1,3 +1,10 @@
+<script>
+	export let foo;
+	export let baz;
+	export let qux;
+	export let quux;
+</script>
+
 <p>foo: {foo}</p>
 <p>baz: {baz} ({typeof baz})</p>
 <p>qux: {qux}</p>
diff --git a/test/server-side-rendering/samples/component-data-empty/Widget.svelte b/test/server-side-rendering/samples/component-data-empty/Widget.svelte
index 0fbf16cc4e..c94758843a 100644
--- a/test/server-side-rendering/samples/component-data-empty/Widget.svelte
+++ b/test/server-side-rendering/samples/component-data-empty/Widget.svelte
@@ -1 +1,5 @@
+<script>
+	export let foo;
+</script>
+
 <p>foo: '{foo}'</p>
diff --git a/test/server-side-rendering/samples/component-refs-and-attributes/Widget.svelte b/test/server-side-rendering/samples/component-refs-and-attributes/Widget.svelte
index c35a27b8e6..c5be3ed3af 100644
--- a/test/server-side-rendering/samples/component-refs-and-attributes/Widget.svelte
+++ b/test/server-side-rendering/samples/component-refs-and-attributes/Widget.svelte
@@ -1 +1,5 @@
+<script>
+	export let foo;
+</script>
+
 <p>{foo}</p>
diff --git a/test/server-side-rendering/samples/dynamic-text-escaped/main.svelte b/test/server-side-rendering/samples/dynamic-text-escaped/main.svelte
index 2146372482..5acf558f3b 100644
--- a/test/server-side-rendering/samples/dynamic-text-escaped/main.svelte
+++ b/test/server-side-rendering/samples/dynamic-text-escaped/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let foo;
+</script>
+
 {foo}
diff --git a/test/server-side-rendering/samples/dynamic-text/main.svelte b/test/server-side-rendering/samples/dynamic-text/main.svelte
index 2146372482..5acf558f3b 100644
--- a/test/server-side-rendering/samples/dynamic-text/main.svelte
+++ b/test/server-side-rendering/samples/dynamic-text/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let foo;
+</script>
+
 {foo}
diff --git a/test/server-side-rendering/samples/each-block/main.svelte b/test/server-side-rendering/samples/each-block/main.svelte
index 96e46c9253..ef1c5f0838 100644
--- a/test/server-side-rendering/samples/each-block/main.svelte
+++ b/test/server-side-rendering/samples/each-block/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let animals;
+</script>
+
 {#each animals as animal, i}
 	<p>{i + 1}: {animal}</p>
 {/each}
diff --git a/test/server-side-rendering/samples/entities/main.svelte b/test/server-side-rendering/samples/entities/main.svelte
index 2146372482..5acf558f3b 100644
--- a/test/server-side-rendering/samples/entities/main.svelte
+++ b/test/server-side-rendering/samples/entities/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let foo;
+</script>
+
 {foo}
diff --git a/test/server-side-rendering/samples/head-title/main.svelte b/test/server-side-rendering/samples/head-title/main.svelte
index c14a1e9c4e..a5ea171406 100644
--- a/test/server-side-rendering/samples/head-title/main.svelte
+++ b/test/server-side-rendering/samples/head-title/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let adjective;
+</script>
+
 <svelte:head>
 	<title>a {adjective} title</title>
 </svelte:head>
diff --git a/test/server-side-rendering/samples/if-block-false/main.svelte b/test/server-side-rendering/samples/if-block-false/main.svelte
index 23b4b0f7ed..45b54f74da 100644
--- a/test/server-side-rendering/samples/if-block-false/main.svelte
+++ b/test/server-side-rendering/samples/if-block-false/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let foo;
+</script>
+
 {#if foo}
 	<p>foo is true</p>
 {/if}
diff --git a/test/server-side-rendering/samples/if-block-true/main.svelte b/test/server-side-rendering/samples/if-block-true/main.svelte
index 23b4b0f7ed..45b54f74da 100644
--- a/test/server-side-rendering/samples/if-block-true/main.svelte
+++ b/test/server-side-rendering/samples/if-block-true/main.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let foo;
+</script>
+
 {#if foo}
 	<p>foo is true</p>
 {/if}
diff --git a/test/server-side-rendering/samples/raw-mustaches/main.svelte b/test/server-side-rendering/samples/raw-mustaches/main.svelte
index 28c657e9a6..e6b2ed57df 100644
--- a/test/server-side-rendering/samples/raw-mustaches/main.svelte
+++ b/test/server-side-rendering/samples/raw-mustaches/main.svelte
@@ -1 +1,5 @@
+<script>
+	export let raw;
+</script>
+
 before{@html raw}after
diff --git a/test/sourcemaps/samples/basic/input.svelte b/test/sourcemaps/samples/basic/input.svelte
index efaf9ef826..0ac40fc058 100644
--- a/test/sourcemaps/samples/basic/input.svelte
+++ b/test/sourcemaps/samples/basic/input.svelte
@@ -1 +1,5 @@
+<script>
+	export let foo;
+</script>
+
 {foo.bar.baz}
diff --git a/test/sourcemaps/samples/binding/input.svelte b/test/sourcemaps/samples/binding/input.svelte
index e493228377..de3f7d5b93 100644
--- a/test/sourcemaps/samples/binding/input.svelte
+++ b/test/sourcemaps/samples/binding/input.svelte
@@ -1 +1,5 @@
+<script>
+	export let foo;
+</script>
+
 <input bind:value={foo.bar.baz}>
diff --git a/test/validator/samples/a11y-html-has-lang/input.svelte b/test/validator/samples/a11y-html-has-lang/input.svelte
index 0fa84d90a6..ccc238e5d4 100644
--- a/test/validator/samples/a11y-html-has-lang/input.svelte
+++ b/test/validator/samples/a11y-html-has-lang/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	export let language;
+</script>
+
 <html lang="en"></html>
 <html lang="en-US"></html>
 <html lang={language}></html>
diff --git a/test/validator/samples/a11y-html-has-lang/warnings.json b/test/validator/samples/a11y-html-has-lang/warnings.json
index 963a2570db..2ac8a2e5e0 100644
--- a/test/validator/samples/a11y-html-has-lang/warnings.json
+++ b/test/validator/samples/a11y-html-has-lang/warnings.json
@@ -4,14 +4,14 @@
 		"message": "A11y: <html> element should have a lang attribute",
 		"start": {
 			"column": 0,
-			"line": 5,
-			"character": 82
+			"line": 9,
+			"character": 124
 		},
 		"end": {
-			"line": 5,
+			"line": 9,
 			"column": 13,
-			"character": 95
+			"character": 137
 		},
-		"pos": 82
+		"pos": 124
 	}
 ]
diff --git a/test/validator/samples/a11y-iframe-has-title/input.svelte b/test/validator/samples/a11y-iframe-has-title/input.svelte
index 5e07ca5a08..4689a2dcf7 100644
--- a/test/validator/samples/a11y-iframe-has-title/input.svelte
+++ b/test/validator/samples/a11y-iframe-has-title/input.svelte
@@ -1 +1,5 @@
-<iframe src='{src}'></iframe>
\ No newline at end of file
+<script>
+	export let src;
+</script>
+
+<iframe src={src}></iframe>
\ No newline at end of file
diff --git a/test/validator/samples/a11y-iframe-has-title/warnings.json b/test/validator/samples/a11y-iframe-has-title/warnings.json
index d71bae1dae..cc80cceaa2 100644
--- a/test/validator/samples/a11y-iframe-has-title/warnings.json
+++ b/test/validator/samples/a11y-iframe-has-title/warnings.json
@@ -3,15 +3,15 @@
 		"code": "a11y-missing-attribute",
 		"message": "A11y: <iframe> element should have a title attribute",
 		"start": {
-			"line": 1,
+			"line": 5,
 			"column": 0,
-			"character": 0
+			"character": 37
 		},
 		"end": {
-			"line": 1,
-			"column": 29,
-			"character": 29
+			"line": 5,
+			"column": 27,
+			"character": 64
 		},
-		"pos": 0
+		"pos": 37
 	}
 ]
diff --git a/test/validator/samples/a11y-tabindex-no-positive/input.svelte b/test/validator/samples/a11y-tabindex-no-positive/input.svelte
index e922078221..5a90e32f8d 100644
--- a/test/validator/samples/a11y-tabindex-no-positive/input.svelte
+++ b/test/validator/samples/a11y-tabindex-no-positive/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	let foo;
+</script>
+
 <div tabindex='-1'/>
 <div tabindex='0'/>
 <div tabindex='1'/>
diff --git a/test/validator/samples/a11y-tabindex-no-positive/warnings.json b/test/validator/samples/a11y-tabindex-no-positive/warnings.json
index 0695de4d7a..ac3c6bd994 100644
--- a/test/validator/samples/a11y-tabindex-no-positive/warnings.json
+++ b/test/validator/samples/a11y-tabindex-no-positive/warnings.json
@@ -3,15 +3,15 @@
 		"code": "a11y-positive-tabindex",
 		"message": "A11y: avoid tabindex values above zero",
 		"start": {
-			"line": 3,
+			"line": 7,
 			"column": 5,
-			"character": 46
+			"character": 76
 		},
 		"end": {
-			"line": 3,
+			"line": 7,
 			"column": 17,
-			"character": 58
+			"character": 88
 		},
-		"pos": 46
+		"pos": 76
 	}
 ]
diff --git a/test/validator/samples/action-invalid/warnings.json b/test/validator/samples/action-invalid/warnings.json
index d5c38acf48..c1c1b2b492 100644
--- a/test/validator/samples/action-invalid/warnings.json
+++ b/test/validator/samples/action-invalid/warnings.json
@@ -1,6 +1,6 @@
 [{
 	"code": "missing-declaration",
-	"message": "'whatever' is not defined",
+	"message": "'whatever' is not defined. Consider adding a <script> block with 'export let whatever' to declare a prop",
 	"pos": 5,
 	"start": {
 		"line": 1,
diff --git a/test/validator/samples/animation-missing/input.svelte b/test/validator/samples/animation-missing/input.svelte
index d67120436b..7f97618162 100644
--- a/test/validator/samples/animation-missing/input.svelte
+++ b/test/validator/samples/animation-missing/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	let things;
+</script>
+
 {#each things as thing (thing)}
 	<div animate:foo></div>
 {/each}
\ No newline at end of file
diff --git a/test/validator/samples/animation-missing/warnings.json b/test/validator/samples/animation-missing/warnings.json
index a9df077ade..78da5371a2 100644
--- a/test/validator/samples/animation-missing/warnings.json
+++ b/test/validator/samples/animation-missing/warnings.json
@@ -2,14 +2,14 @@
 	"code": "missing-declaration",
 	"message": "'foo' is not defined",
 	"start": {
-		"line": 2,
+		"line": 6,
 		"column": 6,
-		"character": 38
+		"character": 71
 	},
 	"end": {
-		"line": 2,
+		"line": 6,
 		"column": 17,
-		"character": 49
+		"character": 82
 	},
-	"pos": 38
+	"pos": 71
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-dimensions-svg-child/errors.json b/test/validator/samples/binding-dimensions-svg-child/errors.json
index d35946678e..bd617771bb 100644
--- a/test/validator/samples/binding-dimensions-svg-child/errors.json
+++ b/test/validator/samples/binding-dimensions-svg-child/errors.json
@@ -1,15 +1,15 @@
 [{
 	"code": "invalid-binding",
 	"message": "'offsetWidth' is not a valid binding on SVG elements",
-	"pos": 13,
+	"pos": 51,
 	"start": {
-		"line": 2,
+		"line": 6,
 		"column": 7,
-		"character": 13
+		"character": 51
 	},
 	"end": {
-		"line": 2,
+		"line": 6,
 		"column": 23,
-		"character": 29
+		"character": 67
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-dimensions-svg-child/input.svelte b/test/validator/samples/binding-dimensions-svg-child/input.svelte
index 8819dca703..c47dcc7237 100644
--- a/test/validator/samples/binding-dimensions-svg-child/input.svelte
+++ b/test/validator/samples/binding-dimensions-svg-child/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	let offsetWidth;
+</script>
+
 <svg>
 	<text bind:offsetWidth>some text</text>
 </svg>
\ No newline at end of file
diff --git a/test/validator/samples/binding-dimensions-svg/errors.json b/test/validator/samples/binding-dimensions-svg/errors.json
index 930f577f22..157f2ee180 100644
--- a/test/validator/samples/binding-dimensions-svg/errors.json
+++ b/test/validator/samples/binding-dimensions-svg/errors.json
@@ -1,15 +1,15 @@
 [{
 	"code": "invalid-binding",
 	"message": "'offsetWidth' is not a valid binding on <svg>. Use 'clientWidth' instead",
-	"pos": 5,
+	"pos": 43,
 	"start": {
-		"line": 1,
+		"line": 5,
 		"column": 5,
-		"character": 5
+		"character": 43
 	},
 	"end": {
-		"line": 1,
+		"line": 5,
 		"column": 21,
-		"character": 21
+		"character": 59
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-dimensions-svg/input.svelte b/test/validator/samples/binding-dimensions-svg/input.svelte
index ced9988f8f..ae1b42085f 100644
--- a/test/validator/samples/binding-dimensions-svg/input.svelte
+++ b/test/validator/samples/binding-dimensions-svg/input.svelte
@@ -1 +1,5 @@
+<script>
+	let offsetWidth;
+</script>
+
 <svg bind:offsetWidth></svg>
\ No newline at end of file
diff --git a/test/validator/samples/binding-dimensions-void/errors.json b/test/validator/samples/binding-dimensions-void/errors.json
index 555cb33f5d..ddd4e359c4 100644
--- a/test/validator/samples/binding-dimensions-void/errors.json
+++ b/test/validator/samples/binding-dimensions-void/errors.json
@@ -1,15 +1,15 @@
 [{
 	"code": "invalid-binding",
 	"message": "'offsetWidth' is not a valid binding on void elements like <img>. Use a wrapper element instead",
-	"pos": 22,
+	"pos": 60,
 	"start": {
-		"line": 1,
+		"line": 5,
 		"column": 22,
-		"character": 22
+		"character": 60
 	},
 	"end": {
-		"line": 1,
+		"line": 5,
 		"column": 38,
-		"character": 38
+		"character": 76
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-dimensions-void/input.svelte b/test/validator/samples/binding-dimensions-void/input.svelte
index 985f6b1930..e8a3fc4174 100644
--- a/test/validator/samples/binding-dimensions-void/input.svelte
+++ b/test/validator/samples/binding-dimensions-void/input.svelte
@@ -1 +1,5 @@
+<script>
+	let offsetWidth;
+</script>
+
 <img src='potato.jpg' bind:offsetWidth>
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-checked/errors.json b/test/validator/samples/binding-input-checked/errors.json
index 92daa1d625..596bd1b4d7 100644
--- a/test/validator/samples/binding-input-checked/errors.json
+++ b/test/validator/samples/binding-input-checked/errors.json
@@ -2,14 +2,14 @@
 	"code": "invalid-binding",
 	"message": "'checked' binding can only be used with <input type=\"checkbox\">",
 	"start": {
-		"line": 1,
+		"line": 5,
 		"column": 7,
-		"character": 7
+		"character": 37
 	},
 	"end": {
-		"line": 1,
+		"line": 5,
 		"column": 25,
-		"character": 25
+		"character": 55
 	},
-	"pos": 7
+	"pos": 37
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-checked/input.svelte b/test/validator/samples/binding-input-checked/input.svelte
index 13fc0b0faa..c01f924202 100644
--- a/test/validator/samples/binding-input-checked/input.svelte
+++ b/test/validator/samples/binding-input-checked/input.svelte
@@ -1 +1,5 @@
+<script>
+	let foo;
+</script>
+
 <input bind:checked={foo}>
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-type-boolean/errors.json b/test/validator/samples/binding-input-type-boolean/errors.json
index a2cdc84928..fcf92356ae 100644
--- a/test/validator/samples/binding-input-type-boolean/errors.json
+++ b/test/validator/samples/binding-input-type-boolean/errors.json
@@ -2,14 +2,14 @@
 	"code": "missing-type",
 	"message": "'type' attribute must be specified",
 	"start": {
-		"line": 1,
+		"line": 5,
 		"column": 24,
-		"character": 24
+		"character": 54
 	},
 	"end": {
-		"line": 1,
+		"line": 5,
 		"column": 28,
-		"character": 28
+		"character": 58
 	},
-	"pos": 24
+	"pos": 54
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-type-boolean/input.svelte b/test/validator/samples/binding-input-type-boolean/input.svelte
index 2b3ae3263d..7cabca8a10 100644
--- a/test/validator/samples/binding-input-type-boolean/input.svelte
+++ b/test/validator/samples/binding-input-type-boolean/input.svelte
@@ -1 +1,5 @@
+<script>
+	let foo;
+</script>
+
 <input bind:value={foo} type>
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-type-dynamic/errors.json b/test/validator/samples/binding-input-type-dynamic/errors.json
index 57cb256fc2..1e886a8e98 100644
--- a/test/validator/samples/binding-input-type-dynamic/errors.json
+++ b/test/validator/samples/binding-input-type-dynamic/errors.json
@@ -2,14 +2,14 @@
 	"code": "invalid-type",
 	"message": "'type' attribute cannot be dynamic if input uses two-way binding",
 	"start": {
-		"line": 1,
+		"line": 6,
 		"column": 24,
-		"character": 24
+		"character": 70
 	},
 	"end": {
-		"line": 1,
-		"column": 42,
-		"character": 42
+		"line": 6,
+		"column": 40,
+		"character": 86
 	},
-	"pos": 24
+	"pos": 70
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-input-type-dynamic/input.svelte b/test/validator/samples/binding-input-type-dynamic/input.svelte
index 9ead3ba20f..e1c69e97d6 100644
--- a/test/validator/samples/binding-input-type-dynamic/input.svelte
+++ b/test/validator/samples/binding-input-type-dynamic/input.svelte
@@ -1 +1,6 @@
-<input bind:value={foo} type='{inputType}'>
\ No newline at end of file
+<script>
+	let foo;
+	let inputType;
+</script>
+
+<input bind:value={foo} type={inputType}>
\ No newline at end of file
diff --git a/test/validator/samples/binding-invalid-on-element/errors.json b/test/validator/samples/binding-invalid-on-element/errors.json
index 40a9bd7ea2..0db88e3447 100644
--- a/test/validator/samples/binding-invalid-on-element/errors.json
+++ b/test/validator/samples/binding-invalid-on-element/errors.json
@@ -1,15 +1,15 @@
 [{
 	"code": "invalid-binding",
 	"message": "'value' is not a valid binding on <div> elements",
-	"pos": 5,
+	"pos": 37,
 	"start": {
-		"line": 1,
+		"line": 5,
 		"column": 5,
-		"character": 5
+		"character": 37
 	},
 	"end": {
-		"line": 1,
+		"line": 5,
 		"column": 15,
-		"character": 15
+		"character": 47
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-invalid-on-element/input.svelte b/test/validator/samples/binding-invalid-on-element/input.svelte
index 9b617e62be..7971dc5393 100644
--- a/test/validator/samples/binding-invalid-on-element/input.svelte
+++ b/test/validator/samples/binding-invalid-on-element/input.svelte
@@ -1 +1,5 @@
+<script>
+	let value;
+</script>
+
 <div bind:value></div>
\ No newline at end of file
diff --git a/test/validator/samples/binding-invalid/errors.json b/test/validator/samples/binding-invalid/errors.json
index 2254286d3f..5021da41b6 100644
--- a/test/validator/samples/binding-invalid/errors.json
+++ b/test/validator/samples/binding-invalid/errors.json
@@ -1,15 +1,15 @@
 [{
 	"code": "invalid-binding",
 	"message": "'whatever' is not a valid binding",
-	"pos": 5,
+	"pos": 40,
 	"start": {
-		"line": 1,
+		"line": 5,
 		"column": 5,
-		"character": 5
+		"character": 40
 	},
 	"end": {
-		"line": 1,
+		"line": 5,
 		"column": 18,
-		"character": 18
+		"character": 53
 	}
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-invalid/input.svelte b/test/validator/samples/binding-invalid/input.svelte
index 8e5f874e5b..50df17c395 100644
--- a/test/validator/samples/binding-invalid/input.svelte
+++ b/test/validator/samples/binding-invalid/input.svelte
@@ -1 +1,5 @@
+<script>
+	let whatever;
+</script>
+
 <div bind:whatever></div>
\ No newline at end of file
diff --git a/test/validator/samples/binding-select-multiple-dynamic/errors.json b/test/validator/samples/binding-select-multiple-dynamic/errors.json
index 7795c69b16..d7710a201a 100644
--- a/test/validator/samples/binding-select-multiple-dynamic/errors.json
+++ b/test/validator/samples/binding-select-multiple-dynamic/errors.json
@@ -2,14 +2,14 @@
 	"code": "dynamic-multiple-attribute",
 	"message": "'multiple' attribute cannot be dynamic if select uses two-way binding",
 	"start": {
-		"line": 1,
+		"line": 6,
 		"column": 19,
-		"character": 19
+		"character": 66
 	},
 	"end": {
-		"line": 1,
+		"line": 6,
 		"column": 29,
-		"character": 29
+		"character": 76
 	},
-	"pos": 19
+	"pos": 66
 }]
\ No newline at end of file
diff --git a/test/validator/samples/binding-select-multiple-dynamic/input.svelte b/test/validator/samples/binding-select-multiple-dynamic/input.svelte
index 9e197c1b3d..6fb0df4d47 100644
--- a/test/validator/samples/binding-select-multiple-dynamic/input.svelte
+++ b/test/validator/samples/binding-select-multiple-dynamic/input.svelte
@@ -1,3 +1,8 @@
+<script>
+	let value;
+	let multiple;
+</script>
+
 <select bind:value {multiple}>
 	<option>1</option>
 	<option>2</option>
diff --git a/test/validator/samples/each-block-multiple-children/input.svelte b/test/validator/samples/each-block-multiple-children/input.svelte
index 384dce49b6..211ebed0c8 100644
--- a/test/validator/samples/each-block-multiple-children/input.svelte
+++ b/test/validator/samples/each-block-multiple-children/input.svelte
@@ -1,3 +1,8 @@
+<script>
+	export let things;
+	export let soDoesThis;
+</script>
+
 {#each things as thing}
 	<span>this only exists...</span>
 	<span>...to increase test coverage</span>
diff --git a/test/validator/samples/empty-block/input.svelte b/test/validator/samples/empty-block/input.svelte
index 979ff837e9..4185f4f817 100644
--- a/test/validator/samples/empty-block/input.svelte
+++ b/test/validator/samples/empty-block/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	let things = [];
+</script>
+
 {#each things as thing}
 
 {/each}
diff --git a/test/validator/samples/empty-block/warnings.json b/test/validator/samples/empty-block/warnings.json
index c26784952c..d563970425 100644
--- a/test/validator/samples/empty-block/warnings.json
+++ b/test/validator/samples/empty-block/warnings.json
@@ -3,30 +3,30 @@
 		"code": "empty-block",
 		"message": "Empty block",
 		"start": {
-			"line": 1,
+			"line": 5,
 			"column": 0,
-			"character": 0
+			"character": 38
 		},
 		"end": {
-			"line": 3,
+			"line": 7,
 			"column": 7,
-			"character": 32
+			"character": 70
 		},
-		"pos": 0
+		"pos": 38
 	},
 	{
 		"code": "empty-block",
 		"message": "Empty block",
 		"start": {
-			"line": 5,
+			"line": 9,
 			"column": 0,
-			"character": 34
+			"character": 72
 		},
 		"end": {
-			"line": 5,
+			"line": 9,
 			"column": 30,
-			"character": 64
+			"character": 102
 		},
-		"pos": 34
+		"pos": 72
 	}
 ]
\ No newline at end of file
diff --git a/test/validator/samples/missing-component/warnings.json b/test/validator/samples/missing-component/warnings.json
index 6aed92a6ad..9c95cd81f1 100644
--- a/test/validator/samples/missing-component/warnings.json
+++ b/test/validator/samples/missing-component/warnings.json
@@ -1,6 +1,6 @@
 [{
 	"code": "missing-declaration",
-	"message": "'Widget' is not defined",
+	"message": "'Widget' is not defined. Consider adding a <script> block with 'export let Widget' to declare a prop",
 	"start": {
 		"line": 2,
 		"column": 1,
diff --git a/test/validator/samples/non-empty-block-dev/input.svelte b/test/validator/samples/non-empty-block-dev/input.svelte
index ed4b9e6274..689f3fa2fe 100644
--- a/test/validator/samples/non-empty-block-dev/input.svelte
+++ b/test/validator/samples/non-empty-block-dev/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	let x;
+</script>
+
 {#if x}
 	&nbsp;
 {/if}
\ No newline at end of file
diff --git a/test/validator/samples/select-multiple/input.svelte b/test/validator/samples/select-multiple/input.svelte
index 268e202c2e..14cba6b882 100644
--- a/test/validator/samples/select-multiple/input.svelte
+++ b/test/validator/samples/select-multiple/input.svelte
@@ -1,3 +1,7 @@
+<script>
+	let value;
+</script>
+
 <select bind:value multiple>
 	<option>1</option>
 </select>
\ No newline at end of file
diff --git a/test/validator/samples/svg-child-component-declared-namespace/input.svelte b/test/validator/samples/svg-child-component-declared-namespace/input.svelte
index 3871f86c21..124265adb3 100644
--- a/test/validator/samples/svg-child-component-declared-namespace/input.svelte
+++ b/test/validator/samples/svg-child-component-declared-namespace/input.svelte
@@ -7,4 +7,4 @@
 	export let height;
 </script>
 
-<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
+<rect x={x} y={y} width={width} height={height}/>
diff --git a/test/validator/samples/svg-child-component-undeclared-namespace/input.svelte b/test/validator/samples/svg-child-component-undeclared-namespace/input.svelte
index 8ba5698f05..b4b6fc86d7 100644
--- a/test/validator/samples/svg-child-component-undeclared-namespace/input.svelte
+++ b/test/validator/samples/svg-child-component-undeclared-namespace/input.svelte
@@ -1 +1,8 @@
-<rect x='{x}' y='{y}' width='{width}' height='{height}'/>
\ No newline at end of file
+<script>
+	export let x;
+	export let y;
+	export let width;
+	export let height;
+</script>
+
+<rect x={x} y={y} width={width} height={height}/>
\ No newline at end of file
diff --git a/test/validator/samples/svg-child-component-undeclared-namespace/warnings.json b/test/validator/samples/svg-child-component-undeclared-namespace/warnings.json
index fc3d19a487..128b8628ed 100644
--- a/test/validator/samples/svg-child-component-undeclared-namespace/warnings.json
+++ b/test/validator/samples/svg-child-component-undeclared-namespace/warnings.json
@@ -2,14 +2,14 @@
 	"code": "missing-namespace",
 	"message": "<rect> is an SVG element – did you forget to add <svelte:options namespace=\"svg\"/> ?",
 	"start": {
-		"line": 1,
+		"line": 8,
 		"column": 0,
-		"character": 0
+		"character": 89
 	},
 	"end": {
-		"line": 1,
-		"column": 57,
-		"character": 57
+		"line": 8,
+		"column": 49,
+		"character": 138
 	},
-	"pos": 0
+	"pos": 89
 }]
diff --git a/test/validator/samples/transition-missing/warnings.json b/test/validator/samples/transition-missing/warnings.json
index b50d55d579..19520a6729 100644
--- a/test/validator/samples/transition-missing/warnings.json
+++ b/test/validator/samples/transition-missing/warnings.json
@@ -1,6 +1,6 @@
 [{
 	"code": "missing-declaration",
-	"message": "'foo' is not defined",
+	"message": "'foo' is not defined. Consider adding a <script> block with 'export let foo' to declare a prop",
 	"start": {
 		"line": 1,
 		"column": 5,
diff --git a/test/validator/samples/window-binding-online/input.svelte b/test/validator/samples/window-binding-online/input.svelte
index 8684545304..99aa93b12d 100644
--- a/test/validator/samples/window-binding-online/input.svelte
+++ b/test/validator/samples/window-binding-online/input.svelte
@@ -1 +1,5 @@
+<script>
+	let online;
+</script>
+
 <svelte:window bind:online/>
\ No newline at end of file
diff --git a/test/vars/samples/implicit-action/_config.js b/test/vars/samples/assumed-global/_config.js
similarity index 100%
rename from test/vars/samples/implicit-action/_config.js
rename to test/vars/samples/assumed-global/_config.js
diff --git a/test/vars/samples/implicit/input.svelte b/test/vars/samples/assumed-global/input.svelte
similarity index 100%
rename from test/vars/samples/implicit/input.svelte
rename to test/vars/samples/assumed-global/input.svelte
diff --git a/test/vars/samples/implicit-action/input.svelte b/test/vars/samples/implicit-action/input.svelte
deleted file mode 100644
index 466495d255..0000000000
--- a/test/vars/samples/implicit-action/input.svelte
+++ /dev/null
@@ -1 +0,0 @@
-<div use:foo/>
\ No newline at end of file
diff --git a/test/vars/samples/implicit/_config.js b/test/vars/samples/implicit/_config.js
deleted file mode 100644
index 0c685e7f18..0000000000
--- a/test/vars/samples/implicit/_config.js
+++ /dev/null
@@ -1,16 +0,0 @@
-export default {
-	test(assert, vars) {
-		assert.deepEqual(vars, [
-			{
-				export_name: 'foo',
-				injected: false,
-				module: false,
-				mutated: false,
-				name: 'foo',
-				reassigned: false,
-				referenced: true,
-				writable: true,
-			},
-		]);
-	},
-};
diff --git a/test/vars/samples/template-references/_config.js b/test/vars/samples/template-references/_config.js
index 1d78fbdf46..adacc0d2ef 100644
--- a/test/vars/samples/template-references/_config.js
+++ b/test/vars/samples/template-references/_config.js
@@ -2,27 +2,27 @@ export default {
 	test(assert, vars) {
 		assert.deepEqual(vars, [
 			{
-				export_name: 'foo',
+				export_name: null,
 				injected: false,
 				module: false,
 				mutated: false,
-				name: 'foo',
+				name: 'Bar',
 				reassigned: false,
 				referenced: true,
-				writable: true,
+				writable: false,
 			},
 			{
-				export_name: 'Bar',
+				export_name: null,
 				injected: false,
 				module: false,
 				mutated: false,
-				name: 'Bar',
+				name: 'foo',
 				reassigned: false,
 				referenced: true,
 				writable: true,
 			},
 			{
-				export_name: 'baz',
+				export_name: null,
 				injected: false,
 				module: false,
 				mutated: false,
diff --git a/test/vars/samples/template-references/input.svelte b/test/vars/samples/template-references/input.svelte
index 938e61b7bd..4e2edad7e6 100644
--- a/test/vars/samples/template-references/input.svelte
+++ b/test/vars/samples/template-references/input.svelte
@@ -1,2 +1,9 @@
+<script>
+	import Bar from './Bar.svelte';
+
+	let foo = 1;
+	let baz = 2;
+</script>
+
 {foo}
 <Bar {baz}/>