Merge pull request #807 from sveltejs/gh-788

don't noop set/get until after component is destroyed

src/shared/index.js

@@ -5,8 +5,9 @@ export * from './transitions.js';
 export * from './utils.js';
 
 export function destroy(detach) {
-	this.destroy = this.set = this.get = noop;
+	this.destroy = noop;
 	this.fire('destroy');
+	this.set = this.get = noop;
 
 	if (detach !== false) this._fragment.unmount();
 	this._fragment.destroy();

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

@@ -38,8 +38,9 @@ function setAttribute(node, attribute, value) {
 }
 
 function destroy(detach) {
-	this.destroy = this.set = this.get = noop;
+	this.destroy = noop;
 	this.fire('destroy');
+	this.set = this.get = noop;
 
 	if (detach !== false) this._fragment.unmount();
 	this._fragment.destroy();

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

@@ -14,8 +14,9 @@ function assign(target) {
 }
 
 function destroy(detach) {
-	this.destroy = this.set = this.get = noop;
+	this.destroy = noop;
 	this.fire('destroy');
+	this.set = this.get = noop;
 
 	if (detach !== false) this._fragment.unmount();
 	this._fragment.destroy();

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

@@ -34,8 +34,9 @@ function setAttribute(node, attribute, value) {
 }
 
 function destroy(detach) {
-	this.destroy = this.set = this.get = noop;
+	this.destroy = noop;
 	this.fire('destroy');
+	this.set = this.get = noop;
 
 	if (detach !== false) this._fragment.unmount();
 	this._fragment.destroy();

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

@@ -47,8 +47,9 @@ function createText(data) {
 }
 
 function destroy(detach) {
-	this.destroy = this.set = this.get = noop;
+	this.destroy = noop;
 	this.fire('destroy');
+	this.set = this.get = noop;
 
 	if (detach !== false) this._fragment.unmount();
 	this._fragment.destroy();

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

@@ -34,8 +34,9 @@ function createText(data) {
 }
 
 function destroy(detach) {
-	this.destroy = this.set = this.get = noop;
+	this.destroy = noop;
 	this.fire('destroy');
+	this.set = this.get = noop;
 
 	if (detach !== false) this._fragment.unmount();
 	this._fragment.destroy();

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

@@ -38,8 +38,9 @@ function createComment() {
 }
 
 function destroy(detach) {
-	this.destroy = this.set = this.get = noop;
+	this.destroy = noop;
 	this.fire('destroy');
+	this.set = this.get = noop;
 
 	if (detach !== false) this._fragment.unmount();
 	this._fragment.destroy();

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

@@ -38,8 +38,9 @@ function createComment() {
 }
 
 function destroy(detach) {
-	this.destroy = this.set = this.get = noop;
+	this.destroy = noop;
 	this.fire('destroy');
+	this.set = this.get = noop;
 
 	if (detach !== false) this._fragment.unmount();
 	this._fragment.destroy();

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

@@ -32,8 +32,9 @@ function setInputType(input, type) {
 }
 
 function destroy(detach) {
-	this.destroy = this.set = this.get = noop;
+	this.destroy = noop;
 	this.fire('destroy');
+	this.set = this.get = noop;
 
 	if (detach !== false) this._fragment.unmount();
 	this._fragment.destroy();

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

@@ -28,8 +28,9 @@ function createText(data) {
 }
 
 function destroy(detach) {
-	this.destroy = this.set = this.get = noop;
+	this.destroy = noop;
 	this.fire('destroy');
+	this.set = this.get = noop;
 
 	if (detach !== false) this._fragment.unmount();
 	this._fragment.destroy();

test/js/samples/onrender-onteardown-rewritten/expected-bundle.js

@@ -14,8 +14,9 @@ function assign(target) {
 }
 
 function destroy(detach) {
-	this.destroy = this.set = this.get = noop;
+	this.destroy = noop;
 	this.fire('destroy');
+	this.set = this.get = noop;
 
 	if (detach !== false) this._fragment.unmount();
 	this._fragment.destroy();

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

@@ -14,8 +14,9 @@ function assign(target) {
 }
 
 function destroy(detach) {
-	this.destroy = this.set = this.get = noop;
+	this.destroy = noop;
 	this.fire('destroy');
+	this.set = this.get = noop;
 
 	if (detach !== false) this._fragment.unmount();
 	this._fragment.destroy();

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

@@ -38,8 +38,9 @@ function createComment() {
 }
 
 function destroy(detach) {
-	this.destroy = this.set = this.get = noop;
+	this.destroy = noop;
 	this.fire('destroy');
+	this.set = this.get = noop;
 
 	if (detach !== false) this._fragment.unmount();
 	this._fragment.destroy();

test/runtime/samples/set-in-ondestroy/_config.js

@@ -0,0 +1,26 @@
+export default {
+	'skip-ssr': true,
+
+	data: {
+		foo: 1
+	},
+
+	test(assert, component) {
+		const values = [];
+		let valueOnDestroy;
+
+		component.on('destroy', () => {
+			component.set({ foo: 2 });
+			valueOnDestroy = component.get('foo');
+		});
+
+		component.observe('foo', foo => {
+			values.push(foo);
+		});
+
+		component.destroy();
+
+		assert.deepEqual(values, [1, 2]);
+		assert.equal(valueOnDestroy, 2);
+	}
+};

test/runtime/samples/set-in-ondestroy/main.html

@@ -0,0 +1 @@
+empty