+

src/utils/component.ts

@@ -32,10 +32,8 @@ export type GenericReturnType =
   | null[];
 
 // this is workaround for `if` case, where we don't have stable root, and to remove it properly we need to look into last rendered part
-export const relatedRoots: WeakMap<
-  DocumentFragment | HTMLElement,
-  GenericReturnType
-> = new WeakMap();
+export const relatedRoots: WeakMap<DocumentFragment, GenericReturnType> =
+  new WeakMap();
 
 function renderNode(parent: Node, target: Node, placeholder: Node | Comment) {
   if (import.meta.env.DEV) {
@@ -177,6 +175,10 @@ async function destroyNode(node: Node) {
     if (parent !== null) {
       parent.removeChild(node);
     } else {
+      if (import.meta.env.SSR) {
+        console.warn(`Node is not in DOM`, node.nodeType, node.nodeName);
+        return;
+      }
       throw new Error(`Node is not in DOM`);
     }
   } else {

src/utils/rehydration.ts

@@ -16,7 +16,7 @@ export function lastItemInStack(target: 'text' | 'node' | 'comment') {
     ) as HTMLElement;
     if (maybeNextNode) {
       // remove data attribute
-      maybeNextNode.dataset.nodeId = '';
+      maybeNextNode.removeAttribute('data-node-id');
       // remove from stack
       const indexInStack = withRehydrationStack.indexOf(maybeNextNode);
       if (indexInStack > -1) {

src/utils/ssr.ts

@@ -1,6 +1,6 @@
-import { renderComponent, type ComponentReturnType } from '@/utils/component';
+import { renderComponent, runDestructors, type ComponentReturnType } from '@/utils/component';
 import { setDocument, getDocument } from './dom-api';
-import { resetNodeCounter } from '@/utils/dom';
+import { getRoot, resetNodeCounter, resetRoot } from '@/utils/dom';
 
 type EnvironmentParams = {
   url: string;
@@ -24,7 +24,6 @@ export async function render(
 ) {
   const { Window } = await import('happy-dom');
   const win = new Window({ url: params.url });
-  const originalDocument = getDocument();
   const doc = win.document;
   setDocument(doc as unknown as Document);
 
@@ -40,10 +39,11 @@ export async function render(
 
   const html = rootNode.innerHTML;
 
-  // @ts-expect-error
-  await el.destroy();
-  resetNodeCounter();
-
-  setDocument(originalDocument as unknown as Document);
+  const oldRoot = getRoot();
+  if (oldRoot) {
+    await runDestructors(oldRoot);
+    resetRoot();
+  }
+  win.close();
   return html;
 }