@modern-js/upgrade-generator 3.1.30 → 3.1.31

package/dist/index.js

@@ -115409,6 +115409,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 */
@@ -115456,6 +115458,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 */
@@ -115619,7 +115625,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",
@@ -115926,6 +115932,7 @@ var require_config2 = __commonJS({
         return isSingleEntry;
       }
     });
+    var _constants = require_constants();
     var _type = require_type();
     var isSSR = (config) => {
       var _server, _server1;
@@ -115963,12 +115970,12 @@ var require_config2 = __commonJS({
       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 _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;
     };
-    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;
   }
 });
 
@@ -116515,6 +116522,9 @@ var require_logger2 = __commonJS({
         });
     }
     _export(exports, {
+      isErrorStackMessage: function() {
+        return isErrorStackMessage;
+      },
       Logger: function() {
         return Logger;
       },
@@ -116565,6 +116575,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) {
@@ -116590,6 +116603,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}`;
         }
@@ -116771,15 +116787,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;
       },
@@ -116817,20 +116824,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 {
@@ -117082,84 +117075,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) {
@@ -117294,19 +117209,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 = 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)) {
@@ -117555,7 +117470,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.30",
+  "version": "3.1.31",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -30,11 +30,11 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@scripts/build": "2.28.0",
-    "@scripts/jest-config": "2.28.0",
-    "@modern-js/generator-utils": "3.1.30",
-    "@modern-js/plugin-i18n": "2.28.0",
-    "@modern-js/generator-common": "3.1.30"
+    "@modern-js/generator-utils": "3.1.31",
+    "@scripts/jest-config": "2.29.0",
+    "@modern-js/generator-common": "3.1.31",
+    "@scripts/build": "2.29.0",
+    "@modern-js/plugin-i18n": "2.29.0"
   },
   "sideEffects": false,
   "publishConfig": {