From e9f17f34ff87f00c5b517e2431346ae9affab07b Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Jul 2017 14:18:26 -0400
Subject: [PATCH 1/2] fire intro.start and outro.start events (#702)

---
 mocha.opts                                    |  1 -
 src/generators/dom/index.ts                   | 26 +++++------
 .../dom/visitors/Element/addTransitions.ts    | 10 ++---
 src/shared/index.js                           | 11 ++---
 src/shared/transitions.js                     |  8 ++--
 .../expected-bundle.js                        | 11 ++---
 .../computed-collapsed-if/expected-bundle.js  | 11 ++---
 .../expected-bundle.js                        | 11 ++---
 .../event-handlers-custom/expected-bundle.js  | 11 ++---
 .../if-block-no-update/expected-bundle.js     | 11 ++---
 .../if-block-simple/expected-bundle.js        | 11 ++---
 .../non-imported-component/expected-bundle.js | 11 ++---
 .../expected-bundle.js                        | 13 +++---
 .../onrender-onteardown-rewritten/expected.js |  2 +
 .../expected-bundle.js                        | 11 ++---
 .../samples/transition-js-events/_config.js   | 35 +++++++++++++++
 .../samples/transition-js-events/main.html    | 45 +++++++++++++++++++
 17 files changed, 166 insertions(+), 73 deletions(-)
 create mode 100644 test/runtime/samples/transition-js-events/_config.js
 create mode 100644 test/runtime/samples/transition-js-events/main.html

diff --git a/mocha.opts b/mocha.opts
index af6b17a845..427b029758 100644
--- a/mocha.opts
+++ b/mocha.opts
@@ -1,2 +1 @@
---bail
 test/test.js
\ No newline at end of file
diff --git a/src/generators/dom/index.ts b/src/generators/dom/index.ts
index ee04867668..5c698821e9 100644
--- a/src/generators/dom/index.ts
+++ b/src/generators/dom/index.ts
@@ -122,10 +122,9 @@ export default function dom(
 		@dispatchObservers( this, this._observers.pre, newState, oldState );
 		${block.hasUpdateMethod && `this._fragment.update( newState, this._state );`}
 		@dispatchObservers( this, this._observers.post, newState, oldState );
-		${(generator.hasComponents || generator.hasIntroTransitions) &&
+		${(generator.hasComponents || generator.hasComplexBindings) &&
 			`this._flush();`}
-		${generator.hasComplexBindings &&
-			`while ( this._bindings.length ) this._bindings.pop()();`}
+		${generator.hasIntroTransitions && `@callAll(this._postcreate);`}
 	`;
 
 	if (hasJs) {
@@ -199,9 +198,9 @@ export default function dom(
 			${generator.css &&
 				options.css !== false &&
 				`if ( !document.getElementById( '${generator.cssId}-style' ) ) @add_css();`}
-			${(generator.hasComponents || generator.hasIntroTransitions) &&
-				`this._oncreate = [];`}
+			${generator.hasComponents && `this._oncreate = [];`}
 			${generator.hasComplexBindings && `this._bindings = [];`}
+			${generator.hasIntroTransitions && `this._postcreate = [];`}
 
 			this._fragment = @create_main_fragment( this._state, this );
 
@@ -219,19 +218,18 @@ export default function dom(
 				this._fragment.${block.hasIntroMethod ? 'intro' : 'mount'}( options.target, null );
 			}
 			
-			${(generator.hasComponents || generator.hasIntroTransitions) &&
+			${(generator.hasComponents || generator.hasIntroTransitions || generator.hasComplexBindings || templateProperties.oncreate) &&
 				`this._flush();`}
-			${generator.hasComplexBindings &&
-				`while ( this._bindings.length ) this._bindings.pop()();`}
 
 			${templateProperties.oncreate &&
 				deindent`
-				if ( options._root ) {
-					options._root._oncreate.push( @template.oncreate.bind( this ) );
-				} else {
-					@template.oncreate.call( this );
-				}
-			`}
+					if ( options._root ) {
+						options._root._oncreate.push( @template.oncreate.bind( this ) );
+					} else {
+						@template.oncreate.call( this );
+					}`}
+
+			${generator.hasIntroTransitions && `@callAll(this._postcreate);`}
 		}
 
 		@assign( ${prototypeBase}, ${proto});
diff --git a/src/generators/dom/visitors/Element/addTransitions.ts b/src/generators/dom/visitors/Element/addTransitions.ts
index d5f0f4c6f9..84b31a4201 100644
--- a/src/generators/dom/visitors/Element/addTransitions.ts
+++ b/src/generators/dom/visitors/Element/addTransitions.ts
@@ -23,8 +23,8 @@ export default function addTransitions(
 		const fn = `@template.transitions.${intro.name}`;
 
 		block.builders.intro.addBlock(deindent`
-			#component._oncreate.push( function () {
-				if ( !${name} ) ${name} = @wrapTransition( ${state.name}, ${fn}, ${snippet}, true, null );
+			#component._postcreate.push( function () {
+				if ( !${name} ) ${name} = @wrapTransition( #component, ${state.name}, ${fn}, ${snippet}, true, null );
 				${name}.run( true, function () {
 					#component.fire( 'intro.end', { node: ${state.name} });
 				});
@@ -58,8 +58,8 @@ export default function addTransitions(
 			}
 
 			block.builders.intro.addBlock(deindent`
-				#component._oncreate.push( function () {
-					${introName} = @wrapTransition( ${state.name}, ${fn}, ${snippet}, true, null );
+				#component._postcreate.push( function () {
+					${introName} = @wrapTransition( #component, ${state.name}, ${fn}, ${snippet}, true, null );
 					${introName}.run( true, function () {
 						#component.fire( 'intro.end', { node: ${state.name} });
 					});
@@ -78,7 +78,7 @@ export default function addTransitions(
 			// TODO hide elements that have outro'd (unless they belong to a still-outroing
 			// group) prior to their removal from the DOM
 			block.builders.outro.addBlock(deindent`
-				${outroName} = @wrapTransition( ${state.name}, ${fn}, ${snippet}, false, null );
+				${outroName} = @wrapTransition( #component, ${state.name}, ${fn}, ${snippet}, false, null );
 				${outroName}.run( false, function () {
 					#component.fire( 'outro.end', { node: ${state.name} });
 					if ( --#outros === 0 ) #outrocallback();
diff --git a/src/shared/index.js b/src/shared/index.js
index 5dde09c66f..4a2f005058 100644
--- a/src/shared/index.js
+++ b/src/shared/index.js
@@ -109,12 +109,13 @@ export function set(newState) {
 	this._root._flush();
 }
 
-export function _flush() {
-	if (!this._oncreate) return;
+export function callAll(fns) {
+	while (fns && fns.length) fns.pop()();
+}
 
-	while (this._oncreate.length) {
-		this._oncreate.pop()();
-	}
+export function _flush() {
+	callAll(this._oncreate);
+	callAll(this._bindings);
 }
 
 export var proto = {
diff --git a/src/shared/transitions.js b/src/shared/transitions.js
index 30b5c73342..6d573f68fd 100644
--- a/src/shared/transitions.js
+++ b/src/shared/transitions.js
@@ -32,7 +32,7 @@ export function hash(str) {
 	return hash >>> 0;
 }
 
-export function wrapTransition(node, fn, params, intro, outgroup) {
+export function wrapTransition(component, node, fn, params, intro, outgroup) {
 	var obj = fn(node, params);
 	var duration = obj.duration || 300;
 	var ease = obj.easing || linear;
@@ -78,6 +78,8 @@ export function wrapTransition(node, fn, params, intro, outgroup) {
 			}
 		},
 		start: function(program) {
+			component.fire(program.intro ? 'intro.start' : 'outro.start', { node: node });
+
 			program.a = this.t;
 			program.b = program.intro ? 1 : 0;
 			program.delta = program.b - program.a;
@@ -149,7 +151,7 @@ export var transitionManager = {
 
 		if (!this.running) {
 			this.running = true;
-			this.next();
+			requestAnimationFrame(this.bound || (this.bound = this.next.bind(this)));
 		}
 	},
 
@@ -186,7 +188,7 @@ export var transitionManager = {
 		}
 
 		if (this.running) {
-			requestAnimationFrame(this.bound || (this.bound = this.next.bind(this)));
+			requestAnimationFrame(this.bound);
 		} else if (this.stylesheet) {
 			var i = this.stylesheet.cssRules.length;
 			while (i--) this.stylesheet.deleteRule(i);
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 057ece3065..e47fe8df28 100644
--- a/test/js/samples/collapses-text-around-comments/expected-bundle.js
+++ b/test/js/samples/collapses-text-around-comments/expected-bundle.js
@@ -118,12 +118,13 @@ function set(newState) {
 	this._root._flush();
 }
 
-function _flush() {
-	if (!this._oncreate) return;
+function callAll(fns) {
+	while (fns && fns.length) fns.pop()();
+}
 
-	while (this._oncreate.length) {
-		this._oncreate.pop()();
-	}
+function _flush() {
+	callAll(this._oncreate);
+	callAll(this._bindings);
 }
 
 var proto = {
diff --git a/test/js/samples/computed-collapsed-if/expected-bundle.js b/test/js/samples/computed-collapsed-if/expected-bundle.js
index d85fd55c51..b574e09f0f 100644
--- a/test/js/samples/computed-collapsed-if/expected-bundle.js
+++ b/test/js/samples/computed-collapsed-if/expected-bundle.js
@@ -94,12 +94,13 @@ function set(newState) {
 	this._root._flush();
 }
 
-function _flush() {
-	if (!this._oncreate) return;
+function callAll(fns) {
+	while (fns && fns.length) fns.pop()();
+}
 
-	while (this._oncreate.length) {
-		this._oncreate.pop()();
-	}
+function _flush() {
+	callAll(this._oncreate);
+	callAll(this._bindings);
 }
 
 var proto = {
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 4bbecf3f71..5ac69c1c96 100644
--- a/test/js/samples/each-block-changed-check/expected-bundle.js
+++ b/test/js/samples/each-block-changed-check/expected-bundle.js
@@ -127,12 +127,13 @@ function set(newState) {
 	this._root._flush();
 }
 
-function _flush() {
-	if (!this._oncreate) return;
+function callAll(fns) {
+	while (fns && fns.length) fns.pop()();
+}
 
-	while (this._oncreate.length) {
-		this._oncreate.pop()();
-	}
+function _flush() {
+	callAll(this._oncreate);
+	callAll(this._bindings);
 }
 
 var proto = {
diff --git a/test/js/samples/event-handlers-custom/expected-bundle.js b/test/js/samples/event-handlers-custom/expected-bundle.js
index 8fa8ead617..b6c8d040ab 100644
--- a/test/js/samples/event-handlers-custom/expected-bundle.js
+++ b/test/js/samples/event-handlers-custom/expected-bundle.js
@@ -112,12 +112,13 @@ function set(newState) {
 	this._root._flush();
 }
 
-function _flush() {
-	if (!this._oncreate) return;
+function callAll(fns) {
+	while (fns && fns.length) fns.pop()();
+}
 
-	while (this._oncreate.length) {
-		this._oncreate.pop()();
-	}
+function _flush() {
+	callAll(this._oncreate);
+	callAll(this._bindings);
 }
 
 var proto = {
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 65634e0748..a445b1dbf4 100644
--- a/test/js/samples/if-block-no-update/expected-bundle.js
+++ b/test/js/samples/if-block-no-update/expected-bundle.js
@@ -118,12 +118,13 @@ function set(newState) {
 	this._root._flush();
 }
 
-function _flush() {
-	if (!this._oncreate) return;
+function callAll(fns) {
+	while (fns && fns.length) fns.pop()();
+}
 
-	while (this._oncreate.length) {
-		this._oncreate.pop()();
-	}
+function _flush() {
+	callAll(this._oncreate);
+	callAll(this._bindings);
 }
 
 var proto = {
diff --git a/test/js/samples/if-block-simple/expected-bundle.js b/test/js/samples/if-block-simple/expected-bundle.js
index bf78f1ca68..199809ac18 100644
--- a/test/js/samples/if-block-simple/expected-bundle.js
+++ b/test/js/samples/if-block-simple/expected-bundle.js
@@ -118,12 +118,13 @@ function set(newState) {
 	this._root._flush();
 }
 
-function _flush() {
-	if (!this._oncreate) return;
+function callAll(fns) {
+	while (fns && fns.length) fns.pop()();
+}
 
-	while (this._oncreate.length) {
-		this._oncreate.pop()();
-	}
+function _flush() {
+	callAll(this._oncreate);
+	callAll(this._bindings);
 }
 
 var proto = {
diff --git a/test/js/samples/non-imported-component/expected-bundle.js b/test/js/samples/non-imported-component/expected-bundle.js
index 030c57369b..809f4e1e77 100644
--- a/test/js/samples/non-imported-component/expected-bundle.js
+++ b/test/js/samples/non-imported-component/expected-bundle.js
@@ -106,12 +106,13 @@ function set(newState) {
 	this._root._flush();
 }
 
-function _flush() {
-	if (!this._oncreate) return;
+function callAll(fns) {
+	while (fns && fns.length) fns.pop()();
+}
 
-	while (this._oncreate.length) {
-		this._oncreate.pop()();
-	}
+function _flush() {
+	callAll(this._oncreate);
+	callAll(this._bindings);
 }
 
 var proto = {
diff --git a/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js
index f5849818fe..ec4b795edd 100644
--- a/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js
+++ b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js
@@ -94,12 +94,13 @@ function set(newState) {
 	this._root._flush();
 }
 
-function _flush() {
-	if (!this._oncreate) return;
+function callAll(fns) {
+	while (fns && fns.length) fns.pop()();
+}
 
-	while (this._oncreate.length) {
-		this._oncreate.pop()();
-	}
+function _flush() {
+	callAll(this._oncreate);
+	callAll(this._bindings);
 }
 
 var proto = {
@@ -155,6 +156,8 @@ function SvelteComponent ( options ) {
 		this._fragment.mount( options.target, null );
 	}
 
+	this._flush();
+
 	if ( options._root ) {
 		options._root._oncreate.push( template.oncreate.bind( this ) );
 	} else {
diff --git a/test/js/samples/onrender-onteardown-rewritten/expected.js b/test/js/samples/onrender-onteardown-rewritten/expected.js
index 96aa37d766..cce718f922 100644
--- a/test/js/samples/onrender-onteardown-rewritten/expected.js
+++ b/test/js/samples/onrender-onteardown-rewritten/expected.js
@@ -44,6 +44,8 @@ function SvelteComponent ( options ) {
 		this._fragment.mount( options.target, null );
 	}
 
+	this._flush();
+
 	if ( options._root ) {
 		options._root._oncreate.push( template.oncreate.bind( this ) );
 	} else {
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 63138c0157..13f89030e4 100644
--- a/test/js/samples/use-elements-as-anchors/expected-bundle.js
+++ b/test/js/samples/use-elements-as-anchors/expected-bundle.js
@@ -118,12 +118,13 @@ function set(newState) {
 	this._root._flush();
 }
 
-function _flush() {
-	if (!this._oncreate) return;
+function callAll(fns) {
+	while (fns && fns.length) fns.pop()();
+}
 
-	while (this._oncreate.length) {
-		this._oncreate.pop()();
-	}
+function _flush() {
+	callAll(this._oncreate);
+	callAll(this._bindings);
 }
 
 var proto = {
diff --git a/test/runtime/samples/transition-js-events/_config.js b/test/runtime/samples/transition-js-events/_config.js
new file mode 100644
index 0000000000..71e9ccd39c
--- /dev/null
+++ b/test/runtime/samples/transition-js-events/_config.js
@@ -0,0 +1,35 @@
+export default {
+	data: {
+		visible: true,
+		things: ['a', 'b', 'c', 'd']
+	},
+
+	test (assert, component, target, window, raf) {
+		raf.tick(50);
+		assert.deepEqual(component.intros.sort(), ['a', 'b', 'c', 'd']);
+		assert.equal(component.introCount, 4);
+
+		raf.tick(100);
+		assert.equal(component.introCount, 0);
+
+		component.set({ visible: false });
+
+		raf.tick(150);
+		assert.deepEqual(component.outros.sort(), ['a', 'b', 'c', 'd']);
+		assert.equal(component.outroCount, 4);
+
+		raf.tick(200);
+		assert.equal(component.outroCount, 0);
+
+		component.set({ visible: true });
+		component.on('intro.start', () => {
+			throw new Error(`intro.start should fire during set(), not after`);
+		});
+
+		raf.tick(250);
+		assert.deepEqual(component.intros.sort(), ['a', 'a', 'b', 'b', 'c', 'c', 'd', 'd']);
+		assert.equal(component.introCount, 4);
+
+		component.destroy();
+	}
+};
\ No newline at end of file
diff --git a/test/runtime/samples/transition-js-events/main.html b/test/runtime/samples/transition-js-events/main.html
new file mode 100644
index 0000000000..0436513348
--- /dev/null
+++ b/test/runtime/samples/transition-js-events/main.html
@@ -0,0 +1,45 @@
+{{#each things as thing}}
+	{{#if visible}}
+		<p transition:foo>{{thing}}</p>
+	{{/if}}
+{{/each}}
+
+<script>
+	export default {
+		transitions: {
+			foo: function ( node, params ) {
+				return {
+					duration: 100,
+					tick: t => {
+						node.foo = t;
+					}
+				};
+			}
+		},
+
+		oncreate() {
+			this.intros = [];
+			this.outros = [];
+			this.introCount = 0;
+			this.outroCount = 0;
+
+			this.on('intro.start', ({ node }) => {
+				this.intros.push(node.textContent);
+				this.introCount += 1;
+			});
+
+			this.on('intro.end', () => {
+				this.introCount -= 1;
+			});
+
+			this.on('outro.start', ({ node }) => {
+				this.outros.push(node.textContent);
+				this.outroCount += 1;
+			});
+
+			this.on('outro.end', () => {
+				this.outroCount -= 1;
+			});
+		}
+	};
+</script>
\ No newline at end of file

From 84e6d0c5b788d1acfb3c03151d0a65102b23ce09 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sat, 8 Jul 2017 14:25:41 -0400
Subject: [PATCH 2/2] remove _flush in favour of callAll

---
 src/generators/dom/index.ts                   | 25 +++++++++----------
 src/shared/index.js                           | 13 +++-------
 .../expected-bundle.js                        | 10 ++------
 .../computed-collapsed-if/expected-bundle.js  | 10 ++------
 .../expected-bundle.js                        | 10 ++------
 .../event-handlers-custom/expected-bundle.js  | 10 ++------
 .../if-block-no-update/expected-bundle.js     | 10 ++------
 .../if-block-simple/expected-bundle.js        | 10 ++------
 .../non-imported-component/expected-bundle.js | 14 +++--------
 .../non-imported-component/expected.js        |  6 ++---
 .../expected-bundle.js                        | 12 ++-------
 .../onrender-onteardown-rewritten/expected.js |  2 --
 .../expected-bundle.js                        | 10 ++------
 13 files changed, 38 insertions(+), 104 deletions(-)

diff --git a/src/generators/dom/index.ts b/src/generators/dom/index.ts
index 5c698821e9..393c83fe1f 100644
--- a/src/generators/dom/index.ts
+++ b/src/generators/dom/index.ts
@@ -122,8 +122,8 @@ export default function dom(
 		@dispatchObservers( this, this._observers.pre, newState, oldState );
 		${block.hasUpdateMethod && `this._fragment.update( newState, this._state );`}
 		@dispatchObservers( this, this._observers.post, newState, oldState );
-		${(generator.hasComponents || generator.hasComplexBindings) &&
-			`this._flush();`}
+		${generator.hasComponents && `@callAll(this._oncreate);`}
+		${generator.hasComplexBindings && `@callAll(this._bindings);`}
 		${generator.hasIntroTransitions && `@callAll(this._postcreate);`}
 	`;
 
@@ -157,7 +157,7 @@ export default function dom(
 		? `@proto `
 		: deindent`
 		{
-			${['get', 'fire', 'observe', 'on', 'set', '_flush']
+			${['get', 'fire', 'observe', 'on', 'set']
 				.map(n => `${n}: @${n}`)
 				.join(',\n')}
 		}`;
@@ -218,16 +218,15 @@ export default function dom(
 				this._fragment.${block.hasIntroMethod ? 'intro' : 'mount'}( options.target, null );
 			}
 			
-			${(generator.hasComponents || generator.hasIntroTransitions || generator.hasComplexBindings || templateProperties.oncreate) &&
-				`this._flush();`}
-
-			${templateProperties.oncreate &&
-				deindent`
-					if ( options._root ) {
-						options._root._oncreate.push( @template.oncreate.bind( this ) );
-					} else {
-						@template.oncreate.call( this );
-					}`}
+			${generator.hasComponents && `@callAll(this._oncreate);`}
+			${generator.hasComplexBindings && `@callAll(this._bindings);`}
+
+			${templateProperties.oncreate && deindent`
+				if ( options._root ) {
+					options._root._oncreate.push( @template.oncreate.bind( this ) );
+				} else {
+					@template.oncreate.call( this );
+				}`}
 
 			${generator.hasIntroTransitions && `@callAll(this._postcreate);`}
 		}
diff --git a/src/shared/index.js b/src/shared/index.js
index 4a2f005058..acac5b216c 100644
--- a/src/shared/index.js
+++ b/src/shared/index.js
@@ -106,25 +106,19 @@ export function onDev(eventName, handler) {
 
 export function set(newState) {
 	this._set(assign({}, newState));
-	this._root._flush();
+	callAll(this._root._oncreate);
 }
 
 export function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
-export function _flush() {
-	callAll(this._oncreate);
-	callAll(this._bindings);
-}
-
 export var proto = {
 	get: get,
 	fire: fire,
 	observe: observe,
 	on: on,
-	set: set,
-	_flush: _flush
+	set: set
 };
 
 export var protoDev = {
@@ -132,6 +126,5 @@ export var protoDev = {
 	fire: fire,
 	observe: observeDev,
 	on: onDev,
-	set: set,
-	_flush: _flush
+	set: set
 };
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 e47fe8df28..ea478745cd 100644
--- a/test/js/samples/collapses-text-around-comments/expected-bundle.js
+++ b/test/js/samples/collapses-text-around-comments/expected-bundle.js
@@ -115,25 +115,19 @@ function on(eventName, handler) {
 
 function set(newState) {
 	this._set(assign({}, newState));
-	this._root._flush();
+	callAll(this._root._oncreate);
 }
 
 function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
-function _flush() {
-	callAll(this._oncreate);
-	callAll(this._bindings);
-}
-
 var proto = {
 	get: get,
 	fire: fire,
 	observe: observe,
 	on: on,
-	set: set,
-	_flush: _flush
+	set: set
 };
 
 var template = (function () {
diff --git a/test/js/samples/computed-collapsed-if/expected-bundle.js b/test/js/samples/computed-collapsed-if/expected-bundle.js
index b574e09f0f..5cd719b372 100644
--- a/test/js/samples/computed-collapsed-if/expected-bundle.js
+++ b/test/js/samples/computed-collapsed-if/expected-bundle.js
@@ -91,25 +91,19 @@ function on(eventName, handler) {
 
 function set(newState) {
 	this._set(assign({}, newState));
-	this._root._flush();
+	callAll(this._root._oncreate);
 }
 
 function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
-function _flush() {
-	callAll(this._oncreate);
-	callAll(this._bindings);
-}
-
 var proto = {
 	get: get,
 	fire: fire,
 	observe: observe,
 	on: on,
-	set: set,
-	_flush: _flush
+	set: set
 };
 
 function recompute ( state, newState, oldState, isInitial ) {
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 5ac69c1c96..d98ac1db37 100644
--- a/test/js/samples/each-block-changed-check/expected-bundle.js
+++ b/test/js/samples/each-block-changed-check/expected-bundle.js
@@ -124,25 +124,19 @@ function on(eventName, handler) {
 
 function set(newState) {
 	this._set(assign({}, newState));
-	this._root._flush();
+	callAll(this._root._oncreate);
 }
 
 function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
-function _flush() {
-	callAll(this._oncreate);
-	callAll(this._bindings);
-}
-
 var proto = {
 	get: get,
 	fire: fire,
 	observe: observe,
 	on: on,
-	set: set,
-	_flush: _flush
+	set: set
 };
 
 function create_main_fragment ( state, component ) {
diff --git a/test/js/samples/event-handlers-custom/expected-bundle.js b/test/js/samples/event-handlers-custom/expected-bundle.js
index b6c8d040ab..3912710a15 100644
--- a/test/js/samples/event-handlers-custom/expected-bundle.js
+++ b/test/js/samples/event-handlers-custom/expected-bundle.js
@@ -109,25 +109,19 @@ function on(eventName, handler) {
 
 function set(newState) {
 	this._set(assign({}, newState));
-	this._root._flush();
+	callAll(this._root._oncreate);
 }
 
 function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
-function _flush() {
-	callAll(this._oncreate);
-	callAll(this._bindings);
-}
-
 var proto = {
 	get: get,
 	fire: fire,
 	observe: observe,
 	on: on,
-	set: set,
-	_flush: _flush
+	set: set
 };
 
 var template = (function () {
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 a445b1dbf4..f00e3816a9 100644
--- a/test/js/samples/if-block-no-update/expected-bundle.js
+++ b/test/js/samples/if-block-no-update/expected-bundle.js
@@ -115,25 +115,19 @@ function on(eventName, handler) {
 
 function set(newState) {
 	this._set(assign({}, newState));
-	this._root._flush();
+	callAll(this._root._oncreate);
 }
 
 function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
-function _flush() {
-	callAll(this._oncreate);
-	callAll(this._bindings);
-}
-
 var proto = {
 	get: get,
 	fire: fire,
 	observe: observe,
 	on: on,
-	set: set,
-	_flush: _flush
+	set: set
 };
 
 function create_main_fragment ( state, component ) {
diff --git a/test/js/samples/if-block-simple/expected-bundle.js b/test/js/samples/if-block-simple/expected-bundle.js
index 199809ac18..2e2e7e7c09 100644
--- a/test/js/samples/if-block-simple/expected-bundle.js
+++ b/test/js/samples/if-block-simple/expected-bundle.js
@@ -115,25 +115,19 @@ function on(eventName, handler) {
 
 function set(newState) {
 	this._set(assign({}, newState));
-	this._root._flush();
+	callAll(this._root._oncreate);
 }
 
 function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
-function _flush() {
-	callAll(this._oncreate);
-	callAll(this._bindings);
-}
-
 var proto = {
 	get: get,
 	fire: fire,
 	observe: observe,
 	on: on,
-	set: set,
-	_flush: _flush
+	set: set
 };
 
 function create_main_fragment ( state, component ) {
diff --git a/test/js/samples/non-imported-component/expected-bundle.js b/test/js/samples/non-imported-component/expected-bundle.js
index 809f4e1e77..878bdf223e 100644
--- a/test/js/samples/non-imported-component/expected-bundle.js
+++ b/test/js/samples/non-imported-component/expected-bundle.js
@@ -103,25 +103,19 @@ function on(eventName, handler) {
 
 function set(newState) {
 	this._set(assign({}, newState));
-	this._root._flush();
+	callAll(this._root._oncreate);
 }
 
 function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
-function _flush() {
-	callAll(this._oncreate);
-	callAll(this._bindings);
-}
-
 var proto = {
 	get: get,
 	fire: fire,
 	observe: observe,
 	on: on,
-	set: set,
-	_flush: _flush
+	set: set
 };
 
 var template = (function () {
@@ -193,7 +187,7 @@ function SvelteComponent ( options ) {
 		this._fragment.mount( options.target, null );
 	}
 
-	this._flush();
+	callAll(this._oncreate);
 }
 
 assign( SvelteComponent.prototype, proto );
@@ -203,7 +197,7 @@ SvelteComponent.prototype._set = function _set ( newState ) {
 	this._state = assign( {}, oldState, newState );
 	dispatchObservers( this, this._observers.pre, newState, oldState );
 	dispatchObservers( this, this._observers.post, newState, oldState );
-	this._flush();
+	callAll(this._oncreate);
 };
 
 SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
diff --git a/test/js/samples/non-imported-component/expected.js b/test/js/samples/non-imported-component/expected.js
index e2aa2d4457..c154930593 100644
--- a/test/js/samples/non-imported-component/expected.js
+++ b/test/js/samples/non-imported-component/expected.js
@@ -1,6 +1,6 @@
 import Imported from 'Imported.html';
 
-import { assign, createText, detachNode, dispatchObservers, insertNode, proto } from "svelte/shared.js";
+import { assign, callAll, createText, detachNode, dispatchObservers, insertNode, proto } from "svelte/shared.js";
 
 var template = (function () {
 	return {
@@ -71,7 +71,7 @@ function SvelteComponent ( options ) {
 		this._fragment.mount( options.target, null );
 	}
 
-	this._flush();
+	callAll(this._oncreate);
 }
 
 assign( SvelteComponent.prototype, proto );
@@ -81,7 +81,7 @@ SvelteComponent.prototype._set = function _set ( newState ) {
 	this._state = assign( {}, oldState, newState );
 	dispatchObservers( this, this._observers.pre, newState, oldState );
 	dispatchObservers( this, this._observers.post, newState, oldState );
-	this._flush();
+	callAll(this._oncreate);
 };
 
 SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
diff --git a/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js
index ec4b795edd..e74522a945 100644
--- a/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js
+++ b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js
@@ -91,25 +91,19 @@ function on(eventName, handler) {
 
 function set(newState) {
 	this._set(assign({}, newState));
-	this._root._flush();
+	callAll(this._root._oncreate);
 }
 
 function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
-function _flush() {
-	callAll(this._oncreate);
-	callAll(this._bindings);
-}
-
 var proto = {
 	get: get,
 	fire: fire,
 	observe: observe,
 	on: on,
-	set: set,
-	_flush: _flush
+	set: set
 };
 
 var template = (function () {
@@ -156,8 +150,6 @@ function SvelteComponent ( options ) {
 		this._fragment.mount( options.target, null );
 	}
 
-	this._flush();
-
 	if ( options._root ) {
 		options._root._oncreate.push( template.oncreate.bind( this ) );
 	} else {
diff --git a/test/js/samples/onrender-onteardown-rewritten/expected.js b/test/js/samples/onrender-onteardown-rewritten/expected.js
index cce718f922..96aa37d766 100644
--- a/test/js/samples/onrender-onteardown-rewritten/expected.js
+++ b/test/js/samples/onrender-onteardown-rewritten/expected.js
@@ -44,8 +44,6 @@ function SvelteComponent ( options ) {
 		this._fragment.mount( options.target, null );
 	}
 
-	this._flush();
-
 	if ( options._root ) {
 		options._root._oncreate.push( template.oncreate.bind( this ) );
 	} else {
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 13f89030e4..62a6ac86e0 100644
--- a/test/js/samples/use-elements-as-anchors/expected-bundle.js
+++ b/test/js/samples/use-elements-as-anchors/expected-bundle.js
@@ -115,25 +115,19 @@ function on(eventName, handler) {
 
 function set(newState) {
 	this._set(assign({}, newState));
-	this._root._flush();
+	callAll(this._root._oncreate);
 }
 
 function callAll(fns) {
 	while (fns && fns.length) fns.pop()();
 }
 
-function _flush() {
-	callAll(this._oncreate);
-	callAll(this._bindings);
-}
-
 var proto = {
 	get: get,
 	fire: fire,
 	observe: observe,
 	on: on,
-	set: set,
-	_flush: _flush
+	set: set
 };
 
 function create_main_fragment ( state, component ) {