@rspack/cli 2.0.0-beta.4 → 2.0.0-beta.6

package/dist/131.js

@@ -9,72 +9,6 @@ import node_fs from "node:fs";
 import { createRequire } from "node:module";
 import { pathToFileURL } from "node:url";
 __webpack_require__.add({
-    "../../node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js" (module) {
-        let p = process || {}, argv = p.argv || [], env = p.env || {};
-        let isColorSupported = !(!!env.NO_COLOR || argv.includes("--no-color")) && (!!env.FORCE_COLOR || argv.includes("--color") || "win32" === p.platform || (p.stdout || {}).isTTY && "dumb" !== env.TERM || !!env.CI);
-        let formatter = (open, close, replace = open)=>(input)=>{
-                let string = "" + input, index = string.indexOf(close, open.length);
-                return ~index ? open + replaceClose(string, close, replace, index) + close : open + string + close;
-            };
-        let replaceClose = (string, close, replace, index)=>{
-            let result = "", cursor = 0;
-            do {
-                result += string.substring(cursor, index) + replace;
-                cursor = index + close.length;
-                index = string.indexOf(close, cursor);
-            }while (~index);
-            return result + string.substring(cursor);
-        };
-        let createColors = (enabled = isColorSupported)=>{
-            let f = enabled ? formatter : ()=>String;
-            return {
-                isColorSupported: enabled,
-                reset: f("\x1b[0m", "\x1b[0m"),
-                bold: f("\x1b[1m", "\x1b[22m", "\x1b[22m\x1b[1m"),
-                dim: f("\x1b[2m", "\x1b[22m", "\x1b[22m\x1b[2m"),
-                italic: f("\x1b[3m", "\x1b[23m"),
-                underline: f("\x1b[4m", "\x1b[24m"),
-                inverse: f("\x1b[7m", "\x1b[27m"),
-                hidden: f("\x1b[8m", "\x1b[28m"),
-                strikethrough: f("\x1b[9m", "\x1b[29m"),
-                black: f("\x1b[30m", "\x1b[39m"),
-                red: f("\x1b[31m", "\x1b[39m"),
-                green: f("\x1b[32m", "\x1b[39m"),
-                yellow: f("\x1b[33m", "\x1b[39m"),
-                blue: f("\x1b[34m", "\x1b[39m"),
-                magenta: f("\x1b[35m", "\x1b[39m"),
-                cyan: f("\x1b[36m", "\x1b[39m"),
-                white: f("\x1b[37m", "\x1b[39m"),
-                gray: f("\x1b[90m", "\x1b[39m"),
-                bgBlack: f("\x1b[40m", "\x1b[49m"),
-                bgRed: f("\x1b[41m", "\x1b[49m"),
-                bgGreen: f("\x1b[42m", "\x1b[49m"),
-                bgYellow: f("\x1b[43m", "\x1b[49m"),
-                bgBlue: f("\x1b[44m", "\x1b[49m"),
-                bgMagenta: f("\x1b[45m", "\x1b[49m"),
-                bgCyan: f("\x1b[46m", "\x1b[49m"),
-                bgWhite: f("\x1b[47m", "\x1b[49m"),
-                blackBright: f("\x1b[90m", "\x1b[39m"),
-                redBright: f("\x1b[91m", "\x1b[39m"),
-                greenBright: f("\x1b[92m", "\x1b[39m"),
-                yellowBright: f("\x1b[93m", "\x1b[39m"),
-                blueBright: f("\x1b[94m", "\x1b[39m"),
-                magentaBright: f("\x1b[95m", "\x1b[39m"),
-                cyanBright: f("\x1b[96m", "\x1b[39m"),
-                whiteBright: f("\x1b[97m", "\x1b[39m"),
-                bgBlackBright: f("\x1b[100m", "\x1b[49m"),
-                bgRedBright: f("\x1b[101m", "\x1b[49m"),
-                bgGreenBright: f("\x1b[102m", "\x1b[49m"),
-                bgYellowBright: f("\x1b[103m", "\x1b[49m"),
-                bgBlueBright: f("\x1b[104m", "\x1b[49m"),
-                bgMagentaBright: f("\x1b[105m", "\x1b[49m"),
-                bgCyanBright: f("\x1b[106m", "\x1b[49m"),
-                bgWhiteBright: f("\x1b[107m", "\x1b[49m")
-            };
-        };
-        module.exports = createColors();
-        module.exports.createColors = createColors;
-    },
     "../../node_modules/.pnpm/pirates@4.0.7/node_modules/pirates/lib/index.js" (module, exports, __webpack_require__) {
         module = __webpack_require__.nmd(module);
         const BuiltinModule = __webpack_require__("module");
@@ -1104,7 +1038,29 @@ async function loadRspackConfig(options, cwd = process.cwd()) {
         configPath
     };
 }
-const picocolors = __webpack_require__("../../node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js");
+function isEnvColorSupported() {
+    if ("u" < typeof process) return false;
+    const p = process;
+    const argv = p.argv ?? [];
+    const env = p.env ?? {};
+    return !('NO_COLOR' in env || argv.includes('--no-color')) && ('FORCE_COLOR' in env || argv.includes('--color') || 'win32' === p.platform || p.stdout?.isTTY && 'dumb' !== env.TERM || 'CI' in env);
+}
+function createAnsiFormatter(open, close, replace = open) {
+    const closeLength = close.length;
+    return (input)=>{
+        const string = String(input);
+        let index = string.indexOf(close, open.length);
+        if (-1 === index) return open + string + close;
+        let result = '';
+        let cursor = 0;
+        do {
+            result += string.substring(cursor, index) + replace;
+            cursor = index + closeLength;
+            index = string.indexOf(close, cursor);
+        }while (-1 !== index);
+        return open + result + string.substring(cursor) + close;
+    };
+}
 class RspackCLI {
     colors;
     program;
@@ -1113,7 +1069,7 @@ class RspackCLI {
         this.colors = this.createColors();
         this.program = program;
         program.help();
-        program.version("2.0.0-beta.4");
+        program.version("2.0.0-beta.6");
     }
     async buildCompilerConfig(options, rspackCommand) {
         let { config, pathMap } = await this.loadConfig(options);
@@ -1140,10 +1096,24 @@ class RspackCLI {
         return compiler;
     }
     createColors(useColor) {
-        const shouldUseColor = useColor || picocolors.isColorSupported;
+        const envSupported = isEnvColorSupported();
+        const enabled = useColor ?? envSupported;
+        if (!enabled) {
+            const passthrough = (text)=>String(text);
+            return {
+                isColorSupported: false,
+                red: passthrough,
+                yellow: passthrough,
+                cyan: passthrough,
+                green: passthrough
+            };
+        }
         return {
-            ...(0, picocolors.createColors)(shouldUseColor),
-            isColorSupported: shouldUseColor
+            isColorSupported: true,
+            red: createAnsiFormatter('\x1b[31m', '\x1b[39m'),
+            green: createAnsiFormatter('\x1b[32m', '\x1b[39m'),
+            yellow: createAnsiFormatter('\x1b[33m', '\x1b[39m'),
+            cyan: createAnsiFormatter('\x1b[36m', '\x1b[39m')
         };
     }
     getLogger() {
@@ -1212,7 +1182,6 @@ class RspackCLI {
             else if ('string' == typeof item.stats) item.stats = {
                 preset: item.stats
             };
-            if (this.colors.isColorSupported && void 0 === item.stats.colors) item.stats.colors = true;
             return item;
         };
         if (Array.isArray(item)) return Promise.all(item.map(internalBuildConfig));

package/dist/cli.d.ts

@@ -12,11 +12,11 @@ export declare class RspackCLI {
     constructor();
     buildCompilerConfig(options: CommonOptionsForBuildAndServe, rspackCommand: Command): Promise<RspackOptions | MultiRspackOptions>;
     createCompiler(config: RspackOptions | MultiRspackOptions, callback?: (e: Error | null, res?: Stats | MultiStats) => void): Promise<MultiCompiler | Compiler | null>;
-    createColors(useColor?: boolean): RspackCLIColors;
+    private createColors;
     getLogger(): RspackCLILogger;
     run(argv: string[]): Promise<void>;
-    registerCommands(): Promise<void>;
-    buildConfig(item: RspackOptions | MultiRspackOptions, pathMap: WeakMap<RspackOptions, string[]>, options: CommonOptionsForBuildAndServe, command: Command): Promise<RspackOptions | MultiRspackOptions>;
+    private registerCommands;
+    private buildConfig;
     loadConfig(options: CommonOptions): Promise<{
         config: RspackOptions | MultiRspackOptions;
         pathMap: WeakMap<RspackOptions, string[]>;

package/dist/types.d.ts

@@ -1,9 +1,13 @@
 import type { RspackCLI } from './cli';
 export type { Configuration } from '@rspack/core';
 export type LogHandler = (value: any) => void;
-export type RspackCLIColors = {
+export interface RspackCLIColors {
     isColorSupported: boolean;
-} & Omit<typeof import('picocolors'), 'createColors'>;
+    red(text: string): string;
+    yellow(text: string): string;
+    cyan(text: string): string;
+    green(text: string): string;
+}
 export interface RspackCLILogger {
     error: LogHandler;
     warn: LogHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/cli",
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.6",
   "description": "CLI for rspack",
   "homepage": "https://rspack.rs",
   "bugs": "https://github.com/web-infra-dev/rspack/issues",
@@ -32,21 +32,20 @@
   },
   "devDependencies": {
     "@rslib/core": "0.19.6",
-    "@rspack/dev-server": "~1.2.1",
+    "@rspack/dev-server": "2.0.0-beta.4",
     "cac": "^6.7.14",
     "concat-stream": "^2.0.0",
     "cross-env": "^10.1.0",
     "execa": "^5.1.1",
-    "picocolors": "^1.1.1",
     "pirates": "^4.0.7",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3",
-    "@rspack/core": "2.0.0-beta.4",
-    "@rspack/test-tools": "2.0.0-beta.4"
+    "@rspack/core": "2.0.0-beta.6",
+    "@rspack/test-tools": "2.0.0-beta.6"
   },
   "peerDependencies": {
     "@rspack/core": "^2.0.0-0",
-    "@rspack/dev-server": "~1.2.1"
+    "@rspack/dev-server": "^2.0.0-0"
   },
   "peerDependenciesMeta": {
     "@rspack/dev-server": {