chore: remove unnecessary block statements (#4888)

salesforce · Nov 19, 2024 · e677e5c · e677e5c
1 parent 3f0e444
commit e677e5c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/packages/@lwc/ssr-compiler/src/compile-js/generate-markup.ts b/packages/@lwc/ssr-compiler/src/compile-js/generate-markup.ts
@@ -13,13 +13,13 @@ import { bImportDeclaration } from '../estree/builders';
 import { bWireAdaptersPlumbing } from './wire';
 
 import type {
-    BlockStatement,
     ExportNamedDeclaration,
     Program,
     SimpleCallExpression,
     Identifier,
     MemberExpression,
     Statement,
+    ExpressionStatement,
 } from 'estree';
 import type { ComponentMetaState } from './types';
 
@@ -68,10 +68,8 @@ const bGenerateMarkup = esTemplate`
 `<ExportNamedDeclaration>;
 
 const bAssignGenerateMarkupToComponentClass = esTemplate`
-    {
-        ${/* lwcClassName */ is.identifier}[__SYMBOL__GENERATE_MARKUP] = generateMarkup;
-    }
-`<BlockStatement>;
+${/* lwcClassName */ is.identifier}[__SYMBOL__GENERATE_MARKUP] = generateMarkup;
+`<ExpressionStatement>;
 
 /**
  * This builds a generator function `generateMarkup` and adds it to the component JS's

diff --git a/packages/@lwc/ssr-compiler/src/compile-js/stylesheet-scope-token.ts b/packages/@lwc/ssr-compiler/src/compile-js/stylesheet-scope-token.ts
@@ -9,7 +9,7 @@ import { is } from 'estree-toolkit';
 import { generateScopeTokens } from '@lwc/template-compiler';
 import { builders as b } from 'estree-toolkit/dist/builders';
 import { esTemplate } from '../estemplate';
-import type { BlockStatement, Program, VariableDeclaration } from 'estree';
+import type { ExpressionStatement, Program, VariableDeclaration } from 'estree';
 
 const bStylesheetTokenDeclaration = esTemplate`
     const stylesheetScopeToken = '${is.literal}';
@@ -23,11 +23,9 @@ const bHasScopedStylesheetsDeclaration = esTemplate`
 // We also need to keep track of whether the template has any scoped styles or not so that we can render (or not) the
 // scope token.
 const tmplAssignmentBlock = esTemplate`
-  {
-    ${/* template */ is.identifier}.hasScopedStylesheets = hasScopedStylesheets;
-    ${/* template */ 0}.stylesheetScopeToken = stylesheetScopeToken;
-  }
-`<BlockStatement>;
+${/* template */ is.identifier}.hasScopedStylesheets = hasScopedStylesheets;
+${/* template */ 0}.stylesheetScopeToken = stylesheetScopeToken;
+`<ExpressionStatement[]>;
 
 export function addScopeTokenDeclarations(
     program: Program,
@@ -42,5 +40,5 @@ export function addScopeTokenDeclarations(
         bHasScopedStylesheetsDeclaration()
     );
 
-    program.body.push(tmplAssignmentBlock(b.identifier('tmpl')));
+    program.body.push(...tmplAssignmentBlock(b.identifier('tmpl')));
 }
diff --git a/packages/@lwc/ssr-compiler/src/compile-template/transformers/element.ts b/packages/@lwc/ssr-compiler/src/compile-template/transformers/element.ts
@@ -31,6 +31,7 @@ import type {
     BlockStatement as EsBlockStatement,
     Expression as EsExpression,
     Statement as EsStatement,
+    IfStatement as EsIfStatement,
 } from 'estree';
 import type { Transformer, TransformerContext } from '../types';
 
@@ -89,13 +90,10 @@ const bStringLiteralYield = esTemplateWithYield`
 `<EsBlockStatement>;
 
 const bConditionallyYieldScopeTokenClass = esTemplateWithYield`
-    {
-        const shouldRenderScopeToken = hasScopedStylesheets || hasScopedStaticStylesheets(Cmp);
-        if (shouldRenderScopeToken) {
-            yield \` class="\${stylesheetScopeToken}"\`;
-        }
+    if (hasScopedStylesheets || hasScopedStaticStylesheets(Cmp)) {
+        yield \` class="\${stylesheetScopeToken}"\`;
     }
-`<EsBlockStatement>;
+`<EsIfStatement>;
 
 const bYieldSanitizedHtml = esTemplateWithYield`
     yield sanitizeHtmlContent(${/* lwc:inner-html content */ is.expression})