@modern-js/packages-generator 3.1.29 → 3.1.31

package/dist/index.js

@@ -115794,6 +115794,8 @@ var require_chainId = __commonJS({
         YAML: "yaml",
         /** Rule for wasm */
         WASM: "wasm",
+        /** Rule for node */
+        NODE: "node",
         /** Rule for bff */
         JS_BFF_API: "js-bff-api"
       },
@@ -115832,6 +115834,8 @@ var require_chainId = __commonJS({
         TOML: "toml",
         /** html-loader */
         HTML: "html",
+        /** node-loader */
+        NODE: "html",
         /** babel-loader */
         BABEL: "babel",
         /** esbuild-loader */
@@ -115850,6 +115854,8 @@ var require_chainId = __commonJS({
         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 */
@@ -115897,6 +115903,10 @@ var require_chainId = __commonJS({
         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 */
@@ -116060,7 +116070,7 @@ var require_constants = __commonJS({
     var API_DIR = "api";
     var SERVER_DIR = "server";
     var SHARED_DIR = "shared";
-    var CONFIG_CACHE_DIR = "./node_modules/.cache/node-bundle-require";
+    var CONFIG_CACHE_DIR = "./node_modules/.cache/bundle-require";
     var CONFIG_FILE_EXTENSIONS = [
       ".js",
       ".ts",
@@ -116092,7 +116102,6 @@ var require_constants = __commonJS({
     };
     var 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",
@@ -116368,13 +116377,15 @@ var require_config2 = __commonJS({
         return isSingleEntry;
       }
     });
+    var _constants = require_constants();
     var _type = require_type();
     var 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) && !(0, _type.isEmpty)(server.ssrByEntries)) {
+      if (((_server1 = server) === null || _server1 === void 0 ? void 0 : _server1.ssrByEntries) && !(0, _type.isEmpty)(server.ssrByEntries)) {
         for (const name of Object.keys(server.ssrByEntries)) {
           if (server.ssrByEntries[name]) {
             return true;
@@ -116384,30 +116395,32 @@ var require_config2 = __commonJS({
       return false;
     };
     var isUseSSRBundle = (config) => {
+      var _output;
       const { output: output2 } = config;
-      if (output2 === null || output2 === void 0 ? void 0 : output2.ssg) {
+      if ((_output = output2) === null || _output === void 0 ? void 0 : _output.ssg) {
         return true;
       }
       return isSSR(config);
     };
     var isServiceWorker = (config) => {
-      var _deploy_worker;
+      var _deploy_worker, _deploy, _output;
       const { output: output2, deploy } = config;
-      if ((deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr) && ((output2 === null || output2 === void 0 ? void 0 : output2.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 = output2) === null || _output === void 0 ? void 0 : _output.ssg) || isSSR(config))) {
         return true;
       }
       return false;
     };
     var 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";
     };
     var 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;
     };
-    var isSingleEntry = (entrypoints) => entrypoints.length === 1 && entrypoints[0].entryName === "main";
+    var isSingleEntry = (entrypoints, mainEntryName = _constants.MAIN_ENTRY_NAME) => entrypoints.length === 1 && entrypoints[0].entryName === mainEntryName;
   }
 });
 
@@ -116954,6 +116967,9 @@ var require_logger2 = __commonJS({
         });
     }
     _export(exports, {
+      isErrorStackMessage: function() {
+        return isErrorStackMessage;
+      },
       Logger: function() {
         return Logger;
       },
@@ -117004,6 +117020,9 @@ var require_logger2 = __commonJS({
       displayLabel: true,
       uppercaseLabel: false
     };
+    var errorStackRegExp = /^\s*at\s.*:\d+:\d+[\s)]*$/;
+    var anonymousErrorStackRegExp = /^\s*at\s.*\(<anonymous>\)$/;
+    var isErrorStackMessage = (message) => errorStackRegExp.test(message) || anonymousErrorStackRegExp.test(message);
     var Logger = class {
       _log(type, message, ...args) {
         if (message === void 0 || message === null) {
@@ -117029,6 +117048,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}`;
         }
@@ -117151,7 +117173,7 @@ var require_alias = __commonJS({
     };
     var mergeAlias = (alias) => (0, _applyOptionsChain.applyOptionsChain)({}, alias);
     var getAliasConfig = (aliasOption, option) => {
-      var _tsconfig_compilerOptions, _tsconfig_compilerOptions1;
+      var _tsconfig_compilerOptions, _tsconfig, _tsconfig_compilerOptions1, _tsconfig1;
       const isTsProject = _fs.default.existsSync(option.tsconfigPath);
       const alias = mergeAlias(aliasOption);
       if (!isTsProject) {
@@ -117163,10 +117185,10 @@ var require_alias = __commonJS({
         };
       }
       const tsconfig = (0, _get.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.default.join(option.appDirectory, baseUrl) : option.appDirectory,
-        paths: __spreadValues(__spreadValues({}, alias), tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig_compilerOptions1 = tsconfig.compilerOptions) === null || _tsconfig_compilerOptions1 === void 0 ? void 0 : _tsconfig_compilerOptions1.paths),
+        paths: __spreadValues(__spreadValues({}, alias), (_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
       };
@@ -117210,15 +117232,6 @@ var require_path = __commonJS({
       getTemplatePath: function() {
         return getTemplatePath;
       },
-      compilePathMatcherRegExp: function() {
-        return compilePathMatcherRegExp;
-      },
-      _joinPathParts: function() {
-        return _joinPathParts;
-      },
-      upwardPaths: function() {
-        return upwardPaths;
-      },
       getRealTemporaryDirectory: function() {
         return getRealTemporaryDirectory;
       },
@@ -117256,20 +117269,6 @@ var require_path = __commonJS({
       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|$)`);
-    }
-    var _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 {
@@ -117521,84 +117520,6 @@ var require_monorepo = __commonJS({
   }
 });
 
-// ../../../toolkit/utils/dist/cjs/cli/pathSerializer.js
-var require_pathSerializer = __commonJS({
-  "../../../toolkit/utils/dist/cjs/cli/pathSerializer.js"(exports) {
-    "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;
-      }
-    });
-    var _interop_require_default = require_interop_require_default();
-    var _os = /* @__PURE__ */ _interop_require_default._(require("os"));
-    var _lodash = /* @__PURE__ */ _interop_require_default._(require_lodash3());
-    var _path = require_path();
-    var 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 regex2 = (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(regex2, replacer);
-    }
-    function applyMatcherReplacement(matchers, str, options = {}) {
-      return matchers.reduce((ret, matcher) => {
-        return applyPathMatcher(matcher, ret, options);
-      }, str);
-    }
-    var 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;
-    };
-  }
-});
-
 // ../../../toolkit/utils/dist/cjs/cli/port.js
 var require_port = __commonJS({
   "../../../toolkit/utils/dist/cjs/cli/port.js"(exports) {
@@ -117705,7 +117626,8 @@ var require_prettyInstructions = __commonJS({
       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 !== _constants.DEFAULT_DEV_HOST) {
         return [
@@ -117732,19 +117654,19 @@ var require_prettyInstructions = __commonJS({
       }, []);
     };
     var 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_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 = (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)) {
@@ -117799,8 +117721,9 @@ var require_require = __commonJS({
     });
     var _fs = require_fs();
     var 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;
     };
     var dynamicImport = new Function("modulePath", "return import(modulePath)");
@@ -117992,7 +117915,6 @@ var require_cli = __commonJS({
     _export_star._(require_monorepo(), exports);
     _export_star._(require_package4(), 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/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.1.29",
+  "version": "3.1.31",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -30,10 +30,10 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/generator-utils": "3.1.29",
-    "@modern-js/generator-common": "3.1.29",
-    "@scripts/build": "2.27.0",
-    "@scripts/jest-config": "2.27.0"
+    "@modern-js/generator-utils": "3.1.31",
+    "@modern-js/generator-common": "3.1.31",
+    "@scripts/jest-config": "2.29.0",
+    "@scripts/build": "2.29.0"
   },
   "sideEffects": false,
   "publishConfig": {