Merge branch 'master' into rave/signal-with-secret-symbol

Author: rax-it

.github/workflows/karma.yml

@@ -182,6 +182,7 @@ jobs:
             - run: ENABLE_SYNTHETIC_SHADOW_IN_HYDRATION=1 yarn hydration:sauce:ci
             - run: NODE_ENV_FOR_TEST=production yarn hydration:sauce:ci
             - run: DISABLE_NATIVE_CUSTOM_ELEMENT_LIFECYCLE=1 yarn hydration:sauce:ci
+            - run: DISABLE_STATIC_CONTENT_OPTIMIZATION=1 yarn hydration:sauce:ci
 
             - name: Upload coverage results
               uses: actions/upload-artifact@v4

eslint.config.mjs

@@ -256,6 +256,7 @@ export default tseslint.config(
         files: ['packages/@lwc/integration-karma/**'],
         rules: {
             'vitest/no-conditional-tests': 'error',
+            'vitest/no-done-callback': 'error',
         },
     },
     {

package.json

@@ -34,29 +34,29 @@
     },
     "devDependencies": {
         "@commitlint/cli": "^19.5.0",
-        "@eslint/compat": "^1.2.0",
-        "@eslint/js": "^9.12.0",
+        "@eslint/compat": "^1.2.1",
+        "@eslint/js": "^9.13.0",
         "@lwc/eslint-plugin-lwc-internal": "link:./scripts/eslint-plugin",
         "@lwc/test-utils-lwc-internals": "link:./scripts/test-utils",
-        "@nx/js": "20.0.0",
-        "@rollup/plugin-commonjs": "^28.0.0",
+        "@nx/js": "20.0.3",
+        "@rollup/plugin-commonjs": "^28.0.1",
         "@rollup/plugin-inject": "^5.0.5",
         "@rollup/plugin-node-resolve": "^15.3.0",
         "@rollup/plugin-replace": "^6.0.1",
-        "@rollup/plugin-typescript": "^12.1.0",
+        "@rollup/plugin-typescript": "^12.1.1",
         "@swc-node/register": "~1.10.9",
         "@swc/core": "~1.7.36",
         "@swc/helpers": "~0.5.13",
         "@types/babel__core": "^7.20.5",
-        "@types/node": "^22.7.5",
+        "@types/node": "^22.7.7",
         "@vitest/coverage-v8": "^2.1.3",
         "@vitest/eslint-plugin": "^1.1.7",
         "@vitest/expect": "^2.1.3",
         "@vitest/ui": "^2.1.3",
         "@vitest/utils": "^2.1.2",
         "bytes": "^3.1.2",
         "es-module-lexer": "^1.5.4",
-        "eslint": "^9.12.0",
+        "eslint": "^9.13.0",
         "eslint-config-flat-gitignore": "^0.3.0",
         "eslint-plugin-header": "^3.1.1",
         "eslint-plugin-import": "^2.31.0",
@@ -68,13 +68,13 @@
         "jsdom": "^25.0.1",
         "lint-staged": "^15.2.10",
         "magic-string": "^0.30.12",
-        "nx": "20.0.0",
+        "nx": "20.0.3",
         "prettier": "^3.3.3",
         "rollup": "^4.24.0",
-        "terser": "^5.34.1",
-        "tslib": "^2.7.0",
+        "terser": "^5.36.0",
+        "tslib": "^2.8.0",
         "typescript": "5.4.5",
-        "typescript-eslint": "^8.9.0",
+        "typescript-eslint": "^8.10.0",
         "vitest": "^2.1.3"
     },
     "lint-staged": {

packages/@lwc/compiler/src/index.ts

@@ -6,7 +6,7 @@
  */
 export { transform, transformSync } from './transformers/transformer';
 
-export { TransformResult } from './transformers/transformer';
+export { TransformResult } from './transformers/shared';
 export {
     NormalizedTransformOptions,
     TransformOptions,

packages/@lwc/compiler/src/options.ts

@@ -6,7 +6,7 @@
  */
 import { InstrumentationObject, CompilerValidationErrors, invariant } from '@lwc/errors';
 import { isUndefined, isBoolean, getAPIVersionFromNumber } from '@lwc/shared';
-import { CustomRendererConfig } from '@lwc/template-compiler';
+import type { CustomRendererConfig } from '@lwc/template-compiler';
 
 /**
  * Flag indicating that a warning about still using the deprecated `enableLwcSpread`
@@ -131,8 +131,7 @@ export interface TransformOptions {
     targetSSR?: boolean;
 }
 
-type RequiredTransformOptions = Omit<
-    TransformOptions,
+type OptionalTransformKeys =
     | 'name'
     | 'namespace'
     | 'scopedStyles'
@@ -142,20 +141,14 @@ type RequiredTransformOptions = Omit<
     | 'enableDynamicComponents'
     | 'experimentalDynamicDirective'
     | 'experimentalDynamicComponent'
-    | 'instrumentation'
->;
-export interface NormalizedTransformOptions extends RecursiveRequired<RequiredTransformOptions> {
-    name?: string;
-    namespace?: string;
-    scopedStyles?: boolean;
-    customRendererConfig?: CustomRendererConfig;
-    enableLwcSpread?: boolean;
-    enableLightningWebSecurityTransforms?: boolean;
-    enableDynamicComponents?: boolean;
-    experimentalDynamicDirective?: boolean;
-    experimentalDynamicComponent?: DynamicImportConfig;
-    instrumentation?: InstrumentationObject;
-}
+    | 'instrumentation';
+
+type RequiredTransformOptions = RecursiveRequired<Omit<TransformOptions, OptionalTransformKeys>>;
+type OptionalTransformOptions = Pick<TransformOptions, OptionalTransformKeys>;
+
+export interface NormalizedTransformOptions
+    extends RequiredTransformOptions,
+        OptionalTransformOptions {}
 
 /**
  * Validates that the options conform to the expected shape and normalizes them to a standard format

packages/@lwc/compiler/src/transformers/javascript.ts

@@ -14,8 +14,8 @@ import lwcClassTransformPlugin, { type LwcBabelPluginOptions } from '@lwc/babel-
 import { normalizeToCompilerError, TransformerErrors } from '@lwc/errors';
 import { isAPIFeatureEnabled, APIFeature } from '@lwc/shared';
 
-import { NormalizedTransformOptions } from '../options';
-import { TransformResult } from './transformer';
+import type { NormalizedTransformOptions } from '../options';
+import type { TransformResult } from './shared';
 
 /**
  * Transforms a JavaScript file.

packages/@lwc/compiler/src/transformers/shared.ts

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2024, Salesforce, Inc.
+ * All rights reserved.
+ * SPDX-License-Identifier: MIT
+ * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
+ */
+import { CompilerDiagnostic } from '@lwc/errors';
+
+/** The object returned after transforming code. */
+export interface TransformResult {
+    /** The compiled source code. */
+    code: string;
+    /** The generated source map. */
+    map: unknown;
+    /** Any diagnostic warnings that may have occurred. */
+    warnings?: CompilerDiagnostic[];
+    /**
+     * String tokens used for style scoping in synthetic shadow DOM and `*.scoped.css`, as either
+     * attributes or classes.
+     */
+    cssScopeTokens?: string[];
+}

packages/@lwc/compiler/src/transformers/style.ts

@@ -7,8 +7,8 @@
 import * as styleCompiler from '@lwc/style-compiler';
 import { normalizeToCompilerError, TransformerErrors } from '@lwc/errors';
 
-import { NormalizedTransformOptions } from '../options';
-import { TransformResult } from './transformer';
+import type { NormalizedTransformOptions } from '../options';
+import type { TransformResult } from './shared';
 
 /**
  * Transform the passed source code

packages/@lwc/compiler/src/transformers/template.ts

@@ -12,8 +12,8 @@ import {
 } from '@lwc/errors';
 import { compile } from '@lwc/template-compiler';
 
-import { NormalizedTransformOptions } from '../options';
-import { TransformResult } from './transformer';
+import type { NormalizedTransformOptions } from '../options';
+import type { TransformResult } from './shared';
 
 /**
  * Transforms a HTML template into module exporting a template function.

packages/@lwc/compiler/src/transformers/transformer.ts

@@ -7,33 +7,14 @@
 import * as path from 'path';
 
 import { isString } from '@lwc/shared';
-import {
-    TransformerErrors,
-    generateCompilerError,
-    invariant,
-    CompilerDiagnostic,
-} from '@lwc/errors';
+import { TransformerErrors, generateCompilerError, invariant } from '@lwc/errors';
 import { compileComponentForSSR, compileTemplateForSSR } from '@lwc/ssr-compiler';
 
 import { NormalizedTransformOptions, TransformOptions, validateTransformOptions } from '../options';
 import styleTransform from './style';
 import templateTransformer from './template';
 import scriptTransformer from './javascript';
-
-/** The object returned after transforming code. */
-export interface TransformResult {
-    /** The compiled source code. */
-    code: string;
-    /** The generated source map. */
-    map: unknown;
-    /** Any diagnostic warnings that may have occurred. */
-    warnings?: CompilerDiagnostic[];
-    /**
-     * String tokens used for style scoping in synthetic shadow DOM and `*.scoped.css`, as either
-     * attributes or classes.
-     */
-    cssScopeTokens?: string[];
-}
+import type { TransformResult } from './shared';
 
 /**
  * Transform the passed source code.