From 68de6b43378477baf1752a7e36960529ad47760b Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Wed, 21 May 2025 15:56:17 -0400 Subject: [PATCH] no longer need to pass `is_functional_template_mode` to `clean_nodes` --- .../compiler/phases/3-transform/client/visitors/Fragment.js | 3 +-- .../phases/3-transform/client/visitors/RegularElement.js | 3 +-- .../compiler/phases/3-transform/server/visitors/Fragment.js | 4 +--- .../phases/3-transform/server/visitors/RegularElement.js | 4 +--- packages/svelte/src/compiler/phases/3-transform/utils.js | 4 +--- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js index f04270ed70..d4768e087b 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js @@ -36,8 +36,7 @@ export function Fragment(node, context) { namespace, context.state, context.state.preserve_whitespace, - context.state.options.preserveComments, - context.state.is_functional_template_mode + context.state.options.preserveComments ); if (hoisted.length === 0 && trimmed.length === 0) { diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/RegularElement.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/RegularElement.js index 1df820dbac..1e31c912cc 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/RegularElement.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/RegularElement.js @@ -373,8 +373,7 @@ export function RegularElement(node, context) { state.metadata.namespace, state, node.name === 'script' || state.preserve_whitespace, - state.options.preserveComments, - state.is_functional_template_mode + state.options.preserveComments ); /** @type {typeof state} */ diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/Fragment.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/Fragment.js index 12bf191e87..a1d25980c4 100644 --- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/Fragment.js +++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/Fragment.js @@ -19,9 +19,7 @@ export function Fragment(node, context) { namespace, context.state, context.state.preserve_whitespace, - context.state.options.preserveComments, - // templating mode doesn't affect server builds - false + context.state.options.preserveComments ); /** @type {ComponentServerTransformState} */ diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js index bcd9c0a94c..5901cb4c50 100644 --- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js +++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js @@ -47,9 +47,7 @@ export function RegularElement(node, context) { scope: /** @type {Scope} */ (state.scopes.get(node.fragment)) }, state.preserve_whitespace, - state.options.preserveComments, - // templating mode doesn't affect server builds - false + state.options.preserveComments ); for (const node of hoisted) { diff --git a/packages/svelte/src/compiler/phases/3-transform/utils.js b/packages/svelte/src/compiler/phases/3-transform/utils.js index eefa869287..5803c04947 100644 --- a/packages/svelte/src/compiler/phases/3-transform/utils.js +++ b/packages/svelte/src/compiler/phases/3-transform/utils.js @@ -141,7 +141,6 @@ function sort_const_tags(nodes, state) { * @param {TransformState & { options: ValidatedCompileOptions }} state * @param {boolean} preserve_whitespace * @param {boolean} preserve_comments - * @param {boolean} [is_functional_template_mode] */ export function clean_nodes( parent, @@ -153,8 +152,7 @@ export function clean_nodes( // first, we need to make `Component(Client|Server)TransformState` inherit from a new `ComponentTransformState` // rather than from `ClientTransformState` and `ServerTransformState` preserve_whitespace, - preserve_comments, - is_functional_template_mode + preserve_comments ) { if (!state.analysis.runes) { nodes = sort_const_tags(nodes, state);