@modern-js/utils 2.35.0 → 2.36.0

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

@@ -1,11 +1,11 @@
 import { execa } from "../compiled";
-export async function getPnpmVersion() {
+async function getPnpmVersion() {
   const { stdout } = await execa("pnpm", [
     "--version"
   ]);
   return stdout;
 }
-export async function canUseNpm() {
+async function canUseNpm() {
   try {
     await execa("npm", [
       "--version"
@@ -17,7 +17,7 @@ export async function canUseNpm() {
     return false;
   }
 }
-export async function canUseYarn() {
+async function canUseYarn() {
   try {
     await execa("yarn", [
       "--version"
@@ -29,7 +29,7 @@ export async function canUseYarn() {
     return false;
   }
 }
-export async function canUsePnpm() {
+async function canUsePnpm() {
   try {
     await execa("pnpm", [
       "--version"
@@ -41,3 +41,9 @@ export async function canUsePnpm() {
     return false;
   }
 }
+export {
+  canUseNpm,
+  canUsePnpm,
+  canUseYarn,
+  getPnpmVersion
+};

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

@@ -2,11 +2,11 @@ import path from "path";
 import os from "os";
 import fs from "fs";
 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]+):/, (_, m) => `/${m.toLowerCase()}`);
-export const getTemplatePath = (prefix) => {
+const isPathString = (test) => path.posix.basename(test) !== test || path.win32.basename(test) !== test;
+const isRelativePath = (test) => /^\.\.?($|[\\/])/.test(test);
+const normalizeOutputPath = (s) => s.replace(/\\/g, "\\\\");
+const normalizeToPosixPath = (p) => upath.normalizeSafe(path.normalize(p || "")).replace(/^([a-zA-Z]+):/, (_, m) => `/${m.toLowerCase()}`);
+const getTemplatePath = (prefix) => {
   const tmpRoot = fs.realpathSync(os.tmpdir());
   const parts = [
     tmpRoot
@@ -15,7 +15,7 @@ export const getTemplatePath = (prefix) => {
   parts.push(nanoid());
   return path.resolve(...parts);
 };
-export function getRealTemporaryDirectory() {
+function getRealTemporaryDirectory() {
   let ret = null;
   try {
     ret = os.tmpdir();
@@ -24,12 +24,25 @@ export function getRealTemporaryDirectory() {
   }
   return ret;
 }
-export function splitPathString(str) {
+function splitPathString(str) {
   return str.split(/[\\/]/);
 }
-export const removeLeadingSlash = (s) => s.replace(/^\/+/, "");
-export const removeTailSlash = (s) => s.replace(/\/+$/, "");
-export const removeSlash = (s) => removeLeadingSlash(removeTailSlash(s));
-export const cutNameByHyphen = (s) => {
+const removeLeadingSlash = (s) => s.replace(/^\/+/, "");
+const removeTailSlash = (s) => s.replace(/\/+$/, "");
+const removeSlash = (s) => removeLeadingSlash(removeTailSlash(s));
+const cutNameByHyphen = (s) => {
   return s.split(/[-_]/)[0];
 };
+export {
+  cutNameByHyphen,
+  getRealTemporaryDirectory,
+  getTemplatePath,
+  isPathString,
+  isRelativePath,
+  normalizeOutputPath,
+  normalizeToPosixPath,
+  removeLeadingSlash,
+  removeSlash,
+  removeTailSlash,
+  splitPathString
+};

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

@@ -1,7 +1,7 @@
 import net from "net";
 import { chalk } from "../compiled";
 import { logger } from "./logger";
-export const getPort = async (port, { tryLimits = 20, strictPort = false, slient = false } = {}) => {
+const getPort = async (port, { tryLimits = 20, strictPort = false, slient = false } = {}) => {
   if (typeof port === "string") {
     port = parseInt(port, 10);
   }
@@ -37,8 +37,11 @@ export const getPort = async (port, { tryLimits = 20, strictPort = false, slient
     if (strictPort) {
       throw new Error(`Port "${original}" is occupied, please choose another one.`);
     } else if (!slient) {
-      logger.info(`Something is already running on port ${original}. ${chalk.yellow(`Use port ${port} instead.`)}`);
+      logger.info(`Port ${original} is in use. ${chalk.yellow(`using port ${port}.`)}`);
     }
   }
   return port;
 };
+export {
+  getPort
+};

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

@@ -16,13 +16,10 @@ const getIpv4Interfaces = () => {
   });
   return ipv4Interfaces;
 };
-export const getAddressUrls = (protocol = "http", port, host) => {
+const getAddressUrls = (protocol = "http", port, host) => {
   const LOCAL_LABEL = "Local:  ";
   const NETWORK_LABEL = "Network:  ";
-  const isLocalhost = (url) => {
-    var _url;
-    return (_url = url) === null || _url === void 0 ? void 0 : _url.includes("localhost");
-  };
+  const isLocalhost = (url) => url === null || url === void 0 ? void 0 : url.includes("localhost");
   if (host && host !== DEFAULT_DEV_HOST) {
     return [
       {
@@ -47,13 +44,13 @@ export const getAddressUrls = (protocol = "http", port, host) => {
     return memo;
   }, []);
 };
-export const prettyInstructions = (appContext, config) => {
+const prettyInstructions = (appContext, config) => {
   var _appContext_builder_context_devServer, _appContext_builder, _config_dev, _config_source;
   const { entrypoints, serverRoutes, port, apiOnly, checkedEntries } = appContext;
   const isHttps = isDev() && ((_appContext_builder = appContext.builder) === null || _appContext_builder === void 0 ? void 0 : (_appContext_builder_context_devServer = _appContext_builder.context.devServer) === null || _appContext_builder_context_devServer === void 0 ? void 0 : _appContext_builder_context_devServer.https);
   const urls = getAddressUrls(isHttps ? "https" : "http", port, (_config_dev = config.dev) === null || _config_dev === void 0 ? void 0 : _config_dev.host);
   const routes = !apiOnly ? serverRoutes.filter((route) => route.entryName) : serverRoutes;
-  let message = "App running at:\n\n";
+  let message = "\n";
   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("");
@@ -76,3 +73,7 @@ export const prettyInstructions = (appContext, config) => {
   }
   return message;
 };
+export {
+  getAddressUrls,
+  prettyInstructions
+};

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

@@ -1,12 +1,11 @@
 import { findExists } from "./fs";
-export const compatRequire = (filePath, interop = true) => {
-  var _mod;
+const compatRequire = (filePath, interop = true) => {
   const mod = require(filePath);
-  const rtnESMDefault = interop && ((_mod = mod) === null || _mod === void 0 ? void 0 : _mod.__esModule);
+  const rtnESMDefault = interop && (mod === null || mod === void 0 ? void 0 : mod.__esModule);
   return rtnESMDefault ? mod.default : mod;
 };
-export const dynamicImport = new Function("modulePath", "return import(modulePath)");
-export const requireExistModule = (filename, opt) => {
+const dynamicImport = new Function("modulePath", "return import(modulePath)");
+const requireExistModule = (filename, opt) => {
   const final = {
     extensions: [
       ".ts",
@@ -21,12 +20,12 @@ export const requireExistModule = (filename, opt) => {
   }
   return compatRequire(exist, final.interop);
 };
-export const cleanRequireCache = (filelist) => {
+const cleanRequireCache = (filelist) => {
   filelist.forEach((filepath) => {
     delete require.cache[filepath];
   });
 };
-export function deleteRequireCache(path) {
+function deleteRequireCache(path) {
   if (require.cache[path]) {
     delete require.cache[path];
   }
@@ -34,7 +33,7 @@ export function deleteRequireCache(path) {
     module.children = module.children.filter((item) => item.filename !== path);
   }
 }
-export const tryResolve = (name, resolvePath) => {
+const tryResolve = (name, resolvePath) => {
   let filePath = "";
   try {
     filePath = require.resolve(name, {
@@ -51,3 +50,11 @@ export const tryResolve = (name, resolvePath) => {
   }
   return filePath;
 };
+export {
+  cleanRequireCache,
+  compatRequire,
+  deleteRequireCache,
+  dynamicImport,
+  requireExistModule,
+  tryResolve
+};

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

@@ -14,7 +14,7 @@ const memo = (fn) => {
     return res;
   };
 };
-export const createRuntimeExportsUtils = memo((pwd = "", namespace = "index") => {
+const createRuntimeExportsUtils = memo((pwd = "", namespace = "index") => {
   const entryExportFile = path.join(pwd, `.runtime-exports/${namespace}.js`);
   const addExport = (statement) => {
     statement = normalizeOutputPath(statement);
@@ -33,3 +33,6 @@ export const createRuntimeExportsUtils = memo((pwd = "", namespace = "index") =>
     getPath
   };
 });
+export {
+  createRuntimeExportsUtils
+};

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

@@ -1,11 +1,11 @@
 import path from "path";
 import { chokidar } from "../compiled";
-export const WatchChangeType = {
+const WatchChangeType = {
   ADD: "add",
   UNLINK: "unlink",
   CHANGE: "change"
 };
-export const watch = (watchDir, runTask, ignored = []) => {
+const watch = (watchDir, runTask, ignored = []) => {
   let ready = false;
   const watcher = chokidar.watch(watchDir, {
     ignored
@@ -39,3 +39,7 @@ export const watch = (watchDir, runTask, ignored = []) => {
   });
   return watcher;
 };
+export {
+  WatchChangeType,
+  watch
+};

package/dist/esm-node/compiled.js

@@ -1,32 +1,66 @@
 import { Import } from "./import";
-export { default as fs } from "../compiled/fs-extra";
-export { default as ora } from "../compiled/ora";
-export { default as glob } from "../compiled/glob";
-export { default as yaml } from "../compiled/js-yaml";
-export { default as chalk } from "../compiled/chalk";
-export { default as debug } from "../compiled/debug";
-export { default as slash } from "../compiled/slash";
-export { default as execa } from "../compiled/execa";
-export { default as json5 } from "../compiled/json5";
-export { default as upath } from "../compiled/upath";
-export { default as pkgUp } from "../compiled/pkg-up";
-export { nanoid } from "../compiled/nanoid";
-export { default as semver } from "../compiled/semver";
-export { default as dotenv } from "../compiled/dotenv";
-export { default as lodash } from "../compiled/lodash";
-export { default as globby } from "../compiled/globby";
-export { default as address } from "../compiled/address";
-export { default as signale } from "../compiled/signale";
-export { default as urlJoin } from "../compiled/url-join";
-export { default as minimist } from "../compiled/minimist";
-export { default as fastGlob } from "../compiled/fast-glob";
-export { default as filesize } from "../compiled/filesize";
-export { default as gzipSize } from "../compiled/gzip-size";
-export { default as stripAnsi } from "../compiled/strip-ansi";
-export { default as dotenvExpand } from "../compiled/dotenv-expand";
-export { default as browserslist } from "../compiled/browserslist";
-export { program, Command } from "../compiled/commander";
-export { Signale } from "../compiled/signale";
-export const mime = Import.lazy("../compiled/mime-types", require);
-export const chokidar = Import.lazy("../compiled/chokidar", require);
-export const inquirer = Import.lazy("../compiled/inquirer", require);
+import { default as default2 } from "../compiled/fs-extra";
+import { default as default3 } from "../compiled/ora";
+import { default as default4 } from "../compiled/glob";
+import { default as default5 } from "../compiled/js-yaml";
+import { default as default6 } from "../compiled/chalk";
+import { default as default7 } from "../compiled/debug";
+import { default as default8 } from "../compiled/slash";
+import { default as default9 } from "../compiled/execa";
+import { default as default10 } from "../compiled/json5";
+import { default as default11 } from "../compiled/upath";
+import { default as default12 } from "../compiled/pkg-up";
+import { nanoid } from "../compiled/nanoid";
+import { default as default13 } from "../compiled/semver";
+import { default as default14 } from "../compiled/dotenv";
+import { default as default15 } from "../compiled/lodash";
+import { default as default16 } from "../compiled/globby";
+import { default as default17 } from "../compiled/address";
+import { default as default18 } from "../compiled/signale";
+import { default as default19 } from "../compiled/url-join";
+import { default as default20 } from "../compiled/minimist";
+import { default as default21 } from "../compiled/fast-glob";
+import { default as default22 } from "../compiled/filesize";
+import { default as default23 } from "../compiled/gzip-size";
+import { default as default24 } from "../compiled/strip-ansi";
+import { default as default25 } from "../compiled/dotenv-expand";
+import { default as default26 } from "../compiled/browserslist";
+import { program, Command } from "../compiled/commander";
+import { Signale } from "../compiled/signale";
+const mime = Import.lazy("../compiled/mime-types", require);
+const chokidar = Import.lazy("../compiled/chokidar", require);
+const inquirer = Import.lazy("../compiled/inquirer", require);
+export {
+  Command,
+  Signale,
+  default17 as address,
+  default26 as browserslist,
+  default6 as chalk,
+  chokidar,
+  default7 as debug,
+  default14 as dotenv,
+  default25 as dotenvExpand,
+  default9 as execa,
+  default21 as fastGlob,
+  default22 as filesize,
+  default2 as fs,
+  default4 as glob,
+  default16 as globby,
+  default23 as gzipSize,
+  inquirer,
+  default10 as json5,
+  default15 as lodash,
+  mime,
+  default20 as minimist,
+  nanoid,
+  default3 as ora,
+  default12 as pkgUp,
+  program,
+  default13 as semver,
+  default18 as signale,
+  default8 as slash,
+  default24 as stripAnsi,
+  default11 as upath,
+  default19 as urlJoin,
+  default5 as yaml
+};

package/dist/esm-node/import.js

@@ -2,7 +2,10 @@ const lazy = (moduleName, requireFn) => {
   const importLazyLocal = require("../compiled/import-lazy")(requireFn);
   return importLazyLocal(moduleName);
 };
-export { lazy as lazyImport };
-export const Import = {
+const Import = {
   lazy
 };
+export {
+  Import,
+  lazy as lazyImport
+};

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

@@ -1,4 +1,10 @@
-export const ROUTE_MANIFEST = `_MODERNJS_ROUTE_MANIFEST`;
-export const HMR_SOCK_PATH = "/webpack-hmr";
-export const HTML_CHUNKSMAP_SEPARATOR = "<!--<?- chunksMap.js ?>-->";
-export const LOADER_REPORTER_NAME = `server-loader`;
+const ROUTE_MANIFEST = `_MODERNJS_ROUTE_MANIFEST`;
+const HMR_SOCK_PATH = "/webpack-hmr";
+const HTML_CHUNKSMAP_SEPARATOR = "<!--<?- chunksMap.js ?>-->";
+const LOADER_REPORTER_NAME = `server-loader`;
+export {
+  HMR_SOCK_PATH,
+  HTML_CHUNKSMAP_SEPARATOR,
+  LOADER_REPORTER_NAME,
+  ROUTE_MANIFEST
+};

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

@@ -50,7 +50,7 @@ const defaultColor = {
   yellow: noop,
   underline: noop
 };
-export function addErrorTips(errors, color = defaultColor) {
+function addErrorTips(errors, color = defaultColor) {
   const errorHelpers = [
     {
       validator(message) {
@@ -79,9 +79,9 @@ export default {
   });
 }
 function formatWebpackMessages(json, color = defaultColor) {
-  var _json_errors, _json, _json_warnings, _json1, _result_errors;
-  const formattedErrors = (_json = json) === null || _json === void 0 ? void 0 : (_json_errors = _json.errors) === null || _json_errors === void 0 ? void 0 : _json_errors.map(formatMessage);
-  const 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 _json_errors, _json_warnings, _result_errors;
+  const formattedErrors = json === null || json === void 0 ? void 0 : (_json_errors = json.errors) === null || _json_errors === void 0 ? void 0 : _json_errors.map(formatMessage);
+  const formattedWarnings = json === null || json === void 0 ? void 0 : (_json_warnings = json.warnings) === null || _json_warnings === void 0 ? void 0 : _json_warnings.map(formatMessage);
   const result = {
     errors: formattedErrors || [],
     warnings: formattedWarnings || [],
@@ -96,4 +96,7 @@ function formatWebpackMessages(json, color = defaultColor) {
   result.errors = addErrorTips(result.errors, color);
   return result;
 }
-export { formatWebpackMessages };
+export {
+  addErrorTips,
+  formatWebpackMessages
+};

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

@@ -1,4 +1,4 @@
-export const pluginDagSort = (plugins, key = "name", preKey = "pre", postKey = "post") => {
+const pluginDagSort = (plugins, key = "name", preKey = "pre", postKey = "post") => {
   let allLines = [];
   function getPluginByAny(q) {
     const target = plugins.find((item) => typeof q === "string" ? item[key] === q : item[key] === q[key]);
@@ -44,7 +44,10 @@ export const pluginDagSort = (plugins, key = "name", preKey = "pre", postKey = "
       restInRingPoints[l[0]] = true;
       restInRingPoints[l[1]] = true;
     });
-    throw new Error(`plugins dependences has loop: ${Object.keys(restInRingPoints).join(",")}`);
+    throw new Error(`plugins dependencies has loop: ${Object.keys(restInRingPoints).join(",")}`);
   }
   return sortedPoint;
 };
+export {
+  pluginDagSort
+};

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

@@ -11,11 +11,6 @@ interface IAliasConfig {
   isTsPath?: boolean;
   isTsProject?: boolean;
 }
-export declare const validAlias: <T extends NormalizedConfig>(modernConfig: T, {
-  tsconfigPath
-}: {
-  tsconfigPath: string;
-}) => string | null;
 export declare const mergeAlias: (alias: NormalizedConfig['source']['alias']) => Alias;
 export declare const getAliasConfig: (aliasOption: NormalizedConfig['source']['alias'], option: {
   appDirectory: string;

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

@@ -89,8 +89,6 @@ export declare const CHAIN_ID: {
     readonly STYLE: "style-loader";
     /** postcss-loader */
     readonly POSTCSS: "postcss";
-    /** markdown-loader */
-    readonly MARKDOWN: "markdown";
     /** ignore-css-loader */
     readonly IGNORE_CSS: "ignore-css";
     /** css-modules-typescript-loader */
@@ -172,6 +170,8 @@ export declare const CHAIN_ID: {
     readonly HTML_ASYNC_CHUNK: "html-async-chunk";
     /** SWC_POLYFILL_CHECKER */
     readonly SWC_POLYFILL_CHECKER: "swc-polyfill-checker-plugin";
+    /** RouterPlugin */
+    readonly ROUTER_MANIFEST: "route-plugin";
   };
   /** Predefined minimizers */
   readonly MINIMIZER: {

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

@@ -5,5 +5,4 @@ export declare const getNodeEnv: () => string;
 export declare const isDev: () => boolean;
 export declare const isProd: () => boolean;
 export declare const isTest: () => boolean;
-export declare const isProdProfile: () => boolean;
-export declare const isFastRefresh: () => boolean;
+export declare const isBrowser: () => boolean;

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

@@ -1,5 +1,4 @@
 export * from './env';
-export * from './platform';
 export * from './type';
 export * from './config';
 export * from './project';

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

@@ -1,64 +1 @@
-import { Color } from '../../compiled/chalk';
-type LogLevel = 'debug' | 'info' | 'warn' | 'error';
-type LogMsg = number | string | Error | null;
-interface LoggerConfiguration {
-  color?: typeof Color;
-  label?: string;
-  level?: LogLevel;
-}
-interface InstanceConfiguration {
-  displayLabel?: boolean;
-  uppercaseLabel?: boolean;
-}
-interface ConstructorOptions {
-  config?: InstanceConfiguration;
-  level?: string;
-  types?: Record<string, LoggerConfiguration>;
-}
-type LoggerFunction = (message?: LogMsg, ...args: any[]) => void;
-declare const LOG_TYPES: {
-  error: {
-    color: string;
-    label: string;
-    level: string;
-  };
-  info: {
-    color: string;
-    label: string;
-    level: string;
-  };
-  success: {
-    color: string;
-    label: string;
-    level: string;
-  };
-  warn: {
-    color: string;
-    label: string;
-    level: string;
-  };
-  debug: {
-    color: string;
-    label: string;
-    level: string;
-  };
-  log: {
-    level: string;
-  };
-};
-export declare const isErrorStackMessage: (message: string) => boolean;
-declare class Logger {
-  private readonly level;
-  private readonly config;
-  private readonly types;
-  private readonly longestLabel;
-  [key: string]: any;
-  constructor(options?: ConstructorOptions);
-  private _log;
-  private getLongestLabel;
-}
-type LoggerInterface = { [key in keyof typeof LOG_TYPES]: LoggerFunction };
-declare const logger: Logger & LoggerInterface;
-export { Logger };
-export { logger };
-export type { LoggerInterface };
+export { logger, createLogger, type Logger } from 'rslog';

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

@@ -3,7 +3,6 @@ export declare const isLerna: (root: string) => boolean;
 export declare const isYarnWorkspaces: (root: string) => boolean;
 export declare const isPnpmWorkspaces: (root: string) => boolean;
 export declare const isMonorepo: (root: string) => boolean;
-export declare const isModernjsMonorepo: (root: string) => boolean;
 export declare const findMonorepoRoot: (appDirectory: string, maxDepth?: number) => string | undefined;
 export declare const getMonorepoPackages: (root: string) => {
   name: string;