@modern-js/plugin-ssg 2.27.0 → 2.28.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @modern-js/plugin-ssg
 
+## 2.28.0
+
+### Patch Changes
+
+- Updated dependencies [00b58a7]
+  - @modern-js/utils@2.28.0
+
 ## 2.27.0
 
 ### Patch Changes

package/dist/cjs/libs/util.js

@@ -136,18 +136,21 @@ const standardOptions = (ssgOptions, entrypoints, routes, server) => {
   } else if (typeof ssgOptions === "function") {
     const intermediateOptions = {};
     for (const entrypoint of entrypoints) {
+      var _server;
       const { entryName } = entrypoint;
-      if (Array.isArray(server === null || server === void 0 ? void 0 : server.baseUrl)) {
+      if (Array.isArray((_server = server) === null || _server === void 0 ? void 0 : _server.baseUrl)) {
         for (const url of server.baseUrl) {
+          var _route;
           const matchUrl = entryName === "main" ? url : `${url}/${entryName}`;
           const route = routes.find((route2) => route2.urlPath === matchUrl);
-          intermediateOptions[route === null || route === void 0 ? void 0 : route.urlPath] = ssgOptions(entryName, {
+          intermediateOptions[(_route = route) === null || _route === void 0 ? void 0 : _route.urlPath] = ssgOptions(entryName, {
             baseUrl: url
           });
         }
       } else {
+        var _server1;
         intermediateOptions[entryName] = ssgOptions(entryName, {
-          baseUrl: server === null || server === void 0 ? void 0 : server.baseUrl
+          baseUrl: (_server1 = server) === null || _server1 === void 0 ? void 0 : _server1.baseUrl
         });
       }
     }

package/dist/cjs/server/index.js

@@ -14,59 +14,57 @@ const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _utils = require("@modern-js/utils");
 const _util = require("../libs/util");
 const _consts = require("./consts");
-const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirectory) => {
-  return new Promise((resolve, reject) => {
-    var _cp_stderr, _cp_stdout;
-    const entries = ssgRoutes.map((route) => route.entryName);
-    const backup = (0, _util.openRouteSSR)(pageRoutes, entries);
-    const total = backup.concat(apiRoutes);
-    const cp = _child_process.default.fork(_path.default.join(__dirname, "process"), {
-      cwd: appDirectory,
-      silent: true
-    });
-    const appContext = api.useAppContext();
-    const plugins = appContext.serverInternalPlugins;
-    cp.send(JSON.stringify({
-      options,
-      renderRoutes: ssgRoutes,
-      routes: total,
-      appDirectory,
-      plugins
-    }));
-    const htmlChunks = [];
-    const htmlAry = [];
-    cp.on("message", (chunk) => {
-      if (chunk !== null) {
-        htmlChunks.push(chunk);
-      } else {
-        const html = htmlChunks.join("");
-        htmlAry.push(html);
-        htmlChunks.length = 0;
-      }
-      if (htmlAry.length === ssgRoutes.length) {
-        cp.send(_consts.CLOSE_SIGN);
-        resolve(htmlAry);
-      }
-    });
-    (_cp_stderr = cp.stderr) === null || _cp_stderr === void 0 ? void 0 : _cp_stderr.on("data", (chunk) => {
-      const str = chunk.toString();
-      if (str.includes("Error")) {
-        _utils.logger.error(str);
-        reject(new Error("ssg render failed"));
-        cp.kill("SIGKILL");
-      } else {
-        _utils.logger.info(str.replace(/[^\S\n]+/g, " "));
-      }
-    });
-    (_cp_stdout = cp.stdout) === null || _cp_stdout === void 0 ? void 0 : _cp_stdout.on("data", (chunk) => {
-      const str = chunk.toString();
-      if (str.includes("Error")) {
-        _utils.logger.error(str);
-        reject(new Error("ssg render failed"));
-        cp.kill("SIGKILL");
-      } else {
-        _utils.logger.info(str.replace(/[^\S\n]+/g, " "));
-      }
-    });
+const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirectory) => new Promise((resolve, reject) => {
+  var _cp_stderr, _cp_stdout;
+  const entries = ssgRoutes.map((route) => route.entryName);
+  const backup = (0, _util.openRouteSSR)(pageRoutes, entries);
+  const total = backup.concat(apiRoutes);
+  const cp = _child_process.default.fork(_path.default.join(__dirname, "process"), {
+    cwd: appDirectory,
+    silent: true
   });
-};
+  const appContext = api.useAppContext();
+  const plugins = appContext.serverInternalPlugins;
+  cp.send(JSON.stringify({
+    options,
+    renderRoutes: ssgRoutes,
+    routes: total,
+    appDirectory,
+    plugins
+  }));
+  const htmlChunks = [];
+  const htmlAry = [];
+  cp.on("message", (chunk) => {
+    if (chunk !== null) {
+      htmlChunks.push(chunk);
+    } else {
+      const html = htmlChunks.join("");
+      htmlAry.push(html);
+      htmlChunks.length = 0;
+    }
+    if (htmlAry.length === ssgRoutes.length) {
+      cp.send(_consts.CLOSE_SIGN);
+      resolve(htmlAry);
+    }
+  });
+  (_cp_stderr = cp.stderr) === null || _cp_stderr === void 0 ? void 0 : _cp_stderr.on("data", (chunk) => {
+    const str = chunk.toString();
+    if (str.includes("Error")) {
+      _utils.logger.error(str);
+      reject(new Error("ssg render failed"));
+      cp.kill("SIGKILL");
+    } else {
+      _utils.logger.info(str.replace(/[^\S\n]+/g, " "));
+    }
+  });
+  (_cp_stdout = cp.stdout) === null || _cp_stdout === void 0 ? void 0 : _cp_stdout.on("data", (chunk) => {
+    const str = chunk.toString();
+    if (str.includes("Error")) {
+      _utils.logger.error(str);
+      reject(new Error("ssg render failed"));
+      cp.kill("SIGKILL");
+    } else {
+      _utils.logger.info(str.replace(/[^\S\n]+/g, " "));
+    }
+  });
+});

package/dist/cjs/server/process.js

@@ -44,7 +44,8 @@ process.on("message", async (chunk) => {
       modernServer.close();
     });
   } catch (e) {
-    modernServer === null || modernServer === void 0 ? void 0 : modernServer.close();
+    var _modernServer;
+    (_modernServer = modernServer) === null || _modernServer === void 0 ? void 0 : _modernServer.close();
     process.stderr.write(e instanceof Error ? e.stack : e.toString());
   }
 });

package/dist/esm/libs/util.js

@@ -100,17 +100,19 @@ export var standardOptions = function(ssgOptions, entrypoints, routes, server) {
     try {
       var _loop = function() {
         var entrypoint = _step.value;
+        var _server;
         var entryName = entrypoint.entryName;
-        if (Array.isArray(server === null || server === void 0 ? void 0 : server.baseUrl)) {
+        if (Array.isArray((_server = server) === null || _server === void 0 ? void 0 : _server.baseUrl)) {
           var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
           try {
             var _loop2 = function() {
               var url = _step1.value;
+              var _route;
               var matchUrl = entryName === "main" ? url : "".concat(url, "/").concat(entryName);
               var route = routes.find(function(route2) {
                 return route2.urlPath === matchUrl;
               });
-              intermediateOptions[route === null || route === void 0 ? void 0 : route.urlPath] = ssgOptions(entryName, {
+              intermediateOptions[(_route = route) === null || _route === void 0 ? void 0 : _route.urlPath] = ssgOptions(entryName, {
                 baseUrl: url
               });
             };
@@ -131,8 +133,9 @@ export var standardOptions = function(ssgOptions, entrypoints, routes, server) {
             }
           }
         } else {
+          var _server1;
           intermediateOptions[entryName] = ssgOptions(entryName, {
-            baseUrl: server === null || server === void 0 ? void 0 : server.baseUrl
+            baseUrl: (_server1 = server) === null || _server1 === void 0 ? void 0 : _server1.baseUrl
           });
         }
       };

package/dist/esm/server/process.js

@@ -8,7 +8,7 @@ import { compile as createRender } from "./prerender";
 import { CLOSE_SIGN } from "./consts";
 process.on("message", function() {
   var _ref = _async_to_generator(function(chunk) {
-    var context, routes, renderRoutes, options, appDirectory, plugins, modernServer, serverOptions, defaultPort, port, e;
+    var context, routes, renderRoutes, options, appDirectory, plugins, modernServer, serverOptions, defaultPort, port, e, _modernServer;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -90,7 +90,7 @@ process.on("message", function() {
           ];
         case 4:
           e = _state.sent();
-          modernServer === null || modernServer === void 0 ? void 0 : modernServer.close();
+          (_modernServer = modernServer) === null || _modernServer === void 0 ? void 0 : _modernServer.close();
           process.stderr.write(_instanceof(e, Error) ? e.stack : e.toString());
           return [
             3,

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

@@ -89,18 +89,21 @@ export const standardOptions = (ssgOptions, entrypoints, routes, server) => {
   } else if (typeof ssgOptions === "function") {
     const intermediateOptions = {};
     for (const entrypoint of entrypoints) {
+      var _server;
       const { entryName } = entrypoint;
-      if (Array.isArray(server === null || server === void 0 ? void 0 : server.baseUrl)) {
+      if (Array.isArray((_server = server) === null || _server === void 0 ? void 0 : _server.baseUrl)) {
         for (const url of server.baseUrl) {
+          var _route;
           const matchUrl = entryName === "main" ? url : `${url}/${entryName}`;
           const route = routes.find((route2) => route2.urlPath === matchUrl);
-          intermediateOptions[route === null || route === void 0 ? void 0 : route.urlPath] = ssgOptions(entryName, {
+          intermediateOptions[(_route = route) === null || _route === void 0 ? void 0 : _route.urlPath] = ssgOptions(entryName, {
             baseUrl: url
           });
         }
       } else {
+        var _server1;
         intermediateOptions[entryName] = ssgOptions(entryName, {
-          baseUrl: server === null || server === void 0 ? void 0 : server.baseUrl
+          baseUrl: (_server1 = server) === null || _server1 === void 0 ? void 0 : _server1.baseUrl
         });
       }
     }

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

@@ -3,59 +3,57 @@ import path from "path";
 import { logger } from "@modern-js/utils";
 import { openRouteSSR } from "../libs/util";
 import { CLOSE_SIGN } from "./consts";
-export const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirectory) => {
-  return new Promise((resolve, reject) => {
-    var _cp_stderr, _cp_stdout;
-    const entries = ssgRoutes.map((route) => route.entryName);
-    const backup = openRouteSSR(pageRoutes, entries);
-    const total = backup.concat(apiRoutes);
-    const cp = childProcess.fork(path.join(__dirname, "process"), {
-      cwd: appDirectory,
-      silent: true
-    });
-    const appContext = api.useAppContext();
-    const plugins = appContext.serverInternalPlugins;
-    cp.send(JSON.stringify({
-      options,
-      renderRoutes: ssgRoutes,
-      routes: total,
-      appDirectory,
-      plugins
-    }));
-    const htmlChunks = [];
-    const htmlAry = [];
-    cp.on("message", (chunk) => {
-      if (chunk !== null) {
-        htmlChunks.push(chunk);
-      } else {
-        const html = htmlChunks.join("");
-        htmlAry.push(html);
-        htmlChunks.length = 0;
-      }
-      if (htmlAry.length === ssgRoutes.length) {
-        cp.send(CLOSE_SIGN);
-        resolve(htmlAry);
-      }
-    });
-    (_cp_stderr = cp.stderr) === null || _cp_stderr === void 0 ? void 0 : _cp_stderr.on("data", (chunk) => {
-      const str = chunk.toString();
-      if (str.includes("Error")) {
-        logger.error(str);
-        reject(new Error("ssg render failed"));
-        cp.kill("SIGKILL");
-      } else {
-        logger.info(str.replace(/[^\S\n]+/g, " "));
-      }
-    });
-    (_cp_stdout = cp.stdout) === null || _cp_stdout === void 0 ? void 0 : _cp_stdout.on("data", (chunk) => {
-      const str = chunk.toString();
-      if (str.includes("Error")) {
-        logger.error(str);
-        reject(new Error("ssg render failed"));
-        cp.kill("SIGKILL");
-      } else {
-        logger.info(str.replace(/[^\S\n]+/g, " "));
-      }
-    });
+export const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirectory) => new Promise((resolve, reject) => {
+  var _cp_stderr, _cp_stdout;
+  const entries = ssgRoutes.map((route) => route.entryName);
+  const backup = openRouteSSR(pageRoutes, entries);
+  const total = backup.concat(apiRoutes);
+  const cp = childProcess.fork(path.join(__dirname, "process"), {
+    cwd: appDirectory,
+    silent: true
   });
-};
+  const appContext = api.useAppContext();
+  const plugins = appContext.serverInternalPlugins;
+  cp.send(JSON.stringify({
+    options,
+    renderRoutes: ssgRoutes,
+    routes: total,
+    appDirectory,
+    plugins
+  }));
+  const htmlChunks = [];
+  const htmlAry = [];
+  cp.on("message", (chunk) => {
+    if (chunk !== null) {
+      htmlChunks.push(chunk);
+    } else {
+      const html = htmlChunks.join("");
+      htmlAry.push(html);
+      htmlChunks.length = 0;
+    }
+    if (htmlAry.length === ssgRoutes.length) {
+      cp.send(CLOSE_SIGN);
+      resolve(htmlAry);
+    }
+  });
+  (_cp_stderr = cp.stderr) === null || _cp_stderr === void 0 ? void 0 : _cp_stderr.on("data", (chunk) => {
+    const str = chunk.toString();
+    if (str.includes("Error")) {
+      logger.error(str);
+      reject(new Error("ssg render failed"));
+      cp.kill("SIGKILL");
+    } else {
+      logger.info(str.replace(/[^\S\n]+/g, " "));
+    }
+  });
+  (_cp_stdout = cp.stdout) === null || _cp_stdout === void 0 ? void 0 : _cp_stdout.on("data", (chunk) => {
+    const str = chunk.toString();
+    if (str.includes("Error")) {
+      logger.error(str);
+      reject(new Error("ssg render failed"));
+      cp.kill("SIGKILL");
+    } else {
+      logger.info(str.replace(/[^\S\n]+/g, " "));
+    }
+  });
+});

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

@@ -39,7 +39,8 @@ process.on("message", async (chunk) => {
       modernServer.close();
     });
   } catch (e) {
-    modernServer === null || modernServer === void 0 ? void 0 : modernServer.close();
+    var _modernServer;
+    (_modernServer = modernServer) === null || _modernServer === void 0 ? void 0 : _modernServer.close();
     process.stderr.write(e instanceof Error ? e.stack : e.toString());
   }
 });

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.27.0",
+  "version": "2.28.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -63,7 +63,7 @@
     "normalize-path": "^3.0.0",
     "portfinder": "^1.0.28",
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "2.27.0"
+    "@modern-js/utils": "2.28.0"
   },
   "peerDependencies": {
     "react-router-dom": ">=5.1.2"
@@ -81,11 +81,11 @@
     "react-dom": "^18",
     "react-router-dom": "^6.8.1",
     "typescript": "^5",
-    "@modern-js/app-tools": "2.27.0",
-    "@modern-js/prod-server": "2.27.0",
-    "@modern-js/types": "2.27.0",
-    "@scripts/build": "2.27.0",
-    "@scripts/jest-config": "2.27.0"
+    "@modern-js/app-tools": "2.28.0",
+    "@modern-js/prod-server": "2.28.0",
+    "@modern-js/types": "2.28.0",
+    "@scripts/build": "2.28.0",
+    "@scripts/jest-config": "2.28.0"
   },
   "sideEffects": false,
   "publishConfig": {