From 696b6922e85672932aeb199a9b644d51bab29ed1 Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Fri, 29 Mar 2024 14:03:52 +0000 Subject: [PATCH] fix: revert shorthand ssr comments (#10980) * fix: revert shorthand ssr comments * tests * add changeset --- .changeset/serious-poems-brake.md | 5 +++++ packages/svelte/src/internal/server/index.js | 18 +++++++++--------- .../samples/comment-before-script/output.json | 9 +++++++-- .../head-meta-hydrate-duplicate/_expected.html | 2 +- 4 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 .changeset/serious-poems-brake.md diff --git a/.changeset/serious-poems-brake.md b/.changeset/serious-poems-brake.md new file mode 100644 index 0000000000..824bc825b8 --- /dev/null +++ b/.changeset/serious-poems-brake.md @@ -0,0 +1,5 @@ +--- +"svelte": patch +--- + +fix: revert SSR shorthand comments diff --git a/packages/svelte/src/internal/server/index.js b/packages/svelte/src/internal/server/index.js index cd216783a9..f163bbfb6d 100644 --- a/packages/svelte/src/internal/server/index.js +++ b/packages/svelte/src/internal/server/index.js @@ -161,11 +161,11 @@ export function element(payload, tag, attributes_fn, children_fn) { if (!VoidElements.has(tag)) { if (tag !== 'textarea') { - payload.out += ''; + payload.out += ''; } children_fn(); if (tag !== 'textarea') { - payload.out += ''; + payload.out += ''; } payload.out += ``; } @@ -187,7 +187,7 @@ export function render(component, options) { const prev_on_destroy = on_destroy; on_destroy = []; - payload.out += ''; + payload.out += ''; if (options.context) { push(); @@ -200,14 +200,14 @@ export function render(component, options) { pop(); } - payload.out += ''; + payload.out += ''; for (const cleanup of on_destroy) cleanup(); on_destroy = prev_on_destroy; return { head: payload.head.out || payload.head.title - ? payload.head.title + '' + payload.head.out + '' + ? payload.head.title + '' + payload.head.out + '' : '', html: payload.out }; @@ -271,15 +271,15 @@ export function attr(name, value, boolean) { export function css_props(payload, is_html, props, component) { const styles = style_object_to_string(props); if (is_html) { - payload.out += `
`; + payload.out += `
`; } else { - payload.out += ``; + payload.out += ``; } component(); if (is_html) { - payload.out += `
`; + payload.out += `
`; } else { - payload.out += ``; + payload.out += ``; } } diff --git a/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json b/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json index 4891e70c92..794e80f66f 100644 --- a/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json +++ b/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json @@ -44,7 +44,6 @@ "column": 0 } }, - "leadingComments": [{ "type": "Line", "value": "should not error out" }], "body": [ { "type": "VariableDeclaration", @@ -127,7 +126,13 @@ "kind": "let" } ], - "sourceType": "module" + "sourceType": "module", + "leadingComments": [ + { + "type": "Line", + "value": "should not error out" + } + ] } } } diff --git a/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html b/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html index 57d9395215..8fb1be347c 100644 --- a/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html +++ b/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html @@ -1 +1 @@ -
Just a dummy page.
+
Just a dummy page.