@rspack/cli 2.1.8 → 2.1.10

package/dist/index.d.ts

@@ -191,15 +191,7 @@ export { Configuration }
  * This function helps you to autocomplete configuration types.
  * It accepts a Rspack config object, or a function that returns a config.
  */
-export declare function defineConfig<const Config extends RspackOptions | MultiRspackOptions>(config: (...args: Parameters<RspackConfigFn>) => Config): RspackConfigFn;
-
-export declare function defineConfig<const Config extends RspackOptions | MultiRspackOptions>(config: (...args: Parameters<RspackConfigFn>) => Promise<Config>): RspackConfigAsyncFn;
-
-export declare function defineConfig(config: RspackOptions): RspackOptions;
-
-export declare function defineConfig(config: MultiRspackOptions): MultiRspackOptions;
-
-export declare function defineConfig(config: RspackConfigExport): RspackConfigExport;
+export declare function defineConfig<const Config extends RspackOptions | MultiRspackOptions, const Definition extends Config | ((...args: Parameters<RspackConfigFn>) => Config) | ((...args: Parameters<RspackConfigFn>) => Promise<Config>)>(config: Definition): Definition extends (...args: Parameters<RspackConfigFn>) => Promise<unknown> ? RspackConfigAsyncFn : Definition extends (...args: Parameters<RspackConfigFn>) => unknown ? RspackConfigFn : Definition extends readonly unknown[] ? MultiRspackOptions : RspackOptions;
 
 export declare function definePlugin(plugin: RspackPluginFunction): RspackPluginFunction;
 
@@ -294,8 +286,6 @@ export declare interface RspackCommand {
 
 declare type RspackConfigAsyncFn = (env: Record<string, any>, argv: Record<string, any>) => Promise<RspackOptions | MultiRspackOptions>;
 
-declare type RspackConfigExport = RspackOptions | MultiRspackOptions | RspackConfigFn | RspackConfigAsyncFn;
-
 declare type RspackConfigFn = (env: Record<string, any>, argv: Record<string, any>) => RspackOptions | MultiRspackOptions;
 
 export { }

package/dist/index.js

@@ -987,11 +987,17 @@ const loadConfigByPath = async (configPath, options)=>{
         fresh: true
     });
     if (!isRspackConfig(content)) throw new Error(`[rspack-cli:loadConfig] The config at "${configPath}" must be an object or an array, got ${String(content)}`);
-    return content;
+    return 'native' === options.configLoader ? content : normalizeContext(content);
 };
 const isConfigObject = (value)=>Boolean(value) && 'object' == typeof value && !Array.isArray(value);
 const isRspackConfig = (value)=>Array.isArray(value) || isConfigObject(value);
 const checkIsMultiRspackOptions = (config)=>Array.isArray(config);
+const normalizeContext = (config)=>{
+    for (const item of checkIsMultiRspackOptions(config) ? config : [
+        config
+    ])if ('string' == typeof item.context) item.context = node_path.normalize(item.context);
+    return config;
+};
 async function loadExtendedConfig(config, configPath, cwd, options, visitedPaths) {
     const currentVisitedPaths = visitedPaths ?? new Set();
     if (checkIsMultiRspackOptions(config)) {
@@ -1115,7 +1121,7 @@ class RspackCLI {
         this.colors = this.createColors();
         this.program = program;
         program.help();
-        program.version("2.1.8");
+        program.version("2.1.10");
     }
     wrapAction(fn) {
         return (...args)=>{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/cli",
-  "version": "2.1.8",
+  "version": "2.1.10",
   "description": "CLI for rspack",
   "homepage": "https://rspack.rs",
   "bugs": "https://github.com/web-infra-dev/rspack/issues",
@@ -31,7 +31,7 @@
     "@discoveryjs/json-ext": "^1.1.0",
     "@microsoft/api-extractor": "^7.58.12",
     "@rstackjs/load-config": "^0.1.2",
-    "@rspack/dev-server": "^2.1.0",
+    "@rspack/dev-server": "^2.2.0",
     "cac": "^7.0.0",
     "concat-stream": "^2.0.0",
     "cross-env": "^10.1.0",
@@ -40,10 +40,10 @@
     "jiti": "^2.7.0",
     "prebundle": "^1.6.5",
     "rspack-merge": "1.0.1",
-    "rstack": "^0.2.0",
+    "rstack": "^0.5.1",
     "typescript": "^6.0.3",
-    "@rspack/core": "2.1.8",
-    "@rspack/test-tools": "2.1.8"
+    "@rspack/core": "2.1.10",
+    "@rspack/test-tools": "2.1.10"
   },
   "peerDependencies": {
     "@rspack/core": "^2.0.0-0",