feat: Pip after onAllReady when pre render SSR

alibaba · Nov 29, 2023 · 5a3889a · 5a3889a
1 parent 3f89726
commit 5a3889a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 33 deletions.
diff --git a/packages/ice/src/middlewares/renderMiddleware.ts b/packages/ice/src/middlewares/renderMiddleware.ts
@@ -48,22 +48,9 @@ export default function createRenderMiddleware(options: Options): Middleware {
           req,
           res,
         };
-
-        // Simulating window object for wormhole.
-        // @ts-ignore
-        global.window = {};
-
         serverModule.renderToResponse(requestContext, {
           renderMode,
           documentOnly,
-          preRender: true,
-          streamOptions: {
-            onAllReady: (params) => {
-              console.log('middleware onAllReady');
-              console.log('params', params);
-              res.write(params.renderAssets.join(','));
-            },
-          },
         });
       }
     } else {

diff --git a/packages/runtime/src/server/streamRender.tsx b/packages/runtime/src/server/streamRender.tsx
@@ -38,9 +38,10 @@ export function renderToNodeStream(
     const {
       preRender = false,
     } = renderOptions;
-    console.log('preRender', preRender);
+
     const { pipe } = ReactDOMServer.renderToPipeableStream(element, {
       onShellReady() {
+        // Pip after onAllReady when pre render SSR.
         if (!preRender) {
           pipe(res);
         }
@@ -53,30 +54,31 @@ export function renderToNodeStream(
         options?.onError && options?.onError(error);
       },
       onAllReady() {
-        const {
-          renderOptions,
-          routerContext,
-        } = renderToNodeStreamOptions;
+        // For pre render SSR.
+        if (preRender) {
+          const {
+            renderOptions,
+            routerContext,
+          } = renderToNodeStreamOptions;
 
-        const {
-          assetsManifest,
-        } = renderOptions;
+          const {
+            assetsManifest,
+          } = renderOptions;
 
-        const {
-          matches,
-          loaderData,
-        } = routerContext;
+          const {
+            matches,
+            loaderData,
+          } = routerContext;
 
-        let renderAssets = getAllAssets(loaderData, matches, assetsManifest);
-        if (typeof window !== 'undefined' && window.renderAssets) {
-          renderAssets = renderAssets.concat(window.renderAssets);
-        }
+          let renderAssets = getAllAssets(loaderData, matches, assetsManifest);
+          if (typeof window !== 'undefined' && window.renderAssets) {
+            renderAssets = renderAssets.concat(window.renderAssets);
+          }
 
-        options?.onAllReady && options?.onAllReady({
-          renderAssets,
-        });
+          options?.onAllReady && options?.onAllReady({
+            renderAssets,
+          });
 
-        if (preRender) {
           pipe(res);
         }
       },