@modern-js/plugin-ssg 2.63.5 → 2.63.7

package/dist/cjs/libs/util.js

@@ -28,6 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var util_exports = {};
 __export(util_exports, {
+  chunkArray: () => chunkArray,
   flattenRoutes: () => flattenRoutes,
   formatOutput: () => formatOutput,
   formatPath: () => formatPath,
@@ -181,8 +182,16 @@ const flattenRoutes = (routes) => {
   routes.forEach(traverseRoute);
   return newRoutes;
 };
+function chunkArray(arr, size) {
+  const result = [];
+  for (let i = 0; i < arr.length; i += size) {
+    result.push(arr.slice(i, i + size));
+  }
+  return result;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  chunkArray,
   flattenRoutes,
   formatOutput,
   formatPath,

package/dist/cjs/server/process.js

@@ -21,10 +21,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
+var import_assert = __toESM(require("assert"));
 var import_http = require("http");
 var import_prod_server = require("@modern-js/prod-server");
 var import_portfinder = __toESM(require("portfinder"));
+var import_util = require("../libs/util");
 var import_consts = require("./consts");
+const MAX_CONCURRENT_REQUESTS = 10;
 process.on("message", async (chunk) => {
   if (chunk === import_consts.CLOSE_SIGN) {
     process.exit();
@@ -45,19 +48,20 @@ process.on("message", async (chunk) => {
       plugins: await (0, import_prod_server.loadServerPlugins)(plugins, appContext.appDirectory || distDirectory),
       staticGenerate: true
     };
+    (0, import_assert.default)(process.send, "process.send is not available");
+    const sendProcessMessage = process.send.bind(process);
     nodeServer = await (0, import_prod_server.createProdServer)(serverOptions);
     nodeServer.listen(port, async () => {
-      if (!nodeServer) {
+      if (!nodeServer)
         return;
+      const chunkedRoutes = (0, import_util.chunkArray)(renderRoutes, MAX_CONCURRENT_REQUESTS);
+      for (const routes2 of chunkedRoutes) {
+        const promises = routes2.map(async (route) => getHtml(`http://localhost:${port}${route.urlPath}`, port));
+        for (const result of await Promise.all(promises)) {
+          sendProcessMessage(result);
+          sendProcessMessage(null);
+        }
       }
-      const htmlAry = await Promise.all(renderRoutes.map((route) => {
-        const url = `http://localhost:${port}${route.urlPath}`;
-        return getHtml(url, port);
-      }));
-      htmlAry.forEach((html) => {
-        process.send(html);
-        process.send(null);
-      });
       nodeServer.close();
     });
   } catch (e) {

package/dist/esm/libs/util.js

@@ -187,7 +187,15 @@ var flattenRoutes = function(routes) {
   routes.forEach(traverseRoute);
   return newRoutes;
 };
+function chunkArray(arr, size) {
+  var result = [];
+  for (var i = 0; i < arr.length; i += size) {
+    result.push(arr.slice(i, i + size));
+  }
+  return result;
+}
 export {
+  chunkArray,
   flattenRoutes,
   formatOutput,
   formatPath,

package/dist/esm/server/process.js

@@ -1,13 +1,16 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import assert from "assert";
 import { request } from "http";
 import { createProdServer, loadServerPlugins } from "@modern-js/prod-server";
 import portfinder from "portfinder";
+import { chunkArray } from "../libs/util";
 import { CLOSE_SIGN } from "./consts";
+var MAX_CONCURRENT_REQUESTS = 10;
 process.on("message", function() {
   var _ref = _async_to_generator(function(chunk) {
-    var context, routes, renderRoutes, options, appContext, plugins, distDirectory, nodeServer, serverConfig, defaultPort, port, serverOptions, _tmp, e;
+    var context, routes, renderRoutes, options, appContext, plugins, distDirectory, nodeServer, serverConfig, defaultPort, port, serverOptions, _tmp, sendProcessMessage, e;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -46,6 +49,8 @@ process.on("message", function() {
           ];
         case 3:
           serverOptions = (_tmp.plugins = _state.sent(), _tmp.staticGenerate = true, _tmp);
+          assert(process.send, "process.send is not available");
+          sendProcessMessage = process.send.bind(process);
           return [
             4,
             createProdServer(serverOptions)
@@ -53,28 +58,137 @@ process.on("message", function() {
         case 4:
           nodeServer = _state.sent();
           nodeServer.listen(port, /* @__PURE__ */ _async_to_generator(function() {
-            var htmlAry;
+            var chunkedRoutes, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, routes2, promises, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, result, err, err;
             return _ts_generator(this, function(_state2) {
               switch (_state2.label) {
                 case 0:
-                  if (!nodeServer) {
+                  if (!nodeServer)
                     return [
                       2
                     ];
-                  }
+                  chunkedRoutes = chunkArray(renderRoutes, MAX_CONCURRENT_REQUESTS);
+                  _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+                  _state2.label = 1;
+                case 1:
+                  _state2.trys.push([
+                    1,
+                    12,
+                    13,
+                    14
+                  ]);
+                  _iterator = chunkedRoutes[Symbol.iterator]();
+                  _state2.label = 2;
+                case 2:
+                  if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done))
+                    return [
+                      3,
+                      11
+                    ];
+                  routes2 = _step.value;
+                  promises = routes2.map(function() {
+                    var _ref2 = _async_to_generator(function(route) {
+                      return _ts_generator(this, function(_state3) {
+                        return [
+                          2,
+                          getHtml("http://localhost:".concat(port).concat(route.urlPath), port)
+                        ];
+                      });
+                    });
+                    return function(route) {
+                      return _ref2.apply(this, arguments);
+                    };
+                  }());
+                  _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
+                  _state2.label = 3;
+                case 3:
+                  _state2.trys.push([
+                    3,
+                    8,
+                    9,
+                    10
+                  ]);
                   return [
                     4,
-                    Promise.all(renderRoutes.map(function(route) {
-                      var url = "http://localhost:".concat(port).concat(route.urlPath);
-                      return getHtml(url, port);
-                    }))
+                    Promise.all(promises)
                   ];
-                case 1:
-                  htmlAry = _state2.sent();
-                  htmlAry.forEach(function(html) {
-                    process.send(html);
-                    process.send(null);
-                  });
+                case 4:
+                  _iterator1 = _state2.sent()[Symbol.iterator]();
+                  _state2.label = 5;
+                case 5:
+                  if (!!(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done))
+                    return [
+                      3,
+                      7
+                    ];
+                  result = _step1.value;
+                  sendProcessMessage(result);
+                  sendProcessMessage(null);
+                  _state2.label = 6;
+                case 6:
+                  _iteratorNormalCompletion1 = true;
+                  return [
+                    3,
+                    5
+                  ];
+                case 7:
+                  return [
+                    3,
+                    10
+                  ];
+                case 8:
+                  err = _state2.sent();
+                  _didIteratorError1 = true;
+                  _iteratorError1 = err;
+                  return [
+                    3,
+                    10
+                  ];
+                case 9:
+                  try {
+                    if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                      _iterator1.return();
+                    }
+                  } finally {
+                    if (_didIteratorError1) {
+                      throw _iteratorError1;
+                    }
+                  }
+                  return [
+                    7
+                  ];
+                case 10:
+                  _iteratorNormalCompletion = true;
+                  return [
+                    3,
+                    2
+                  ];
+                case 11:
+                  return [
+                    3,
+                    14
+                  ];
+                case 12:
+                  err = _state2.sent();
+                  _didIteratorError = true;
+                  _iteratorError = err;
+                  return [
+                    3,
+                    14
+                  ];
+                case 13:
+                  try {
+                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                      _iterator.return();
+                    }
+                  } finally {
+                    if (_didIteratorError) {
+                      throw _iteratorError;
+                    }
+                  }
+                  return [
+                    7
+                  ];
+                case 14:
                   nodeServer.close();
                   return [
                     2

package/dist/esm-node/libs/util.js

@@ -138,7 +138,15 @@ const flattenRoutes = (routes) => {
   routes.forEach(traverseRoute);
   return newRoutes;
 };
+function chunkArray(arr, size) {
+  const result = [];
+  for (let i = 0; i < arr.length; i += size) {
+    result.push(arr.slice(i, i + size));
+  }
+  return result;
+}
 export {
+  chunkArray,
   flattenRoutes,
   formatOutput,
   formatPath,

package/dist/esm-node/server/process.js

@@ -1,7 +1,10 @@
+import assert from "assert";
 import { request } from "http";
 import { createProdServer, loadServerPlugins } from "@modern-js/prod-server";
 import portfinder from "portfinder";
+import { chunkArray } from "../libs/util";
 import { CLOSE_SIGN } from "./consts";
+const MAX_CONCURRENT_REQUESTS = 10;
 process.on("message", async (chunk) => {
   if (chunk === CLOSE_SIGN) {
     process.exit();
@@ -22,19 +25,20 @@ process.on("message", async (chunk) => {
       plugins: await loadServerPlugins(plugins, appContext.appDirectory || distDirectory),
       staticGenerate: true
     };
+    assert(process.send, "process.send is not available");
+    const sendProcessMessage = process.send.bind(process);
     nodeServer = await createProdServer(serverOptions);
     nodeServer.listen(port, async () => {
-      if (!nodeServer) {
+      if (!nodeServer)
         return;
+      const chunkedRoutes = chunkArray(renderRoutes, MAX_CONCURRENT_REQUESTS);
+      for (const routes2 of chunkedRoutes) {
+        const promises = routes2.map(async (route) => getHtml(`http://localhost:${port}${route.urlPath}`, port));
+        for (const result of await Promise.all(promises)) {
+          sendProcessMessage(result);
+          sendProcessMessage(null);
+        }
       }
-      const htmlAry = await Promise.all(renderRoutes.map((route) => {
-        const url = `http://localhost:${port}${route.urlPath}`;
-        return getHtml(url, port);
-      }));
-      htmlAry.forEach((html) => {
-        process.send(html);
-        process.send(null);
-      });
       nodeServer.close();
     });
   } catch (e) {

package/dist/types/libs/util.d.ts

@@ -23,3 +23,4 @@ export declare const openRouteSSR: (routes: ModernRoute[], entries?: string[]) =
     responseHeaders?: Record<string, unknown> | undefined;
 }[];
 export declare const flattenRoutes: (routes: AgreedRoute[]) => AgreedRoute[];
+export declare function chunkArray<T>(arr: T[], size: number): T[][];

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.63.5",
+  "version": "2.63.7",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -63,8 +63,8 @@
     "node-mocks-http": "^1.11.0",
     "normalize-path": "3.0.0",
     "portfinder": "^1.0.28",
-    "@modern-js/prod-server": "2.63.5",
-    "@modern-js/utils": "2.63.5"
+    "@modern-js/prod-server": "2.63.7",
+    "@modern-js/utils": "2.63.7"
   },
   "peerDependencies": {
     "react-router-dom": ">=5.1.2"
@@ -82,10 +82,10 @@
     "react-dom": "^18.3.1",
     "react-router-dom": "6.27.0",
     "typescript": "^5",
-    "@modern-js/app-tools": "2.63.5",
-    "@modern-js/types": "2.63.5",
-    "@scripts/jest-config": "2.63.5",
-    "@scripts/build": "2.63.5"
+    "@modern-js/app-tools": "2.63.7",
+    "@modern-js/types": "2.63.7",
+    "@scripts/build": "2.63.7",
+    "@scripts/jest-config": "2.63.7"
   },
   "sideEffects": false,
   "publishConfig": {