@umijs/server 4.0.0-canary.20230927.1 → 4.0.0-canary.20231009.1

package/dist/ssr.d.ts

@@ -18,6 +18,7 @@ interface CreateRequestHandlerOptions {
     createHistory: (opts: any) => any;
     helmetContext?: any;
     ServerInsertedHTMLContext: React.Context<ServerInsertedHTMLHook | null>;
+    withoutHTML?: boolean;
 }
 export declare function createMarkupGenerator(opts: CreateRequestHandlerOptions): (url: string) => Promise<unknown>;
 export default function createRequestHandler(opts: CreateRequestHandlerOptions): (req: any, res: any, next: any) => Promise<any>;

package/dist/ssr.js

@@ -98,7 +98,8 @@ function createJSXGenerator(opts) {
       pluginManager,
       location: url,
       manifest,
-      loaderData
+      loaderData,
+      withoutHTML: opts.withoutHTML
     };
     const element = await opts.getClientRootComponent(
       context
@@ -202,7 +203,10 @@ function createRequestHandler(opts) {
   };
 }
 function createUmiHandler(opts) {
-  const jsxGeneratorDeferrer = createJSXGenerator(opts);
+  const jsxGeneratorDeferrer = createJSXGenerator({
+    ...opts,
+    withoutHTML: true
+  });
   return function(req) {
     return new Promise(async (resolve, reject) => {
       const jsx = await jsxGeneratorDeferrer(new URL(req.url).pathname);
@@ -210,34 +214,20 @@ function createUmiHandler(opts) {
         reject(new Error("no page resource"));
         return;
       }
-      let buf = Buffer.alloc(0);
-      const writable = new import_stream.Writable();
-      writable._write = (chunk, _encoding, next) => {
-        buf = Buffer.concat([buf, chunk]);
-        next();
-      };
-      writable.on("finish", async () => {
-        resolve(import_stream.Readable.from(buf));
-      });
-      const stream = await ReactDomServer.renderToPipeableStream(jsx.element, {
+      const stream = await ReactDomServer.renderToReadableStream(jsx.element, {
         bootstrapScripts: [jsx.manifest.assets["umi.js"] || "/umi.js"],
-        onShellReady() {
-          stream.pipe(writable);
-        },
         onError(err) {
           reject(err);
         }
       });
+      resolve(stream);
     });
   };
 }
 function createUmiServerLoader(opts) {
   return async function(req) {
     const query = Object.fromEntries(new URL(req.url).searchParams);
-    return await executeLoader(
-      query.route,
-      opts.routesWithServerLoader
-    );
+    return await executeLoader(query.route, opts.routesWithServerLoader);
   };
 }
 function matchRoutesForSSR(reqUrl, routesById) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/server",
-  "version": "4.0.0-canary.20230927.1",
+  "version": "4.0.0-canary.20231009.1",
   "description": "@umijs/server",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/server#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -19,7 +19,7 @@
     "react": "18.1.0",
     "react-dom": "18.1.0",
     "react-router-dom": "6.3.0",
-    "@umijs/bundler-utils": "4.0.0-canary.20230927.1"
+    "@umijs/bundler-utils": "4.0.0-canary.20231009.1"
   },
   "publishConfig": {
     "access": "public"