@modern-js/utils 2.35.0 → 2.36.0

package/dist/esm/cli/prettyInstructions.js

@@ -19,13 +19,12 @@ var getIpv4Interfaces = function() {
   });
   return ipv4Interfaces;
 };
-export var getAddressUrls = function() {
+var getAddressUrls = function() {
   var protocol = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "http", port = arguments.length > 1 ? arguments[1] : void 0, host = arguments.length > 2 ? arguments[2] : void 0;
   var LOCAL_LABEL = "Local:  ";
   var NETWORK_LABEL = "Network:  ";
   var isLocalhost = function(url) {
-    var _url;
-    return (_url = url) === null || _url === void 0 ? void 0 : _url.includes("localhost");
+    return url === null || url === void 0 ? void 0 : url.includes("localhost");
   };
   if (host && host !== DEFAULT_DEV_HOST) {
     return [
@@ -51,7 +50,7 @@ export var getAddressUrls = function() {
     return memo;
   }, []);
 };
-export var prettyInstructions = function(appContext, config) {
+var prettyInstructions = function(appContext, config) {
   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 = 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);
@@ -59,7 +58,7 @@ export var prettyInstructions = function(appContext, config) {
   var routes = !apiOnly ? serverRoutes.filter(function(route) {
     return route.entryName;
   }) : serverRoutes;
-  var message = "App running at:\n\n";
+  var message = "\n";
   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;
@@ -87,3 +86,7 @@ export var prettyInstructions = function(appContext, config) {
   }
   return message;
 };
+export {
+  getAddressUrls,
+  prettyInstructions
+};

package/dist/esm/cli/require.js

@@ -1,14 +1,13 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { findExists } from "./fs";
-export var compatRequire = function(filePath) {
+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 = mod) === null || _mod === void 0 ? void 0 : _mod.__esModule);
+  var rtnESMDefault = interop && (mod === null || mod === void 0 ? void 0 : mod.__esModule);
   return rtnESMDefault ? mod.default : mod;
 };
-export var dynamicImport = new Function("modulePath", "return import(modulePath)");
-export var requireExistModule = function(filename, opt) {
+var dynamicImport = new Function("modulePath", "return import(modulePath)");
+var requireExistModule = function(filename, opt) {
   var final = _object_spread({
     extensions: [
       ".ts",
@@ -24,12 +23,12 @@ export var requireExistModule = function(filename, opt) {
   }
   return compatRequire(exist, final.interop);
 };
-export var cleanRequireCache = function(filelist) {
+var cleanRequireCache = function(filelist) {
   filelist.forEach(function(filepath) {
     delete require.cache[filepath];
   });
 };
-export function deleteRequireCache(path) {
+function deleteRequireCache(path) {
   if (require.cache[path]) {
     delete require.cache[path];
   }
@@ -39,7 +38,7 @@ export function deleteRequireCache(path) {
     });
   }
 }
-export var tryResolve = function(name, resolvePath) {
+var tryResolve = function(name, resolvePath) {
   var filePath = "";
   try {
     filePath = require.resolve(name, {
@@ -56,3 +55,11 @@ export var tryResolve = function(name, resolvePath) {
   }
   return filePath;
 };
+export {
+  cleanRequireCache,
+  compatRequire,
+  deleteRequireCache,
+  dynamicImport,
+  requireExistModule,
+  tryResolve
+};

package/dist/esm/cli/runtimeExports.js

@@ -18,7 +18,7 @@ var memo = function(fn) {
     return res;
   };
 };
-export var createRuntimeExportsUtils = memo(function() {
+var createRuntimeExportsUtils = memo(function() {
   var pwd = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "", namespace = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "index";
   var entryExportFile = path.join(pwd, ".runtime-exports/".concat(namespace, ".js"));
   var addExport = function(statement) {
@@ -35,7 +35,10 @@ export var createRuntimeExportsUtils = memo(function() {
     return entryExportFile;
   };
   return {
-    addExport: addExport,
-    getPath: getPath
+    addExport,
+    getPath
   };
 });
+export {
+  createRuntimeExportsUtils
+};

package/dist/esm/cli/watch.js

@@ -2,16 +2,16 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { chokidar } from "../compiled";
-export var WatchChangeType = {
+var WatchChangeType = {
   ADD: "add",
   UNLINK: "unlink",
   CHANGE: "change"
 };
-export var watch = function(watchDir, runTask) {
+var watch = function(watchDir, runTask) {
   var ignored = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : [];
   var ready = false;
   var watcher = chokidar.watch(watchDir, {
-    ignored: ignored
+    ignored
   });
   watcher.on("ready", function() {
     return ready = true;
@@ -26,7 +26,7 @@ export var watch = function(watchDir, runTask) {
             return [
               4,
               runTask({
-                changedFilePath: changedFilePath,
+                changedFilePath,
                 changeType: WatchChangeType.CHANGE
               })
             ];
@@ -57,7 +57,7 @@ export var watch = function(watchDir, runTask) {
             return [
               4,
               runTask({
-                changedFilePath: changedFilePath,
+                changedFilePath,
                 changeType: WatchChangeType.ADD
               })
             ];
@@ -85,7 +85,7 @@ export var watch = function(watchDir, runTask) {
             return [
               4,
               runTask({
-                changedFilePath: changedFilePath,
+                changedFilePath,
                 changeType: WatchChangeType.UNLINK
               })
             ];
@@ -106,3 +106,7 @@ export var watch = function(watchDir, runTask) {
   });
   return watcher;
 };
+export {
+  WatchChangeType,
+  watch
+};

package/dist/esm/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 var mime = Import.lazy("../compiled/mime-types", require);
-export var chokidar = Import.lazy("../compiled/chokidar", require);
-export var 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";
+var mime = Import.lazy("../compiled/mime-types", require);
+var chokidar = Import.lazy("../compiled/chokidar", require);
+var 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/import.js

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

package/dist/esm/universal/constants.js

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

package/dist/esm/universal/formatWebpack.js

@@ -50,7 +50,7 @@ var defaultColor = {
   yellow: noop,
   underline: noop
 };
-export function addErrorTips(errors) {
+function addErrorTips(errors) {
   var color = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : defaultColor;
   var errorHelpers = [
     {
@@ -71,9 +71,9 @@ export function addErrorTips(errors) {
 }
 function formatWebpackMessages(json) {
   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 _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 result = {
     errors: formattedErrors || [],
     warnings: formattedWarnings || [],
@@ -88,4 +88,7 @@ function formatWebpackMessages(json) {
   result.errors = addErrorTips(result.errors, color);
   return result;
 }
-export { formatWebpackMessages };
+export {
+  addErrorTips,
+  formatWebpackMessages
+};

package/dist/esm/universal/pluginDagSort.js

@@ -1,4 +1,4 @@
-export var pluginDagSort = function(plugins) {
+var pluginDagSort = function(plugins) {
   var _loop = function() {
     var zep = zeroEndPoints.shift();
     sortedPoint.push(getPluginByAny(zep));
@@ -67,7 +67,10 @@ export var pluginDagSort = function(plugins) {
       restInRingPoints[l[0]] = true;
       restInRingPoints[l[1]] = true;
     });
-    throw new Error("plugins dependences has loop: ".concat(Object.keys(restInRingPoints).join(",")));
+    throw new Error("plugins dependencies has loop: ".concat(Object.keys(restInRingPoints).join(",")));
   }
   return sortedPoint;
 };
+export {
+  pluginDagSort
+};

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

@@ -1,26 +1,10 @@
 import fs from "fs";
 import path from "path";
-import { chalk } from "../compiled";
 import { readTsConfigByFile } from "./get";
 import { applyOptionsChain } from "./applyOptionsChain";
-export const validAlias = (modernConfig, { tsconfigPath }) => {
-  const { source: { alias } } = modernConfig;
-  if (!alias) {
-    return null;
-  }
-  const isTsProject = fs.existsSync(tsconfigPath);
-  if (!isTsProject) {
-    return null;
-  }
-  const userAlias = getUserAlias(alias);
-  if (Object.keys(userAlias).length > 0) {
-    return chalk.red('Note: Please use `compilerOptions.paths` in "tsconfig.json" file replace `source.alias` config in "modern.config.js/ts" when project is typescript');
-  }
-  return null;
-};
-export const mergeAlias = (alias) => applyOptionsChain({}, alias);
-export const getAliasConfig = (aliasOption, option) => {
-  var _tsconfig_compilerOptions, _tsconfig, _tsconfig_compilerOptions1, _tsconfig1;
+const mergeAlias = (alias) => applyOptionsChain({}, alias);
+const getAliasConfig = (aliasOption, option) => {
+  var _tsconfig_compilerOptions, _tsconfig_compilerOptions1;
   const isTsProject = fs.existsSync(option.tsconfigPath);
   const alias = mergeAlias(aliasOption);
   if (!isTsProject) {
@@ -32,20 +16,25 @@ export const getAliasConfig = (aliasOption, option) => {
     };
   }
   const tsconfig = readTsConfigByFile(option.tsconfigPath);
-  const baseUrl = (_tsconfig = tsconfig) === null || _tsconfig === void 0 ? void 0 : (_tsconfig_compilerOptions = _tsconfig.compilerOptions) === null || _tsconfig_compilerOptions === void 0 ? void 0 : _tsconfig_compilerOptions.baseUrl;
+  const baseUrl = 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,
-      ...(_tsconfig1 = tsconfig) === null || _tsconfig1 === void 0 ? void 0 : (_tsconfig_compilerOptions1 = _tsconfig1.compilerOptions) === null || _tsconfig_compilerOptions1 === void 0 ? void 0 : _tsconfig_compilerOptions1.paths
+      ...tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig_compilerOptions1 = tsconfig.compilerOptions) === null || _tsconfig_compilerOptions1 === void 0 ? void 0 : _tsconfig_compilerOptions1.paths
     },
     isTsPath: true,
     isTsProject
   };
 };
-export const getUserAlias = (alias = {}) => Object.keys(alias).reduce((o, k) => {
+const getUserAlias = (alias = {}) => Object.keys(alias).reduce((o, k) => {
   if (Array.isArray(alias[k])) {
     o[k] = alias[k];
   }
   return o;
 }, {});
+export {
+  getAliasConfig,
+  getUserAlias,
+  mergeAlias
+};

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

@@ -1,6 +1,6 @@
 import { isFunction, isPlainObject } from "./is";
 import { logger } from "./logger";
-export function applyOptionsChain(defaults, options, utils, mergeFn = Object.assign) {
+function applyOptionsChain(defaults, options, utils, mergeFn = Object.assign) {
   if (!options) {
     return defaults;
   }
@@ -22,3 +22,6 @@ default options is: ${JSON.stringify(defaults)}`);
   }
   return defaults;
 }
+export {
+  applyOptionsChain
+};

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

@@ -74,7 +74,7 @@ const modifyPresetOptions = (presetName, options, presets = []) => {
     }
   });
 };
-export const getBabelUtils = (config) => {
+const getBabelUtils = (config) => {
   const noop = () => {
   };
   return {
@@ -91,7 +91,7 @@ export const getBabelUtils = (config) => {
     modifyPresetReactOptions: (options) => modifyPresetOptions("@babel/preset-react", options, config.presets || [])
   };
 };
-export const applyUserBabelConfig = (defaultOptions, userBabelConfig, extraBabelUtils) => {
+const applyUserBabelConfig = (defaultOptions, userBabelConfig, extraBabelUtils) => {
   if (userBabelConfig) {
     const babelUtils = {
       ...getBabelUtils(defaultOptions),
@@ -101,3 +101,7 @@ export const applyUserBabelConfig = (defaultOptions, userBabelConfig, extraBabel
   }
   return defaultOptions;
 };
+export {
+  applyUserBabelConfig,
+  getBabelUtils
+};

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

@@ -1,16 +1,22 @@
-export const getFullArgv = () => {
+const getFullArgv = () => {
   var _process_env_MODERN_ARGV;
   return ((_process_env_MODERN_ARGV = process.env.MODERN_ARGV) === null || _process_env_MODERN_ARGV === void 0 ? void 0 : _process_env_MODERN_ARGV.split(" ")) || process.argv;
 };
-export const getArgv = () => {
+const getArgv = () => {
   return getFullArgv().slice(2);
 };
-export const getCommand = () => {
+const getCommand = () => {
   const args = getArgv();
   const command = args[0];
   return command;
 };
-export const isDevCommand = () => {
+const isDevCommand = () => {
   const command = getCommand();
   return command === "dev" || command === "start";
 };
+export {
+  getArgv,
+  getCommand,
+  getFullArgv,
+  isDevCommand
+};

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

@@ -1,10 +1,15 @@
 import { debug } from "../../compiled/debug";
-export const createDebugger = (scope) => debug(`modern-js:${scope}`);
-export const clearConsole = () => {
+const createDebugger = (scope) => debug(`modern-js:${scope}`);
+const clearConsole = () => {
   if (process.stdout.isTTY && !process.env.DEBUG) {
     process.stdout.write("\x1B[H\x1B[2J");
   }
 };
-export const wait = (time = 0) => new Promise((resolve) => {
+const wait = (time = 0) => new Promise((resolve) => {
   setTimeout(resolve, time);
 });
+export {
+  clearConsole,
+  createDebugger,
+  wait
+};

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

@@ -1,5 +1,8 @@
-export const isOverriddenConfigKey = (key) => [
+const isOverriddenConfigKey = (key) => [
   "removeConsole",
   "enableInlineScripts",
   "enableInlineStyles"
 ].includes(key);
+export {
+  isOverriddenConfigKey
+};

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

@@ -1,4 +1,4 @@
-export const CHAIN_ID = {
+const CHAIN_ID = {
   /** Predefined rules */
   RULE: {
     /** Rule for .mjs */
@@ -89,8 +89,6 @@ export const CHAIN_ID = {
     STYLE: "style-loader",
     /** postcss-loader */
     POSTCSS: "postcss",
-    /** markdown-loader */
-    MARKDOWN: "markdown",
     /** ignore-css-loader */
     IGNORE_CSS: "ignore-css",
     /** css-modules-typescript-loader */
@@ -171,7 +169,9 @@ export const CHAIN_ID = {
     /** HtmlAsyncChunkPlugin */
     HTML_ASYNC_CHUNK: "html-async-chunk",
     /** SWC_POLYFILL_CHECKER */
-    SWC_POLYFILL_CHECKER: "swc-polyfill-checker-plugin"
+    SWC_POLYFILL_CHECKER: "swc-polyfill-checker-plugin",
+    /** RouterPlugin */
+    ROUTER_MANIFEST: "route-plugin"
   },
   /** Predefined minimizers */
   MINIMIZER: {
@@ -192,3 +192,6 @@ export const CHAIN_ID = {
     TS_CONFIG_PATHS: "ts-config-paths"
   }
 };
+export {
+  CHAIN_ID
+};