@rsbuild/webpack 0.0.14 → 0.0.16

package/dist/core/webpackConfig.js

@@ -56,12 +56,12 @@ async function modifyWebpackConfig(context, webpackConfig, utils) {
     utils
   );
   if ((_a = context.config.tools) == null ? void 0 : _a.webpack) {
-    modifiedConfig = (0, import_shared.mergeChainedOptions)(
-      modifiedConfig,
-      context.config.tools.webpack,
+    modifiedConfig = (0, import_shared.mergeChainedOptions)({
+      defaults: modifiedConfig,
+      options: context.config.tools.webpack,
       utils,
-      utils.mergeConfig
-    );
+      mergeFn: utils.mergeConfig
+    });
   }
   (0, import_shared.debug)("modify webpack config done");
   return modifiedConfig;

package/dist/plugins/babel.js

@@ -92,14 +92,14 @@ const pluginBabel = () => ({
             baseBabelConfig,
             config2.performance.transformLodash
           );
-          const babelConfig = (0, import_shared.mergeChainedOptions)(
-            baseBabelConfig,
-            config2.tools.babel,
-            {
+          const babelConfig = (0, import_shared.mergeChainedOptions)({
+            defaults: baseBabelConfig,
+            options: config2.tools.babel,
+            utils: {
               ...(0, import_plugin_babel.getBabelUtils)(baseBabelConfig),
               ...babelUtils
             }
-          );
+          });
           const finalOptions = {
             babelrc: false,
             configFile: false,

package/dist/plugins/css.js

@@ -49,14 +49,6 @@ async function applyBaseCSSRule({
   const enableCssMinify = !enableExtractCSS && isProd;
   const enableSourceMap = (0, import_shared.isUseCssSourceMap)(config);
   const enableCSSModuleTS = Boolean(config.output.enableCssModuleTSDeclaration);
-  const extraCSSOptions = typeof config.tools.cssExtract === "object" ? config.tools.cssExtract : {
-    loaderOptions: {},
-    pluginOptions: {}
-  };
-  const styleLoaderOptions = (0, import_shared.mergeChainedOptions)(
-    {},
-    config.tools.styleLoader
-  );
   const localIdentName = (0, import_shared.getCssModuleLocalIdentName)(config, isProd);
   const cssLoaderOptions = await (0, import_shared.getCssLoaderOptions)({
     config,
@@ -68,8 +60,16 @@ async function applyBaseCSSRule({
   });
   if (!isServer && !isWebWorker) {
     if (enableExtractCSS) {
+      const extraCSSOptions = typeof config.tools.cssExtract === "object" ? config.tools.cssExtract : {
+        loaderOptions: {},
+        pluginOptions: {}
+      };
       rule.use(CHAIN_ID.USE.MINI_CSS_EXTRACT).loader(require("mini-css-extract-plugin").loader).options(extraCSSOptions.loaderOptions).end();
     } else {
+      const styleLoaderOptions = (0, import_shared.mergeChainedOptions)({
+        defaults: {},
+        options: config.tools.styleLoader
+      });
       rule.use(CHAIN_ID.USE.STYLE).loader(require.resolve("style-loader")).options(styleLoaderOptions).end();
     }
     if (enableCSSModuleTS && cssLoaderOptions.modules) {

package/dist/plugins/output.js

@@ -43,10 +43,10 @@ const pluginOutput = () => ({
       const cssPath = (0, import_shared.getDistPath)(config.output, "css");
       if ((0, import_shared.isUseCssExtract)(config, target)) {
         const { default: MiniCssExtractPlugin } = await Promise.resolve().then(() => __toESM(require("mini-css-extract-plugin")));
-        const extractPluginOptions = (0, import_shared.mergeChainedOptions)(
-          {},
-          ((_a = config.tools.cssExtract) == null ? void 0 : _a.pluginOptions) || {}
-        );
+        const extractPluginOptions = (0, import_shared.mergeChainedOptions)({
+          defaults: {},
+          options: (_a = config.tools.cssExtract) == null ? void 0 : _a.pluginOptions
+        });
         const cssFilename = (0, import_shared.getFilename)(config.output, "css", isProd);
         chain.plugin(CHAIN_ID.PLUGIN.MINI_CSS_EXTRACT).use(MiniCssExtractPlugin, [
           {

package/dist/plugins/tsLoader.js

@@ -57,11 +57,11 @@ const pluginTsLoader = () => {
           }
         });
         const babelUtils = (0, import_plugin_babel.getBabelUtils)(baseBabelConfig);
-        const babelLoaderOptions = (0, import_shared.mergeChainedOptions)(
-          baseBabelConfig,
-          config.tools.babel,
-          babelUtils
-        );
+        const babelLoaderOptions = (0, import_shared.mergeChainedOptions)({
+          defaults: baseBabelConfig,
+          options: config.tools.babel,
+          utils: babelUtils
+        });
         const includes = [];
         const excludes = [];
         const tsLoaderUtils = {
@@ -72,18 +72,20 @@ const pluginTsLoader = () => {
             excludes.push(...(0, import_shared.castArray)(items));
           }
         };
-        const tsLoaderOptions = (0, import_shared.mergeChainedOptions)(
-          {
-            compilerOptions: {
-              target: "esnext",
-              module: "esnext"
-            },
-            transpileOnly: true,
-            allowTsInNodeModules: true
+        const tsLoaderDefaultOptions = {
+          compilerOptions: {
+            target: "esnext",
+            module: "esnext"
           },
-          config.tools.tsLoader,
-          tsLoaderUtils
-        );
+          transpileOnly: true,
+          allowTsInNodeModules: true
+        };
+        const tsLoaderOptions = (0, import_shared.mergeChainedOptions)({
+          defaults: tsLoaderDefaultOptions,
+          // @ts-expect-error ts-loader has incorrect types for compilerOptions
+          options: config.tools.tsLoader,
+          utils: tsLoaderUtils
+        });
         const rule = chain.module.rule(CHAIN_ID.RULE.TS);
         (0, import_shared.applyScriptCondition)({
           rule,

package/dist/types/config/tools.d.ts

@@ -1,18 +1,18 @@
-import type { ArrayOrNot, ChainedConfig, FileFilterUtil, TerserPluginOptions, ToolsConfig as BaseToolsConfig } from '@rsbuild/shared';
+import type { ArrayOrNot, ChainedConfig, FileFilterUtil, TerserPluginOptions, ToolsConfig as BaseToolsConfig, ChainedConfigWithUtils } from '@rsbuild/shared';
 import type { BabelTransformOptions, BabelConfigUtils } from '@rsbuild/plugin-babel';
 import type { PluginCssMinimizerOptions } from '@rsbuild/plugin-css-minimizer';
 import type { ModifyWebpackChainUtils, ModifyWebpackConfigUtils } from '../hooks';
 import type { WebpackChain, WebpackConfig, TSLoaderOptions, CSSExtractOptions } from '../thirdParty';
 import type { NormalizedCSSExtractOptions } from '../thirdParty/css';
 export type ToolsTerserConfig = ChainedConfig<TerserPluginOptions>;
-export type ToolsTSLoaderConfig = ChainedConfig<TSLoaderOptions, {
+export type ToolsTSLoaderConfig = ChainedConfigWithUtils<TSLoaderOptions, {
   addIncludes: FileFilterUtil;
   addExcludes: FileFilterUtil;
 }>;
 export type ToolsCssExtractConfig = CSSExtractOptions | ((options: CSSExtractOptions) => CSSExtractOptions | void);
-export type ToolsWebpackConfig = ChainedConfig<WebpackConfig, ModifyWebpackConfigUtils>;
+export type ToolsWebpackConfig = ChainedConfigWithUtils<WebpackConfig, ModifyWebpackConfigUtils>;
 export type ToolsWebpackChainConfig = ArrayOrNot<(chain: WebpackChain, utils: ModifyWebpackChainUtils) => void>;
-export type ToolsBabelConfig = ChainedConfig<BabelTransformOptions, BabelConfigUtils>;
+export type ToolsBabelConfig = ChainedConfigWithUtils<BabelTransformOptions, BabelConfigUtils>;
 export interface ToolsConfig extends BaseToolsConfig {
   /**
    * Modify the options of [babel-loader](https://github.com/babel/babel-loader)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/webpack",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "homepage": "https://rsbuild.dev",
   "repository": {
     "type": "git",
@@ -59,11 +59,11 @@
     "tsconfig-paths-webpack-plugin": "4.1.0",
     "webpack": "^5.89.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@rsbuild/babel-preset": "0.0.14",
-    "@rsbuild/plugin-babel": "0.0.14",
-    "@rsbuild/plugin-css-minimizer": "0.0.14",
-    "@rsbuild/core": "0.0.14",
-    "@rsbuild/shared": "0.0.14"
+    "@rsbuild/babel-preset": "0.0.16",
+    "@rsbuild/core": "0.0.16",
+    "@rsbuild/plugin-babel": "0.0.16",
+    "@rsbuild/plugin-css-minimizer": "0.0.16",
+    "@rsbuild/shared": "0.0.16"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.200",
@@ -71,7 +71,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.2.2",
-    "@rsbuild/test-helper": "0.0.14"
+    "@rsbuild/test-helper": "0.0.16"
   },
   "engines": {
     "node": ">=14.0.0"