@rspack/cli 2.1.5 → 2.1.7

package/dist/index.d.ts

@@ -191,13 +191,13 @@ 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(config: RspackOptions): RspackOptions;
+export declare function defineConfig<const Config extends RspackOptions | MultiRspackOptions>(config: (...args: Parameters<RspackConfigFn>) => Config): RspackConfigFn;
 
-export declare function defineConfig(config: MultiRspackOptions): MultiRspackOptions;
+export declare function defineConfig<const Config extends RspackOptions | MultiRspackOptions>(config: (...args: Parameters<RspackConfigFn>) => Promise<Config>): RspackConfigAsyncFn;
 
-export declare function defineConfig(config: RspackConfigFn): RspackConfigFn;
+export declare function defineConfig(config: RspackOptions): RspackOptions;
 
-export declare function defineConfig(config: RspackConfigAsyncFn): RspackConfigAsyncFn;
+export declare function defineConfig(config: MultiRspackOptions): MultiRspackOptions;
 
 export declare function defineConfig(config: RspackConfigExport): RspackConfigExport;
 

package/dist/index.js

@@ -891,12 +891,6 @@ const loadWithJiti = async (configPath, exportName, fresh)=>{
     };
 };
 const JS_CONFIG_REGEXP = /\.(?:js|mjs|cjs)$/;
-const tryFreshImport = async (configFileURL)=>{
-    try {
-        const { freshImport } = await import("./freshImport.js");
-        return await freshImport(configFileURL);
-    } catch  {}
-};
 const loadWithNative = async (configPath, fresh)=>{
     const configFileURL = pathToFileURL(configPath).href;
     if (!fresh) {
@@ -906,7 +900,8 @@ const loadWithNative = async (configPath, fresh)=>{
             dependencies: []
         };
     }
-    const freshImportResult = await tryFreshImport(configFileURL);
+    const { freshImport } = await import("./freshImport.js");
+    const freshImportResult = await freshImport(configFileURL);
     if (freshImportResult) return {
         configModule: freshImportResult.result,
         dependencies: freshImportResult.dependencies.sort()
@@ -930,6 +925,7 @@ const resolveConfigPath = (root, customConfig, configFileNames = [])=>{
     return null;
 };
 async function loadConfig({ cwd = process.cwd(), path, configFileNames = [], loader = 'auto', exportName = 'default', configParams = [], fresh = false } = {}) {
+    if (!path && 0 === configFileNames.length) throw new Error('Either `path` or at least one `configFileNames` entry must be provided.');
     const configPath = resolveConfigPath(cwd, path, configFileNames);
     if (!configPath) return {
         content: {},
@@ -1119,7 +1115,7 @@ class RspackCLI {
         this.colors = this.createColors();
         this.program = program;
         program.help();
-        program.version("2.1.5");
+        program.version("2.1.7");
     }
     wrapAction(fn) {
         return (...args)=>{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/cli",
-  "version": "2.1.5",
+  "version": "2.1.7",
   "description": "CLI for rspack",
   "homepage": "https://rspack.rs",
   "bugs": "https://github.com/web-infra-dev/rspack/issues",
@@ -29,9 +29,9 @@
   ],
   "devDependencies": {
     "@discoveryjs/json-ext": "^1.1.0",
-    "@microsoft/api-extractor": "^7.58.9",
-    "@rstackjs/load-config": "^0.1.1",
-    "@rslib/core": "^0.23.2",
+    "@microsoft/api-extractor": "^7.58.12",
+    "@rstackjs/load-config": "^0.1.2",
+    "@rslib/core": "1.0.0-beta.1",
     "@rspack/dev-server": "^2.1.0",
     "cac": "^7.0.0",
     "concat-stream": "^2.0.0",
@@ -42,8 +42,8 @@
     "prebundle": "^1.6.5",
     "rspack-merge": "1.0.1",
     "typescript": "^6.0.3",
-    "@rspack/core": "2.1.5",
-    "@rspack/test-tools": "2.1.5"
+    "@rspack/core": "2.1.7",
+    "@rspack/test-tools": "2.1.7"
   },
   "peerDependencies": {
     "@rspack/core": "^2.0.0-0",