merge master -> gh-1257

sveltejs · Apr 1, 2018 · 304a0e8 · 304a0e8
2 parents c0287f2 + 0c9d703
commit 304a0e8
Show file tree

Hide file tree

Showing 44 changed files with 805 additions and 366 deletions.
diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts
@@ -877,6 +877,10 @@ export default class Generator {
 				if (node.type === 'Component' && node.name === ':Component') {
 					node.metadata = contextualise(node.expression, contextDependencies, indexes, false);
 				}
+
+				if (node.type === 'Spread') {
+					node.metadata = contextualise(node.expression, contextDependencies, indexes, false);
+				}
 			},
 
 			leave(node: Node, parent: Node) {

diff --git a/src/generators/nodes/Attribute.ts b/src/generators/nodes/Attribute.ts
@@ -223,10 +223,9 @@ export default class Attribute {
 				);
 			}
 		} else {
-		const value =
-			this.value === true
+			const value = this.value === true
 				? 'true'
-				: this.value.length === 0 ? `''` : stringify(this.value[0].data);
+				: this.value.length === 0 ? `""` : stringify(this.value[0].data);
 
 			const statement = (
 				isLegacyInputType