test: reload keep-alive slot

Author: edison1105

packages/compiler-vapor/src/generators/component.ts

@@ -40,7 +40,7 @@ import { genEventHandler } from './event'
 import { genDirectiveModifiers, genDirectivesForElement } from './directive'
 import { genBlock } from './block'
 import { genModelHandler } from './vModel'
-import { isBuiltInComponent } from '../utils'
+import { isBuiltInComponent, isKeepAliveTag } from '../utils'
 
 export function genCreateComponent(
   operation: CreateComponentIRNode,
@@ -460,7 +460,7 @@ function genSlotBlockWithProps(oper: SlotBlockIRNode, context: CodegenContext) {
     ]
   }
 
-  if (node.type === NodeTypes.ELEMENT) {
+  if (node.type === NodeTypes.ELEMENT && !isKeepAliveTag(node.tag)) {
     // wrap with withVaporCtx to ensure correct currentInstance inside slot
     blockFn = [`${context.helper('withVaporCtx')}(`, ...blockFn, `)`]
   }

packages/runtime-vapor/__tests__/hmr.spec.ts

@@ -163,8 +163,9 @@ describe('hot module replacement', () => {
     expect(mountSpy).toHaveBeenCalledTimes(1)
   })
 
-  test.todo('reload KeepAlive slot', async () => {
+  test('reload KeepAlive slot', async () => {
     const root = document.createElement('div')
+    document.body.appendChild(root)
     const childId = 'test-child-keep-alive'
     const unmountSpy = vi.fn()
     const mountSpy = vi.fn()
@@ -201,6 +202,7 @@ describe('hot module replacement', () => {
 
     reload(childId, {
       __hmrId: childId,
+      __vapor: true,
       setup() {
         onMounted(mountSpy)
         onUnmounted(unmountSpy)
@@ -219,15 +221,15 @@ describe('hot module replacement', () => {
     expect(deactivatedSpy).toHaveBeenCalledTimes(0)
 
     // should not unmount when toggling
-    triggerEvent('click', root.children[1] as Element)
+    triggerEvent('click', root.children[0] as Element)
     await nextTick()
     expect(unmountSpy).toHaveBeenCalledTimes(1)
     expect(mountSpy).toHaveBeenCalledTimes(1)
     expect(activeSpy).toHaveBeenCalledTimes(1)
     expect(deactivatedSpy).toHaveBeenCalledTimes(1)
 
     // should not mount when toggling
-    triggerEvent('click', root.children[1] as Element)
+    triggerEvent('click', root.children[0] as Element)
     await nextTick()
     expect(unmountSpy).toHaveBeenCalledTimes(1)
     expect(mountSpy).toHaveBeenCalledTimes(1)

packages/runtime-vapor/src/hmr.ts

@@ -1,4 +1,5 @@
 import {
+  isKeepAlive,
   popWarningContext,
   pushWarningContext,
   setCurrentInstance,
@@ -35,6 +36,11 @@ export function hmrReload(
   instance: VaporComponentInstance,
   newComp: VaporComponent,
 ): void {
+  // if parent is KeepAlive, we need to rerender it
+  if (instance.parent && isKeepAlive(instance.parent)) {
+    instance.parent.hmrRerender!()
+    return
+  }
   const normalized = normalizeBlock(instance.block)
   const parent = normalized[0].parentNode!
   const anchor = normalized[normalized.length - 1].nextSibling