@umijs/server 4.0.71 → 4.0.73

package/dist/ssr.d.ts

@@ -1,6 +1,8 @@
+import React from 'react';
 interface RouteLoaders {
     [key: string]: () => Promise<any>;
 }
+export declare type ServerInsertedHTMLHook = (callbacks: () => React.ReactNode) => void;
 interface CreateRequestHandlerOptions {
     routesWithServerLoader: RouteLoaders;
     PluginManager: any;
@@ -15,6 +17,7 @@ interface CreateRequestHandlerOptions {
     getClientRootComponent: (PluginManager: any) => any;
     createHistory: (opts: any) => any;
     helmetContext?: any;
+    ServerInsertedHTMLContext: React.Context<ServerInsertedHTMLHook | null>;
 }
 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

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/ssr.ts
@@ -23,9 +33,25 @@ __export(ssr_exports, {
   default: () => createRequestHandler
 });
 module.exports = __toCommonJS(ssr_exports);
-var import_server = require("react-dom/server");
+var import_react = __toESM(require("react"));
+var ReactDomServer = __toESM(require("react-dom/server"));
 var import_react_router_dom = require("react-router-dom");
 var import_stream = require("stream");
+var createJSXProvider = (Provider, serverInsertedHTMLCallbacks) => {
+  const JSXProvider = (props) => {
+    const addInsertedHtml = import_react.default.useCallback(
+      (handler) => {
+        serverInsertedHTMLCallbacks.add(handler);
+      },
+      []
+    );
+    return import_react.default.createElement(Provider, {
+      children: props.children,
+      value: addInsertedHtml
+    });
+  };
+  return JSXProvider;
+};
 function createJSXGenerator(opts) {
   return async (url) => {
     const {
@@ -72,26 +98,44 @@ function createJSXGenerator(opts) {
       manifest,
       loaderData
     };
+    const element = await opts.getClientRootComponent(
+      context
+    );
     return {
-      element: await opts.getClientRootComponent(context),
+      element,
       manifest
     };
   };
 }
+var getGenerateStaticHTML = (serverInsertedHTMLCallbacks) => {
+  return ReactDomServer.renderToString(
+    import_react.default.createElement(import_react.default.Fragment, {
+      children: Array.from(serverInsertedHTMLCallbacks || []).map(
+        (callback) => callback()
+      )
+    })
+  ) || "";
+};
 function createMarkupGenerator(opts) {
   const jsxGeneratorDeferrer = createJSXGenerator(opts);
   return async (url) => {
     const jsx = await jsxGeneratorDeferrer(url);
     if (jsx) {
       return new Promise(async (resolve, reject) => {
+        const serverInsertedHTMLCallbacks = /* @__PURE__ */ new Set();
+        const JSXProvider = createJSXProvider(
+          opts.ServerInsertedHTMLContext.Provider,
+          serverInsertedHTMLCallbacks
+        );
         let chunks = [];
         const writable = new import_stream.Writable();
         writable._write = (chunk, _encoding, next) => {
           chunks.push(Buffer.from(chunk));
           next();
         };
-        writable.on("finish", () => {
+        writable.on("finish", async () => {
           let html = Buffer.concat(chunks).toString("utf8");
+          html += await getGenerateStaticHTML(serverInsertedHTMLCallbacks);
           if (opts.helmetContext) {
             html = html.replace(
               /(<\/head>)/,
@@ -107,12 +151,15 @@ function createMarkupGenerator(opts) {
           }
           resolve(html);
         });
-        const stream = (0, import_server.renderToPipeableStream)(jsx.element, {
-          onShellReady() {
-            stream.pipe(writable);
-          },
-          onError: reject
-        });
+        const stream = ReactDomServer.renderToPipeableStream(
+          import_react.default.createElement(JSXProvider, { children: jsx.element }),
+          {
+            onShellReady() {
+              stream.pipe(writable);
+            },
+            onError: reject
+          }
+        );
       });
     }
     return "";
@@ -132,11 +179,19 @@ function createRequestHandler(opts) {
     const jsx = await jsxGeneratorDeferrer(req.url);
     if (!jsx)
       return next();
-    const stream = (0, import_server.renderToPipeableStream)(jsx.element, {
+    const writable = new import_stream.Writable();
+    writable._write = (chunk, _encoding, next2) => {
+      res.write(chunk);
+      next2();
+    };
+    writable.on("finish", async () => {
+      res.write(await getGenerateStaticHTML());
+      res.end();
+    });
+    const stream = await ReactDomServer.renderToPipeableStream(jsx.element, {
       bootstrapScripts: [jsx.manifest.assets["umi.js"] || "/umi.js"],
       onShellReady() {
-        res.setHeader("Content-type", "text/html");
-        stream.pipe(res);
+        stream.pipe(writable);
       },
       onError(x) {
         console.error(x);

package/package.json

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