partial fix

Author: JoviDeCroock

demo/package.json

@@ -5,7 +5,7 @@
     "main": "server.js",
     "type": "module",
     "scripts": {
-        "dev": "vite",
+        "dev": "vite --force",
         "build": "npm run build:client && npm run build:server",
         "build:client": "vite build --outDir dist/client",
         "build:server": "vite build --ssr src/entry-server.jsx --outDir dist/server"

demo/vite.config.js

@@ -13,10 +13,12 @@ function ssrPlugin() {
 					return next();
 				}
 
-				const { render } = await server.ssrLoadModule(
+				const { render, abort } = await server.ssrLoadModule(
 					path.resolve(__dirname, './src/entry-server')
 				);
 
+				setTimeout(abort, 10000);
+
 				const indexHtml = await fs.readFile(
 					path.resolve(__dirname, './index.html'),
 					'utf-8'

src/index.js

@@ -245,7 +245,8 @@ function _renderToString(
 			);
 
 			if (afterDiff) afterDiff(vnode);
-			vnode[PARENT] = undefined;
+			// when we are dealing with suspense we can't do this...
+			// vnode[PARENT] = undefined;
 
 			if (options.unmount) options.unmount(vnode);
 
@@ -394,7 +395,7 @@ function _renderToString(
 	}
 
 	if (afterDiff) afterDiff(vnode);
-	vnode[PARENT] = undefined;
+	//vnode[PARENT] = undefined;
 	if (ummountHook) ummountHook(vnode);
 
 	// Emit self-closing tag for empty void elements:

src/lib/chunked.js

@@ -39,6 +39,7 @@ export async function renderToChunks(vnode, { context, onWrite, abortSignal }) {
 function handleError(error, vnode, renderChild) {
 	if (!error || !error.then) return;
 
+	console.log('--- IN HANDLER ---');
 	// walk up to the Suspense boundary
 	while ((vnode = vnode[PARENT])) {
 		let component = vnode[COMPONENT];
@@ -50,6 +51,7 @@ function handleError(error, vnode, renderChild) {
 	if (!vnode) return;
 
 	let root = vnode;
+	// TODO: we can't unset parent because of this traversal to Suspense
 	while (root !== null && !root.mask && root[PARENT] !== null) {
 		root = root[PARENT];
 	}
@@ -68,6 +70,7 @@ function handleError(error, vnode, renderChild) {
 
 	const promise = error.then(
 		() => {
+			console.log('resolved');
 			if (abortSignal && abortSignal.aborted) return;
 			this.onWrite(createSubtree(id, renderChild(vnode.props.children)));
 		},