@modern-js/utils 2.27.0 → 2.29.0

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

@@ -1,10 +1,12 @@
+import { MAIN_ENTRY_NAME } from "../constants";
 import { isEmpty } from "./type";
 export var isSSR = function(config) {
+  var _server, _server1;
   var server = config.server;
-  if (server === null || server === void 0 ? void 0 : server.ssr) {
+  if ((_server = server) === null || _server === void 0 ? void 0 : _server.ssr) {
     return true;
   }
-  if ((server === null || server === void 0 ? void 0 : server.ssrByEntries) && !isEmpty(server.ssrByEntries)) {
+  if (((_server1 = server) === null || _server1 === void 0 ? void 0 : _server1.ssrByEntries) && !isEmpty(server.ssrByEntries)) {
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
     try {
       for (var _iterator = Object.keys(server.ssrByEntries)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
@@ -31,29 +33,32 @@ export var isSSR = function(config) {
   return false;
 };
 export var isUseSSRBundle = function(config) {
+  var _output;
   var output = config.output;
-  if (output === null || output === void 0 ? void 0 : output.ssg) {
+  if ((_output = output) === null || _output === void 0 ? void 0 : _output.ssg) {
     return true;
   }
   return isSSR(config);
 };
 export var isServiceWorker = function(config) {
-  var _deploy_worker;
+  var _deploy_worker, _deploy, _output;
   var output = config.output, deploy = config.deploy;
-  if ((deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr) && ((output === null || output === void 0 ? void 0 : output.ssg) || isSSR(config))) {
+  if (((_deploy = deploy) === null || _deploy === void 0 ? void 0 : (_deploy_worker = _deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr) && (((_output = output) === null || _output === void 0 ? void 0 : _output.ssg) || isSSR(config))) {
     return true;
   }
   return false;
 };
 export var isRouterV5 = function(config) {
-  var _config_runtime, _config_runtime1, _config_runtime_router;
-  return typeof ((_config_runtime = config.runtime) === null || _config_runtime === void 0 ? void 0 : _config_runtime.router) !== "boolean" && (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";
+  var _config_runtime, _config_runtime_router, _config_runtime1, _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 _config_source, _ssgConfig, _ssgConfig1;
   var ssgConfig = config.output.ssg;
-  var useSSG = isSingleEntry(entrypoints) ? Boolean(ssgConfig) : ssgConfig === true || typeof (ssgConfig === null || ssgConfig === void 0 ? void 0 : ssgConfig[0]) === "function" || Boolean(ssgConfig === null || ssgConfig === void 0 ? void 0 : ssgConfig[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

@@ -24,7 +24,8 @@ export var getAddressUrls = function() {
   var LOCAL_LABEL = "Local:  ";
   var NETWORK_LABEL = "Network:  ";
   var isLocalhost = function(url) {
-    return url === null || url === void 0 ? void 0 : url.includes("localhost");
+    var _url;
+    return (_url = url) === null || _url === void 0 ? void 0 : _url.includes("localhost");
   };
   if (host && host !== DEFAULT_DEV_HOST) {
     return [
@@ -51,15 +52,15 @@ 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_context_devServer = (_appContext_builder = appContext.builder) === null || _appContext_builder === void 0 ? void 0 : _appContext_builder.context.devServer) === null || _appContext_builder_context_devServer === void 0 ? void 0 : _appContext_builder_context_devServer.https);
+  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);
   var routes = !apiOnly ? serverRoutes.filter(function(route) {
     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");
@@ -71,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/cli/require.js

@@ -2,8 +2,9 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { findExists } from "./fs";
 export var compatRequire = function(filePath) {
   var interop = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
+  var _mod;
   var mod = require(filePath);
-  var rtnESMDefault = interop && (mod === null || mod === void 0 ? void 0 : mod.__esModule);
+  var rtnESMDefault = interop && ((_mod = mod) === null || _mod === void 0 ? void 0 : _mod.__esModule);
   return rtnESMDefault ? mod.default : mod;
 };
 export var dynamicImport = new Function("modulePath", "return import(modulePath)");

package/dist/esm/runtime/nestedRoutes.js

@@ -30,6 +30,7 @@ export var transformNestedRoutes = function(routes) {
 };
 export var renderNestedRoute = function(nestedRoute) {
   var options = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
+  var _config, _children;
   var children = nestedRoute.children, index = nestedRoute.index, id = nestedRoute.id, component = nestedRoute.component, isRoot = nestedRoute.isRoot, lazyImport = nestedRoute.lazyImport, config = nestedRoute.config, handle = nestedRoute.handle;
   var Component = component;
   var parent = options.parent, DeferredDataComponent = options.DeferredDataComponent, _options_props = options.props, props = _options_props === void 0 ? {} : _options_props;
@@ -41,7 +42,7 @@ export var renderNestedRoute = function(nestedRoute) {
     action: nestedRoute.action,
     hasErrorBoundary: nestedRoute.hasErrorBoundary,
     shouldRevalidate: nestedRoute.shouldRevalidate,
-    handle: _object_spread({}, handle, typeof config === "object" ? config === null || config === void 0 ? void 0 : config.handle : {}),
+    handle: _object_spread({}, handle, typeof config === "object" ? (_config = config) === null || _config === void 0 ? void 0 : _config.handle : {}),
     index: nestedRoute.index,
     element: nestedRoute.element,
     errorElement: nestedRoute.errorElement
@@ -52,7 +53,8 @@ export var renderNestedRoute = function(nestedRoute) {
   }
   var element;
   if (Component) {
-    if ((parent === null || parent === void 0 ? void 0 : parent.loading) && lazyImport) {
+    var _parent;
+    if (((_parent = parent) === null || _parent === void 0 ? void 0 : _parent.loading) && lazyImport) {
       var Loading = parent.loading;
       if (isLoadableComponent(Component)) {
         element = /* @__PURE__ */ _jsx(Component, {
@@ -67,11 +69,12 @@ export var renderNestedRoute = function(nestedRoute) {
     } else if (isLoadableComponent(Component) && lazyImport) {
       element = /* @__PURE__ */ _jsx(Component, {});
     } else if (isRoot) {
+      var _props;
       element = /* @__PURE__ */ _jsxs(_Fragment, {
         children: [
           /* @__PURE__ */ _jsx(Component, _object_spread({}, props)),
           typeof document === "undefined" && DeferredDataComponent && /* @__PURE__ */ _jsx(DeferredDataComponent, {
-            nonce: props === null || props === void 0 ? void 0 : props.nonce
+            nonce: (_props = props) === null || _props === void 0 ? void 0 : _props.nonce
           })
         ]
       });
@@ -84,12 +87,13 @@ export var renderNestedRoute = function(nestedRoute) {
       element = /* @__PURE__ */ _jsx(Component, {});
     }
   } else {
-    nestedRoute.loading = parent === null || parent === void 0 ? void 0 : parent.loading;
+    var _parent1;
+    nestedRoute.loading = (_parent1 = parent) === null || _parent1 === void 0 ? void 0 : _parent1.loading;
   }
   if (element) {
     routeProps.element = element;
   }
-  var childElements = children === null || children === void 0 ? void 0 : children.map(function(childRoute) {
+  var childElements = (_children = children) === null || _children === void 0 ? void 0 : _children.map(function(childRoute) {
     return renderNestedRoute(childRoute, {
       parent: nestedRoute
     });

package/dist/esm/runtime-browser/parsed.js

@@ -6,7 +6,8 @@ export var parsedJSONFromElement = function(id) {
   var element = elements[elements.length - 1];
   if (element) {
     try {
-      var parsed = JSON.parse((element === null || element === void 0 ? void 0 : element.textContent) || "");
+      var _element;
+      var parsed = JSON.parse(((_element = element) === null || _element === void 0 ? void 0 : _element.textContent) || "");
       return parsed;
     } catch (e) {
       console.error("parse ".concat(id, " error"), e);

package/dist/esm/universal/formatWebpack.js

@@ -40,13 +40,44 @@ function formatMessage(stats) {
   message = lines.join("\n");
   return message.trim();
 }
+var noop = function(message) {
+  return message;
+};
+var defaultColor = {
+  gray: noop,
+  cyan: noop,
+  green: noop,
+  yellow: noop,
+  underline: noop
+};
+export function addErrorTips(errors) {
+  var color = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : defaultColor;
+  var errorHelpers = [
+    {
+      validator: function validator(message) {
+        return (message.includes("You may need an appropriate loader") || message.includes("You may need an additional loader")) && message.includes(".ts");
+      },
+      formatter: function formatter(message) {
+        return "".concat(message, "\n\n").concat(color.yellow('If it is a TypeScript file, you can use "source.include" config to compile it. see '.concat(color.underline("https://modernjs.dev/builder/en/api/config-source.html#sourceinclude"))), "\n\n").concat(color.green("".concat(color.gray("// config file"), "\nexport default {\n  source: {\n    include: [\n      ").concat(color.gray("// add some include rules"), "\n    ]\n  }\n}")), "\n        ");
+      }
+    }
+  ];
+  return errors.map(function(error) {
+    var helper = errorHelpers.find(function(item) {
+      return item.validator(error);
+    });
+    return helper ? helper.formatter(error) : error;
+  });
+}
 function formatWebpackMessages(json) {
-  var _json_errors, _json_warnings, _result_errors;
-  var formattedErrors = json === null || json === void 0 ? void 0 : (_json_errors = json.errors) === null || _json_errors === void 0 ? void 0 : _json_errors.map(formatMessage);
-  var formattedWarnings = json === null || json === void 0 ? void 0 : (_json_warnings = json.warnings) === null || _json_warnings === void 0 ? void 0 : _json_warnings.map(formatMessage);
+  var color = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : defaultColor;
+  var _json_errors, _json, _json_warnings, _json1, _result_errors;
+  var formattedErrors = (_json = json) === null || _json === void 0 ? void 0 : (_json_errors = _json.errors) === null || _json_errors === void 0 ? void 0 : _json_errors.map(formatMessage);
+  var formattedWarnings = (_json1 = json) === null || _json1 === void 0 ? void 0 : (_json_warnings = _json1.warnings) === null || _json_warnings === void 0 ? void 0 : _json_warnings.map(formatMessage);
   var result = {
     errors: formattedErrors || [],
-    warnings: formattedWarnings || []
+    warnings: formattedWarnings || [],
+    errorTips: []
   };
   if ((_result_errors = result.errors) === null || _result_errors === void 0 ? void 0 : _result_errors.some(isLikelyASyntaxError)) {
     result.errors = result.errors.filter(isLikelyASyntaxError);
@@ -54,6 +85,7 @@ function formatWebpackMessages(json) {
   if (result.errors.length > 1) {
     result.errors.length = 1;
   }
+  result.errors = addErrorTips(result.errors, color);
   return result;
 }
 export { formatWebpackMessages };

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/alias.js

@@ -20,7 +20,7 @@ export const validAlias = (modernConfig, { tsconfigPath }) => {
 };
 export const mergeAlias = (alias) => applyOptionsChain({}, alias);
 export const getAliasConfig = (aliasOption, option) => {
-  var _tsconfig_compilerOptions, _tsconfig_compilerOptions1;
+  var _tsconfig_compilerOptions, _tsconfig, _tsconfig_compilerOptions1, _tsconfig1;
   const isTsProject = fs.existsSync(option.tsconfigPath);
   const alias = mergeAlias(aliasOption);
   if (!isTsProject) {
@@ -32,12 +32,12 @@ export const getAliasConfig = (aliasOption, option) => {
     };
   }
   const tsconfig = readTsConfigByFile(option.tsconfigPath);
-  const baseUrl = tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig_compilerOptions = tsconfig.compilerOptions) === null || _tsconfig_compilerOptions === void 0 ? void 0 : _tsconfig_compilerOptions.baseUrl;
+  const baseUrl = (_tsconfig = tsconfig) === null || _tsconfig === void 0 ? void 0 : (_tsconfig_compilerOptions = _tsconfig.compilerOptions) === null || _tsconfig_compilerOptions === void 0 ? void 0 : _tsconfig_compilerOptions.baseUrl;
   return {
     absoluteBaseUrl: baseUrl ? path.join(option.appDirectory, baseUrl) : option.appDirectory,
     paths: {
       ...alias,
-      ...tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig_compilerOptions1 = tsconfig.compilerOptions) === null || _tsconfig_compilerOptions1 === void 0 ? void 0 : _tsconfig_compilerOptions1.paths
+      ...(_tsconfig1 = tsconfig) === null || _tsconfig1 === void 0 ? void 0 : (_tsconfig_compilerOptions1 = _tsconfig1.compilerOptions) === null || _tsconfig_compilerOptions1 === void 0 ? void 0 : _tsconfig_compilerOptions1.paths
     },
     isTsPath: true,
     isTsProject

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

@@ -37,6 +37,8 @@ export const CHAIN_ID = {
     YAML: "yaml",
     /** Rule for wasm */
     WASM: "wasm",
+    /** Rule for node */
+    NODE: "node",
     /** Rule for bff */
     JS_BFF_API: "js-bff-api"
   },
@@ -75,6 +77,8 @@ export const CHAIN_ID = {
     TOML: "toml",
     /** html-loader */
     HTML: "html",
+    /** node-loader */
+    NODE: "html",
     /** babel-loader */
     BABEL: "babel",
     /** esbuild-loader */
@@ -93,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 */
@@ -140,6 +146,10 @@ 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",
     /** 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",
@@ -41,7 +41,6 @@ export const INTERNAL_APP_TOOLS_RUNTIME_PLUGINS = {
 };
 export const INTERNAL_MODULE_TOOLS_PLUGINS = {
   "@modern-js/module-tools": "@modern-js/module-tools",
-  "@modern-js/doc-tools": "@modern-js/doc-tools",
   "@modern-js/runtime": "@modern-js/runtime/cli",
   "@modern-js/plugin-testing": "@modern-js/plugin-testing/cli",
   "@modern-js/plugin-storybook": "@modern-js/plugin-storybook/cli",

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,10 +1,12 @@
+import { MAIN_ENTRY_NAME } from "../constants";
 import { isEmpty } from "./type";
 export const isSSR = (config) => {
+  var _server, _server1;
   const { server } = config;
-  if (server === null || server === void 0 ? void 0 : server.ssr) {
+  if ((_server = server) === null || _server === void 0 ? void 0 : _server.ssr) {
     return true;
   }
-  if ((server === null || server === void 0 ? void 0 : server.ssrByEntries) && !isEmpty(server.ssrByEntries)) {
+  if (((_server1 = server) === null || _server1 === void 0 ? void 0 : _server1.ssrByEntries) && !isEmpty(server.ssrByEntries)) {
     for (const name of Object.keys(server.ssrByEntries)) {
       if (server.ssrByEntries[name]) {
         return true;
@@ -14,27 +16,29 @@ export const isSSR = (config) => {
   return false;
 };
 export const isUseSSRBundle = (config) => {
+  var _output;
   const { output } = config;
-  if (output === null || output === void 0 ? void 0 : output.ssg) {
+  if ((_output = output) === null || _output === void 0 ? void 0 : _output.ssg) {
     return true;
   }
   return isSSR(config);
 };
 export const isServiceWorker = (config) => {
-  var _deploy_worker;
+  var _deploy_worker, _deploy, _output;
   const { output, deploy } = config;
-  if ((deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr) && ((output === null || output === void 0 ? void 0 : output.ssg) || isSSR(config))) {
+  if (((_deploy = deploy) === null || _deploy === void 0 ? void 0 : (_deploy_worker = _deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr) && (((_output = output) === null || _output === void 0 ? void 0 : _output.ssg) || isSSR(config))) {
     return true;
   }
   return false;
 };
 export const isRouterV5 = (config) => {
-  var _config_runtime, _config_runtime1, _config_runtime_router;
-  return typeof ((_config_runtime = config.runtime) === null || _config_runtime === void 0 ? void 0 : _config_runtime.router) !== "boolean" && (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";
+  var _config_runtime, _config_runtime_router, _config_runtime1, _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 _config_source, _ssgConfig, _ssgConfig1;
   const ssgConfig = config.output.ssg;
-  const useSSG = isSingleEntry(entrypoints) ? Boolean(ssgConfig) : ssgConfig === true || typeof (ssgConfig === null || ssgConfig === void 0 ? void 0 : ssgConfig[0]) === "function" || Boolean(ssgConfig === null || ssgConfig === void 0 ? void 0 : ssgConfig[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

@@ -20,7 +20,8 @@ export const getAddressUrls = (protocol = "http", port, host) => {
   const LOCAL_LABEL = "Local:  ";
   const NETWORK_LABEL = "Network:  ";
   const isLocalhost = (url) => {
-    return url === null || url === void 0 ? void 0 : url.includes("localhost");
+    var _url;
+    return (_url = url) === null || _url === void 0 ? void 0 : _url.includes("localhost");
   };
   if (host && host !== DEFAULT_DEV_HOST) {
     return [
@@ -47,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_context_devServer = (_appContext_builder = appContext.builder) === null || _appContext_builder === void 0 ? void 0 : _appContext_builder.context.devServer) === null || _appContext_builder_context_devServer === void 0 ? void 0 : _appContext_builder_context_devServer.https);
+  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/cli/require.js

@@ -1,7 +1,8 @@
 import { findExists } from "./fs";
 export const compatRequire = (filePath, interop = true) => {
+  var _mod;
   const mod = require(filePath);
-  const rtnESMDefault = interop && (mod === null || mod === void 0 ? void 0 : mod.__esModule);
+  const rtnESMDefault = interop && ((_mod = mod) === null || _mod === void 0 ? void 0 : _mod.__esModule);
   return rtnESMDefault ? mod.default : mod;
 };
 export const dynamicImport = new Function("modulePath", "return import(modulePath)");

package/dist/esm-node/runtime/nestedRoutes.js

@@ -10,6 +10,7 @@ export const transformNestedRoutes = (routes) => {
   return createRoutesFromElements(routeElements);
 };
 export const renderNestedRoute = (nestedRoute, options = {}) => {
+  var _config, _children;
   const { children, index, id, component, isRoot, lazyImport, config, handle } = nestedRoute;
   const Component = component;
   const { parent, DeferredDataComponent, props = {} } = options;
@@ -23,7 +24,7 @@ export const renderNestedRoute = (nestedRoute, options = {}) => {
     shouldRevalidate: nestedRoute.shouldRevalidate,
     handle: {
       ...handle,
-      ...typeof config === "object" ? config === null || config === void 0 ? void 0 : config.handle : {}
+      ...typeof config === "object" ? (_config = config) === null || _config === void 0 ? void 0 : _config.handle : {}
     },
     index: nestedRoute.index,
     element: nestedRoute.element,
@@ -35,7 +36,8 @@ export const renderNestedRoute = (nestedRoute, options = {}) => {
   }
   let element;
   if (Component) {
-    if ((parent === null || parent === void 0 ? void 0 : parent.loading) && lazyImport) {
+    var _parent;
+    if (((_parent = parent) === null || _parent === void 0 ? void 0 : _parent.loading) && lazyImport) {
       const Loading = parent.loading;
       if (isLoadableComponent(Component)) {
         element = /* @__PURE__ */ _jsx(Component, {
@@ -50,13 +52,14 @@ export const renderNestedRoute = (nestedRoute, options = {}) => {
     } else if (isLoadableComponent(Component) && lazyImport) {
       element = /* @__PURE__ */ _jsx(Component, {});
     } else if (isRoot) {
+      var _props;
       element = /* @__PURE__ */ _jsxs(_Fragment, {
         children: [
           /* @__PURE__ */ _jsx(Component, {
             ...props
           }),
           typeof document === "undefined" && DeferredDataComponent && /* @__PURE__ */ _jsx(DeferredDataComponent, {
-            nonce: props === null || props === void 0 ? void 0 : props.nonce
+            nonce: (_props = props) === null || _props === void 0 ? void 0 : _props.nonce
           })
         ]
       });
@@ -69,12 +72,13 @@ export const renderNestedRoute = (nestedRoute, options = {}) => {
       element = /* @__PURE__ */ _jsx(Component, {});
     }
   } else {
-    nestedRoute.loading = parent === null || parent === void 0 ? void 0 : parent.loading;
+    var _parent1;
+    nestedRoute.loading = (_parent1 = parent) === null || _parent1 === void 0 ? void 0 : _parent1.loading;
   }
   if (element) {
     routeProps.element = element;
   }
-  const childElements = children === null || children === void 0 ? void 0 : children.map((childRoute) => {
+  const childElements = (_children = children) === null || _children === void 0 ? void 0 : _children.map((childRoute) => {
     return renderNestedRoute(childRoute, {
       parent: nestedRoute
     });