@rspack/cli 1.6.0-beta.1 → 1.6.1

package/dist/index.js

@@ -259,9 +259,9 @@ var __webpack_exports__ = {};
     "use strict";
     __webpack_require__.r(__webpack_exports__);
     __webpack_require__.d(__webpack_exports__, {
-        defineConfig: ()=>defineConfig,
         definePlugin: ()=>definePlugin,
-        RspackCLI: ()=>RspackCLI
+        RspackCLI: ()=>RspackCLI,
+        defineConfig: ()=>defineConfig
     });
     var external_node_path_ = __webpack_require__("node:path");
     var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_);
@@ -847,9 +847,13 @@ ${section.body}` : section.body).join("\n\n"));
             }
             if (stats?.hasErrors()) process.exitCode = 1;
             if (!compiler || !stats) return;
-            const statsOptions = cli.isMultipleCompiler(compiler) ? {
-                children: compiler.compilers.map((item)=>item.options ? item.options.stats : void 0)
-            } : compiler.options?.stats;
+            const getStatsOptions = ()=>{
+                if (cli.isMultipleCompiler(compiler)) return {
+                    children: compiler.compilers.map((item)=>item.options ? item.options.stats : void 0)
+                };
+                return compiler.options?.stats;
+            };
+            const statsOptions = getStatsOptions();
             if (options.json && createJsonStringifyStream) {
                 const handleWriteError = (error)=>{
                     logger.error(error);
@@ -1032,16 +1036,14 @@ ${section.body}` : section.body).join("\n\n"));
         }
     };
     const utils_readPackageUp = readPackageUp;
-    const isEsmFile = (filePath, cwd = process.cwd())=>{
-        const ext = external_node_path_default().extname(filePath);
-        if (/\.(mjs|mts)$/.test(ext)) return true;
-        if (/\.(cjs|cts)/.test(ext)) return false;
+    const isEsmFile = (filePath)=>{
+        if (/\.(mjs|mts)$/.test(filePath)) return true;
+        if (/\.(cjs|cts)$/.test(filePath)) return false;
         const packageJson = utils_readPackageUp(external_node_path_default().dirname(filePath));
         return packageJson?.type === "module";
     };
-    const utils_isEsmFile = isEsmFile;
-    const crossImport = async (path, cwd = process.cwd())=>{
-        if (utils_isEsmFile(path, cwd)) {
+    const crossImport = async (path)=>{
+        if (isEsmFile(path)) {
             const url = (0, external_node_url_namespaceObject.pathToFileURL)(path).href;
             const { default: config } = await import(url);
             return config;
@@ -1065,11 +1067,11 @@ ${section.body}` : section.body).join("\n\n"));
         ".cts",
         ".mts"
     ];
-    const isTsFile_isTsFile = (configPath)=>{
+    const isTsFile = (configPath)=>{
         const ext = external_node_path_default().extname(configPath);
         return TS_EXTENSION.includes(ext);
     };
-    const isTsFile = isTsFile_isTsFile;
+    const utils_isTsFile = isTsFile;
     const injectInlineSourceMap = ({ code, map })=>{
         if (map) {
             const base64Map = Buffer.from(map, "utf8").toString("base64");
@@ -1102,8 +1104,8 @@ ${section.body}` : section.body).join("\n\n"));
     }
     const loadConfig_DEFAULT_CONFIG_NAME = "rspack.config";
     const registerLoader = (configPath)=>{
-        if (utils_isEsmFile(configPath) && isTsFile(configPath)) return;
-        if (!isTsFile(configPath)) throw new Error(`config file "${configPath}" is not supported.`);
+        if (isEsmFile(configPath) && utils_isTsFile(configPath)) return;
+        if (!utils_isTsFile(configPath)) throw new Error(`config file "${configPath}" is not supported.`);
         (0, lib.addHook)((code, filename)=>{
             try {
                 return compile(code, filename);
@@ -1166,8 +1168,8 @@ ${section.body}` : section.body).join("\n\n"));
                 throw new Error(`Cannot find module '${extendPath}' to extend from.`);
             }
             if (!external_node_fs_default().existsSync(resolvedPath)) throw new Error(`Extended configuration file "${resolvedPath}" not found.`);
-            if (isTsFile(resolvedPath) && "register" === options.configLoader) registerLoader(resolvedPath);
-            let loadedConfig = await crossImport(resolvedPath, cwd);
+            if (utils_isTsFile(resolvedPath) && "register" === options.configLoader) registerLoader(resolvedPath);
+            let loadedConfig = await crossImport(resolvedPath);
             if ("function" == typeof loadedConfig) {
                 loadedConfig = loadedConfig(options.env, options);
                 if ("function" == typeof loadedConfig.then) loadedConfig = await loadedConfig;
@@ -1195,8 +1197,8 @@ ${section.body}` : section.body).join("\n\n"));
             if (!defaultConfig) return null;
             configPath = defaultConfig;
         }
-        if (isTsFile(configPath) && "register" === options.configLoader) registerLoader(configPath);
-        const loadedConfig = await crossImport(configPath, cwd);
+        if (utils_isTsFile(configPath) && "register" === options.configLoader) registerLoader(configPath);
+        const loadedConfig = await crossImport(configPath);
         return {
             loadedConfig,
             configPath
@@ -1210,7 +1212,7 @@ ${section.body}` : section.body).join("\n\n"));
             this.colors = this.createColors();
             this.program = program;
             program.help();
-            program.version("1.6.0-beta.1");
+            program.version("1.6.1");
         }
         async createCompiler(options, rspackCommand, callback) {
             let { config, pathMap } = await this.loadConfig(options);

package/dist/index.mjs

@@ -811,9 +811,13 @@ async function runBuild(cli, options) {
         }
         if (stats?.hasErrors()) process.exitCode = 1;
         if (!compiler || !stats) return;
-        const statsOptions = cli.isMultipleCompiler(compiler) ? {
-            children: compiler.compilers.map((item)=>item.options ? item.options.stats : void 0)
-        } : compiler.options?.stats;
+        const getStatsOptions = ()=>{
+            if (cli.isMultipleCompiler(compiler)) return {
+                children: compiler.compilers.map((item)=>item.options ? item.options.stats : void 0)
+            };
+            return compiler.options?.stats;
+        };
+        const statsOptions = getStatsOptions();
         if (options.json && createJsonStringifyStream) {
             const handleWriteError = (error)=>{
                 logger.error(error);
@@ -995,16 +999,14 @@ const readPackageUp = (cwd = process.cwd())=>{
     }
 };
 const utils_readPackageUp = readPackageUp;
-const isEsmFile = (filePath, cwd = process.cwd())=>{
-    const ext = external_node_path_["default"].extname(filePath);
-    if (/\.(mjs|mts)$/.test(ext)) return true;
-    if (/\.(cjs|cts)/.test(ext)) return false;
+const isEsmFile = (filePath)=>{
+    if (/\.(mjs|mts)$/.test(filePath)) return true;
+    if (/\.(cjs|cts)$/.test(filePath)) return false;
     const packageJson = utils_readPackageUp(external_node_path_["default"].dirname(filePath));
     return packageJson?.type === "module";
 };
-const utils_isEsmFile = isEsmFile;
-const crossImport = async (path, cwd = process.cwd())=>{
-    if (utils_isEsmFile(path, cwd)) {
+const crossImport = async (path)=>{
+    if (isEsmFile(path)) {
         const url = (0, __WEBPACK_EXTERNAL_MODULE_node_url_e96de089__.pathToFileURL)(path).href;
         const { default: config } = await import(url);
         return config;
@@ -1028,11 +1030,11 @@ const TS_EXTENSION = [
     ".cts",
     ".mts"
 ];
-const isTsFile_isTsFile = (configPath)=>{
+const isTsFile = (configPath)=>{
     const ext = external_node_path_["default"].extname(configPath);
     return TS_EXTENSION.includes(ext);
 };
-const isTsFile = isTsFile_isTsFile;
+const utils_isTsFile = isTsFile;
 const injectInlineSourceMap = ({ code, map })=>{
     if (map) {
         const base64Map = Buffer.from(map, "utf8").toString("base64");
@@ -1065,8 +1067,8 @@ function compile(sourcecode, filename) {
 }
 const loadConfig_DEFAULT_CONFIG_NAME = "rspack.config";
 const registerLoader = (configPath)=>{
-    if (utils_isEsmFile(configPath) && isTsFile(configPath)) return;
-    if (!isTsFile(configPath)) throw new Error(`config file "${configPath}" is not supported.`);
+    if (isEsmFile(configPath) && utils_isTsFile(configPath)) return;
+    if (!utils_isTsFile(configPath)) throw new Error(`config file "${configPath}" is not supported.`);
     (0, lib.addHook)((code, filename)=>{
         try {
             return compile(code, filename);
@@ -1129,8 +1131,8 @@ async function loadExtendedConfig(config, configPath, cwd, options) {
             throw new Error(`Cannot find module '${extendPath}' to extend from.`);
         }
         if (!external_node_fs_["default"].existsSync(resolvedPath)) throw new Error(`Extended configuration file "${resolvedPath}" not found.`);
-        if (isTsFile(resolvedPath) && "register" === options.configLoader) registerLoader(resolvedPath);
-        let loadedConfig = await crossImport(resolvedPath, cwd);
+        if (utils_isTsFile(resolvedPath) && "register" === options.configLoader) registerLoader(resolvedPath);
+        let loadedConfig = await crossImport(resolvedPath);
         if ("function" == typeof loadedConfig) {
             loadedConfig = loadedConfig(options.env, options);
             if ("function" == typeof loadedConfig.then) loadedConfig = await loadedConfig;
@@ -1158,8 +1160,8 @@ async function loadRspackConfig(options, cwd = process.cwd()) {
         if (!defaultConfig) return null;
         configPath = defaultConfig;
     }
-    if (isTsFile(configPath) && "register" === options.configLoader) registerLoader(configPath);
-    const loadedConfig = await crossImport(configPath, cwd);
+    if (utils_isTsFile(configPath) && "register" === options.configLoader) registerLoader(configPath);
+    const loadedConfig = await crossImport(configPath);
     return {
         loadedConfig,
         configPath
@@ -1173,7 +1175,7 @@ class RspackCLI {
         this.colors = this.createColors();
         this.program = program;
         program.help();
-        program.version("1.6.0-beta.1");
+        program.version("1.6.1");
     }
     async createCompiler(options, rspackCommand, callback) {
         let { config, pathMap } = await this.loadConfig(options);

package/dist/utils/crossImport.d.ts

@@ -1 +1 @@
-export declare const crossImport: <T = any>(path: string, cwd?: string) => Promise<T>;
+export declare const crossImport: <T = any>(path: string) => Promise<T>;

package/dist/utils/isEsmFile.d.ts

@@ -1,2 +1 @@
-declare const isEsmFile: (filePath: string, cwd?: string) => boolean;
-export default isEsmFile;
+export declare const isEsmFile: (filePath: string) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/cli",
-  "version": "1.6.0-beta.1",
+  "version": "1.6.1",
   "description": "CLI for rspack",
   "homepage": "https://rspack.rs",
   "bugs": "https://github.com/web-infra-dev/rspack/issues",
@@ -34,7 +34,7 @@
     "webpack-bundle-analyzer": "4.10.2"
   },
   "devDependencies": {
-    "@rslib/core": "0.15.1",
+    "@rslib/core": "0.17.0",
     "@types/webpack-bundle-analyzer": "^4.7.0",
     "cac": "^6.7.14",
     "concat-stream": "^2.0.0",
@@ -44,8 +44,8 @@
     "pirates": "^4.0.7",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3",
-    "@rspack/core": "1.6.0-beta.1",
-    "@rspack/test-tools": "1.6.0-beta.1"
+    "@rspack/core": "1.6.1",
+    "@rspack/test-tools": "1.6.1"
   },
   "peerDependencies": {
     "@rspack/core": "^1.0.0-alpha || ^1.x"
@@ -57,6 +57,6 @@
   "scripts": {
     "build": "rslib build",
     "dev": "rslib build -w",
-    "test": "cross-env RUST_BACKTRACE=full jest --colors"
+    "test": "rstest"
   }
 }