From fd43c8562d246a4a050781abfff31979d8fb701e Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Tue, 9 Jul 2024 11:12:04 -0400 Subject: [PATCH] fix --- .../3-transform/server/transform-server.js | 24 +++++++++---------- .../samples/raw-anchor-first-child/_config.js | 2 +- .../_expected/server/index.svelte.js | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js index c5a6bda8dc..643f6e1377 100644 --- a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js +++ b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js @@ -40,9 +40,9 @@ import { } from '../../../../internal/server/hydration.js'; import { filename, locator } from '../../../state.js'; -export const block_open = b.literal(BLOCK_OPEN); -export const block_close = b.literal(BLOCK_CLOSE); -export const block_anchor = b.literal(BLOCK_ANCHOR); +const block_open = b.literal(BLOCK_OPEN); +const block_close = b.literal(BLOCK_CLOSE); +const empty_comment = b.literal(BLOCK_ANCHOR); /** * @param {import('estree').Node} node @@ -1014,13 +1014,13 @@ function serialize_inline_component(node, expression, context) { ); } else { if (dynamic) { - context.state.template.push(block_open); + context.state.template.push(empty_comment); } context.state.template.push(statement); if (!context.state.skip_hydration_boundaries) { - context.state.template.push(block_close); + context.state.template.push(empty_comment); } } } @@ -1154,7 +1154,7 @@ const template_visitors = { if (is_text_first) { // insert `` to prevent this from being glued to the previous fragment - state.template.push(block_anchor); + state.template.push(empty_comment); } process_children(trimmed, { ...context, state }); @@ -1163,7 +1163,7 @@ const template_visitors = { }, HtmlTag(node, context) { const expression = /** @type {import('estree').Expression} */ (context.visit(node.expression)); - context.state.template.push(block_open, expression, block_anchor); + context.state.template.push(empty_comment, expression, empty_comment); }, ConstTag(node, { state, visit }) { const declaration = node.declaration.declarations[0]; @@ -1214,7 +1214,7 @@ const template_visitors = { ); if (!context.state.skip_hydration_boundaries) { - context.state.template.push(block_close); + context.state.template.push(empty_comment); } }, ClassDirective() { @@ -1439,7 +1439,7 @@ const template_visitors = { }, AwaitBlock(node, context) { context.state.template.push( - block_open, + empty_comment, b.stmt( b.call( '$.await', @@ -1463,12 +1463,12 @@ const template_visitors = { ) ) ), - block_close + empty_comment ); }, KeyBlock(node, context) { const block = /** @type {import('estree').BlockStatement} */ (context.visit(node.fragment)); - context.state.template.push(block_open, block, block_close); + context.state.template.push(empty_comment, block, empty_comment); }, SnippetBlock(node, context) { const fn = b.function_declaration( @@ -1602,7 +1602,7 @@ const template_visitors = { const slot = b.call('$.slot', b.id('$$payload'), expression, props_expression, fallback); - context.state.template.push(block_open, b.stmt(slot), block_close); + context.state.template.push(empty_comment, b.stmt(slot), empty_comment); }, SvelteHead(node, context) { const block = /** @type {import('estree').BlockStatement} */ (context.visit(node.fragment)); diff --git a/packages/svelte/tests/runtime-legacy/samples/raw-anchor-first-child/_config.js b/packages/svelte/tests/runtime-legacy/samples/raw-anchor-first-child/_config.js index f575b3274e..0f47f3c114 100644 --- a/packages/svelte/tests/runtime-legacy/samples/raw-anchor-first-child/_config.js +++ b/packages/svelte/tests/runtime-legacy/samples/raw-anchor-first-child/_config.js @@ -11,7 +11,7 @@ export default test({ if (variant === 'dom') { assert.ok(!span.previousSibling); } else { - assert.ok(span.previousSibling?.textContent === '['); // ssr commment node + assert.ok(span.previousSibling?.textContent === ''); // ssr commment node } component.raw = 'bar'; diff --git a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js index 81e076b30f..b645d05570 100644 --- a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js +++ b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js @@ -23,7 +23,7 @@ export default function Bind_component_snippet($$payload) { } }); - $$payload.out += ` value: ${$.escape(value)}`; + $$payload.out += ` value: ${$.escape(value)}`; }; do {