@modern-js/utils 2.15.0 → 2.16.0

package/dist/esm/ensureAbsolutePath.js

@@ -1,5 +1,2 @@
 import path from "path";
-const ensureAbsolutePath = (base, filePath) => path.isAbsolute(filePath) ? filePath : path.resolve(base, filePath);
-export {
-  ensureAbsolutePath
-};
+export const ensureAbsolutePath = (base, filePath) => path.isAbsolute(filePath) ? filePath : path.resolve(base, filePath);

package/dist/esm/ensureArray.js

@@ -1,9 +1,8 @@
-const ensureArray = (params) => {
+export const ensureArray = (params) => {
   if (Array.isArray(params)) {
     return params;
   }
-  return [params];
-};
-export {
-  ensureArray
+  return [
+    params
+  ];
 };

package/dist/esm/findExists.js

@@ -1,5 +1,5 @@
 import fs from "fs";
-const findExists = (files) => {
+export const findExists = (files) => {
   for (const file of files) {
     if (fs.existsSync(file) && fs.statSync(file).isFile()) {
       return file;
@@ -7,6 +7,3 @@ const findExists = (files) => {
   }
   return false;
 };
-export {
-  findExists
-};

package/dist/esm/generateMetaTags.js

@@ -5,9 +5,11 @@ const tagObjectToString = (tagDefinition) => {
     }
     return `${attributeName}="${tagDefinition.attributes[attributeName]}"`;
   });
-  return `<${[tagDefinition.tagName].concat(attributes).join(" ")}>${tagDefinition.innerHTML || ""}${tagDefinition.voidTag ? "" : `</${tagDefinition.tagName}>`}`;
+  return `<${[
+    tagDefinition.tagName
+  ].concat(attributes).join(" ")}>${tagDefinition.innerHTML || ""}${tagDefinition.voidTag ? "" : `</${tagDefinition.tagName}>`}`;
 };
-const generateMetaTags = (metaOptions) => {
+export const generateMetaTags = (metaOptions) => {
   if (!metaOptions) {
     return "";
   }
@@ -27,12 +29,6 @@ const generateMetaTags = (metaOptions) => {
       voidTag: true,
       attributes: metaTagAttributes
     };
-  }).reduce(
-    (memo, tagObject) => `${memo}
-${tagObjectToString(tagObject)}`,
-    ""
-  );
-};
-export {
-  generateMetaTags
+  }).reduce((memo, tagObject) => `${memo}
+${tagObjectToString(tagObject)}`, "");
 };

package/dist/esm/getBrowserslist.js

@@ -1,7 +1,9 @@
 import { browserslist } from "./compiled";
-const defaults = ["> 0.01%", "not dead", "not op_mini all"];
-const getBrowserslist = (appDirectory) => browserslist.loadConfig({ path: appDirectory }) || defaults;
-export {
-  defaults,
-  getBrowserslist
-};
+export const defaults = [
+  "> 0.01%",
+  "not dead",
+  "not op_mini all"
+];
+export const getBrowserslist = (appDirectory) => browserslist.loadConfig({
+  path: appDirectory
+}) || defaults;

package/dist/esm/getCoreJsVersion.js

@@ -1,5 +1,5 @@
 import * as fs from "../compiled/fs-extra";
-const getCoreJsVersion = (corejsPkgPath) => {
+export const getCoreJsVersion = (corejsPkgPath) => {
   try {
     const { version } = fs.readJSONSync(corejsPkgPath);
     const [major, minor] = version.split(".");
@@ -8,6 +8,3 @@ const getCoreJsVersion = (corejsPkgPath) => {
     return "3";
   }
 };
-export {
-  getCoreJsVersion
-};

package/dist/esm/getEntryOptions.js

@@ -1,17 +1,17 @@
 import { isPlainObject } from "./is";
 import { MAIN_ENTRY_NAME } from "./constants";
-const getEntryOptions = (name, baseOptions, optionsByEntries, packageName) => {
+export const getEntryOptions = (name, baseOptions, optionsByEntries, packageName) => {
   if (optionsByEntries) {
     let optionsByEntry = getOptionsByEntryName(name, optionsByEntries);
     if (optionsByEntry === void 0 && name === MAIN_ENTRY_NAME && packageName) {
       optionsByEntry = getOptionsByEntryName(packageName, optionsByEntries);
     }
-    return optionsByEntry !== void 0 ? isPlainObject(optionsByEntry) && isPlainObject(baseOptions) ? { ...baseOptions, ...optionsByEntry } : optionsByEntry : baseOptions;
+    return optionsByEntry !== void 0 ? isPlainObject(optionsByEntry) && isPlainObject(baseOptions) ? {
+      ...baseOptions,
+      ...optionsByEntry
+    } : optionsByEntry : baseOptions;
   } else {
     return baseOptions;
   }
 };
 const getOptionsByEntryName = (name, optionsByEntries) => optionsByEntries.hasOwnProperty(name) ? optionsByEntries[name] : void 0;
-export {
-  getEntryOptions
-};

package/dist/esm/getPackageManager.js

@@ -3,7 +3,7 @@ import path from "path";
 import { fs } from "./compiled";
 import { canUsePnpm, canUseYarn } from "./nodeEnv";
 const MAX_TIMES = 5;
-async function getPackageManager(cwd = process.cwd()) {
+export async function getPackageManager(cwd = process.cwd()) {
   let appDirectory = cwd;
   let times = 0;
   while (os.homedir() !== appDirectory && times < MAX_TIMES) {
@@ -27,6 +27,3 @@ async function getPackageManager(cwd = process.cwd()) {
   }
   return "npm";
 }
-export {
-  getPackageManager
-};

package/dist/esm/getPort.js

@@ -1,10 +1,7 @@
 import net from "net";
 import { chalk } from "./compiled";
 import { logger } from "./logger";
-const getPort = async (port, {
-  tryLimits = 20,
-  strictPort = false
-} = {}) => {
+export const getPort = async (port, { tryLimits = 20, strictPort = false } = {}) => {
   if (typeof port === "string") {
     port = parseInt(port, 10);
   }
@@ -20,16 +17,13 @@ const getPort = async (port, {
         const server = net.createServer();
         server.unref();
         server.on("error", reject);
-        server.listen(
-          {
-            port,
-            host: "0.0.0.0"
-          },
-          () => {
-            found = true;
-            server.close(resolve);
-          }
-        );
+        server.listen({
+          port,
+          host: "0.0.0.0"
+        }, () => {
+          found = true;
+          server.close(resolve);
+        });
       });
     } catch (e) {
       if (e.code !== "EADDRINUSE") {
@@ -41,19 +35,10 @@ const getPort = async (port, {
   }
   if (port !== original) {
     if (strictPort) {
-      throw new Error(
-        `Port "${original}" is occupied, please choose another one.`
-      );
+      throw new Error(`Port "${original}" is occupied, please choose another one.`);
     } else {
-      logger.info(
-        `Something is already running on port ${original}. ${chalk.yellow(
-          `Use port ${port} instead.`
-        )}`
-      );
+      logger.info(`Something is already running on port ${original}. ${chalk.yellow(`Use port ${port} instead.`)}`);
     }
   }
   return port;
 };
-export {
-  getPort
-};

package/dist/esm/getServerConfig.js

@@ -1,14 +1,7 @@
 import * as path from "path";
 import { CONFIG_FILE_EXTENSIONS } from "./constants";
 import { findExists } from "./findExists";
-const getServerConfig = async (appDirectory, configFile) => {
-  const configFilePath = findExists(
-    CONFIG_FILE_EXTENSIONS.map(
-      (extension) => path.resolve(appDirectory, `${configFile}${extension}`)
-    )
-  );
+export const getServerConfig = async (appDirectory, configFile) => {
+  const configFilePath = findExists(CONFIG_FILE_EXTENSIONS.map((extension) => path.resolve(appDirectory, `${configFile}${extension}`)));
   return configFilePath;
 };
-export {
-  getServerConfig
-};

package/dist/esm/getTargetDir.js

@@ -1,8 +1,5 @@
 import * as path from "path";
-const getTargetDir = (from, baseDir, targetBaseDir) => {
+export const getTargetDir = (from, baseDir, targetBaseDir) => {
   const relativePath = path.relative(baseDir, from);
   return path.resolve(targetBaseDir, relativePath);
 };
-export {
-  getTargetDir
-};

package/dist/esm/import.js

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

package/dist/esm/is/index.js

@@ -3,7 +3,7 @@ import path from "path";
 import { createDebugger } from "../debug";
 import { isDev } from "./nodeEnv";
 const debug = createDebugger("judge-depExists");
-const isDepExists = (appDirectory, name) => {
+export const isDepExists = (appDirectory, name) => {
   const pkgPath = path.resolve(appDirectory, "./package.json");
   if (!fs.existsSync(pkgPath)) {
     debug(`can't find package.json under: %s`, appDirectory);
@@ -13,14 +13,14 @@ const isDepExists = (appDirectory, name) => {
   const { dependencies = {}, devDependencies = {} } = json;
   return dependencies.hasOwnProperty(name) || devDependencies.hasOwnProperty(name);
 };
-const isTypescript = (root) => fs.existsSync(path.resolve(root, "./tsconfig.json"));
-const isEmpty = (o) => Object.entries(o).length === 0 && o.constructor === Object;
-const isSSR = (config) => {
+export const isTypescript = (root) => fs.existsSync(path.resolve(root, "./tsconfig.json"));
+export const isEmpty = (o) => Object.entries(o).length === 0 && o.constructor === Object;
+export const isSSR = (config) => {
   const { server } = config;
-  if (server == null ? void 0 : server.ssr) {
+  if (server === null || server === void 0 ? void 0 : server.ssr) {
     return true;
   }
-  if ((server == null ? void 0 : server.ssrByEntries) && !isEmpty(server.ssrByEntries)) {
+  if ((server === null || server === void 0 ? void 0 : server.ssrByEntries) && !isEmpty(server.ssrByEntries)) {
     for (const name of Object.keys(server.ssrByEntries)) {
       if (server.ssrByEntries[name]) {
         return true;
@@ -29,44 +29,32 @@ const isSSR = (config) => {
   }
   return false;
 };
-const isUseSSRBundle = (config) => {
+export const isUseSSRBundle = (config) => {
   const { output } = config;
-  if (output == null ? void 0 : output.ssg) {
+  if (output === null || output === void 0 ? void 0 : output.ssg) {
     return true;
   }
   return isSSR(config);
 };
-const isServiceWorker = (config) => {
-  var _a;
+export const isServiceWorker = (config) => {
+  var _deploy_worker;
   const { output, deploy } = config;
-  if (((_a = deploy == null ? void 0 : deploy.worker) == null ? void 0 : _a.ssr) && ((output == null ? void 0 : output.ssg) || isSSR(config))) {
+  if ((deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr) && ((output === null || output === void 0 ? void 0 : output.ssg) || isSSR(config))) {
     return true;
   }
   return false;
 };
-const isFastRefresh = () => isDev() && process.env.FAST_REFRESH !== "false";
-const isRouterV5 = (config) => {
-  var _a, _b, _c;
-  return typeof ((_a = config.runtime) == null ? void 0 : _a.router) !== "boolean" && ((_c = (_b = config == null ? void 0 : config.runtime) == null ? void 0 : _b.router) == null ? void 0 : _c.mode) === "react-router-5";
+export const isFastRefresh = () => isDev() && process.env.FAST_REFRESH !== "false";
+export const 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";
 };
-const isSSGEntry = (config, entryName, entrypoints) => {
+export const isSSGEntry = (config, entryName, entrypoints) => {
   const ssgConfig = config.output.ssg;
-  const useSSG = isSingleEntry(entrypoints) ? Boolean(ssgConfig) : ssgConfig === true || typeof (ssgConfig == null ? void 0 : ssgConfig[0]) === "function" || Boolean(ssgConfig == null ? void 0 : ssgConfig[entryName]);
+  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]);
   return useSSG;
 };
-const isSingleEntry = (entrypoints) => entrypoints.length === 1 && entrypoints[0].entryName === "main";
+export const isSingleEntry = (entrypoints) => entrypoints.length === 1 && entrypoints[0].entryName === "main";
 export * from "./nodeEnv";
 export * from "./platform";
 export * from "./type";
-export {
-  isDepExists,
-  isEmpty,
-  isFastRefresh,
-  isRouterV5,
-  isSSGEntry,
-  isSSR,
-  isServiceWorker,
-  isSingleEntry,
-  isTypescript,
-  isUseSSRBundle
-};

package/dist/esm/is/nodeEnv.js

@@ -1,12 +1,5 @@
-const getNodeEnv = () => process.env.NODE_ENV || "development";
-const isDev = () => getNodeEnv() === "development";
-const isProd = () => getNodeEnv() === "production";
-const isTest = () => getNodeEnv() === "test";
-const isProdProfile = () => isProd() && process.argv.includes("--profile");
-export {
-  getNodeEnv,
-  isDev,
-  isProd,
-  isProdProfile,
-  isTest
-};
+export const getNodeEnv = () => process.env.NODE_ENV || "development";
+export const isDev = () => getNodeEnv() === "development";
+export const isProd = () => getNodeEnv() === "production";
+export const isTest = () => getNodeEnv() === "test";
+export const isProdProfile = () => isProd() && process.argv.includes("--profile");

package/dist/esm/is/platform.js

@@ -1,6 +1,2 @@
-const isNodeJS = () => typeof process !== "undefined" && process.versions != null && process.versions.node != null && process.versions.electron == null;
-const isBrowser = () => typeof window !== "undefined";
-export {
-  isBrowser,
-  isNodeJS
-};
+export const isNodeJS = () => typeof process !== "undefined" && process.versions != null && process.versions.node != null && process.versions.electron == null;
+export const isBrowser = () => typeof window !== "undefined";

package/dist/esm/is/type.js

@@ -1,34 +1,24 @@
-function isString(str) {
+export function isString(str) {
   return typeof str === "string";
 }
-function isUndefined(obj) {
+export function isUndefined(obj) {
   return typeof obj === "undefined";
 }
-function isArray(obj) {
+export function isArray(obj) {
   return Array.isArray(obj);
 }
-function isFunction(func) {
+export function isFunction(func) {
   return typeof func === "function";
 }
-function isObject(obj) {
+export function isObject(obj) {
   return obj !== null && typeof obj === "object";
 }
-function isPlainObject(obj) {
+export function isPlainObject(obj) {
   return isObject(obj) && Object.prototype.toString.call(obj) === "[object Object]";
 }
-function isPromise(obj) {
+export function isPromise(obj) {
   return Boolean(obj) && (typeof obj === "object" || typeof obj === "function") && typeof obj.then === "function";
 }
-function isRegExp(obj) {
+export function isRegExp(obj) {
   return Object.prototype.toString.call(obj) === "[object RegExp]";
 }
-export {
-  isArray,
-  isFunction,
-  isObject,
-  isPlainObject,
-  isPromise,
-  isRegExp,
-  isString,
-  isUndefined
-};

package/dist/esm/logger.js

@@ -1,3 +1,16 @@
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
 import chalk from "../compiled/chalk";
 const LOG_LEVEL = {
   error: 0,
@@ -32,25 +45,15 @@ const LOG_TYPES = {
     label: "debug",
     level: "debug"
   },
-  log: { level: "log" }
+  log: {
+    level: "log"
+  }
 };
 const DEFAULT_CONFIG = {
   displayLabel: true,
   uppercaseLabel: false
 };
 class Logger {
-  constructor(options = {}) {
-    this.level = options.level || LOG_TYPES.log.level;
-    this.config = { ...DEFAULT_CONFIG, ...options.config || {} };
-    this.types = {
-      ...LOG_TYPES,
-      ...options.types || {}
-    };
-    this.longestLabel = this.getLongestLabel();
-    Object.keys(this.types).forEach((type) => {
-      this[type] = this._log.bind(this, type);
-    });
-  }
   _log(type, message, ...args) {
     if (message === void 0 || message === null) {
       console.log();
@@ -91,10 +94,27 @@ ${chalk.grey(rest.join("\n"))}`;
     });
     return longestLabel;
   }
+  constructor(options = {}) {
+    _define_property(this, "level", void 0);
+    _define_property(this, "config", void 0);
+    _define_property(this, "types", void 0);
+    _define_property(this, "longestLabel", void 0);
+    this.level = options.level || LOG_TYPES.log.level;
+    this.config = {
+      ...DEFAULT_CONFIG,
+      ...options.config || {}
+    };
+    this.types = {
+      ...LOG_TYPES,
+      ...options.types || {}
+    };
+    this.longestLabel = this.getLongestLabel();
+    Object.keys(this.types).forEach((type) => {
+      this[type] = this._log.bind(this, type);
+    });
+  }
 }
 const logger = new Logger();
 logger.Logger = Logger;
-export {
-  Logger,
-  logger
-};
+export { Logger };
+export { logger };

package/dist/esm/monorepo.js

@@ -7,19 +7,19 @@ const WORKSPACE_FILES = {
   PNPM: "pnpm-workspace.yaml",
   LERNA: "lerna.json"
 };
-const isLerna = (root) => fs.existsSync(path.join(root, WORKSPACE_FILES.LERNA));
-const isYarnWorkspaces = (root) => {
-  var _a;
+export const isLerna = (root) => fs.existsSync(path.join(root, WORKSPACE_FILES.LERNA));
+export const isYarnWorkspaces = (root) => {
+  var _json_workspaces;
   const pkg = path.join(root, WORKSPACE_FILES.YARN);
   if (!fs.existsSync(pkg)) {
     return false;
   }
   const json = JSON.parse(fs.readFileSync(pkg, "utf8"));
-  return Boolean((_a = json.workspaces) == null ? void 0 : _a.packages);
+  return Boolean((_json_workspaces = json.workspaces) === null || _json_workspaces === void 0 ? void 0 : _json_workspaces.packages);
 };
-const isPnpmWorkspaces = (root) => fs.existsSync(path.join(root, WORKSPACE_FILES.PNPM));
-const isMonorepo = (root) => isLerna(root) || isYarnWorkspaces(root) || isPnpmWorkspaces(root);
-const isModernjsMonorepo = (root) => {
+export const isPnpmWorkspaces = (root) => fs.existsSync(path.join(root, WORKSPACE_FILES.PNPM));
+export const isMonorepo = (root) => isLerna(root) || isYarnWorkspaces(root) || isPnpmWorkspaces(root);
+export const isModernjsMonorepo = (root) => {
   const pkgJsonPath = path.join(root, "package.json");
   if (!fs.existsSync(pkgJsonPath)) {
     return false;
@@ -31,7 +31,7 @@ const isModernjsMonorepo = (root) => {
   };
   return Boolean(deps["@modern-js/monorepo-tools"]);
 };
-const findMonorepoRoot = (appDirectory, maxDepth = PACKAGE_MAX_DEPTH) => {
+export const findMonorepoRoot = (appDirectory, maxDepth = PACKAGE_MAX_DEPTH) => {
   let inMonorepo = false;
   for (let depth = 0; depth < maxDepth; depth++) {
     if (isMonorepo(appDirectory)) {
@@ -42,46 +42,29 @@ const findMonorepoRoot = (appDirectory, maxDepth = PACKAGE_MAX_DEPTH) => {
   }
   return inMonorepo ? appDirectory : void 0;
 };
-const getMonorepoPackages = (root) => {
+export const getMonorepoPackages = (root) => {
   let packages = [];
   if (isYarnWorkspaces(root)) {
-    const json = JSON.parse(
-      fs.readFileSync(path.join(root, "package.json"), "utf8")
-    );
+    const json = JSON.parse(fs.readFileSync(path.join(root, "package.json"), "utf8"));
     ({ packages } = json.workspaces);
   } else if (isLerna(root)) {
-    const json = JSON.parse(
-      fs.readFileSync(path.resolve(root, "lerna.json"), "utf8")
-    );
+    const json = JSON.parse(fs.readFileSync(path.resolve(root, "lerna.json"), "utf8"));
     ({ packages } = json);
   } else {
-    ({ packages } = yaml.load(
-      fs.readFileSync(path.join(root, WORKSPACE_FILES.PNPM), "utf8")
-    ));
+    ({ packages } = yaml.load(fs.readFileSync(path.join(root, WORKSPACE_FILES.PNPM), "utf8")));
   }
   if (packages) {
-    return packages.map(
-      (name) => (
-        // The trailing / ensures only dirs are picked up
-        glob.sync(path.join(root, `${name}/`), {
-          ignore: ["**/node_modules/**"]
-        })
-      )
-    ).reduce((acc, val) => acc.concat(val), []).filter((filepath) => fs.existsSync(path.resolve(filepath, "package.json"))).map((filepath) => ({
+    return packages.map((name) => (
+      // The trailing / ensures only dirs are picked up
+      glob.sync(path.join(root, `${name}/`), {
+        ignore: [
+          "**/node_modules/**"
+        ]
+      })
+    )).reduce((acc, val) => acc.concat(val), []).filter((filepath) => fs.existsSync(path.resolve(filepath, "package.json"))).map((filepath) => ({
       path: filepath,
-      name: JSON.parse(
-        fs.readFileSync(path.resolve(filepath, "package.json"), "utf8")
-      ).name
+      name: JSON.parse(fs.readFileSync(path.resolve(filepath, "package.json"), "utf8")).name
     }));
   }
   return [];
 };
-export {
-  findMonorepoRoot,
-  getMonorepoPackages,
-  isLerna,
-  isModernjsMonorepo,
-  isMonorepo,
-  isPnpmWorkspaces,
-  isYarnWorkspaces
-};

package/dist/esm/nodeEnv.js

@@ -1,30 +1,37 @@
 import { execa } from "./compiled";
-async function canUseNpm() {
+export async function canUseNpm() {
   try {
-    await execa("npm", ["--version"], { env: process.env });
+    await execa("npm", [
+      "--version"
+    ], {
+      env: process.env
+    });
     return true;
   } catch (e) {
     return false;
   }
 }
-async function canUseYarn() {
+export async function canUseYarn() {
   try {
-    await execa("yarn", ["--version"], { env: process.env });
+    await execa("yarn", [
+      "--version"
+    ], {
+      env: process.env
+    });
     return true;
   } catch (e) {
     return false;
   }
 }
-async function canUsePnpm() {
+export async function canUsePnpm() {
   try {
-    await execa("pnpm", ["--version"], { env: process.env });
+    await execa("pnpm", [
+      "--version"
+    ], {
+      env: process.env
+    });
     return true;
   } catch (e) {
     return false;
   }
 }
-export {
-  canUseNpm,
-  canUsePnpm,
-  canUseYarn
-};