@modern-js/utils 2.28.0 → 2.30.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @modern-js/utils
 
+## 2.30.0
+
+## 2.29.0
+
+### Minor Changes
+
+- cba7675: feat: add a server reporter that report server cost, logger about error, info etc.
+  feat: 添加一个 server 端 reporter，来报告 server 端耗时，报错等
+
+### Patch Changes
+
+- e6b5355: feat(utils): change the color of error stacks to gray
+
+  feat(utils): 将 error stack 的颜色改为灰色
+
+- 93db783: fix(utils): remove hard code 'main'
+
+  fix(utils): 移除 'main' 硬编码
+
+- 99052ea: feat(builder): improve error stacks if dev compilation failed
+
+  feat(builder): 优化 dev 编译失败时的错误堆栈格式
+
+- 1d71d2e: fix(@modern-js/utils): add missing url in devServer console
+  fix(@modern-js/utils): 修复 devServer console 中丢失的 url
+
 ## 2.28.0
 
 ### Patch Changes

package/dist/cjs/cli/constants/chainId.js

@@ -107,6 +107,8 @@ const CHAIN_ID = {
     CSS_MODULES_TS: "css-modules-typescript",
     /** mini-css-extract-plugin.loader */
     MINI_CSS_EXTRACT: "mini-css-extract",
+    /** resolve-url-loader */
+    RESOLVE_URL_LOADER_FOR_SASS: "resolve-url-loader",
     /** builder-plugin-image-compress.loader */
     IMAGE_COMPRESS: "image-compress",
     /** builder-plugin-image-compress svgo-loader */
@@ -154,6 +156,14 @@ const CHAIN_ID = {
     HTML_NONCE: "html-nonce",
     /** HtmlCrossOriginPlugin */
     HTML_CROSS_ORIGIN: "html-cross-origin",
+    /** htmlPreconnectPlugin */
+    HTML_PRECONNECT: "html-preconnect-plugin",
+    /** htmlDnsPrefetchPlugin */
+    HTML_DNS_PREFETCH: "html-dns-prefetch-plugin",
+    /** htmlPrefetchPlugin */
+    HTML_PREFETCH: "html-prefetch-plugin",
+    /** htmlPreloadPlugin */
+    HTML_PRELOAD: "html-preload-plugin",
     /** MiniCssExtractPlugin */
     MINI_CSS_EXTRACT: "mini-css-extract",
     /** VueLoaderPlugin */

package/dist/cjs/cli/constants/index.js

@@ -117,7 +117,7 @@ const LOADABLE_STATS_FILE = "loadable-stats.json";
 const API_DIR = "api";
 const SERVER_DIR = "server";
 const SHARED_DIR = "shared";
-const CONFIG_CACHE_DIR = "./node_modules/.cache/node-bundle-require";
+const CONFIG_CACHE_DIR = "./node_modules/.cache/bundle-require";
 const CONFIG_FILE_EXTENSIONS = [
   ".js",
   ".ts",

package/dist/cjs/cli/index.js

@@ -17,7 +17,6 @@ _export_star._(require("./logger"), exports);
 _export_star._(require("./monorepo"), exports);
 _export_star._(require("./package"), exports);
 _export_star._(require("./path"), exports);
-_export_star._(require("./pathSerializer"), exports);
 _export_star._(require("./port"), exports);
 _export_star._(require("./prettyInstructions"), exports);
 _export_star._(require("./require"), exports);

package/dist/cjs/cli/is/config.js

@@ -29,6 +29,7 @@ _export(exports, {
     return isSingleEntry;
   }
 });
+const _constants = require("../constants");
 const _type = require("./type");
 const isSSR = (config) => {
   var _server, _server1;
@@ -66,9 +67,9 @@ const isRouterV5 = (config) => {
   return typeof ((_config_runtime = config.runtime) === null || _config_runtime === void 0 ? void 0 : _config_runtime.router) !== "boolean" && ((_config = config) === null || _config === void 0 ? void 0 : (_config_runtime1 = _config.runtime) === null || _config_runtime1 === void 0 ? void 0 : (_config_runtime_router = _config_runtime1.router) === null || _config_runtime_router === void 0 ? void 0 : _config_runtime_router.mode) === "react-router-5";
 };
 const isSSGEntry = (config, entryName, entrypoints) => {
-  var _ssgConfig, _ssgConfig1;
+  var _config_source, _ssgConfig, _ssgConfig1;
   const ssgConfig = config.output.ssg;
-  const useSSG = isSingleEntry(entrypoints) ? Boolean(ssgConfig) : ssgConfig === true || typeof ((_ssgConfig = ssgConfig) === null || _ssgConfig === void 0 ? void 0 : _ssgConfig[0]) === "function" || Boolean((_ssgConfig1 = ssgConfig) === null || _ssgConfig1 === void 0 ? void 0 : _ssgConfig1[entryName]);
+  const useSSG = isSingleEntry(entrypoints, (_config_source = config.source) === null || _config_source === void 0 ? void 0 : _config_source.mainEntryName) ? Boolean(ssgConfig) : ssgConfig === true || typeof ((_ssgConfig = ssgConfig) === null || _ssgConfig === void 0 ? void 0 : _ssgConfig[0]) === "function" || Boolean((_ssgConfig1 = ssgConfig) === null || _ssgConfig1 === void 0 ? void 0 : _ssgConfig1[entryName]);
   return useSSG;
 };
-const isSingleEntry = (entrypoints) => entrypoints.length === 1 && entrypoints[0].entryName === "main";
+const isSingleEntry = (entrypoints, mainEntryName = _constants.MAIN_ENTRY_NAME) => entrypoints.length === 1 && entrypoints[0].entryName === mainEntryName;

package/dist/cjs/cli/logger.js

@@ -10,6 +10,9 @@ function _export(target, all) {
     });
 }
 _export(exports, {
+  isErrorStackMessage: function() {
+    return isErrorStackMessage;
+  },
   Logger: function() {
     return Logger;
   },
@@ -60,6 +63,9 @@ const DEFAULT_CONFIG = {
   displayLabel: true,
   uppercaseLabel: false
 };
+const errorStackRegExp = /^\s*at\s.*:\d+:\d+[\s)]*$/;
+const anonymousErrorStackRegExp = /^\s*at\s.*\(<anonymous>\)$/;
+const isErrorStackMessage = (message) => errorStackRegExp.test(message) || anonymousErrorStackRegExp.test(message);
 class Logger {
   _log(type, message, ...args) {
     if (message === void 0 || message === null) {
@@ -85,6 +91,9 @@ ${_chalk.default.grey(rest.join("\n"))}`;
       } else {
         text = message.message;
       }
+    } else if (logType.level === "error" && typeof message === "string") {
+      const lines = message.split("\n");
+      text = lines.map((line) => isErrorStackMessage(line) ? _chalk.default.gray(line) : line).join("\n");
     } else {
       text = `${message}`;
     }

package/dist/cjs/cli/path.js

@@ -25,15 +25,6 @@ _export(exports, {
   getTemplatePath: function() {
     return getTemplatePath;
   },
-  compilePathMatcherRegExp: function() {
-    return compilePathMatcherRegExp;
-  },
-  _joinPathParts: function() {
-    return _joinPathParts;
-  },
-  upwardPaths: function() {
-    return upwardPaths;
-  },
   getRealTemporaryDirectory: function() {
     return getRealTemporaryDirectory;
   },
@@ -71,20 +62,6 @@ const getTemplatePath = (prefix) => {
   parts.push((0, _compiled.nanoid)());
   return _path.default.resolve(...parts);
 };
-function compilePathMatcherRegExp(match) {
-  if (typeof match !== "string") {
-    return match;
-  }
-  const escaped = _compiled.lodash.escapeRegExp(match);
-  return new RegExp(`(?<=\\W|^)${escaped}(?=\\W|$)`);
-}
-const _joinPathParts = (_part, i, parts) => (0, _compiled.lodash)(parts).filter((part) => ![
-  "/",
-  "\\"
-].includes(part)).tap((parts2) => parts2.unshift("")).slice(0, i + 2).join("/");
-function upwardPaths(start) {
-  return (0, _compiled.lodash)(start).split(/[/\\]/).filter(Boolean).map(_joinPathParts).reverse().push("/").value();
-}
 function getRealTemporaryDirectory() {
   let ret = null;
   try {

package/dist/cjs/cli/prettyInstructions.js

@@ -68,19 +68,19 @@ const getAddressUrls = (protocol = "http", port, host) => {
   }, []);
 };
 const prettyInstructions = (appContext, config) => {
-  var _appContext_builder_context_devServer, _appContext_builder, _config_dev;
+  var _appContext_builder_context_devServer, _appContext_builder, _config_dev, _config_source;
   const { entrypoints, serverRoutes, port, apiOnly, checkedEntries } = appContext;
   const isHttps = (0, _is.isDev)() && ((_appContext_builder = appContext.builder) === null || _appContext_builder === void 0 ? void 0 : (_appContext_builder_context_devServer = _appContext_builder.context.devServer) === null || _appContext_builder_context_devServer === void 0 ? void 0 : _appContext_builder_context_devServer.https);
   const urls = getAddressUrls(isHttps ? "https" : "http", port, (_config_dev = config.dev) === null || _config_dev === void 0 ? void 0 : _config_dev.host);
   const routes = !apiOnly ? serverRoutes.filter((route) => route.entryName) : serverRoutes;
   let message = "App running at:\n\n";
-  if ((0, _is.isSingleEntry)(entrypoints) || apiOnly) {
+  if ((0, _is.isSingleEntry)(entrypoints, (_config_source = config.source) === null || _config_source === void 0 ? void 0 : _config_source.mainEntryName) || apiOnly) {
     message += urls.map(({ label, url }) => `  ${_compiled.chalk.bold(`> ${label.padEnd(10)}`)}${_compiled.chalk.cyanBright(normalizeUrl(`${url}/${routes[0].urlPath}`))}
 `).join("");
   } else {
     const maxNameLength = Math.max(...routes.map((r) => r.entryName.length));
     urls.forEach(({ label, url }) => {
-      message += `  ${_compiled.chalk.bold(`> ${label}`)}
+      message += `  ${_compiled.chalk.bold(`> ${label}`)}${routes.length === 0 ? _compiled.chalk.cyanBright(url) : ""}
 `;
       routes.forEach(({ entryName, urlPath, isSSR }) => {
         if (!checkedEntries.includes(entryName)) {

package/dist/cjs/universal/time.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "time", {
+  enumerable: true,
+  get: function() {
+    return time;
+  }
+});
+function processHrtime(previousTimestamp) {
+  const now = (/* @__PURE__ */ new Date()).getTime();
+  const clocktime = now * 1e-3;
+  let seconds = Math.floor(clocktime);
+  let nanoseconds = Math.floor(clocktime % 1 * 1e9);
+  if (previousTimestamp) {
+    seconds -= previousTimestamp[0];
+    nanoseconds -= previousTimestamp[1];
+    if (nanoseconds < 0) {
+      seconds--;
+      nanoseconds += 1e9;
+    }
+  }
+  return [
+    seconds,
+    nanoseconds
+  ];
+}
+const getLatency = (hrtime) => {
+  const [s, ns] = processHrtime(hrtime);
+  return s * 1e3 + ns / 1e6;
+};
+const time = () => {
+  const hrtime = processHrtime();
+  return () => {
+    return getLatency(hrtime);
+  };
+};

package/dist/esm/cli/constants/chainId.js

@@ -97,6 +97,8 @@ export var CHAIN_ID = {
     CSS_MODULES_TS: "css-modules-typescript",
     /** mini-css-extract-plugin.loader */
     MINI_CSS_EXTRACT: "mini-css-extract",
+    /** resolve-url-loader */
+    RESOLVE_URL_LOADER_FOR_SASS: "resolve-url-loader",
     /** builder-plugin-image-compress.loader */
     IMAGE_COMPRESS: "image-compress",
     /** builder-plugin-image-compress svgo-loader */
@@ -144,6 +146,14 @@ export var CHAIN_ID = {
     HTML_NONCE: "html-nonce",
     /** HtmlCrossOriginPlugin */
     HTML_CROSS_ORIGIN: "html-cross-origin",
+    /** htmlPreconnectPlugin */
+    HTML_PRECONNECT: "html-preconnect-plugin",
+    /** htmlDnsPrefetchPlugin */
+    HTML_DNS_PREFETCH: "html-dns-prefetch-plugin",
+    /** htmlPrefetchPlugin */
+    HTML_PREFETCH: "html-prefetch-plugin",
+    /** htmlPreloadPlugin */
+    HTML_PRELOAD: "html-preload-plugin",
     /** MiniCssExtractPlugin */
     MINI_CSS_EXTRACT: "mini-css-extract",
     /** VueLoaderPlugin */

package/dist/esm/cli/constants/index.js

@@ -10,7 +10,7 @@ export var LOADABLE_STATS_FILE = "loadable-stats.json";
 export var API_DIR = "api";
 export var SERVER_DIR = "server";
 export var SHARED_DIR = "shared";
-export var CONFIG_CACHE_DIR = "./node_modules/.cache/node-bundle-require";
+export var CONFIG_CACHE_DIR = "./node_modules/.cache/bundle-require";
 export var CONFIG_FILE_EXTENSIONS = [
   ".js",
   ".ts",

package/dist/esm/cli/index.js

@@ -12,7 +12,6 @@ export * from "./logger";
 export * from "./monorepo";
 export * from "./package";
 export * from "./path";
-export * from "./pathSerializer";
 export * from "./port";
 export * from "./prettyInstructions";
 export * from "./require";

package/dist/esm/cli/is/config.js

@@ -1,3 +1,4 @@
+import { MAIN_ENTRY_NAME } from "../constants";
 import { isEmpty } from "./type";
 export var isSSR = function(config) {
   var _server, _server1;
@@ -52,11 +53,12 @@ export var isRouterV5 = function(config) {
   return typeof ((_config_runtime = config.runtime) === null || _config_runtime === void 0 ? void 0 : _config_runtime.router) !== "boolean" && ((_config = config) === null || _config === void 0 ? void 0 : (_config_runtime1 = _config.runtime) === null || _config_runtime1 === void 0 ? void 0 : (_config_runtime_router = _config_runtime1.router) === null || _config_runtime_router === void 0 ? void 0 : _config_runtime_router.mode) === "react-router-5";
 };
 export var isSSGEntry = function(config, entryName, entrypoints) {
-  var _ssgConfig, _ssgConfig1;
+  var _config_source, _ssgConfig, _ssgConfig1;
   var ssgConfig = config.output.ssg;
-  var useSSG = isSingleEntry(entrypoints) ? Boolean(ssgConfig) : ssgConfig === true || typeof ((_ssgConfig = ssgConfig) === null || _ssgConfig === void 0 ? void 0 : _ssgConfig[0]) === "function" || Boolean((_ssgConfig1 = ssgConfig) === null || _ssgConfig1 === void 0 ? void 0 : _ssgConfig1[entryName]);
+  var useSSG = isSingleEntry(entrypoints, (_config_source = config.source) === null || _config_source === void 0 ? void 0 : _config_source.mainEntryName) ? Boolean(ssgConfig) : ssgConfig === true || typeof ((_ssgConfig = ssgConfig) === null || _ssgConfig === void 0 ? void 0 : _ssgConfig[0]) === "function" || Boolean((_ssgConfig1 = ssgConfig) === null || _ssgConfig1 === void 0 ? void 0 : _ssgConfig1[entryName]);
   return useSSG;
 };
 export var isSingleEntry = function(entrypoints) {
-  return entrypoints.length === 1 && entrypoints[0].entryName === "main";
+  var mainEntryName = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : MAIN_ENTRY_NAME;
+  return entrypoints.length === 1 && entrypoints[0].entryName === mainEntryName;
 };

package/dist/esm/cli/logger.js

@@ -45,6 +45,11 @@ var DEFAULT_CONFIG = {
   displayLabel: true,
   uppercaseLabel: false
 };
+var errorStackRegExp = /^\s*at\s.*:\d+:\d+[\s)]*$/;
+var anonymousErrorStackRegExp = /^\s*at\s.*\(<anonymous>\)$/;
+export var isErrorStackMessage = function(message) {
+  return errorStackRegExp.test(message) || anonymousErrorStackRegExp.test(message);
+};
 var Logger = /* @__PURE__ */ function() {
   "use strict";
   function Logger2() {
@@ -87,6 +92,11 @@ var Logger = /* @__PURE__ */ function() {
       } else {
         text = message.message;
       }
+    } else if (logType.level === "error" && typeof message === "string") {
+      var lines = message.split("\n");
+      text = lines.map(function(line) {
+        return isErrorStackMessage(line) ? chalk.gray(line) : line;
+      }).join("\n");
     } else {
       text = "".concat(message);
     }

package/dist/esm/cli/path.js

@@ -2,7 +2,7 @@ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import path from "path";
 import os from "os";
 import fs from "fs";
-import { nanoid, upath, lodash as _ } from "../compiled";
+import { nanoid, upath } from "../compiled";
 export var isPathString = function(test) {
   return path.posix.basename(test) !== test || path.win32.basename(test) !== test;
 };
@@ -13,7 +13,7 @@ export var normalizeOutputPath = function(s) {
   return s.replace(/\\/g, "\\\\");
 };
 export var normalizeToPosixPath = function(p) {
-  return upath.normalizeSafe(path.normalize(p || "")).replace(/^([a-zA-Z]+):/, function(_2, m) {
+  return upath.normalizeSafe(path.normalize(p || "")).replace(/^([a-zA-Z]+):/, function(_, m) {
     return "/".concat(m.toLowerCase());
   });
 };
@@ -27,26 +27,6 @@ export var getTemplatePath = function(prefix) {
   parts.push(nanoid());
   return (_path = path).resolve.apply(_path, _to_consumable_array(parts));
 };
-export function compilePathMatcherRegExp(match) {
-  if (typeof match !== "string") {
-    return match;
-  }
-  var escaped = _.escapeRegExp(match);
-  return new RegExp("(?<=\\W|^)".concat(escaped, "(?=\\W|$)"));
-}
-export var _joinPathParts = function(_part, i, parts) {
-  return _(parts).filter(function(part) {
-    return ![
-      "/",
-      "\\"
-    ].includes(part);
-  }).tap(function(parts2) {
-    return parts2.unshift("");
-  }).slice(0, i + 2).join("/");
-};
-export function upwardPaths(start) {
-  return _(start).split(/[/\\]/).filter(Boolean).map(_joinPathParts).reverse().push("/").value();
-}
 export function getRealTemporaryDirectory() {
   var ret = null;
   try {

package/dist/esm/cli/prettyInstructions.js

@@ -52,7 +52,7 @@ export var getAddressUrls = function() {
   }, []);
 };
 export var prettyInstructions = function(appContext, config) {
-  var _appContext_builder_context_devServer, _appContext_builder, _config_dev;
+  var _appContext_builder_context_devServer, _appContext_builder, _config_dev, _config_source;
   var entrypoints = appContext.entrypoints, serverRoutes = appContext.serverRoutes, port = appContext.port, apiOnly = appContext.apiOnly, checkedEntries = appContext.checkedEntries;
   var isHttps = isDev() && ((_appContext_builder = appContext.builder) === null || _appContext_builder === void 0 ? void 0 : (_appContext_builder_context_devServer = _appContext_builder.context.devServer) === null || _appContext_builder_context_devServer === void 0 ? void 0 : _appContext_builder_context_devServer.https);
   var urls = getAddressUrls(isHttps ? "https" : "http", port, (_config_dev = config.dev) === null || _config_dev === void 0 ? void 0 : _config_dev.host);
@@ -60,7 +60,7 @@ export var prettyInstructions = function(appContext, config) {
     return route.entryName;
   }) : serverRoutes;
   var message = "App running at:\n\n";
-  if (isSingleEntry(entrypoints) || apiOnly) {
+  if (isSingleEntry(entrypoints, (_config_source = config.source) === null || _config_source === void 0 ? void 0 : _config_source.mainEntryName) || apiOnly) {
     message += urls.map(function(param) {
       var label = param.label, url = param.url;
       return "  ".concat(chalk.bold("> ".concat(label.padEnd(10)))).concat(chalk.cyanBright(normalizeUrl("".concat(url, "/").concat(routes[0].urlPath))), "\n");
@@ -72,7 +72,7 @@ export var prettyInstructions = function(appContext, config) {
     })));
     urls.forEach(function(param) {
       var label = param.label, url = param.url;
-      message += "  ".concat(chalk.bold("> ".concat(label)), "\n");
+      message += "  ".concat(chalk.bold("> ".concat(label))).concat(routes.length === 0 ? chalk.cyanBright(url) : "", "\n");
       routes.forEach(function(param2) {
         var entryName = param2.entryName, urlPath = param2.urlPath, isSSR = param2.isSSR;
         if (!checkedEntries.includes(entryName)) {

package/dist/esm/universal/time.js

@@ -0,0 +1,29 @@
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+function processHrtime(previousTimestamp) {
+  var now = (/* @__PURE__ */ new Date()).getTime();
+  var clocktime = now * 1e-3;
+  var seconds = Math.floor(clocktime);
+  var nanoseconds = Math.floor(clocktime % 1 * 1e9);
+  if (previousTimestamp) {
+    seconds -= previousTimestamp[0];
+    nanoseconds -= previousTimestamp[1];
+    if (nanoseconds < 0) {
+      seconds--;
+      nanoseconds += 1e9;
+    }
+  }
+  return [
+    seconds,
+    nanoseconds
+  ];
+}
+var getLatency = function(hrtime) {
+  var _processHrtime = _sliced_to_array(processHrtime(hrtime), 2), s = _processHrtime[0], ns = _processHrtime[1];
+  return s * 1e3 + ns / 1e6;
+};
+export var time = function() {
+  var hrtime = processHrtime();
+  return function() {
+    return getLatency(hrtime);
+  };
+};

package/dist/esm-node/cli/constants/chainId.js

@@ -97,6 +97,8 @@ export const CHAIN_ID = {
     CSS_MODULES_TS: "css-modules-typescript",
     /** mini-css-extract-plugin.loader */
     MINI_CSS_EXTRACT: "mini-css-extract",
+    /** resolve-url-loader */
+    RESOLVE_URL_LOADER_FOR_SASS: "resolve-url-loader",
     /** builder-plugin-image-compress.loader */
     IMAGE_COMPRESS: "image-compress",
     /** builder-plugin-image-compress svgo-loader */
@@ -144,6 +146,14 @@ export const CHAIN_ID = {
     HTML_NONCE: "html-nonce",
     /** HtmlCrossOriginPlugin */
     HTML_CROSS_ORIGIN: "html-cross-origin",
+    /** htmlPreconnectPlugin */
+    HTML_PRECONNECT: "html-preconnect-plugin",
+    /** htmlDnsPrefetchPlugin */
+    HTML_DNS_PREFETCH: "html-dns-prefetch-plugin",
+    /** htmlPrefetchPlugin */
+    HTML_PREFETCH: "html-prefetch-plugin",
+    /** htmlPreloadPlugin */
+    HTML_PRELOAD: "html-preload-plugin",
     /** MiniCssExtractPlugin */
     MINI_CSS_EXTRACT: "mini-css-extract",
     /** VueLoaderPlugin */

package/dist/esm-node/cli/constants/index.js

@@ -9,7 +9,7 @@ export const LOADABLE_STATS_FILE = "loadable-stats.json";
 export const API_DIR = "api";
 export const SERVER_DIR = "server";
 export const SHARED_DIR = "shared";
-export const CONFIG_CACHE_DIR = "./node_modules/.cache/node-bundle-require";
+export const CONFIG_CACHE_DIR = "./node_modules/.cache/bundle-require";
 export const CONFIG_FILE_EXTENSIONS = [
   ".js",
   ".ts",

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

@@ -12,7 +12,6 @@ export * from "./logger";
 export * from "./monorepo";
 export * from "./package";
 export * from "./path";
-export * from "./pathSerializer";
 export * from "./port";
 export * from "./prettyInstructions";
 export * from "./require";

package/dist/esm-node/cli/is/config.js

@@ -1,3 +1,4 @@
+import { MAIN_ENTRY_NAME } from "../constants";
 import { isEmpty } from "./type";
 export const isSSR = (config) => {
   var _server, _server1;
@@ -35,9 +36,9 @@ export const isRouterV5 = (config) => {
   return typeof ((_config_runtime = config.runtime) === null || _config_runtime === void 0 ? void 0 : _config_runtime.router) !== "boolean" && ((_config = config) === null || _config === void 0 ? void 0 : (_config_runtime1 = _config.runtime) === null || _config_runtime1 === void 0 ? void 0 : (_config_runtime_router = _config_runtime1.router) === null || _config_runtime_router === void 0 ? void 0 : _config_runtime_router.mode) === "react-router-5";
 };
 export const isSSGEntry = (config, entryName, entrypoints) => {
-  var _ssgConfig, _ssgConfig1;
+  var _config_source, _ssgConfig, _ssgConfig1;
   const ssgConfig = config.output.ssg;
-  const useSSG = isSingleEntry(entrypoints) ? Boolean(ssgConfig) : ssgConfig === true || typeof ((_ssgConfig = ssgConfig) === null || _ssgConfig === void 0 ? void 0 : _ssgConfig[0]) === "function" || Boolean((_ssgConfig1 = ssgConfig) === null || _ssgConfig1 === void 0 ? void 0 : _ssgConfig1[entryName]);
+  const useSSG = isSingleEntry(entrypoints, (_config_source = config.source) === null || _config_source === void 0 ? void 0 : _config_source.mainEntryName) ? Boolean(ssgConfig) : ssgConfig === true || typeof ((_ssgConfig = ssgConfig) === null || _ssgConfig === void 0 ? void 0 : _ssgConfig[0]) === "function" || Boolean((_ssgConfig1 = ssgConfig) === null || _ssgConfig1 === void 0 ? void 0 : _ssgConfig1[entryName]);
   return useSSG;
 };
-export const isSingleEntry = (entrypoints) => entrypoints.length === 1 && entrypoints[0].entryName === "main";
+export const isSingleEntry = (entrypoints, mainEntryName = MAIN_ENTRY_NAME) => entrypoints.length === 1 && entrypoints[0].entryName === mainEntryName;

package/dist/esm-node/cli/logger.js

@@ -40,6 +40,9 @@ const DEFAULT_CONFIG = {
   displayLabel: true,
   uppercaseLabel: false
 };
+const errorStackRegExp = /^\s*at\s.*:\d+:\d+[\s)]*$/;
+const anonymousErrorStackRegExp = /^\s*at\s.*\(<anonymous>\)$/;
+export const isErrorStackMessage = (message) => errorStackRegExp.test(message) || anonymousErrorStackRegExp.test(message);
 class Logger {
   _log(type, message, ...args) {
     if (message === void 0 || message === null) {
@@ -65,6 +68,9 @@ ${chalk.grey(rest.join("\n"))}`;
       } else {
         text = message.message;
       }
+    } else if (logType.level === "error" && typeof message === "string") {
+      const lines = message.split("\n");
+      text = lines.map((line) => isErrorStackMessage(line) ? chalk.gray(line) : line).join("\n");
     } else {
       text = `${message}`;
     }

package/dist/esm-node/cli/path.js

@@ -1,11 +1,11 @@
 import path from "path";
 import os from "os";
 import fs from "fs";
-import { nanoid, upath, lodash as _ } from "../compiled";
+import { nanoid, upath } from "../compiled";
 export const isPathString = (test) => path.posix.basename(test) !== test || path.win32.basename(test) !== test;
 export const isRelativePath = (test) => /^\.\.?($|[\\/])/.test(test);
 export const normalizeOutputPath = (s) => s.replace(/\\/g, "\\\\");
-export const normalizeToPosixPath = (p) => upath.normalizeSafe(path.normalize(p || "")).replace(/^([a-zA-Z]+):/, (_2, m) => `/${m.toLowerCase()}`);
+export const normalizeToPosixPath = (p) => upath.normalizeSafe(path.normalize(p || "")).replace(/^([a-zA-Z]+):/, (_, m) => `/${m.toLowerCase()}`);
 export const getTemplatePath = (prefix) => {
   const tmpRoot = fs.realpathSync(os.tmpdir());
   const parts = [
@@ -15,20 +15,6 @@ export const getTemplatePath = (prefix) => {
   parts.push(nanoid());
   return path.resolve(...parts);
 };
-export function compilePathMatcherRegExp(match) {
-  if (typeof match !== "string") {
-    return match;
-  }
-  const escaped = _.escapeRegExp(match);
-  return new RegExp(`(?<=\\W|^)${escaped}(?=\\W|$)`);
-}
-export const _joinPathParts = (_part, i, parts) => _(parts).filter((part) => ![
-  "/",
-  "\\"
-].includes(part)).tap((parts2) => parts2.unshift("")).slice(0, i + 2).join("/");
-export function upwardPaths(start) {
-  return _(start).split(/[/\\]/).filter(Boolean).map(_joinPathParts).reverse().push("/").value();
-}
 export function getRealTemporaryDirectory() {
   let ret = null;
   try {

package/dist/esm-node/cli/prettyInstructions.js

@@ -48,19 +48,19 @@ export const getAddressUrls = (protocol = "http", port, host) => {
   }, []);
 };
 export const prettyInstructions = (appContext, config) => {
-  var _appContext_builder_context_devServer, _appContext_builder, _config_dev;
+  var _appContext_builder_context_devServer, _appContext_builder, _config_dev, _config_source;
   const { entrypoints, serverRoutes, port, apiOnly, checkedEntries } = appContext;
   const isHttps = isDev() && ((_appContext_builder = appContext.builder) === null || _appContext_builder === void 0 ? void 0 : (_appContext_builder_context_devServer = _appContext_builder.context.devServer) === null || _appContext_builder_context_devServer === void 0 ? void 0 : _appContext_builder_context_devServer.https);
   const urls = getAddressUrls(isHttps ? "https" : "http", port, (_config_dev = config.dev) === null || _config_dev === void 0 ? void 0 : _config_dev.host);
   const routes = !apiOnly ? serverRoutes.filter((route) => route.entryName) : serverRoutes;
   let message = "App running at:\n\n";
-  if (isSingleEntry(entrypoints) || apiOnly) {
+  if (isSingleEntry(entrypoints, (_config_source = config.source) === null || _config_source === void 0 ? void 0 : _config_source.mainEntryName) || apiOnly) {
     message += urls.map(({ label, url }) => `  ${chalk.bold(`> ${label.padEnd(10)}`)}${chalk.cyanBright(normalizeUrl(`${url}/${routes[0].urlPath}`))}
 `).join("");
   } else {
     const maxNameLength = Math.max(...routes.map((r) => r.entryName.length));
     urls.forEach(({ label, url }) => {
-      message += `  ${chalk.bold(`> ${label}`)}
+      message += `  ${chalk.bold(`> ${label}`)}${routes.length === 0 ? chalk.cyanBright(url) : ""}
 `;
       routes.forEach(({ entryName, urlPath, isSSR }) => {
         if (!checkedEntries.includes(entryName)) {

package/dist/esm-node/universal/time.js

@@ -0,0 +1,28 @@
+function processHrtime(previousTimestamp) {
+  const now = (/* @__PURE__ */ new Date()).getTime();
+  const clocktime = now * 1e-3;
+  let seconds = Math.floor(clocktime);
+  let nanoseconds = Math.floor(clocktime % 1 * 1e9);
+  if (previousTimestamp) {
+    seconds -= previousTimestamp[0];
+    nanoseconds -= previousTimestamp[1];
+    if (nanoseconds < 0) {
+      seconds--;
+      nanoseconds += 1e9;
+    }
+  }
+  return [
+    seconds,
+    nanoseconds
+  ];
+}
+const getLatency = (hrtime) => {
+  const [s, ns] = processHrtime(hrtime);
+  return s * 1e3 + ns / 1e6;
+};
+export const time = () => {
+  const hrtime = processHrtime();
+  return () => {
+    return getLatency(hrtime);
+  };
+};

package/dist/types/cli/constants/chainId.d.ts

@@ -97,6 +97,8 @@ export declare const CHAIN_ID: {
     readonly CSS_MODULES_TS: "css-modules-typescript";
     /** mini-css-extract-plugin.loader */
     readonly MINI_CSS_EXTRACT: "mini-css-extract";
+    /** resolve-url-loader */
+    readonly RESOLVE_URL_LOADER_FOR_SASS: "resolve-url-loader";
     /** builder-plugin-image-compress.loader */
     readonly IMAGE_COMPRESS: "image-compress";
     /** builder-plugin-image-compress svgo-loader */
@@ -144,6 +146,14 @@ export declare const CHAIN_ID: {
     readonly HTML_NONCE: "html-nonce";
     /** HtmlCrossOriginPlugin */
     readonly HTML_CROSS_ORIGIN: "html-cross-origin";
+    /** htmlPreconnectPlugin */
+    readonly HTML_PRECONNECT: "html-preconnect-plugin";
+    /** htmlDnsPrefetchPlugin */
+    readonly HTML_DNS_PREFETCH: "html-dns-prefetch-plugin";
+    /** htmlPrefetchPlugin */
+    readonly HTML_PREFETCH: "html-prefetch-plugin";
+    /** htmlPreloadPlugin */
+    readonly HTML_PRELOAD: "html-preload-plugin";
     /** MiniCssExtractPlugin */
     readonly MINI_CSS_EXTRACT: "mini-css-extract";
     /** VueLoaderPlugin */

package/dist/types/cli/constants/index.d.ts

@@ -40,7 +40,7 @@ export declare const SHARED_DIR = "shared";
 /**
  * Modern.config.ts cached dir
  */
-export declare const CONFIG_CACHE_DIR = "./node_modules/.cache/node-bundle-require";
+export declare const CONFIG_CACHE_DIR = "./node_modules/.cache/bundle-require";
 export declare const CONFIG_FILE_EXTENSIONS: string[];
 /**
  * Serialized config path

package/dist/types/cli/index.d.ts

@@ -12,7 +12,6 @@ export * from './logger';
 export * from './monorepo';
 export * from './package';
 export * from './path';
-export * from './pathSerializer';
 export * from './port';
 export * from './prettyInstructions';
 export * from './require';

package/dist/types/cli/is/config.d.ts

@@ -24,5 +24,5 @@ export declare const isRouterV5: (config: {
   };
 }) => boolean;
 export declare const isSSGEntry: (config: any, entryName: string, entrypoints: EntryPoint[]) => boolean;
-export declare const isSingleEntry: (entrypoints: EntryPoint[]) => boolean;
+export declare const isSingleEntry: (entrypoints: EntryPoint[], mainEntryName?: string) => boolean;
 export {};

package/dist/types/cli/logger.d.ts

@@ -46,6 +46,7 @@ declare const LOG_TYPES: {
     level: string;
   };
 };
+export declare const isErrorStackMessage: (message: string) => boolean;
 declare class Logger {
   private readonly level;
   private readonly config;

package/dist/types/cli/path.d.ts

@@ -1,17 +1,8 @@
-import { lodash as _ } from '../compiled';
 export declare const isPathString: (test: string) => boolean;
 export declare const isRelativePath: (test: string) => boolean;
 export declare const normalizeOutputPath: (s: string) => string;
 export declare const normalizeToPosixPath: (p: string | undefined) => string;
 export declare const getTemplatePath: (prefix?: string) => string;
-/**
- * Compile path string to RegExp.
- * @note Only support posix path.
- */
-export declare function compilePathMatcherRegExp(match: string | RegExp): RegExp;
-/** @internal @see {@link upwardPaths} */
-export declare const _joinPathParts: (_part: unknown, i: number, parts: _.List<string>) => string;
-export declare function upwardPaths(start: string): string[];
 export declare function getRealTemporaryDirectory(): string | null;
 export declare function splitPathString(str: string): string[];
 export declare const removeLeadingSlash: (s: string) => string;

package/dist/types/universal/time.d.ts

@@ -0,0 +1 @@
+export declare const time: () => () => number;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.28.0",
+  "version": "2.30.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -76,6 +76,11 @@
       "import": "./dist/esm/universal/pluginDagSort.js",
       "default": "./dist/cjs/universal/pluginDagSort.js"
     },
+    "./universal/time": {
+      "types": "./dist/types/universal/time.d.ts",
+      "import": "./dist/esm/universal/time.js",
+      "default": "./dist/cjs/universal/time.js"
+    },
     "./ajv": "./dist/compiled/ajv/index.js",
     "./commander": "./dist/compiled/commander/index.js",
     "./ora": "./dist/compiled/ora/index.js",
@@ -138,6 +143,9 @@
       "universal/plugin-dag-sort": [
         "./dist/types/universal/pluginDagSort.d.ts"
       ],
+      "universal/time": [
+        "./dist/types/universal/time.d.ts"
+      ],
       "ajv": [
         "./dist/compiled/ajv/types/ajv.d.ts"
       ],
@@ -235,9 +243,9 @@
     "typescript": "^5",
     "webpack": "^5.88.1",
     "@types/serialize-javascript": "^5.0.1",
-    "@modern-js/types": "2.28.0",
-    "@scripts/build": "2.28.0",
-    "@scripts/jest-config": "2.28.0"
+    "@scripts/build": "2.30.0",
+    "@scripts/jest-config": "2.30.0",
+    "@modern-js/types": "2.30.0"
   },
   "sideEffects": false,
   "scripts": {

package/dist/cjs/cli/pathSerializer.js

@@ -1,72 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
-  for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  matchUpwardPathsAsUnknown: function() {
-    return matchUpwardPathsAsUnknown;
-  },
-  applyPathMatcher: function() {
-    return applyPathMatcher;
-  },
-  applyMatcherReplacement: function() {
-    return applyMatcherReplacement;
-  },
-  createDefaultPathMatchers: function() {
-    return createDefaultPathMatchers;
-  }
-});
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _os = /* @__PURE__ */ _interop_require_default._(require("os"));
-const _lodash = /* @__PURE__ */ _interop_require_default._(require("../../compiled/lodash"));
-const _path = require("./path");
-const matchUpwardPathsAsUnknown = (p) => (0, _lodash.default)((0, _path.upwardPaths)((0, _path.normalizeToPosixPath)(p))).map((match) => ({
-  match,
-  mark: "unknown"
-})).slice(1, -1).value();
-function applyPathMatcher(matcher, str, options = {}) {
-  const regex = (0, _path.compilePathMatcherRegExp)(matcher.match);
-  const replacer = (substring, ...args) => {
-    if (options.minPartials && (0, _path.splitPathString)(substring).length < options.minPartials) {
-      return substring;
-    }
-    const ret = typeof matcher.mark === "string" ? matcher.mark : matcher.mark(substring, ...args);
-    return `<${_lodash.default.snakeCase(ret).toUpperCase()}>`;
-  };
-  return str.replace(regex, replacer);
-}
-function applyMatcherReplacement(matchers, str, options = {}) {
-  return matchers.reduce((ret, matcher) => {
-    return applyPathMatcher(matcher, ret, options);
-  }, str);
-}
-const createDefaultPathMatchers = (root) => {
-  const ret = [
-    {
-      match: RegExp("(?<=\\/)(\\.pnpm\\/.+?\\/node_modules)(?=\\/)"),
-      mark: "pnpmInner"
-    }
-  ];
-  const tmpdir = (0, _path.getRealTemporaryDirectory)();
-  tmpdir && ret.push({
-    match: tmpdir,
-    mark: "temp"
-  });
-  ret.push({
-    match: _os.default.tmpdir(),
-    mark: "temp"
-  });
-  ret.push({
-    match: _os.default.homedir(),
-    mark: "home"
-  });
-  ret.push(...matchUpwardPathsAsUnknown(root));
-  return ret;
-};

package/dist/esm/cli/pathSerializer.js

@@ -1,60 +0,0 @@
-import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import os from "os";
-import _ from "../../compiled/lodash";
-import { compilePathMatcherRegExp, normalizeToPosixPath, getRealTemporaryDirectory, splitPathString, upwardPaths } from "./path";
-export var matchUpwardPathsAsUnknown = function(p) {
-  return _(upwardPaths(normalizeToPosixPath(p))).map(function(match) {
-    return {
-      match: match,
-      mark: "unknown"
-    };
-  }).slice(1, -1).value();
-};
-export function applyPathMatcher(matcher, str) {
-  var options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
-  var regex = compilePathMatcherRegExp(matcher.match);
-  var replacer = function(substring) {
-    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      args[_key - 1] = arguments[_key];
-    }
-    var _matcher;
-    if (options.minPartials && splitPathString(substring).length < options.minPartials) {
-      return substring;
-    }
-    var ret = typeof matcher.mark === "string" ? matcher.mark : (_matcher = matcher).mark.apply(_matcher, [
-      substring
-    ].concat(_to_consumable_array(args)));
-    return "<".concat(_.snakeCase(ret).toUpperCase(), ">");
-  };
-  return str.replace(regex, replacer);
-}
-export function applyMatcherReplacement(matchers, str) {
-  var options = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
-  return matchers.reduce(function(ret, matcher) {
-    return applyPathMatcher(matcher, ret, options);
-  }, str);
-}
-export var createDefaultPathMatchers = function(root) {
-  var _ret;
-  var ret = [
-    {
-      match: RegExp("(?<=\\/)(\\.pnpm\\/.+?\\/node_modules)(?=\\/)"),
-      mark: "pnpmInner"
-    }
-  ];
-  var tmpdir = getRealTemporaryDirectory();
-  tmpdir && ret.push({
-    match: tmpdir,
-    mark: "temp"
-  });
-  ret.push({
-    match: os.tmpdir(),
-    mark: "temp"
-  });
-  ret.push({
-    match: os.homedir(),
-    mark: "home"
-  });
-  (_ret = ret).push.apply(_ret, _to_consumable_array(matchUpwardPathsAsUnknown(root)));
-  return ret;
-};

package/dist/esm-node/cli/pathSerializer.js

@@ -1,46 +0,0 @@
-import os from "os";
-import _ from "../../compiled/lodash";
-import { compilePathMatcherRegExp, normalizeToPosixPath, getRealTemporaryDirectory, splitPathString, upwardPaths } from "./path";
-export const matchUpwardPathsAsUnknown = (p) => _(upwardPaths(normalizeToPosixPath(p))).map((match) => ({
-  match,
-  mark: "unknown"
-})).slice(1, -1).value();
-export function applyPathMatcher(matcher, str, options = {}) {
-  const regex = compilePathMatcherRegExp(matcher.match);
-  const replacer = (substring, ...args) => {
-    if (options.minPartials && splitPathString(substring).length < options.minPartials) {
-      return substring;
-    }
-    const ret = typeof matcher.mark === "string" ? matcher.mark : matcher.mark(substring, ...args);
-    return `<${_.snakeCase(ret).toUpperCase()}>`;
-  };
-  return str.replace(regex, replacer);
-}
-export function applyMatcherReplacement(matchers, str, options = {}) {
-  return matchers.reduce((ret, matcher) => {
-    return applyPathMatcher(matcher, ret, options);
-  }, str);
-}
-export const createDefaultPathMatchers = (root) => {
-  const ret = [
-    {
-      match: RegExp("(?<=\\/)(\\.pnpm\\/.+?\\/node_modules)(?=\\/)"),
-      mark: "pnpmInner"
-    }
-  ];
-  const tmpdir = getRealTemporaryDirectory();
-  tmpdir && ret.push({
-    match: tmpdir,
-    mark: "temp"
-  });
-  ret.push({
-    match: os.tmpdir(),
-    mark: "temp"
-  });
-  ret.push({
-    match: os.homedir(),
-    mark: "home"
-  });
-  ret.push(...matchUpwardPathsAsUnknown(root));
-  return ret;
-};

package/dist/types/cli/pathSerializer.d.ts

@@ -1,16 +0,0 @@
-/** Different from  */
-export type PathMatchExpression = string | RegExp;
-export interface PathMatcher {
-  match: PathMatchExpression;
-  mark: string | ((substring: string, ...args: any[]) => string);
-}
-export declare const matchUpwardPathsAsUnknown: (p: string) => {
-  match: string;
-  mark: string;
-}[];
-export interface ApplyPathMatcherOptions {
-  minPartials?: number;
-}
-export declare function applyPathMatcher(matcher: PathMatcher, str: string, options?: ApplyPathMatcherOptions): string;
-export declare function applyMatcherReplacement(matchers: PathMatcher[], str: string, options?: ApplyPathMatcherOptions): string;
-export declare const createDefaultPathMatchers: (root: string) => PathMatcher[];