Merge branch 'master' into pr/6811

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Svelte changelog
 
+## 3.44.0
+
+* Add `enableSourcemap` compiler option ([#6835](https://github.com/sveltejs/svelte/pull/6835))
+
+## 3.43.2
+
+* Fix regression where user-specified `import`s were not rewritten according to the `sveltePath` option ([#6834](https://github.com/sveltejs/svelte/issues/6834))
+
 ## 3.43.1
 
 * Prevent a rejecting promise used in `{#await}` during SSR from appearing as an unhandled rejection ([#6789](https://github.com/sveltejs/svelte/issues/6789))

package-lock.json

@@ -1,11 +1,12 @@
 {
   "name": "svelte",
-  "version": "3.43.1",
+  "version": "3.44.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "3.43.1",
+      "name": "svelte",
+      "version": "3.44.0",
       "license": "MIT",
       "devDependencies": {
         "@ampproject/remapping": "^0.3.0",
@@ -16,7 +17,7 @@
         "@rollup/plugin-sucrase": "^3.1.0",
         "@rollup/plugin-typescript": "^2.0.1",
         "@rollup/plugin-virtual": "^2.0.0",
-        "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.7.0",
+        "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.8.0",
         "@types/mocha": "^7.0.0",
         "@types/node": "^8.10.53",
         "@typescript-eslint/eslint-plugin": "^4.31.2",
@@ -5804,7 +5805,7 @@
     "@sveltejs/eslint-config": {
       "version": "git+ssh://git@github.com/sveltejs/eslint-config.git#31fd4faeea88990069502460b023698b1c9c2d13",
       "dev": true,
-      "from": "@sveltejs/eslint-config@github:sveltejs/eslint-config#v5.7.0"
+      "from": "@sveltejs/eslint-config@github:sveltejs/eslint-config#v5.8.0"
     },
     "@tootallnate/once": {
       "version": "1.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "3.43.1",
+  "version": "3.44.0",
   "description": "Cybernetically enhanced web apps",
   "module": "index.mjs",
   "main": "index",
@@ -111,7 +111,7 @@
     "@rollup/plugin-sucrase": "^3.1.0",
     "@rollup/plugin-typescript": "^2.0.1",
     "@rollup/plugin-virtual": "^2.0.0",
-    "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.7.0",
+    "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.8.0",
     "@types/mocha": "^7.0.0",
     "@types/node": "^8.10.53",
     "@typescript-eslint/eslint-plugin": "^4.31.2",

site/content/docs/04-compile-time.md

@@ -82,6 +82,8 @@ The following options can be passed to the compiler. None are required:
 | `loopGuardTimeout` | 0 | A `number` that tells Svelte to break the loop if it blocks the thread for more than `loopGuardTimeout` ms. This is useful to prevent infinite loops. **Only available when `dev: true`**
 | `preserveComments` | `false` | If `true`, your HTML comments will be preserved during server-side rendering. By default, they are stripped out.
 | `preserveWhitespace` | `false` | If `true`, whitespace inside and between elements is kept as you typed it, rather than removed or collapsed to a single space where possible.
+| `sourcemap` | `object \| string` | An initial sourcemap that will be merged into the final output sourcemap. This is usually the preprocessor sourcemap.
+| `enableSourcemap` | `boolean \| { js: boolean; css: boolean; }` | If `true`, Svelte generate sourcemaps for components. Use an object with `js` or `css` for more granular control of sourcemap generation. By default, this is `true`.
 | `outputFilename` | `null` | A `string` used for your JavaScript sourcemap.
 | `cssOutputFilename` | `null` | A `string` used for your CSS sourcemap.
 | `sveltePath` | `"svelte"` | The location of the `svelte` package. Any imports from `svelte` or `svelte/[module]` will be modified accordingly.

site/content/examples/09-transitions/04-custom-js-transitions/App.svelte

@@ -30,7 +30,7 @@
 </label>
 
 {#if visible}
-	<p in:typewriter out:typewriter>
+	<p transition:typewriter>
 		The quick brown fox jumps over the lazy dog
 	</p>
 {/if}

site/content/tutorial/06-bindings/02-numeric-inputs/app-a/App.svelte

@@ -14,3 +14,8 @@
 </label>
 
 <p>{a} + {b} = {a + b}</p>
+
+<style>
+	label { display: flex }
+	input, p { margin: 6px }
+</style>

site/content/tutorial/06-bindings/02-numeric-inputs/app-b/App.svelte

@@ -14,3 +14,8 @@
 </label>
 
 <p>{a} + {b} = {a + b}</p>
+
+<style>
+	label { display: flex }
+	input, p { margin: 6px }
+</style>

site/content/tutorial/10-transitions/05-custom-js-transitions/app-a/App.svelte

@@ -16,7 +16,7 @@
 </label>
 
 {#if visible}
-	<p in:typewriter>
+	<p transition:typewriter>
 		The quick brown fox jumps over the lazy dog
 	</p>
 {/if}

site/content/tutorial/10-transitions/05-custom-js-transitions/app-b/App.svelte

@@ -30,7 +30,7 @@
 </label>
 
 {#if visible}
-	<p in:typewriter out:typewriter>
+	<p transition:typewriter>
 		The quick brown fox jumps over the lazy dog
 	</p>
 {/if}

src/compiler/compile/Component.ts

@@ -36,6 +36,7 @@ import { clone } from '../utils/clone';
 import compiler_warnings from './compiler_warnings';
 import compiler_errors from './compiler_errors';
 import { extract_ignores_above_position, extract_svelte_ignore_from_comments } from '../utils/extract_svelte_ignore';
+import check_enable_sourcemap from './utils/check_enable_sourcemap';
 
 interface ComponentOptions {
 	namespace?: string;
@@ -343,21 +344,28 @@ export default class Component {
 				? { code: null, map: null }
 				: result.css;
 
-			const sourcemap_source_filename = get_sourcemap_source_filename(compile_options);
+			const js_sourcemap_enabled = check_enable_sourcemap(compile_options.enableSourcemap, 'js');
 
-			js = print(program, {
+			if (!js_sourcemap_enabled) {
-				sourceMapSource: sourcemap_source_filename
+				js = print(program);
-			});
+				js.map = null;
+			} else {
+				const sourcemap_source_filename = get_sourcemap_source_filename(compile_options);
 
-			js.map.sources = [
+				js = print(program, {
-				sourcemap_source_filename
+					sourceMapSource: sourcemap_source_filename
-			];
+				});
 
-			js.map.sourcesContent = [
+				js.map.sources = [
-				this.source
+					sourcemap_source_filename
-			];
+				];
 
-			js.map = apply_preprocessor_sourcemap(sourcemap_source_filename, js.map, compile_options.sourcemap as (string | RawSourceMap | DecodedSourceMap));
+				js.map.sourcesContent = [
+					this.source
+				];
+
+				js.map = apply_preprocessor_sourcemap(sourcemap_source_filename, js.map, compile_options.sourcemap as (string | RawSourceMap | DecodedSourceMap));
+			}
 		}
 
 		return {

src/compiler/compile/create_module.ts

@@ -93,12 +93,15 @@ function esm(
 	const internal_globals = get_internal_globals(globals, helpers);
 
 	// edit user imports
-	imports.forEach(node => {
+	function rewrite_import(node) {
-		node.source.value = edit_source(node.source.value, sveltePath);
+		const value = edit_source(node.source.value, sveltePath);
-	});
+		if (node.source.value !== value) {
-	exports_from.forEach(node => {
+			node.source.value = value;
-		node.source!.value = edit_source(node.source!.value, sveltePath);
+			node.source.raw = null;
-	});
+		}
+	}
+	imports.forEach(rewrite_import);
+	exports_from.forEach(rewrite_import);
 
 	const exports = module_exports.length > 0 && {
 		type: 'ExportNamedDeclaration',

src/compiler/compile/index.ts

@@ -13,6 +13,7 @@ const valid_options = [
 	'name',
 	'filename',
 	'sourcemap',
+	'enableSourcemap',
 	'generate',
 	'errorMode',
 	'varsReport',
@@ -82,7 +83,7 @@ function validate_options(options: CompileOptions, warnings: Warning[]) {
 }
 
 export default function compile(source: string, options: CompileOptions = {}) {
-	options = Object.assign({ generate: 'dom', dev: false }, options);
+	options = Object.assign({ generate: 'dom', dev: false, enableSourcemap: true }, options);
 
 	const stats = new Stats();
 	const warnings = [];

src/compiler/compile/render_dom/index.ts

@@ -10,6 +10,7 @@ import { ImportDeclaration, ClassDeclaration, FunctionExpression, Node, Statemen
 import { apply_preprocessor_sourcemap } from '../../utils/mapped_code';
 import { RawSourceMap, DecodedSourceMap } from '@ampproject/remapping/dist/types/types';
 import { flatten } from '../../utils/flatten';
+import check_enable_sourcemap from '../utils/check_enable_sourcemap';
 
 export default function dom(
 	component: Component,
@@ -34,9 +35,15 @@ export default function dom(
 
 	const css = component.stylesheet.render(options.filename, !options.customElement);
 
-	css.map = apply_preprocessor_sourcemap(options.filename, css.map, options.sourcemap as string | RawSourceMap | DecodedSourceMap);
+	const css_sourcemap_enabled = check_enable_sourcemap(options.enableSourcemap, 'css');
 
-	const styles = component.stylesheet.has_styles && options.dev
+	if (css_sourcemap_enabled) {
+		css.map = apply_preprocessor_sourcemap(options.filename, css.map, options.sourcemap as string | RawSourceMap | DecodedSourceMap);
+	} else {
+		css.map = null;
+	}
+
+	const styles = css_sourcemap_enabled && component.stylesheet.has_styles && options.dev
 		? `${css.code}\n/*# sourceMappingURL=${css.map.toUrl()} */`
 		: css.code;
 
@@ -521,7 +528,7 @@ export default function dom(
 				constructor(options) {
 					super();
 
-					${css.code && b`this.shadowRoot.innerHTML = \`<style>${css.code.replace(/\\/g, '\\\\')}${options.dev ? `\n/*# sourceMappingURL=${css.map.toUrl()} */` : ''}</style>\`;`}
+					${css.code && b`this.shadowRoot.innerHTML = \`<style>${css.code.replace(/\\/g, '\\\\')}${css_sourcemap_enabled && options.dev ? `\n/*# sourceMappingURL=${css.map.toUrl()} */` : ''}</style>\`;`}
 
 					@init(this, { target: this.shadowRoot, props: ${init_props}, customElement: true }, ${definition}, ${has_create_fragment ? 'create_fragment' : 'null'}, ${not_equal}, ${prop_indexes}, null, ${dirty});
 

src/compiler/compile/render_ssr/index.ts

@@ -10,6 +10,7 @@ import { extract_names } from 'periscopic';
 import { walk } from 'estree-walker';
 
 import { invalidate } from '../render_dom/invalidate';
+import check_enable_sourcemap from '../utils/check_enable_sourcemap';
 
 export default function ssr(
 	component: Component,
@@ -200,11 +201,13 @@ export default function ssr(
 		main
 	].filter(Boolean);
 
+	const css_sourcemap_enabled = check_enable_sourcemap(options.enableSourcemap, 'css');
+
 	const js = b`
 		${css.code ? b`
 		const #css = {
 			code: "${css.code}",
-			map: ${css.map ? string_literal(css.map.toString()) : 'null'}
+			map: ${css_sourcemap_enabled && css.map ? string_literal(css.map.toString()) : 'null'}
 		};` : null}
 
 		${component.extract_javascript(component.ast.module)}

src/compiler/compile/utils/check_enable_sourcemap.ts

@@ -0,0 +1,10 @@
+import { EnableSourcemap } from '../../interfaces';
+
+export default function check_enable_sourcemap(
+  enable_sourcemap: EnableSourcemap,
+  namespace: keyof Extract<EnableSourcemap, object>
+) {
+  return typeof enable_sourcemap === 'boolean'
+    ? enable_sourcemap
+    : enable_sourcemap[namespace];
+}

src/compiler/interfaces.ts

@@ -131,6 +131,8 @@ export interface Warning {
 
 export type ModuleFormat = 'esm' | 'cjs';
 
+export type EnableSourcemap = boolean | { js: boolean; css: boolean };
+
 export type CssHashGetter = (args: {
 	name: string;
 	filename: string | undefined;
@@ -147,6 +149,7 @@ export interface CompileOptions {
 	varsReport?: 'full' | 'strict' | false;
 
 	sourcemap?: object | string;
+	enableSourcemap?: EnableSourcemap;
 	outputFilename?: string;
 	cssOutputFilename?: string;
 	sveltePath?: string;

test/js/samples/custom-svelte-path/_config.js

@@ -0,0 +1,5 @@
+export default {
+	options: {
+		sveltePath: 'a/b/svelte'
+	}
+};

test/js/samples/custom-svelte-path/expected.js

@@ -0,0 +1,64 @@
+/* generated by Svelte vX.Y.Z */
+import {
+	SvelteComponent,
+	append,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	set_data,
+	text
+} from "a/b/svelte/internal";
+
+import { onMount } from "a/b/svelte";
+
+function create_fragment(ctx) {
+	let h1;
+	let t0;
+	let t1;
+	let t2;
+
+	return {
+		c() {
+			h1 = element("h1");
+			t0 = text("Hello ");
+			t1 = text(/*name*/ ctx[0]);
+			t2 = text("!");
+		},
+		m(target, anchor) {
+			insert(target, h1, anchor);
+			append(h1, t0);
+			append(h1, t1);
+			append(h1, t2);
+		},
+		p(ctx, [dirty]) {
+			if (dirty & /*name*/ 1) set_data(t1, /*name*/ ctx[0]);
+		},
+		i: noop,
+		o: noop,
+		d(detaching) {
+			if (detaching) detach(h1);
+		}
+	};
+}
+
+function instance($$self, $$props, $$invalidate) {
+	let name = '';
+
+	onMount(() => {
+		$$invalidate(0, name = 'world');
+	});
+
+	return [name];
+}
+
+class Component extends SvelteComponent {
+	constructor(options) {
+		super();
+		init(this, options, instance, create_fragment, safe_not_equal, {});
+	}
+}
+
+export default Component;

test/js/samples/custom-svelte-path/input.svelte

@@ -0,0 +1,9 @@
+<script>
+	import { onMount } from 'svelte';
+	let name = '';
+  onMount(() => {
+    name = 'world';
+  })
+</script>
+
+<h1>Hello {name}!</h1>

test/runtime/samples/$$slot/_config.js

@@ -11,7 +11,7 @@ export default {
 		<div><span slot="b">hello world</span></div>
 	`,
 
-	async test({ assert, target, component }) {
+	async test({ assert, component }) {
 		assert.equal(component.getA(), '');
 		assert.equal(component.getB(), 'foo');
 	}

test/runtime/samples/action-custom-event-handler-node-context/_config.js

@@ -3,7 +3,7 @@ export default {
 
 	html: '<button>10</button>',
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const event = new window.MouseEvent('click');
 
 		const button = target.querySelector('button');

test/runtime/samples/action-custom-event-handler-this/_config.js

@@ -1,7 +1,7 @@
 export default {
 	html: '<input>',
 
-	test({ assert, component, target, window }) {
+	test({ assert, target, window }) {
 		const input = target.querySelector('input');
 		const event = new window.KeyboardEvent('keydown', {
 			key: 'Enter'

test/runtime/samples/action-custom-event-handler-with-context/_config.js

@@ -1,7 +1,7 @@
 export default {
 	html: '<button>???</button>',
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const event = new window.MouseEvent('click', {
 			clientX: 42,
 			clientY: 42

test/runtime/samples/action-function/_config.js

@@ -3,7 +3,7 @@ export default {
 		<button>action</button>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const button = target.querySelector('button');
 		const eventEnter = new window.MouseEvent('mouseenter');
 		const eventLeave = new window.MouseEvent('mouseleave');

test/runtime/samples/action-object-deep/_config.js

@@ -2,7 +2,7 @@ export default {
 	html: `
 		<button>action</button>
 	`,
-	async test({ assert, target, window }) {
+	async test({ assert, target }) {
 		assert.equal(target.querySelector('button').foo, 'bar1337');
 	}
 };

test/runtime/samples/action-object/_config.js

@@ -2,7 +2,7 @@ export default {
 	html: `
 		<button>action</button>
 	`,
-	async test({ assert, target, window }) {
+	async test({ assert, target }) {
 		assert.equal(target.querySelector('button').foo, 'bar1337');
 	}
 };

test/runtime/samples/action-receives-element-mounted/_config.js

@@ -2,7 +2,7 @@ const result = {};
 
 export default {
 	props: { result },
-	async test({ assert, component, target, window }) {
+	async test({ assert }) {
 		assert.notEqual(result.parentElement, null);
 	}
 };

test/runtime/samples/action-ternary-template/_config.js

@@ -8,7 +8,7 @@ export default {
 		<h1></h1>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const header = target.querySelector('h1');
 		const click = new window.MouseEvent('click');
 

test/runtime/samples/action-this/_config.js

@@ -1,5 +1,5 @@
 export default {
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const button = target.querySelector('button');
 		const click = new window.MouseEvent('click');
 

test/runtime/samples/animation-js-delay/_config.js

@@ -17,7 +17,7 @@ export default {
 		<div>e</div>
 	`,
 
-	test({ assert, component, target, window, raf }) {
+	test({ assert, component, window, raf }) {
 		let divs = window.document.querySelectorAll('div');
 		divs.forEach(div => {
 			div.getBoundingClientRect = function() {

test/runtime/samples/animation-js-easing/_config.js

@@ -17,7 +17,7 @@ export default {
 		<div>e</div>
 	`,
 
-	test({ assert, component, target, window, raf }) {
+	test({ assert, component, raf }) {
 		let divs = document.querySelectorAll('div');
 		divs.forEach(div => {
 			div.getBoundingClientRect = function() {

test/runtime/samples/animation-js/_config.js

@@ -17,7 +17,7 @@ export default {
 		<div>e</div>
 	`,
 
-	test({ assert, component, target, window, raf }) {
+	test({ assert, component, raf }) {
 		let divs = document.querySelectorAll('div');
 		divs.forEach(div => {
 			div.getBoundingClientRect = function() {

test/runtime/samples/apply-directives-in-order-2/_config.js

@@ -4,7 +4,7 @@ export default {
 		value
 	},
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const inputs = target.querySelectorAll('input');
 
 		const event = new window.Event('input');

test/runtime/samples/apply-directives-in-order/_config.js

@@ -13,7 +13,7 @@ export default {
 		<p></p>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const input = target.querySelector('input');
 
 		const event = new window.Event('input');

test/runtime/samples/attribute-boolean-false/_config.js

@@ -1,6 +1,6 @@
 export default {
 	html: '<textarea></textarea>',
-	test({ assert, component, target }) {
+	test({ assert, target }) {
 		const textarea = target.querySelector('textarea');
 		assert.ok(textarea.readOnly === false);
 	}

test/runtime/samples/attribute-boolean-true/_config.js

@@ -1,6 +1,6 @@
 export default {
 	html: '<textarea readonly></textarea>',
-	test({ assert, component, target }) {
+	test({ assert, target }) {
 		const textarea = target.querySelector('textarea');
 		assert.ok(textarea.readOnly);
 	}

test/runtime/samples/attribute-namespaced/_config.js

@@ -7,7 +7,7 @@ export default {
 		</svg>
 	`,
 
-	test({ assert, component, target }) {
+	test({ assert, target }) {
 		const use = target.querySelector( 'use' );
 		assert.equal( use.getAttributeNS( 'http://www.w3.org/1999/xlink', 'href' ), '#bar' );
 	}

test/runtime/samples/attribute-static-boolean/_config.js

@@ -1,6 +1,6 @@
 export default {
 	html: '<textarea readonly=""></textarea>',
-	test({ assert, component, target }) {
+	test({ assert, target }) {
 		const textarea = target.querySelector( 'textarea' );
 		assert.ok( textarea.readOnly );
 	}

test/runtime/samples/await-conservative-update/_config.js

@@ -5,7 +5,7 @@ export default {
 		<p>loading...</p>
 	`,
 
-	test({ assert, component, target }) {
+	test({ assert, target }) {
 		return sleep(50).then(() => {
 			assert.htmlEqual(target.innerHTML, `
 				<p>the answer is 42</p>

test/runtime/samples/await-in-each/_config.js

@@ -18,7 +18,7 @@ export default {
 		<p>a title: loading...</p>
 	`,
 
-	test({ assert, component, target }) {
+	test({ assert, target }) {
 		fulfil(42);
 
 		return thePromise

test/runtime/samples/await-then-catch-order/_config.js

@@ -13,7 +13,7 @@ export default {
 		<p>loading...</p><p>true!</p>
 	`,
 
-	test({ assert, component, target }) {
+	test({ assert, target }) {
 		fulfil(42);
 
 		return thePromise

test/runtime/samples/await-then-catch-static/_config.js

@@ -22,7 +22,7 @@ export default {
 					<p>loaded</p>
 				`);
 
-				promise = new Promise((f, r) => {
+				promise = new Promise((f, _) => {
 					fulfil = f;
 				});
 

test/runtime/samples/await-then-destruct-array/_config.js

@@ -1,6 +1,6 @@
 export default {
 	props: {
-		thePromise: new Promise(resolve => {})
+		thePromise: new Promise(_ => {})
 	},
 
 	html: `

test/runtime/samples/await-then-destruct-default/_config.js

@@ -1,5 +1,5 @@
 export default {
-	async test({ assert, component, target }) {
+	async test({ assert, target }) {
 		await Promise.resolve();
 
 		assert.htmlEqual(

test/runtime/samples/await-then-destruct-object/_config.js

@@ -1,6 +1,6 @@
 export default {
 	props: {
-		thePromise: new Promise(resolve => {})
+		thePromise: new Promise(_ => {})
 	},
 
 	html: `

test/runtime/samples/await-then-destruct-rest/_config.js

@@ -1,5 +1,5 @@
 export default {
-	async test({ assert, component, target }) {
+	async test({ assert, target }) {
 		await Promise.resolve();
 
 		assert.htmlEqual(

test/runtime/samples/await-then-if/_config.js

@@ -13,7 +13,7 @@ export default {
 		loading...
 	`,
 
-	async test({ assert, component, target }) {
+	async test({ assert, target }) {
 		fulfil([]);
 
 		await thePromise;

test/runtime/samples/binding-input-group-duplicate-value/_config.js

@@ -17,7 +17,7 @@ export default {
 		<input type='checkbox' value='d'>d<br>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const inputs = target.querySelectorAll('input');
 		const p = target.querySelector('p');
 

test/runtime/samples/binding-input-group-each-6/_config.js

@@ -13,7 +13,7 @@ export default {
 		<label><input type="checkbox" value="z"> z</label>
 		<p></p>
 	`,
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const inputs = target.querySelectorAll('input');
 		assert.equal(inputs[0].checked, false);
 		assert.equal(inputs[1].checked, false);

test/runtime/samples/binding-input-group-each-7/_config.js

@@ -20,7 +20,7 @@ export default {
 		<input type="checkbox" value="c" data-index="z-2">
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const inputs = target.querySelectorAll('input');
 		const checked = new Set();
 		const checkInbox = async (i) => {

test/runtime/samples/binding-input-text-undefined/_config.js

@@ -7,7 +7,7 @@ export default {
 		<input>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, component, target }) {
 		const input = target.querySelector('input');
 		assert.equal(input.value, '');
 

test/runtime/samples/binding-select-initial-value/_config.js

@@ -15,7 +15,7 @@ export default {
 		selected: 'b'
 	},
 
-	test({ assert, component, target }) {
+	test({ assert, target }) {
 		const select = target.querySelector('select');
 		const options = [...target.querySelectorAll('option')];
 

test/runtime/samples/bitmask-overflow-if/_config.js

@@ -6,7 +6,7 @@ export default {
 		<button></button>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const button = target.querySelector('button');
 		await button.dispatchEvent(new window.MouseEvent('click'));
 

test/runtime/samples/bitmask-overflow-slot-6/_config.js

@@ -7,7 +7,7 @@ export default {
 		<button>Toggle outside</button>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const button = target.querySelectorAll('button')[1];
 		const div = target.querySelector('div');
 		await div.dispatchEvent(new window.MouseEvent('click'));

test/runtime/samples/class-shortcut-with-class/_config.js

@@ -7,7 +7,7 @@ export default {
 
 	html: '<div class="one two foo bar"></div>',
 
-	test({ assert, component, target, window }) {
+	test({ assert, component, target }) {
 		component.foo = false;
 
 		assert.htmlEqual(target.innerHTML, `

test/runtime/samples/class-shortcut/_config.js

@@ -6,7 +6,7 @@ export default {
 
 	html: '<div class="foo bar"></div>',
 
-	test({ assert, component, target, window }) {
+	test({ assert, component, target }) {
 		component.foo = false;
 
 		assert.htmlEqual(target.innerHTML, `

test/runtime/samples/class-with-dynamic-attribute-and-spread/_config.js

@@ -8,7 +8,7 @@ export default {
 
 	html: '<div class="one two three" role="button"></div>',
 
-	test({ assert, component, target, window }) {
+	test({ assert, component, target }) {
 		component.myClass = 'one';
 		component.attributes = {
 			'aria-label': 'Test'

test/runtime/samples/class-with-dynamic-attribute/_config.js

@@ -5,7 +5,7 @@ export default {
 
 	html: '<div class="one two three"></div>',
 
-	test({ assert, component, target, window }) {
+	test({ assert, component, target }) {
 		component.myClass = 'one';
 
 		assert.htmlEqual(target.innerHTML, `

test/runtime/samples/class-with-spread-and-bind/_config.js

@@ -5,7 +5,7 @@ export default {
 
 	html: '<div class="test-class primary" role="button"></div>',
 
-	test({ assert, component, target, window }) {
+	test({ assert, component, target }) {
 		component.primary = true;
 
 		assert.htmlEqual(

test/runtime/samples/class-with-spread/_config.js

@@ -8,7 +8,7 @@ export default {
 
 	html: '<div class="one two" role="button"></div>',
 
-	test({ assert, component, target, window }) {
+	test({ assert, component, target }) {
 		component.myClass = 'one';
 		component.attributes = {
 			'aria-label': 'Test'

test/runtime/samples/component-binding-accessors/_config.js

@@ -1,5 +1,5 @@
 export default {
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const [input1, input2] = target.querySelectorAll('input');
 		assert.equal(input1.value, 'something');
 		assert.equal(input2.value, 'something');

test/runtime/samples/component-binding-blowback-b/_config.js

@@ -14,7 +14,7 @@ export default {
 		</ol>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const input = target.querySelector('input');
 
 		input.value = 4;

test/runtime/samples/component-binding-parent-supercedes-child-b/_config.js

@@ -4,7 +4,7 @@ export default {
 		<p>x in parent: yes</p>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, component, target }) {
 		component.a = false;
 
 		assert.htmlEqual(target.innerHTML, `

test/runtime/samples/component-binding-parent-supercedes-child-c/_config.js

@@ -4,7 +4,7 @@ export default {
 		<p>x in parent: yes</p>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, component, target }) {
 		component.a = false;
 
 		assert.htmlEqual(target.innerHTML, `

test/runtime/samples/component-binding-private-state/_config.js

@@ -4,7 +4,7 @@ export default {
 		<p>x in parent: undefined</p>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, component, target }) {
 		component.a = false;
 
 		assert.htmlEqual(target.innerHTML, `

test/runtime/samples/component-binding-reactive-statement/_config.js

@@ -4,7 +4,7 @@ export default {
 		<button>button 0</button>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const event = new window.MouseEvent('click');
 
 		const buttons = target.querySelectorAll('button');

test/runtime/samples/component-event-handler-contenteditable/_config.js

@@ -3,7 +3,7 @@ export default {
 		<div contenteditable=""></div>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const div = target.querySelector('div');
 		const text =  window.document.createTextNode('a');
 		div.insertBefore(text, null);

test/runtime/samples/component-events-console/_config.js

@@ -1,7 +1,7 @@
 export default {
 	html: '<button>click me</button>',
 
-	test({ assert, component, target }) {
+	test({ assert, target }) {
 		const button = target.querySelector('button');
 		const messages = [];
 

test/runtime/samples/component-nested-deep/_config.js

@@ -1,5 +1,5 @@
 export default {
-	test({ assert, component }) {
+	test({ component }) {
 		component.l1.$destroy();
 	}
 };

test/runtime/samples/component-nested-deeper/_config.js

@@ -3,7 +3,7 @@ export default {
 		values: [1, 2, 3, 4]
 	},
 
-	test({ assert, component }) {
+	test({ component }) {
 		component.values = [2, 3];
 	}
 };

test/runtime/samples/component-slot-attribute-order/_config.js

@@ -4,7 +4,7 @@ export default {
 		<button slot="footer">Button</button>
 		<button slot="footer">Button</button>
 	`,
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const [btn, btn1, btn2] = target.querySelectorAll('button');
 
 		await btn.dispatchEvent(new window.MouseEvent('click'));

test/runtime/samples/component-slot-dynamic/_config.js

@@ -3,7 +3,7 @@ export default {
 		<p>override default slot</p>
 	`,
 
-	test({ assert, component }) {
+	test({ component }) {
 		component.nested.foo = 'b';
 	}
 };

test/runtime/samples/component-slot-let-destructured-2/_config.js

@@ -13,7 +13,7 @@ export default {
 			<button>Increment</button>
 		</div>
 	`,
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const [button1, button2, button3] = target.querySelectorAll('button');
 		const event = new window.MouseEvent('click');
 

test/runtime/samples/component-slot-nested-if/_config.js

@@ -2,7 +2,7 @@ export default {
 	html: `
     <input>
 	`,
-	async test({ assert, target, snapshot, component, window }) {
+	async test({ assert, target, window }) {
 		const input = target.querySelector('input');
 
 		input.value = 'a';

test/runtime/samples/component-svelte-slot-let-destructured-2/_config.js

@@ -13,7 +13,7 @@ export default {
 			<button>Increment</button>
 		</div>
 	`,
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const [button1, button2, button3] = target.querySelectorAll('button');
 		const event = new window.MouseEvent('click');
 

test/runtime/samples/component-yield-placement/_config.js

@@ -12,7 +12,7 @@ export default {
 		</div>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const button = target.querySelector('button');
 		const click = new window.MouseEvent('click');
 

test/runtime/samples/css-comments/_config.js

@@ -1,6 +1,6 @@
 // JSDOM makes this test pass when it should fail. weird
 export default {
-	test({ assert, component, target, window }) {
+	test({ assert, target, window }) {
 		const p = target.querySelector( 'p' );
 		assert.equal( window.getComputedStyle( p ).color, 'red' );
 	}

test/runtime/samples/css-false/_config.js

@@ -3,7 +3,7 @@ export default {
 		css: false
 	},
 
-	test({ assert, component, target, window }) {
+	test({ assert, target, window }) {
 		const [ control, test ] = target.querySelectorAll( 'p' );
 
 		assert.equal( window.getComputedStyle( control ).color, '' );

test/runtime/samples/css-space-in-attribute/_config.js

@@ -1,5 +1,5 @@
 export default {
-	test({ assert, component, target, window }) {
+	test({ assert, target, window }) {
 		const [ control, test ] = target.querySelectorAll( 'p' );
 
 		assert.equal( window.getComputedStyle( control ).color, '' );

test/runtime/samples/css/_config.js

@@ -1,5 +1,5 @@
 export default {
-	test({ assert, component, target, window }) {
+	test({ assert, target, window }) {
 		const [control, test] = target.querySelectorAll('p');
 
 		assert.equal(window.getComputedStyle(control).color, '');

test/runtime/samples/destroy-twice/_config.js

@@ -1,5 +1,5 @@
 export default {
-	test({ assert, component }) {
+	test({ component }) {
 		component.$destroy();
 		component.$destroy();
 	}

test/runtime/samples/dynamic-component-destroy-null/_config.js

@@ -3,7 +3,7 @@ export default {
 		x: true
 	},
 
-	test({ assert, component }) {
+	test({ component }) {
 		component.x = false;
 	}
 };

test/runtime/samples/each-block-keyed-component-action/_config.js

@@ -1,5 +1,5 @@
 export default {
-	test({ assert, component, raf }) {
+	test({ assert, component }) {
 		assert.equal(component.count, 0);
 
 		component.arr = ['2'];

test/runtime/samples/each-block-keyed-dynamic-2/_config.js

@@ -5,7 +5,7 @@ export default {
 	<ul></ul>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const button = target.querySelector('button');
 
 		const event = new window.MouseEvent('click');

test/runtime/samples/each-blocks-assignment-2/_config.js

@@ -3,7 +3,7 @@ export default {
 		<span class="content">foo</span>
 		<button>Test</button>
 	`,
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const button = target.querySelector('button');
 
 		const clickEvent = new window.MouseEvent('click');

test/runtime/samples/each-blocks-assignment/_config.js

@@ -8,7 +8,7 @@ export default {
 	<span class="content">3</span>
 	<button>Test</button>
 	`,
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		let [incrementBtn, ...buttons] = target.querySelectorAll('button');
 
 		const clickEvent = new window.MouseEvent('click');

test/runtime/samples/each-blocks-nested-b/_config.js

@@ -29,7 +29,7 @@ export default {
 		]
 	},
 	html: '<p>animals: aardvark</p><p>animals: buffalo</p><p>animals: chinchilla</p><!----><p>countries: albania</p><p>countries: brazil</p><p>countries: china</p><!----><p>people: alice</p><p>people: bob</p><p>people: carol</p><p>people: dave</p><!----><!---->',
-	test({ assert, component, target }) {
+	test() {
 		// TODO
 	}
 };

test/runtime/samples/each-blocks-nested/_config.js

@@ -6,7 +6,6 @@ export default {
 
 	html: '<div>a, 1</div><div>a, 2</div><div>a, 3</div><!----><div>b, 1</div><div>b, 2</div><div>b, 3</div><!----><div>c, 1</div><div>c, 2</div><div>c, 3</div><!----><!---->',
 
-	test({ assert, component, target }) {
+	// TODO
-		// TODO
+	test() {}
-	}
 };

test/runtime/samples/element-source-location/_config.js

@@ -5,7 +5,7 @@ export default {
 		dev: true
 	},
 
-	test({ assert, component, target }) {
+	test({ assert, target }) {
 		const h1 = target.querySelector('h1');
 		const p = target.querySelector('p');
 

test/runtime/samples/event-handler-console-log/_config.js

@@ -7,7 +7,7 @@ export default {
 		<button>click me</button>
 	`,
 
-	test({ assert, component, target, window }) {
+	test({ assert, target, window }) {
 		const button = target.querySelector('button');
 		const event = new window.MouseEvent('click');
 

test/runtime/samples/event-handler-destructured/_config.js

@@ -3,7 +3,7 @@ export default {
 		<button>clicked: false</button>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const button = target.querySelector('button');
 		const event = new window.MouseEvent('click');
 

test/runtime/samples/event-handler-dynamic-bound-var/_config.js

@@ -3,7 +3,7 @@ export default {
 		<button>Click Me</button>
 		Hello World
 	`,
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const button = target.querySelector('button');
 
 		const event = new window.MouseEvent('click');

test/runtime/samples/event-handler-dynamic-expression/_config.js

@@ -1,7 +1,7 @@
 export default {
 	html: '<button>bar</button>',
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const [button] = target.querySelectorAll(
 			'button'
 		);

test/runtime/samples/event-handler-dynamic-hash/_config.js

@@ -8,7 +8,7 @@ export default {
 	<button>click</button>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const [updateButton1, updateButton2, button] = target.querySelectorAll(
 			'button'
 		);

test/runtime/samples/event-handler-dynamic-invalid/_config.js

@@ -3,7 +3,7 @@ export default {
 	<button>null</button>
 	<button>invalid</button>`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const [buttonUndef, buttonNull, buttonInvalid] = target.querySelectorAll(
 			'button'
 		);

test/runtime/samples/event-handler-dynamic/_config.js

@@ -8,7 +8,7 @@ export default {
 	<button>click</button>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const [updateButton1, updateButton2, button] = target.querySelectorAll(
 			'button'
 		);

test/runtime/samples/event-handler-each/_config.js

@@ -15,7 +15,7 @@ export default {
 		<p>selected: foo</p>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const buttons = target.querySelectorAll('button');
 		const event = new window.MouseEvent('click');
 

test/runtime/samples/event-handler-sanitize/_config.js

@@ -3,7 +3,7 @@ export default {
 		<div>toggle</div>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const div = target.querySelector('div');
 		const event = new window.MouseEvent('some-event');
 

test/runtime/samples/event-handler-this-methods/_config.js

@@ -1,5 +1,5 @@
 export default {
-	test({ assert, component, target, window }) {
+	test({ assert, target, window }) {
 		// Click events don't focus elements in JSDOM – obviously they would
 		// in real browsers. More realistically, you'd use this for e.g.
 		// this.select(), but that's harder to test than this.focus()

test/runtime/samples/event-handler/_config.js

@@ -3,7 +3,7 @@ export default {
 		<button>toggle</button>
 	`,
 
-	async test({ assert, component, target, window }) {
+	async test({ assert, target, window }) {
 		const button = target.querySelector('button');
 		const event = new window.MouseEvent('click');