@rspack/cli 1.2.5 → 1.2.7-alpha.0

package/dist/{737.js → 197.js}

@@ -1,6 +1,6 @@
 "use strict";
 exports.ids = [
-    '737'
+    '197'
 ];
 exports.modules = {
     "./src/utils/profile.ts": function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {

package/dist/{737.mjs → 197.mjs}

@@ -1,5 +1,5 @@
 export const ids = [
-    '737'
+    '197'
 ];
 export const modules = {
     "./src/utils/profile.ts": function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {

package/dist/index.js

@@ -135,12 +135,24 @@ var __webpack_exports__ = {};
                 describe: "config file",
                 alias: "c"
             },
+            configName: {
+                type: "array",
+                string: true,
+                describe: "Name of the configuration to use."
+            },
+            configLoader: {
+                type: "string",
+                default: "register",
+                describe: "Specify the loader to load the config file, can be `native` or `register`."
+            }
+        });
+    const commonOptionsForBuildAndServe = (yargs)=>yargs.options({
             entry: {
                 type: "array",
                 string: true,
                 describe: "entry file"
             },
-            "output-path": {
+            outputPath: {
                 type: "string",
                 describe: "output path dir",
                 alias: "o"
@@ -161,7 +173,7 @@ var __webpack_exports__ = {};
                 string: true,
                 describe: "env passed to config function"
             },
-            "node-env": {
+            nodeEnv: {
                 string: true,
                 describe: "sets process.env.NODE_ENV to be specified value"
             },
@@ -170,57 +182,11 @@ var __webpack_exports__ = {};
                 default: false,
                 describe: "devtool",
                 alias: "d"
-            },
-            configName: {
-                type: "array",
-                string: true,
-                describe: "Name of the configuration to use."
-            },
-            "config-loader": {
-                type: "string",
-                default: "register",
-                describe: "Specify the loader to load the config file, can be `native` or `register`."
             }
         }).alias({
             v: "version",
             h: "help"
         });
-    const previewOptions = (yargs)=>yargs.positional("dir", {
-            type: "string",
-            describe: "directory want to preview"
-        }).options({
-            publicPath: {
-                type: "string",
-                describe: "static resource server path"
-            },
-            config: {
-                g: true,
-                type: "string",
-                describe: "config file",
-                alias: "c"
-            },
-            port: {
-                type: "number",
-                describe: "preview server port"
-            },
-            host: {
-                type: "string",
-                describe: "preview server host"
-            },
-            open: {
-                type: "boolean",
-                describe: "open browser"
-            },
-            server: {
-                type: "string",
-                describe: "Configuration items for the server."
-            },
-            configName: {
-                type: "array",
-                string: true,
-                describe: "Name of the configuration to use."
-            }
-        });
     function normalizeEnv(argv) {
         function parseValue(previous, value) {
             const [allKeys, val] = value.split(/=(.+)/, 2);
@@ -263,7 +229,8 @@ var __webpack_exports__ = {};
                 "$0",
                 "bundle",
                 "b"
-            ], "run the rspack build", (yargs)=>commonOptions(yargs).options({
+            ], "run the rspack build", (yargs)=>{
+                commonOptionsForBuildAndServe(commonOptions(yargs)).options({
                     analyze: {
                         type: "boolean",
                         default: false,
@@ -277,7 +244,8 @@ var __webpack_exports__ = {};
                         default: false,
                         describe: "capture timing information for each module"
                     }
-                }), async (options)=>{
+                });
+            }, async (options)=>{
                 const env = ensureEnvObject(options);
                 if (options.watch) setBuiltinEnvArg(env, "WATCH", true);
                 else {
@@ -332,6 +300,34 @@ var __webpack_exports__ = {};
             });
         }
     }
+    const previewOptions = (yargs)=>{
+        yargs.positional("dir", {
+            type: "string",
+            describe: "directory want to preview"
+        });
+        return commonOptions(yargs).options({
+            publicPath: {
+                type: "string",
+                describe: "static resource server path"
+            },
+            port: {
+                type: "number",
+                describe: "preview server port"
+            },
+            host: {
+                type: "string",
+                describe: "preview server host"
+            },
+            open: {
+                type: "boolean",
+                describe: "open browser"
+            },
+            server: {
+                type: "string",
+                describe: "Configuration items for the server."
+            }
+        });
+    };
     const defaultRoot = "dist";
     class PreviewCommand {
         async apply(cli) {
@@ -341,8 +337,7 @@ var __webpack_exports__ = {};
                 "p"
             ], "run the rspack server for build output", previewOptions, async (options)=>{
                 const rspackOptions = {
-                    config: options.config,
-                    configName: options.configName,
+                    ...options,
                     argv: {
                         ...options
                     }
@@ -397,7 +392,7 @@ var __webpack_exports__ = {};
                 "server",
                 "s",
                 "dev"
-            ], "run the rspack dev server.", (yargs)=>commonOptions(yargs).options({
+            ], "run the rspack dev server.", (yargs)=>commonOptionsForBuildAndServe(commonOptions(yargs)).options({
                     hot: {
                         coerce: (arg)=>{
                             if ("boolean" == typeof arg || "only" === arg) return arg;
@@ -554,12 +549,12 @@ var __webpack_exports__ = {};
         if (options.config) {
             const configPath = external_node_path_default().resolve(cwd, options.config);
             if (!external_node_fs_default().existsSync(configPath)) throw new Error(`config file "${configPath}" not found.`);
-            if (isTsFile(configPath) && "register" === options["config-loader"]) await registerLoader(configPath);
+            if (isTsFile(configPath) && "register" === options.configLoader) await registerLoader(configPath);
             return crossImport(configPath, cwd);
         }
         const defaultConfig = utils_findConfig(external_node_path_default().resolve(cwd, loadConfig_DEFAULT_CONFIG_NAME));
         if (defaultConfig) {
-            if (isTsFile(defaultConfig) && "register" === options["config-loader"]) await registerLoader(defaultConfig);
+            if (isTsFile(defaultConfig) && "register" === options.configLoader) await registerLoader(defaultConfig);
             return crossImport(defaultConfig, cwd);
         }
         return {};
@@ -647,7 +642,7 @@ var __webpack_exports__ = {};
                     main: options.entry.map((x)=>external_node_path_default().resolve(process.cwd(), x))[0]
                 };
                 item.output = item.output || {};
-                if (options["output-path"]) item.output.path = external_node_path_default().resolve(process.cwd(), options["output-path"]);
+                if (options.outputPath) item.output.path = external_node_path_default().resolve(process.cwd(), options.outputPath);
                 if (options.analyze) {
                     const { BundleAnalyzerPlugin } = await Promise.resolve().then(__webpack_require__.bind(__webpack_require__, "webpack-bundle-analyzer"));
                     (item.plugins ??= []).push({
@@ -661,7 +656,7 @@ var __webpack_exports__ = {};
                 }
                 if (options.profile) item.profile = true;
                 if (process.env.RSPACK_PROFILE) {
-                    const { applyProfile } = await __webpack_require__.e("737").then(__webpack_require__.bind(__webpack_require__, "./src/utils/profile.ts"));
+                    const { applyProfile } = await __webpack_require__.e("197").then(__webpack_require__.bind(__webpack_require__, "./src/utils/profile.ts"));
                     await applyProfile(process.env.RSPACK_PROFILE, item);
                 }
                 if (options.watch) item.watch = options.watch;

package/dist/index.mjs

@@ -111,12 +111,24 @@ const commonOptions = (yargs)=>yargs.options({
             describe: "config file",
             alias: "c"
         },
+        configName: {
+            type: "array",
+            string: true,
+            describe: "Name of the configuration to use."
+        },
+        configLoader: {
+            type: "string",
+            default: "register",
+            describe: "Specify the loader to load the config file, can be `native` or `register`."
+        }
+    });
+const commonOptionsForBuildAndServe = (yargs)=>yargs.options({
         entry: {
             type: "array",
             string: true,
             describe: "entry file"
         },
-        "output-path": {
+        outputPath: {
             type: "string",
             describe: "output path dir",
             alias: "o"
@@ -137,7 +149,7 @@ const commonOptions = (yargs)=>yargs.options({
             string: true,
             describe: "env passed to config function"
         },
-        "node-env": {
+        nodeEnv: {
             string: true,
             describe: "sets process.env.NODE_ENV to be specified value"
         },
@@ -146,57 +158,11 @@ const commonOptions = (yargs)=>yargs.options({
             default: false,
             describe: "devtool",
             alias: "d"
-        },
-        configName: {
-            type: "array",
-            string: true,
-            describe: "Name of the configuration to use."
-        },
-        "config-loader": {
-            type: "string",
-            default: "register",
-            describe: "Specify the loader to load the config file, can be `native` or `register`."
         }
     }).alias({
         v: "version",
         h: "help"
     });
-const previewOptions = (yargs)=>yargs.positional("dir", {
-        type: "string",
-        describe: "directory want to preview"
-    }).options({
-        publicPath: {
-            type: "string",
-            describe: "static resource server path"
-        },
-        config: {
-            g: true,
-            type: "string",
-            describe: "config file",
-            alias: "c"
-        },
-        port: {
-            type: "number",
-            describe: "preview server port"
-        },
-        host: {
-            type: "string",
-            describe: "preview server host"
-        },
-        open: {
-            type: "boolean",
-            describe: "open browser"
-        },
-        server: {
-            type: "string",
-            describe: "Configuration items for the server."
-        },
-        configName: {
-            type: "array",
-            string: true,
-            describe: "Name of the configuration to use."
-        }
-    });
 function normalizeEnv(argv) {
     function parseValue(previous, value) {
         const [allKeys, val] = value.split(/=(.+)/, 2);
@@ -239,7 +205,8 @@ class BuildCommand {
             "$0",
             "bundle",
             "b"
-        ], "run the rspack build", (yargs)=>commonOptions(yargs).options({
+        ], "run the rspack build", (yargs)=>{
+            commonOptionsForBuildAndServe(commonOptions(yargs)).options({
                 analyze: {
                     type: "boolean",
                     default: false,
@@ -253,7 +220,8 @@ class BuildCommand {
                     default: false,
                     describe: "capture timing information for each module"
                 }
-            }), async (options)=>{
+            });
+        }, async (options)=>{
             const env = ensureEnvObject(options);
             if (options.watch) setBuiltinEnvArg(env, "WATCH", true);
             else {
@@ -308,6 +276,34 @@ class BuildCommand {
         });
     }
 }
+const previewOptions = (yargs)=>{
+    yargs.positional("dir", {
+        type: "string",
+        describe: "directory want to preview"
+    });
+    return commonOptions(yargs).options({
+        publicPath: {
+            type: "string",
+            describe: "static resource server path"
+        },
+        port: {
+            type: "number",
+            describe: "preview server port"
+        },
+        host: {
+            type: "string",
+            describe: "preview server host"
+        },
+        open: {
+            type: "boolean",
+            describe: "open browser"
+        },
+        server: {
+            type: "string",
+            describe: "Configuration items for the server."
+        }
+    });
+};
 const defaultRoot = "dist";
 class PreviewCommand {
     async apply(cli) {
@@ -317,8 +313,7 @@ class PreviewCommand {
             "p"
         ], "run the rspack server for build output", previewOptions, async (options)=>{
             const rspackOptions = {
-                config: options.config,
-                configName: options.configName,
+                ...options,
                 argv: {
                     ...options
                 }
@@ -373,7 +368,7 @@ class ServeCommand {
             "server",
             "s",
             "dev"
-        ], "run the rspack dev server.", (yargs)=>commonOptions(yargs).options({
+        ], "run the rspack dev server.", (yargs)=>commonOptionsForBuildAndServe(commonOptions(yargs)).options({
                 hot: {
                     coerce: (arg)=>{
                         if ("boolean" == typeof arg || "only" === arg) return arg;
@@ -530,12 +525,12 @@ async function loadRspackConfig(options, cwd = process.cwd()) {
     if (options.config) {
         const configPath = external_node_path_["default"].resolve(cwd, options.config);
         if (!external_node_fs_["default"].existsSync(configPath)) throw new Error(`config file "${configPath}" not found.`);
-        if (isTsFile(configPath) && "register" === options["config-loader"]) await registerLoader(configPath);
+        if (isTsFile(configPath) && "register" === options.configLoader) await registerLoader(configPath);
         return crossImport(configPath, cwd);
     }
     const defaultConfig = utils_findConfig(external_node_path_["default"].resolve(cwd, loadConfig_DEFAULT_CONFIG_NAME));
     if (defaultConfig) {
-        if (isTsFile(defaultConfig) && "register" === options["config-loader"]) await registerLoader(defaultConfig);
+        if (isTsFile(defaultConfig) && "register" === options.configLoader) await registerLoader(defaultConfig);
         return crossImport(defaultConfig, cwd);
     }
     return {};
@@ -623,7 +618,7 @@ class RspackCLI {
                 main: options.entry.map((x)=>external_node_path_["default"].resolve(process.cwd(), x))[0]
             };
             item.output = item.output || {};
-            if (options["output-path"]) item.output.path = external_node_path_["default"].resolve(process.cwd(), options["output-path"]);
+            if (options.outputPath) item.output.path = external_node_path_["default"].resolve(process.cwd(), options.outputPath);
             if (options.analyze) {
                 const { BundleAnalyzerPlugin } = await import("webpack-bundle-analyzer");
                 (item.plugins ??= []).push({
@@ -637,7 +632,7 @@ class RspackCLI {
             }
             if (options.profile) item.profile = true;
             if (process.env.RSPACK_PROFILE) {
-                const { applyProfile } = await __webpack_require__.e("737").then(__webpack_require__.bind(__webpack_require__, "./src/utils/profile.ts"));
+                const { applyProfile } = await __webpack_require__.e("197").then(__webpack_require__.bind(__webpack_require__, "./src/utils/profile.ts"));
                 await applyProfile(process.env.RSPACK_PROFILE, item);
             }
             if (options.watch) item.watch = options.watch;

package/dist/types.d.ts

@@ -21,7 +21,7 @@ export interface RspackCLIOptions {
     config?: string;
     argv?: Record<string, any>;
     configName?: string[];
-    "config-loader"?: string;
+    configLoader?: string;
 }
 export interface RspackBuildCLIOptions extends RspackCLIOptions {
     entry?: string[];
@@ -32,7 +32,7 @@ export interface RspackBuildCLIOptions extends RspackCLIOptions {
     profile?: boolean;
     env?: Record<string, any>;
     nodeEnv?: string;
-    "output-path"?: string;
+    outputPath?: string;
 }
 export interface RspackPreviewCLIOptions extends RspackCLIOptions {
     dir?: string;

package/dist/utils/options.d.ts

@@ -1,17 +1,35 @@
 import type yargs from "yargs";
-export declare const commonOptions: (yargs: yargs.Argv) => yargs.Argv<yargs.Omit<{}, "entry" | "devtool" | "mode" | "watch" | "env" | "output-path" | "config" | "node-env" | "configName" | "config-loader"> & yargs.InferredOptionTypes<{
+/**
+ * Apply common options for all commands
+ */
+export declare const commonOptions: (yargs: yargs.Argv) => yargs.Argv<yargs.Omit<{}, "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;
+    };
+}>>;
+/**
+ * Apply common options for `build` and `serve` commands
+ */
+export declare const commonOptionsForBuildAndServe: (yargs: yargs.Argv) => yargs.Argv<yargs.Omit<{}, "entry" | "devtool" | "mode" | "watch" | "env" | "nodeEnv" | "outputPath"> & yargs.InferredOptionTypes<{
     entry: {
         type: "array";
         string: true;
         describe: string;
     };
-    "output-path": {
+    outputPath: {
         type: "string";
         describe: string;
         alias: string;
@@ -32,7 +50,7 @@ export declare const commonOptions: (yargs: yargs.Argv) => yargs.Argv<yargs.Omit
         string: true;
         describe: string;
     };
-    "node-env": {
+    nodeEnv: {
         string: true;
         describe: string;
     };
@@ -42,51 +60,6 @@ export declare const commonOptions: (yargs: yargs.Argv) => yargs.Argv<yargs.Omit
         describe: string;
         alias: string;
     };
-    configName: {
-        type: "array";
-        string: true;
-        describe: string;
-    };
-    "config-loader": {
-        type: "string";
-        default: string;
-        describe: string;
-    };
-}>>;
-export declare const previewOptions: (yargs: yargs.Argv) => yargs.Argv<yargs.Omit<{
-    dir: string | undefined;
-}, "port" | "host" | "open" | "server" | "publicPath" | "config" | "configName"> & yargs.InferredOptionTypes<{
-    publicPath: {
-        type: "string";
-        describe: string;
-    };
-    config: {
-        g: boolean;
-        type: "string";
-        describe: string;
-        alias: string;
-    };
-    port: {
-        type: "number";
-        describe: string;
-    };
-    host: {
-        type: "string";
-        describe: string;
-    };
-    open: {
-        type: "boolean";
-        describe: string;
-    };
-    server: {
-        type: "string";
-        describe: string;
-    };
-    configName: {
-        type: "array";
-        string: true;
-        describe: string;
-    };
 }>>;
 export declare function normalizeEnv(argv: yargs.Arguments): void;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/cli",
-  "version": "1.2.5",
+  "version": "1.2.7-alpha.0",
   "description": "CLI for rspack",
   "homepage": "https://rspack.dev",
   "bugs": "https://github.com/web-infra-dev/rspack/issues",
@@ -30,7 +30,7 @@
   "dependencies": {
     "@discoveryjs/json-ext": "^0.5.7",
     "@rspack/dev-server": "1.0.10",
-    "colorette": "2.0.19",
+    "colorette": "2.0.20",
     "exit-hook": "^4.0.0",
     "interpret": "^3.1.1",
     "rechoir": "^0.8.0",
@@ -38,18 +38,18 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@rslib/core": "0.4.0",
+    "@rslib/core": "0.5.2",
     "@types/interpret": "^1.1.3",
-    "@types/rechoir": "^0.6.1",
-    "@types/webpack-bundle-analyzer": "^4.6.0",
+    "@types/rechoir": "^0.6.4",
+    "@types/webpack-bundle-analyzer": "^4.7.0",
     "@types/yargs": "17.0.33",
     "concat-stream": "^2.0.0",
     "cross-env": "^7.0.3",
-    "execa": "^5.0.0",
+    "execa": "^5.1.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.7.3",
-    "@rspack/core": "1.2.5",
-    "@rspack/tracing": "1.2.5"
+    "@rspack/core": "1.2.7-alpha.0",
+    "@rspack/tracing": "1.2.7-alpha.0"
   },
   "peerDependencies": {
     "@rspack/core": "^1.0.0-alpha || ^1.x",