Merge branch 'master' of github.com:sveltejs/svelte

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Svelte changelog
 
+## v2.9.3
+
+* Fix bug when an each block contains transitions but its else branch does not ([#1559](https://github.com/sveltejs/svelte/issues/1559))
+* If an event handler throws an exception, don't block all future calls to that handler ([#1573](https://github.com/sveltejs/svelte/issues/1573))
+
+## 2.9.2
+
+* Fix conflict when using multiple if-else blocks, some of which use outros and some of which do not ([#1580](https://github.com/sveltejs/svelte/issues/1580))
+* Fix some cases where `.innerHTML` was being used to create child elements when it shouldn't ([#1581](https://github.com/sveltejs/svelte/issues/1581))
+
 ## 2.9.1
 
 * Use `template.content` instead of `template` where appropriate ([#1571](https://github.com/sveltejs/svelte/issues/1571))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte",
-  "version": "2.9.1",
+  "version": "2.9.3",
   "description": "The magical disappearing UI framework",
   "main": "compiler/svelte.js",
   "bin": {

src/compile/nodes/EachBlock.ts

@@ -189,6 +189,7 @@ export default class EachBlock extends Node {
 
 		if (this.else) {
 			const each_block_else = compiler.getUniqueName(`${each}_else`);
+			const mountOrIntro = (this.else.block.hasIntroMethod || this.else.block.hasOutroMethod) ? 'i' : 'm';
 
 			block.builders.init.addLine(`var ${each_block_else} = null;`);
 

src/compile/nodes/ElseBlock.ts

@@ -5,6 +5,7 @@ import mapChildren from './shared/mapChildren';
 export default class ElseBlock extends Node {
 	type: 'ElseBlock';
 	children: Node[];
+	block: Block;
 
 	constructor(compiler, parent, scope, info) {
 		super(compiler, parent, scope, info);

src/compile/nodes/IfBlock.ts

@@ -208,14 +208,7 @@ export default class IfBlock extends Node {
 		const updateMountNode = this.getUpdateMountNode(anchor);
 
 		const changeBlock = deindent`
-			${hasElse
+			${if_name}${name}.d(1);
-				? deindent`
-					${name}.d(1);
-				`
-				: deindent`
-					if (${name}) {
-						${name}.d(1);
-					}`}
 			${name} = ${current_block_type_and}${current_block_type}(#component, ctx);
 			${if_name}${name}.c();
 			${if_name}${name}.${mountOrIntro}(${updateMountNode}, ${anchor});

src/parse/state/mustache.ts

@@ -147,11 +147,12 @@ export default function mustache(parser: Parser) {
 			parser.stack.pop();
 			const awaitBlock = parser.current();
 
-			parser.requireWhitespace();
+			if (!parser.eat('}')) {
-			awaitBlock.value = parser.readIdentifier();
+				parser.requireWhitespace();
-
+				awaitBlock.value = parser.readIdentifier();
-			parser.allowWhitespace();
+				parser.allowWhitespace();
-			parser.eat('}', true);
+				parser.eat('}', true);
+			}
 
 			const thenBlock: Node = {
 				start,
@@ -170,11 +171,12 @@ export default function mustache(parser: Parser) {
 			parser.stack.pop();
 			const awaitBlock = parser.current();
 
-			parser.requireWhitespace();
+			if (!parser.eat('}')) {
-			awaitBlock.error = parser.readIdentifier();
+				parser.requireWhitespace();
-
+				awaitBlock.error = parser.readIdentifier();
-			parser.allowWhitespace();
+				parser.allowWhitespace();
-			parser.eat('}', true);
+				parser.eat('}', true);
+			}
 
 			const catchBlock: Node = {
 				start,

src/shared/index.js

@@ -47,9 +47,12 @@ export function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -100,9 +100,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -121,9 +121,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -121,9 +121,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -1,4 +1,4 @@
-/* src/Main.html generated by Svelte v2.7.2 */
+/* src/Main.html generated by Svelte vx.y.z */
 import Widget from './Widget.html';
 
 
@@ -108,9 +108,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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.7.2 */
+/* src/Widget.html generated by Svelte vx.y.z */
 
 function create_main_fragment(component, ctx) {
 	var p;
@@ -100,9 +100,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -108,9 +108,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -100,9 +100,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -108,9 +108,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -100,9 +100,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -121,9 +121,12 @@ var Main = (function(answer) { "use strict";
 			var handler = handlers[i];
 
 			if (!handler.__calling) {
-				handler.__calling = true;
+				try {
-				handler.call(this, data);
+					handler.__calling = true;
-				handler.__calling = false;
+					handler.call(this, data);
+				} finally {
+					handler.__calling = false;
+				}
 			}
 		}
 	}

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

@@ -100,9 +100,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }
@@ -166,4 +169,4 @@ function callAll(fns) {
 	while (fns && fns.length) fns.shift()();
 }
 export default Main;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWFpbi5qcyIsInNvdXJjZXMiOlsiLi4vc3JjL01haW4uaHRtbCJdLCJzb3VyY2VzQ29udGVudCI6WyI8cD5IZWxsbyB3b3JsZCE8L3A+XG5cbjxzY3JpcHQ+XG5cdGV4cG9ydCBkZWZhdWx0IHtcblx0XHRvbnJlbmRlciAoKSB7XG5cdFx0XHRjb25zb2xlLmxvZyggJ2hlcmUnICk7XG5cdFx0fVxuXHR9O1xuPC9zY3JpcHQ+Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OyJ9
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWFpbi5qcyIsInNvdXJjZXMiOlsiLi4vc3JjL01haW4uaHRtbCJdLCJzb3VyY2VzQ29udGVudCI6WyI8cD5IZWxsbyB3b3JsZCE8L3A+XG5cbjxzY3JpcHQ+XG5cdGV4cG9ydCBkZWZhdWx0IHtcblx0XHRvbnJlbmRlciAoKSB7XG5cdFx0XHRjb25zb2xlLmxvZyggJ2hlcmUnICk7XG5cdFx0fVxuXHR9O1xuPC9zY3JpcHQ+Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OyJ9

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

@@ -100,9 +100,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -120,9 +120,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -44,9 +44,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -76,9 +76,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -52,9 +52,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -32,9 +32,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -36,9 +36,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -36,9 +36,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -32,9 +32,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -32,9 +32,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -48,9 +48,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -44,9 +44,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -62,9 +62,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -37,9 +37,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -65,9 +65,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -48,9 +48,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -52,9 +52,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -52,9 +52,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -64,9 +64,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

test/js/samples/each-block-keyed-animated/expected-bundle.js

@@ -367,9 +367,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

test/js/samples/each-block-keyed/expected-bundle.js

@@ -147,9 +147,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -44,9 +44,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -44,9 +44,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -48,9 +48,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -48,9 +48,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -48,9 +48,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -48,9 +48,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -48,9 +48,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -48,9 +48,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

test/js/samples/input-range/expected-bundle.js

@@ -60,9 +60,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -56,9 +56,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -50,9 +50,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -60,9 +60,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -46,9 +46,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -32,9 +32,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -52,9 +52,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -32,9 +32,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -56,9 +56,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

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

@@ -52,9 +52,12 @@ function fire(eventName, data) {
 		var handler = handlers[i];
 
 		if (!handler.__calling) {
-			handler.__calling = true;
+			try {
-			handler.call(this, data);
+				handler.__calling = true;
-			handler.__calling = false;
+				handler.call(this, data);
+			} finally {
+				handler.__calling = false;
+			}
 		}
 	}
 }

test/runtime/samples/await-then-catch-no-values/_config.js

@@ -0,0 +1,41 @@
+let fulfil;
+
+let thePromise = new Promise(f => {
+	fulfil = f;
+});
+
+export default {
+	data: {
+		thePromise
+	},
+
+	html: `waiting`,
+
+	test(assert, component, target) {
+		fulfil(9000);
+
+		return thePromise
+			.then(() => {
+				assert.htmlEqual(target.innerHTML, `resolved`);
+
+				let reject;
+
+				thePromise = new Promise((f, r) => {
+					reject = r;
+				});
+
+				component.set({
+					thePromise
+				});
+
+				assert.htmlEqual(target.innerHTML, `waiting`);
+
+				reject(new Error('something broke'));
+
+				return thePromise.catch(() => {});
+			})
+			.then(() => {
+				assert.htmlEqual(target.innerHTML, `rejected`);
+			});
+	}
+};

test/runtime/samples/await-then-catch-no-values/main.html

@@ -0,0 +1,7 @@
+{#await thePromise}
+	waiting
+{:then}
+	resolved
+{:catch}
+	rejected
+{/await}

test/runtime/samples/component-events-fire-finally/_config.js

@@ -0,0 +1,23 @@
+export default {
+	test(assert, component) {
+		const events = [];
+		component.on('foo', (shouldThrow) => {
+			events.push(shouldThrow);
+			if (shouldThrow) {
+				throw new Error();
+			}
+		});
+		component.fire('foo', false);
+		assert.equal(events.toString(), 'false');
+		let threw = false;
+		try {
+			component.fire('foo', true);
+		} catch (err) {
+			threw = true;
+		}
+		assert.equal(threw, true);
+		assert.equal(events.toString(), 'false,true');
+		component.fire('foo', false);
+		assert.equal(events.toString(), 'false,true,false');
+	},
+};

test/runtime/samples/component-events-fire-finally/main.html

@@ -0,0 +1 @@
+Foo

test/runtime/samples/each-block-else-mount-or-intro/Widget.html

@@ -0,0 +1 @@
+Foo

test/runtime/samples/each-block-else-mount-or-intro/_config.js

@@ -0,0 +1,5 @@
+export default {
+	nestedTransitions: true,
+	data: { items: [] },
+	html: `No items.`,
+};

test/runtime/samples/each-block-else-mount-or-intro/main.html

@@ -0,0 +1,9 @@
+{#each items as item}
+	<Widget {item}/>
+{:else}
+	No items.
+{/each}
+
+<script>
+	export default { components: { Widget: './Widget.html' } };
+</script>