data-svelte -> data-svelte-h

pull/7426/head
Simon Holthausen 3 years ago
parent 3a8b6d0abe
commit f891995017

@ -602,7 +602,7 @@ export default class ElementWrapper extends Wrapper {
} }
if (to_optimise_hydration) { if (to_optimise_hydration) {
attributes.push(p`["data-svelte"]: true`); attributes.push(p`["data-svelte-h"]: true`);
} }
if (this.node.namespace === namespaces.svg) { if (this.node.namespace === namespaces.svg) {

@ -161,10 +161,10 @@ export default function (node: Element, renderer: Renderer, options: RenderOptio
if (options.hydratable) { if (options.hydratable) {
if (node.children.length === 1 && node.children[0].type === 'RawMustacheTag') { if (node.children.length === 1 && node.children[0].type === 'RawMustacheTag') {
renderer.add_string(` data-svelte="${hash(JSON.stringify(node.children[0].expression.node))}"`); renderer.add_string(` data-svelte-h="${hash(JSON.stringify(node.children[0].expression.node))}"`);
options = { ...options, optimised_html_hydration: true }; options = { ...options, optimised_html_hydration: true };
} else if (node.can_optimise_to_html_string && !options.has_added_svelte_hash) { } else if (node.can_optimise_to_html_string && !options.has_added_svelte_hash) {
renderer.add_string(` data-svelte="${node.hash()}"`); renderer.add_string(` data-svelte-h="${node.hash()}"`);
options = { ...options, has_added_svelte_hash: true }; options = { ...options, has_added_svelte_hash: true };
} }
} }

@ -353,7 +353,7 @@ export function xlink_attr(node, attribute, value) {
} }
export function get_svelte_dataset(node: HTMLElement) { export function get_svelte_dataset(node: HTMLElement) {
return node.dataset.svelte; return node.dataset.svelteH;
} }
export function get_binding_group_value(group, __value, checked) { export function get_binding_group_value(group, __value, checked) {

@ -145,7 +145,7 @@ export function normalizeHtml(window, html, { removeDataSvelte = false, preserve
const node = window.document.createElement('div'); const node = window.document.createElement('div');
node.innerHTML = html node.innerHTML = html
.replace(/(<!--.*?-->)/g, preserveComments ? '$1' : '') .replace(/(<!--.*?-->)/g, preserveComments ? '$1' : '')
.replace(/(data-svelte="[^"]+")/g, removeDataSvelte ? '' : '$1') .replace(/(data-svelte-h="[^"]+")/g, removeDataSvelte ? '' : '$1')
.replace(/>[\s\r\n]+</g, '><') .replace(/>[\s\r\n]+</g, '><')
.trim(); .trim();
cleanChildren(node); cleanChildren(node);
@ -174,10 +174,10 @@ export function setupHtmlEqual(options: { removeDataSvelte?: boolean } = {}) {
assert.htmlEqualWithOptions = (actual: string, expected: string, { preserveComments, withoutNormalizeHtml }: { preserveComments?: boolean, withoutNormalizeHtml?: boolean }, message?: string) => { assert.htmlEqualWithOptions = (actual: string, expected: string, { preserveComments, withoutNormalizeHtml }: { preserveComments?: boolean, withoutNormalizeHtml?: boolean }, message?: string) => {
assert.deepEqual( assert.deepEqual(
withoutNormalizeHtml withoutNormalizeHtml
? normalizeNewline(actual).replace(/(\sdata-svelte="[^"]+")/g, options.removeDataSvelte ? '' : '$1') ? normalizeNewline(actual).replace(/(\sdata-svelte-h="[^"]+")/g, options.removeDataSvelte ? '' : '$1')
: normalizeHtml(window, actual, { ...options, preserveComments }), : normalizeHtml(window, actual, { ...options, preserveComments }),
withoutNormalizeHtml withoutNormalizeHtml
? normalizeNewline(expected).replace(/(\sdata-svelte="[^"]+")/g, options.removeDataSvelte ? '' : '$1') ? normalizeNewline(expected).replace(/(\sdata-svelte-h="[^"]+")/g, options.removeDataSvelte ? '' : '$1')
: normalizeHtml(window, expected, { ...options, preserveComments }), : normalizeHtml(window, expected, { ...options, preserveComments }),
message message
); );

@ -1 +1 @@
<h1 data-svelte="svelte-1vv3a6r">Hello world!</h1> <h1 data-svelte-h="svelte-1vv3a6r">Hello world!</h1>

@ -1 +1 @@
<h1 data-svelte="svelte-1vv3a6r">Hello world!</h1> <h1 data-svelte-h="svelte-1vv3a6r">Hello world!</h1>

@ -1,8 +1,8 @@
<div data-svelte="xxx">hello</div> <div data-svelte-h="xxx">hello</div>
<div data-svelte="xxx"><div>bye</div></div> <div data-svelte-h="xxx"><div>bye</div></div>
<div data-svelte="xxx"> <div data-svelte-h="xxx">
<div>aaa</div> <div>aaa</div>
<div>bbb</div> <div>bbb</div>
</div> </div>

@ -1,8 +1,8 @@
<div data-svelte="xxx">hello</div> <div data-svelte-h="xxx">hello</div>
<div data-svelte="xxx"><div data-svelte="yyy">bye</div></div> <div data-svelte-h="xxx"><div data-svelte-h="yyy">bye</div></div>
<div data-svelte="xxx"> <div data-svelte-h="xxx">
<div data-svelte="yyy">aaa</div> <div data-svelte-h="yyy">aaa</div>
<div data-svelte="zzz">bbb</div> <div data-svelte-h="zzz">bbb</div>
</div> </div>

@ -1,3 +1,3 @@
<div> <div>
<p data-svelte="svelte-1x3hbnh">nested</p> <p data-svelte-h="svelte-1x3hbnh">nested</p>
</div> </div>

@ -1,3 +1,3 @@
<div> <div>
<p data-svelte="svelte-1x3hbnh">nested</p> <p data-svelte-h="svelte-1x3hbnh">nested</p>
</div> </div>

@ -1 +1 @@
<p data-svelte="svelte-1x3hbnh">nested</p> <p data-svelte-h="svelte-1x3hbnh">nested</p>

@ -1 +1 @@
<p data-svelte="svelte-1x3hbnh">nested</p> <p data-svelte-h="svelte-1x3hbnh">nested</p>

@ -1,3 +1,3 @@
<div data-svelte="svelte-1aqf5aj"> <div data-svelte-h="svelte-1aqf5aj">
<p>nested</p> <p>nested</p>
</div> </div>

@ -1,3 +1,3 @@
<div data-svelte="svelte-1aqf5aj"> <div data-svelte-h="svelte-1aqf5aj">
<p>nested</p> <p>nested</p>
</div> </div>

@ -1 +1 @@
<div data-svelte="svelte-156ixv6">Just a dummy page.</div> <div data-svelte-h="svelte-156ixv6">Just a dummy page.</div>
Loading…
Cancel
Save