@umijs/server 4.0.84 → 4.0.86

package/dist/ssr.d.ts

@@ -6,7 +6,7 @@ export declare type ServerInsertedHTMLHook = (callbacks: () => React.ReactNode)
 interface CreateRequestHandlerOptions {
     routesWithServerLoader: RouteLoaders;
     PluginManager: any;
-    manifest: (() => {
+    manifest: ((sourceDir?: string) => {
         assets: Record<string, string>;
     }) | {
         assets: Record<string, string>;
@@ -18,9 +18,11 @@ interface CreateRequestHandlerOptions {
     createHistory: (opts: any) => any;
     helmetContext?: any;
     ServerInsertedHTMLContext: React.Context<ServerInsertedHTMLHook | null>;
+    withoutHTML?: boolean;
+    sourceDir?: string;
 }
 export declare function createMarkupGenerator(opts: CreateRequestHandlerOptions): (url: string) => Promise<unknown>;
 export default function createRequestHandler(opts: CreateRequestHandlerOptions): (req: any, res: any, next: any) => Promise<any>;
-export declare function createUmiHandler(opts: CreateRequestHandlerOptions): (req: Request) => Promise<unknown>;
+export declare function createUmiHandler(opts: CreateRequestHandlerOptions): (req: Request, params?: CreateRequestHandlerOptions) => Promise<NodeJS.ReadableStream>;
 export declare function createUmiServerLoader(opts: CreateRequestHandlerOptions): (req: Request) => Promise<any>;
 export {};

package/dist/ssr.js

@@ -62,7 +62,8 @@ function createJSXGenerator(opts) {
       getPlugins,
       getValidKeys,
       getRoutes,
-      createHistory
+      createHistory,
+      sourceDir
     } = opts;
     createHistory({ type: "memory", initialEntries: [url], initialIndex: 1 });
     const pluginManager = PluginManager.create({
@@ -91,14 +92,15 @@ function createJSXGenerator(opts) {
         })
       )
     );
-    const manifest = typeof opts.manifest === "function" ? opts.manifest() : opts.manifest;
+    const manifest = typeof opts.manifest === "function" ? opts.manifest(sourceDir) : opts.manifest;
     const context = {
       routes,
       routeComponents,
       pluginManager,
       location: url,
       manifest,
-      loaderData
+      loaderData,
+      withoutHTML: opts.withoutHTML
     };
     const element = await opts.getClientRootComponent(
       context
@@ -202,42 +204,22 @@ function createRequestHandler(opts) {
   };
 }
 function createUmiHandler(opts) {
-  const jsxGeneratorDeferrer = createJSXGenerator(opts);
-  return function(req) {
-    return new Promise(async (resolve, reject) => {
-      const jsx = await jsxGeneratorDeferrer(new URL(req.url).pathname);
-      if (!jsx) {
-        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, {
-        bootstrapScripts: [jsx.manifest.assets["umi.js"] || "/umi.js"],
-        onShellReady() {
-          stream.pipe(writable);
-        },
-        onError(err) {
-          reject(err);
-        }
-      });
+  return async function(req, params) {
+    const jsxGeneratorDeferrer = createJSXGenerator({
+      ...opts,
+      ...params
     });
+    const jsx = await jsxGeneratorDeferrer(new URL(req.url).pathname);
+    if (!jsx) {
+      throw new Error("no page resource");
+    }
+    return ReactDomServer.renderToNodeStream(jsx.element);
   };
 }
 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.84",
+  "version": "4.0.86",
   "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.84"
+    "@umijs/bundler-utils": "4.0.86"
   },
   "publishConfig": {
     "access": "public"