almost all SSR tests passing

pull/3539/head
Richard Harris 6 years ago
parent 7a000c2905
commit 9ba199a716

@ -115,7 +115,7 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
args.push(x`{ ${attribute.name}: ${attribute.chunks[0].node} }`); args.push(x`{ ${attribute.name}: ${attribute.chunks[0].node} }`);
} else if (attribute.name === 'class' && class_expression) { } else if (attribute.name === 'class' && class_expression) {
// Add class expression // Add class expression
args.push(x`{ ${attribute.name}: [${get_class_attribute_value(attribute)}, ${class_expression}}].join(' ').trim() }`); args.push(x`{ ${attribute.name}: [${get_class_attribute_value(attribute)}, ${class_expression}].join(' ').trim() }`);
} else { } else {
args.push(x`{ ${attribute.name}: ${attribute.name === 'class' ? get_class_attribute_value(attribute) : get_attribute_value(attribute, true)} }`); args.push(x`{ ${attribute.name}: ${attribute.name === 'class' ? get_class_attribute_value(attribute) : get_attribute_value(attribute, true)} }`);
} }
@ -193,9 +193,17 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
} else { } else {
renderer.add_expression(node_contents); renderer.add_expression(node_contents);
} }
if (!is_void(node.name)) {
renderer.add_string(`</${node.name}>`);
}
} else if (slot && nearest_inline_component) { } else if (slot && nearest_inline_component) {
renderer.render(node.children, options); renderer.render(node.children, options);
if (!is_void(node.name)) {
renderer.add_string(`</${node.name}>`);
}
const lets = node.lets; const lets = node.lets;
const seen = new Set(lets.map(l => l.name.name)); const seen = new Set(lets.map(l => l.name.name));
@ -209,9 +217,9 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
}); });
} else { } else {
renderer.render(node.children, options); renderer.render(node.children, options);
}
if (!is_void(node.name)) { if (!is_void(node.name)) {
renderer.add_string(`</${node.name}>`); renderer.add_string(`</${node.name}>`);
}
} }
} }

Loading…
Cancel
Save