msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

- Changed comment style to HEAD_${head_id}_START and HEAD_${head_id}_END

Browse Source 
- Improved claim logic
- Changed tests accordingly
pull/7745/head
Maximiliano Ruani 4 years ago
parent 0147e251d7
commit 0b4dc52977
8 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File

2
src/compiler/compile/render_ssr/handlers/Head.ts
Unescape View File

@ -12,5 +12,5 @@ export default function(node: Head, renderer: Renderer, options: RenderOptions)
renderer.render(node.children, head_options);
const result = renderer.pop();
renderer.add_expression(x`$$result.head += '<!-- HEAD_START data-svelte="${node.id}" -->' + ${result} + '<!-- HEAD_END data-svelte="${node.id}" -->', ""`);
renderer.add_expression(x`$$result.head += '<!-- HEAD_${node.id}_START -->' + ${result} + '<!-- HEAD_${node.id}_END -->', ""`);
}

7
src/runtime/internal/dom.ts
Unescape View File

@ -645,12 +645,15 @@ export function head_selector(nodeId: string, head: HTMLElement) {
let started = 0;
for (const node of head.childNodes) {
if (node.nodeType === 8 /* comment node */ && node.textContent.trim() === `HEAD_END data-svelte="${nodeId}"`) {
if (node.nodeType === 8 /* comment node */) {
const comment = node.textContent.trim();
if (comment === `HEAD_${nodeId}_END`) {
started -= 1;
result.push(node);
} else if (node.nodeType === 8 /* comment node */ && node.textContent.trim() === `HEAD_START data-svelte="${nodeId}"`) {
} else if (comment === `HEAD_${nodeId}_START`) {
started += 1;
result.push(node);
}
} else if (started > 0) {
result.push(node);
}

8
test/hydration/samples/head-html-and-component/_after_head.html
Unescape View File

@ -1,12 +1,12 @@
<!-- HEAD_START data-svelte="svelte-17ibcve" -->
<!-- HEAD_svelte-17ibcve_START -->
<!-- HTML_TAG_START --><meta name="main_html" content="main_html"><!-- HTML_TAG_END -->
<meta name="main" content="main">
<!-- HTML_TAG_START --><meta name="head_nested_html" content="head_nested_html"><!-- HTML_TAG_END -->
<meta name="head_nested" content="head_nested">
<!-- HEAD_END data-svelte="svelte-17ibcve" -->
<!-- HEAD_svelte-17ibcve_END -->
<!-- HEAD_START data-svelte="svelte-1gqzvnn" -->
<!-- HEAD_svelte-1gqzvnn_START -->
<!-- HTML_TAG_START --><meta name="nested_html" content="nested_html"><!-- HTML_TAG_END -->
<meta name="nested" content="nested">
<!-- HEAD_END data-svelte="svelte-1gqzvnn" -->
<!-- HEAD_svelte-1gqzvnn_END -->

8
test/hydration/samples/head-html-and-component/_before_head.html
Unescape View File

@ -1,11 +1,11 @@
<!-- HEAD_START data-svelte="svelte-17ibcve" -->
<!-- HEAD_svelte-17ibcve_START -->
<!-- HTML_TAG_START --><meta name="main_html" content="main_html"><!-- HTML_TAG_END -->
<meta name="main" content="main">
<!-- HTML_TAG_START --><meta name="head_nested_html" content="head_nested_html"><!-- HTML_TAG_END -->
<meta name="head_nested" content="head_nested">
<!-- HEAD_END data-svelte="svelte-17ibcve" -->
<!-- HEAD_svelte-17ibcve_END -->
<!-- HEAD_START data-svelte="svelte-1gqzvnn" -->
<!-- HEAD_svelte-1gqzvnn_START -->
<!-- HTML_TAG_START --><meta name="nested_html" content="nested_html"><!-- HTML_TAG_END -->
<meta name="nested" content="nested">
<!-- HEAD_END data-svelte="svelte-1gqzvnn" -->
<!-- HEAD_svelte-1gqzvnn_END -->

4
test/hydration/samples/head-meta-hydrate-duplicate/_after_head.html
Unescape View File

@ -1,6 +1,6 @@
<title>Some Title</title>
<!-- HEAD_START data-svelte="svelte-1s8aodm" -->
<!-- HEAD_svelte-1s8aodm_START -->
<link rel="canonical" href="/">
<meta name="description" content="some description">
<meta name="keywords" content="some keywords">
<!-- HEAD_END data-svelte="svelte-1s8aodm" -->
<!-- HEAD_svelte-1s8aodm_END -->

4
test/hydration/samples/head-meta-hydrate-duplicate/_before_head.html
Unescape View File

@ -1,6 +1,6 @@
<title>Some Title</title>
<!-- HEAD_START data-svelte="svelte-1s8aodm" -->
<!-- HEAD_svelte-1s8aodm_START -->
<link rel="canonical" href="/">
<meta name="description" content="some description">
<meta name="keywords" content="some keywords">
<!-- HEAD_END data-svelte="svelte-1s8aodm" -->
<!-- HEAD_svelte-1s8aodm_END -->

9
test/server-side-rendering/samples/head-html-and-component/_expected_head.html → test/server-side-rendering/samples/head-html-and-component/_expected-head.html
Unescape View File

@ -1,12 +1,11 @@
<!-- HEAD_START data-svelte="svelte-17ibcve" -->
<!-- HEAD_svelte-17ibcve_START -->
<!-- HTML_TAG_START --><meta name="main_html" content="main_html"><!-- HTML_TAG_END -->
<meta name="main" content="main">
<!-- HTML_TAG_START --><meta name="head_nested_html" content="head_nested_html"><!-- HTML_TAG_END -->
<meta name="head_nested" content="head_nested">
<!-- HEAD_END data-svelte="svelte-17ibcve" -->
<!-- HEAD_svelte-17ibcve_END -->
<!-- HEAD_START data-svelte="svelte-1gqzvnn" -->
<!-- HEAD_svelte-1gqzvnn_START -->
<!-- HTML_TAG_START --><meta name="nested_html" content="nested_html"><!-- HTML_TAG_END -->
<meta name="nested" content="nested">
<!-- HEAD_END data-svelte="svelte-1gqzvnn" -->
<!-- HEAD_svelte-1gqzvnn_END -->

4
test/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected-head.html
Unescape View File

@ -1,6 +1,6 @@
<title>Some Title</title>
<!-- HEAD_START data="svelte-1s8aodm" -->
<!-- HEAD_svelte-1s8aodm_START -->
<link rel="canonical" href="/">
<meta name="description" content="some description">
<meta name="keywords" content="some keywords">
<!-- HEAD_END data="svelte-1s8aodm" -->
<!-- HEAD_svelte-1s8aodm_END -->

Write Preview
Loading…
Cancel
Save