@rspack/cli 2.2.9 → 2.3.0-beta.1

package/dist/index.d.ts

@@ -82,10 +82,9 @@ declare class CAC extends EventTarget {
     /**
      * Parse argv
      */
-    parse(argv?: string[], {
-        run
-    }?: {
-        /** Whether to run the action for matched command */run?: boolean | undefined;
+    parse(argv?: string[], { run }?: {
+        /** Whether to run the action for matched command */
+        run?: boolean | undefined;
     }): ParsedArgv;
     private mri;
     runMatchedCommand(): any;

package/dist/index.js

@@ -113,7 +113,7 @@ function findAllBrackets(v) {
 }
 function getMriOptions(options) {
     const result = {
-        alias: {},
+        alias: Object.create(null),
         boolean: []
     };
     for (const [index, option] of options.entries()){
@@ -125,7 +125,7 @@ function getMriOptions(options) {
     return result;
 }
 function findLongest(arr) {
-    return arr.sort((a, b)=>a.length > b.length ? -1 : 1)[0];
+    return arr.sort((a, b)=>b.length - a.length)[0];
 }
 function padRight(str, length) {
     return str.length >= length ? str : `${str}${" ".repeat(length - str.length)}`;
@@ -133,7 +133,13 @@ function padRight(str, length) {
 function camelcase(input) {
     return input.replaceAll(/([a-z])-([a-z])/g, (_, p1, p2)=>p1 + p2.toUpperCase());
 }
+const UNSAFE_KEYS = /* @__PURE__ */ new Set([
+    "__proto__",
+    "constructor",
+    "prototype"
+]);
 function setDotProp(obj, keys, val) {
+    if (keys.some((key)=>UNSAFE_KEYS.has(key))) return;
     let current = obj;
     for(let i = 0; i < keys.length; i++){
         const key = keys[i];
@@ -149,14 +155,11 @@ function setDotProp(obj, keys, val) {
     }
 }
 function setByType(obj, transforms) {
-    for (const key of Object.keys(transforms)){
-        const transform = transforms[key];
-        if (transform.shouldTransform) {
-            obj[key] = [
-                obj[key]
-            ].flat();
-            if ("function" == typeof transform.transformFunction) obj[key] = obj[key].map(transform.transformFunction);
-        }
+    for (const [key, transform] of Object.entries(transforms))if (transform.shouldTransform && key in obj) {
+        obj[key] = [
+            obj[key]
+        ].flat();
+        if ("function" == typeof transform.transformFunction) obj[key] = obj[key].map(transform.transformFunction);
     }
 }
 function getFileName(input) {
@@ -195,7 +198,7 @@ var Option = class {
                 name = name.replace(/^no-/, "");
             }
             return camelcaseOptionName(name);
-        }).sort((a, b)=>a.length > b.length ? 1 : -1);
+        }).sort((a, b)=>a.length - b.length);
         this.name = this.names.at(-1);
         if (this.negated && null == this.config.default) this.config.default = true;
         if (rawName.includes("<")) this.required = true;
@@ -203,14 +206,15 @@ var Option = class {
         else this.isBoolean = true;
     }
 };
-let runtimeProcessArgs;
 let runtimeInfo;
 if ("u" > typeof process) {
     let runtimeName;
     runtimeName = "u" > typeof Deno && "string" == typeof Deno.version?.deno ? "deno" : "u" > typeof Bun && "string" == typeof Bun.version ? "bun" : "node";
     runtimeInfo = `${process.platform}-${process.arch} ${runtimeName}-${process.version}`;
-    runtimeProcessArgs = process.argv;
 } else runtimeInfo = "u" < typeof navigator ? "unknown" : `${navigator.platform} ${navigator.userAgent}`;
+function getRuntimeProcessArgs() {
+    return "u" < typeof process ? void 0 : process.argv;
+}
 var Command = class {
     rawName;
     description;
@@ -281,7 +285,7 @@ var Command = class {
         return this instanceof GlobalCommand;
     }
     hasOption(name) {
-        name = name.split(".")[0];
+        name = name.split(".", 1)[0];
         return this.options.find((option)=>option.names.includes(name));
     }
     outputHelp() {
@@ -350,7 +354,7 @@ var Command = class {
             ...this.options
         ];
         for (const option of options){
-            const value = parsedOptions[option.name.split(".")[0]];
+            const value = parsedOptions[option.name.split(".", 1)[0]];
             if (option.required) {
                 const hasNegated = options.some((o)=>o.negated && o.names.includes(option.name));
                 if (true === value || false === value && !hasNegated) throw new CACError(`option \`${option.rawName}\` value is missing`);
@@ -437,6 +441,7 @@ var CAC = class extends EventTarget {
     }
     parse(argv, { run = true } = {}) {
         if (!argv) {
+            const runtimeProcessArgs = getRuntimeProcessArgs();
             if (!runtimeProcessArgs) throw new Error("No argv provided and runtime process argv is not available.");
             argv = runtimeProcessArgs;
         }
@@ -525,8 +530,8 @@ var CAC = class extends EventTarget {
                 transforms[cliOption.name].transformFunction = cliOption.config.type[0];
             }
         }
-        for (const key of Object.keys(parsed))if ("_" !== key) {
-            setDotProp(options, key.split("."), parsed[key]);
+        for (const [key, value] of Object.entries(parsed))if ("_" !== key) {
+            setDotProp(options, key.split("."), value);
             setByType(options, transforms);
         }
         return {
@@ -869,7 +874,7 @@ const cachedImport = (importer)=>{
             throw error;
         });
 };
-const getJiti = cachedImport(()=>import("../compiled/jiti/index.js"));
+let getJiti = cachedImport(()=>import("../compiled/jiti/index.js"));
 const loadWithJiti = async (configPath, exportName, fresh)=>{
     let createJiti;
     try {
@@ -1143,7 +1148,7 @@ class RspackCLI {
         this.colors = this.createColors();
         this.program = program;
         program.help();
-        program.version("2.2.9");
+        program.version("2.3.0-beta.1");
     }
     wrapAction(fn) {
         return (...args)=>{
@@ -1241,19 +1246,12 @@ class RspackCLI {
                 if (!installed) (item.plugins ??= []).push(new rspack.ProgressPlugin());
             }
             const cacheOptions = item.cache;
-            if ('object' == typeof cacheOptions && ('persistent' === cacheOptions.type || 'filesystem' === cacheOptions.type)) {
+            if ('object' == typeof cacheOptions && 'persistent' === cacheOptions.type) {
                 const configPaths = pathMap.get(item);
-                if (configPaths) if ('persistent' === cacheOptions.type) cacheOptions.buildDependencies = [
+                if (configPaths) cacheOptions.buildDependencies = [
                     ...configPaths,
                     ...cacheOptions.buildDependencies || []
                 ];
-                else cacheOptions.buildDependencies = {
-                    ...cacheOptions.buildDependencies,
-                    config: [
-                        ...configPaths,
-                        ...cacheOptions.buildDependencies?.config || []
-                    ]
-                };
             }
             if (void 0 === item.stats) item.stats = {
                 preset: 'errors-warnings',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/cli",
-  "version": "2.2.9",
+  "version": "2.3.0-beta.1",
   "description": "CLI for rspack",
   "homepage": "https://rspack.rs",
   "bugs": "https://github.com/web-infra-dev/rspack/issues",
@@ -29,22 +29,22 @@
   ],
   "devDependencies": {
     "@discoveryjs/json-ext": "^1.1.0",
-    "@microsoft/api-extractor": "^7.59.3",
-    "@rstackjs/load-config": "^1.0.1",
-    "@rspack/core": "2.2.9",
+    "@microsoft/api-extractor": "^7.59.4",
+    "@rstackjs/load-config": "^1.0.2",
+    "@rspack/core": "2.3.0-beta.1",
     "@rspack/dev-server": "^2.2.1",
-    "cac": "^7.0.0",
+    "cac": "^7.1.0",
     "concat-stream": "^2.0.0",
     "execa": "^5.1.1",
     "exit-hook": "^5.1.0",
     "jiti": "^2.7.0",
     "prebundle": "^1.6.5",
     "rspack-merge": "1.0.1",
-    "rstack": "^0.8.3",
+    "rstack": "^0.8.4",
     "typescript": "^6.0.3"
   },
   "peerDependencies": {
-    "@rspack/core": "^2.0.0-0",
+    "@rspack/core": "^2.3.0-0",
     "@rspack/dev-server": "^2.0.0-0"
   },
   "peerDependenciesMeta": {