From 751da5f39797641c3510881eb3094a3606ca2d44 Mon Sep 17 00:00:00 2001
From: Matheus Cardoso <matheus@cardo.so>
Date: Fri, 29 Nov 2024 15:35:17 -0300
Subject: [PATCH 1/3] fix(template-compiler): dynamic components with scoped
 slots

---
 .../dynamic-components/slots/scoped-slots/config.json  |  6 ------
 .../slots/scoped-slots/error-ssr.txt                   |  1 -
 .../dynamic-components/slots/scoped-slots/error.txt    |  1 -
 .../slots/scoped-slots/expected-ssr.html               |  0
 .../slots/scoped-slots/expected.html                   | 10 ++++++++++
 .../src/__tests__/utils/expected-failures.ts           |  1 +
 packages/@lwc/template-compiler/src/parser/index.ts    |  7 ++++++-
 7 files changed, 17 insertions(+), 9 deletions(-)
 delete mode 100644 packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/config.json
 delete mode 100644 packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/error-ssr.txt
 delete mode 100644 packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/expected-ssr.html

diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/config.json b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/config.json
deleted file mode 100644
index 59676736cb..0000000000
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "ssrFiles": {
-        "error": "error-ssr.txt",
-        "expected": "expected-ssr.html"
-    }
-}
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/error-ssr.txt b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/error-ssr.txt
deleted file mode 100644
index 050b0885d3..0000000000
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/error-ssr.txt
+++ /dev/null
@@ -1 +0,0 @@
-Template compilation failure; see warnings in the console.
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/error.txt b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/error.txt
index dd1d09f796..e69de29bb2 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/error.txt
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/error.txt
@@ -1 +0,0 @@
-LWC1178: <template> tag with lwc:slot-data directive must be the direct child of a custom element.
\ No newline at end of file
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/expected-ssr.html b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/expected-ssr.html
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/expected.html
index e69de29bb2..7f7a586f32 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/expected.html
@@ -0,0 +1,10 @@
+<x-dynamic-component>
+  <template shadowrootmode="open">
+    <x-test>
+      a
+      <!---->
+      <!---->
+      b
+    </x-test>
+  </template>
+</x-dynamic-component>
\ No newline at end of file
diff --git a/packages/@lwc/ssr-compiler/src/__tests__/utils/expected-failures.ts b/packages/@lwc/ssr-compiler/src/__tests__/utils/expected-failures.ts
index d847cc1f21..82e9a02688 100644
--- a/packages/@lwc/ssr-compiler/src/__tests__/utils/expected-failures.ts
+++ b/packages/@lwc/ssr-compiler/src/__tests__/utils/expected-failures.ts
@@ -23,6 +23,7 @@ export const expectedFailures = new Set([
     'attribute-style/basic/index.js',
     'attribute-style/dynamic/index.js',
     'dynamic-components/mixed/index.js',
+    'dynamic-components/slots/scoped-slots/index.js',
     'dynamic-slots/index.js',
     'exports/component-as-default/index.js',
     'if-conditional-slot-content/index.js',
diff --git a/packages/@lwc/template-compiler/src/parser/index.ts b/packages/@lwc/template-compiler/src/parser/index.ts
index f67d72876d..995bad66bb 100644
--- a/packages/@lwc/template-compiler/src/parser/index.ts
+++ b/packages/@lwc/template-compiler/src/parser/index.ts
@@ -83,6 +83,7 @@ import type {
     ScopedSlotFragment,
     LwcComponent,
     Element,
+    Component,
 } from '../shared/types';
 import type State from '../state';
 import type { Token as parse5Token } from 'parse5';
@@ -1282,10 +1283,14 @@ function parseScopedSlotFragment(
         );
     }
 
+    function isComponentOrLwcComponent(node: ParentNode): node is Component | LwcComponent {
+        return ast.isComponent(node) || ast.isLwcComponent(node);
+    }
+
     // <template lwc:slot-data> element should always be the direct child of a custom element
     // The only exception is, a conditional block as parent
     const parentCmp = ctx.findAncestor(
-        ast.isComponent,
+        isComponentOrLwcComponent,
         ({ current }) => current && ast.isConditionalBlock(current)
     );
 

From f36bd8193bca7194563754cf85f5c2a54bed8d10 Mon Sep 17 00:00:00 2001
From: Matheus Cardoso <matheus@cardo.so>
Date: Fri, 29 Nov 2024 17:34:05 -0300
Subject: [PATCH 2/3] fix: update fixture

---
 .../dynamic-components/slots/scoped-slots/expected.html      | 5 +++++
 .../slots/scoped-slots/modules/x/test/test.html              | 2 +-
 .../slots/scoped-slots/modules/x/test/test.js                | 5 +++++
 .../ssr-compiler/src/__tests__/utils/expected-failures.ts    | 1 -
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/expected.html
index 7f7a586f32..8f4236b230 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/expected.html
@@ -4,6 +4,11 @@
       a
       <!---->
       <!---->
+      <span>
+        a - b
+      </span>
+      <!---->
+      <!---->
       b
     </x-test>
   </template>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/modules/x/test/test.html b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/modules/x/test/test.html
index 11a79388ce..edc0d5ca62 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/modules/x/test/test.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/modules/x/test/test.html
@@ -1,5 +1,5 @@
 <template lwc:render-mode="light">
     a
-    <slot lwc:slot-bind={item}>Default slot content</slot>
+    <slot lwc:slot-bind={data}>Default slot content</slot>
     b
 </template>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/modules/x/test/test.js b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/modules/x/test/test.js
index 737a9edf5d..f8d98b5cdc 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/modules/x/test/test.js
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/modules/x/test/test.js
@@ -2,4 +2,9 @@ import { LightningElement } from 'lwc';
 
 export default class Test extends LightningElement {
     static renderMode = 'light';
+
+    data = {
+        id: 'a',
+        name: 'b',
+    };
 }
diff --git a/packages/@lwc/ssr-compiler/src/__tests__/utils/expected-failures.ts b/packages/@lwc/ssr-compiler/src/__tests__/utils/expected-failures.ts
index 82e9a02688..d847cc1f21 100644
--- a/packages/@lwc/ssr-compiler/src/__tests__/utils/expected-failures.ts
+++ b/packages/@lwc/ssr-compiler/src/__tests__/utils/expected-failures.ts
@@ -23,7 +23,6 @@ export const expectedFailures = new Set([
     'attribute-style/basic/index.js',
     'attribute-style/dynamic/index.js',
     'dynamic-components/mixed/index.js',
-    'dynamic-components/slots/scoped-slots/index.js',
     'dynamic-slots/index.js',
     'exports/component-as-default/index.js',
     'if-conditional-slot-content/index.js',

From 98cc4b1295a8875c45ce89e147a68700b282e798 Mon Sep 17 00:00:00 2001
From: Matheus Cardoso <matheus@cardo.so>
Date: Fri, 29 Nov 2024 17:47:23 -0300
Subject: [PATCH 3/3] fix: revert unneeded change

---
 .../slots/scoped-slots/modules/x/test/test.html                 | 2 +-
 .../slots/scoped-slots/modules/x/test/test.js                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/modules/x/test/test.html b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/modules/x/test/test.html
index edc0d5ca62..11a79388ce 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/modules/x/test/test.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/modules/x/test/test.html
@@ -1,5 +1,5 @@
 <template lwc:render-mode="light">
     a
-    <slot lwc:slot-bind={data}>Default slot content</slot>
+    <slot lwc:slot-bind={item}>Default slot content</slot>
     b
 </template>
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/modules/x/test/test.js b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/modules/x/test/test.js
index f8d98b5cdc..cbf50c2466 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/modules/x/test/test.js
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/dynamic-components/slots/scoped-slots/modules/x/test/test.js
@@ -3,7 +3,7 @@ import { LightningElement } from 'lwc';
 export default class Test extends LightningElement {
     static renderMode = 'light';
 
-    data = {
+    item = {
         id: 'a',
         name: 'b',
     };