@modern-js/builder 3.9.1 → 3.9.3

package/dist/cjs/shared/parseCommonConfig.js

@@ -43,6 +43,7 @@ const globalVars_js_namespaceObject = require("../plugins/globalVars.js");
 const htmlMinify_js_namespaceObject = require("../plugins/htmlMinify.js");
 const runtimeChunk_js_namespaceObject = require("../plugins/runtimeChunk.js");
 const external_devServer_js_namespaceObject = require("./devServer.js");
+const external_pluginOptions_js_namespaceObject = require("./pluginOptions.js");
 const external_utils_js_namespaceObject = require("./utils.js");
 const CSS_MODULES_REGEX = /\.modules?\.\w+$/i;
 const GLOBAL_CSS_REGEX = /\.global\.\w+$/;
@@ -58,7 +59,7 @@ function removeUndefinedKey(obj) {
 }
 async function parseCommonConfig(builderConfig, options) {
     const frameworkConfigPath = options?.frameworkConfigPath;
-    const { plugins: [...plugins] = [], splitChunks, performance: { ...performanceConfig } = {}, output: { module = false, enableCssModuleTSDeclaration, disableCssModuleExtension, disableTsChecker, disableSvgr, svgDefaultExport, assetsRetry, enableAssetManifest, sourceMap, convertToRem, polyfill, dataUriLimit = 10000, distPath = {}, ...outputConfig } = {}, html: { outputStructure, appIcon, ...htmlConfig } = {}, source: { alias, globalVars, transformImport, reactCompiler, ...sourceConfig } = {}, dev = {}, server = {}, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, less, sass, htmlPlugin, autoprefixer, ...toolsConfig } = {}, environments = {}, resolve = {} } = builderConfig;
+    const { plugins: [...plugins] = [], splitChunks, performance: { ...performanceConfig } = {}, output: { module = false, enableCssModuleTSDeclaration, disableCssModuleExtension, disableTsChecker, disableSvgr, svgDefaultExport, assetsRetry, enableAssetManifest, sourceMap, convertToRem, polyfill, dataUriLimit = 10000, distPath = {}, ...outputConfig } = {}, html: { outputStructure, appIcon, ...htmlConfig } = {}, source: { alias, globalVars, transformImport, reactCompiler, ...sourceConfig } = {}, dev = {}, server = {}, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, less, sass, svgr, htmlPlugin, autoprefixer, ...toolsConfig } = {}, environments = {}, resolve = {} } = builderConfig;
     let combinedAlias;
     if (alias || resolve.alias) combinedAlias = [].concat(alias ?? []).concat(resolve.alias ?? []);
     const rsbuildConfig = {
@@ -140,12 +141,8 @@ async function parseCommonConfig(builderConfig, options) {
             sourceMap
         }),
         (0, emitRouteFile_js_namespaceObject.pluginEmitRouteFile)(),
-        (0, plugin_sass_namespaceObject.pluginSass)({
-            sassLoaderOptions: sass
-        }),
-        (0, plugin_less_namespaceObject.pluginLess)({
-            lessLoaderOptions: less
-        }),
+        (0, plugin_sass_namespaceObject.pluginSass)((0, external_pluginOptions_js_namespaceObject.normalizeSassOptions)(sass)),
+        (0, plugin_less_namespaceObject.pluginLess)((0, external_pluginOptions_js_namespaceObject.normalizeLessOptions)(less)),
         (0, environmentDefaults_js_namespaceObject.pluginEnvironmentDefaults)(distPath),
         (0, htmlMinify_js_namespaceObject.pluginHtmlMinifierTerser)()
     ];
@@ -176,14 +173,14 @@ async function parseCommonConfig(builderConfig, options) {
     rsbuildPlugins.push((0, plugin_react_namespaceObject.pluginReact)(void 0 !== reactCompiler ? {
         reactCompiler
     } : {}));
-    if (!disableSvgr) {
+    const svgrOptions = (0, external_pluginOptions_js_namespaceObject.resolveSvgrOptions)({
+        svgr,
+        disableSvgr,
+        svgDefaultExport
+    });
+    if (false !== svgrOptions) {
         const { pluginSvgr } = await import("@rsbuild/plugin-svgr");
-        rsbuildPlugins.push(pluginSvgr({
-            mixedImport: true,
-            svgrOptions: {
-                exportType: 'component' === svgDefaultExport ? 'default' : 'named'
-            }
-        }));
+        rsbuildPlugins.push(pluginSvgr(svgrOptions));
     }
     if (assetsRetry) {
         const { pluginAssetsRetry } = await import("@rsbuild/plugin-assets-retry");

package/dist/cjs/shared/pluginOptions.js

@@ -0,0 +1,121 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    normalizeLessOptions: ()=>normalizeLessOptions,
+    normalizeSassOptions: ()=>normalizeSassOptions,
+    resetPluginOptionsWarnings: ()=>resetPluginOptionsWarnings,
+    resolveSvgrOptions: ()=>resolveSvgrOptions
+});
+const utils_namespaceObject = require("@modern-js/utils");
+const LESS_PLUGIN_KEYS = [
+    'lessLoaderOptions',
+    'include',
+    'exclude',
+    'parallel'
+];
+const SASS_PLUGIN_KEYS = [
+    'sassLoaderOptions',
+    'include',
+    'exclude',
+    'rewriteUrls'
+];
+const warned = new Set();
+const resetPluginOptionsWarnings = ()=>{
+    warned.clear();
+};
+const warnOnceInDev = (key, message)=>{
+    if (!(0, utils_namespaceObject.isDevCommand)() || warned.has(key)) return;
+    warned.add(key);
+    utils_namespaceObject.logger.warn(message);
+};
+const isPlainObject = (value)=>'object' == typeof value && null !== value && !Array.isArray(value);
+const isPluginLevelOptions = (value, pluginKeys)=>isPlainObject(value) && pluginKeys.some((key)=>key in value);
+const isEmptyObject = (value)=>isPlainObject(value) && 0 === Object.keys(value).length;
+const warnIgnoredKeys = (name, value, pluginKeys, loaderOptionsKey)=>{
+    const pluginLevel = Object.keys(value).filter((key)=>pluginKeys.includes(key));
+    const ignored = Object.keys(value).filter((key)=>!pluginKeys.includes(key));
+    if (0 === ignored.length) return;
+    warnOnceInDev(`${name}:mixed`, `\`${name}\` contains plugin-level options (${pluginLevel.join(', ')}) together with other keys (${ignored.join(', ')}). The whole object is passed to the plugin, so the other keys are ignored. Move loader options under \`${loaderOptionsKey}\`.`);
+};
+const normalizeLessOptions = (less)=>{
+    if (isPluginLevelOptions(less, LESS_PLUGIN_KEYS)) {
+        warnIgnoredKeys('tools.less', less, LESS_PLUGIN_KEYS, 'lessLoaderOptions');
+        return less;
+    }
+    if (void 0 !== less && !isEmptyObject(less)) warnOnceInDev('tools.less', "`tools.less` now accepts the full options of @rsbuild/plugin-less. Passing less-loader options directly is deprecated and will stop working in the next major version. Move them under `lessLoaderOptions`:\n  before: tools: { less: { lessOptions: { javascriptEnabled: true } } }\n  after:  tools: { less: { lessLoaderOptions: { lessOptions: { javascriptEnabled: true } } } }");
+    return {
+        lessLoaderOptions: less
+    };
+};
+const normalizeSassOptions = (sass)=>{
+    if (isPluginLevelOptions(sass, SASS_PLUGIN_KEYS)) {
+        warnIgnoredKeys('tools.sass', sass, SASS_PLUGIN_KEYS, 'sassLoaderOptions');
+        return sass;
+    }
+    if (void 0 !== sass && !isEmptyObject(sass)) warnOnceInDev('tools.sass', "`tools.sass` now accepts the full options of @rsbuild/plugin-sass. Passing sass-loader options directly is deprecated and will stop working in the next major version. Move them under `sassLoaderOptions`:\n  before: tools: { sass: { sassOptions: { quietDeps: true } } }\n  after:  tools: { sass: { sassLoaderOptions: { sassOptions: { quietDeps: true } } } }");
+    return {
+        sassLoaderOptions: sass
+    };
+};
+const mergeSvgrOptions = (target, source)=>{
+    const svgrOptions = source.svgrOptions ? {
+        ...target.svgrOptions,
+        ...source.svgrOptions
+    } : target.svgrOptions;
+    return Object.assign(target, source, {
+        svgrOptions
+    });
+};
+const resolveSvgrOptions = ({ svgr, disableSvgr, svgDefaultExport })=>{
+    if (void 0 !== disableSvgr) warnOnceInDev('output.disableSvgr', disableSvgr ? '`output.disableSvgr` is deprecated and will be removed in the next major version. Use `tools: { svgr: false }` instead.' : '`output.disableSvgr` is deprecated and will be removed in the next major version. SVGR is enabled by default, so `output.disableSvgr: false` can be removed (or use `tools: { svgr: {} }` to keep it explicit).');
+    if (void 0 !== svgDefaultExport) warnOnceInDev('output.svgDefaultExport', "`output.svgDefaultExport` is deprecated and will be removed in the next major version. Use `tools.svgr.svgrOptions.exportType` instead:\n  before: output: { svgDefaultExport: 'component' }\n  after:  tools: { svgr: { svgrOptions: { exportType: 'default' } } }\n  ('url' maps to exportType: 'named')");
+    if (false === svgr) return false;
+    if (void 0 === svgr && disableSvgr) return false;
+    const defaults = {
+        mixedImport: true,
+        svgrOptions: {
+            exportType: 'component' === svgDefaultExport ? 'default' : 'named'
+        }
+    };
+    return (0, utils_namespaceObject.applyOptionsChain)(defaults, svgr, void 0, mergeSvgrOptions);
+};
+exports.normalizeLessOptions = __webpack_exports__.normalizeLessOptions;
+exports.normalizeSassOptions = __webpack_exports__.normalizeSassOptions;
+exports.resetPluginOptionsWarnings = __webpack_exports__.resetPluginOptionsWarnings;
+exports.resolveSvgrOptions = __webpack_exports__.resolveSvgrOptions;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "normalizeLessOptions",
+    "normalizeSassOptions",
+    "resetPluginOptionsWarnings",
+    "resolveSvgrOptions"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/esm/shared/parseCommonConfig.mjs

@@ -10,6 +10,7 @@ import { pluginGlobalVars } from "../plugins/globalVars.mjs";
 import { pluginHtmlMinifierTerser } from "../plugins/htmlMinify.mjs";
 import { pluginRuntimeChunk } from "../plugins/runtimeChunk.mjs";
 import { transformToRsbuildServerOptions } from "./devServer.mjs";
+import { normalizeLessOptions, normalizeSassOptions, resolveSvgrOptions } from "./pluginOptions.mjs";
 import { NODE_MODULES_REGEX } from "./utils.mjs";
 const CSS_MODULES_REGEX = /\.modules?\.\w+$/i;
 const GLOBAL_CSS_REGEX = /\.global\.\w+$/;
@@ -25,7 +26,7 @@ function removeUndefinedKey(obj) {
 }
 async function parseCommonConfig(builderConfig, options) {
     const frameworkConfigPath = options?.frameworkConfigPath;
-    const { plugins: [...plugins] = [], splitChunks, performance: { ...performanceConfig } = {}, output: { module = false, enableCssModuleTSDeclaration, disableCssModuleExtension, disableTsChecker, disableSvgr, svgDefaultExport, assetsRetry, enableAssetManifest, sourceMap, convertToRem, polyfill, dataUriLimit = 10000, distPath = {}, ...outputConfig } = {}, html: { outputStructure, appIcon, ...htmlConfig } = {}, source: { alias, globalVars, transformImport, reactCompiler, ...sourceConfig } = {}, dev = {}, server = {}, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, less, sass, htmlPlugin, autoprefixer, ...toolsConfig } = {}, environments = {}, resolve = {} } = builderConfig;
+    const { plugins: [...plugins] = [], splitChunks, performance: { ...performanceConfig } = {}, output: { module = false, enableCssModuleTSDeclaration, disableCssModuleExtension, disableTsChecker, disableSvgr, svgDefaultExport, assetsRetry, enableAssetManifest, sourceMap, convertToRem, polyfill, dataUriLimit = 10000, distPath = {}, ...outputConfig } = {}, html: { outputStructure, appIcon, ...htmlConfig } = {}, source: { alias, globalVars, transformImport, reactCompiler, ...sourceConfig } = {}, dev = {}, server = {}, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, less, sass, svgr, htmlPlugin, autoprefixer, ...toolsConfig } = {}, environments = {}, resolve = {} } = builderConfig;
     let combinedAlias;
     if (alias || resolve.alias) combinedAlias = [].concat(alias ?? []).concat(resolve.alias ?? []);
     const rsbuildConfig = {
@@ -107,12 +108,8 @@ async function parseCommonConfig(builderConfig, options) {
             sourceMap
         }),
         pluginEmitRouteFile(),
-        pluginSass({
-            sassLoaderOptions: sass
-        }),
-        pluginLess({
-            lessLoaderOptions: less
-        }),
+        pluginSass(normalizeSassOptions(sass)),
+        pluginLess(normalizeLessOptions(less)),
         pluginEnvironmentDefaults(distPath),
         pluginHtmlMinifierTerser()
     ];
@@ -143,14 +140,14 @@ async function parseCommonConfig(builderConfig, options) {
     rsbuildPlugins.push(pluginReact(void 0 !== reactCompiler ? {
         reactCompiler
     } : {}));
-    if (!disableSvgr) {
+    const svgrOptions = resolveSvgrOptions({
+        svgr,
+        disableSvgr,
+        svgDefaultExport
+    });
+    if (false !== svgrOptions) {
         const { pluginSvgr } = await import("@rsbuild/plugin-svgr");
-        rsbuildPlugins.push(pluginSvgr({
-            mixedImport: true,
-            svgrOptions: {
-                exportType: 'component' === svgDefaultExport ? 'default' : 'named'
-            }
-        }));
+        rsbuildPlugins.push(pluginSvgr(svgrOptions));
     }
     if (assetsRetry) {
         const { pluginAssetsRetry } = await import("@rsbuild/plugin-assets-retry");

package/dist/esm/shared/pluginOptions.mjs

@@ -0,0 +1,74 @@
+import { applyOptionsChain, isDevCommand, logger } from "@modern-js/utils";
+const LESS_PLUGIN_KEYS = [
+    'lessLoaderOptions',
+    'include',
+    'exclude',
+    'parallel'
+];
+const SASS_PLUGIN_KEYS = [
+    'sassLoaderOptions',
+    'include',
+    'exclude',
+    'rewriteUrls'
+];
+const warned = new Set();
+const resetPluginOptionsWarnings = ()=>{
+    warned.clear();
+};
+const warnOnceInDev = (key, message)=>{
+    if (!isDevCommand() || warned.has(key)) return;
+    warned.add(key);
+    logger.warn(message);
+};
+const isPlainObject = (value)=>'object' == typeof value && null !== value && !Array.isArray(value);
+const isPluginLevelOptions = (value, pluginKeys)=>isPlainObject(value) && pluginKeys.some((key)=>key in value);
+const isEmptyObject = (value)=>isPlainObject(value) && 0 === Object.keys(value).length;
+const warnIgnoredKeys = (name, value, pluginKeys, loaderOptionsKey)=>{
+    const pluginLevel = Object.keys(value).filter((key)=>pluginKeys.includes(key));
+    const ignored = Object.keys(value).filter((key)=>!pluginKeys.includes(key));
+    if (0 === ignored.length) return;
+    warnOnceInDev(`${name}:mixed`, `\`${name}\` contains plugin-level options (${pluginLevel.join(', ')}) together with other keys (${ignored.join(', ')}). The whole object is passed to the plugin, so the other keys are ignored. Move loader options under \`${loaderOptionsKey}\`.`);
+};
+const normalizeLessOptions = (less)=>{
+    if (isPluginLevelOptions(less, LESS_PLUGIN_KEYS)) {
+        warnIgnoredKeys('tools.less', less, LESS_PLUGIN_KEYS, 'lessLoaderOptions');
+        return less;
+    }
+    if (void 0 !== less && !isEmptyObject(less)) warnOnceInDev('tools.less', "`tools.less` now accepts the full options of @rsbuild/plugin-less. Passing less-loader options directly is deprecated and will stop working in the next major version. Move them under `lessLoaderOptions`:\n  before: tools: { less: { lessOptions: { javascriptEnabled: true } } }\n  after:  tools: { less: { lessLoaderOptions: { lessOptions: { javascriptEnabled: true } } } }");
+    return {
+        lessLoaderOptions: less
+    };
+};
+const normalizeSassOptions = (sass)=>{
+    if (isPluginLevelOptions(sass, SASS_PLUGIN_KEYS)) {
+        warnIgnoredKeys('tools.sass', sass, SASS_PLUGIN_KEYS, 'sassLoaderOptions');
+        return sass;
+    }
+    if (void 0 !== sass && !isEmptyObject(sass)) warnOnceInDev('tools.sass', "`tools.sass` now accepts the full options of @rsbuild/plugin-sass. Passing sass-loader options directly is deprecated and will stop working in the next major version. Move them under `sassLoaderOptions`:\n  before: tools: { sass: { sassOptions: { quietDeps: true } } }\n  after:  tools: { sass: { sassLoaderOptions: { sassOptions: { quietDeps: true } } } }");
+    return {
+        sassLoaderOptions: sass
+    };
+};
+const mergeSvgrOptions = (target, source)=>{
+    const svgrOptions = source.svgrOptions ? {
+        ...target.svgrOptions,
+        ...source.svgrOptions
+    } : target.svgrOptions;
+    return Object.assign(target, source, {
+        svgrOptions
+    });
+};
+const resolveSvgrOptions = ({ svgr, disableSvgr, svgDefaultExport })=>{
+    if (void 0 !== disableSvgr) warnOnceInDev('output.disableSvgr', disableSvgr ? '`output.disableSvgr` is deprecated and will be removed in the next major version. Use `tools: { svgr: false }` instead.' : '`output.disableSvgr` is deprecated and will be removed in the next major version. SVGR is enabled by default, so `output.disableSvgr: false` can be removed (or use `tools: { svgr: {} }` to keep it explicit).');
+    if (void 0 !== svgDefaultExport) warnOnceInDev('output.svgDefaultExport', "`output.svgDefaultExport` is deprecated and will be removed in the next major version. Use `tools.svgr.svgrOptions.exportType` instead:\n  before: output: { svgDefaultExport: 'component' }\n  after:  tools: { svgr: { svgrOptions: { exportType: 'default' } } }\n  ('url' maps to exportType: 'named')");
+    if (false === svgr) return false;
+    if (void 0 === svgr && disableSvgr) return false;
+    const defaults = {
+        mixedImport: true,
+        svgrOptions: {
+            exportType: 'component' === svgDefaultExport ? 'default' : 'named'
+        }
+    };
+    return applyOptionsChain(defaults, svgr, void 0, mergeSvgrOptions);
+};
+export { normalizeLessOptions, normalizeSassOptions, resetPluginOptionsWarnings, resolveSvgrOptions };

package/dist/esm-node/shared/parseCommonConfig.mjs

@@ -11,6 +11,7 @@ import { pluginGlobalVars } from "../plugins/globalVars.mjs";
 import { pluginHtmlMinifierTerser } from "../plugins/htmlMinify.mjs";
 import { pluginRuntimeChunk } from "../plugins/runtimeChunk.mjs";
 import { transformToRsbuildServerOptions } from "./devServer.mjs";
+import { normalizeLessOptions, normalizeSassOptions, resolveSvgrOptions } from "./pluginOptions.mjs";
 import { NODE_MODULES_REGEX } from "./utils.mjs";
 const CSS_MODULES_REGEX = /\.modules?\.\w+$/i;
 const GLOBAL_CSS_REGEX = /\.global\.\w+$/;
@@ -26,7 +27,7 @@ function removeUndefinedKey(obj) {
 }
 async function parseCommonConfig(builderConfig, options) {
     const frameworkConfigPath = options?.frameworkConfigPath;
-    const { plugins: [...plugins] = [], splitChunks, performance: { ...performanceConfig } = {}, output: { module = false, enableCssModuleTSDeclaration, disableCssModuleExtension, disableTsChecker, disableSvgr, svgDefaultExport, assetsRetry, enableAssetManifest, sourceMap, convertToRem, polyfill, dataUriLimit = 10000, distPath = {}, ...outputConfig } = {}, html: { outputStructure, appIcon, ...htmlConfig } = {}, source: { alias, globalVars, transformImport, reactCompiler, ...sourceConfig } = {}, dev = {}, server = {}, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, less, sass, htmlPlugin, autoprefixer, ...toolsConfig } = {}, environments = {}, resolve = {} } = builderConfig;
+    const { plugins: [...plugins] = [], splitChunks, performance: { ...performanceConfig } = {}, output: { module = false, enableCssModuleTSDeclaration, disableCssModuleExtension, disableTsChecker, disableSvgr, svgDefaultExport, assetsRetry, enableAssetManifest, sourceMap, convertToRem, polyfill, dataUriLimit = 10000, distPath = {}, ...outputConfig } = {}, html: { outputStructure, appIcon, ...htmlConfig } = {}, source: { alias, globalVars, transformImport, reactCompiler, ...sourceConfig } = {}, dev = {}, server = {}, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, less, sass, svgr, htmlPlugin, autoprefixer, ...toolsConfig } = {}, environments = {}, resolve = {} } = builderConfig;
     let combinedAlias;
     if (alias || resolve.alias) combinedAlias = [].concat(alias ?? []).concat(resolve.alias ?? []);
     const rsbuildConfig = {
@@ -108,12 +109,8 @@ async function parseCommonConfig(builderConfig, options) {
             sourceMap
         }),
         pluginEmitRouteFile(),
-        pluginSass({
-            sassLoaderOptions: sass
-        }),
-        pluginLess({
-            lessLoaderOptions: less
-        }),
+        pluginSass(normalizeSassOptions(sass)),
+        pluginLess(normalizeLessOptions(less)),
         pluginEnvironmentDefaults(distPath),
         pluginHtmlMinifierTerser()
     ];
@@ -144,14 +141,14 @@ async function parseCommonConfig(builderConfig, options) {
     rsbuildPlugins.push(pluginReact(void 0 !== reactCompiler ? {
         reactCompiler
     } : {}));
-    if (!disableSvgr) {
+    const svgrOptions = resolveSvgrOptions({
+        svgr,
+        disableSvgr,
+        svgDefaultExport
+    });
+    if (false !== svgrOptions) {
         const { pluginSvgr } = await import("@rsbuild/plugin-svgr");
-        rsbuildPlugins.push(pluginSvgr({
-            mixedImport: true,
-            svgrOptions: {
-                exportType: 'component' === svgDefaultExport ? 'default' : 'named'
-            }
-        }));
+        rsbuildPlugins.push(pluginSvgr(svgrOptions));
     }
     if (assetsRetry) {
         const { pluginAssetsRetry } = await import("@rsbuild/plugin-assets-retry");

package/dist/esm-node/shared/pluginOptions.mjs

@@ -0,0 +1,75 @@
+import "node:module";
+import { applyOptionsChain, isDevCommand, logger } from "@modern-js/utils";
+const LESS_PLUGIN_KEYS = [
+    'lessLoaderOptions',
+    'include',
+    'exclude',
+    'parallel'
+];
+const SASS_PLUGIN_KEYS = [
+    'sassLoaderOptions',
+    'include',
+    'exclude',
+    'rewriteUrls'
+];
+const warned = new Set();
+const resetPluginOptionsWarnings = ()=>{
+    warned.clear();
+};
+const warnOnceInDev = (key, message)=>{
+    if (!isDevCommand() || warned.has(key)) return;
+    warned.add(key);
+    logger.warn(message);
+};
+const isPlainObject = (value)=>'object' == typeof value && null !== value && !Array.isArray(value);
+const isPluginLevelOptions = (value, pluginKeys)=>isPlainObject(value) && pluginKeys.some((key)=>key in value);
+const isEmptyObject = (value)=>isPlainObject(value) && 0 === Object.keys(value).length;
+const warnIgnoredKeys = (name, value, pluginKeys, loaderOptionsKey)=>{
+    const pluginLevel = Object.keys(value).filter((key)=>pluginKeys.includes(key));
+    const ignored = Object.keys(value).filter((key)=>!pluginKeys.includes(key));
+    if (0 === ignored.length) return;
+    warnOnceInDev(`${name}:mixed`, `\`${name}\` contains plugin-level options (${pluginLevel.join(', ')}) together with other keys (${ignored.join(', ')}). The whole object is passed to the plugin, so the other keys are ignored. Move loader options under \`${loaderOptionsKey}\`.`);
+};
+const normalizeLessOptions = (less)=>{
+    if (isPluginLevelOptions(less, LESS_PLUGIN_KEYS)) {
+        warnIgnoredKeys('tools.less', less, LESS_PLUGIN_KEYS, 'lessLoaderOptions');
+        return less;
+    }
+    if (void 0 !== less && !isEmptyObject(less)) warnOnceInDev('tools.less', "`tools.less` now accepts the full options of @rsbuild/plugin-less. Passing less-loader options directly is deprecated and will stop working in the next major version. Move them under `lessLoaderOptions`:\n  before: tools: { less: { lessOptions: { javascriptEnabled: true } } }\n  after:  tools: { less: { lessLoaderOptions: { lessOptions: { javascriptEnabled: true } } } }");
+    return {
+        lessLoaderOptions: less
+    };
+};
+const normalizeSassOptions = (sass)=>{
+    if (isPluginLevelOptions(sass, SASS_PLUGIN_KEYS)) {
+        warnIgnoredKeys('tools.sass', sass, SASS_PLUGIN_KEYS, 'sassLoaderOptions');
+        return sass;
+    }
+    if (void 0 !== sass && !isEmptyObject(sass)) warnOnceInDev('tools.sass', "`tools.sass` now accepts the full options of @rsbuild/plugin-sass. Passing sass-loader options directly is deprecated and will stop working in the next major version. Move them under `sassLoaderOptions`:\n  before: tools: { sass: { sassOptions: { quietDeps: true } } }\n  after:  tools: { sass: { sassLoaderOptions: { sassOptions: { quietDeps: true } } } }");
+    return {
+        sassLoaderOptions: sass
+    };
+};
+const mergeSvgrOptions = (target, source)=>{
+    const svgrOptions = source.svgrOptions ? {
+        ...target.svgrOptions,
+        ...source.svgrOptions
+    } : target.svgrOptions;
+    return Object.assign(target, source, {
+        svgrOptions
+    });
+};
+const resolveSvgrOptions = ({ svgr, disableSvgr, svgDefaultExport })=>{
+    if (void 0 !== disableSvgr) warnOnceInDev('output.disableSvgr', disableSvgr ? '`output.disableSvgr` is deprecated and will be removed in the next major version. Use `tools: { svgr: false }` instead.' : '`output.disableSvgr` is deprecated and will be removed in the next major version. SVGR is enabled by default, so `output.disableSvgr: false` can be removed (or use `tools: { svgr: {} }` to keep it explicit).');
+    if (void 0 !== svgDefaultExport) warnOnceInDev('output.svgDefaultExport', "`output.svgDefaultExport` is deprecated and will be removed in the next major version. Use `tools.svgr.svgrOptions.exportType` instead:\n  before: output: { svgDefaultExport: 'component' }\n  after:  tools: { svgr: { svgrOptions: { exportType: 'default' } } }\n  ('url' maps to exportType: 'named')");
+    if (false === svgr) return false;
+    if (void 0 === svgr && disableSvgr) return false;
+    const defaults = {
+        mixedImport: true,
+        svgrOptions: {
+            exportType: 'component' === svgDefaultExport ? 'default' : 'named'
+        }
+    };
+    return applyOptionsChain(defaults, svgr, void 0, mergeSvgrOptions);
+};
+export { normalizeLessOptions, normalizeSassOptions, resetPluginOptionsWarnings, resolveSvgrOptions };

package/dist/types/shared/pluginOptions.d.ts

@@ -0,0 +1,32 @@
+import type { PluginLessOptions } from '@rsbuild/plugin-less';
+import type { PluginSassOptions } from '@rsbuild/plugin-sass';
+import type { PluginSvgrOptions, SvgDefaultExport } from '@rsbuild/plugin-svgr';
+import type { BuilderConfig } from '../types.js';
+type BuilderToolsConfig = NonNullable<BuilderConfig['tools']>;
+/** Reset the warn-once state. Only meant for unit tests. */
+export declare const resetPluginOptionsWarnings: () => void;
+/**
+ * `tools.less` accepts either the full options of `@rsbuild/plugin-less`
+ * or, for backward compatibility, the less-loader options directly
+ * (object, function or array form). The legacy form is wrapped into
+ * `lessLoaderOptions` so the generated bundler config stays unchanged.
+ */
+export declare const normalizeLessOptions: (less: BuilderToolsConfig["less"]) => PluginLessOptions;
+/**
+ * Same as {@link normalizeLessOptions} for `tools.sass`.
+ */
+export declare const normalizeSassOptions: (sass: BuilderToolsConfig["sass"]) => PluginSassOptions;
+/**
+ * Resolve the options passed to `@rsbuild/plugin-svgr`, or `false` when the
+ * plugin should not be registered.
+ *
+ * `tools.svgr` takes precedence over the deprecated `output.disableSvgr` and
+ * `output.svgDefaultExport`; the two legacy options keep working when
+ * `tools.svgr` is not set.
+ */
+export declare const resolveSvgrOptions: ({ svgr, disableSvgr, svgDefaultExport, }: {
+    svgr: BuilderToolsConfig["svgr"];
+    disableSvgr?: boolean;
+    svgDefaultExport?: SvgDefaultExport;
+}) => PluginSvgrOptions | false;
+export {};

package/dist/types/types.d.ts

@@ -8,7 +8,7 @@ import type { PluginReactOptions } from '@rsbuild/plugin-react';
 import type { PluginRemOptions } from '@rsbuild/plugin-rem';
 import type { PluginSassOptions } from '@rsbuild/plugin-sass';
 import type { PluginSourceBuildOptions } from '@rsbuild/plugin-source-build';
-import type { SvgDefaultExport } from '@rsbuild/plugin-svgr';
+import type { PluginSvgrOptions, SvgDefaultExport } from '@rsbuild/plugin-svgr';
 import type { PluginTypeCheckerOptions } from '@rsbuild/plugin-type-check';
 import type { Options as AutoprefixerOptions } from 'autoprefixer';
 export type CacheGroup = Rspack.OptimizationSplitChunksCacheGroup;
@@ -100,13 +100,29 @@ export type BuilderExtraConfig = {
          */
         minifyCss?: PluginCssMinimizerOptions['pluginOptions'];
         /**
-         * Modify the config of [less-loader](https://github.com/webpack-contrib/less-loader).
+         * Modify the options of [@rsbuild/plugin-less](https://rsbuild.rs/plugins/list/plugin-less),
+         * such as `lessLoaderOptions`, `include`, `exclude` and `parallel`.
+         *
+         * Passing the [less-loader](https://github.com/webpack-contrib/less-loader)
+         * options directly is still supported for backward compatibility, but is
+         * deprecated: move them under `lessLoaderOptions`.
+         */
+        less?: PluginLessOptions['lessLoaderOptions'] | PluginLessOptions;
+        /**
+         * Modify the options of [@rsbuild/plugin-sass](https://rsbuild.rs/plugins/list/plugin-sass),
+         * such as `sassLoaderOptions`, `include`, `exclude` and `rewriteUrls`.
+         *
+         * Passing the [sass-loader](https://github.com/webpack-contrib/sass-loader)
+         * options directly is still supported for backward compatibility, but is
+         * deprecated: move them under `sassLoaderOptions`.
          */
-        less?: PluginLessOptions['lessLoaderOptions'];
+        sass?: PluginSassOptions['sassLoaderOptions'] | PluginSassOptions;
         /**
-         * Modify the config of [sass-loader](https://github.com/webpack-contrib/sass-loader).
+         * Modify the options of [@rsbuild/plugin-svgr](https://rsbuild.rs/plugins/list/plugin-svgr),
+         * such as `svgrOptions`, `parallel`, `exclude` and `query`.
+         * Set to `false` to disable SVGR; all `.svg` files are then treated as static assets.
          */
-        sass?: PluginSassOptions['sassLoaderOptions'];
+        svgr?: ConfigChain<PluginSvgrOptions> | false;
     };
     dev?: {
         /** Set the page URL to open when the server starts. */
@@ -177,10 +193,14 @@ export type BuilderExtraConfig = {
         disableTsChecker?: boolean;
         /**
          * Configure the default export type of SVG files.
+         * @deprecated Use `tools.svgr.svgrOptions.exportType` instead:
+         * `'component'` maps to `exportType: 'default'`, `'url'` maps to `exportType: 'named'`.
          */
         svgDefaultExport?: SvgDefaultExport;
         /**
          * Whether to transform SVGs into React components. If true, will treat all .svg files as assets.
+         * @deprecated Use `tools.svgr` instead: `output.disableSvgr: true` maps to `tools.svgr: false`;
+         * `false` is the default behavior and can simply be removed.
          */
         disableSvgr?: boolean;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/builder",
-  "version": "3.9.1",
+  "version": "3.9.3",
   "description": "A builder for Modern.js",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "dist"
   ],
   "dependencies": {
-    "@rsbuild/core": "2.2.4",
+    "@rsbuild/core": "2.2.9",
     "@rsbuild/plugin-assets-retry": "2.0.2",
     "@rsbuild/plugin-check-syntax": "2.0.1",
     "@rsbuild/plugin-css-minimizer": "2.0.1",
@@ -34,19 +34,19 @@
     "@rsbuild/plugin-react": "2.1.0",
     "@rsbuild/plugin-rem": "1.0.6",
     "@rsbuild/plugin-sass": "2.0.1",
-    "@rsbuild/plugin-source-build": "1.0.6",
+    "@rsbuild/plugin-source-build": "1.0.7",
     "@rsbuild/plugin-svgr": "2.0.5",
     "@rsbuild/plugin-type-check": "1.6.0",
     "@rsbuild/plugin-typed-css-modules": "1.2.4",
     "@swc/core": "1.15.41",
     "@swc/helpers": "^0.5.17",
     "autoprefixer": "10.4.27",
-    "browserslist": "4.28.8",
+    "browserslist": "4.29.0",
     "core-js": "^3.48.0",
     "cssnano": "6.1.2",
     "html-minifier-terser": "^7.2.0",
     "lodash": "^4.18.1",
-    "postcss": "^8.5.26",
+    "postcss": "^8.5.28",
     "postcss-custom-properties": "13.3.12",
     "postcss-flexbugs-fixes": "5.0.2",
     "postcss-font-variant": "5.0.0",
@@ -56,19 +56,19 @@
     "postcss-page-break": "3.0.4",
     "rsbuild-plugin-rsc": "0.1.1",
     "rspack-manifest-plugin": "5.2.2",
-    "ts-deepmerge": "7.0.3",
-    "@modern-js/utils": "3.9.1"
+    "ts-deepmerge": "8.0.0",
+    "@modern-js/utils": "3.9.3"
   },
   "devDependencies": {
-    "@rslib/core": "1.0.0",
+    "@rslib/core": "1.0.1",
     "@types/html-minifier-terser": "^7.0.2",
-    "@types/lodash": "^4.17.24",
+    "@types/lodash": "^4.17.25",
     "react": "^19.2.8",
-    "terser": "^5.48.0",
+    "terser": "^5.51.2",
     "typescript": "^5.3.0",
-    "@modern-js/types": "3.9.1",
-    "@scripts/rstest-config": "2.66.0",
-    "@modern-js/rslib": "2.68.10"
+    "@modern-js/rslib": "2.68.10",
+    "@modern-js/types": "3.9.3",
+    "@scripts/rstest-config": "2.66.0"
   },
   "publishConfig": {
     "access": "public",