@modern-js/plugin-ssg 2.15.0 → 2.17.0

package/dist/esm/libs/util.js

@@ -1,239 +1,240 @@
-function _defineProperty(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        obj[key] = value;
-    }
-    return obj;
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
 }
-function _objectSpread(target) {
-    for(var i = 1; i < arguments.length; i++){
-        var source = arguments[i] != null ? arguments[i] : {};
-        var ownKeys = Object.keys(source);
-        if (typeof Object.getOwnPropertySymbols === "function") {
-            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-            }));
-        }
-        ownKeys.forEach(function(key) {
-            _defineProperty(target, key, source[key]);
-        });
+function _object_spread(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i] != null ? arguments[i] : {};
+    var ownKeys2 = Object.keys(source);
+    if (typeof Object.getOwnPropertySymbols === "function") {
+      ownKeys2 = ownKeys2.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+        return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+      }));
     }
-    return target;
+    ownKeys2.forEach(function(key) {
+      _define_property(target, key, source[key]);
+    });
+  }
+  return target;
 }
 function ownKeys(object, enumerableOnly) {
-    var keys = Object.keys(object);
-    if (Object.getOwnPropertySymbols) {
-        var symbols = Object.getOwnPropertySymbols(object);
-        if (enumerableOnly) {
-            symbols = symbols.filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-            });
-        }
-        keys.push.apply(keys, symbols);
+  var keys = Object.keys(object);
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    if (enumerableOnly) {
+      symbols = symbols.filter(function(sym) {
+        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+      });
     }
-    return keys;
+    keys.push.apply(keys, symbols);
+  }
+  return keys;
 }
-function _objectSpreadProps(target, source) {
-    source = source != null ? source : {};
-    if (Object.getOwnPropertyDescriptors) {
-        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-        ownKeys(Object(source)).forEach(function(key) {
-            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-        });
-    }
-    return target;
+function _object_spread_props(target, source) {
+  source = source != null ? source : {};
+  if (Object.getOwnPropertyDescriptors) {
+    Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+  } else {
+    ownKeys(Object(source)).forEach(function(key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
+  }
+  return target;
 }
 import path from "path";
 import { ROUTE_SPEC_FILE, fs, isSingleEntry, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils";
-function formatOutput(filename) {
-    var outputPath = path.extname(filename) ? filename : "".concat(filename, "/index.html");
-    return outputPath;
+export function formatOutput(filename) {
+  var outputPath = path.extname(filename) ? filename : "".concat(filename, "/index.html");
+  return outputPath;
 }
-function formatPath(str) {
-    var addr = str;
-    if (!addr || typeof addr !== "string") {
-        return addr;
-    }
-    if (addr.startsWith(".")) {
-        addr = addr.slice(1);
-    }
-    if (!addr.startsWith("/")) {
-        addr = "/".concat(addr);
-    }
-    if (addr.endsWith("/") && addr !== "/") {
-        addr = addr.slice(0, addr.length - 1);
-    }
+export function formatPath(str) {
+  var addr = str;
+  if (!addr || typeof addr !== "string") {
     return addr;
+  }
+  if (addr.startsWith(".")) {
+    addr = addr.slice(1);
+  }
+  if (!addr.startsWith("/")) {
+    addr = "/".concat(addr);
+  }
+  if (addr.endsWith("/") && addr !== "/") {
+    addr = addr.slice(0, addr.length - 1);
+  }
+  return addr;
 }
-function isDynamicUrl(url) {
-    return url.includes(":");
+export function isDynamicUrl(url) {
+  return url.includes(":");
 }
-function getUrlPrefix(route, baseUrl) {
-    var base = "";
-    if (Array.isArray(baseUrl)) {
-        var filters = baseUrl.filter(function(url) {
-            return route.urlPath.includes(url);
-        });
-        if (filters.length > 1) {
-            var matched = filters.sort(function(a, b) {
-                return a.length - b.length;
-            })[0];
-            if (!matched) {
-                throw new Error("");
-            }
-            base = matched;
-        }
-    } else {
-        base = baseUrl;
+export function getUrlPrefix(route, baseUrl) {
+  var base = "";
+  if (Array.isArray(baseUrl)) {
+    var filters = baseUrl.filter(function(url) {
+      return route.urlPath.includes(url);
+    });
+    if (filters.length > 1) {
+      var matched = filters.sort(function(a, b) {
+        return a.length - b.length;
+      })[0];
+      if (!matched) {
+        throw new Error("");
+      }
+      base = matched;
     }
-    base = base === "/" ? "" : base;
-    var entryName = route.entryName === "main" ? "" : route.entryName;
-    var prefix = "".concat(base, "/").concat(entryName);
-    return prefix.endsWith("/") ? prefix.slice(0, -1) : prefix;
+  } else {
+    base = baseUrl;
+  }
+  base = base === "/" ? "" : base;
+  var entryName = route.entryName === "main" ? "" : route.entryName;
+  var prefix = "".concat(base, "/").concat(entryName);
+  return prefix.endsWith("/") ? prefix.slice(0, -1) : prefix;
 }
-function getOutput(route, base, agreed) {
-    var output = route.output;
-    if (output) {
-        return output;
-    }
-    if (agreed) {
-        var urlWithoutBase = route.urlPath.replace(base, "");
-        return urlWithoutBase.startsWith("/") ? urlWithoutBase.slice(1) : urlWithoutBase;
-    }
-    throw new Error("routing must provide output when calling createPage(), check ".concat(route.urlPath));
+export function getOutput(route, base, agreed) {
+  var output = route.output;
+  if (output) {
+    return output;
+  }
+  if (agreed) {
+    var urlWithoutBase = route.urlPath.replace(base, "");
+    return urlWithoutBase.startsWith("/") ? urlWithoutBase.slice(1) : urlWithoutBase;
+  }
+  throw new Error("routing must provide output when calling createPage(), check ".concat(route.urlPath));
 }
-var readJSONSpec = function(dir) {
-    var routeJSONPath = path.join(dir, ROUTE_SPEC_FILE);
-    var routeJSON = require(routeJSONPath);
-    var routes = routeJSON.routes;
-    return routes;
+export var readJSONSpec = function(dir) {
+  var routeJSONPath = path.join(dir, ROUTE_SPEC_FILE);
+  var routeJSON = require(routeJSONPath);
+  var routes = routeJSON.routes;
+  return routes;
 };
-var writeJSONSpec = function(dir, routes) {
-    var routeJSONPath = path.join(dir, ROUTE_SPEC_FILE);
-    fs.writeJSONSync(routeJSONPath, {
-        routes: routes
-    }, {
-        spaces: 2
-    });
+export var writeJSONSpec = function(dir, routes) {
+  var routeJSONPath = path.join(dir, ROUTE_SPEC_FILE);
+  fs.writeJSONSync(routeJSONPath, {
+    routes
+  }, {
+    spaces: 2
+  });
 };
-var replaceWithAlias = function(base, filePath, alias) {
-    return path.posix.join(alias, path.posix.relative(base, filePath));
+export var replaceWithAlias = function(base, filePath, alias) {
+  return path.posix.join(alias, path.posix.relative(base, filePath));
 };
-var standardOptions = function(ssgOptions, entrypoints, routes, server) {
-    if (ssgOptions === false) {
-        return false;
+export var standardOptions = function(ssgOptions, entrypoints, routes, server) {
+  if (ssgOptions === false) {
+    return false;
+  }
+  if (ssgOptions === true) {
+    return entrypoints.reduce(function(opt, entry) {
+      opt[entry.entryName] = ssgOptions;
+      return opt;
+    }, {});
+  } else if (typeof ssgOptions === "object") {
+    var isSingle = isSingleEntry(entrypoints);
+    if (isSingle && typeof ssgOptions.main === "undefined") {
+      return {
+        main: ssgOptions
+      };
+    } else {
+      return ssgOptions;
     }
-    if (ssgOptions === true) {
-        return entrypoints.reduce(function(opt, entry) {
-            opt[entry.entryName] = ssgOptions;
-            return opt;
-        }, {});
-    } else if (typeof ssgOptions === "object") {
-        var isSingle = isSingleEntry(entrypoints);
-        if (isSingle && typeof ssgOptions.main === "undefined") {
-            return {
-                main: ssgOptions
-            };
-        } else {
-            return ssgOptions;
-        }
-    } else if (typeof ssgOptions === "function") {
-        var intermediateOptions = {};
-        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-        try {
-            var _loop = function() {
-                var entrypoint = _step.value;
-                var entryName = entrypoint.entryName;
-                if (Array.isArray(server === null || server === void 0 ? void 0 : server.baseUrl)) {
-                    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-                    try {
-                        var _loop = function() {
-                            var url = _step1.value;
-                            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, {
-                                baseUrl: url
-                            });
-                        };
-                        for(var _iterator = server.baseUrl[Symbol.iterator](), _step1; !(_iteratorNormalCompletion = (_step1 = _iterator.next()).done); _iteratorNormalCompletion = true)_loop();
-                    } catch (err) {
-                        _didIteratorError = true;
-                        _iteratorError = err;
-                    } finally{
-                        try {
-                            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                                _iterator.return();
-                            }
-                        } finally{
-                            if (_didIteratorError) {
-                                throw _iteratorError;
-                            }
-                        }
-                    }
-                } else {
-                    intermediateOptions[entryName] = ssgOptions(entryName, {
-                        baseUrl: server === null || server === void 0 ? void 0 : server.baseUrl
-                    });
-                }
+  } else if (typeof ssgOptions === "function") {
+    var intermediateOptions = {};
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+    try {
+      var _loop = function() {
+        var entrypoint = _step.value;
+        var entryName = entrypoint.entryName;
+        if (Array.isArray(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 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, {
+                baseUrl: url
+              });
             };
-            for(var _iterator = entrypoints[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)_loop();
-        } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-        } finally{
+            for (var _iterator2 = server.baseUrl[Symbol.iterator](), _step1; !(_iteratorNormalCompletion2 = (_step1 = _iterator2.next()).done); _iteratorNormalCompletion2 = true)
+              _loop2();
+          } catch (err) {
+            _didIteratorError2 = true;
+            _iteratorError2 = err;
+          } finally {
             try {
-                if (!_iteratorNormalCompletion && _iterator.return != null) {
-                    _iterator.return();
-                }
-            } finally{
-                if (_didIteratorError) {
-                    throw _iteratorError;
-                }
+              if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
+                _iterator2.return();
+              }
+            } finally {
+              if (_didIteratorError2) {
+                throw _iteratorError2;
+              }
             }
+          }
+        } else {
+          intermediateOptions[entryName] = ssgOptions(entryName, {
+            baseUrl: server === null || server === void 0 ? void 0 : server.baseUrl
+          });
+        }
+      };
+      for (var _iterator = entrypoints[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)
+        _loop();
+    } catch (err) {
+      _didIteratorError = true;
+      _iteratorError = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion && _iterator.return != null) {
+          _iterator.return();
         }
-        return intermediateOptions;
+      } finally {
+        if (_didIteratorError) {
+          throw _iteratorError;
+        }
+      }
     }
-    return false;
+    return intermediateOptions;
+  }
+  return false;
 };
-var openRouteSSR = function(routes) {
-    var entries = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : [];
-    return routes.map(function(ssgRoute) {
-        return _objectSpreadProps(_objectSpread({}, ssgRoute), {
-            isSSR: entries.includes(ssgRoute.entryName),
-            bundle: "".concat(SERVER_BUNDLE_DIRECTORY, "/").concat(ssgRoute.entryName, ".js")
-        });
+export var openRouteSSR = function(routes) {
+  var entries = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : [];
+  return routes.map(function(ssgRoute) {
+    return _object_spread_props(_object_spread({}, ssgRoute), {
+      isSSR: entries.includes(ssgRoute.entryName),
+      bundle: "".concat(SERVER_BUNDLE_DIRECTORY, "/").concat(ssgRoute.entryName, ".js")
     });
+  });
 };
-var flattenRoutes = function(routes) {
-    var parents = [];
-    var newRoutes = [];
-    var traverseRoute = function(route) {
-        var parent = parents[parents.length - 1];
-        var path2 = parent ? "".concat(parent.path, "/").concat(route.path || "").replace(/\/+/g, "/") : route.path || "";
-        path2 = path2.replace(/\/$/, "");
-        if (route._component && (path2 !== "/" || path2 === "/" && !parent)) {
-            newRoutes.push(_objectSpreadProps(_objectSpread({}, route), {
-                path: path2
-            }));
-        }
-        if (route.children) {
-            parents.push(_objectSpreadProps(_objectSpread({}, route), {
-                path: path2
-            }));
-            route.children.forEach(traverseRoute);
-            parents.pop();
-        }
-    };
-    routes.forEach(traverseRoute);
-    return newRoutes;
+export var flattenRoutes = function(routes) {
+  var parents = [];
+  var newRoutes = [];
+  var traverseRoute = function(route) {
+    var parent = parents[parents.length - 1];
+    var path2 = parent ? "".concat(parent.path, "/").concat(route.path || "").replace(/\/+/g, "/") : route.path || "";
+    path2 = path2.replace(/\/$/, "");
+    if (route._component && (path2 !== "/" || path2 === "/" && !parent)) {
+      newRoutes.push(_object_spread_props(_object_spread({}, route), {
+        path: path2
+      }));
+    }
+    if (route.children) {
+      parents.push(_object_spread_props(_object_spread({}, route), {
+        path: path2
+      }));
+      route.children.forEach(traverseRoute);
+      parents.pop();
+    }
+  };
+  routes.forEach(traverseRoute);
+  return newRoutes;
 };
-export { flattenRoutes, formatOutput, formatPath, getOutput, getUrlPrefix, isDynamicUrl, openRouteSSR, readJSONSpec, replaceWithAlias, standardOptions, writeJSONSpec };

package/dist/esm/server/consts.js

@@ -1,2 +1 @@
-var CLOSE_SIGN = "modern_close_server";
-export { CLOSE_SIGN };
+export var CLOSE_SIGN = "modern_close_server";

package/dist/esm/server/index.js

@@ -3,62 +3,61 @@ import path from "path";
 import { logger } from "@modern-js/utils";
 import { openRouteSSR } from "../libs/util";
 import { CLOSE_SIGN } from "./consts";
-var createServer = function(api, ssgRoutes, pageRoutes, apiRoutes, options, appDirectory) {
-    return new Promise(function(resolve, reject) {
-        var _cp_stderr, _cp_stdout;
-        var entries = ssgRoutes.map(function(route) {
-            return route.entryName;
-        });
-        var backup = openRouteSSR(pageRoutes, entries);
-        var total = backup.concat(apiRoutes);
-        var cp = childProcess.fork(path.join(__dirname, "process"), {
-            cwd: appDirectory,
-            silent: true
-        });
-        var appContext = api.useAppContext();
-        var plugins = appContext.serverInternalPlugins;
-        cp.send(JSON.stringify({
-            options: options,
-            renderRoutes: ssgRoutes,
-            routes: total,
-            appDirectory: appDirectory,
-            plugins: plugins
-        }));
-        var htmlChunks = [];
-        var htmlAry = [];
-        cp.on("message", function(chunk) {
-            if (chunk !== null) {
-                htmlChunks.push(chunk);
-            } else {
-                var 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", function(chunk) {
-            var 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", function(chunk) {
-            var 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 var createServer = function(api, ssgRoutes, pageRoutes, apiRoutes, options, appDirectory) {
+  return new Promise(function(resolve, reject) {
+    var _cp_stderr, _cp_stdout;
+    var entries = ssgRoutes.map(function(route) {
+      return route.entryName;
     });
+    var backup = openRouteSSR(pageRoutes, entries);
+    var total = backup.concat(apiRoutes);
+    var cp = childProcess.fork(path.join(__dirname, "process"), {
+      cwd: appDirectory,
+      silent: true
+    });
+    var appContext = api.useAppContext();
+    var plugins = appContext.serverInternalPlugins;
+    cp.send(JSON.stringify({
+      options,
+      renderRoutes: ssgRoutes,
+      routes: total,
+      appDirectory,
+      plugins
+    }));
+    var htmlChunks = [];
+    var htmlAry = [];
+    cp.on("message", function(chunk) {
+      if (chunk !== null) {
+        htmlChunks.push(chunk);
+      } else {
+        var 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", function(chunk) {
+      var 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", function(chunk) {
+      var 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 { createServer };