@modern-js/utils 1.19.0 → 1.20.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @modern-js/utils
 
+## 1.20.0
+
+### Patch Changes
+
+- d5d570b: feat: optimize the logger of @modern-js/utils, remove builder logger
+
+  feat: 优化 @modern-js/utils 的 logger 格式, 移除 builder 内置的 logger
+
+- 4ddc185: chore(builder): bump webpack to 5.74.0
+
+  chore(builder): 升级 webpack 到 5.74.0 版本
+
+- df8ee7e: fix(utils): failed to resolve execa
+
+  fix(utils): 修复找不到 execa 模块的问题
+
+- 8c05089: fix: support monorepo deploy in pnpm 7
+  fix: 修复 monorepo deploy 命令在 pnpm 7 下的问题
+
 ## 1.19.0
 
 ## 1.18.1
@@ -18,8 +37,8 @@
 
 ### Minor Changes
 
-- 5227370: feat: add webpack-builder plugin subresource-integrity
-  feat: 新增 webpack-builder 插件 subresource-integrity
+- 5227370: feat: add builder plugin subresource-integrity
+  feat: 新增 builder 插件 subresource-integrity
 
 ### Patch Changes
 
@@ -124,7 +143,7 @@
 
 ### Minor Changes
 
-- 7b9067f: add babel plugin for webpack-builder
+- 7b9067f: add babel plugin for builder
 
 ### Patch Changes
 

package/dist/getPort.d.ts

@@ -2,6 +2,10 @@
  * Get available free port.
  * @param port - Current port want to use.
  * @param tryLimits - Maximum number of retries.
+ * @param strictPort - Whether to throw an error when the port is occupied.
  * @returns Available port number.
  */
-export declare const getPort: (port: string | number, tryLimits?: number) => Promise<number>;
+export declare const getPort: (port: string | number, { tryLimits, strictPort, }?: {
+    tryLimits?: number | undefined;
+    strictPort?: boolean | undefined;
+}) => Promise<number>;

package/dist/getPort.js

@@ -11,13 +11,17 @@ const logger_1 = require("./logger");
  * Get available free port.
  * @param port - Current port want to use.
  * @param tryLimits - Maximum number of retries.
+ * @param strictPort - Whether to throw an error when the port is occupied.
  * @returns Available port number.
  */
 /* eslint-disable no-param-reassign, @typescript-eslint/no-loop-func */
-const getPort = async (port, tryLimits = 20) => {
+const 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;
@@ -45,7 +49,12 @@ const getPort = async (port, tryLimits = 20) => {
         }
     }
     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;
 };

package/dist/index.d.ts

@@ -34,4 +34,4 @@ export * from './ssr';
 export * from './tryResolve';
 export * from './analyzeProject';
 export * from './chainId';
-export * from './reactVersion';
+export * from './version';

package/dist/index.js

@@ -50,4 +50,4 @@ __exportStar(require("./ssr"), exports);
 __exportStar(require("./tryResolve"), exports);
 __exportStar(require("./analyzeProject"), exports);
 __exportStar(require("./chainId"), exports);
-__exportStar(require("./reactVersion"), exports);
+__exportStar(require("./version"), exports);

package/dist/logger.d.ts

@@ -1,5 +1,6 @@
 import { Color } from '../compiled/chalk';
 declare type LogLevel = 'debug' | 'info' | 'warn' | 'error';
+declare type LogMsg = number | string | Error | null;
 interface LoggerConfiguration {
     color?: typeof Color;
     label?: string;
@@ -7,7 +8,6 @@ interface LoggerConfiguration {
 }
 interface InstanceConfiguration {
     displayLabel?: boolean;
-    underlineLabel?: boolean;
     uppercaseLabel?: boolean;
 }
 interface ConstructorOptions {
@@ -15,7 +15,7 @@ interface ConstructorOptions {
     level?: string;
     types?: Record<string, LoggerConfiguration>;
 }
-declare type LoggerFunction = (message?: number | string | Error, ...args: any[]) => void;
+declare type LoggerFunction = (message?: LogMsg, ...args: any[]) => void;
 declare const LOG_TYPES: {
     error: {
         color: string;
@@ -42,20 +42,14 @@ declare const LOG_TYPES: {
     };
 };
 declare class Logger {
-    private readonly logCount;
     private readonly level;
-    private history;
     private readonly config;
     private readonly types;
     private readonly longestLabel;
     [key: string]: any;
     constructor(options?: ConstructorOptions);
-    private retainLog;
     private _log;
     private getLongestLabel;
-    private get longestUnderlinedLabel();
-    getRetainedLogs(type: string): string[];
-    clearRetainedLogs(type: string): void;
 }
 declare type LoggerInterface = {
     [key in keyof typeof LOG_TYPES]: LoggerFunction;

package/dist/logger.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logger = exports.Logger = void 0;
 const chalk_1 = __importDefault(require("../compiled/chalk"));
-const { grey, underline } = chalk_1.default;
 const LOG_LEVEL = {
     error: 0,
     warn: 1,
@@ -20,13 +19,13 @@ const LOG_TYPES = {
         level: 'error',
     },
     info: {
-        color: 'blue',
+        color: 'cyan',
         label: 'info',
         level: 'info',
     },
     warn: {
         color: 'yellow',
-        label: 'warning',
+        label: 'warn',
         level: 'warn',
     },
     debug: {
@@ -38,13 +37,10 @@ const LOG_TYPES = {
 };
 const DEFAULT_CONFIG = {
     displayLabel: true,
-    underlineLabel: true,
     uppercaseLabel: false,
 };
 class Logger {
     constructor(options = {}) {
-        this.logCount = 200;
-        this.history = {};
         this.level = options.level || LOG_TYPES.log.level;
         this.config = { ...DEFAULT_CONFIG, ...(options.config || {}) };
         this.types = {
@@ -56,17 +52,8 @@ class Logger {
             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 === undefined) {
+        if (message === undefined || message === null) {
             // eslint-disable-next-line no-console
             console.log();
             return;
@@ -81,18 +68,13 @@ class Logger {
             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 [name, ...rest] = message.stack.split('\n');
-                text = `${name}\n${grey(rest.join('\n'))}`;
+                text = `${name}\n${chalk_1.default.grey(rest.join('\n'))}`;
             }
             else {
                 text = message.message;
@@ -101,12 +83,7 @@ class Logger {
         else {
             text = `${message}`;
         }
-        // only retain logs of warn/error level
-        if (logType.level === 'warn' || logType.level === 'error') {
-            // retain log text without label
-            this.retainLog(type, text);
-        }
-        const log = label.length > 0 ? `${label}  ${text}` : text;
+        const log = label.length > 0 ? `${label} ${text}` : text;
         // eslint-disable-next-line no-console
         console.log(log, ...args);
     }
@@ -120,22 +97,6 @@ class Logger {
         });
         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;
 const logger = new Logger();

package/dist/version.d.ts

@@ -0,0 +1,2 @@
+export declare function getPnpmVersion(): Promise<string>;
+export declare const isReact18: (cwd: string) => boolean;

package/dist/{reactVersion.js → version.js}

@@ -3,9 +3,14 @@ var __importDefault = (this && this.__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;
 const path_1 = __importDefault(require("path"));
 const compiled_1 = require("./compiled");
+async function getPnpmVersion() {
+    const { stdout } = await (0, compiled_1.execa)('pnpm', ['--version']);
+    return stdout;
+}
+exports.getPnpmVersion = getPnpmVersion;
 const isReact18 = (cwd) => {
     const pkgPath = path_1.default.join(cwd, 'package.json');
     if (!compiled_1.fs.existsSync(pkgPath)) {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.19.0",
+  "version": "1.20.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -20,9 +20,10 @@
   "_comment": "Provide ESM and CJS exports, ESM is used by runtime package, for treeshaking",
   "exports": {
     ".": "./dist/index.js",
+    "./ssr": "./dist/ssr.js",
     "./format": "./dist/format.js",
+    "./logger": "./dist/logger.js",
     "./constants": "./dist/constants.js",
-    "./ssr": "./dist/ssr.js",
     "./ajv": "./compiled/ajv/index.js",
     "./glob": "./compiled/glob/index.js",
     "./chalk": "./compiled/chalk/index.js",
@@ -49,15 +50,18 @@
   },
   "typesVersions": {
     "*": {
+      "ssr": [
+        "./dist/ssr.d.ts"
+      ],
       "format": [
         "./dist/format.d.ts"
       ],
+      "logger": [
+        "./dist/logger.d.ts"
+      ],
       "constants": [
         "./dist/constants.d.ts"
       ],
-      "ssr": [
-        "./dist/ssr.d.ts"
-      ],
       "ajv": [
         "./compiled/ajv/types/ajv.d.ts"
       ],
@@ -125,14 +129,14 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@modern-js/types": "1.19.0",
-    "@scripts/build": "1.19.0",
-    "@scripts/jest-config": "1.19.0",
+    "@modern-js/types": "1.20.0",
+    "@scripts/build": "1.20.0",
+    "@scripts/jest-config": "1.20.0",
     "@types/jest": "^27",
     "@types/node": "^14",
     "typescript": "^4",
     "jest": "^27",
-    "webpack": "^5.71.0"
+    "webpack": "^5.74.0"
   },
   "sideEffects": false,
   "wireit": {

package/dist/reactVersion.d.ts

@@ -1 +0,0 @@
-export declare const isReact18: (cwd: string) => boolean;