fix: relax parent validation (#14442)

This reverts #13255 / #13158, and helps with the validation error part of #14120

If you would have a component like this...
```svelte
<td>hi there</td>
```
...and then render it on the server via our `render` function like this:
```js
const result = render(Main);
```
...then right now you get an error saying that `td` is not valid at this position. But that doesn't seem right, because we should give people the benefit of the doubt: It may very well be that someone renders such a component and then correctly puts it into a `tr` tag themselves on the server (another example is rendering a full html document like in #14120).

All the other validation where there's a known parent (X not valid inside Y) is untouched by this.

Doing this as cleanup prior to tackling #13331
pull/14444/head
Simon H 2 months ago committed by GitHub
parent 4f0dde5207
commit 9e9fb2463c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -0,0 +1,5 @@
---
'svelte': patch
---
fix: relax html parent validation

@ -167,13 +167,12 @@ export function is_tag_valid_with_ancestor(tag, ancestors) {
* Returns false if the tag is not allowed inside the parent tag such that it will result * Returns false if the tag is not allowed inside the parent tag such that it will result
* in the browser repairing the HTML, which will likely result in an error during hydration. * in the browser repairing the HTML, which will likely result in an error during hydration.
* @param {string} tag * @param {string} tag
* @param {string | null} parent_tag * @param {string} parent_tag
* @returns {boolean} * @returns {boolean}
*/ */
export function is_tag_valid_with_parent(tag, parent_tag) { export function is_tag_valid_with_parent(tag, parent_tag) {
if (tag.includes('-') || parent_tag?.includes('-')) return true; // custom elements can be anything if (tag.includes('-') || parent_tag?.includes('-')) return true; // custom elements can be anything
if (parent_tag !== null) {
const disallowed = disallowed_children[parent_tag]; const disallowed = disallowed_children[parent_tag];
if (disallowed) { if (disallowed) {
@ -187,7 +186,6 @@ export function is_tag_valid_with_parent(tag, parent_tag) {
return disallowed.only.includes(tag); return disallowed.only.includes(tag);
} }
} }
}
switch (tag) { switch (tag) {
case 'body': case 'body':

@ -34,14 +34,12 @@ function stringify(element) {
/** /**
* @param {Payload} payload * @param {Payload} payload
* @param {Element | null} parent * @param {Element} parent
* @param {Element} child * @param {Element} child
*/ */
function print_error(payload, parent, child) { function print_error(payload, parent, child) {
var message = var message =
(parent === null `node_invalid_placement_ssr: ${stringify(parent)} cannot contain ${stringify(child)}\n\n` +
? `node_invalid_placement_ssr: ${stringify(child)} needs a valid parent element\n\n`
: `node_invalid_placement_ssr: ${stringify(parent)} cannot contain ${stringify(child)}\n\n`) +
'This can cause content to shift around as the browser repairs the HTML, and will likely result in a `hydration_mismatch` warning.'; 'This can cause content to shift around as the browser repairs the HTML, and will likely result in a `hydration_mismatch` warning.';
if ((seen ??= new Set()).has(message)) return; if ((seen ??= new Set()).has(message)) return;
@ -85,8 +83,6 @@ export function push_element(payload, tag, line, column) {
} }
ancestor = ancestor.parent; ancestor = ancestor.parent;
} }
} else if (!is_tag_valid_with_parent(tag, null)) {
print_error(payload, null, child);
} }
parent = child; parent = child;

@ -5,7 +5,7 @@ export default test({
dev: true dev: true
}, },
html: `<p></p><h1>foo</h1><p></p><form></form> hello`, html: `<p></p><h1>foo</h1><p></p><form></form>`,
recover: true, recover: true,
@ -13,8 +13,7 @@ export default test({
errors: [ errors: [
'node_invalid_placement_ssr: `<p>` (main.svelte:6:0) cannot contain `<h1>` (h1.svelte:1:0)\n\nThis can cause content to shift around as the browser repairs the HTML, and will likely result in a `hydration_mismatch` warning.', 'node_invalid_placement_ssr: `<p>` (main.svelte:6:0) cannot contain `<h1>` (h1.svelte:1:0)\n\nThis can cause content to shift around as the browser repairs the HTML, and will likely result in a `hydration_mismatch` warning.',
'node_invalid_placement_ssr: `<form>` (main.svelte:9:0) cannot contain `<form>` (form.svelte:1:0)\n\nThis can cause content to shift around as the browser repairs the HTML, and will likely result in a `hydration_mismatch` warning.', 'node_invalid_placement_ssr: `<form>` (main.svelte:9:0) cannot contain `<form>` (form.svelte:1:0)\n\nThis can cause content to shift around as the browser repairs the HTML, and will likely result in a `hydration_mismatch` warning.'
'node_invalid_placement_ssr: `<td>` (main.svelte:12:0) needs a valid parent element\n\nThis can cause content to shift around as the browser repairs the HTML, and will likely result in a `hydration_mismatch` warning.'
], ],
warnings: [ warnings: [

@ -9,4 +9,3 @@
<form> <form>
<Form /> <Form />
</form> </form>
<td>hello</td>

Loading…
Cancel
Save