From d0f8a37424820f3dbe507a6470d9c42a01a5e059 Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Fri, 6 Jul 2018 09:25:38 -0400
Subject: [PATCH 1/3] :us:

---
 src/cli/error.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cli/error.ts b/src/cli/error.ts
index b7ca813716..cfe6a3e72d 100644
--- a/src/cli/error.ts
+++ b/src/cli/error.ts
@@ -8,9 +8,9 @@ export default function error(err) {
 	stderr(`${clorox.red(err.message || err)}`);
 
 	if (err.frame) {
-		stderr(err.frame); // eslint-disable-line no-console
+		stderr(err.frame);
 	} else if (err.stack) {
-		stderr(`${clorox.grey(err.stack)}`);
+		stderr(`${clorox.gray(err.stack)}`);
 	}
 
 	process.exit(1);

From 8e95c29a771f5d1a0c2ab7981eb185a6c874bc09 Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Sun, 8 Jul 2018 01:47:38 -0400
Subject: [PATCH 2/3] fix determing whether an attribute should prevent
 innerHTML optimization

Fixes #1581
---
 src/compile/nodes/Element.ts                              | 8 +++++++-
 .../samples/attribute-dynamic-no-dependencies/_config.js  | 5 +++++
 .../samples/attribute-dynamic-no-dependencies/main.html   | 1 +
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 test/runtime/samples/attribute-dynamic-no-dependencies/_config.js
 create mode 100644 test/runtime/samples/attribute-dynamic-no-dependencies/main.html

diff --git a/src/compile/nodes/Element.ts b/src/compile/nodes/Element.ts
index a2a6f8d5b4..403b9cce8b 100644
--- a/src/compile/nodes/Element.ts
+++ b/src/compile/nodes/Element.ts
@@ -152,8 +152,14 @@ export default class Element extends Node {
 		);
 
 		this.attributes.forEach(attr => {
-			if (attr.dependencies.size) {
+			if (
+				attr.chunks &&
+				attr.chunks.length &&
+				(attr.chunks.length > 1 || attr.chunks[0].type !== 'Text')
+			) {
 				this.parent.cannotUseInnerHTML();
+			}
+			if (attr.dependencies.size) {
 				block.addDependencies(attr.dependencies);
 
 				// special case — <option value={foo}> — see below
diff --git a/test/runtime/samples/attribute-dynamic-no-dependencies/_config.js b/test/runtime/samples/attribute-dynamic-no-dependencies/_config.js
new file mode 100644
index 0000000000..acf3c64bdd
--- /dev/null
+++ b/test/runtime/samples/attribute-dynamic-no-dependencies/_config.js
@@ -0,0 +1,5 @@
+export default {
+	html: `
+		<div><div title='foo'>bar</div></div>
+	`,
+};
diff --git a/test/runtime/samples/attribute-dynamic-no-dependencies/main.html b/test/runtime/samples/attribute-dynamic-no-dependencies/main.html
new file mode 100644
index 0000000000..5d90c0ea58
--- /dev/null
+++ b/test/runtime/samples/attribute-dynamic-no-dependencies/main.html
@@ -0,0 +1 @@
+<div><div title={'foo'}>bar</div></div>

From 3f334171ce32382b99db2f6f4ceb05fe3e38d65f Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Sun, 8 Jul 2018 10:55:56 -0400
Subject: [PATCH 3/3] unique name for select_block_type in
 IfBlock#buildCompoundWithOutros

Fixes #1580
---
 src/compile/nodes/IfBlock.ts                  |  2 +-
 .../Component.html                            |  1 +
 .../_config.js                                |  7 +++++++
 .../main.html                                 | 20 +++++++++++++++++++
 4 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 test/runtime/samples/if-block-outro-unique-select-block-type/Component.html
 create mode 100644 test/runtime/samples/if-block-outro-unique-select-block-type/_config.js
 create mode 100644 test/runtime/samples/if-block-outro-unique-select-block-type/main.html

diff --git a/src/compile/nodes/IfBlock.ts b/src/compile/nodes/IfBlock.ts
index 730128fc71..23ac29166e 100644
--- a/src/compile/nodes/IfBlock.ts
+++ b/src/compile/nodes/IfBlock.ts
@@ -250,7 +250,7 @@ export default class IfBlock extends Node {
 		dynamic,
 		{ name, anchor, hasElse }
 	) {
-		const select_block_type = block.getUniqueName(`select_block_type`);
+		const select_block_type = this.compiler.getUniqueName(`select_block_type`);
 		const current_block_type_index = block.getUniqueName(`current_block_type_index`);
 		const previous_block_index = block.getUniqueName(`previous_block_index`);
 		const if_block_creators = block.getUniqueName(`if_block_creators`);
diff --git a/test/runtime/samples/if-block-outro-unique-select-block-type/Component.html b/test/runtime/samples/if-block-outro-unique-select-block-type/Component.html
new file mode 100644
index 0000000000..7c89b545c5
--- /dev/null
+++ b/test/runtime/samples/if-block-outro-unique-select-block-type/Component.html
@@ -0,0 +1 @@
+<div></div>
diff --git a/test/runtime/samples/if-block-outro-unique-select-block-type/_config.js b/test/runtime/samples/if-block-outro-unique-select-block-type/_config.js
new file mode 100644
index 0000000000..f3cbb42e25
--- /dev/null
+++ b/test/runtime/samples/if-block-outro-unique-select-block-type/_config.js
@@ -0,0 +1,7 @@
+export default {
+	nestedTransitions: true,
+	html: `
+		<div></div>
+		<div></div>
+	`,
+};
diff --git a/test/runtime/samples/if-block-outro-unique-select-block-type/main.html b/test/runtime/samples/if-block-outro-unique-select-block-type/main.html
new file mode 100644
index 0000000000..a27aba9d77
--- /dev/null
+++ b/test/runtime/samples/if-block-outro-unique-select-block-type/main.html
@@ -0,0 +1,20 @@
+{#if foo}
+	<Component/>
+{:else}
+	<Component/>
+{/if}
+
+{#if foo}
+	<div></div>
+{:else}
+	<div></div>
+{/if}
+
+<script>
+	export default {
+		components: {
+			Component: './Component.html',
+		},
+		data: () => ({ foo: true }),
+	}
+</script>