From a412f11907311c301993401bfc2508e8efc026f7 Mon Sep 17 00:00:00 2001
From: Luke Edwards <luke.edwards05@gmail.com>
Date: Tue, 27 Mar 2018 12:59:56 -0700
Subject: [PATCH] =?UTF-8?q?update=20test=20samples=E2=80=99=20expectants?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/js/samples/action/expected-bundle.js     | 18 +++++------------
 .../expected-bundle.js                        | 16 ++++-----------
 .../expected-bundle.js                        | 16 ++++-----------
 .../expected-bundle.js                        | 16 ++++-----------
 .../component-static/expected-bundle.js       | 16 ++++-----------
 .../computed-collapsed-if/expected-bundle.js  | 16 ++++-----------
 .../css-media-query/expected-bundle.js        | 16 ++++-----------
 .../expected-bundle.js                        | 18 +++++------------
 .../css-shadow-dom-keyframes/expected.js      |  4 ++--
 .../deconflict-builtins/expected-bundle.js    | 20 ++++++-------------
 .../samples/deconflict-builtins/expected.js   |  6 +++---
 .../deconflict-globals/expected-bundle.js     | 16 ++++-----------
 .../expected-bundle.js                        | 16 ++++-----------
 .../samples/do-use-dataset/expected-bundle.js | 16 ++++-----------
 .../expected-bundle.js                        | 16 ++++-----------
 .../expected-bundle.js                        | 16 ++++-----------
 .../expected-bundle.js                        | 20 ++++++-------------
 .../each-block-changed-check/expected.js      |  6 +++---
 .../event-handlers-custom/expected-bundle.js  | 18 +++++------------
 .../samples/event-handlers-custom/expected.js |  4 ++--
 .../head-no-whitespace/expected-bundle.js     | 16 ++++-----------
 .../if-block-no-update/expected-bundle.js     | 16 ++++-----------
 .../if-block-simple/expected-bundle.js        | 16 ++++-----------
 .../expected-bundle.js                        | 16 ++++-----------
 .../expected-bundle.js                        | 16 ++++-----------
 .../inline-style-optimized/expected-bundle.js | 16 ++++-----------
 .../expected-bundle.js                        | 16 ++++-----------
 .../expected-bundle.js                        | 16 ++++-----------
 .../samples/legacy-default/expected-bundle.js | 16 ++++-----------
 .../legacy-input-type/expected-bundle.js      | 16 ++++-----------
 .../legacy-quote-class/expected-bundle.js     | 16 ++++-----------
 .../samples/media-bindings/expected-bundle.js | 16 ++++-----------
 .../non-imported-component/expected-bundle.js | 16 ++++-----------
 .../expected-bundle.js                        | 16 ++++-----------
 .../samples/setup-method/expected-bundle.js   | 18 +++++------------
 test/js/samples/setup-method/expected.js      |  4 ++--
 test/js/samples/svg-title/expected-bundle.js  | 16 ++++-----------
 test/js/samples/title/expected-bundle.js      | 16 ++++-----------
 .../expected-bundle.js                        | 16 ++++-----------
 .../window-binding-scroll/expected-bundle.js  | 16 ++++-----------
 40 files changed, 160 insertions(+), 440 deletions(-)

diff --git a/test/js/samples/action/expected-bundle.js b/test/js/samples/action/expected-bundle.js
index fe0b795b7f..de026989e4 100644
--- a/test/js/samples/action/expected-bundle.js
+++ b/test/js/samples/action/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function insertNode(node, target, anchor) {
@@ -143,7 +135,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
@@ -184,7 +176,7 @@ var proto = {
 /* generated by Svelte vX.Y.Z */
 
 function link(node) {
-  
+
   function onClick(event) {
     event.preventDefault();
     history.pushState(null, null, event.target.href);
diff --git a/test/js/samples/collapses-text-around-comments/expected-bundle.js b/test/js/samples/collapses-text-around-comments/expected-bundle.js
index 5d602e5a0a..83e680be30 100644
--- a/test/js/samples/collapses-text-around-comments/expected-bundle.js
+++ b/test/js/samples/collapses-text-around-comments/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function appendNode(node, target) {
@@ -151,7 +143,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/component-static-immutable/expected-bundle.js b/test/js/samples/component-static-immutable/expected-bundle.js
index c7969997a6..48fbb1e836 100644
--- a/test/js/samples/component-static-immutable/expected-bundle.js
+++ b/test/js/samples/component-static-immutable/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function blankObject() {
@@ -135,7 +127,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/component-static-immutable2/expected-bundle.js b/test/js/samples/component-static-immutable2/expected-bundle.js
index c7969997a6..48fbb1e836 100644
--- a/test/js/samples/component-static-immutable2/expected-bundle.js
+++ b/test/js/samples/component-static-immutable2/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function blankObject() {
@@ -135,7 +127,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/component-static/expected-bundle.js b/test/js/samples/component-static/expected-bundle.js
index ec0d4ddff4..027cd3be45 100644
--- a/test/js/samples/component-static/expected-bundle.js
+++ b/test/js/samples/component-static/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function blankObject() {
@@ -131,7 +123,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/computed-collapsed-if/expected-bundle.js b/test/js/samples/computed-collapsed-if/expected-bundle.js
index c297a03460..c2d577187f 100644
--- a/test/js/samples/computed-collapsed-if/expected-bundle.js
+++ b/test/js/samples/computed-collapsed-if/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function blankObject() {
@@ -131,7 +123,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/css-media-query/expected-bundle.js b/test/js/samples/css-media-query/expected-bundle.js
index 248b282067..65abf18b53 100644
--- a/test/js/samples/css-media-query/expected-bundle.js
+++ b/test/js/samples/css-media-query/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function appendNode(node, target) {
@@ -147,7 +139,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js b/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js
index 45aa714ea2..66d6da680d 100644
--- a/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js
+++ b/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function insertNode(node, target, anchor) {
@@ -143,7 +135,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
@@ -234,7 +226,7 @@ class SvelteComponent extends HTMLElement {
 }
 
 customElements.define("custom-element", SvelteComponent);
-assign(SvelteComponent.prototype, proto, {
+assign(assign(SvelteComponent.prototype, proto), {
 	_mount(target, anchor) {
 		target.insertBefore(this, anchor);
 	},
diff --git a/test/js/samples/css-shadow-dom-keyframes/expected.js b/test/js/samples/css-shadow-dom-keyframes/expected.js
index 7682ec0a40..680231c77d 100644
--- a/test/js/samples/css-shadow-dom-keyframes/expected.js
+++ b/test/js/samples/css-shadow-dom-keyframes/expected.js
@@ -52,7 +52,7 @@ class SvelteComponent extends HTMLElement {
 }
 
 customElements.define("custom-element", SvelteComponent);
-assign(SvelteComponent.prototype, proto, {
+assign(assign(SvelteComponent.prototype, proto), {
 	_mount(target, anchor) {
 		target.insertBefore(this, anchor);
 	},
@@ -61,4 +61,4 @@ assign(SvelteComponent.prototype, proto, {
 		this.parentNode.removeChild(this);
 	}
 });
-export default SvelteComponent;
\ No newline at end of file
+export default SvelteComponent;
diff --git a/test/js/samples/deconflict-builtins/expected-bundle.js b/test/js/samples/deconflict-builtins/expected-bundle.js
index 0b3656e86b..eac899bc36 100644
--- a/test/js/samples/deconflict-builtins/expected-bundle.js
+++ b/test/js/samples/deconflict-builtins/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function appendNode(node, target) {
@@ -161,7 +153,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
@@ -209,7 +201,7 @@ function create_main_fragment(component, state) {
 	var each_blocks = [];
 
 	for (var i = 0; i < each_value.length; i += 1) {
-		each_blocks[i] = create_each_block(component, assign({}, state, {
+		each_blocks[i] = create_each_block(component, assign(assign({}, state), {
 			each_value: each_value,
 			node: each_value[i],
 			node_index: i
@@ -238,7 +230,7 @@ function create_main_fragment(component, state) {
 
 			if (changed.createElement) {
 				for (var i = 0; i < each_value.length; i += 1) {
-					var each_context = assign({}, state, {
+					var each_context = assign(assign({}, state), {
 						each_value: each_value,
 						node: each_value[i],
 						node_index: i
diff --git a/test/js/samples/deconflict-builtins/expected.js b/test/js/samples/deconflict-builtins/expected.js
index 3ec9c5c9af..314708544b 100644
--- a/test/js/samples/deconflict-builtins/expected.js
+++ b/test/js/samples/deconflict-builtins/expected.js
@@ -9,7 +9,7 @@ function create_main_fragment(component, state) {
 	var each_blocks = [];
 
 	for (var i = 0; i < each_value.length; i += 1) {
-		each_blocks[i] = create_each_block(component, assign({}, state, {
+		each_blocks[i] = create_each_block(component, assign(assign({}, state), {
 			each_value: each_value,
 			node: each_value[i],
 			node_index: i
@@ -38,7 +38,7 @@ function create_main_fragment(component, state) {
 
 			if (changed.createElement) {
 				for (var i = 0; i < each_value.length; i += 1) {
-					var each_context = assign({}, state, {
+					var each_context = assign(assign({}, state), {
 						each_value: each_value,
 						node: each_value[i],
 						node_index: i
@@ -121,4 +121,4 @@ function SvelteComponent(options) {
 }
 
 assign(SvelteComponent.prototype, proto);
-export default SvelteComponent;
\ No newline at end of file
+export default SvelteComponent;
diff --git a/test/js/samples/deconflict-globals/expected-bundle.js b/test/js/samples/deconflict-globals/expected-bundle.js
index 050af86e46..c5967ec8b6 100644
--- a/test/js/samples/deconflict-globals/expected-bundle.js
+++ b/test/js/samples/deconflict-globals/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function blankObject() {
@@ -131,7 +123,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/dev-warning-missing-data-computed/expected-bundle.js b/test/js/samples/dev-warning-missing-data-computed/expected-bundle.js
index 4798efc419..84a148c901 100644
--- a/test/js/samples/dev-warning-missing-data-computed/expected-bundle.js
+++ b/test/js/samples/dev-warning-missing-data-computed/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function appendNode(node, target) {
@@ -183,7 +175,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/do-use-dataset/expected-bundle.js b/test/js/samples/do-use-dataset/expected-bundle.js
index ea6c4c26c0..883194110d 100644
--- a/test/js/samples/do-use-dataset/expected-bundle.js
+++ b/test/js/samples/do-use-dataset/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function insertNode(node, target, anchor) {
@@ -147,7 +139,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js b/test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js
index b1a3d273fa..1e231ec056 100644
--- a/test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js
+++ b/test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function insertNode(node, target, anchor) {
@@ -151,7 +143,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/dont-use-dataset-in-svg/expected-bundle.js b/test/js/samples/dont-use-dataset-in-svg/expected-bundle.js
index 311366c776..0b60ba22e2 100644
--- a/test/js/samples/dont-use-dataset-in-svg/expected-bundle.js
+++ b/test/js/samples/dont-use-dataset-in-svg/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function appendNode(node, target) {
@@ -151,7 +143,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/each-block-changed-check/expected-bundle.js b/test/js/samples/each-block-changed-check/expected-bundle.js
index 92e32c85d2..7581483383 100644
--- a/test/js/samples/each-block-changed-check/expected-bundle.js
+++ b/test/js/samples/each-block-changed-check/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function appendNode(node, target) {
@@ -163,7 +155,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
@@ -211,7 +203,7 @@ function create_main_fragment(component, state) {
 	var each_blocks = [];
 
 	for (var i = 0; i < each_value.length; i += 1) {
-		each_blocks[i] = create_each_block(component, assign({}, state, {
+		each_blocks[i] = create_each_block(component, assign(assign({}, state), {
 			each_value: each_value,
 			comment: each_value[i],
 			i: i
@@ -244,7 +236,7 @@ function create_main_fragment(component, state) {
 
 			if (changed.comments || changed.elapsed || changed.time) {
 				for (var i = 0; i < each_value.length; i += 1) {
-					var each_context = assign({}, state, {
+					var each_context = assign(assign({}, state), {
 						each_value: each_value,
 						comment: each_value[i],
 						i: i
diff --git a/test/js/samples/each-block-changed-check/expected.js b/test/js/samples/each-block-changed-check/expected.js
index a73d47593b..407fcf81ea 100644
--- a/test/js/samples/each-block-changed-check/expected.js
+++ b/test/js/samples/each-block-changed-check/expected.js
@@ -9,7 +9,7 @@ function create_main_fragment(component, state) {
 	var each_blocks = [];
 
 	for (var i = 0; i < each_value.length; i += 1) {
-		each_blocks[i] = create_each_block(component, assign({}, state, {
+		each_blocks[i] = create_each_block(component, assign(assign({}, state), {
 			each_value: each_value,
 			comment: each_value[i],
 			i: i
@@ -42,7 +42,7 @@ function create_main_fragment(component, state) {
 
 			if (changed.comments || changed.elapsed || changed.time) {
 				for (var i = 0; i < each_value.length; i += 1) {
-					var each_context = assign({}, state, {
+					var each_context = assign(assign({}, state), {
 						each_value: each_value,
 						comment: each_value[i],
 						i: i
@@ -166,4 +166,4 @@ function SvelteComponent(options) {
 }
 
 assign(SvelteComponent.prototype, proto);
-export default SvelteComponent;
\ No newline at end of file
+export default SvelteComponent;
diff --git a/test/js/samples/event-handlers-custom/expected-bundle.js b/test/js/samples/event-handlers-custom/expected-bundle.js
index eaf52c8c7d..6d0dcd3bc8 100644
--- a/test/js/samples/event-handlers-custom/expected-bundle.js
+++ b/test/js/samples/event-handlers-custom/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function insertNode(node, target, anchor) {
@@ -143,7 +135,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
@@ -237,6 +229,6 @@ function SvelteComponent(options) {
 	}
 }
 
-assign(SvelteComponent.prototype, methods, proto);
+assign(assign(SvelteComponent.prototype, methods), proto);
 
 export default SvelteComponent;
diff --git a/test/js/samples/event-handlers-custom/expected.js b/test/js/samples/event-handlers-custom/expected.js
index ecc6f97855..ee1d155e9d 100644
--- a/test/js/samples/event-handlers-custom/expected.js
+++ b/test/js/samples/event-handlers-custom/expected.js
@@ -56,5 +56,5 @@ function SvelteComponent(options) {
 	}
 }
 
-assign(SvelteComponent.prototype, methods, proto);
-export default SvelteComponent;
\ No newline at end of file
+assign(assign(SvelteComponent.prototype, methods), proto);
+export default SvelteComponent;
diff --git a/test/js/samples/head-no-whitespace/expected-bundle.js b/test/js/samples/head-no-whitespace/expected-bundle.js
index fe4181879a..396cf8fb8c 100644
--- a/test/js/samples/head-no-whitespace/expected-bundle.js
+++ b/test/js/samples/head-no-whitespace/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function appendNode(node, target) {
@@ -143,7 +135,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/if-block-no-update/expected-bundle.js b/test/js/samples/if-block-no-update/expected-bundle.js
index dff5298109..59d3e9656b 100644
--- a/test/js/samples/if-block-no-update/expected-bundle.js
+++ b/test/js/samples/if-block-no-update/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function insertNode(node, target, anchor) {
@@ -147,7 +139,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/if-block-simple/expected-bundle.js b/test/js/samples/if-block-simple/expected-bundle.js
index 684a5aa6f1..1c0f7f3fae 100644
--- a/test/js/samples/if-block-simple/expected-bundle.js
+++ b/test/js/samples/if-block-simple/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function insertNode(node, target, anchor) {
@@ -147,7 +139,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/inline-style-optimized-multiple/expected-bundle.js b/test/js/samples/inline-style-optimized-multiple/expected-bundle.js
index 4df73d50d2..eb528e4ebf 100644
--- a/test/js/samples/inline-style-optimized-multiple/expected-bundle.js
+++ b/test/js/samples/inline-style-optimized-multiple/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function insertNode(node, target, anchor) {
@@ -147,7 +139,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/inline-style-optimized-url/expected-bundle.js b/test/js/samples/inline-style-optimized-url/expected-bundle.js
index ad89d07b5e..a4d2dda669 100644
--- a/test/js/samples/inline-style-optimized-url/expected-bundle.js
+++ b/test/js/samples/inline-style-optimized-url/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function insertNode(node, target, anchor) {
@@ -147,7 +139,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/inline-style-optimized/expected-bundle.js b/test/js/samples/inline-style-optimized/expected-bundle.js
index b012a321bb..2b78d3932a 100644
--- a/test/js/samples/inline-style-optimized/expected-bundle.js
+++ b/test/js/samples/inline-style-optimized/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function insertNode(node, target, anchor) {
@@ -147,7 +139,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/inline-style-unoptimized/expected-bundle.js b/test/js/samples/inline-style-unoptimized/expected-bundle.js
index 2d36273b6e..670a2c02f6 100644
--- a/test/js/samples/inline-style-unoptimized/expected-bundle.js
+++ b/test/js/samples/inline-style-unoptimized/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function insertNode(node, target, anchor) {
@@ -147,7 +139,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/input-without-blowback-guard/expected-bundle.js b/test/js/samples/input-without-blowback-guard/expected-bundle.js
index 2e27d4c2bc..3a0d2ab0e5 100644
--- a/test/js/samples/input-without-blowback-guard/expected-bundle.js
+++ b/test/js/samples/input-without-blowback-guard/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function insertNode(node, target, anchor) {
@@ -155,7 +147,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/legacy-default/expected-bundle.js b/test/js/samples/legacy-default/expected-bundle.js
index 534b9d6baa..38455aa8bc 100644
--- a/test/js/samples/legacy-default/expected-bundle.js
+++ b/test/js/samples/legacy-default/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function appendNode(node, target) {
@@ -165,7 +157,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/legacy-input-type/expected-bundle.js b/test/js/samples/legacy-input-type/expected-bundle.js
index 5cc1296a4f..9c478dd3d9 100644
--- a/test/js/samples/legacy-input-type/expected-bundle.js
+++ b/test/js/samples/legacy-input-type/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function insertNode(node, target, anchor) {
@@ -149,7 +141,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/legacy-quote-class/expected-bundle.js b/test/js/samples/legacy-quote-class/expected-bundle.js
index 4a20d61232..84afafca02 100644
--- a/test/js/samples/legacy-quote-class/expected-bundle.js
+++ b/test/js/samples/legacy-quote-class/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function insertNode(node, target, anchor) {
@@ -166,7 +158,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/media-bindings/expected-bundle.js b/test/js/samples/media-bindings/expected-bundle.js
index 8287902dff..b4479b8ff1 100644
--- a/test/js/samples/media-bindings/expected-bundle.js
+++ b/test/js/samples/media-bindings/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function insertNode(node, target, anchor) {
@@ -159,7 +151,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/non-imported-component/expected-bundle.js b/test/js/samples/non-imported-component/expected-bundle.js
index 399e3d594d..47366ed109 100644
--- a/test/js/samples/non-imported-component/expected-bundle.js
+++ b/test/js/samples/non-imported-component/expected-bundle.js
@@ -2,17 +2,9 @@ import Imported from 'Imported.html';
 
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function insertNode(node, target, anchor) {
@@ -145,7 +137,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js
index 783831720b..87e038ea8d 100644
--- a/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js
+++ b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function blankObject() {
@@ -131,7 +123,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/setup-method/expected-bundle.js b/test/js/samples/setup-method/expected-bundle.js
index b4465e2a6b..3a002059aa 100644
--- a/test/js/samples/setup-method/expected-bundle.js
+++ b/test/js/samples/setup-method/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function blankObject() {
@@ -131,7 +123,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
@@ -214,7 +206,7 @@ function SvelteComponent(options) {
 	}
 }
 
-assign(SvelteComponent.prototype, methods, proto);
+assign(assign(SvelteComponent.prototype, methods), proto);
 
 setup(SvelteComponent);
 
diff --git a/test/js/samples/setup-method/expected.js b/test/js/samples/setup-method/expected.js
index 12dc0b2452..256d1710b4 100644
--- a/test/js/samples/setup-method/expected.js
+++ b/test/js/samples/setup-method/expected.js
@@ -44,7 +44,7 @@ function SvelteComponent(options) {
 	}
 }
 
-assign(SvelteComponent.prototype, methods, proto);
+assign(assign(SvelteComponent.prototype, methods), proto);
 
 setup(SvelteComponent);
-export default SvelteComponent;
\ No newline at end of file
+export default SvelteComponent;
diff --git a/test/js/samples/svg-title/expected-bundle.js b/test/js/samples/svg-title/expected-bundle.js
index 534d98b185..837d81e0e2 100644
--- a/test/js/samples/svg-title/expected-bundle.js
+++ b/test/js/samples/svg-title/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function appendNode(node, target) {
@@ -151,7 +143,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/title/expected-bundle.js b/test/js/samples/title/expected-bundle.js
index e1de24a335..83c8815d6f 100644
--- a/test/js/samples/title/expected-bundle.js
+++ b/test/js/samples/title/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function blankObject() {
@@ -131,7 +123,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/use-elements-as-anchors/expected-bundle.js b/test/js/samples/use-elements-as-anchors/expected-bundle.js
index fbfb801019..722574e063 100644
--- a/test/js/samples/use-elements-as-anchors/expected-bundle.js
+++ b/test/js/samples/use-elements-as-anchors/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function appendNode(node, target) {
@@ -155,7 +147,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);
 
diff --git a/test/js/samples/window-binding-scroll/expected-bundle.js b/test/js/samples/window-binding-scroll/expected-bundle.js
index 0fca60a0f8..a98de2af63 100644
--- a/test/js/samples/window-binding-scroll/expected-bundle.js
+++ b/test/js/samples/window-binding-scroll/expected-bundle.js
@@ -1,16 +1,8 @@
 function noop() {}
 
-function assign(target) {
-	var k,
-		source,
-		i = 1,
-		len = arguments.length;
-	for (; i < len; i++) {
-		source = arguments[i];
-		for (k in source) target[k] = source[k];
-	}
-
-	return target;
+function assign(tar, src) {
+	for (var k in src) tar[k] = src[k];
+	return tar;
 }
 
 function appendNode(node, target) {
@@ -151,7 +143,7 @@ function _set(newState) {
 	}
 	if (!dirty) return;
 
-	this._state = assign({}, oldState, newState);
+	this._state = assign(assign({}, oldState), newState);
 	this._recompute(changed, this._state);
 	if (this._bind) this._bind(changed, this._state);