update tests

src/compile/dom/Block.ts

@@ -34,7 +34,6 @@ export default class Block {
 		intro: CodeBuilder;
 		update: CodeBuilder;
 		outro: CodeBuilder;
-		unmount: CodeBuilder;
 		detachRaw: CodeBuilder;
 		destroy: CodeBuilder;
 	};
@@ -73,7 +72,6 @@ export default class Block {
 			intro: new CodeBuilder(),
 			update: new CodeBuilder(),
 			outro: new CodeBuilder(),
-			unmount: new CodeBuilder(),
 			detachRaw: new CodeBuilder(),
 			destroy: new CodeBuilder(),
 		};
@@ -161,7 +159,8 @@ export default class Block {
 			this.builders.mount.addLine(`${this.autofocus}.focus();`);
 		}
 
-		// minor hack – we need to ensure that any {{{triples}}} are detached first
+		// minor hack – we need to ensure that any {@html x} blocks are detached first
+		// (TODO: is this still necessary? or is there a neater approach?)
 		this.builders.destroy.addBlockAtStart(this.builders.detachRaw.toString());
 
 		const properties = new CodeBuilder();

src/compile/nodes/Slot.ts

@@ -55,13 +55,12 @@ export default class Slot extends Element {
 		if (needsAnchorAfter) block.addVariable(anchorAfter);
 
 		let mountBefore = block.builders.mount.toString();
-		let unmountBefore = block.builders.unmount.toString();
+		let destroyBefore = block.builders.destroy.toString();
 
 		block.builders.create.pushCondition(`!${content_name}`);
 		block.builders.hydrate.pushCondition(`!${content_name}`);
 		block.builders.mount.pushCondition(`!${content_name}`);
 		block.builders.update.pushCondition(`!${content_name}`);
-		block.builders.unmount.pushCondition(`!${content_name}`);
 		block.builders.destroy.pushCondition(`!${content_name}`);
 
 		this.children.forEach((child: Node) => {
@@ -72,7 +71,6 @@ export default class Slot extends Element {
 		block.builders.hydrate.popCondition();
 		block.builders.mount.popCondition();
 		block.builders.update.popCondition();
-		block.builders.unmount.popCondition();
 		block.builders.destroy.popCondition();
 
 		const mountLeadin = block.builders.mount.toString() !== mountBefore
@@ -101,30 +99,30 @@ export default class Slot extends Element {
 		// so that it can be reinserted later
 		// TODO so that this can work with public API, component._slotted should
 		// be all fragments, derived from options.slots. Not === options.slots
-		const unmountLeadin = block.builders.unmount.toString() !== unmountBefore
+		const unmountLeadin = block.builders.destroy.toString() !== destroyBefore
 			? `else`
 			: `if (${content_name})`;
 
 		if (anchorBefore === 'null' && anchorAfter === 'null') {
-			block.builders.unmount.addBlock(deindent`
+			block.builders.destroy.addBlock(deindent`
 				${unmountLeadin} {
 					@reinsertChildren(${parentNode}, ${content_name});
 				}
 			`);
 		} else if (anchorBefore === 'null') {
-			block.builders.unmount.addBlock(deindent`
+			block.builders.destroy.addBlock(deindent`
 				${unmountLeadin} {
 					@reinsertBefore(${anchorAfter}, ${content_name});
 				}
 			`);
 		} else if (anchorAfter === 'null') {
-			block.builders.unmount.addBlock(deindent`
+			block.builders.destroy.addBlock(deindent`
 				${unmountLeadin} {
 					@reinsertAfter(${anchorBefore}, ${content_name});
 				}
 			`);
 		} else {
-			block.builders.unmount.addBlock(deindent`
+			block.builders.destroy.addBlock(deindent`
 				${unmountLeadin} {
 					@reinsertBetween(${anchorBefore}, ${anchorAfter}, ${content_name});
 					@detachNode(${anchorBefore});

test/cli/samples/basic/expected/Main.js

@@ -1,4 +1,4 @@
-/* src/Main.html generated by Svelte v2.3.0 */
+/* src/Main.html generated by Svelte v2.4.4 */
 
 function create_main_fragment(component, ctx) {
 	var p;
@@ -15,11 +15,11 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -43,7 +43,6 @@ assign(Main.prototype, {
  	set: set,
  	_set: _set,
  	_mount: _mount,
- 	_unmount: _unmount,
  	_differs: _differs
  });
 
@@ -82,8 +81,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -155,10 +153,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 function _differs(a, b) {
 	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
 }

test/cli/samples/custom-element/expected/Main.js

@@ -1,4 +1,4 @@
-/* src/Main.html generated by Svelte v2.3.0 */
+/* src/Main.html generated by Svelte v2.4.4 */
 
 function create_main_fragment(component, ctx) {
 	var p;
@@ -16,11 +16,11 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -57,16 +57,11 @@ assign(Main.prototype, {
  	set: set,
  	_set: _set,
  	_mount: _mount,
- 	_unmount: _unmount,
  	_differs: _differs
  });
 assign(Main.prototype, {
 	_mount(target, anchor) {
 		target.insertBefore(this, anchor);
-	},
-
-	_unmount() {
-		this.parentNode.removeChild(this);
 	}
 });
 
@@ -107,8 +102,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -180,10 +174,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 function _differs(a, b) {
 	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
 }

test/cli/samples/dev/expected/Main.js

@@ -1,4 +1,4 @@
-/* src/Main.html generated by Svelte v2.3.0 */
+/* src/Main.html generated by Svelte v2.4.4 */
 
 function create_main_fragment(component, ctx) {
 	var p;
@@ -15,11 +15,11 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u: function unmount() {
+		d: function destroy(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -46,7 +46,6 @@ assign(Main.prototype, {
  	set: setDev,
  	_set: _set,
  	_mount: _mount,
- 	_unmount: _unmount,
  	_differs: _differs
  });
 
@@ -158,10 +157,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 function _differs(a, b) {
 	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
 }
@@ -175,8 +170,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }

test/cli/samples/dir-sourcemap/expected/Main.js

@@ -1,4 +1,4 @@
-/* src/Main.html generated by Svelte v2.3.0 */
+/* src/Main.html generated by Svelte v2.4.4 */
 import Widget from './Widget.html';
 
 
@@ -20,12 +20,8 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
-			widget._unmount();
+			widget.destroy(detach);
-		},
-
-		d() {
-			widget.destroy(false);
 		}
 	};
 }
@@ -62,7 +58,6 @@ assign(Main.prototype, {
  	set: set,
  	_set: _set,
  	_mount: _mount,
- 	_unmount: _unmount,
  	_differs: _differs
  });
 
@@ -93,8 +88,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -166,10 +160,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 function _differs(a, b) {
 	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
 }

test/cli/samples/dir-sourcemap/expected/Main.js.map

@@ -1 +1 @@
-{"version":3,"file":"Main.js","sources":["../src/Main.html"],"sourcesContent":["<Widget/>\n\n<script>\n\timport Widget from './Widget.html';\n\n\texport default {\n\t\tcomponents: {\n\t\t\tWidget\n\t\t}\n\t};\n</script>"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"Main.js","sources":["../src/Main.html"],"sourcesContent":["<Widget/>\n\n<script>\n\timport Widget from './Widget.html';\n\n\texport default {\n\t\tcomponents: {\n\t\t\tWidget\n\t\t}\n\t};\n</script>"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

test/cli/samples/dir-sourcemap/expected/Widget.js

@@ -1,4 +1,4 @@
-/* src/Widget.html generated by Svelte v2.3.0 */
+/* src/Widget.html generated by Svelte v2.4.4 */
 
 function create_main_fragment(component, ctx) {
 	var p;
@@ -15,11 +15,11 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -43,7 +43,6 @@ assign(Widget.prototype, {
  	set: set,
  	_set: _set,
  	_mount: _mount,
- 	_unmount: _unmount,
  	_differs: _differs
  });
 
@@ -82,8 +81,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -155,10 +153,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 function _differs(a, b) {
 	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
 }

test/cli/samples/dir-sourcemap/expected/Widget.js.map

@@ -1 +1 @@
-{"version":3,"file":"Widget.js","sources":["../src/Widget.html"],"sourcesContent":["<p>widget</p>"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"Widget.js","sources":["../src/Widget.html"],"sourcesContent":["<p>widget</p>"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

test/cli/samples/dir-subdir/expected/Main.js

@@ -1,4 +1,4 @@
-/* src/Main.html generated by Svelte v2.3.0 */
+/* src/Main.html generated by Svelte v2.4.4 */
 import Widget from './widget/Widget.html';
 
 
@@ -20,12 +20,8 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
-			widget._unmount();
+			widget.destroy(detach);
-		},
-
-		d() {
-			widget.destroy(false);
 		}
 	};
 }
@@ -62,7 +58,6 @@ assign(Main.prototype, {
  	set: set,
  	_set: _set,
  	_mount: _mount,
- 	_unmount: _unmount,
  	_differs: _differs
  });
 
@@ -93,8 +88,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -166,10 +160,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 function _differs(a, b) {
 	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
 }

test/cli/samples/dir-subdir/expected/widget/Widget.js

@@ -1,4 +1,4 @@
-/* src/widget/Widget.html generated by Svelte v2.3.0 */
+/* src/widget/Widget.html generated by Svelte v2.4.4 */
 
 function create_main_fragment(component, ctx) {
 	var p;
@@ -15,11 +15,11 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -43,7 +43,6 @@ assign(Widget.prototype, {
  	set: set,
  	_set: _set,
  	_mount: _mount,
- 	_unmount: _unmount,
  	_differs: _differs
  });
 
@@ -82,8 +81,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -155,10 +153,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 function _differs(a, b) {
 	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
 }

test/cli/samples/dir/expected/Main.js

@@ -1,4 +1,4 @@
-/* src/Main.html generated by Svelte v2.3.0 */
+/* src/Main.html generated by Svelte v2.4.4 */
 import Widget from './Widget.html';
 
 
@@ -20,12 +20,8 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
-			widget._unmount();
+			widget.destroy(detach);
-		},
-
-		d() {
-			widget.destroy(false);
 		}
 	};
 }
@@ -62,7 +58,6 @@ assign(Main.prototype, {
  	set: set,
  	_set: _set,
  	_mount: _mount,
- 	_unmount: _unmount,
  	_differs: _differs
  });
 
@@ -93,8 +88,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -166,10 +160,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 function _differs(a, b) {
 	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
 }

test/cli/samples/dir/expected/Widget.js

@@ -1,4 +1,4 @@
-/* src/Widget.html generated by Svelte v2.3.0 */
+/* src/Widget.html generated by Svelte v2.4.4 */
 
 function create_main_fragment(component, ctx) {
 	var p;
@@ -15,11 +15,11 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -43,7 +43,6 @@ assign(Widget.prototype, {
  	set: set,
  	_set: _set,
  	_mount: _mount,
- 	_unmount: _unmount,
  	_differs: _differs
  });
 
@@ -82,8 +81,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -155,10 +153,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 function _differs(a, b) {
 	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
 }

test/cli/samples/globals/expected/Main.js

@@ -1,4 +1,4 @@
-/* src/Main.html generated by Svelte v2.3.0 */
+/* src/Main.html generated by Svelte v2.4.4 */
 var Main = (function(answer) { "use strict";
 	answer = (answer && answer.__esModule) ? answer["default"] : answer;
 
@@ -30,11 +30,11 @@ var Main = (function(answer) { "use strict";
 				}
 			},
 
-			u() {
+			d(detach) {
+				if (detach) {
 					detachNode(p);
-			},
+				}
-
+			}
-			d: noop
 		};
 	}
 
@@ -58,7 +58,6 @@ var Main = (function(answer) { "use strict";
 	 	set: set,
 	 	_set: _set,
 	 	_mount: _mount,
-	 	_unmount: _unmount,
 	 	_differs: _differs
 	 });
 
@@ -84,8 +83,6 @@ var Main = (function(answer) { "use strict";
 		node.parentNode.removeChild(node);
 	}
 
-	function noop() {}
-
 	function init(component, options) {
 		component._handlers = blankObject();
 		component._bind = options._bind;
@@ -105,8 +102,7 @@ var Main = (function(answer) { "use strict";
 		this.fire('destroy');
 		this.set = noop;
 
-		if (detach !== false) this._fragment.u();
+		this._fragment.d(detach !== false);
-		this._fragment.d();
 		this._fragment = null;
 		this._state = {};
 	}
@@ -178,14 +174,12 @@ var Main = (function(answer) { "use strict";
 		this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 	}
 
-	function _unmount() {
-		if (this._fragment) this._fragment.u();
-	}
-
 	function _differs(a, b) {
 		return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
 	}
 
+	function noop() {}
+
 	function blankObject() {
 		return Object.create(null);
 	}

test/cli/samples/sourcemap-inline/expected/Main.js

@@ -1,4 +1,4 @@
-/* src/Main.html generated by Svelte v2.3.0 */
+/* src/Main.html generated by Svelte v2.4.4 */
 
 function create_main_fragment(component, ctx) {
 	var p;
@@ -15,11 +15,11 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -43,7 +43,6 @@ assign(Main.prototype, {
  	set: set,
  	_set: _set,
  	_mount: _mount,
- 	_unmount: _unmount,
  	_differs: _differs
  });
 
@@ -82,8 +81,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -155,10 +153,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 function _differs(a, b) {
 	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
 }
@@ -171,4 +165,4 @@ function callAll(fns) {
 	while (fns && fns.length) fns.shift()();
 }
 export default Main;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWFpbi5qcyIsInNvdXJjZXMiOlsiLi4vc3JjL01haW4uaHRtbCJdLCJzb3VyY2VzQ29udGVudCI6WyI8cD5IZWxsbyB3b3JsZCE8L3A+XG5cbjxzY3JpcHQ+XG5cdGV4cG9ydCBkZWZhdWx0IHtcblx0XHRvbnJlbmRlciAoKSB7XG5cdFx0XHRjb25zb2xlLmxvZyggJ2hlcmUnICk7XG5cdFx0fVxuXHR9O1xuPC9zY3JpcHQ+Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7In0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWFpbi5qcyIsInNvdXJjZXMiOlsiLi4vc3JjL01haW4uaHRtbCJdLCJzb3VyY2VzQ29udGVudCI6WyI8cD5IZWxsbyB3b3JsZCE8L3A+XG5cbjxzY3JpcHQ+XG5cdGV4cG9ydCBkZWZhdWx0IHtcblx0XHRvbnJlbmRlciAoKSB7XG5cdFx0XHRjb25zb2xlLmxvZyggJ2hlcmUnICk7XG5cdFx0fVxuXHR9O1xuPC9zY3JpcHQ+Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7In0=

test/cli/samples/sourcemap/expected/Main.js

@@ -1,4 +1,4 @@
-/* src/Main.html generated by Svelte v2.3.0 */
+/* src/Main.html generated by Svelte v2.4.4 */
 
 function create_main_fragment(component, ctx) {
 	var p;
@@ -15,11 +15,11 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -43,7 +43,6 @@ assign(Main.prototype, {
  	set: set,
  	_set: _set,
  	_mount: _mount,
- 	_unmount: _unmount,
  	_differs: _differs
  });
 
@@ -82,8 +81,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -155,10 +153,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 function _differs(a, b) {
 	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
 }

test/cli/samples/sourcemap/expected/Main.js.map

@@ -1 +1 @@
-{"version":3,"file":"Main.js","sources":["../src/Main.html"],"sourcesContent":["<p>Hello world!</p>\n\n<script>\n\texport default {\n\t\tonrender () {\n\t\t\tconsole.log( 'here' );\n\t\t}\n\t};\n</script>"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"Main.js","sources":["../src/Main.html"],"sourcesContent":["<p>Hello world!</p>\n\n<script>\n\texport default {\n\t\tonrender () {\n\t\t\tconsole.log( 'here' );\n\t\t}\n\t};\n</script>"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

test/cli/samples/store/expected/Main.js

@@ -1,4 +1,4 @@
-/* src/Main.html generated by Svelte v2.3.0 */
+/* src/Main.html generated by Svelte v2.4.4 */
 
 function create_main_fragment(component, ctx) {
 	var h1, text, text_1;
@@ -22,11 +22,11 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(h1);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -53,7 +53,6 @@ assign(Main.prototype, {
  	set: set,
  	_set: _set,
  	_mount: _mount,
- 	_unmount: _unmount,
  	_differs: _differs
  });
 
@@ -79,8 +78,6 @@ function detachNode(node) {
 	node.parentNode.removeChild(node);
 }
 
-function noop() {}
-
 function init(component, options) {
 	component._handlers = blankObject();
 	component._bind = options._bind;
@@ -104,8 +101,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -177,14 +173,12 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 function _differs(a, b) {
 	return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
 }
 
+function noop() {}
+
 function blankObject() {
 	return Object.create(null);
 }

test/js/samples/action/expected-bundle.js

@@ -26,8 +26,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -116,10 +115,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -129,7 +124,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -167,11 +161,11 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(a);
-		},
+			}
 
-		d() {
 			if (typeof link_action.destroy === 'function') link_action.destroy.call(component);
 		}
 	};

test/js/samples/action/expected.js

@@ -34,11 +34,11 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(a);
-		},
+			}
 
-		d() {
 			if (typeof link_action.destroy === 'function') link_action.destroy.call(component);
 		}
 	};

test/js/samples/bind-width-height/expected-bundle.js

@@ -58,8 +58,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -148,10 +147,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -161,7 +156,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -188,12 +182,13 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
-			div_resize_listener.cancel();
+			}
-		},
 
-		d: noop
+			div_resize_listener.cancel();
+		}
 	};
 }
 

test/js/samples/bind-width-height/expected.js

@@ -22,12 +22,13 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
-			div_resize_listener.cancel();
+			}
-		},
 
-		d: noop
+			div_resize_listener.cancel();
+		}
 	};
 }
 

test/js/samples/collapses-text-around-comments/expected-bundle.js

@@ -34,8 +34,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -124,10 +123,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -137,7 +132,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -174,11 +168,11 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/collapses-text-around-comments/expected.js

@@ -1,5 +1,5 @@
 /* generated by Svelte vX.Y.Z */
-import { appendNode, assign, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
+import { appendNode, assign, createElement, createText, detachNode, init, insertNode, proto } from "svelte/shared.js";
 
 function data() {
 	return { foo: 42 }
@@ -33,11 +33,11 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/component-static-array/expected-bundle.js

@@ -14,8 +14,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -104,10 +103,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -117,7 +112,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -144,12 +138,8 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
-			nested._unmount();
+			nested.destroy(detach);
-		},
-
-		d() {
-			nested.destroy(false);
 		}
 	};
 }

test/js/samples/component-static-array/expected.js

@@ -22,12 +22,8 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
-			nested._unmount();
+			nested.destroy(detach);
-		},
-
-		d() {
-			nested.destroy(false);
 		}
 	};
 }

test/js/samples/component-static-immutable/expected-bundle.js

@@ -14,8 +14,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -108,10 +107,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -121,7 +116,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -148,12 +142,8 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
-			nested._unmount();
+			nested.destroy(detach);
-		},
-
-		d() {
-			nested.destroy(false);
 		}
 	};
 }

test/js/samples/component-static-immutable/expected.js

@@ -22,12 +22,8 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
-			nested._unmount();
+			nested.destroy(detach);
-		},
-
-		d() {
-			nested.destroy(false);
 		}
 	};
 }

test/js/samples/component-static-immutable2/expected-bundle.js

@@ -14,8 +14,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -108,10 +107,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -121,7 +116,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -148,12 +142,8 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
-			nested._unmount();
+			nested.destroy(detach);
-		},
-
-		d() {
-			nested.destroy(false);
 		}
 	};
 }

test/js/samples/component-static-immutable2/expected.js

@@ -22,12 +22,8 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
-			nested._unmount();
+			nested.destroy(detach);
-		},
-
-		d() {
-			nested.destroy(false);
 		}
 	};
 }

test/js/samples/component-static/expected-bundle.js

@@ -14,8 +14,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -104,10 +103,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -117,7 +112,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -144,12 +138,8 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
-			nested._unmount();
+			nested.destroy(detach);
-		},
-
-		d() {
-			nested.destroy(false);
 		}
 	};
 }

test/js/samples/component-static/expected.js

@@ -22,12 +22,8 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
-			nested._unmount();
+			nested.destroy(detach);
-		},
-
-		d() {
-			nested.destroy(false);
 		}
 	};
 }

test/js/samples/computed-collapsed-if/expected-bundle.js

@@ -14,8 +14,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -104,10 +103,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -117,7 +112,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -140,8 +134,6 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u: noop,
-
 		d: noop
 	};
 }

test/js/samples/computed-collapsed-if/expected.js

@@ -18,8 +18,6 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u: noop,
-
 		d: noop
 	};
 }

test/js/samples/css-media-query/expected-bundle.js

@@ -30,8 +30,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -120,10 +119,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -133,7 +128,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -161,11 +155,11 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/css-media-query/expected.js

@@ -23,11 +23,11 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/css-shadow-dom-keyframes/expected-bundle.js

@@ -26,8 +26,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -116,10 +115,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -129,7 +124,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -151,11 +145,11 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -189,10 +183,6 @@ assign(SvelteComponent.prototype, proto);
 assign(SvelteComponent.prototype, {
 	_mount(target, anchor) {
 		target.insertBefore(this, anchor);
-	},
-
-	_unmount() {
-		this.parentNode.removeChild(this);
 	}
 });
 

test/js/samples/css-shadow-dom-keyframes/expected.js

@@ -17,11 +17,11 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -55,10 +55,6 @@ assign(SvelteComponent.prototype, proto);
 assign(SvelteComponent.prototype, {
 	_mount(target, anchor) {
 		target.insertBefore(this, anchor);
-	},
-
-	_unmount() {
-		this.parentNode.removeChild(this);
 	}
 });
 

test/js/samples/deconflict-builtins/expected-bundle.js

@@ -17,9 +17,9 @@ function detachNode(node) {
 	node.parentNode.removeChild(node);
 }
 
-function destroyEach(iterations) {
+function destroyEach(iterations, detach) {
 	for (var i = 0; i < iterations.length; i += 1) {
-		if (iterations[i]) iterations[i].d();
+		if (iterations[i]) iterations[i].d(detach);
 	}
 }
 
@@ -44,8 +44,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -134,10 +133,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -147,7 +142,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -198,23 +192,18 @@ function create_main_fragment(component, ctx) {
 				}
 
 				for (; i < each_blocks.length; i += 1) {
-					each_blocks[i].u();
+					each_blocks[i].d(1);
-					each_blocks[i].d();
 				}
 				each_blocks.length = each_value.length;
 			}
 		},
 
-		u() {
+		d(detach) {
-			for (var i = 0; i < each_blocks.length; i += 1) {
+			destroyEach(each_blocks, detach);
-				each_blocks[i].u();
-			}
 
+			if (detach) {
 				detachNode(each_anchor);
-		},
+			}
-
-		d() {
-			destroyEach(each_blocks);
 		}
 	};
 }
@@ -240,11 +229,11 @@ function create_each_block(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(span);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/deconflict-builtins/expected.js

@@ -1,5 +1,5 @@
 /* generated by Svelte vX.Y.Z */
-import { appendNode, assign, createComment, createElement, createText, destroyEach, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
+import { appendNode, assign, createComment, createElement, createText, destroyEach, detachNode, init, insertNode, proto } from "svelte/shared.js";
 
 function create_main_fragment(component, ctx) {
 	var each_anchor;
@@ -46,23 +46,18 @@ function create_main_fragment(component, ctx) {
 				}
 
 				for (; i < each_blocks.length; i += 1) {
-					each_blocks[i].u();
+					each_blocks[i].d(1);
-					each_blocks[i].d();
 				}
 				each_blocks.length = each_value.length;
 			}
 		},
 
-		u() {
+		d(detach) {
-			for (var i = 0; i < each_blocks.length; i += 1) {
+			destroyEach(each_blocks, detach);
-				each_blocks[i].u();
-			}
 
+			if (detach) {
 				detachNode(each_anchor);
-		},
+			}
-
-		d() {
-			destroyEach(each_blocks);
 		}
 	};
 }
@@ -88,11 +83,11 @@ function create_each_block(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(span);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/deconflict-globals/expected-bundle.js

@@ -19,8 +19,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -109,10 +108,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -122,7 +117,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -146,8 +140,6 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u: noop,
-
 		d: noop
 	};
 }

test/js/samples/deconflict-globals/expected.js

@@ -20,8 +20,6 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u: noop,
-
 		d: noop
 	};
 }

test/js/samples/dev-warning-missing-data-computed/expected-bundle.js

@@ -34,8 +34,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -142,10 +141,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var protoDev = {
 	destroy: destroyDev,
 	get,
@@ -155,7 +150,6 @@ var protoDev = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -193,11 +187,11 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u: function unmount() {
+		d: function destroy$$1(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/dev-warning-missing-data-computed/expected.js

@@ -1,5 +1,5 @@
 /* generated by Svelte vX.Y.Z */
-import { appendNode, assign, createElement, createText, detachNode, init, insertNode, noop, protoDev } from "svelte/shared.js";
+import { appendNode, assign, createElement, createText, detachNode, init, insertNode, protoDev } from "svelte/shared.js";
 
 function bar({ foo }) {
 	return foo * 2;
@@ -33,11 +33,11 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u: function unmount() {
+		d: function destroy(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/do-use-dataset/expected-bundle.js

@@ -30,8 +30,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -120,10 +119,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -133,7 +128,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -163,13 +157,13 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
 				detachNode(text);
 				detachNode(div_1);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/do-use-dataset/expected.js

@@ -1,5 +1,5 @@
 /* generated by Svelte vX.Y.Z */
-import { assign, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
+import { assign, createElement, createText, detachNode, init, insertNode, proto } from "svelte/shared.js";
 
 function create_main_fragment(component, ctx) {
 	var div, text, div_1;
@@ -25,13 +25,13 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
 				detachNode(text);
 				detachNode(div_1);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js

@@ -34,8 +34,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -124,10 +123,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -137,7 +132,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -167,13 +161,13 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
 				detachNode(text);
 				detachNode(div_1);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/dont-use-dataset-in-legacy/expected.js

@@ -1,5 +1,5 @@
 /* generated by Svelte vX.Y.Z */
-import { assign, createElement, createText, detachNode, init, insertNode, noop, proto, setAttribute } from "svelte/shared.js";
+import { assign, createElement, createText, detachNode, init, insertNode, proto, setAttribute } from "svelte/shared.js";
 
 function create_main_fragment(component, ctx) {
 	var div, text, div_1;
@@ -25,13 +25,13 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
 				detachNode(text);
 				detachNode(div_1);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/dont-use-dataset-in-svg/expected-bundle.js

@@ -34,8 +34,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -124,10 +123,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -137,7 +132,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -167,11 +161,11 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(svg);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/dont-use-dataset-in-svg/expected.js

@@ -1,5 +1,5 @@
 /* generated by Svelte vX.Y.Z */
-import { appendNode, assign, createSvgElement, detachNode, init, insertNode, noop, proto, setAttribute } from "svelte/shared.js";
+import { appendNode, assign, createSvgElement, detachNode, init, insertNode, proto, setAttribute } from "svelte/shared.js";
 
 function create_main_fragment(component, ctx) {
 	var svg, g, g_1;
@@ -25,11 +25,11 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(svg);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/each-block-changed-check/expected-bundle.js

@@ -23,9 +23,9 @@ function detachAfter(before) {
 	}
 }
 
-function destroyEach(iterations) {
+function destroyEach(iterations, detach) {
 	for (var i = 0; i < iterations.length; i += 1) {
-		if (iterations[i]) iterations[i].d();
+		if (iterations[i]) iterations[i].d(detach);
 	}
 }
 
@@ -46,8 +46,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -136,10 +135,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -149,7 +144,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -204,8 +198,7 @@ function create_main_fragment(component, ctx) {
 				}
 
 				for (; i < each_blocks.length; i += 1) {
-					each_blocks[i].u();
+					each_blocks[i].d(1);
-					each_blocks[i].d();
 				}
 				each_blocks.length = each_value.length;
 			}
@@ -215,17 +208,13 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
-			for (var i = 0; i < each_blocks.length; i += 1) {
+			destroyEach(each_blocks, detach);
-				each_blocks[i].u();
-			}
 
+			if (detach) {
 				detachNode(text);
 				detachNode(p);
-		},
+			}
-
-		d() {
-			destroyEach(each_blocks);
 		}
 	};
 }
@@ -281,13 +270,16 @@ function create_each_block(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachAfter(raw_before);
+			}
 
-			detachNode(div);
-		},
 
-		d: noop
+			if (detach) {
+				detachNode(div);
+			}
+		}
 	};
 }
 

test/js/samples/each-block-changed-check/expected.js

@@ -1,5 +1,5 @@
 /* generated by Svelte vX.Y.Z */
-import { appendNode, assign, createElement, createText, destroyEach, detachAfter, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
+import { appendNode, assign, createElement, createText, destroyEach, detachAfter, detachNode, init, insertNode, proto } from "svelte/shared.js";
 
 function create_main_fragment(component, ctx) {
 	var text, p, text_1;
@@ -50,8 +50,7 @@ function create_main_fragment(component, ctx) {
 				}
 
 				for (; i < each_blocks.length; i += 1) {
-					each_blocks[i].u();
+					each_blocks[i].d(1);
-					each_blocks[i].d();
 				}
 				each_blocks.length = each_value.length;
 			}
@@ -61,17 +60,13 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
-			for (var i = 0; i < each_blocks.length; i += 1) {
+			destroyEach(each_blocks, detach);
-				each_blocks[i].u();
-			}
 
+			if (detach) {
 				detachNode(text);
 				detachNode(p);
-		},
+			}
-
-		d() {
-			destroyEach(each_blocks);
 		}
 	};
 }
@@ -127,13 +122,16 @@ function create_each_block(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachAfter(raw_before);
+			}
 
-			detachNode(div);
-		},
 
-		d: noop
+			if (detach) {
+				detachNode(div);
+			}
+		}
 	};
 }
 

test/js/samples/event-handlers-custom/expected-bundle.js

@@ -26,8 +26,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -116,10 +115,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -129,7 +124,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -165,11 +159,11 @@ function create_main_fragment(component, ctx) {
 
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(button);
-		},
+			}
 
-		d() {
 			foo_handler.destroy();
 		}
 	};

test/js/samples/event-handlers-custom/expected.js

@@ -32,11 +32,11 @@ function create_main_fragment(component, ctx) {
 
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(button);
-		},
+			}
 
-		d() {
 			foo_handler.destroy();
 		}
 	};

test/js/samples/head-no-whitespace/expected-bundle.js

@@ -26,8 +26,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -116,10 +115,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -129,7 +124,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -155,12 +149,10 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
 			detachNode(meta);
 			detachNode(meta_1);
-		},
+		}
-
-		d: noop
 	};
 }
 

test/js/samples/head-no-whitespace/expected.js

@@ -21,12 +21,10 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
 			detachNode(meta);
 			detachNode(meta_1);
-		},
+		}
-
-		d: noop
 	};
 }
 

test/js/samples/if-block-no-update/expected-bundle.js

@@ -30,8 +30,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -120,10 +119,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -133,7 +128,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -163,21 +157,18 @@ function create_main_fragment(component, ctx) {
 
 		p(changed, ctx) {
 			if (current_block_type !== (current_block_type = select_block_type(ctx))) {
-				if_block.u();
+				if_block.d(1);
-				if_block.d();
 				if_block = current_block_type(component, ctx);
 				if_block.c();
 				if_block.m(if_block_anchor.parentNode, if_block_anchor);
 			}
 		},
 
-		u() {
+		d(detach) {
-			if_block.u();
+			if_block.d(detach);
+			if (detach) {
 				detachNode(if_block_anchor);
-		},
+			}
-
-		d() {
-			if_block.d();
 		}
 	};
 }
@@ -196,11 +187,11 @@ function create_if_block(component, ctx) {
 			insertNode(p, target, anchor);
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -218,11 +209,11 @@ function create_if_block_1(component, ctx) {
 			insertNode(p, target, anchor);
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/if-block-no-update/expected.js

@@ -1,5 +1,5 @@
 /* generated by Svelte vX.Y.Z */
-import { assign, createComment, createElement, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
+import { assign, createComment, createElement, detachNode, init, insertNode, proto } from "svelte/shared.js";
 
 function create_main_fragment(component, ctx) {
 	var if_block_anchor;
@@ -25,21 +25,18 @@ function create_main_fragment(component, ctx) {
 
 		p(changed, ctx) {
 			if (current_block_type !== (current_block_type = select_block_type(ctx))) {
-				if_block.u();
+				if_block.d(1);
-				if_block.d();
 				if_block = current_block_type(component, ctx);
 				if_block.c();
 				if_block.m(if_block_anchor.parentNode, if_block_anchor);
 			}
 		},
 
-		u() {
+		d(detach) {
-			if_block.u();
+			if_block.d(detach);
+			if (detach) {
 				detachNode(if_block_anchor);
-		},
+			}
-
-		d() {
-			if_block.d();
 		}
 	};
 }
@@ -58,11 +55,11 @@ function create_if_block(component, ctx) {
 			insertNode(p, target, anchor);
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -80,11 +77,11 @@ function create_if_block_1(component, ctx) {
 			insertNode(p, target, anchor);
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/if-block-simple/expected-bundle.js

@@ -30,8 +30,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -120,10 +119,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -133,7 +128,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -163,19 +157,16 @@ function create_main_fragment(component, ctx) {
 					if_block.m(if_block_anchor.parentNode, if_block_anchor);
 				}
 			} else if (if_block) {
-				if_block.u();
+				if_block.d(1);
-				if_block.d();
 				if_block = null;
 			}
 		},
 
-		u() {
+		d(detach) {
-			if (if_block) if_block.u();
+			if (if_block) if_block.d(detach);
+			if (detach) {
 				detachNode(if_block_anchor);
-		},
+			}
-
-		d() {
-			if (if_block) if_block.d();
 		}
 	};
 }
@@ -194,11 +185,11 @@ function create_if_block(component, ctx) {
 			insertNode(p, target, anchor);
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/if-block-simple/expected.js

@@ -1,5 +1,5 @@
 /* generated by Svelte vX.Y.Z */
-import { assign, createComment, createElement, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
+import { assign, createComment, createElement, detachNode, init, insertNode, proto } from "svelte/shared.js";
 
 function create_main_fragment(component, ctx) {
 	var if_block_anchor;
@@ -25,19 +25,16 @@ function create_main_fragment(component, ctx) {
 					if_block.m(if_block_anchor.parentNode, if_block_anchor);
 				}
 			} else if (if_block) {
-				if_block.u();
+				if_block.d(1);
-				if_block.d();
 				if_block = null;
 			}
 		},
 
-		u() {
+		d(detach) {
-			if (if_block) if_block.u();
+			if (if_block) if_block.d(detach);
+			if (detach) {
 				detachNode(if_block_anchor);
-		},
+			}
-
-		d() {
-			if (if_block) if_block.d();
 		}
 	};
 }
@@ -56,11 +53,11 @@ function create_if_block(component, ctx) {
 			insertNode(p, target, anchor);
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/inline-style-optimized-multiple/expected-bundle.js

@@ -30,8 +30,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -120,10 +119,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -133,7 +128,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -163,11 +157,11 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/inline-style-optimized-multiple/expected.js

@@ -1,5 +1,5 @@
 /* generated by Svelte vX.Y.Z */
-import { assign, createElement, detachNode, init, insertNode, noop, proto, setStyle } from "svelte/shared.js";
+import { assign, createElement, detachNode, init, insertNode, proto, setStyle } from "svelte/shared.js";
 
 function create_main_fragment(component, ctx) {
 	var div;
@@ -25,11 +25,11 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/inline-style-optimized-url/expected-bundle.js

@@ -30,8 +30,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -120,10 +119,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -133,7 +128,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -158,11 +152,11 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/inline-style-optimized-url/expected.js

@@ -1,5 +1,5 @@
 /* generated by Svelte vX.Y.Z */
-import { assign, createElement, detachNode, init, insertNode, noop, proto, setStyle } from "svelte/shared.js";
+import { assign, createElement, detachNode, init, insertNode, proto, setStyle } from "svelte/shared.js";
 
 function create_main_fragment(component, ctx) {
 	var div;
@@ -20,11 +20,11 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/inline-style-optimized/expected-bundle.js

@@ -30,8 +30,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -120,10 +119,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -133,7 +128,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -158,11 +152,11 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/inline-style-optimized/expected.js

@@ -1,5 +1,5 @@
 /* generated by Svelte vX.Y.Z */
-import { assign, createElement, detachNode, init, insertNode, noop, proto, setStyle } from "svelte/shared.js";
+import { assign, createElement, detachNode, init, insertNode, proto, setStyle } from "svelte/shared.js";
 
 function create_main_fragment(component, ctx) {
 	var div;
@@ -20,11 +20,11 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/inline-style-unoptimized/expected-bundle.js

@@ -30,8 +30,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -120,10 +119,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -133,7 +128,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -167,13 +161,13 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
 				detachNode(text);
 				detachNode(div_1);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/inline-style-unoptimized/expected.js

@@ -1,5 +1,5 @@
 /* generated by Svelte vX.Y.Z */
-import { assign, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
+import { assign, createElement, createText, detachNode, init, insertNode, proto } from "svelte/shared.js";
 
 function create_main_fragment(component, ctx) {
 	var div, text, div_1, div_1_style_value;
@@ -29,13 +29,13 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
 				detachNode(text);
 				detachNode(div_1);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/input-without-blowback-guard/expected-bundle.js

@@ -38,8 +38,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -128,10 +127,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -141,7 +136,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -171,11 +165,11 @@ function create_main_fragment(component, ctx) {
 			input.checked = ctx.foo;
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(input);
-		},
+			}
 
-		d() {
 			removeListener(input, "change", input_change_handler);
 		}
 	};

test/js/samples/input-without-blowback-guard/expected.js

@@ -25,11 +25,11 @@ function create_main_fragment(component, ctx) {
 			input.checked = ctx.foo;
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(input);
-		},
+			}
 
-		d() {
 			removeListener(input, "change", input_change_handler);
 		}
 	};

test/js/samples/legacy-input-type/expected-bundle.js

@@ -32,8 +32,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -122,10 +121,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -135,7 +130,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -156,11 +150,11 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(input);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/legacy-input-type/expected.js

@@ -16,11 +16,11 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(input);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/media-bindings/expected-bundle.js

@@ -42,8 +42,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -132,10 +131,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -145,7 +140,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -214,11 +208,11 @@ function create_main_fragment(component, ctx) {
 			if (!audio_updating && !isNaN(ctx.volume)) audio.volume = ctx.volume;
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(audio);
-		},
+			}
 
-		d() {
 			removeListener(audio, "timeupdate", audio_timeupdate_handler);
 			removeListener(audio, "durationchange", audio_durationchange_handler);
 			removeListener(audio, "play", audio_play_pause_handler);

test/js/samples/media-bindings/expected.js

@@ -64,11 +64,11 @@ function create_main_fragment(component, ctx) {
 			if (!audio_updating && !isNaN(ctx.volume)) audio.volume = ctx.volume;
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(audio);
-		},
+			}
 
-		d() {
 			removeListener(audio, "timeupdate", audio_timeupdate_handler);
 			removeListener(audio, "durationchange", audio_durationchange_handler);
 			removeListener(audio, "play", audio_play_pause_handler);

test/js/samples/non-imported-component/expected-bundle.js

@@ -28,8 +28,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -118,10 +117,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -131,7 +126,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -165,15 +159,13 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
-			imported._unmount();
+			imported.destroy(detach);
+			if (detach) {
 				detachNode(text);
-			nonimported._unmount();
+			}
-		},
 
-		d() {
+			nonimported.destroy(detach);
-			imported.destroy(false);
-			nonimported.destroy(false);
 		}
 	};
 }

test/js/samples/non-imported-component/expected.js

@@ -30,15 +30,13 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
-			imported._unmount();
+			imported.destroy(detach);
+			if (detach) {
 				detachNode(text);
-			nonimported._unmount();
+			}
-		},
 
-		d() {
+			nonimported.destroy(detach);
-			imported.destroy(false);
-			nonimported.destroy(false);
 		}
 	};
 }

test/js/samples/setup-method/expected-bundle.js

@@ -14,8 +14,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -104,10 +103,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -117,7 +112,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -148,8 +142,6 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u: noop,
-
 		d: noop
 	};
 }

test/js/samples/setup-method/expected.js

@@ -26,8 +26,6 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u: noop,
-
 		d: noop
 	};
 }

test/js/samples/svg-title/expected-bundle.js

@@ -34,8 +34,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -124,10 +123,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -137,7 +132,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -161,11 +155,11 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(svg);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/svg-title/expected.js

@@ -19,11 +19,11 @@ function create_main_fragment(component, ctx) {
 
 		p: noop,
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(svg);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/title/expected-bundle.js

@@ -14,8 +14,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -104,10 +103,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -117,7 +112,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -139,8 +133,6 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u: noop,
-
 		d: noop
 	};
 }

test/js/samples/title/expected.js

@@ -17,8 +17,6 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u: noop,
-
 		d: noop
 	};
 }

test/js/samples/use-elements-as-anchors/expected-bundle.js

@@ -38,8 +38,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -128,10 +127,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -141,7 +136,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -207,8 +201,7 @@ function create_main_fragment(component, ctx) {
 					if_block.m(div, text);
 				}
 			} else if (if_block) {
-				if_block.u();
+				if_block.d(1);
-				if_block.d();
 				if_block = null;
 			}
 
@@ -219,8 +212,7 @@ function create_main_fragment(component, ctx) {
 					if_block_1.m(div, text_3);
 				}
 			} else if (if_block_1) {
-				if_block_1.u();
+				if_block_1.d(1);
-				if_block_1.d();
 				if_block_1 = null;
 			}
 
@@ -231,8 +223,7 @@ function create_main_fragment(component, ctx) {
 					if_block_2.m(div, text_4);
 				}
 			} else if (if_block_2) {
-				if_block_2.u();
+				if_block_2.d(1);
-				if_block_2.d();
 				if_block_2 = null;
 			}
 
@@ -243,8 +234,7 @@ function create_main_fragment(component, ctx) {
 					if_block_3.m(div, null);
 				}
 			} else if (if_block_3) {
-				if_block_3.u();
+				if_block_3.d(1);
-				if_block_3.d();
 				if_block_3 = null;
 			}
 
@@ -255,29 +245,28 @@ function create_main_fragment(component, ctx) {
 					if_block_4.m(if_block_4_anchor.parentNode, if_block_4_anchor);
 				}
 			} else if (if_block_4) {
-				if_block_4.u();
+				if_block_4.d(1);
-				if_block_4.d();
 				if_block_4 = null;
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
-			if (if_block) if_block.u();
+			}
-			if (if_block_1) if_block_1.u();
-			if (if_block_2) if_block_2.u();
-			if (if_block_3) if_block_3.u();
-			detachNode(text_8);
-			if (if_block_4) if_block_4.u();
-			detachNode(if_block_4_anchor);
-		},
 
-		d() {
 			if (if_block) if_block.d();
 			if (if_block_1) if_block_1.d();
 			if (if_block_2) if_block_2.d();
 			if (if_block_3) if_block_3.d();
-			if (if_block_4) if_block_4.d();
+			if (detach) {
+				detachNode(text_8);
+			}
+
+			if (if_block_4) if_block_4.d(detach);
+			if (detach) {
+				detachNode(if_block_4_anchor);
+			}
 		}
 	};
 }
@@ -296,11 +285,11 @@ function create_if_block(component, ctx) {
 			insertNode(p, target, anchor);
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -318,11 +307,11 @@ function create_if_block_1(component, ctx) {
 			insertNode(p, target, anchor);
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -340,11 +329,11 @@ function create_if_block_2(component, ctx) {
 			insertNode(p, target, anchor);
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -362,11 +351,11 @@ function create_if_block_3(component, ctx) {
 			insertNode(p, target, anchor);
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -384,11 +373,11 @@ function create_if_block_4(component, ctx) {
 			insertNode(p, target, anchor);
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/use-elements-as-anchors/expected.js

@@ -1,5 +1,5 @@
 /* generated by Svelte vX.Y.Z */
-import { appendNode, assign, createComment, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
+import { appendNode, assign, createComment, createElement, createText, detachNode, init, insertNode, proto } from "svelte/shared.js";
 
 function create_main_fragment(component, ctx) {
 	var div, text, p, text_2, text_3, text_4, p_1, text_6, text_8, if_block_4_anchor;
@@ -61,8 +61,7 @@ function create_main_fragment(component, ctx) {
 					if_block.m(div, text);
 				}
 			} else if (if_block) {
-				if_block.u();
+				if_block.d(1);
-				if_block.d();
 				if_block = null;
 			}
 
@@ -73,8 +72,7 @@ function create_main_fragment(component, ctx) {
 					if_block_1.m(div, text_3);
 				}
 			} else if (if_block_1) {
-				if_block_1.u();
+				if_block_1.d(1);
-				if_block_1.d();
 				if_block_1 = null;
 			}
 
@@ -85,8 +83,7 @@ function create_main_fragment(component, ctx) {
 					if_block_2.m(div, text_4);
 				}
 			} else if (if_block_2) {
-				if_block_2.u();
+				if_block_2.d(1);
-				if_block_2.d();
 				if_block_2 = null;
 			}
 
@@ -97,8 +94,7 @@ function create_main_fragment(component, ctx) {
 					if_block_3.m(div, null);
 				}
 			} else if (if_block_3) {
-				if_block_3.u();
+				if_block_3.d(1);
-				if_block_3.d();
 				if_block_3 = null;
 			}
 
@@ -109,29 +105,28 @@ function create_main_fragment(component, ctx) {
 					if_block_4.m(if_block_4_anchor.parentNode, if_block_4_anchor);
 				}
 			} else if (if_block_4) {
-				if_block_4.u();
+				if_block_4.d(1);
-				if_block_4.d();
 				if_block_4 = null;
 			}
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(div);
-			if (if_block) if_block.u();
+			}
-			if (if_block_1) if_block_1.u();
-			if (if_block_2) if_block_2.u();
-			if (if_block_3) if_block_3.u();
-			detachNode(text_8);
-			if (if_block_4) if_block_4.u();
-			detachNode(if_block_4_anchor);
-		},
 
-		d() {
 			if (if_block) if_block.d();
 			if (if_block_1) if_block_1.d();
 			if (if_block_2) if_block_2.d();
 			if (if_block_3) if_block_3.d();
-			if (if_block_4) if_block_4.d();
+			if (detach) {
+				detachNode(text_8);
+			}
+
+			if (if_block_4) if_block_4.d(detach);
+			if (detach) {
+				detachNode(if_block_4_anchor);
+			}
 		}
 	};
 }
@@ -150,11 +145,11 @@ function create_if_block(component, ctx) {
 			insertNode(p, target, anchor);
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -172,11 +167,11 @@ function create_if_block_1(component, ctx) {
 			insertNode(p, target, anchor);
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -194,11 +189,11 @@ function create_if_block_2(component, ctx) {
 			insertNode(p, target, anchor);
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -216,11 +211,11 @@ function create_if_block_3(component, ctx) {
 			insertNode(p, target, anchor);
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 
@@ -238,11 +233,11 @@ function create_if_block_4(component, ctx) {
 			insertNode(p, target, anchor);
 		},
 
-		u() {
+		d(detach) {
+			if (detach) {
 				detachNode(p);
-		},
+			}
-
+		}
-		d: noop
 	};
 }
 

test/js/samples/window-binding-scroll/expected-bundle.js

@@ -34,8 +34,7 @@ function destroy(detach) {
 	this.fire('destroy');
 	this.set = noop;
 
-	if (detach !== false) this._fragment.u();
+	this._fragment.d(detach !== false);
-	this._fragment.d();
 	this._fragment = null;
 	this._state = {};
 }
@@ -124,10 +123,6 @@ function _mount(target, anchor) {
 	this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
 }
 
-function _unmount() {
-	if (this._fragment) this._fragment.u();
-}
-
 var proto = {
 	destroy,
 	get,
@@ -137,7 +132,6 @@ var proto = {
 	_recompute: noop,
 	_set,
 	_mount,
-	_unmount,
 	_differs
 };
 
@@ -185,12 +179,12 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
-			detachNode(p);
-		},
-
-		d() {
 			window.removeEventListener("scroll", onwindowscroll);
+
+			if (detach) {
+				detachNode(p);
+			}
 		}
 	};
 }

test/js/samples/window-binding-scroll/expected.js

@@ -43,12 +43,12 @@ function create_main_fragment(component, ctx) {
 			}
 		},
 
-		u() {
+		d(detach) {
-			detachNode(p);
-		},
-
-		d() {
 			window.removeEventListener("scroll", onwindowscroll);
+
+			if (detach) {
+				detachNode(p);
+			}
 		}
 	};
 }