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

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>;
@@ -19,9 +19,10 @@ interface CreateRequestHandlerOptions {
     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,7 +92,7 @@ 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,
@@ -203,25 +204,16 @@ function createRequestHandler(opts) {
   };
 }
 function createUmiHandler(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);
-      if (!jsx) {
-        reject(new Error("no page resource"));
-        return;
-      }
-      const stream = await ReactDomServer.renderToReadableStream(jsx.element, {
-        bootstrapScripts: [jsx.manifest.assets["umi.js"] || "/umi.js"],
-        onError(err) {
-          reject(err);
-        }
-      });
-      resolve(stream);
+  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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/server",
-  "version": "4.0.0-canary.20231009.1",
+  "version": "4.0.0-canary.20231010.2",
   "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.20231009.1"
+    "@umijs/bundler-utils": "4.0.0-canary.20231010.2"
   },
   "publishConfig": {
     "access": "public"