chore: merged master

package.json

@@ -34,43 +34,43 @@
     },
     "devDependencies": {
         "@commitlint/cli": "^19.6.1",
-        "@eslint/js": "9.17.0",
+        "@eslint/js": "9.18.0",
         "@lwc/eslint-plugin-lwc-internal": "link:./scripts/eslint-plugin",
         "@lwc/test-utils-lwc-internals": "link:./scripts/test-utils",
-        "@nx/js": "20.3.0",
+        "@nx/js": "20.3.1",
         "@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.4",
+        "@swc/core": "~1.10.7",
         "@swc/helpers": "~0.5.15",
         "@types/babel__core": "^7.20.5",
         "@types/node": "^22.10.5",
         "@vitest/coverage-v8": "^2.1.8",
-        "@vitest/eslint-plugin": "^1.1.24",
+        "@vitest/eslint-plugin": "^1.1.25",
         "@vitest/ui": "^2.1.8",
         "bytes": "^3.1.2",
         "es-module-lexer": "^1.6.0",
-        "eslint": "9.17.0",
-        "eslint-config-flat-gitignore": "^0.3.0",
+        "eslint": "9.18.0",
+        "eslint-config-flat-gitignore": "^1.0.0",
         "eslint-plugin-header": "^3.1.1",
         "eslint-plugin-import": "^2.31.0",
-        "glob": "^11.0.0",
+        "glob": "^11.0.1",
         "globals": "^15.14.0",
         "husky": "^9.1.7",
         "isbinaryfile": "^5.0.4",
-        "jsdom": "^25.0.1",
+        "jsdom": "^26.0.0",
         "lint-staged": "^15.3.0",
         "magic-string": "^0.30.17",
-        "nx": "20.3.0",
+        "nx": "20.3.1",
         "prettier": "^3.4.2",
-        "rollup": "^4.30.0",
+        "rollup": "^4.30.1",
         "terser": "^5.37.0",
         "tslib": "^2.8.1",
         "typescript": "5.4.5",
-        "typescript-eslint": "8.19.0",
+        "typescript-eslint": "8.19.1",
         "vitest": "^2.1.8"
     },
     "lint-staged": {

packages/@lwc/integration-tests/package.json

@@ -19,10 +19,10 @@
     },
     "devDependencies": {
         "@lwc/rollup-plugin": "8.12.4",
-        "@wdio/cli": "^9.5.1",
-        "@wdio/local-runner": "^9.5.1",
+        "@wdio/cli": "^9.5.7",
+        "@wdio/local-runner": "^9.5.7",
         "@wdio/mocha-framework": "^9.5.0",
-        "@wdio/sauce-service": "^9.5.1",
+        "@wdio/sauce-service": "^9.5.7",
         "@wdio/spec-reporter": "^9.5.0",
         "@wdio/static-server-service": "^9.5.0",
         "deepmerge": "^4.3.1",

packages/@lwc/integration-types/package.json

@@ -15,7 +15,7 @@
     "devDependencies": {
         "@rollup/plugin-replace": "^6.0.2",
         "@rollup/plugin-typescript": "^12.1.2",
-        "rollup": "^4.30.0",
+        "rollup": "^4.30.1",
         "rollup-plugin-livereload": "^2.0.5",
         "rollup-plugin-serve": "^3.0.0"
     }

packages/@lwc/perf-benchmarks/package.json

@@ -25,7 +25,7 @@
         "@best/cli": "^14.0.0",
         "@best/runner-headless": "^14.0.0",
         "@best/runner-remote": "^14.0.0",
-        "folder-hash": "4.1.0",
+        "folder-hash": "4.1.1",
         "markdown-table": "^3.0.4",
         "tachometer": "^0.7.1"
     },

packages/@lwc/ssr-compiler/package.json

@@ -48,7 +48,7 @@
         }
     },
     "dependencies": {
-        "@babel/types": "7.26.3",
+        "@babel/types": "7.26.5",
         "@lwc/shared": "8.12.4",
         "@lwc/errors": "8.12.4",
         "@lwc/template-compiler": "8.12.4",

packages/@lwc/ssr-compiler/src/compile-template/transformers/slot.ts

@@ -28,7 +28,7 @@ const bConditionalSlot = esTemplateWithYield`
         const slotName = ${/* slotName */ is.expression};
         const lightGenerators = lightSlottedContent?.[slotName ?? ""];
         const scopedGenerators = scopedSlottedContent?.[slotName ?? ""];
-        const mismatchedSlots = (isScopedSlot && lightGenerators) || (!isScopedSlot && scopedGenerators);
+        const mismatchedSlots = isScopedSlot ? lightGenerators : scopedGenerators;
         const generators = isScopedSlot ? scopedGenerators : lightGenerators;
 
         // start bookend HTML comment for light DOM slot vfragment
@@ -44,13 +44,18 @@ const bConditionalSlot = esTemplateWithYield`
         if (generators) {
             for (let i = 0; i < generators.length; i++) {
                 yield* generators[i](contextfulParent, ${/* scoped slot data */ isNullableOf(is.expression)});
-                // Bookends after all but last scoped slot data
+                // Scoped slotted data is separated by bookends. Final bookends are added outside of the loop below.
                 if (isScopedSlot && i < generators.length - 1) {
                     yield '<!---->';
                     yield '<!---->';
                 }
             }
-        // If there were mismatched slots, do not fallback to the default
+        /* 
+            If there were mismatched slots, do not fallback to the default. This is required for parity with
+            engine-core which resets children to an empty array when there are children (mismatched or not). 
+            Because the child nodes are reset, the default slotted content is not rendered in the mismatched slot case. 
+            See https://github.com/salesforce/lwc/blob/master/packages/%40lwc/engine-core/src/framework/api.ts#L238
+        */
         } else if (!mismatchedSlots) {
             // If we're in this else block, then the generator _must_ have yielded
             // something. It's impossible for a slottedContent["foo"] to exist

playground/package.json

@@ -12,7 +12,7 @@
         "@lwc/rollup-plugin": "8.12.4",
         "@rollup/plugin-replace": "^6.0.2",
         "lwc": "8.12.4",
-        "rollup": "^4.30.0",
+        "rollup": "^4.30.1",
         "rollup-plugin-livereload": "^2.0.5",
         "rollup-plugin-serve": "^3.0.0"
     },