@rspack-canary/cli 1.6.0-canary-c1ffd5c5-20251016085846 → 1.6.0-canary-2ccce257-20251016173648

package/dist/types.d.ts

@@ -1,10 +1,6 @@
-import type { DevServer } from "@rspack/core";
 import type { Colorette } from "colorette";
 import type { RspackCLI } from "./cli";
 export type { Configuration } from "@rspack/core";
-export interface IRspackCLI {
-    runRspack(): Promise<void>;
-}
 export type LogHandler = (value: any) => void;
 export interface RspackCLIColors extends Colorette {
     isColorSupported: boolean;
@@ -17,32 +13,6 @@ export interface RspackCLILogger {
     log: LogHandler;
     raw: LogHandler;
 }
-export interface RspackCLIOptions {
-    config?: string;
-    argv?: Record<string, any>;
-    configName?: string[];
-    configLoader?: string;
-    nodeEnv?: string;
-}
-export interface RspackBuildCLIOptions extends RspackCLIOptions {
-    entry?: string[];
-    devtool?: string | boolean;
-    mode?: string;
-    watch?: boolean;
-    analyze?: boolean;
-    profile?: boolean;
-    env?: Record<string, any>;
-    outputPath?: string;
-}
-export interface RspackPreviewCLIOptions extends RspackCLIOptions {
-    dir?: string;
-    port?: number;
-    host?: string;
-    open?: boolean;
-    server?: string;
-    publicPath?: string;
-}
 export interface RspackCommand {
     apply(cli: RspackCLI): Promise<void>;
 }
-export type RspackDevServerOptions = DevServer;

package/dist/utils/loadConfig.d.ts

@@ -1,5 +1,5 @@
-import { type MultiRspackOptions, type RspackOptions } from "@rspack/core";
-import type { RspackCLIOptions } from "../types";
+import type { MultiRspackOptions, RspackOptions } from "@rspack/core";
+import type { CommonOptions } from "./options";
 export declare function compile(sourcecode: string, filename: string): string;
 export type LoadedRspackConfig = undefined | RspackOptions | MultiRspackOptions | ((env: Record<string, any>, argv?: Record<string, any>) => RspackOptions | MultiRspackOptions);
 /**
@@ -10,19 +10,19 @@ export type LoadedRspackConfig = undefined | RspackOptions | MultiRspackOptions
  * @param options CLI options
  * @returns The merged configuration
  */
-export declare function loadExtendedConfig(config: RspackOptions, configPath: string, cwd: string, options: RspackCLIOptions): Promise<{
+export declare function loadExtendedConfig(config: RspackOptions, configPath: string, cwd: string, options: CommonOptions): Promise<{
     config: RspackOptions;
     pathMap: WeakMap<RspackOptions, string[]>;
 }>;
-export declare function loadExtendedConfig(config: MultiRspackOptions, configPath: string, cwd: string, options: RspackCLIOptions): Promise<{
+export declare function loadExtendedConfig(config: MultiRspackOptions, configPath: string, cwd: string, options: CommonOptions): Promise<{
     config: MultiRspackOptions;
     pathMap: WeakMap<RspackOptions, string[]>;
 }>;
-export declare function loadExtendedConfig(config: RspackOptions | MultiRspackOptions, configPath: string, cwd: string, options: RspackCLIOptions): Promise<{
+export declare function loadExtendedConfig(config: RspackOptions | MultiRspackOptions, configPath: string, cwd: string, options: CommonOptions): Promise<{
     config: RspackOptions | MultiRspackOptions;
     pathMap: WeakMap<RspackOptions, string[]>;
 }>;
-export declare function loadRspackConfig(options: RspackCLIOptions, cwd?: string): Promise<{
+export declare function loadRspackConfig(options: CommonOptions, cwd?: string): Promise<{
     loadedConfig: LoadedRspackConfig;
     configPath: string;
 } | null>;

package/dist/utils/options.d.ts

@@ -1,77 +1,29 @@
-import type yargs from "yargs";
+import type { Command } from "cac";
 /**
  * Apply common options for all commands
  */
-export declare const commonOptions: (yargs: yargs.Argv) => yargs.Argv<yargs.Omit<{}, "nodeEnv" | "config" | "configName" | "configLoader"> & yargs.InferredOptionTypes<{
-    config: {
-        g: boolean;
-        type: "string";
-        describe: string;
-        alias: string;
-    };
-    configName: {
-        type: "array";
-        string: true;
-        describe: string;
-    };
-    configLoader: {
-        type: "string";
-        default: string;
-        describe: string;
-    };
-    nodeEnv: {
-        string: true;
-        describe: string;
-    };
-}>>;
+export declare const commonOptions: (command: Command) => Command;
+export type CommonOptions = {
+    config?: string;
+    configName?: string[];
+    configLoader?: string;
+    env?: Record<string, unknown> | string[];
+    nodeEnv?: string;
+};
+export declare const normalizeCommonOptions: (options: CommonOptions | CommonOptionsForBuildAndServe, action: "serve" | "build" | "preview") => void;
 /**
  * Apply common options for `build` and `serve` commands
  */
-export declare const commonOptionsForBuildAndServe: (yargs: yargs.Argv) => yargs.Argv<yargs.Omit<{}, "entry" | "devtool" | "mode" | "watch" | "env" | "outputPath"> & yargs.InferredOptionTypes<{
-    entry: {
-        type: "array";
-        string: true;
-        describe: string;
-    };
-    outputPath: {
-        type: "string";
-        describe: string;
-        alias: string;
-    };
-    mode: {
-        type: "string";
-        describe: string;
-        alias: string;
-    };
-    watch: {
-        type: "boolean";
-        default: boolean;
-        describe: string;
-        alias: string;
-    };
-    env: {
-        type: "array";
-        string: true;
-        describe: string;
-    };
-    devtool: {
-        type: "string";
-        describe: string;
-        alias: string;
-        coerce: (arg: any) => string | boolean;
-    };
-}>>;
-export declare function normalizeEnv(argv: yargs.Arguments): void;
-/**
- * set builtin env from cli - like `WEBPACK_BUNDLE=true`. also for `RSPACK_` prefixed.
- * @param env the `argv.env` object
- * @param envNameSuffix the added env will be `WEBPACK_${envNameSuffix}` and `RSPACK_${envNameSuffix}`
- * @param value
- */
-export declare function setBuiltinEnvArg(env: Record<string, any>, envNameSuffix: string, value: any): void;
-/**
- * infer `argv.env` as an object for it was transformed from array to object after `normalizeEnv` middleware
- * @returns the reference of `argv.env` object
- */
-export declare function ensureEnvObject<T extends Record<string, unknown>>(options: yargs.Arguments): T;
-export declare function setDefaultNodeEnv(options: yargs.Arguments, defaultEnv: string): void;
+export declare const commonOptionsForBuildAndServe: (command: Command) => Command;
+export type CommonOptionsForBuildAndServe = CommonOptions & {
+    analyze?: boolean;
+    devtool?: string | boolean;
+    entry?: string[];
+    mode?: string;
+    outputPath?: string;
+    profile?: boolean;
+    watch?: boolean;
+};
+export declare function setDefaultNodeEnv(options: {
+    nodeEnv?: unknown;
+}, defaultEnv: string): void;

package/dist/utils/rspackCore.d.ts

@@ -0,0 +1,2 @@
+declare const rspack: (typeof import("@rspack/core"))["rspack"];
+export { rspack };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack-canary/cli",
-  "version": "1.6.0-canary-c1ffd5c5-20251016085846",
+  "version": "1.6.0-canary-2ccce257-20251016173648",
   "description": "CLI for rspack",
   "homepage": "https://rspack.rs",
   "bugs": "https://github.com/web-infra-dev/rspack/issues",
@@ -30,23 +30,22 @@
   "dependencies": {
     "@discoveryjs/json-ext": "^0.5.7",
     "@rspack/dev-server": "~1.1.4",
-    "colorette": "2.0.20",
     "exit-hook": "^4.0.0",
-    "webpack-bundle-analyzer": "4.10.2",
-    "yargs": "17.7.2",
-    "pirates": "^4.0.7"
+    "webpack-bundle-analyzer": "4.10.2"
   },
   "devDependencies": {
     "@rslib/core": "0.15.1",
     "@types/webpack-bundle-analyzer": "^4.7.0",
-    "@types/yargs": "17.0.33",
+    "cac": "^6.7.14",
+    "colorette": "2.0.20",
     "concat-stream": "^2.0.0",
     "cross-env": "^10.1.0",
     "execa": "^5.1.1",
+    "pirates": "^4.0.7",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3",
-    "@rspack/core": "npm:@rspack-canary/core@1.6.0-canary-c1ffd5c5-20251016085846",
-    "@rspack/test-tools": "npm:@rspack-canary/test-tools@1.6.0-canary-c1ffd5c5-20251016085846"
+    "@rspack/core": "npm:@rspack-canary/core@1.6.0-canary-2ccce257-20251016173648",
+    "@rspack/test-tools": "npm:@rspack-canary/test-tools@1.6.0-canary-2ccce257-20251016173648"
   },
   "peerDependencies": {
     "@rspack/core": "^1.0.0-alpha || ^1.x"