@umijs/server 4.0.0-canary.20230907.1 → 4.0.0-canary.20231007.1

package/dist/ssr.d.ts

@@ -18,7 +18,10 @@ 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>;
+export declare function createUmiHandler(opts: CreateRequestHandlerOptions): (req: Request) => Promise<unknown>;
+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);
@@ -96,7 +98,8 @@ function createJSXGenerator(opts) {
       pluginManager,
       location: url,
       manifest,
-      loaderData
+      loaderData,
+      withoutHTML: opts.withoutHTML
     };
     const element = await opts.getClientRootComponent(
       context
@@ -199,6 +202,34 @@ 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);
+    });
+  };
+}
+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 +267,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.0-canary.20230907.1",
+  "version": "4.0.0-canary.20231007.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.20230907.1"
+    "@umijs/bundler-utils": "4.0.0-canary.20231007.1"
   },
   "publishConfig": {
     "access": "public"