@rspack/cli 1.2.8 → 1.3.0-beta.0

package/dist/{390.js → 957.js}

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

package/dist/{390.mjs → 957.mjs}

@@ -1,5 +1,5 @@
 export const __webpack_ids__ = [
-    '390'
+    '957'
 ];
 export const __webpack_modules__ = {
     "./src/utils/profile.ts": function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {

package/dist/index.js

@@ -542,19 +542,63 @@ var __webpack_exports__ = {};
             throw error;
         }
     };
+    async function loadExtendedConfig(config, configPath, cwd, options) {
+        if (!("extends" in config) || !config.extends) return config;
+        const extendsList = Array.isArray(config.extends) ? config.extends : [
+            config.extends
+        ];
+        const { extends: _, ...configWithoutExtends } = config;
+        const baseDir = external_node_path_default().dirname(configPath);
+        let resultConfig = configWithoutExtends;
+        for (const extendPath of extendsList){
+            let resolvedPath;
+            if (extendPath.startsWith(".") || extendPath.startsWith("/") || extendPath.includes(":\\")) {
+                resolvedPath = external_node_path_default().resolve(baseDir, extendPath);
+                if (!external_node_path_default().extname(resolvedPath)) {
+                    const foundConfig = utils_findConfig(resolvedPath);
+                    if (foundConfig) resolvedPath = foundConfig;
+                    else throw new Error(`Extended configuration file "${resolvedPath}" not found.`);
+                }
+            } else try {
+                resolvedPath = require.resolve(extendPath, {
+                    paths: [
+                        baseDir,
+                        cwd
+                    ]
+                });
+            } catch (error) {
+                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 (utils_isTsFile(resolvedPath) && "register" === options.configLoader) await registerLoader(resolvedPath);
+            let extendedConfig = await crossImport(resolvedPath, cwd);
+            if ("function" == typeof extendedConfig) {
+                var _options_argv;
+                extendedConfig = extendedConfig(null === (_options_argv = options.argv) || void 0 === _options_argv ? void 0 : _options_argv.env, options.argv);
+                if ("function" == typeof extendedConfig.then) extendedConfig = await extendedConfig;
+            }
+            extendedConfig = await loadExtendedConfig(extendedConfig, resolvedPath, cwd, options);
+            resultConfig = core_.util.cleverMerge(extendedConfig, resultConfig);
+        }
+        return resultConfig;
+    }
     async function loadRspackConfig(options, cwd = process.cwd()) {
+        let configPath;
+        let loadedConfig;
         if (options.config) {
-            const configPath = external_node_path_default().resolve(cwd, options.config);
+            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 (utils_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) {
+            loadedConfig = await crossImport(configPath, cwd);
+        } else {
+            const defaultConfig = utils_findConfig(external_node_path_default().resolve(cwd, loadConfig_DEFAULT_CONFIG_NAME));
+            if (!defaultConfig) return {};
+            configPath = defaultConfig;
             if (utils_isTsFile(defaultConfig) && "register" === options.configLoader) await registerLoader(defaultConfig);
-            return crossImport(defaultConfig, cwd);
+            loadedConfig = await crossImport(defaultConfig, cwd);
         }
-        return {};
+        if ("function" != typeof loadedConfig && configPath) loadedConfig = await loadExtendedConfig(loadedConfig, configPath, cwd, options);
+        return loadedConfig;
     }
     function _define_property(obj, key, value) {
         if (key in obj) Object.defineProperty(obj, key, {
@@ -647,7 +691,7 @@ var __webpack_exports__ = {};
                 }
                 if (options.profile) item.profile = true;
                 if (process.env.RSPACK_PROFILE) {
-                    const { applyProfile } = await __webpack_require__.e("390").then(__webpack_require__.bind(__webpack_require__, "./src/utils/profile.ts"));
+                    const { applyProfile } = await __webpack_require__.e("957").then(__webpack_require__.bind(__webpack_require__, "./src/utils/profile.ts"));
                     await applyProfile(process.env.RSPACK_PROFILE, item);
                 }
                 if (options.watch) item.watch = options.watch;
@@ -680,8 +724,13 @@ var __webpack_exports__ = {};
             let loadedConfig = await loadRspackConfig(options);
             if ("function" == typeof loadedConfig) {
                 var _options_argv;
-                loadedConfig = loadedConfig(null === (_options_argv = options.argv) || void 0 === _options_argv ? void 0 : _options_argv.env, options.argv);
-                if ("function" == typeof loadedConfig.then) loadedConfig = await loadedConfig;
+                let functionResult = loadedConfig(null === (_options_argv = options.argv) || void 0 === _options_argv ? void 0 : _options_argv.env, options.argv);
+                if ("function" == typeof functionResult.then) functionResult = await functionResult;
+                loadedConfig = functionResult;
+                if ("extends" in loadedConfig && loadedConfig.extends) {
+                    const tempConfigPath = external_node_path_default().resolve(process.cwd(), "rspack.config.js");
+                    loadedConfig = await loadExtendedConfig(loadedConfig, tempConfigPath, process.cwd(), options);
+                }
             }
             if (options.configName) {
                 const notFoundConfigNames = [];

package/dist/index.mjs

@@ -522,19 +522,63 @@ const registerLoader = async (configPath)=>{
         throw error;
     }
 };
+async function loadExtendedConfig(config, configPath, cwd, options) {
+    if (!("extends" in config) || !config.extends) return config;
+    const extendsList = Array.isArray(config.extends) ? config.extends : [
+        config.extends
+    ];
+    const { extends: _, ...configWithoutExtends } = config;
+    const baseDir = external_node_path_["default"].dirname(configPath);
+    let resultConfig = configWithoutExtends;
+    for (const extendPath of extendsList){
+        let resolvedPath;
+        if (extendPath.startsWith(".") || extendPath.startsWith("/") || extendPath.includes(":\\")) {
+            resolvedPath = external_node_path_["default"].resolve(baseDir, extendPath);
+            if (!external_node_path_["default"].extname(resolvedPath)) {
+                const foundConfig = utils_findConfig(resolvedPath);
+                if (foundConfig) resolvedPath = foundConfig;
+                else throw new Error(`Extended configuration file "${resolvedPath}" not found.`);
+            }
+        } else try {
+            resolvedPath = require.resolve(extendPath, {
+                paths: [
+                    baseDir,
+                    cwd
+                ]
+            });
+        } catch (error) {
+            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 (utils_isTsFile(resolvedPath) && "register" === options.configLoader) await registerLoader(resolvedPath);
+        let extendedConfig = await crossImport(resolvedPath, cwd);
+        if ("function" == typeof extendedConfig) {
+            var _options_argv;
+            extendedConfig = extendedConfig(null === (_options_argv = options.argv) || void 0 === _options_argv ? void 0 : _options_argv.env, options.argv);
+            if ("function" == typeof extendedConfig.then) extendedConfig = await extendedConfig;
+        }
+        extendedConfig = await loadExtendedConfig(extendedConfig, resolvedPath, cwd, options);
+        resultConfig = core_.util.cleverMerge(extendedConfig, resultConfig);
+    }
+    return resultConfig;
+}
 async function loadRspackConfig(options, cwd = process.cwd()) {
+    let configPath;
+    let loadedConfig;
     if (options.config) {
-        const configPath = external_node_path_["default"].resolve(cwd, options.config);
+        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 (utils_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) {
+        loadedConfig = await crossImport(configPath, cwd);
+    } else {
+        const defaultConfig = utils_findConfig(external_node_path_["default"].resolve(cwd, loadConfig_DEFAULT_CONFIG_NAME));
+        if (!defaultConfig) return {};
+        configPath = defaultConfig;
         if (utils_isTsFile(defaultConfig) && "register" === options.configLoader) await registerLoader(defaultConfig);
-        return crossImport(defaultConfig, cwd);
+        loadedConfig = await crossImport(defaultConfig, cwd);
     }
-    return {};
+    if ("function" != typeof loadedConfig && configPath) loadedConfig = await loadExtendedConfig(loadedConfig, configPath, cwd, options);
+    return loadedConfig;
 }
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
@@ -627,7 +671,7 @@ class RspackCLI {
             }
             if (options.profile) item.profile = true;
             if (process.env.RSPACK_PROFILE) {
-                const { applyProfile } = await __webpack_require__.e("390").then(__webpack_require__.bind(__webpack_require__, "./src/utils/profile.ts"));
+                const { applyProfile } = await __webpack_require__.e("957").then(__webpack_require__.bind(__webpack_require__, "./src/utils/profile.ts"));
                 await applyProfile(process.env.RSPACK_PROFILE, item);
             }
             if (options.watch) item.watch = options.watch;
@@ -660,8 +704,13 @@ class RspackCLI {
         let loadedConfig = await loadRspackConfig(options);
         if ("function" == typeof loadedConfig) {
             var _options_argv;
-            loadedConfig = loadedConfig(null === (_options_argv = options.argv) || void 0 === _options_argv ? void 0 : _options_argv.env, options.argv);
-            if ("function" == typeof loadedConfig.then) loadedConfig = await loadedConfig;
+            let functionResult = loadedConfig(null === (_options_argv = options.argv) || void 0 === _options_argv ? void 0 : _options_argv.env, options.argv);
+            if ("function" == typeof functionResult.then) functionResult = await functionResult;
+            loadedConfig = functionResult;
+            if ("extends" in loadedConfig && loadedConfig.extends) {
+                const tempConfigPath = external_node_path_["default"].resolve(process.cwd(), "rspack.config.js");
+                loadedConfig = await loadExtendedConfig(loadedConfig, tempConfigPath, process.cwd(), options);
+            }
         }
         if (options.configName) {
             const notFoundConfigNames = [];

package/dist/utils/loadConfig.d.ts

@@ -1,4 +1,13 @@
-import type { MultiRspackOptions, RspackOptions } from "@rspack/core";
+import { type MultiRspackOptions, type RspackOptions } from "@rspack/core";
 import type { RspackCLIOptions } from "../types";
 export type LoadedRspackConfig = undefined | RspackOptions | MultiRspackOptions | ((env: Record<string, any>, argv?: Record<string, any>) => RspackOptions | MultiRspackOptions);
+/**
+ * Loads and merges configurations from the 'extends' property
+ * @param config The configuration object that may contain an 'extends' property
+ * @param configPath The path to the configuration file
+ * @param cwd The current working directory
+ * @param options CLI options
+ * @returns The merged configuration
+ */
+export declare function loadExtendedConfig(config: RspackOptions | MultiRspackOptions, configPath: string, cwd: string, options: RspackCLIOptions): Promise<RspackOptions | MultiRspackOptions>;
 export declare function loadRspackConfig(options: RspackCLIOptions, cwd?: string): Promise<LoadedRspackConfig>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/cli",
-  "version": "1.2.8",
+  "version": "1.3.0-beta.0",
   "description": "CLI for rspack",
   "homepage": "https://rspack.dev",
   "bugs": "https://github.com/web-infra-dev/rspack/issues",
@@ -29,16 +29,16 @@
   ],
   "dependencies": {
     "@discoveryjs/json-ext": "^0.5.7",
-    "@rspack/dev-server": "1.0.10",
+    "@rspack/dev-server": "1.1.0",
     "colorette": "2.0.20",
     "exit-hook": "^4.0.0",
     "interpret": "^3.1.1",
     "rechoir": "^0.8.0",
-    "webpack-bundle-analyzer": "4.6.1",
+    "webpack-bundle-analyzer": "4.10.2",
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@rslib/core": "0.5.3",
+    "@rslib/core": "0.5.4",
     "@types/interpret": "^1.1.3",
     "@types/rechoir": "^0.6.4",
     "@types/webpack-bundle-analyzer": "^4.7.0",
@@ -48,8 +48,8 @@
     "execa": "^5.1.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.7.3",
-    "@rspack/core": "1.2.8",
-    "@rspack/tracing": "1.2.8"
+    "@rspack/core": "1.3.0-beta.0",
+    "@rspack/tracing": "1.3.0-beta.0"
   },
   "peerDependencies": {
     "@rspack/core": "^1.0.0-alpha || ^1.x",