@umijs/server 4.0.28 → 4.0.30

package/dist/server.js

@@ -33,7 +33,16 @@ var import_styles = require("./styles");
 async function getMarkup(opts) {
   let markup = import_server.default.renderToString(import_react.default.createElement("div", { id: opts.mountElementId || "root" }));
   function propsToString(opts2) {
-    return Object.keys(opts2.props).filter((key) => !(opts2.filters || []).includes(key)).map((key) => `${key}=${JSON.stringify(opts2.props[key])}`).join(" ");
+    return Object.keys(opts2.props).filter((key) => {
+      const isValidBoolean = opts2.props[key] !== false;
+      return !(opts2.filters || []).includes(key) && isValidBoolean;
+    }).map((key) => {
+      const value = opts2.props[key];
+      if (value === true) {
+        return `${key}`;
+      }
+      return `${key}=${JSON.stringify(value)}`;
+    }).join(" ");
   }
   function getScriptContent(script) {
     const attrs = propsToString({

package/dist/ssr.d.ts

@@ -13,6 +13,9 @@ interface CreateRequestHandlerOptions {
     getValidKeys: () => any;
     getRoutes: (PluginManager: any) => any;
     getClientRootComponent: (PluginManager: any) => any;
+    helmetContext: any;
+    createHistory: (opts: any) => any;
 }
+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 {};

package/dist/ssr.js

@@ -19,33 +19,40 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/ssr.ts
 var ssr_exports = {};
 __export(ssr_exports, {
+  createMarkupGenerator: () => createMarkupGenerator,
   default: () => createRequestHandler
 });
 module.exports = __toCommonJS(ssr_exports);
+var import_stream = require("stream");
 var import_server = require("react-dom/server");
 var import_react_router_dom = require("react-router-dom");
-function createRequestHandler(opts) {
-  return async function(req, res, next) {
+function createJSXGenerator(opts) {
+  return async (url) => {
     const {
       routesWithServerLoader,
       PluginManager,
       getPlugins,
       getValidKeys,
-      getRoutes
+      getRoutes,
+      createHistory
     } = opts;
-    if (req.url.startsWith("/__serverLoader") && req.query.route) {
-      const data = await executeLoader(req.query.route, routesWithServerLoader);
-      res.status(200).json(data);
-      return;
-    }
+    createHistory({ type: "memory", initialEntries: [url], initialIndex: 1 });
     const pluginManager = PluginManager.create({
       plugins: getPlugins(),
       validKeys: getValidKeys()
     });
     const { routes, routeComponents } = await getRoutes(pluginManager);
-    const matches = matchRoutesForSSR(req.url, routes);
+    await pluginManager.applyPlugins({
+      key: "patchRoutes",
+      type: "event",
+      args: {
+        routes,
+        routeComponents
+      }
+    });
+    const matches = matchRoutesForSSR(url, routes);
     if (matches.length === 0) {
-      return next();
+      return;
     }
     const loaderData = {};
     await Promise.all(matches.filter((id) => routes[id].hasServerLoader).map((id) => new Promise(async (resolve) => {
@@ -57,13 +64,64 @@ function createRequestHandler(opts) {
       routes,
       routeComponents,
       pluginManager,
-      location: req.url,
+      location: url,
       manifest,
       loaderData
     };
-    const jsx = await opts.getClientRootComponent(context);
-    const stream = (0, import_server.renderToPipeableStream)(jsx, {
-      bootstrapScripts: [manifest.assets["umi.js"] || "/umi.js"],
+    return {
+      element: await opts.getClientRootComponent(context),
+      manifest
+    };
+  };
+}
+function createMarkupGenerator(opts) {
+  const jsxGeneratorDeferrer = createJSXGenerator(opts);
+  return async (url) => {
+    const jsx = await jsxGeneratorDeferrer(url);
+    if (jsx) {
+      return new Promise(async (resolve, reject) => {
+        let chunks = [];
+        const writable = new import_stream.Writable();
+        writable._write = (chunk, _encoding, next) => {
+          chunks.push(Buffer.from(chunk));
+          next();
+        };
+        writable.on("finish", () => {
+          let html = Buffer.concat(chunks).toString("utf8");
+          html = html.replace(/(<\/head>)/, [
+            opts.helmetContext.helmet.title.toString(),
+            opts.helmetContext.helmet.priority.toString(),
+            opts.helmetContext.helmet.meta.toString(),
+            opts.helmetContext.helmet.link.toString(),
+            opts.helmetContext.helmet.script.toString(),
+            "$1"
+          ].filter(Boolean).join("/n"));
+          resolve(html);
+        });
+        const stream = (0, import_server.renderToPipeableStream)(jsx.element, {
+          onShellReady() {
+            stream.pipe(writable);
+          },
+          onError: reject
+        });
+      });
+    }
+    return "";
+  };
+}
+function createRequestHandler(opts) {
+  const jsxGeneratorDeferrer = createJSXGenerator(opts);
+  return async function(req, res, next) {
+    if (req.url.startsWith("/__serverLoader") && req.query.route) {
+      const data = await executeLoader(req.query.route, opts.routesWithServerLoader);
+      res.status(200).json(data);
+      return;
+    }
+    const jsx = await jsxGeneratorDeferrer(req.url);
+    if (!jsx)
+      return next();
+    const stream = (0, import_server.renderToPipeableStream)(jsx.element, {
+      bootstrapScripts: [jsx.manifest.assets["umi.js"] || "/umi.js"],
       onShellReady() {
         res.setHeader("Content-type", "text/html");
         stream.pipe(res);
@@ -108,4 +166,6 @@ async function executeLoader(routeKey, routesWithServerLoader) {
   return await mod.serverLoader();
 }
 // Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+0 && (module.exports = {
+  createMarkupGenerator
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/server",
-  "version": "4.0.28",
+  "version": "4.0.30",
   "description": "@umijs/server",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/server#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -20,7 +20,7 @@
     "dev": "umi-scripts father dev"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.28",
+    "@umijs/bundler-utils": "4.0.30",
     "history": "5.3.0",
     "react": "18.1.0",
     "react-dom": "18.1.0",