+
\ No newline at end of file
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-static/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-static/expected.html
index d4c3d760cf..04a6a3b5e2 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-static/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/attribute-static/expected.html
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/packages/@lwc/engine-server/src/__tests__/fixtures/if-conditional-slot/expected.html b/packages/@lwc/engine-server/src/__tests__/fixtures/if-conditional-slot/expected.html
index 09be4b9b74..48fdcd999f 100644
--- a/packages/@lwc/engine-server/src/__tests__/fixtures/if-conditional-slot/expected.html
+++ b/packages/@lwc/engine-server/src/__tests__/fixtures/if-conditional-slot/expected.html
@@ -12,14 +12,14 @@
-
+
Testing if:true
-
+
@@ -36,14 +36,14 @@
-
+
Testing if:true
-
+
From 59bc9139510a8fe11b725fd40b11330da76f1645 Mon Sep 17 00:00:00 2001
From: Pierre-Marie Dartus
Date: Sun, 19 Dec 2021 18:43:42 +0200
Subject: [PATCH 15/17] chore: fix slot patching
---
packages/@lwc/engine-core/src/framework/rendering.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/@lwc/engine-core/src/framework/rendering.ts b/packages/@lwc/engine-core/src/framework/rendering.ts
index bbcffe6da1..beea2951f2 100644
--- a/packages/@lwc/engine-core/src/framework/rendering.ts
+++ b/packages/@lwc/engine-core/src/framework/rendering.ts
@@ -267,7 +267,7 @@ function patchCustomElement(n1: VCustomElement, n2: VCustomElement) {
// in fallback mode, the children will be always empty, so, nothing
// will happen, but in native, it does allocate the light dom
- patchChildren(elm, n1.children, n1.children);
+ patchChildren(elm, n1.children, n2.children);
if (!isUndefined(vm)) {
if (process.env.NODE_ENV !== 'production') {
From 68ff7dfde799fb4f98147f83a73bc2fed5ff35e2 Mon Sep 17 00:00:00 2001
From: Jose David Rodriguez Velasco
Date: Fri, 7 Jan 2022 08:05:13 -0500
Subject: [PATCH 16/17] fix: portals in native shadow
---
packages/@lwc/engine-core/src/framework/rendering.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/@lwc/engine-core/src/framework/rendering.ts b/packages/@lwc/engine-core/src/framework/rendering.ts
index beea2951f2..34038b8b11 100644
--- a/packages/@lwc/engine-core/src/framework/rendering.ts
+++ b/packages/@lwc/engine-core/src/framework/rendering.ts
@@ -157,7 +157,7 @@ function mountElement(vnode: VElement, parent: ParentNode, anchor: Node | null)
// Handle dom:manual template directive.
const isDomManual = data.context?.lwc?.dom === LWCDOMMode.manual;
- if (isDomManual) {
+ if (owner.shadowMode === ShadowMode.Synthetic && isDomManual) {
elm.$domManual$ = true;
}
From c728a6b74a4f90c5906931484b97573eff10c2ba Mon Sep 17 00:00:00 2001
From: Jose David Rodriguez Velasco
Date: Fri, 7 Jan 2022 08:41:55 -0500
Subject: [PATCH 17/17] fix: disconnectedCallback hydration test
---
packages/@lwc/engine-core/src/framework/rendering.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/@lwc/engine-core/src/framework/rendering.ts b/packages/@lwc/engine-core/src/framework/rendering.ts
index 34038b8b11..76c9937552 100644
--- a/packages/@lwc/engine-core/src/framework/rendering.ts
+++ b/packages/@lwc/engine-core/src/framework/rendering.ts
@@ -291,7 +291,7 @@ function unmount(vnode: VNode, parent: ParentNode) {
break;
case VNodeType.CustomElement: {
- const { vm } = vnode;
+ const vm = getAssociatedVMIfPresent(vnode.elm);
// No need to unmount the children here, `removeVM` will take care of removing the
// children.