@modern-js/upgrade 1.21.3 → 2.0.0-beta.0

package/dist/index.js

@@ -34555,8 +34555,8 @@ ${stats.stack}` : "";
   }
   function formatWebpackMessages(json) {
     var _a, _b, _c;
-    const formattedErrors = (_a = json.errors) === null || _a === void 0 ? void 0 : _a.map(formatMessage);
-    const formattedWarnings = (_b = json.warnings) === null || _b === void 0 ? void 0 : _b.map(formatMessage);
+    const formattedErrors = (_a = json === null || json === void 0 ? void 0 : json.errors) === null || _a === void 0 ? void 0 : _a.map(formatMessage);
+    const formattedWarnings = (_b = json === null || json === void 0 ? void 0 : json.warnings) === null || _b === void 0 ? void 0 : _b.map(formatMessage);
     const result = {
       errors: formattedErrors || [],
       warnings: formattedWarnings || []
@@ -34938,9 +34938,16 @@ var require_is = __commonJSMin((exports) => {
   exports.isFastRefresh = exports.isUseSSRBundle = exports.isSSR = exports.isEmpty = exports.isTypescript = exports.isDepExists = void 0;
   var fs_1 = __importDefault(__require("fs"));
   var path_1 = __importDefault(__require("path"));
+  var debug_1 = require_debug2();
   var node_env_1 = require_node_env();
+  var debug = (0, debug_1.createDebugger)("judge-depExists");
   var isDepExists = (appDirectory, name4) => {
-    const json = __require(path_1.default.resolve(appDirectory, "./package.json"));
+    const pkgPath = path_1.default.resolve(appDirectory, "./package.json");
+    if (!fs_1.default.existsSync(pkgPath)) {
+      debug(`can't find package.json under: %s`, appDirectory);
+      return false;
+    }
+    const json = __require(pkgPath);
     const { dependencies: dependencies2 = {}, devDependencies: devDependencies2 = {} } = json;
     return dependencies2.hasOwnProperty(name4) || devDependencies2.hasOwnProperty(name4);
   };
@@ -34983,17 +34990,23 @@ var require_compatRequire = __commonJSMin((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.cleanRequireCache = exports.requireExistModule = exports.compatRequire = void 0;
   var findExists_1 = require_findExists();
-  var compatRequire = (filePath) => {
+  var compatRequire = (filePath, interop = true) => {
     const mod = __require(filePath);
-    return (mod === null || mod === void 0 ? void 0 : mod.__esModule) ? mod.default : mod;
+    const rtnESMDefault = interop && (mod === null || mod === void 0 ? void 0 : mod.__esModule);
+    return rtnESMDefault ? mod.default : mod;
   };
   exports.compatRequire = compatRequire;
-  var requireExistModule = (filename, extensions = [".ts", ".js"]) => {
-    const exist = (0, findExists_1.findExists)(extensions.map((ext) => `${filename}${ext}`));
+  var requireExistModule = (filename, opt) => {
+    const final = {
+      extensions: [".ts", ".js"],
+      interop: true,
+      ...opt
+    };
+    const exist = (0, findExists_1.findExists)(final.extensions.map((ext) => `${filename}${ext}`));
     if (!exist) {
       return null;
     }
-    return (0, exports.compatRequire)(exist);
+    return (0, exports.compatRequire)(exist, final.interop);
   };
   exports.requireExistModule = requireExistModule;
   var cleanRequireCache = (filelist) => {
@@ -35006,7 +35019,7 @@ var require_compatRequire = __commonJSMin((exports) => {
 var require_constants = __commonJSMin((exports) => {
   "use strict";
   Object.defineProperty(exports, "__esModule", { value: true });
-  exports.PLUGIN_SCHEMAS = exports.INTERNAL_PLUGINS = exports.DEFAULT_SERVER_CONFIG = exports.OUTPUT_CONFIG_FILE = exports.CONFIG_FILE_EXTENSIONS = exports.CONFIG_CACHE_DIR = exports.SHARED_DIR = exports.SERVER_DIR = exports.API_DIR = exports.LOADABLE_STATS_FILE = exports.SERVER_RENDER_FUNCTION_NAME = exports.ENTRY_NAME_PATTERN = exports.SERVER_BUNDLE_DIRECTORY = exports.LAUNCH_EDITOR_ENDPOINT = exports.MAIN_ENTRY_NAME = exports.ROUTE_SPEC_FILE = exports.HMR_SOCK_PATH = void 0;
+  exports.PLUGIN_SCHEMAS = exports.INTERNAL_SERVER_PLUGINS = exports.INTERNAL_CLI_PLUGINS = exports.DEFAULT_SERVER_CONFIG = exports.OUTPUT_CONFIG_FILE = exports.CONFIG_FILE_EXTENSIONS = exports.CONFIG_CACHE_DIR = exports.SHARED_DIR = exports.SERVER_DIR = exports.API_DIR = exports.LOADABLE_STATS_FILE = exports.SERVER_RENDER_FUNCTION_NAME = exports.ENTRY_NAME_PATTERN = exports.SERVER_BUNDLE_DIRECTORY = exports.LAUNCH_EDITOR_ENDPOINT = exports.MAIN_ENTRY_NAME = exports.ROUTE_SPEC_FILE = exports.HMR_SOCK_PATH = void 0;
   exports.HMR_SOCK_PATH = "/webpack-hmr";
   exports.ROUTE_SPEC_FILE = "route.json";
   exports.MAIN_ENTRY_NAME = "main";
@@ -35022,53 +35035,36 @@ var require_constants = __commonJSMin((exports) => {
   exports.CONFIG_FILE_EXTENSIONS = [".js", ".ts", ".ejs", ".mjs"];
   exports.OUTPUT_CONFIG_FILE = "modern.config.json";
   exports.DEFAULT_SERVER_CONFIG = "modern.server-runtime.config";
-  exports.INTERNAL_PLUGINS = {
-    "@modern-js/app-tools": { cli: "@modern-js/app-tools/cli" },
-    "@modern-js/monorepo-tools": { cli: "@modern-js/monorepo-tools/cli" },
-    "@modern-js/module-tools": { cli: "@modern-js/module-tools/cli" },
-    "@modern-js/runtime": { cli: "@modern-js/runtime/cli" },
-    "@modern-js/plugin-less": { cli: "@modern-js/plugin-less/cli" },
-    "@modern-js/plugin-sass": { cli: "@modern-js/plugin-sass/cli" },
-    "@modern-js/plugin-esbuild": { cli: "@modern-js/plugin-esbuild/cli" },
-    "@modern-js/plugin-proxy": { cli: "@modern-js/plugin-proxy/cli" },
-    "@modern-js/plugin-ssg": { cli: "@modern-js/plugin-ssg/cli" },
-    "@modern-js/plugin-bff": {
-      cli: "@modern-js/plugin-bff/cli",
-      server: "@modern-js/plugin-bff/server"
-    },
-    "@modern-js/plugin-electron": { cli: "@modern-js/plugin-electron/cli" },
-    "@modern-js/plugin-testing": { cli: "@modern-js/plugin-testing/cli" },
-    "@modern-js/plugin-storybook": { cli: "@modern-js/plugin-storybook/cli" },
-    "@modern-js/plugin-express": {
-      cli: "@modern-js/plugin-express/cli",
-      server: "@modern-js/plugin-express"
-    },
-    "@modern-js/plugin-egg": {
-      cli: "@modern-js/plugin-egg/cli",
-      server: "@modern-js/plugin-egg"
-    },
-    "@modern-js/plugin-koa": {
-      cli: "@modern-js/plugin-koa/cli",
-      server: "@modern-js/plugin-koa"
-    },
-    "@modern-js/plugin-nest": {
-      cli: "@modern-js/plugin-nest/cli",
-      server: "@modern-js/plugin-nest/server"
-    },
-    "@modern-js/plugin-unbundle": { cli: "@modern-js/plugin-unbundle" },
-    "@modern-js/plugin-server": {
-      cli: "@modern-js/plugin-server/cli",
-      server: "@modern-js/plugin-server/server"
-    },
-    "@modern-js/plugin-garfish": {
-      cli: "@modern-js/plugin-garfish/cli"
-    },
-    "@modern-js/plugin-tailwindcss": { cli: "@modern-js/plugin-tailwindcss/cli" },
-    "@modern-js/plugin-polyfill": {
-      cli: "@modern-js/plugin-polyfill/cli",
-      server: "@modern-js/plugin-polyfill"
-    },
-    "@modern-js/plugin-nocode": { cli: "@modern-js/plugin-nocode/cli" }
+  exports.INTERNAL_CLI_PLUGINS = {
+    "@modern-js/app-tools": "@modern-js/app-tools/cli",
+    "@modern-js/monorepo-tools": "@modern-js/monorepo-tools/cli",
+    "@modern-js/module-tools": "@modern-js/module-tools/cli",
+    "@modern-js/module-tools-v2": "@modern-js/module-tools-v2",
+    "@modern-js/runtime": "@modern-js/runtime/cli",
+    "@modern-js/plugin-proxy": "@modern-js/plugin-proxy/cli",
+    "@modern-js/plugin-ssg": "@modern-js/plugin-ssg/cli",
+    "@modern-js/plugin-bff": "@modern-js/plugin-bff/cli",
+    "@modern-js/plugin-testing": "@modern-js/plugin-testing/cli",
+    "@modern-js/plugin-storybook": "@modern-js/plugin-storybook/cli",
+    "@modern-js/plugin-express": "@modern-js/plugin-express/cli",
+    "@modern-js/plugin-egg": "@modern-js/plugin-egg/cli",
+    "@modern-js/plugin-koa": "@modern-js/plugin-koa/cli",
+    "@modern-js/plugin-nest": "@modern-js/plugin-nest/cli",
+    "@modern-js/plugin-server": "@modern-js/plugin-server/cli",
+    "@modern-js/plugin-garfish": "@modern-js/plugin-garfish/cli",
+    "@modern-js/plugin-tailwindcss": "@modern-js/plugin-tailwindcss/cli",
+    "@modern-js/plugin-polyfill": "@modern-js/plugin-polyfill/cli",
+    "@modern-js/plugin-nocode": "@modern-js/plugin-nocode/cli",
+    "@modern-js/plugin-router-legacy": "@modern-js/plugin-router-legacy/cli"
+  };
+  exports.INTERNAL_SERVER_PLUGINS = {
+    "@modern-js/plugin-bff": "@modern-js/plugin-bff/server",
+    "@modern-js/plugin-express": "@modern-js/plugin-express",
+    "@modern-js/plugin-egg": "@modern-js/plugin-egg",
+    "@modern-js/plugin-koa": "@modern-js/plugin-koa",
+    "@modern-js/plugin-nest": "@modern-js/plugin-nest/server",
+    "@modern-js/plugin-server": "@modern-js/plugin-server/server",
+    "@modern-js/plugin-polyfill": "@modern-js/plugin-polyfill"
   };
   exports.PLUGIN_SCHEMAS = {
     "@modern-js/runtime": [
@@ -35105,24 +35101,6 @@ var require_constants = __commonJSMin((exports) => {
         }
       }
     ],
-    "@modern-js/plugin-esbuild": [
-      {
-        target: "tools.esbuild",
-        schema: { typeof: ["object"] }
-      }
-    ],
-    "@modern-js/plugin-less": [
-      {
-        target: "tools.less",
-        schema: { typeof: ["object", "function"] }
-      }
-    ],
-    "@modern-js/plugin-sass": [
-      {
-        target: "tools.sass",
-        schema: { typeof: ["object", "function"] }
-      }
-    ],
     "@modern-js/plugin-tailwindcss": [
       {
         target: "tools.tailwindcss",
@@ -35135,27 +35113,6 @@ var require_constants = __commonJSMin((exports) => {
         schema: { typeof: ["string", "object"] }
       }
     ],
-    "@modern-js/plugin-unbundle": [
-      {
-        target: "output.disableAutoImportStyle",
-        schema: { type: "boolean" }
-      },
-      {
-        target: "dev.unbundle",
-        schema: {
-          type: "object",
-          properties: {
-            ignore: {
-              type: ["string", "array"],
-              items: { type: "string" }
-            },
-            ignoreModuleCache: { type: "boolean" },
-            clearPdnCache: { type: "boolean" },
-            pdnHost: { type: "string" }
-          }
-        }
-      }
-    ],
     "@modern-js/plugin-ssg": [
       {
         target: "output.ssg",
@@ -35530,7 +35487,7 @@ var require_path = __commonJSMin((exports) => {
     return mod && mod.__esModule ? mod : { "default": mod };
   };
   Object.defineProperty(exports, "__esModule", { value: true });
-  exports.getTemplatePath = exports.normalizeToPosixPath = exports.normalizeOutputPath = exports.isRelativePath = exports.isPathString = void 0;
+  exports.splitPathString = exports.getRealTemporaryDirectory = exports.upwardPaths = exports._joinPathParts = exports.compilePathMatcherRegExp = exports.getTemplatePath = exports.normalizeToPosixPath = exports.normalizeOutputPath = exports.isRelativePath = exports.isPathString = void 0;
   var path_1 = __importDefault(__require("path"));
   var os_1 = __importDefault(__require("os"));
   var fs_1 = __importDefault(__require("fs"));
@@ -35551,6 +35508,34 @@ var require_path = __commonJSMin((exports) => {
     return path_1.default.resolve(...parts);
   };
   exports.getTemplatePath = getTemplatePath;
+  function compilePathMatcherRegExp(match) {
+    if (typeof match !== "string") {
+      return match;
+    }
+    const escaped = compiled_1.lodash.escapeRegExp(match);
+    return new RegExp(`(?<=\\W|^)${escaped}(?=\\W|$)`);
+  }
+  exports.compilePathMatcherRegExp = compilePathMatcherRegExp;
+  var _joinPathParts = (_part, i, parts) => (0, compiled_1.lodash)(parts).filter((part) => !["/", "\\"].includes(part)).tap((parts2) => parts2.unshift("")).slice(0, i + 2).join("/");
+  exports._joinPathParts = _joinPathParts;
+  function upwardPaths(start) {
+    return (0, compiled_1.lodash)(start).split(/[/\\]/).filter(Boolean).map(exports._joinPathParts).reverse().push("/").value();
+  }
+  exports.upwardPaths = upwardPaths;
+  function getRealTemporaryDirectory() {
+    let ret = null;
+    try {
+      ret = os_1.default.tmpdir();
+      ret = fs_1.default.realpathSync(ret);
+    } catch {
+    }
+    return ret;
+  }
+  exports.getRealTemporaryDirectory = getRealTemporaryDirectory;
+  function splitPathString(str) {
+    return str.split(/[\\/]/);
+  }
+  exports.splitPathString = splitPathString;
 });
 var require_runtimeExports = __commonJSMin((exports) => {
   "use strict";
@@ -35614,6 +35599,52 @@ var require_readTsConfig = __commonJSMin((exports) => {
   };
   exports.readTsConfigByFile = readTsConfigByFile;
 });
+var require_pathSerializer = __commonJSMin((exports) => {
+  "use strict";
+  var __importDefault = exports && exports.__importDefault || function(mod) {
+    return mod && mod.__esModule ? mod : { "default": mod };
+  };
+  Object.defineProperty(exports, "__esModule", { value: true });
+  exports.createDefaultPathMatchers = exports.applyMatcherReplacement = exports.applyPathMatcher = exports.matchUpwardPathsAsUnknown = void 0;
+  var os_1 = __importDefault(__require("os"));
+  var lodash_1 = __importDefault(require_lodash2());
+  var path_1 = require_path();
+  var matchUpwardPathsAsUnknown = (p) => (0, lodash_1.default)((0, path_1.upwardPaths)((0, path_1.normalizeToPosixPath)(p))).map((match) => ({ match, mark: "unknown" })).slice(1, -1).value();
+  exports.matchUpwardPathsAsUnknown = matchUpwardPathsAsUnknown;
+  function applyPathMatcher(matcher, str, options3 = {}) {
+    const regex = (0, path_1.compilePathMatcherRegExp)(matcher.match);
+    const replacer = (substring, ...args) => {
+      if (options3.minPartials && (0, path_1.splitPathString)(substring).length < options3.minPartials) {
+        return substring;
+      }
+      const ret = typeof matcher.mark === "string" ? matcher.mark : matcher.mark(substring, ...args);
+      return `<${lodash_1.default.snakeCase(ret).toUpperCase()}>`;
+    };
+    return str.replace(regex, replacer);
+  }
+  exports.applyPathMatcher = applyPathMatcher;
+  function applyMatcherReplacement(matchers, str, options3 = {}) {
+    return matchers.reduce((ret, matcher) => {
+      return applyPathMatcher(matcher, ret, options3);
+    }, str);
+  }
+  exports.applyMatcherReplacement = applyMatcherReplacement;
+  var createDefaultPathMatchers = (root) => {
+    const ret = [
+      {
+        match: /(?<=\/)(\.pnpm\/.+?\/node_modules)(?=\/)/,
+        mark: "pnpmInner"
+      }
+    ];
+    const tmpdir = (0, path_1.getRealTemporaryDirectory)();
+    tmpdir && ret.push({ match: tmpdir, mark: "temp" });
+    ret.push({ match: os_1.default.tmpdir(), mark: "temp" });
+    ret.push({ match: os_1.default.homedir(), mark: "home" });
+    ret.push(...(0, exports.matchUpwardPathsAsUnknown)(root));
+    return ret;
+  };
+  exports.createDefaultPathMatchers = createDefaultPathMatchers;
+});
 var require_generateMetaTags = __commonJSMin((exports) => {
   "use strict";
   Object.defineProperty(exports, "__esModule", { value: true });
@@ -35728,7 +35759,7 @@ var require_alias = __commonJSMin((exports) => {
     return mod && mod.__esModule ? mod : { "default": mod };
   };
   Object.defineProperty(exports, "__esModule", { value: true });
-  exports.getUserAlias = exports.getAlias = exports.validAlias = void 0;
+  exports.getUserAlias = exports.getAliasConfig = exports.mergeAlias = exports.validAlias = void 0;
   var fs_1 = __importDefault(__require("fs"));
   var path_1 = __importDefault(__require("path"));
   var compiled_1 = require_compiled();
@@ -35750,33 +35781,33 @@ var require_alias = __commonJSMin((exports) => {
     return null;
   };
   exports.validAlias = validAlias;
-  var getAlias = (aliasOption, option) => {
+  var mergeAlias = (alias) => (0, applyOptionsChain_1.applyOptionsChain)({}, alias);
+  exports.mergeAlias = mergeAlias;
+  var getAliasConfig = (aliasOption, option) => {
     var _a, _b;
     const isTsProject = fs_1.default.existsSync(option.tsconfigPath);
-    let aliasConfig;
+    const alias = (0, exports.mergeAlias)(aliasOption);
     if (!isTsProject) {
-      aliasConfig = {
+      return {
         absoluteBaseUrl: option.appDirectory,
-        paths: (0, applyOptionsChain_1.applyOptionsChain)({ "@": ["./src"] }, aliasOption),
+        paths: alias,
         isTsPath: false,
         isTsProject
       };
-    } else {
-      const tsconfig = (0, readTsConfig_1.readTsConfigByFile)(option.tsconfigPath);
-      const baseUrl = (_a = tsconfig === null || tsconfig === void 0 ? void 0 : tsconfig.compilerOptions) === null || _a === void 0 ? void 0 : _a.baseUrl;
-      aliasConfig = {
-        absoluteBaseUrl: baseUrl ? path_1.default.join(option.appDirectory, baseUrl) : option.appDirectory,
-        paths: {
-          ...aliasOption || {},
-          ...(_b = tsconfig === null || tsconfig === void 0 ? void 0 : tsconfig.compilerOptions) === null || _b === void 0 ? void 0 : _b.paths
-        },
-        isTsPath: true,
-        isTsProject
-      };
     }
-    return aliasConfig;
+    const tsconfig = (0, readTsConfig_1.readTsConfigByFile)(option.tsconfigPath);
+    const baseUrl = (_a = tsconfig === null || tsconfig === void 0 ? void 0 : tsconfig.compilerOptions) === null || _a === void 0 ? void 0 : _a.baseUrl;
+    return {
+      absoluteBaseUrl: baseUrl ? path_1.default.join(option.appDirectory, baseUrl) : option.appDirectory,
+      paths: {
+        ...alias,
+        ...(_b = tsconfig === null || tsconfig === void 0 ? void 0 : tsconfig.compilerOptions) === null || _b === void 0 ? void 0 : _b.paths
+      },
+      isTsPath: true,
+      isTsProject
+    };
   };
-  exports.getAlias = getAlias;
+  exports.getAliasConfig = getAliasConfig;
   var getUserAlias = (alias = {}) => Object.keys(alias).reduce((o, k) => {
     if (Array.isArray(alias[k])) {
       o[k] = alias[k];
@@ -36100,7 +36131,8 @@ var require_chainId = __commonJSMin((exports) => {
       SVG: "svg",
       PUG: "pug",
       TOML: "toml",
-      YAML: "yaml"
+      YAML: "yaml",
+      JS_BFF_API: "js-bff-api"
     },
     ONE_OF: {
       JS: "js",
@@ -36138,9 +36170,11 @@ var require_chainId = __commonJSMin((exports) => {
       HTML: "html",
       BABEL: "babel",
       ESBUILD: "esbuild",
+      SWC: "swc",
       STYLE: "style-loader",
       POSTCSS: "postcss",
       MARKDOWN: "markdown",
+      IGNORE_CSS: "ignore-css",
       CSS_MODULES_TS: "css-modules-typescript",
       MINI_CSS_EXTRACT: "mini-css-extract"
     },
@@ -36166,12 +36200,14 @@ var require_chainId = __commonJSMin((exports) => {
       NODE_POLYFILL_PROVIDE: "node-polyfill-provide",
       SUBRESOURCE_INTEGRITY: "subresource-integrity",
       ASSETS_RETRY: "ASSETS_RETRY",
-      AUTO_SET_ROOT_SIZE: "auto-set-root-size"
+      AUTO_SET_ROOT_SIZE: "auto-set-root-size",
+      HTML_ASYNC_CHUNK: "html-async-chunk"
     },
     MINIMIZER: {
       JS: "js",
       CSS: "css",
-      ESBUILD: "js-css"
+      ESBUILD: "js-css",
+      SWC: "swc"
     },
     RESOLVE_PLUGIN: {
       MODULE_SCOPE: "module-scope",
@@ -36210,6 +36246,53 @@ var require_version = __commonJSMin((exports) => {
   };
   exports.isReact18 = isReact18;
 });
+var require_plugin = __commonJSMin((exports) => {
+  "use strict";
+  Object.defineProperty(exports, "__esModule", { value: true });
+  exports.getInternalPlugins = void 0;
+  var constants_1 = require_constants();
+  var is_1 = require_is();
+  function getInternalPlugins(appDirectory, internalPlugins = constants_1.INTERNAL_CLI_PLUGINS) {
+    return [
+      ...Object.keys(internalPlugins).filter((name4) => {
+        const config = internalPlugins[name4];
+        if (typeof config !== "string" && config.forced === true) {
+          return true;
+        }
+        return (0, is_1.isDepExists)(appDirectory, name4);
+      }).map((name4) => {
+        const config = internalPlugins[name4];
+        if (typeof config !== "string") {
+          return config.path;
+        } else {
+          return config;
+        }
+      })
+    ];
+  }
+  exports.getInternalPlugins = getInternalPlugins;
+});
+var require_routes = __commonJSMin((exports) => {
+  "use strict";
+  var __importDefault = exports && exports.__importDefault || function(mod) {
+    return mod && mod.__esModule ? mod : { "default": mod };
+  };
+  Object.defineProperty(exports, "__esModule", { value: true });
+  exports.getRouteId = exports.getPathWithoutExt = void 0;
+  var path_1 = __importDefault(__require("path"));
+  var path_2 = require_path();
+  var getPathWithoutExt = (filename) => {
+    const extname = path_1.default.extname(filename);
+    return filename.slice(0, -extname.length);
+  };
+  exports.getPathWithoutExt = getPathWithoutExt;
+  var getRouteId = (componentPath, routesDir) => {
+    const relativePath = (0, path_2.normalizeToPosixPath)(path_1.default.relative(routesDir, componentPath));
+    const id = (0, exports.getPathWithoutExt)(relativePath);
+    return id;
+  };
+  exports.getRouteId = getRouteId;
+});
 var require_dist = __commonJSMin((exports) => {
   "use strict";
   var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
@@ -36256,6 +36339,7 @@ var require_dist = __commonJSMin((exports) => {
   __exportStar(require_runtimeExports(), exports);
   __exportStar(require_readTsConfig(), exports);
   __exportStar(require_path(), exports);
+  __exportStar(require_pathSerializer(), exports);
   __exportStar(require_generateMetaTags(), exports);
   __exportStar(require_prettyInstructions(), exports);
   __exportStar(require_alias(), exports);
@@ -36270,6 +36354,8 @@ var require_dist = __commonJSMin((exports) => {
   __exportStar(require_analyzeProject(), exports);
   __exportStar(require_chainId(), exports);
   __exportStar(require_version(), exports);
+  __exportStar(require_plugin(), exports);
+  __exportStar(require_routes(), exports);
 });
 var require_constants2 = __commonJSMin((exports) => {
   "use strict";
@@ -65411,7 +65497,6 @@ var require_logger2 = __commonJSMin((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.logger = exports.Logger = void 0;
   var chalk_1 = __importDefault(require_chalk2());
-  var { grey, underline } = chalk_1.default;
   var LOG_LEVEL = {
     error: 0,
     warn: 1,
@@ -65426,13 +65511,18 @@ var require_logger2 = __commonJSMin((exports) => {
       level: "error"
     },
     info: {
-      color: "blue",
+      color: "cyan",
       label: "info",
       level: "info"
     },
+    success: {
+      color: "green",
+      label: "Success",
+      level: "info"
+    },
     warn: {
       color: "yellow",
-      label: "warning",
+      label: "warn",
       level: "warn"
     },
     debug: {
@@ -65444,13 +65534,10 @@ var require_logger2 = __commonJSMin((exports) => {
   };
   var DEFAULT_CONFIG = {
     displayLabel: true,
-    underlineLabel: true,
     uppercaseLabel: false
   };
   var Logger = class {
     constructor(options3 = {}) {
-      this.logCount = 200;
-      this.history = {};
       this.level = options3.level || LOG_TYPES.log.level;
       this.config = { ...DEFAULT_CONFIG, ...options3.config || {} };
       this.types = {
@@ -65462,17 +65549,8 @@ var require_logger2 = __commonJSMin((exports) => {
         this[type] = this._log.bind(this, type);
       });
     }
-    retainLog(type, message) {
-      if (!this.history[type]) {
-        this.history[type] = [];
-      }
-      this.history[type].push(message);
-      while (this.history[type].length > this.logCount) {
-        this.history[type].shift();
-      }
-    }
     _log(type, message, ...args) {
-      if (message === void 0) {
+      if (message === void 0 || message === null) {
         console.log();
         return;
       }
@@ -65484,28 +65562,21 @@ var require_logger2 = __commonJSMin((exports) => {
       const logType = this.types[type];
       if (this.config.displayLabel && logType.label) {
         label = this.config.uppercaseLabel ? logType.label.toUpperCase() : logType.label;
-        if (this.config.underlineLabel) {
-          label = underline(label).padEnd(this.longestUnderlinedLabel.length + 1);
-        } else {
-          label = label.padEnd(this.longestLabel.length + 1);
-        }
-        label = logType.color ? chalk_1.default[logType.color](label) : label;
+        label = label.padEnd(this.longestLabel.length);
+        label = chalk_1.default.bold(logType.color ? chalk_1.default[logType.color](label) : label);
       }
       if (message instanceof Error) {
         if (message.stack) {
           const [name4, ...rest] = message.stack.split("\n");
           text = `${name4}
-${grey(rest.join("\n"))}`;
+${chalk_1.default.grey(rest.join("\n"))}`;
         } else {
           text = message.message;
         }
       } else {
         text = `${message}`;
       }
-      if (logType.level === "warn" || logType.level === "error") {
-        this.retainLog(type, text);
-      }
-      const log = label.length > 0 ? `${label}  ${text}` : text;
+      const log = label.length > 0 ? `${label} ${text}` : text;
       console.log(log, ...args);
     }
     getLongestLabel() {
@@ -65518,21 +65589,6 @@ ${grey(rest.join("\n"))}`;
       });
       return longestLabel;
     }
-    get longestUnderlinedLabel() {
-      return underline(this.longestLabel);
-    }
-    getRetainedLogs(type) {
-      return this.history[type] || [];
-    }
-    clearRetainedLogs(type) {
-      if (type) {
-        if (this.history[type]) {
-          this.history[type] = [];
-        }
-      } else {
-        this.history = {};
-      }
-    }
   };
   exports.Logger = Logger;
   var logger = new Logger();
@@ -66192,10 +66248,13 @@ var require_getPort2 = __commonJSMin((exports) => {
   var net_1 = __importDefault(__require("net"));
   var compiled_1 = require_compiled2();
   var logger_1 = require_logger2();
-  var getPort = async (port, tryLimits = 20) => {
+  var getPort = async (port, { tryLimits = 20, strictPort = false } = {}) => {
     if (typeof port === "string") {
       port = parseInt(port, 10);
     }
+    if (strictPort) {
+      tryLimits = 1;
+    }
     const original = port;
     let found = false;
     let attempts = 0;
@@ -66222,7 +66281,11 @@ var require_getPort2 = __commonJSMin((exports) => {
       }
     }
     if (port !== original) {
-      logger_1.logger.info(compiled_1.chalk.red(`Something is already running on port ${original}. ${compiled_1.chalk.yellow(`Use port ${port} instead.`)}`));
+      if (strictPort) {
+        throw new Error(`Port "${original}" is occupied, please choose another one.`);
+      } else {
+        logger_1.logger.info(`Something is already running on port ${original}. ${compiled_1.chalk.yellow(`Use port ${port} instead.`)}`);
+      }
     }
     return port;
   };
@@ -67034,15 +67097,20 @@ var require_chainId2 = __commonJSMin((exports) => {
     }
   };
 });
-var require_reactVersion = __commonJSMin((exports) => {
+var require_version2 = __commonJSMin((exports) => {
   "use strict";
   var __importDefault = exports && exports.__importDefault || function(mod) {
     return mod && mod.__esModule ? mod : { "default": mod };
   };
   Object.defineProperty(exports, "__esModule", { value: true });
-  exports.isReact18 = void 0;
+  exports.isReact18 = exports.getPnpmVersion = void 0;
   var path_1 = __importDefault(__require("path"));
   var compiled_1 = require_compiled2();
+  async function getPnpmVersion() {
+    const { stdout } = await (0, compiled_1.execa)("pnpm", ["--version"]);
+    return stdout;
+  }
+  exports.getPnpmVersion = getPnpmVersion;
   var isReact18 = (cwd) => {
     const pkgPath = path_1.default.join(cwd, "package.json");
     if (!compiled_1.fs.existsSync(pkgPath)) {
@@ -67119,7 +67187,7 @@ var require_dist2 = __commonJSMin((exports) => {
   __exportStar(require_tryResolve2(), exports);
   __exportStar(require_analyzeProject2(), exports);
   __exportStar(require_chainId2(), exports);
-  __exportStar(require_reactVersion(), exports);
+  __exportStar(require_version2(), exports);
 });
 var require_logger3 = __commonJSMin((exports) => {
   "use strict";

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.3",
+  "version": "2.0.0-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -34,12 +34,12 @@
   },
   "devDependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/utils": "1.21.3",
-    "@modern-js/codesmith": "1.6.3",
-    "@modern-js/plugin-i18n": "1.21.3",
-    "@modern-js/upgrade-generator": "2.4.8",
-    "@scripts/build": "1.21.3",
-    "@scripts/jest-config": "1.21.3",
+    "@modern-js/utils": "2.0.0-beta.0",
+    "@modern-js/codesmith": "2.0.0",
+    "@modern-js/plugin-i18n": "2.0.0-beta.0",
+    "@modern-js/upgrade-generator": "3.0.0-beta.0",
+    "@scripts/build": "2.0.0-beta.0",
+    "@scripts/jest-config": "2.0.0-beta.0",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
@@ -51,34 +51,9 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "wireit": {
-    "build": {
-      "command": "modern build",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "modern.config.js"
-      ],
-      "output": [
-        "dist/**/*",
-        "!dist/node/main.js"
-      ]
-    },
-    "test": {
-      "command": "jest --passWithNoTests",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
     "new": "modern new",
-    "build": "wireit",
-    "test": "wireit"
+    "build": "modern build",
+    "test": "jest --passWithNoTests"
   }
 }