Merge branch 'master' into wjh/export-cmp-as-default

Author: wjhsf

.github/workflows/unit.yml

@@ -66,9 +66,6 @@ jobs:
               run: yarn test:types
             - name: Run unit tests
               run: yarn test:ci
-            # TODO [#4815]: enable all SSR v2 tests
-            - name: Run experimental SSR fixture tests
-              run: TEST_SSR_COMPILER=1 yarn test packages/@lwc/ssr-compiler/src/__tests__/fixtures.spec.ts
             - name: Upload unit test coverage report
               uses: actions/upload-artifact@v4
               with:

eslint.config.mjs

@@ -48,14 +48,7 @@ export default tseslint.config(
             },
 
             parserOptions: {
-                projectService: {
-                    allowDefaultProject: [
-                        // I'm not sure why these files aren't picked up... :\
-                        'packages/@lwc/module-resolver/scripts/test/matchers/to-throw-error-with-code.ts',
-                        'packages/@lwc/module-resolver/scripts/test/matchers/to-throw-error-with-type.ts',
-                        'packages/@lwc/module-resolver/scripts/test/setup-test.ts',
-                    ],
-                },
+                projectService: {},
             },
         },
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "lwc-monorepo",
-    "version": "8.12.5",
+    "version": "8.12.6",
     "private": true,
     "description": "Lightning Web Components",
     "repository": {
@@ -24,6 +24,7 @@
         "test:ci": "vitest run --workspace vitest.workspace.mjs --coverage",
         "test:karma": "nx test @lwc/integration-karma",
         "test:karma:start": "nx start @lwc/integration-karma",
+        "test:hydration:start": "nx hydration:start @lwc/integration-karma",
         "test:integration": "nx sauce @lwc/integration-tests",
         "test:performance": "nx test @lwc/perf-benchmarks",
         "test:performance:best": "nx test:best @lwc/perf-benchmarks",
@@ -34,26 +35,26 @@
     },
     "devDependencies": {
         "@commitlint/cli": "^19.6.1",
-        "@eslint/js": "9.18.0",
+        "@eslint/js": "9.19.0",
         "@lwc/eslint-plugin-lwc-internal": "link:./scripts/eslint-plugin",
         "@lwc/test-utils-lwc-internals": "link:./scripts/test-utils",
-        "@nx/js": "20.3.2",
+        "@nx/js": "20.3.3",
         "@rollup/plugin-commonjs": "^28.0.2",
         "@rollup/plugin-inject": "^5.0.5",
         "@rollup/plugin-node-resolve": "^16.0.0",
         "@rollup/plugin-replace": "^6.0.2",
         "@rollup/plugin-typescript": "^12.1.2",
         "@swc-node/register": "~1.10.9",
-        "@swc/core": "~1.10.8",
+        "@swc/core": "~1.10.11",
         "@swc/helpers": "~0.5.15",
         "@types/babel__core": "^7.20.5",
-        "@types/node": "^22.10.7",
-        "@vitest/coverage-v8": "^3.0.3",
+        "@types/node": "^22.10.10",
+        "@vitest/coverage-v8": "^3.0.4",
         "@vitest/eslint-plugin": "^1.1.25",
-        "@vitest/ui": "^3.0.3",
+        "@vitest/ui": "^3.0.4",
         "bytes": "^3.1.2",
         "es-module-lexer": "^1.6.0",
-        "eslint": "9.18.0",
+        "eslint": "9.19.0",
         "eslint-config-flat-gitignore": "^1.0.0",
         "eslint-plugin-header": "^3.1.1",
         "eslint-plugin-import": "^2.31.0",
@@ -62,16 +63,16 @@
         "husky": "^9.1.7",
         "isbinaryfile": "^5.0.4",
         "jsdom": "^26.0.0",
-        "lint-staged": "^15.4.1",
+        "lint-staged": "^15.4.3",
         "magic-string": "^0.30.17",
-        "nx": "20.3.2",
+        "nx": "20.3.3",
         "prettier": "^3.4.2",
-        "rollup": "^4.31.0",
+        "rollup": "^4.32.0",
         "terser": "^5.37.0",
         "tslib": "^2.8.1",
-        "typescript": "5.4.5",
-        "typescript-eslint": "8.20.0",
-        "vitest": "^3.0.3"
+        "typescript": "5.7.3",
+        "typescript-eslint": "8.21.0",
+        "vitest": "^3.0.4"
     },
     "lint-staged": {
         "*.{js,mjs,ts}": "eslint --cache",

packages/@lwc/aria-reflection/package.json

@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/aria-reflection",
-    "version": "8.12.5",
+    "version": "8.12.6",
     "description": "ARIA element reflection polyfill for strings",
     "keywords": [
         "aom",

packages/@lwc/babel-plugin-component/package.json

@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/babel-plugin-component",
-    "version": "8.12.5",
+    "version": "8.12.6",
     "description": "Babel plugin to transform a LWC module",
     "keywords": [
         "lwc"
@@ -47,8 +47,8 @@
     },
     "dependencies": {
         "@babel/helper-module-imports": "7.25.9",
-        "@lwc/errors": "8.12.5",
-        "@lwc/shared": "8.12.5",
+        "@lwc/errors": "8.12.6",
+        "@lwc/shared": "8.12.6",
         "line-column": "~1.0.2"
     },
     "devDependencies": {

packages/@lwc/compiler/package.json

@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/compiler",
-    "version": "8.12.5",
+    "version": "8.12.6",
     "description": "LWC compiler",
     "keywords": [
         "lwc"
@@ -46,17 +46,17 @@
         }
     },
     "dependencies": {
-        "@babel/core": "7.26.0",
+        "@babel/core": "7.26.7",
         "@babel/plugin-transform-async-generator-functions": "7.25.9",
         "@babel/plugin-transform-async-to-generator": "7.25.9",
         "@babel/plugin-transform-class-properties": "7.25.9",
         "@babel/plugin-transform-object-rest-spread": "7.25.9",
         "@locker/babel-plugin-transform-unforgeables": "0.22.0",
-        "@lwc/babel-plugin-component": "8.12.5",
-        "@lwc/errors": "8.12.5",
-        "@lwc/shared": "8.12.5",
-        "@lwc/ssr-compiler": "8.12.5",
-        "@lwc/style-compiler": "8.12.5",
-        "@lwc/template-compiler": "8.12.5"
+        "@lwc/babel-plugin-component": "8.12.6",
+        "@lwc/errors": "8.12.6",
+        "@lwc/shared": "8.12.6",
+        "@lwc/ssr-compiler": "8.12.6",
+        "@lwc/style-compiler": "8.12.6",
+        "@lwc/template-compiler": "8.12.6"
     }
 }

packages/@lwc/engine-core/package.json

@@ -4,7 +4,7 @@
         "You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
     ],
     "name": "@lwc/engine-core",
-    "version": "8.12.5",
+    "version": "8.12.6",
     "description": "Core LWC engine APIs.",
     "keywords": [
         "lwc"
@@ -46,9 +46,9 @@
         }
     },
     "dependencies": {
-        "@lwc/features": "8.12.5",
-        "@lwc/shared": "8.12.5",
-        "@lwc/signals": "8.12.5"
+        "@lwc/features": "8.12.6",
+        "@lwc/shared": "8.12.6",
+        "@lwc/signals": "8.12.6"
     },
     "devDependencies": {
         "observable-membrane": "2.0.0"

packages/@lwc/engine-core/src/framework/decorators/wire.ts

@@ -65,7 +65,15 @@ export default function wire<
     Class = LightningElement,
 >(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    adapter: WireAdapterConstructor<ReplaceReactiveValues<ReactiveConfig, Class>, Value, Context>,
+    adapter:
+        | WireAdapterConstructor<ReplaceReactiveValues<ReactiveConfig, Class>, Value, Context>
+        | {
+              adapter: WireAdapterConstructor<
+                  ReplaceReactiveValues<ReactiveConfig, Class>,
+                  Value,
+                  Context
+              >;
+          },
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     config?: ReactiveConfig
 ): WireDecorator<Value, Class> {

packages/@lwc/engine-core/src/framework/hydration.ts

@@ -55,6 +55,13 @@ import { getScopeTokenClass } from './stylesheet';
 import { renderComponent } from './component';
 import { applyRefs } from './modules/refs';
 import { unwrapIfNecessary } from './sanitized-html-content';
+import {
+    logGlobalOperationEndWithVM,
+    logGlobalOperationStartWithVM,
+    logOperationEnd,
+    logOperationStart,
+    OperationId,
+} from './profiler';
 import type { Classes } from './hydration-utils';
 import type {
     VNodes,
@@ -85,6 +92,8 @@ let hasMismatch = false;
 export function hydrateRoot(vm: VM) {
     hasMismatch = false;
 
+    logGlobalOperationStartWithVM(OperationId.GlobalSsrHydrate, vm);
+
     runConnectedCallback(vm);
     hydrateVM(vm);
 
@@ -98,6 +107,7 @@ export function hydrateRoot(vm: VM) {
             logHydrationWarning('Hydration completed with errors.');
         }
     }
+    logGlobalOperationEndWithVM(OperationId.GlobalSsrHydrate, vm);
 }
 
 function hydrateVM(vm: VM) {
@@ -111,7 +121,9 @@ function hydrateVM(vm: VM) {
         renderRoot: parentNode,
         renderer: { getFirstChild },
     } = vm;
+    logOperationStart(OperationId.Patch, vm);
     hydrateChildren(getFirstChild(parentNode), children, parentNode, vm, false);
+    logOperationEnd(OperationId.Patch, vm);
     runRenderedCallback(vm);
 }
 

packages/@lwc/engine-core/src/framework/profiler.ts

@@ -20,11 +20,15 @@ export const enum OperationId {
     RenderedCallback = 4,
     DisconnectedCallback = 5,
     ErrorCallback = 6,
-    GlobalHydrate = 7,
-    GlobalRehydrate = 8,
+    GlobalRender = 7,
+    GlobalRerender = 8,
+    GlobalSsrHydrate = 9,
 }
 
-type GlobalOperationId = OperationId.GlobalHydrate | OperationId.GlobalRehydrate;
+type GlobalOperationId =
+    | OperationId.GlobalRender
+    | OperationId.GlobalRerender
+    | OperationId.GlobalSsrHydrate;
 
 const enum Phase {
     Start = 0,
@@ -60,8 +64,9 @@ const operationIdNameMapping = [
     'renderedCallback',
     'disconnectedCallback',
     'errorCallback',
-    'lwc-hydrate',
-    'lwc-rehydrate',
+    'lwc-render',
+    'lwc-rerender',
+    'lwc-ssr-hydrate',
 ] as const satisfies Record<OperationId, string>;
 
 const operationTooltipMapping = [
@@ -79,10 +84,12 @@ const operationTooltipMapping = [
     'component disconnectedCallback()',
     // errorCallback
     'component errorCallback()',
-    // lwc-hydrate
+    // lwc-render
     'component first rendered',
-    // lwc-rehydrate
+    // lwc-rerender
     'component re-rendered',
+    // lwc-ssr-hydrate
+    'component hydrated from server-rendered HTML',
 ] as const satisfies Record<OperationId, string>;
 
 // Even if all the browser the engine supports implements the UserTiming API, we need to guard the measure APIs.
@@ -154,13 +161,14 @@ function getProperties(vm: VM<any, any>): [string, string][] {
 function getColor(opId: OperationId): TrackColor {
     // As of Sept 2024: primary (dark blue), secondary (light blue), tertiary (green)
     switch (opId) {
-        // GlobalHydrate and Constructor tend to occur at the top level
-        case OperationId.GlobalHydrate:
+        // GlobalSsrHydrate, GlobalRender, and Constructor tend to occur at the top level
+        case OperationId.GlobalRender:
+        case OperationId.GlobalSsrHydrate:
         case OperationId.Constructor:
             return 'primary';
-        // GlobalRehydrate also occurs at the top level, but we want to use tertiary (green) because it's easier to
+        // GlobalRerender also occurs at the top level, but we want to use tertiary (green) because it's easier to
         // distinguish from primary, and at a glance you should be able to easily tell re-renders from first renders.
-        case OperationId.GlobalRehydrate:
+        case OperationId.GlobalRerender:
             return 'tertiary';
         // Everything else (patch/render/callbacks)
         default: