@umijs/server 4.0.83 → 4.0.85

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,7 +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, params?: CreateRequestHandlerOptions) => Promise<NodeJS.ReadableStream>;
+export declare function createUmiServerLoader(opts: CreateRequestHandlerOptions): (req: Request) => Promise<any>;
 export {};

package/dist/ssr.js

@@ -30,6 +30,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var ssr_exports = {};
 __export(ssr_exports, {
   createMarkupGenerator: () => createMarkupGenerator,
+  createUmiHandler: () => createUmiHandler,
+  createUmiServerLoader: () => createUmiServerLoader,
   default: () => createRequestHandler
 });
 module.exports = __toCommonJS(ssr_exports);
@@ -60,7 +62,8 @@ function createJSXGenerator(opts) {
       getPlugins,
       getValidKeys,
       getRoutes,
-      createHistory
+      createHistory,
+      sourceDir
     } = opts;
     createHistory({ type: "memory", initialEntries: [url], initialIndex: 1 });
     const pluginManager = PluginManager.create({
@@ -89,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
@@ -199,6 +203,25 @@ function createRequestHandler(opts) {
     });
   };
 }
+function createUmiHandler(opts) {
+  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);
+  };
+}
 function matchRoutesForSSR(reqUrl, routesById) {
   var _a;
   return ((_a = (0, import_react_router_dom.matchRoutes)(createClientRoutes({ routesById }), reqUrl)) == null ? void 0 : _a.map(
@@ -236,5 +259,7 @@ async function executeLoader(routeKey, routesWithServerLoader) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createMarkupGenerator
+  createMarkupGenerator,
+  createUmiHandler,
+  createUmiServerLoader
 });

package/package.json

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